Skip to content

Commit

Permalink
Cleans up toolbox initializes (tgstation#71585)
Browse files Browse the repository at this point in the history
🆑
fix: normal toolboxes can't hold fishing rods anymore
/🆑
  • Loading branch information
AnturK authored Nov 29, 2022
1 parent 52e1ec5 commit 5c86033
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
5 changes: 1 addition & 4 deletions code/game/objects/items/storage/toolbox.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/fishing/fishing_equipment.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 5c86033

Please sign in to comment.