From 78b00162ae8b9cfdb98d58fea59cdcbaaa447c11 Mon Sep 17 00:00:00 2001 From: "baloh.matevz" Date: Sat, 18 Feb 2012 15:22:44 +0000 Subject: [PATCH] - Syndicate personal closets now spawn with a FULL high capacity cell - Added job-specific pda cartridges to the lockers of engineers, security officers, wardens, scientists, doctors, cargo techs, janitor and all 6 heads. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3142 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/closets/janitor.dm | 1 + code/game/objects/closets/secure/cargo.dm | 1 + code/game/objects/closets/secure/engineering.dm | 5 +++++ code/game/objects/closets/secure/medical.dm | 2 ++ code/game/objects/closets/secure/scientist.dm | 2 ++ code/game/objects/closets/secure/security.dm | 6 ++++++ code/game/objects/closets/syndicate.dm | 2 +- 7 files changed, 18 insertions(+), 1 deletion(-) diff --git a/code/game/objects/closets/janitor.dm b/code/game/objects/closets/janitor.dm index 8c9c170df72..dc9f05985bd 100644 --- a/code/game/objects/closets/janitor.dm +++ b/code/game/objects/closets/janitor.dm @@ -2,6 +2,7 @@ ..() sleep(2) new /obj/item/clothing/under/rank/janitor(src) + new /obj/item/weapon/cartridge/janitor(src) new /obj/item/device/flashlight(src) new /obj/item/clothing/shoes/galoshes(src) new /obj/item/weapon/caution(src) diff --git a/code/game/objects/closets/secure/cargo.dm b/code/game/objects/closets/secure/cargo.dm index e25f87be09c..d5f7ef8b521 100644 --- a/code/game/objects/closets/secure/cargo.dm +++ b/code/game/objects/closets/secure/cargo.dm @@ -17,4 +17,5 @@ new /obj/item/clothing/shoes/brown(src) new /obj/item/device/radio/headset/headset_cargo(src) new /obj/item/clothing/gloves/black(src) + new /obj/item/weapon/cartridge/quartermaster(src) return \ No newline at end of file diff --git a/code/game/objects/closets/secure/engineering.dm b/code/game/objects/closets/secure/engineering.dm index 11e17242258..4efba771d92 100644 --- a/code/game/objects/closets/secure/engineering.dm +++ b/code/game/objects/closets/secure/engineering.dm @@ -19,6 +19,7 @@ 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/cartridge/ce(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) @@ -48,6 +49,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) @@ -97,6 +101,7 @@ new /obj/item/clothing/under/rank/engineer(src) new /obj/item/clothing/shoes/orange(src) new /obj/item/weapon/storage/toolbox/mechanical(src) + new /obj/item/weapon/cartridge/engineering(src) new /obj/item/device/radio/headset/headset_eng(src) new /obj/item/clothing/suit/hazardvest(src) new /obj/item/clothing/mask/gas(src) diff --git a/code/game/objects/closets/secure/medical.dm b/code/game/objects/closets/secure/medical.dm index 1bf9f9bd9a0..d365d1c78f0 100644 --- a/code/game/objects/closets/secure/medical.dm +++ b/code/game/objects/closets/secure/medical.dm @@ -65,6 +65,7 @@ new /obj/item/clothing/under/rank/medical(src) new /obj/item/clothing/suit/labcoat(src) new /obj/item/clothing/shoes/white(src) + new /obj/item/weapon/cartridge/medical(src) new /obj/item/device/radio/headset/headset_med(src) new /obj/item/weapon/storage/belt/medical(src) return @@ -83,6 +84,7 @@ new /obj/item/clothing/head/bio_hood/general(src) new /obj/item/clothing/under/rank/chief_medical_officer(src) new /obj/item/clothing/suit/labcoat/cmo(src) + new /obj/item/weapon/cartridge/cmo(src) new /obj/item/clothing/gloves/latex(src) new /obj/item/clothing/shoes/brown (src) new /obj/item/device/radio/headset/heads/cmo(src) diff --git a/code/game/objects/closets/secure/scientist.dm b/code/game/objects/closets/secure/scientist.dm index 7e959155243..e77bb209c93 100644 --- a/code/game/objects/closets/secure/scientist.dm +++ b/code/game/objects/closets/secure/scientist.dm @@ -9,6 +9,7 @@ new /obj/item/clothing/under/rank/scientist(src) new /obj/item/clothing/suit/labcoat(src) new /obj/item/clothing/shoes/white(src) + new /obj/item/weapon/cartridge/signal/toxins(src) new /obj/item/device/radio/headset/headset_sci(src) new /obj/item/weapon/tank/air(src) new /obj/item/clothing/mask/gas(src) @@ -28,6 +29,7 @@ new /obj/item/clothing/head/bio_hood/scientist(src) new /obj/item/clothing/under/rank/research_director(src) new /obj/item/clothing/suit/labcoat(src) + new /obj/item/weapon/cartridge/rd(src) new /obj/item/clothing/shoes/white(src) new /obj/item/clothing/gloves/latex(src) new /obj/item/device/radio/headset/heads/rd(src) diff --git a/code/game/objects/closets/secure/security.dm b/code/game/objects/closets/secure/security.dm index d81a1794b65..50129e04aed 100644 --- a/code/game/objects/closets/secure/security.dm +++ b/code/game/objects/closets/secure/security.dm @@ -10,6 +10,7 @@ new /obj/item/clothing/head/helmet/cap(src) 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) @@ -31,6 +32,7 @@ new /obj/item/clothing/under/rank/head_of_personnel(src) new /obj/item/clothing/suit/armor/vest(src) new /obj/item/clothing/head/helmet(src) + new /obj/item/weapon/cartridge/hop(src) new /obj/item/device/radio/headset/heads/hop(src) new /obj/item/clothing/shoes/brown(src) new /obj/item/weapon/storage/id_kit(src) @@ -54,6 +56,7 @@ new /obj/item/clothing/under/jensen(src) new /obj/item/clothing/suit/armor/hos/jensen(src) new /obj/item/clothing/head/helmet/HoS/dermal(src) + new /obj/item/weapon/cartridge/hos(src) new /obj/item/device/radio/headset/heads/hos(src) new /obj/item/clothing/glasses/sunglasses/sechud(src) new /obj/item/weapon/shield/riot(src) @@ -84,6 +87,7 @@ new /obj/item/clothing/under/rank/warden(src) new /obj/item/clothing/suit/armor/vest(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/weapon/storage/flashbang_kit(src) new /obj/item/weapon/pepperspray(src) @@ -111,6 +115,7 @@ new /obj/item/weapon/storage/backpack/security(src) new /obj/item/clothing/suit/armor/vest(src) new /obj/item/clothing/head/helmet(src) + 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) @@ -143,6 +148,7 @@ new /obj/item/clothing/head/det_hat(src) new /obj/item/clothing/shoes/brown(src) new /obj/item/device/radio/headset/headset_sec(src) + new /obj/item/weapon/cartridge/detective(src) new /obj/item/weapon/storage/fcard_kit(src) new /obj/item/weapon/fcardholder(src) new /obj/item/weapon/clipboard(src) diff --git a/code/game/objects/closets/syndicate.dm b/code/game/objects/closets/syndicate.dm index b4871556872..23a5fd2ff0c 100644 --- a/code/game/objects/closets/syndicate.dm +++ b/code/game/objects/closets/syndicate.dm @@ -7,7 +7,7 @@ new /obj/item/clothing/head/helmet/space/syndicate(src) new /obj/item/clothing/suit/space/syndicate(src) new /obj/item/weapon/crowbar(src) - new /obj/item/weapon/cell(src) + new /obj/item/weapon/cell/high(src) new /obj/item/weapon/card/id/syndicate(src) new /obj/item/device/multitool(src) new /obj/item/weapon/shield/riot(src)