From d88865fc78805caa939cffca67f1bf36ccc8a9b6 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 30 Nov 2022 22:11:49 +0100 Subject: [PATCH] [MIRROR] Cleans up toolbox initializes [MDB IGNORE] (#17822) * Cleans up toolbox initializes (#71585) :cl: fix: normal toolboxes can't hold fishing rods anymore /:cl: * Cleans up toolbox initializes Co-authored-by: AnturK --- code/game/objects/items/storage/toolbox.dm | 5 +---- code/modules/fishing/fishing_equipment.dm | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index cd4c77401b5..d22b4c722d5 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -26,6 +26,7 @@ /obj/item/storage/toolbox/Initialize(mapload) . = ..() + atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL if(has_latches) if(prob(10)) latches = "double_latch" @@ -40,10 +41,6 @@ if(has_latches) . += latches -/obj/item/storage/toolbox/Initialize(mapload) - . = ..() - atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL - /obj/item/storage/toolbox/suicide_act(mob/living/user) user.visible_message(span_suicide("[user] robusts [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return BRUTELOSS diff --git a/code/modules/fishing/fishing_equipment.dm b/code/modules/fishing/fishing_equipment.dm index a320c5d146b..7711281a945 100644 --- a/code/modules/fishing/fishing_equipment.dm +++ b/code/modules/fishing/fishing_equipment.dm @@ -167,7 +167,7 @@ inhand_icon_state = "artistic_toolbox" material_flags = NONE -/obj/item/storage/toolbox/Initialize(mapload) +/obj/item/storage/toolbox/fishing/Initialize(mapload) . = ..() // Can hold fishing rod despite the size var/static/list/exception_cache = typecacheof(/obj/item/fishing_rod)