You can now interact with belts that are not on your belt slot.

Added Security Belts, 4 slot belt that can carry basic sec gear.
The security shuttle control can now be emag'd.
Removed the old take off and stabilize verbs for the pshuttle. 
Cleaned up some computer defines.
The detective's cabinet is now a secure cabinet.
Most of the secure closets cleaned up a bit.
The captain no longer spawns with an ID box in his backpack.
RD's locker got its flash back.
Added the blob node sprites.
Removed the 2% laser resist that normal jumpsuits gave.  Normal clothing should not be blocking lasers.  Left the 10% special block on each department.
Riot suit slowdown lowered to 1 from 2.5
Repiped the right side of sec and tidied up the powerlines.
Loyalty Implanter moved into the outer rec room checkpoint.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2277 316c924e-a436-60f5-8080-3fe189b3f50e

code/game/objects/closets/firecloset.dm

@@ -58,7 +58,7 @@
 	if(prob(70))
 		new /obj/item/device/t_scanner(src)
 	if(prob(20))
-		new /obj/item/weapon/storage/utilitybelt(src)
+		new /obj/item/weapon/storage/belt/utility(src)
 	if(prob(30))
 		new /obj/item/weapon/cable_coil(src)
 	if(prob(30))

code/game/objects/closets/gimmick.dm

@@ -1,7 +1,3 @@
-/obj/closet/gimmick/New()
-	..()
-	sleep(2)
-
 /obj/closet/gimmick/russian/New()
 	..()
 	sleep(2)

code/game/objects/closets/secure/animal.dm

@@ -1,10 +0,0 @@
-/obj/secure_closet/animal/New()
-	..()
-	sleep(2)
-	new /obj/item/device/radio/signaler( src )
-	new /obj/item/device/radio/electropack( src )
-	new /obj/item/device/radio/electropack( src )
-	new /obj/item/device/radio/electropack( src )
-	new /obj/item/device/radio/electropack( src )
-	new /obj/item/device/radio/electropack( src )
-	return

code/game/objects/closets/secure/bar.dm

@@ -1,14 +1,19 @@
-/obj/secure_closet/bar/New()
-	..()
-	sleep(2)
-	new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
-	new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
-	new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
-	new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
-	new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
-	new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
-	new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
-	new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
-	new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
-	new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
-	return
+/obj/secure_closet/bar
+	name = "Booze"
+	req_access = list(access_bar)
+
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/beer( src )
+		return

code/game/objects/closets/secure/brig.dm

@@ -1,6 +0,0 @@
-/obj/secure_closet/brig/New()
-	new /obj/item/clothing/under/color/orange( src )
-	new /obj/item/clothing/under/color/orange( src )
-	new /obj/item/clothing/shoes/orange( src )
-	new /obj/item/clothing/shoes/orange( src )
-	return

code/game/objects/closets/secure/captain.dm

@@ -1,16 +0,0 @@
-/obj/secure_closet/captains/New()
-	..()
-	sleep(2)
-	new /obj/item/weapon/reagent_containers/food/drinks/flask(src)
-	new /obj/item/device/radio/headset/heads/captain( src )
-	new /obj/item/weapon/gun/energy( src )
-	new /obj/item/weapon/storage/id_kit( src )
-	new /obj/item/clothing/under/rank/captain( src )
-	new /obj/item/clothing/shoes/brown( 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/clothing/suit/captunic( src )
-	new /obj/item/clothing/head/helmet/cap( src )
-	new /obj/item/clothing/gloves/captain( src )
-	return

code/game/objects/closets/secure/chemlocker.dm

@@ -1,6 +0,0 @@
-/obj/secure_closet/chemtoxin/New()
-	..()
-	sleep(2)
-	new /obj/item/weapon/storage/pillbottlebox(src)
-	new /obj/item/weapon/storage/pillbottlebox(src)
-	return

code/game/objects/closets/secure/courtroom.dm

@@ -1,15 +0,0 @@
-/obj/secure_closet/courtroom/New()
-	..()
-	sleep(2)
-	new /obj/item/clothing/shoes/brown(src)
-	new /obj/item/weapon/paper/Court (src)
-	new /obj/item/weapon/paper/Court (src)
-	new /obj/item/weapon/paper/Court (src)
-	new /obj/item/weapon/pen (src)
-	new /obj/item/clothing/suit/judgerobe (src)
-	new /obj/item/clothing/head/powdered_wig (src)
-	new /obj/item/clothing/under/lawyer/red(src)
-	new /obj/item/clothing/under/lawyer/blue(src)
-	new /obj/item/clothing/under/lawyer/black(src)
-	new /obj/item/weapon/storage/briefcase(src)
-	return

code/game/objects/closets/secure/engineering.dm

@@ -1,59 +1,78 @@
-/obj/secure_closet/engineering_chief/New()
-	..()
-	sleep(2)
-	new /obj/item/blueprints( src )
-	new /obj/item/device/radio/headset/heads/ce( src )
-	new /obj/item/clothing/under/rank/chief_engineer( src )
-	new /obj/item/clothing/gloves/yellow( src )
-	new /obj/item/clothing/shoes/brown( src )
-	new /obj/item/weapon/storage/toolbox/mechanical( src )
-	//new /obj/item/clothing/shoes/magboots( src ) Moved to RIG suit rack --errorage
-	//new /obj/item/clothing/ears/earmuffs( src ) useless --errorage
-	//new /obj/item/clothing/glasses/meson( src ) Moved to his desk --errorage
-	//new /obj/item/clothing/suit/fire/firefighter( src )
-	new /obj/item/clothing/suit/hazardvest( src )
-	new /obj/item/clothing/mask/gas( src )
-	new /obj/item/clothing/head/helmet/welding( src )
-	new /obj/item/clothing/head/helmet/hardhat/white( src )
-	new /obj/item/device/multitool( src )
-	new /obj/item/device/flash( src )
-	return
+/obj/secure_closet/engineering_chief
+	name = "Chief Engineer's Locker"
+	req_access = list(access_ce)
 
-/obj/secure_closet/engineering_electrical/New()
-	..()
-	sleep(2)
-	new /obj/item/clothing/gloves/yellow( src )
-	new /obj/item/clothing/gloves/yellow( src )
-	//new /obj/item/clothing/gloves/yellow( src ) --Part of DangerCon 2011, approved by Urist_McDorf, --Errorage
-	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/device/multitool( src )
-	new /obj/item/device/multitool( src )
-	new /obj/item/device/multitool( src )
-	return
 
-/obj/secure_closet/engineering_welding/New()
-	..()
-	sleep(2)
-	new /obj/item/clothing/head/helmet/welding( src )
-	new /obj/item/clothing/head/helmet/welding( src )
-	new /obj/item/clothing/head/helmet/welding( src )
-	new /obj/item/weapon/weldingtool/largetank( src )
-	new /obj/item/weapon/weldingtool/largetank( src )
-	new /obj/item/weapon/weldingtool/largetank( src )
-	return
+	New()
+		..()
+		sleep(2)
+		new /obj/item/blueprints(src)
+		new /obj/item/clothing/under/rank/chief_engineer(src)
+		new /obj/item/clothing/suit/hazardvest(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/device/radio/headset/heads/ce(src)
+		new /obj/item/weapon/storage/toolbox/mechanical(src)
+		new /obj/item/clothing/mask/gas(src)
+		new /obj/item/device/multitool(src)
+		new /obj/item/device/flash(src)
+		return
 
-/obj/secure_closet/engineering_personal/New()
-	..()
-	sleep(2)
-	new /obj/item/weapon/storage/toolbox/mechanical( src )
-	new /obj/item/device/radio/headset/headset_eng( src )
-	new /obj/item/clothing/under/rank/engineer( src )
-	new /obj/item/clothing/shoes/orange( src )
-	new /obj/item/clothing/suit/hazardvest( src )
-	new /obj/item/clothing/mask/gas( src )
-	//new /obj/item/clothing/head/helmet/hardhat( src ) engineers now spawn with them --Errorage
-	//new /obj/item/clothing/ears/earmuffs( src ) useless --Errorage
-	new /obj/item/clothing/glasses/meson( src )
-	return
+
+
+/obj/secure_closet/engineering_electrical
+	name = "Electrical Supplies"
+	req_access = list(access_engine)
+
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/gloves/yellow(src)
+		new /obj/item/clothing/gloves/yellow(src)
+		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/device/multitool(src)
+		new /obj/item/device/multitool(src)
+		new /obj/item/device/multitool(src)
+		return
+
+
+
+/obj/secure_closet/engineering_welding
+	name = "Welding Supplies"
+	req_access = list(access_engine)
+
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/head/helmet/welding(src)
+		new /obj/item/clothing/head/helmet/welding(src)
+		new /obj/item/clothing/head/helmet/welding(src)
+		new /obj/item/weapon/weldingtool/largetank(src)
+		new /obj/item/weapon/weldingtool/largetank(src)
+		new /obj/item/weapon/weldingtool/largetank(src)
+		return
+
+
+
+/obj/secure_closet/engineering_personal
+	name = "Engineer's Locker"
+	req_access = list(access_engine)
+
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/under/rank/engineer(src)
+		new /obj/item/clothing/suit/hazardvest(src)
+		new /obj/item/clothing/shoes/orange(src)
+		new /obj/item/device/radio/headset/headset_eng(src)
+		new /obj/item/weapon/storage/toolbox/mechanical(src)
+		new /obj/item/clothing/mask/gas(src)
+		new /obj/item/clothing/glasses/meson(src)
+		return

code/game/objects/closets/secure/medical.dm

@@ -1,61 +1,126 @@
-/obj/secure_closet/medical1/New()
-	..()
-	sleep(2)
-	//new /obj/item/weapon/storage/gl_kit( src )
-	//new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin( src )
-	new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin( src )
-	new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin( src )
-	//new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline( src )
-	new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline( src )
-	new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline( src )
-	//new /obj/item/weapon/reagent_containers/glass/bottle/stoxin( src )
-	//new /obj/item/weapon/reagent_containers/glass/bottle/stoxin( src )
-	//new /obj/item/weapon/reagent_containers/glass/bottle/toxin( src )
-	new /obj/item/weapon/storage/syringes( src )
-	new /obj/item/weapon/reagent_containers/dropper( src )
-	new /obj/item/weapon/reagent_containers/dropper( src )
-	new /obj/item/weapon/reagent_containers/glass/beaker( src )
-	new /obj/item/weapon/reagent_containers/glass/beaker( src )
-	return
+/obj/secure_closet/medical1
+	name = "Medicine Closet"
+	desc = "Filled with medical junk."
+	icon_state = "medical1"
+	icon_closed = "medical"
+	icon_locked = "medical1"
+	icon_opened = "medicalopen"
+	icon_broken = "medicalbroken"
+	icon_off = "medical1"
+	req_access = list(access_medical)
 
-/obj/secure_closet/medical2/New()
-	..()
-	sleep(2)
-	new /obj/item/weapon/tank/anesthetic( src )
-	new /obj/item/weapon/tank/anesthetic( src )
-	new /obj/item/weapon/tank/anesthetic( src )
-	new /obj/item/clothing/mask/medical( src )
-	new /obj/item/clothing/mask/medical( src )
-	new /obj/item/clothing/mask/medical( src )
-	return
 
-/obj/secure_closet/medical3/New()
-	..()
-	sleep(2)
-	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/storage/backpack/medic( src )
-	new /obj/item/clothing/mask/breath( src )
-	new /obj/item/weapon/cartridge/medical( src )
-	new /obj/item/device/radio/headset/headset_med( src )
-	new /obj/item/weapon/storage/utilitybelt/medical( src )
-	new /obj/item/clothing/under/rank/nursesuit ( src )
-	new /obj/item/clothing/head/nursehat ( src )
-	return
+	New()
+		..()
+		sleep(2)
+		new /obj/item/weapon/storage/syringes(src)
+		new /obj/item/weapon/reagent_containers/dropper(src)
+		new /obj/item/weapon/reagent_containers/dropper(src)
+		new /obj/item/weapon/reagent_containers/glass/beaker(src)
+		new /obj/item/weapon/reagent_containers/glass/beaker(src)
+		new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src)
+		new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src)
+		new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src)
+		new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src)
+		return
 
-/obj/secure_closet/CMO/New()
-	..()
-	sleep(2)
-	new /obj/item/clothing/suit/labcoat/cmo( src )
-	new /obj/item/clothing/under/rank/chief_medical_officer( src )
-	new /obj/item/clothing/suit/bio_suit/cmo( src )
-	new /obj/item/clothing/shoes/brown	( src )
-	new /obj/item/clothing/gloves/latex( src )
-	new /obj/item/clothing/head/bio_hood/general( src )
-	new /obj/item/clothing/suit/labcoat(src)
-	new /obj/item/clothing/mask/gas( src )
-	new /obj/item/device/radio/headset/heads/cmo( src )
-	new /obj/item/clothing/under/rank/nursesuit ( src )
-	new /obj/item/clothing/head/nursehat ( src )
-	return
+
+
+/obj/secure_closet/medical2
+	name = "Anesthetic"
+	desc = "Used to knock people out."
+	icon_state = "medical1"
+	icon_closed = "medical"
+	icon_locked = "medical1"
+	icon_opened = "medicalopen"
+	icon_broken = "medicalbroken"
+	icon_off = "medical1"
+	req_access = list(access_medical)
+
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/weapon/tank/anesthetic(src)
+		new /obj/item/weapon/tank/anesthetic(src)
+		new /obj/item/weapon/tank/anesthetic(src)
+		new /obj/item/clothing/mask/medical(src)
+		new /obj/item/clothing/mask/medical(src)
+		new /obj/item/clothing/mask/medical(src)
+		return
+
+
+
+/obj/secure_closet/medical3
+	name = "Medical Doctor's Locker"
+	req_access = list(access_medical)
+
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/weapon/storage/backpack/medic(src)
+		new /obj/item/clothing/under/rank/nursesuit (src)
+		new /obj/item/clothing/head/nursehat (src)
+		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/device/radio/headset/headset_med(src)
+		new /obj/item/weapon/storage/belt/medical(src)
+		return
+
+
+
+/obj/secure_closet/CMO
+	name = "Chief Medical Officer"
+	req_access = list(access_cmo)
+
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/suit/bio_suit/cmo(src)
+		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/clothing/gloves/latex(src)
+		new /obj/item/clothing/shoes/brown	(src)
+		new /obj/item/device/radio/headset/heads/cmo(src)
+		return
+
+
+
+/obj/secure_closet/animal
+	name = "Animal Control"
+	req_access = list(access_medical)
+
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/device/radio/signaler(src)
+		new /obj/item/device/radio/electropack(src)
+		new /obj/item/device/radio/electropack(src)
+		new /obj/item/device/radio/electropack(src)
+		return
+
+
+
+/obj/secure_closet/chemical
+	name = "Chemical Closet"
+	desc = "Store dangerous chemicals in here."
+	icon_state = "medical1"
+	icon_closed = "medical"
+	icon_locked = "medical1"
+	icon_opened = "medicalopen"
+	icon_broken = "medicalbroken"
+	icon_off = "medical1"
+	req_access = list(access_medical)
+
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/weapon/storage/pillbottlebox(src)
+		new /obj/item/weapon/storage/pillbottlebox(src)
+		return

code/game/objects/closets/secure/scientist.dm

@@ -1,27 +1,37 @@
-/obj/secure_closet/scientist/New()
-	..()
-	sleep(2)
-	new /obj/item/device/radio/headset/headset_sci( src )
-	new /obj/item/weapon/tank/air( src )
-	new /obj/item/clothing/mask/gas( src )
-	new /obj/item/clothing/suit/bio_suit/general( src )
-	new /obj/item/clothing/under/rank/scientist( src )
-	new /obj/item/clothing/shoes/white( src )
-	new /obj/item/clothing/gloves/latex( src )
-	new /obj/item/clothing/head/bio_hood/general( src )
-	new /obj/item/clothing/suit/labcoat(src)
-	return
+/obj/secure_closet/scientist
+	name = "Scientist Locker"
+	req_access = list(access_tox_storage)
 
-/obj/secure_closet/RD/New()
-	..()
-	sleep(2)
-	new /obj/item/device/radio/headset/heads/rd( src )
-	new /obj/item/clothing/under/rank/research_director( src )
-	new /obj/item/weapon/tank/air( src )
-	new /obj/item/clothing/mask/gas( src )
-	new /obj/item/clothing/suit/bio_suit/scientist( src )
-	new /obj/item/clothing/shoes/white( src )
-	new /obj/item/clothing/gloves/latex( src )
-	new /obj/item/clothing/head/bio_hood/scientist( src )
-	new /obj/item/clothing/suit/labcoat(src)
-	return
+
+	New()
+		..()
+		sleep(2)
+		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/device/radio/headset/headset_sci(src)
+		new /obj/item/weapon/tank/air(src)
+		new /obj/item/clothing/mask/gas(src)
+		return
+
+
+
+/obj/secure_closet/RD
+	name = "Research Director"
+	req_access = list(access_rd)
+
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/suit/bio_suit/scientist(src)
+		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/clothing/shoes/white(src)
+		new /obj/item/clothing/gloves/latex(src)
+		new /obj/item/device/radio/headset/heads/rd(src)
+		new /obj/item/weapon/tank/air(src)
+		new /obj/item/clothing/mask/gas(src)
+		new /obj/item/device/flash(src)
+		return

code/game/objects/closets/secure/security.dm

@@ -1,73 +1,181 @@
-/obj/secure_closet/security1/New()
-	..()
-	sleep(2)
-	new /obj/item/device/radio/headset/headset_sec(src)
-	new /obj/item/weapon/flashbang(src)
-	new /obj/item/weapon/handcuffs(src)
-	new /obj/item/weapon/gun/energy/taser(src)
-	new /obj/item/device/flash(src)
-	new /obj/item/clothing/suit/armor/vest(src)
-	new /obj/item/clothing/head/helmet(src)
-	new /obj/item/clothing/glasses/sunglasses/sechud(src)
-	new /obj/item/weapon/melee/baton(src)
-	return
-
-/obj/secure_closet/security1/proc/prison_break()
-	src.locked = 0
-	src.icon_state = src.icon_closed
+/obj/secure_closet/captains
+	name = "Captain's Closet"
+	req_access = list(access_captain)
 
 
-/obj/secure_closet/security2/New()
-	..()
-	sleep(2)
-	new /obj/item/device/radio/headset/headset_sec(src)
-	new /obj/item/clothing/under/det( src )
-	new /obj/item/clothing/shoes/brown( src )
-	new /obj/item/clothing/head/det_hat( src )
-	new /obj/item/clothing/suit/det_suit( src )
-	new /obj/item/clothing/suit/det_suit/armor( src )
-	new /obj/item/weapon/storage/fcard_kit( src )
-	new /obj/item/clothing/gloves/black( src )
-	new /obj/item/weapon/storage/lglo_kit( src )
-	new /obj/item/weapon/fcardholder( src )
-	new /obj/item/weapon/clipboard( src )
-	new /obj/item/device/detective_scanner( src )
-	return
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/suit/captunic( src )
+		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/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/weapon/gun/energy( src )
+		return
 
-/obj/secure_closet/highsec/New()
-	..()
-	sleep(2)
-	new /obj/item/device/radio/headset/heads/hop( src )
-	new /obj/item/weapon/gun/energy( src )
-	new /obj/item/device/flash( src )
-	new /obj/item/weapon/storage/id_kit( src )
-	new /obj/item/clothing/under/rank/head_of_personnel( src )
-	new /obj/item/clothing/shoes/brown( src )
-	new /obj/item/clothing/glasses/sunglasses( src )
-	new /obj/item/clothing/suit/armor/vest( src )
-	new /obj/item/clothing/head/helmet( src )
-	return
 
-/obj/secure_closet/hos/New()
-	..()
-	sleep(2)
-	new /obj/item/device/radio/headset/heads/hos(src)
-	new /obj/item/weapon/shield/riot(src)
-	new /obj/item/weapon/gun/energy( src )
-	new /obj/item/device/flash( src )
-	new /obj/item/clothing/under/rank/head_of_security( src )
-	new /obj/item/clothing/shoes/brown( src )
-	new /obj/item/clothing/glasses/sunglasses/sechud( src )
-	new /obj/item/clothing/suit/armor/hos( src )
-	new /obj/item/clothing/head/helmet( src )
-	new /obj/item/weapon/storage/flashbang_kit(src)
-	new /obj/item/weapon/handcuffs(src)
-	new /obj/item/weapon/melee/baton(src)
-	return
 
-/obj/secure_closet/injection/New()
-	..()
-	sleep(2)
-	new /obj/item/weapon/reagent_containers/ld50_syringe/choral ( src )
-	new /obj/item/weapon/reagent_containers/ld50_syringe/choral ( src )
-	return
+/obj/secure_closet/hop
+	name = "Head of Personnel"
+	req_access = list(access_hop)
+
+
+	New()
+		..()
+		sleep(2)
+		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/device/radio/headset/heads/hop(src)
+		new /obj/item/clothing/shoes/brown(src)
+		new /obj/item/weapon/storage/id_kit(src)
+		new /obj/item/weapon/storage/id_kit( src )
+		new /obj/item/weapon/gun/energy(src)
+		new /obj/item/device/flash(src)
+		new /obj/item/clothing/glasses/sunglasses(src)
+		return
+
+
+
+/obj/secure_closet/hos
+	name = "Head Of Security"
+	req_access = list(access_hos)
+
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/under/rank/head_of_security(src)
+		new /obj/item/clothing/suit/armor/hos(src)
+		new /obj/item/clothing/head/helmet(src)
+		new /obj/item/device/radio/headset/heads/hos(src)
+		new /obj/item/weapon/shield/riot(src)
+		new /obj/item/weapon/gun/energy(src)
+		new /obj/item/device/flash(src)
+		new /obj/item/clothing/glasses/sunglasses/sechud(src)
+		new /obj/item/weapon/storage/flashbang_kit(src)
+		new /obj/item/weapon/melee/baton(src)
+		return
+
+
+
+/obj/secure_closet/warden
+	name = "Warden's Locker"
+	req_access = list(access_armory)
+
+
+	New()
+		..()
+		sleep(2)
+		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/device/radio/headset/headset_sec(src)
+		new /obj/item/weapon/storage/belt/security(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/secure_closet/security
+	name = "Security Locker"
+	req_access = list(access_security)
+
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/suit/armor/vest(src)
+		new /obj/item/clothing/head/helmet(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/device/flash(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/secure_closet/detective
+	name = "Detective"
+	req_access = list(access_forensics_lockers)
+	icon_state = "cabinetdetective"
+	icon_closed = "cabinetdetective"
+	icon_locked = "cabinetdetective_locked"
+	icon_opened = "cabinetdetective_open"
+	icon_broken = "cabinetdetective_broken"
+	icon_off = "cabinetdetective_broken"
+
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/under/det(src)
+		new /obj/item/clothing/suit/det_suit/armor(src)
+		new /obj/item/clothing/suit/det_suit(src)
+		new /obj/item/clothing/gloves/black(src)
+		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/storage/fcard_kit(src)
+		new /obj/item/weapon/fcardholder(src)
+		new /obj/item/weapon/clipboard(src)
+		new /obj/item/device/detective_scanner(src)
+		return
+
+
+
+/obj/secure_closet/injection
+	name = "Lethal Injections"
+	req_access = list(access_hos)
+
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/weapon/reagent_containers/ld50_syringe/choral(src)
+		new /obj/item/weapon/reagent_containers/ld50_syringe/choral(src)
+		return
+
+
+
+/obj/secure_closet/brig
+	name = "Brig Locker"
+	req_access = list(access_brig)
+	var/id = null
+
+	New()
+		new /obj/item/clothing/under/color/orange( src )
+		new /obj/item/clothing/under/color/orange( src )
+		new /obj/item/clothing/shoes/orange( src )
+		new /obj/item/clothing/shoes/orange( src )
+		return
+
+
+
+/obj/secure_closet/courtroom
+	name = "Courtroom Locker"
+	req_access = list(access_court)
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/shoes/brown(src)
+		new /obj/item/weapon/paper/Court (src)
+		new /obj/item/weapon/paper/Court (src)
+		new /obj/item/weapon/paper/Court (src)
+		new /obj/item/weapon/pen (src)
+		new /obj/item/clothing/suit/judgerobe (src)
+		new /obj/item/clothing/head/powdered_wig (src)
+		new /obj/item/weapon/storage/briefcase(src)
+		return

code/game/objects/closets/wardrobe.dm

@@ -168,20 +168,3 @@
 	new /obj/item/clothing/suit/lawyer/purpjacket(src)
 	new /obj/item/clothing/shoes/brown(src)
 	new /obj/item/clothing/shoes/black(src)
-
-/obj/closet/cabinet/New()
-	..()
-	sleep(2)
-	new /obj/item/device/radio/headset/headset_sec(src)
-	new /obj/item/clothing/under/det( src )
-	new /obj/item/clothing/shoes/brown( src )
-	new /obj/item/clothing/head/det_hat( src )
-	new /obj/item/clothing/suit/det_suit( src )
-	new /obj/item/clothing/suit/det_suit/armor( src )
-	new /obj/item/weapon/storage/fcard_kit( src )
-	new /obj/item/clothing/gloves/black( src )
-	new /obj/item/weapon/storage/lglo_kit( src )
-	new /obj/item/weapon/fcardholder( src )
-	new /obj/item/weapon/clipboard( src )
-	new /obj/item/device/detective_scanner( src )
-	return