From 0127fa02cdf77ce4c978e5df0d42cd48ed15f279 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Mon, 23 Apr 2018 09:30:25 -0400 Subject: [PATCH] Fixes toolbelts holding everything --- code/game/objects/items/storage/belt.dm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index d0b3480f04..f6d23b0986 100755 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -32,7 +32,16 @@ desc = "Holds tools." icon_state = "utilitybelt" item_state = "utility" +<<<<<<< HEAD can_hold = list( +======= + content_overlays = TRUE + +/obj/item/storage/belt/utility/ComponentInitialize() + . = ..() + GET_COMPONENT(STR, /datum/component/storage) + var/static/list/can_hold = typecacheof(list( +>>>>>>> 4fca080... Merge pull request #37381 from DaxDupont/toolbelts /obj/item/crowbar, /obj/item/screwdriver, /obj/item/weldingtool, @@ -48,9 +57,15 @@ /obj/item/device/radio, /obj/item/clothing/gloves, /obj/item/holosign_creator, +<<<<<<< HEAD /obj/item/device/assembly/signaler ) content_overlays = TRUE +======= + /obj/item/assembly/signaler + )) + STR.can_hold = can_hold +>>>>>>> 4fca080... Merge pull request #37381 from DaxDupont/toolbelts /obj/item/storage/belt/utility/chief name = "\improper Chief Engineer's toolbelt" //"the Chief Engineer's toolbelt", because "Chief Engineer's toolbelt" is not a proper noun