cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stack examine fixes (#34270)

Browse Source 
Co-authored-by: SECBATON GRIFFON <sage>
This commit is contained in:
SECBATON GRIFFON
2023-05-25 17:52:47 +01:00
committed by GitHub
parent cef5331540
commit f99e7c6ee1
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
code/modules/mining/ores_coins.dm
View File

@@ -1,7 +1,9 @@
/**********************Mineral ores**************************/
/obj/item/stack/ore
name = "Rock"
name = "rock"
singular_name = "piece of "
irregular_plural = "pieces of "
icon = 'icons/obj/mining.dmi'
icon_state = "ore2"
w_type = RECYK_MISC
@@ -9,6 +11,11 @@
var/datum/geosample/geologic_data
var/can_orebox = TRUE
/obj/item/stack/ore/New()
singular_name += name
irregular_plural += name
..()
/obj/item/stack/ore/recycle(var/datum/materials/rec)
if(!materials)
return NOT_RECYCLABLE
@@ -16,21 +23,21 @@
return ..()
/obj/item/stack/ore/uranium
name = "Uranium ore"
name = "\improper uranium ore"
icon_state = "Uranium ore"
origin_tech = Tc_MATERIALS + "=5"
melt_temperature = 1070+T0C
starting_materials = list(MAT_URANIUM = CC_PER_SHEET_URANIUM)
/obj/item/stack/ore/iron
name = "Iron ore"
name = "\improper iron ore"
icon_state = "Iron ore"
origin_tech = Tc_MATERIALS + "=1"
melt_temperature = MELTPOINT_STEEL
starting_materials = list(MAT_IRON = CC_PER_SHEET_METAL)
/obj/item/stack/ore/glass
name = "Sand"
name = "\improper sand"
icon_state = "Glass ore"
origin_tech = Tc_MATERIALS + "=1"
melt_temperature = MELTPOINT_GLASS
@@ -82,55 +89,55 @@
use(1)
/obj/item/stack/ore/plasma
name = "Plasma ore"
name = "\improper plasma ore"
icon_state = "Plasma ore"
origin_tech = Tc_MATERIALS + "=2"
melt_temperature = MELTPOINT_STEEL+500
starting_materials = list(MAT_PLASMA = CC_PER_SHEET_PLASMA)
/obj/item/stack/ore/nanotrasite
name = "Nanotrasite ore"
name = "\improper nanotrasite ore"
icon_state = "Nanotrasite ore"
origin_tech = Tc_MATERIALS + "=3"
melt_temperature = MELTPOINT_STEEL+700
starting_materials = list(MAT_IRON = CC_PER_SHEET_METAL/2, MAT_PLASMA = CC_PER_SHEET_PLASMA/2)
/obj/item/stack/ore/silver
name = "Silver ore"
name = "\improper silver ore"
icon_state = "Silver ore"
origin_tech = Tc_MATERIALS + "=3"
starting_materials = list(MAT_SILVER = CC_PER_SHEET_SILVER)
melt_temperature = 961+T0C
/obj/item/stack/ore/gold
name = "Gold ore"
name = "\improper gold ore"
icon_state = "Gold ore"
origin_tech = Tc_MATERIALS + "=4"
starting_materials = list(MAT_GOLD = CC_PER_SHEET_GOLD)
melt_temperature = 1064+T0C
/obj/item/stack/ore/electrum
name = "Electrum ore"
name = "\improper electrum ore"
icon_state = "Electrum ore"
starting_materials = list(MAT_GOLD = CC_PER_SHEET_MISC*0.6, MAT_SILVER = CC_PER_SHEET_MISC*0.4)
origin_tech = Tc_MATERIALS + "=4"
melt_temperature = 1023.22+T0C //60% gold, 40% silver
/obj/item/stack/ore/diamond
name = "Diamond ore"
name = "\improper diamond ore"
icon_state = "Diamond ore"
origin_tech = Tc_MATERIALS + "=6"
starting_materials = list(MAT_DIAMOND = CC_PER_SHEET_DIAMOND)
/obj/item/stack/ore/clown
name = "Bananium ore"
name = "\improper bananium ore"
icon_state = "Clown ore"
origin_tech = Tc_MATERIALS + "=4"
melt_temperature = MELTPOINT_POTASSIUM
starting_materials = list(MAT_CLOWN = CC_PER_SHEET_CLOWN)
/obj/item/stack/ore/phazon
name = "Phazite"
name = "\improper phazite"
desc = "What the fuck?"
icon_state = "Phazon ore"
origin_tech = Tc_MATERIALS + "=7"
@@ -138,7 +145,7 @@
starting_materials = list(MAT_PHAZON = CC_PER_SHEET_PHAZON)
/obj/item/stack/ore/slag
name = "Slag"
name = "\improper slag"
desc = "Completely useless unless recycled."
icon_state = "slag"
melt_temperature=MELTPOINT_PLASTIC
@@ -270,7 +277,7 @@
starting_materials = list(MAT_TELECRYSTAL = CC_PER_SHEET_TELECRYSTAL)
/obj/item/stack/ore/mythril
name = "mythril ore"
name = "\improper mythril ore"
desc = "A naturally-occuring silver steel alloy."
icon_state = "cobryl"
starting_materials = list(MAT_MYTHRIL = CC_PER_SHEET_MYTHRIL)