From 2dea3cf15c4d36b4560649efee8e72adc0e2e77e Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sun, 23 Feb 2020 00:53:42 -0500 Subject: [PATCH 1/2] Gives ash sandstone --- code/modules/mining/ores_coins.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 8240724d66..42a8fd2ca6 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -131,6 +131,10 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ icon_state = "volcanic_sand" singular_name = "volcanic ash pile" +/obj/item/stack/ore/glass/basalt/Initialize(mapload, new_amount, merge = TRUE) + recipes = GLOB.sand_recipes + . = ..() + /obj/item/stack/ore/plasma name = "plasma ore" icon_state = "Plasma ore" From 845e719ade2d999e4e16a38998f6145485657463 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Sun, 23 Feb 2020 01:52:36 -0500 Subject: [PATCH 2/2] But what if we did it right? --- code/modules/mining/ores_coins.dm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 42a8fd2ca6..7fc4728329 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -94,12 +94,12 @@ w_class = WEIGHT_CLASS_TINY GLOBAL_LIST_INIT(sand_recipes, list(\ - new /datum/stack_recipe("sandstone", /obj/item/stack/sheet/mineral/sandstone, 1, 1, 50)\ - )) + new/datum/stack_recipe("sandstone", /obj/item/stack/sheet/mineral/sandstone, 1, 1, 50),\ + )) -/obj/item/stack/ore/glass/Initialize(mapload, new_amount, merge = TRUE) - recipes = GLOB.sand_recipes +/obj/item/stack/ore/glass/get_main_recipes() . = ..() + . += GLOB.sand_recipes /obj/item/stack/ore/glass/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) if(..() || !ishuman(hit_atom)) @@ -131,10 +131,6 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ icon_state = "volcanic_sand" singular_name = "volcanic ash pile" -/obj/item/stack/ore/glass/basalt/Initialize(mapload, new_amount, merge = TRUE) - recipes = GLOB.sand_recipes - . = ..() - /obj/item/stack/ore/plasma name = "plasma ore" icon_state = "Plasma ore" @@ -148,7 +144,6 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ to_chat(user, "You can't hit a high enough temperature to smelt [src] properly!") return TRUE - /obj/item/stack/ore/silver name = "silver ore" icon_state = "Silver ore"