From d4e46182af08275fa3ae52ab45b9d90d77bcf9bf Mon Sep 17 00:00:00 2001 From: Techhead0 Date: Sat, 14 Mar 2015 14:38:30 -0400 Subject: [PATCH 1/3] More things in belts. I widened the selection of things you can put in various belts. Most notably, emergency gear in medical belts and botany gear in tool belts. --- .../objects/items/weapons/storage/belt.dm | 25 +++++++++++++------ .../xenoarchaeology/tools/gearbelt.dm | 4 ++- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index d5c1cd851f5..a44adb1832e 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -32,7 +32,11 @@ /obj/item/device/t_scanner, /obj/item/device/analyzer, /obj/item/taperoll/engineering, - /obj/item/device/robotanalyzer) + /obj/item/device/robotanalyzer, + /obj/item/weapon/minihoe, + /obj/item/weapon/hatchet, + /obj/item/weapon/extinguisher/mini + ) /obj/item/weapon/storage/belt/utility/full/New() @@ -75,9 +79,11 @@ /obj/item/stack/medical, /obj/item/device/flashlight/pen, /obj/item/clothing/mask/surgical, + /obj/item/clothing/head/surgery, /obj/item/clothing/gloves/latex, - /obj/item/weapon/reagent_containers/hypospray - ) + /obj/item/weapon/reagent_containers/hypospray, + /obj/item/clothing/glasses/hud/health + ) /obj/item/weapon/storage/belt/medical/emt name = "EMT utility belt" @@ -85,6 +91,11 @@ icon = 'icons/obj/custom_items.dmi' icon_state = "emsbelt" item_state = "emsbelt" + can_hold = list( + /obj/item/weapon/crowbar, + /obj/item/device/flashlight, + /obj/item/weapon/extinguisher/mini + ) /obj/item/weapon/storage/belt/security @@ -100,18 +111,18 @@ /obj/item/weapon/reagent_containers/spray/pepper, /obj/item/weapon/handcuffs, /obj/item/device/flash, - /obj/item/clothing/glasses, + /obj/item/clothing/glasses/sunglasses, /obj/item/ammo_casing/shotgun, /obj/item/ammo_magazine, - /obj/item/weapon/reagent_containers/food/snacks/donut/normal, - /obj/item/weapon/reagent_containers/food/snacks/donut/jelly, + /obj/item/weapon/reagent_containers/food/snacks/donut/, /obj/item/weapon/melee/baton, /obj/item/weapon/gun/energy/taser, - /obj/item/weapon/flame/lighter/zippo, + /obj/item/weapon/flame/lighter, /obj/item/clothing/glasses/hud/security, /obj/item/device/flashlight, /obj/item/device/pda, /obj/item/device/radio/headset, + /obj/item/device/hailer, /obj/item/weapon/melee, /obj/item/weapon/gun/projectile/sec, /obj/item/taperoll/police diff --git a/code/modules/research/xenoarchaeology/tools/gearbelt.dm b/code/modules/research/xenoarchaeology/tools/gearbelt.dm index 02a3e93abd9..b51a9e69aba 100644 --- a/code/modules/research/xenoarchaeology/tools/gearbelt.dm +++ b/code/modules/research/xenoarchaeology/tools/gearbelt.dm @@ -25,4 +25,6 @@ /obj/item/clothing/glasses, /obj/item/weapon/wrench, /obj/item/weapon/storage/box/excavation, - /obj/item/weapon/anobattery) + /obj/item/weapon/anobattery + /obj/item/device/ano_scanner + ) From 10c81f8d22346b8ca6ff8f76d0e6d132c4da7dd8 Mon Sep 17 00:00:00 2001 From: Techhead0 Date: Sat, 14 Mar 2015 15:04:09 -0400 Subject: [PATCH 2/3] Forgot a comma. --- code/modules/research/xenoarchaeology/tools/gearbelt.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/xenoarchaeology/tools/gearbelt.dm b/code/modules/research/xenoarchaeology/tools/gearbelt.dm index b51a9e69aba..d12446382ba 100644 --- a/code/modules/research/xenoarchaeology/tools/gearbelt.dm +++ b/code/modules/research/xenoarchaeology/tools/gearbelt.dm @@ -25,6 +25,6 @@ /obj/item/clothing/glasses, /obj/item/weapon/wrench, /obj/item/weapon/storage/box/excavation, - /obj/item/weapon/anobattery + /obj/item/weapon/anobattery, /obj/item/device/ano_scanner ) From 020e1e4c60103ad2df26c37b261b51812d88e15f Mon Sep 17 00:00:00 2001 From: Techhead0 Date: Sat, 14 Mar 2015 15:52:29 -0400 Subject: [PATCH 3/3] Tweaks. Regeneralizes sunglasses. Adds plant analyzer and megaphone. Puts EMT gear under general medical. --- code/game/objects/items/weapons/storage/belt.dm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index a44adb1832e..47821d6a244 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -35,6 +35,7 @@ /obj/item/device/robotanalyzer, /obj/item/weapon/minihoe, /obj/item/weapon/hatchet, + /obj/item/device/analyzer/plant_analyzer, /obj/item/weapon/extinguisher/mini ) @@ -82,7 +83,10 @@ /obj/item/clothing/head/surgery, /obj/item/clothing/gloves/latex, /obj/item/weapon/reagent_containers/hypospray, - /obj/item/clothing/glasses/hud/health + /obj/item/clothing/glasses/hud/health, + /obj/item/weapon/crowbar, + /obj/item/device/flashlight, + /obj/item/weapon/extinguisher/mini ) /obj/item/weapon/storage/belt/medical/emt @@ -91,11 +95,7 @@ icon = 'icons/obj/custom_items.dmi' icon_state = "emsbelt" item_state = "emsbelt" - can_hold = list( - /obj/item/weapon/crowbar, - /obj/item/device/flashlight, - /obj/item/weapon/extinguisher/mini - ) + /obj/item/weapon/storage/belt/security @@ -111,7 +111,7 @@ /obj/item/weapon/reagent_containers/spray/pepper, /obj/item/weapon/handcuffs, /obj/item/device/flash, - /obj/item/clothing/glasses/sunglasses, + /obj/item/clothing/glasses, /obj/item/ammo_casing/shotgun, /obj/item/ammo_magazine, /obj/item/weapon/reagent_containers/food/snacks/donut/, @@ -123,6 +123,7 @@ /obj/item/device/pda, /obj/item/device/radio/headset, /obj/item/device/hailer, + /obj/item/device/megaphone, /obj/item/weapon/melee, /obj/item/weapon/gun/projectile/sec, /obj/item/taperoll/police