From 04c51f5ac2a031238733f382d2fdd4bbd14d3c74 Mon Sep 17 00:00:00 2001 From: "ericgfwong@hotmail.com" Date: Tue, 15 May 2012 05:24:29 +0000 Subject: [PATCH] -Added security backpacks in Warden and HoS lockers -Added spare Warden's jacket in his locker -Some re-sorting of items in security lockers for convenience -Removed leather gloves from hydro lockers git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3598 316c924e-a436-60f5-8080-3fe189b3f50e --- .../objects/closets/secure/hydroponics.dm | 3 +-- code/game/objects/closets/secure/security.dm | 21 +++++++++++-------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/code/game/objects/closets/secure/hydroponics.dm b/code/game/objects/closets/secure/hydroponics.dm index 0e5ee590972..e682e6a98d1 100644 --- a/code/game/objects/closets/secure/hydroponics.dm +++ b/code/game/objects/closets/secure/hydroponics.dm @@ -15,9 +15,8 @@ new /obj/item/weapon/plantbag(src) new /obj/item/clothing/under/rank/hydroponics(src) new /obj/item/clothing/suit/apron(src) - new /obj/item/clothing/head/helmet/greenbandana(src) new /obj/item/device/analyzer/plant_analyzer(src) + new /obj/item/clothing/head/helmet/greenbandana(src) new /obj/item/weapon/minihoe(src) new /obj/item/weapon/hatchet(src) - new /obj/item/clothing/gloves/botanic_leather(src) return \ No newline at end of file diff --git a/code/game/objects/closets/secure/security.dm b/code/game/objects/closets/secure/security.dm index 521e8370f56..15de53300eb 100644 --- a/code/game/objects/closets/secure/security.dm +++ b/code/game/objects/closets/secure/security.dm @@ -16,11 +16,11 @@ new /obj/item/clothing/under/rank/captain(src) new /obj/item/clothing/suit/armor/vest(src) new /obj/item/weapon/cartridge/captain(src) - new /obj/item/clothing/gloves/captain(src) new /obj/item/clothing/head/helmet/swat(src) new /obj/item/clothing/shoes/brown(src) new /obj/item/device/radio/headset/heads/captain(src) new /obj/item/weapon/reagent_containers/food/drinks/flask(src) + new /obj/item/clothing/gloves/captain(src) new /obj/item/weapon/gun/energy/gun(src) return @@ -62,6 +62,7 @@ New() ..() sleep(2) + new /obj/item/weapon/storage/backpack/security(src) new /obj/item/clothing/suit/armor/vest(src) new /obj/item/clothing/under/jensen(src) new /obj/item/clothing/suit/armor/hos/jensen(src) @@ -70,12 +71,12 @@ new /obj/item/device/radio/headset/heads/hos(src) new /obj/item/clothing/glasses/sunglasses/sechud(src) new /obj/item/weapon/shield/riot(src) - new /obj/item/weapon/storage/flashbang_kit(src) new /obj/item/weapon/storage/lockbox/loyalty(src) + new /obj/item/weapon/storage/flashbang_kit(src) + new /obj/item/weapon/storage/belt/security(src) + new /obj/item/device/flash(src) new /obj/item/weapon/melee/baton(src) new /obj/item/weapon/gun/energy/gun(src) - new /obj/item/device/flash(src) - new /obj/item/weapon/storage/belt/security(src) return @@ -94,17 +95,19 @@ New() ..() sleep(2) - new /obj/item/clothing/under/rank/warden(src) + new /obj/item/weapon/storage/backpack/security(src) new /obj/item/clothing/suit/armor/vest(src) + new /obj/item/clothing/under/rank/warden(src) + new /obj/item/clothing/suit/armor/vest/warden(src) new /obj/item/clothing/head/helmet/warden(src) new /obj/item/weapon/cartridge/security(src) new /obj/item/device/radio/headset/headset_sec(src) + new /obj/item/clothing/glasses/sunglasses/sechud(src) new /obj/item/weapon/storage/flashbang_kit(src) - new /obj/item/weapon/pepperspray(src) new /obj/item/weapon/storage/belt/security(src) + new /obj/item/weapon/pepperspray(src) new /obj/item/weapon/melee/baton(src) new /obj/item/weapon/gun/energy/taser(src) - new /obj/item/clothing/glasses/sunglasses/sechud(src) return @@ -128,9 +131,9 @@ new /obj/item/weapon/cartridge/security(src) new /obj/item/device/radio/headset/headset_sec(src) new /obj/item/weapon/storage/belt/security(src) - new /obj/item/weapon/flashbang(src) - new /obj/item/weapon/pepperspray(src) new /obj/item/device/flash(src) + new /obj/item/weapon/pepperspray(src) + new /obj/item/weapon/flashbang(src) new /obj/item/weapon/melee/baton(src) new /obj/item/weapon/gun/energy/taser(src) new /obj/item/clothing/glasses/sunglasses/sechud(src)