From b255b1a8a381cd1c29bb66f8817a70b35e7762f7 Mon Sep 17 00:00:00 2001 From: Heroman Date: Mon, 2 Oct 2023 15:54:41 +1000 Subject: [PATCH] Fixes belts and pouches not being able to hold power tools --- code/game/objects/items/weapons/storage/belt.dm | 9 ++++++++- code/game/objects/items/weapons/storage/belt_vr.dm | 2 ++ code/game/objects/items/weapons/storage/pouches.dm | 10 ++++++---- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 760ea116ddd..1bac7d5ef59 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -54,6 +54,8 @@ /obj/item/weapon/weldingtool, /obj/item/weapon/tool/wirecutters, /obj/item/weapon/tool/wrench, + /obj/item/weapon/tool/transforming/powerdrill, + /obj/item/weapon/tool/transforming/jawsoflife, /obj/item/device/multitool, /obj/item/device/flashlight, /obj/item/weapon/cell/device, @@ -124,6 +126,8 @@ /obj/item/weapon/weldingtool, /obj/item/weapon/tool/wirecutters, /obj/item/weapon/tool/wrench, + /obj/item/weapon/tool/transforming/powerdrill, + /obj/item/weapon/tool/transforming/jawsoflife, /obj/item/device/multitool, /obj/item/device/flashlight, /obj/item/weapon/cell/device, @@ -169,11 +173,13 @@ storage_slots = 14 //twice the amount as a normal belt max_storage_space = ITEMSIZE_COST_NORMAL * 14 can_hold = list( - /obj/item/weapon/tool/crowbar, + /obj/item/weapon/tool/crowbar, /obj/item/weapon/tool/screwdriver, /obj/item/weapon/weldingtool, /obj/item/weapon/tool/wirecutters, /obj/item/weapon/tool/wrench, + /obj/item/weapon/tool/transforming/powerdrill, + /obj/item/weapon/tool/transforming/jawsoflife, /obj/item/device/multitool, /obj/item/device/flashlight, /obj/item/weapon/cell/device, @@ -507,6 +513,7 @@ /obj/item/weapon/anodevice, /obj/item/clothing/glasses, /obj/item/weapon/tool/wrench, + /obj/item/weapon/tool/transforming/powerdrill, /obj/item/weapon/storage/excavation, /obj/item/weapon/anobattery, /obj/item/device/ano_scanner, diff --git a/code/game/objects/items/weapons/storage/belt_vr.dm b/code/game/objects/items/weapons/storage/belt_vr.dm index 8321cfcbbb3..a9d78c13fb3 100644 --- a/code/game/objects/items/weapons/storage/belt_vr.dm +++ b/code/game/objects/items/weapons/storage/belt_vr.dm @@ -109,6 +109,7 @@ /obj/item/weapon/anodevice, /obj/item/weapon/tool/wrench, /obj/item/weapon/tool/screwdriver, + /obj/item/weapon/tool/transforming/powerdrill, /obj/item/weapon/storage/excavation, /obj/item/weapon/anobattery, /obj/item/weapon/reagent_containers/hypospray/autoinjector, @@ -147,6 +148,7 @@ /obj/item/weapon/clipboard, /obj/item/weapon/anodevice, /obj/item/weapon/tool/wrench, + /obj/item/weapon/tool/transforming/powerdrill, /obj/item/device/multitool, /obj/item/weapon/storage/excavation, /obj/item/weapon/anobattery, diff --git a/code/game/objects/items/weapons/storage/pouches.dm b/code/game/objects/items/weapons/storage/pouches.dm index fa3ee2fe91d..6eb775c2fee 100644 --- a/code/game/objects/items/weapons/storage/pouches.dm +++ b/code/game/objects/items/weapons/storage/pouches.dm @@ -76,6 +76,8 @@ /obj/item/weapon/weldingtool, /obj/item/weapon/tool/wirecutters, /obj/item/weapon/tool/wrench, + /obj/item/weapon/tool/transforming/powerdrill, + /obj/item/weapon/tool/transforming/jawsoflife, /obj/item/device/multitool, /obj/item/device/flashlight, /obj/item/weapon/cell/device, @@ -95,9 +97,9 @@ /obj/item/weapon/extinguisher/mini, /obj/item/weapon/tape_roll, /obj/item/device/integrated_electronics/wirer, - /obj/item/device/integrated_electronics/debugger, - /obj/item/weapon/shovel/spade, - /obj/item/stack/nanopaste, + /obj/item/device/integrated_electronics/debugger, + /obj/item/weapon/shovel/spade, + /obj/item/stack/nanopaste, /obj/item/device/geiger ) //Vorestation Add - make it the same as the tool-belt why was it not like this to start with wtf @@ -156,7 +158,7 @@ /obj/item/stack/nanopaste, /obj/item/taperoll/medical, /obj/item/weapon/storage/box/freezer, - /obj/item/clothing/mask/chewable/candy/lolli, + /obj/item/clothing/mask/chewable/candy/lolli, ) //Vorestation add - added a bunch of misc medical stuff max_storage_space = ITEMSIZE_COST_SMALL*3 //Vorestation Add - makes it slightly smaller since its a lot of stuff with pocket access remove_delay = 5 //Vorestation Add - .5 second delay, get the medical things faster because there is no reason to use this otherwise. still gotta stop moving to take things out.