From 52ee45859ac9e5e46ca9a04fe3776f41a0b9c650 Mon Sep 17 00:00:00 2001 From: Ren Erthilo Date: Sat, 21 Apr 2012 23:48:57 +0100 Subject: [PATCH] TG: - CE's locker spawns the hazard vest above the toolbox - CE's locker spawns with an industrial backpack at the bottom - Sec locker spawns with a sec backpack at the bottom - HoS locker spawns with the injectors lockbox above the flashbang box - HoS locker spawns with an armor vest at the bottom for the convenience of HoS' who want to play with regular armor. - Added this to the changelog, I used the old format because the new one is just too tedious to do by hand, sorry. Revision: r3062 Author: baloh.matevz --- .../objects/closets/secure/engineering.dm | 30 ++++++++------ code/game/objects/closets/secure/security.dm | 41 ++++++++++--------- 2 files changed, 39 insertions(+), 32 deletions(-) diff --git a/code/game/objects/closets/secure/engineering.dm b/code/game/objects/closets/secure/engineering.dm index 55a6d9d6909..7e0f4f4595f 100644 --- a/code/game/objects/closets/secure/engineering.dm +++ b/code/game/objects/closets/secure/engineering.dm @@ -12,25 +12,25 @@ New() ..() sleep(2) - new /obj/item/wardrobe/chief_engineer(src) - new /obj/item/blueprints(src) var/obj/item/weapon/storage/backpack/industrial/BPK = new /obj/item/weapon/storage/backpack/industrial(src) var/obj/item/weapon/storage/box/B = new(BPK) + new /obj/item/wardrobe/chief_engineer(src) + new /obj/item/blueprints(src) + new /obj/item/clothing/under/rank/chief_engineer(src) new /obj/item/weapon/pen(B) new /obj/item/device/pda/heads/ce(src) - new /obj/item/device/multitool(src) - new /obj/item/device/flash(src) new /obj/item/clothing/head/helmet/hardhat/white(src) new /obj/item/clothing/head/helmet/welding(src) + new /obj/item/clothing/gloves/yellow(src) + new /obj/item/clothing/shoes/brown(src) new /obj/item/weapon/storage/belt/utility/full(src) + new /obj/item/device/radio/headset/heads/ce(src) new /obj/item/weapon/storage/toolbox/mechanical(src) new /obj/item/clothing/suit/hazardvest(src) - new /obj/item/clothing/gloves/yellow(src) new /obj/item/clothing/mask/gas(src) + new /obj/item/device/multitool(src) + new /obj/item/device/flash(src) new /obj/item/clothing/glasses/meson(src) - new /obj/item/device/radio/headset/heads/ce(src) - new /obj/item/clothing/shoes/brown(src) - new /obj/item/clothing/under/rank/chief_engineer(src) return @@ -54,6 +54,9 @@ new /obj/item/weapon/storage/toolbox/electrical(src) new /obj/item/weapon/storage/toolbox/electrical(src) new /obj/item/weapon/storage/toolbox/electrical(src) + new /obj/item/weapon/module/power_control(src) + new /obj/item/weapon/module/power_control(src) + new /obj/item/weapon/module/power_control(src) new /obj/item/device/multitool(src) new /obj/item/device/multitool(src) new /obj/item/device/multitool(src) @@ -83,6 +86,8 @@ new /obj/item/weapon/weldingtool/largetank(src) return + + /obj/structure/closet/secure_closet/engineering_personal name = "Engineer's Locker" req_access = list(access_engine) @@ -93,6 +98,7 @@ icon_broken = "secureengbroken" icon_off = "secureengoff" + New() ..() sleep(2) @@ -100,18 +106,18 @@ // var/obj/item/weapon/storage/backpack/industrial/BPK = new /obj/item/weapon/storage/backpack/industrial(src) var/obj/item/weapon/storage/box/B = new(BPK) + new /obj/item/clothing/under/rank/engineer(src) + new /obj/item/clothing/shoes/orange(src) new /obj/item/weapon/pen(B) new /obj/item/device/pda/engineering(src) new /obj/item/device/t_scanner(src) - new /obj/item/clothing/suit/hazardvest(src) new /obj/item/weapon/storage/belt/utility/full(src) new /obj/item/weapon/storage/toolbox/mechanical(src) + new /obj/item/device/radio/headset/headset_eng(src) + new /obj/item/clothing/suit/hazardvest(src) new /obj/item/clothing/mask/gas(src) new /obj/item/clothing/head/helmet/hardhat(src) new /obj/item/clothing/glasses/meson(src) - new /obj/item/device/radio/headset/headset_eng(src) - new /obj/item/clothing/shoes/orange(src) - new /obj/item/clothing/under/rank/engineer(src) return /obj/structure/closet/secure_closet/atmos_personal diff --git a/code/game/objects/closets/secure/security.dm b/code/game/objects/closets/secure/security.dm index 5d41480fda6..967d9adaf39 100644 --- a/code/game/objects/closets/secure/security.dm +++ b/code/game/objects/closets/secure/security.dm @@ -15,14 +15,14 @@ // new /obj/item/device/pda/captain(src) new /obj/item/weapon/storage/id_kit(src) - new /obj/item/weapon/reagent_containers/food/drinks/flask(src) - new /obj/item/weapon/gun/energy/gun(src) + new /obj/item/clothing/suit/armor/captain(src) + new /obj/item/clothing/head/helmet/cap(src) new /obj/item/clothing/glasses/sunglasses(src) new /obj/item/clothing/suit/armor/vest(src) new /obj/item/clothing/head/helmet/swat(src) new /obj/item/device/radio/headset/heads/captain(src) - new /obj/item/clothing/suit/armor/captain(src) - new /obj/item/clothing/head/helmet/cap(src) + new /obj/item/weapon/reagent_containers/food/drinks/flask(src) + new /obj/item/weapon/gun/energy/gun(src) return @@ -45,12 +45,12 @@ var/obj/item/weapon/storage/backpack/BPK = new /obj/item/weapon/storage/backpack(src) var/obj/item/weapon/storage/box/B = new(BPK) new /obj/item/weapon/pen(B) - new /obj/item/device/flash(B) new /obj/item/device/pda/heads/hop(src) + new /obj/item/device/radio/headset/heads/hop(src) new /obj/item/weapon/storage/id_kit(src) new /obj/item/weapon/gun/energy/gun(src) + new /obj/item/device/flash(src) new /obj/item/clothing/glasses/sunglasses(src) - new /obj/item/device/radio/headset/heads/hop(src) return @@ -74,12 +74,12 @@ var/obj/item/weapon/storage/box/B = new(BPK) new /obj/item/weapon/pen(B) new /obj/item/device/flash(B) - new /obj/item/weapon/melee/baton(src) - new /obj/item/weapon/gun/energy/gun(src) new /obj/item/device/pda/heads/hos(src) new /obj/item/clothing/glasses/sunglasses/sechud(src) - new /obj/item/weapon/storage/lockbox/loyalty(src) new /obj/item/weapon/storage/flashbang_kit(src) + new /obj/item/weapon/storage/lockbox/loyalty(src) + new /obj/item/weapon/melee/baton(src) + new /obj/item/weapon/gun/energy/gun(src) return /obj/structure/closet/secure_closet/warden @@ -102,15 +102,17 @@ var/obj/item/weapon/storage/box/B = new(BPK) new /obj/item/weapon/pen(B) new /obj/item/device/flash(B) - new /obj/item/weapon/melee/baton(src) - new /obj/item/weapon/gun/energy/taser(src) new /obj/item/device/pda/security(src) new /obj/item/clothing/suit/armor/vest(src) - new /obj/item/clothing/glasses/sunglasses/sechud(src) new /obj/item/device/radio/headset/headset_sec(src) new /obj/item/weapon/storage/flashbang_kit(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 + + /obj/structure/closet/secure_closet/security name = "Security Locker" req_access = list(access_security) @@ -130,18 +132,18 @@ var/obj/item/weapon/storage/backpack/security/BPK = new /obj/item/weapon/storage/backpack/security(src) var/obj/item/weapon/storage/box/B = new(BPK) new /obj/item/weapon/pen(B) - new /obj/item/device/flash(B) - new /obj/item/weapon/pepperspray(src) - new /obj/item/weapon/melee/baton(src) new /obj/item/policetaperoll(src) - new /obj/item/weapon/flashbang(src) - new /obj/item/device/pda/security(src) new /obj/item/clothing/suit/armor/vest(src) new /obj/item/clothing/suit/storage/gearharness(src) - new /obj/item/clothing/glasses/sunglasses/sechud(src) - new /obj/item/weapon/storage/belt/security(src) new /obj/item/clothing/head/helmet(src) + new /obj/item/device/pda/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/melee/baton(src) + new /obj/item/clothing/glasses/sunglasses/sechud(src) return @@ -156,7 +158,6 @@ icon_broken = "cabinetdetective_broken" icon_off = "cabinetdetective_broken" - New() ..() sleep(2)