From cb511ae7259162e0cc5eea1f7c1aebf4c490a847 Mon Sep 17 00:00:00 2001 From: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Mon, 30 Oct 2023 20:10:39 +0100 Subject: [PATCH] Fixes it all, I hate it (#23008) --- code/game/objects/items/stacks/medical_packs.dm | 3 +++ code/game/objects/items/stacks/sheets/mineral.dm | 1 + code/game/objects/items/stacks/stack.dm | 3 ++- code/modules/mining/ores_coins.dm | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/stacks/medical_packs.dm b/code/game/objects/items/stacks/medical_packs.dm index 7d002f30715..61bc4a348ff 100644 --- a/code/game/objects/items/stacks/medical_packs.dm +++ b/code/game/objects/items/stacks/medical_packs.dm @@ -129,6 +129,7 @@ icon = 'icons/obj/stacks/miscellaneous.dmi' icon_state = "gauze" origin_tech = "biotech=2" + merge_type = /obj/item/stack/medical/bruise_pack max_amount = 12 heal_brute = 10 stop_bleeding = 1800 @@ -173,6 +174,7 @@ name = "improvised gauze" singular_name = "improvised gauze" desc = "A roll of cloth roughly cut from something that can stop bleeding, but does not heal wounds." + merge_type = /obj/item/stack/medical/bruise_pack/improvised heal_brute = 0 stop_bleeding = 900 @@ -183,6 +185,7 @@ desc = "An advanced trauma kit for severe injuries." icon_state = "traumakit" belt_icon = "traumakit" + merge_type = /obj/item/stack/medical/bruise_pack/advanced max_amount = 6 heal_brute = 25 stop_bleeding = 0 diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index f1c668bec69..8aab03be8a5 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -441,6 +441,7 @@ GLOBAL_LIST_INIT(plastitanium_recipes, list( throw_speed = 1 origin_tech = "materials=6;abductor=1" sheettype = "abductor" + merge_type = /obj/item/stack/sheet/mineral/abductor table_type = /obj/structure/table/abductor /obj/item/stack/sheet/mineral/abductor/fifty diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 41f546f3e66..11d45ad6448 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -24,7 +24,8 @@ var/amount = 1 var/to_transfer = 0 var/max_amount = 50 //also see stack recipes initialisation, param "max_res_amount" must be equal to this max_amount - var/merge_type = null // This path and its children should merge with this stack, defaults to src.type + /// This path and its children should merge with this stack, defaults to src.type + var/merge_type = null var/recipe_width = 400 //Width of the recipe popup var/recipe_height = 400 //Height of the recipe popup /// What sort of table is made when applying this stack to a frame? diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 47a0b2a305b..4a199cd11b3 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -99,6 +99,7 @@ singular_name = "sand pile" points = 1 refined_type = /obj/item/stack/sheet/glass + merge_type = /obj/item/stack/ore/glass materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT) GLOBAL_LIST_INIT(sand_recipes, list(\