diff --git a/code/game/objects/closets/detective.dm b/code/game/objects/closets/detective.dm
new file mode 100644
index 0000000000..0eda9026f5
--- /dev/null
+++ b/code/game/objects/closets/detective.dm
@@ -0,0 +1 @@
+/obj/structure/closet/detective
\ No newline at end of file
diff --git a/code/game/objects/closets/secure/cargo.dm b/code/game/objects/closets/secure/cargo.dm
new file mode 100644
index 0000000000..730d2dc6c9
--- /dev/null
+++ b/code/game/objects/closets/secure/cargo.dm
@@ -0,0 +1,46 @@
+
+/obj/structure/closet/secure_closet/qm_personal
+	name = "Quartermaster's Locker"
+	req_access = list(access_qm)
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/wardrobe/qm(src)
+		//
+		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/weapon/clipboard(src)
+		new /obj/item/device/pda/quartermaster(src)
+		new /obj/item/clothing/glasses/sunglasses(src)
+		new /obj/item/device/radio/headset/heads/qm(src)
+
+/obj/structure/closet/secure_closet/cargo_tech_personal
+	name = "Cargo Tech's Locker"
+	req_access = list(access_cargo)
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/wardrobe/cargo_tech(src)
+		//
+		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/pda/quartermaster(src)
+		new /obj/item/device/radio/headset/headset_cargo(src)
+
+/obj/structure/closet/secure_closet/miner_personal
+	name = "Miner's Locker"
+	req_access = list(access_cargo)
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/wardrobe/cargo_tech(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/weapon/pen(B)
+		new /obj/item/device/radio/headset/headset_mine(src)
\ No newline at end of file
diff --git a/code/game/objects/closets/secure/civilian.dm b/code/game/objects/closets/secure/civilian.dm
new file mode 100644
index 0000000000..690c6eaa94
--- /dev/null
+++ b/code/game/objects/closets/secure/civilian.dm
@@ -0,0 +1,130 @@
+
+/obj/structure/closet/secure_closet/chef_personal
+	name = "Chef's Locker"
+	req_access = list(access_kitchen)
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/wardrobe/chef(src)
+		//
+		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/radio/headset(src)
+
+/obj/structure/closet/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
+
+/obj/structure/closet/secure_closet/barman_personal
+	name = "Barman's Locker"
+	req_access = list(access_bar)
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/wardrobe/bartender(src)
+		//
+		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/radio/headset(src)
+		new /obj/item/ammo_casing/shotgun/beanbag(BPK)
+		new /obj/item/ammo_casing/shotgun/beanbag(BPK)
+		new /obj/item/ammo_casing/shotgun/beanbag(BPK)
+		new /obj/item/ammo_casing/shotgun/beanbag(BPK)
+
+/obj/structure/closet/secure_closet/hydro_personal
+	name = "Botanist's Locker"
+	req_access = list(access_hydroponics)
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/wardrobe/hydro
+		//
+		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/analyzer/plant_analyzer(src)
+		new /obj/item/device/radio/headset(src)
+
+/obj/structure/closet/secure_closet/janitor_personal
+	name = "Janitor's Locker"
+	req_access = list(access_janitor)
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/wardrobe/janitor(src)
+		//
+		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/pda/janitor(src)
+
+/obj/structure/closet/secure_closet/lawyer_personal
+	name = "Lawyer's Locker"
+	req_access = list(access_lawyer)
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/wardrobe/lawyer(src)
+		//
+		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/pda/lawyer(src)
+		new /obj/item/device/detective_scanner(src)
+		new /obj/item/weapon/storage/briefcase(src)
+
+/obj/structure/closet/secure_closet/librarian_personal
+	name = "Librarian's Locker"
+	req_access = list(access_library)
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/wardrobe/librarian(src)
+		//
+		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/weapon/barcodescanner(src)
+
+/obj/structure/closet/secure_closet/counselor_personal
+	name = "Counselor's Locker"
+	req_access = list(access_chapel_office)
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/wardrobe/chaplain(src)
+		//
+		new /obj/item/weapon/storage/backpack/cultpack (src)
+		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/weapon/storage/bible/booze(src)
+		new /obj/item/device/pda/chaplain(src)
+		new /obj/item/device/radio/headset(src)
+		new /obj/item/weapon/candlepack(src)
+		new /obj/item/weapon/candlepack(src)
diff --git a/code/game/objects/closets/secure/research.dm b/code/game/objects/closets/secure/research.dm
new file mode 100644
index 0000000000..7cee367963
--- /dev/null
+++ b/code/game/objects/closets/secure/research.dm
@@ -0,0 +1,36 @@
+
+/obj/structure/closet/secure_closet/rd
+	name = "Research Director's Locker"
+	req_access = list(access_cmo)
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/wardrobe/rd(src)
+		//
+		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/weapon/clipboard(src)
+		new /obj/item/weapon/tank/air(src)
+		new /obj/item/clothing/mask/gas(src)
+		new /obj/item/device/flash(src)
+		new /obj/item/device/radio/headset/heads/rd(src)
+		//
+
+/obj/structure/closet/secure_closet/scientist
+	name = "Scientist's Locker"
+	req_access = list(access_cmo)
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/wardrobe/scientist(src)
+		//
+		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/pda/toxins(src)
+		new /obj/item/weapon/tank/oxygen(src)
+		new /obj/item/clothing/mask/gas(src)
+		new /obj/item/device/radio/headset/headset_sci(src)
\ No newline at end of file