Skip to content

Commit

Permalink
Fixes sand showing as glass in the ore console (#20330)
Browse files Browse the repository at this point in the history
Fixes #20287
Also uses defines instead of strings in other ores.
  • Loading branch information
Jasorn authored Jan 4, 2025
1 parent 981d93e commit 33ecf00
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 4 deletions.
8 changes: 4 additions & 4 deletions code/modules/mining/ore_datum.dm
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ GLOBAL_LIST_EMPTY(ore_data)

/ore/glass
name = ORE_SAND
display_name = MATERIAL_GLASS
display_name = "sand"
smelts_to = MATERIAL_GLASS
compresses_to = MATERIAL_SANDSTONE
worth = 1
Expand Down Expand Up @@ -97,9 +97,9 @@ GLOBAL_LIST_EMPTY(ore_data)
worth = 20

/ore/gold
name = "gold"
smelts_to = MATERIAL_GOLD
name = ORE_GOLD
display_name = "native gold"
smelts_to = MATERIAL_GOLD
result_amount = 5
spread_chance = 10
ore = /obj/item/ore/gold
Expand All @@ -113,7 +113,7 @@ GLOBAL_LIST_EMPTY(ore_data)
worth = 30

/ore/diamond
name = "diamond"
name = ORE_DIAMOND
display_name = "diamond"
compresses_to = MATERIAL_DIAMOND
result_amount = 5
Expand Down
58 changes: 58 additions & 0 deletions html/changelogs/Jasorn-SandFix.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# - (fixes bugs)
# wip
# - (work in progress)
# qol
# - (quality of life)
# soundadd
# - (adds a sound)
# sounddel
# - (removes a sound)
# rscadd
# - (adds a feature)
# rscdel
# - (removes a feature)
# imageadd
# - (adds an image or sprite)
# imagedel
# - (removes an image or sprite)
# spellcheck
# - (fixes spelling or grammar)
# experiment
# - (experimental change)
# balance
# - (balance changes)
# code_imp
# - (misc internal code change)
# refactor
# - (refactors code)
# config
# - (makes a change to the config files)
# admin
# - (makes changes to administrator tools)
# server
# - (miscellaneous changes to server)
#################################

# Your name.
author: Jasorn

# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True

# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- bugfix: "Fixed sand showing up as glass in the ore console. Also used defines in ore_datum where they should be instead of strings"

0 comments on commit 33ecf00

Please sign in to comment.