diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index 0a5a95c69ac..42fdcf9c629 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -12347,6 +12347,8 @@
 	pixel_x = 26;
 	pixel_y = 26
 	},
+/obj/structure/table/wood,
+/obj/item/gun/projectile/revolver/doublebarrel,
 /turf/simulated/floor/plasteel{
 	dir = 5;
 	icon_state = "dark"
@@ -14448,7 +14450,14 @@
 /area/maintenance/auxsolarport)
 "aKp" = (
 /obj/structure/table/wood,
-/obj/item/gun/projectile/revolver/doublebarrel,
+/obj/item/wrench,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/stack/sheet/metal/fifty,
+/obj/item/stack/cable_coil/random,
+/obj/item/stack/cable_coil/random{
+	pixel_x = 2;
+	pixel_y = 3
+	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
 	icon_state = "dark"
@@ -15191,15 +15200,7 @@
 /area/crew_quarters/bar)
 "aLN" = (
 /obj/machinery/light,
-/obj/structure/closet/gmcloset,
-/obj/item/wrench,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/stack/sheet/metal/fifty,
-/obj/item/stack/cable_coil/random{
-	pixel_x = 2;
-	pixel_y = 3
-	},
-/obj/item/stack/cable_coil/random,
+/obj/machinery/vending/bardrobe,
 /turf/simulated/floor/plasteel{
 	dir = 5;
 	icon_state = "dark"
@@ -17781,7 +17782,7 @@
 	pixel_x = -22
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
-/obj/structure/closet/wardrobe/atmospherics_yellow,
+/obj/structure/closet/radiation,
 /turf/simulated/floor/plasteel,
 /area/engine/controlroom)
 "aRb" = (
@@ -22417,7 +22418,8 @@
 /area/quartermaster/storage)
 "aZq" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/item/twohanded/required/kirbyplants,
+/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/structure/closet/secure_closet/cargotech,
 /turf/simulated/floor/plasteel{
 	icon_state = "brown"
 	},
@@ -23361,6 +23363,10 @@
 /obj/structure/table,
 /obj/item/clipboard,
 /obj/item/toy/figure/crew/cargotech,
+/obj/machinery/newscaster{
+	layer = 3.3;
+	pixel_y = -27
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "brown"
 	},
@@ -24023,10 +24029,8 @@
 /turf/simulated/floor/plasteel,
 /area/hydroponics)
 "bci" = (
-/obj/item/radio/intercom{
-	pixel_y = 28
-	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/vending/hydrodrobe,
 /turf/simulated/floor/plasteel,
 /area/hydroponics)
 "bcj" = (
@@ -24034,6 +24038,9 @@
 /obj/item/wrench,
 /obj/item/clothing/suit/apron,
 /obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/item/radio/intercom{
+	pixel_y = 28
+	},
 /turf/simulated/floor/plasteel,
 /area/hydroponics)
 "bck" = (
@@ -24189,8 +24196,8 @@
 	},
 /area/atmos)
 "bcz" = (
-/obj/structure/closet/chefcloset,
 /obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/vending/chefdrobe,
 /turf/simulated/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bcA" = (
@@ -24286,11 +24293,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/structure/closet/secure_closet/cargotech,
 /obj/machinery/ai_status_display{
 	pixel_y = -32
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/vending/cargodrobe,
 /turf/simulated/floor/plasteel{
 	icon_state = "brown"
 	},
@@ -25314,8 +25321,8 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/structure/closet/wardrobe/atmospherics_yellow,
 /obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/vending/atmosdrobe,
 /turf/simulated/floor/plasteel{
 	dir = 6;
 	icon_state = "caution"
@@ -27142,7 +27149,7 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/obj/item/twohanded/required/kirbyplants,
+/obj/machinery/vending/secdrobe,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "red"
@@ -41257,12 +41264,10 @@
 /turf/simulated/floor/plasteel,
 /area/maintenance/starboard)
 "bHJ" = (
-/obj/structure/table/wood,
-/obj/item/clipboard,
-/obj/item/toy/figure/crew/detective,
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -28
 	},
+/obj/machinery/vending/detdrobe,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -43175,6 +43180,7 @@
 /area/security/detectives_office)
 "bLs" = (
 /obj/structure/table/wood,
+/obj/item/clipboard,
 /obj/item/clothing/glasses/sunglasses,
 /turf/simulated/floor/plasteel{
 	icon_state = "carpet"
@@ -56771,8 +56777,8 @@
 /turf/simulated/floor/plasteel,
 /area/engine/engineering)
 "clt" = (
-/obj/structure/closet/wardrobe/engineering_yellow,
 /obj/effect/decal/warning_stripes/yellow,
+/obj/machinery/vending/engidrobe,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "yellow"
@@ -69067,11 +69073,7 @@
 	},
 /area/medical/medbay2)
 "cJu" = (
-/obj/structure/extinguisher_cabinet{
-	pixel_y = 30
-	},
-/obj/structure/closet/wardrobe/medical_white,
-/obj/item/storage/backpack/satchel_med,
+/obj/machinery/vending/medidrobe,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutral"
 	},
@@ -70198,8 +70200,8 @@
 	},
 /area/toxins/xenobiology)
 "cLV" = (
-/obj/structure/closet/wardrobe/white,
 /obj/effect/decal/warning_stripes/yellow,
+/obj/structure/closet/firecloset,
 /turf/simulated/floor/plasteel,
 /area/medical/research)
 "cLW" = (
@@ -73076,6 +73078,9 @@
 /obj/item/clothing/glasses/hud/health,
 /obj/item/clothing/glasses/hud/health,
 /obj/item/reagent_containers/spray/cleaner,
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 28
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "neutral"
@@ -75471,8 +75476,8 @@
 	},
 /area/medical/research)
 "cVK" = (
-/obj/structure/closet/wardrobe/chemistry_white,
 /obj/effect/decal/warning_stripes/northwest,
+/obj/machinery/vending/chemdrobe,
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},
@@ -76876,11 +76881,8 @@
 	},
 /area/toxins/lab)
 "cYz" = (
-/obj/structure/table,
-/obj/item/crowbar,
-/obj/item/wrench,
-/obj/item/clothing/mask/gas,
 /obj/effect/decal/warning_stripes/yellow,
+/obj/machinery/vending/scidrobe,
 /turf/simulated/floor/plasteel,
 /area/medical/research)
 "cYA" = (
@@ -84432,9 +84434,7 @@
 /turf/simulated/floor/plasteel,
 /area/assembly/chargebay)
 "dnG" = (
-/obj/structure/extinguisher_cabinet{
-	pixel_y = 30
-	},
+/obj/machinery/vending/genedrobe,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "whitepurplecorner"
@@ -94533,11 +94533,11 @@
 	},
 /area/bridge)
 "dGT" = (
-/obj/structure/closet/wardrobe/robotics_black,
 /obj/structure/window/reinforced{
 	dir = 4
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/vending/robodrobe,
 /turf/simulated/floor/plasteel,
 /area/assembly/robotics)
 "dGU" = (
@@ -94813,11 +94813,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/structure/table/glass,
-/obj/item/flashlight/lamp,
 /obj/machinery/newscaster{
 	pixel_y = 32
 	},
+/obj/structure/dresser,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -94832,25 +94831,15 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
 	},
-/obj/structure/bed,
-/obj/item/bedsheet/medical,
-/obj/effect/landmark/start{
-	name = "Virologist"
-	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
 /area/medical/virology)
 "dHq" = (
-/obj/structure/table/glass,
 /obj/machinery/computer/security/telescreen/entertainment{
 	pixel_y = 32
 	},
-/obj/item/radio/intercom{
-	dir = 4;
-	pixel_x = 28
-	},
-/obj/machinery/computer/med_data/laptop,
+/obj/machinery/vending/virodrobe,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -96137,7 +96126,8 @@
 /turf/simulated/wall,
 /area/medical/virology)
 "dJX" = (
-/obj/structure/dresser,
+/obj/structure/table/glass,
+/obj/item/flashlight/lamp,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -96153,12 +96143,22 @@
 	dir = 1;
 	on = 1
 	},
+/obj/structure/bed,
+/obj/item/bedsheet/medical,
+/obj/effect/landmark/start{
+	name = "Virologist"
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
 /area/medical/virology)
 "dJZ" = (
-/obj/structure/closet/wardrobe/virology_white,
+/obj/structure/table/glass,
+/obj/machinery/computer/med_data/laptop,
+/obj/item/radio/intercom{
+	dir = 4;
+	pixel_x = 28
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -102728,6 +102728,9 @@
 /obj/structure/table/glass,
 /obj/item/clipboard,
 /obj/item/toy/figure/crew/geneticist,
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "whitepurplecorner"
@@ -105913,6 +105916,14 @@
 	icon_state = "dark"
 	},
 /area/crew_quarters/courtroom)
+"oJa" = (
+/obj/structure/table,
+/obj/item/crowbar,
+/obj/item/wrench,
+/obj/item/clothing/mask/gas,
+/obj/effect/decal/warning_stripes/yellow,
+/turf/simulated/floor/plasteel,
+/area/medical/research)
 "oSH" = (
 /obj/effect/spawner/window/reinforced,
 /obj/structure/cable,
@@ -106351,7 +106362,7 @@
 	icon_state = "4-8";
 	tag = ""
 	},
-/obj/structure/closet/wardrobe/red,
+/obj/machinery/vending/secdrobe,
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "red"
@@ -143408,7 +143419,7 @@ cTL
 cVl
 cWP
 cTL
-cYA
+oJa
 day
 cMi
 ddx
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index d72b8a9dfa6..c5279a8dacd 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -4891,7 +4891,7 @@
 	},
 /area/security/main)
 "alH" = (
-/obj/structure/closet/wardrobe/red,
+/obj/machinery/vending/secdrobe,
 /turf/simulated/floor/plasteel{
 	icon_state = "showroomfloor"
 	},
@@ -5884,6 +5884,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
 	},
+/obj/structure/closet/secure_closet/security,
 /turf/simulated/floor/plasteel{
 	icon_state = "showroomfloor"
 	},
@@ -14362,18 +14363,8 @@
 	},
 /area/crew_quarters/sleep)
 "aFM" = (
-/obj/structure/rack{
-	dir = 8;
-	layer = 2.9
-	},
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/suit/storage/hazardvest,
-/obj/item/clothing/suit/storage/hazardvest,
-/obj/item/tank/internals/emergency_oxygen/engi,
-/obj/item/tank/internals/emergency_oxygen/engi,
 /obj/effect/decal/warning_stripes/yellow,
+/obj/machinery/vending/engidrobe,
 /turf/simulated/floor/plasteel,
 /area/engine/engineering)
 "aFO" = (
@@ -14470,14 +14461,25 @@
 	},
 /area/engine/engineering)
 "aGb" = (
+/obj/structure/rack{
+	dir = 8;
+	layer = 2.9
+	},
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/suit/storage/hazardvest,
+/obj/item/clothing/suit/storage/hazardvest,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/effect/decal/warning_stripes/yellow,
+/obj/machinery/camera{
+	c_tag = "Engineering - Fore"
+	},
 /obj/item/radio/intercom{
 	name = "Station Intercom (General)";
 	pixel_y = 21
 	},
-/obj/machinery/camera{
-	c_tag = "Engineering - Fore"
-	},
-/obj/effect/decal/warning_stripes/northwest,
 /turf/simulated/floor/plasteel,
 /area/engine/engineering)
 "aGc" = (
@@ -15420,18 +15422,7 @@
 	},
 /area/crew_quarters/sleep)
 "aIa" = (
-/obj/structure/rack{
-	dir = 8;
-	layer = 2.9
-	},
-/obj/item/storage/briefcase{
-	pixel_x = -3;
-	pixel_y = 2
-	},
-/obj/item/storage/secure/briefcase{
-	pixel_x = 2;
-	pixel_y = -2
-	},
+/obj/machinery/vending/detdrobe,
 /turf/simulated/floor/plasteel{
 	icon_state = "grimy"
 	},
@@ -17731,6 +17722,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/machinery/vending/cargodrobe,
 /turf/simulated/floor/plasteel,
 /area/quartermaster/storage)
 "aMU" = (
@@ -27562,8 +27554,9 @@
 	})
 "biz" = (
 /obj/effect/decal/warning_stripes/southwest,
-/obj/structure/closet/wardrobe/atmospherics_yellow,
+/obj/structure/rack,
 /obj/item/flashlight,
+/obj/item/painter,
 /turf/simulated/floor/plasteel,
 /area/atmos)
 "biA" = (
@@ -27572,8 +27565,9 @@
 	pixel_y = 28
 	},
 /obj/effect/decal/warning_stripes/southeast,
-/obj/structure/closet/wardrobe/atmospherics_yellow,
+/obj/structure/rack,
 /obj/item/flashlight,
+/obj/item/painter,
 /turf/simulated/floor/plasteel,
 /area/atmos)
 "biB" = (
@@ -36139,6 +36133,14 @@
 	pixel_x = -3;
 	pixel_y = 5
 	},
+/obj/item/storage/briefcase{
+	pixel_x = -3;
+	pixel_y = 2
+	},
+/obj/item/storage/secure/briefcase{
+	pixel_x = 2;
+	pixel_y = -2
+	},
 /turf/simulated/floor/carpet,
 /area/security/detectives_office)
 "byE" = (
@@ -36258,14 +36260,10 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/bar)
 "byN" = (
-/obj/structure/closet/gmcloset{
-	desc = "It's a storage unit.";
-	name = "spare gear"
-	},
-/obj/item/wrench,
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
 	},
+/obj/machinery/vending/bardrobe,
 /turf/simulated/floor/wood,
 /area/crew_quarters/bar)
 "byO" = (
@@ -49714,16 +49712,11 @@
 /turf/simulated/floor/plasteel,
 /area/crew_quarters/kitchen)
 "caT" = (
-/obj/structure/closet{
-	name = "spare parts locker"
-	},
-/obj/item/rack_parts,
-/obj/item/rack_parts,
-/obj/item/wrench,
 /obj/structure/window/reinforced{
 	dir = 4
 	},
 /obj/effect/decal/warning_stripes/yellow,
+/obj/machinery/vending/chefdrobe,
 /turf/simulated/floor/plasteel,
 /area/crew_quarters/kitchen)
 "caU" = (
@@ -49907,12 +49900,8 @@
 /turf/simulated/floor/engine/co2,
 /area/atmos)
 "cbn" = (
-/obj/structure/table/glass,
-/obj/item/book/manual/sop_service{
-	pixel_x = 2;
-	pixel_y = 5
-	},
 /obj/effect/decal/warning_stripes/south,
+/obj/machinery/vending/hydrodrobe,
 /turf/simulated/floor/plasteel,
 /area/hydroponics)
 "cbo" = (
@@ -50978,7 +50967,6 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -27
 	},
-/obj/item/storage/backpack/satchel_hyd,
 /turf/simulated/floor/plasteel{
 	icon_state = "hydrofloor"
 	},
@@ -51275,7 +51263,6 @@
 /area/maintenance/aft)
 "cev" = (
 /obj/structure/closet/secure_closet/hydroponics,
-/obj/item/storage/backpack/satchel_hyd,
 /turf/simulated/floor/plasteel{
 	icon_state = "hydrofloor"
 	},
@@ -51825,7 +51812,7 @@
 	name = "Station Intercom (Medbay)";
 	pixel_y = 30
 	},
-/obj/structure/closet/wardrobe/medical_white,
+/obj/machinery/vending/medidrobe,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "whiteblue"
@@ -51989,7 +51976,6 @@
 /obj/machinery/light_switch{
 	pixel_x = -26
 	},
-/obj/item/storage/backpack/satchel_hyd,
 /turf/simulated/floor/plasteel{
 	icon_state = "hydrofloor"
 	},
@@ -54616,9 +54602,12 @@
 "cll" = (
 /obj/item/wrench,
 /obj/item/clothing/suit/apron,
-/obj/item/clothing/accessory/armband/hydro,
 /obj/structure/table/glass,
 /obj/effect/decal/warning_stripes/northwest,
+/obj/item/book/manual/sop_service{
+	pixel_x = 2;
+	pixel_y = 5
+	},
 /turf/simulated/floor/plasteel,
 /area/hydroponics)
 "clm" = (
@@ -58873,12 +58862,11 @@
 	},
 /area/medical/exam_room)
 "cui" = (
-/obj/structure/closet/wardrobe/chemistry_white,
-/obj/item/storage/backpack/satchel_chem,
 /obj/effect/decal/warning_stripes/south,
 /obj/structure/disaster_counter/chemistry{
 	pixel_y = 32
 	},
+/obj/machinery/vending/chemdrobe,
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},
@@ -63299,9 +63287,8 @@
 /obj/machinery/light_switch{
 	pixel_y = 28
 	},
-/obj/structure/rack,
 /obj/effect/decal/warning_stripes/south,
-/obj/item/painter,
+/obj/machinery/vending/atmosdrobe,
 /turf/simulated/floor/plasteel,
 /area/atmos)
 "cDe" = (
@@ -64798,11 +64785,11 @@
 /turf/simulated/floor/plasteel,
 /area/medical/cryo)
 "cGx" = (
-/obj/structure/closet/secure_closet/scientist,
 /obj/machinery/light_switch{
 	pixel_y = 28
 	},
 /obj/effect/decal/warning_stripes/south,
+/obj/machinery/vending/scidrobe,
 /turf/simulated/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
@@ -66747,7 +66734,7 @@
 	},
 /area/medical/genetics_cloning)
 "cKo" = (
-/obj/structure/closet/wardrobe/black,
+/obj/machinery/vending/genedrobe,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -69062,12 +69049,11 @@
 	},
 /area/medical/virology)
 "cOD" = (
-/obj/structure/closet/wardrobe/virology_white,
-/obj/item/storage/backpack/satchel_vir,
 /obj/structure/disposalpipe/segment{
 	dir = 8;
 	icon_state = "pipe-c"
 	},
+/obj/machinery/vending/virodrobe,
 /turf/simulated/floor/plasteel{
 	icon_state = "vault"
 	},
@@ -69738,13 +69724,11 @@
 /turf/space,
 /area/space/nearstation)
 "cPV" = (
-/obj/structure/closet/wardrobe/robotics_black{
-	pixel_x = 2
-	},
 /obj/structure/window/reinforced{
 	dir = 8
 	},
 /obj/effect/decal/warning_stripes/yellow,
+/obj/machinery/vending/robodrobe,
 /turf/simulated/floor/plasteel,
 /area/assembly/robotics)
 "cPW" = (
@@ -78187,6 +78171,20 @@
 	icon_state = "white"
 	},
 /area/medical/virology)
+"fBo" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/effect/decal/warning_stripes/south,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/effect/decal/warning_stripes/northwestcorner,
+/turf/simulated/floor/plasteel,
+/area/engine/engineering)
 "fBO" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plasteel{
@@ -79791,7 +79789,6 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/effect/decal/warning_stripes/northwestcorner,
 /obj/effect/decal/warning_stripes/southeastcorner,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -79799,6 +79796,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/effect/decal/warning_stripes/north,
 /turf/simulated/floor/plasteel,
 /area/engine/engineering)
 "kzH" = (
@@ -111104,7 +111102,7 @@ aiP
 ajM
 akg
 agA
-alC
+alH
 alX
 anN
 aof
@@ -125515,8 +125513,8 @@ azs
 aCg
 aEy
 aEz
-aHg
-iof
+aHa
+fBo
 aCg
 vRY
 aJZ
diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index 833ca217ea4..6506ef1889a 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -875,7 +875,6 @@
 	},
 /area/security/armoury)
 "aej" = (
-/obj/structure/closet/secure_closet/security,
 /obj/structure/window/reinforced{
 	dir = 8
 	},
@@ -885,6 +884,7 @@
 	name = "Security Requests Console";
 	pixel_y = 30
 	},
+/obj/machinery/vending/secdrobe,
 /turf/simulated/floor/plasteel{
 	dir = 9;
 	icon_state = "red"
@@ -1548,13 +1548,13 @@
 	},
 /area/security/medbay)
 "afx" = (
-/obj/structure/closet/wardrobe/red,
 /obj/machinery/light_switch{
 	pixel_y = -25
 	},
-/obj/item/clothing/suit/tracksuit/red,
+/obj/structure/closet/secure_closet/security,
 /turf/simulated/floor/plasteel{
-	icon_state = "redcorner"
+	dir = 6;
+	icon_state = "red"
 	},
 /area/security/main)
 "afJ" = (
@@ -4468,13 +4468,13 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fsmaint)
 "amf" = (
-/obj/structure/closet/secure_closet/security,
 /obj/structure/window/reinforced{
 	dir = 4
 	},
 /obj/item/radio/intercom{
 	pixel_y = 25
 	},
+/obj/machinery/vending/secdrobe,
 /turf/simulated/floor/plasteel{
 	dir = 5;
 	icon_state = "red"
@@ -5832,7 +5832,12 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
-/turf/simulated/floor/plasteel,
+/obj/effect/decal/warning_stripes/red/partial{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	dir = 1
+	},
 /area/security/main)
 "aoI" = (
 /obj/structure/cable{
@@ -6354,26 +6359,16 @@
 	icon_state = "dark"
 	},
 /area/security/evidence)
-"apH" = (
-/obj/structure/closet/secure_closet/security,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/turf/simulated/floor/plasteel{
-	dir = 10;
-	icon_state = "red"
-	},
-/area/security/main)
 "apI" = (
-/obj/structure/closet/redcorp,
 /obj/machinery/firealarm{
 	dir = 1;
 	pixel_y = -24
 	},
 /obj/machinery/light,
+/obj/structure/closet/secure_closet/security,
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "redcorner"
+	dir = 10;
+	icon_state = "red"
 	},
 /area/security/main)
 "apJ" = (
@@ -6388,16 +6383,6 @@
 	icon_state = "dark"
 	},
 /area/security/evidence)
-"apL" = (
-/obj/structure/closet/secure_closet/security,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel{
-	dir = 6;
-	icon_state = "red"
-	},
-/area/security/main)
 "apM" = (
 /obj/structure/table,
 /obj/item/storage/fancy/donut_box,
@@ -14902,11 +14887,7 @@
 /turf/simulated/floor/carpet,
 /area/security/detectives_office)
 "aGC" = (
-/obj/structure/closet/secure_closet{
-	anchored = 1;
-	name = "Evidence Storage";
-	req_access_txt = "4"
-	},
+/obj/machinery/vending/detdrobe,
 /turf/simulated/floor/plasteel{
 	icon_state = "grimy"
 	},
@@ -16057,6 +16038,11 @@
 	dir = 1;
 	pixel_y = -22
 	},
+/obj/structure/closet/secure_closet{
+	anchored = 1;
+	name = "Evidence Storage";
+	req_access_txt = "4"
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "grimy"
 	},
@@ -16508,8 +16494,6 @@
 /area/hallway/primary/fore)
 "aKB" = (
 /obj/structure/closet/secure_closet/detective,
-/obj/item/restraints/handcuffs,
-/obj/item/flash,
 /turf/simulated/floor/plasteel{
 	icon_state = "grimy"
 	},
@@ -25435,7 +25419,7 @@
 /obj/item/radio/intercom{
 	pixel_y = 25
 	},
-/obj/structure/closet/chefcloset,
+/obj/machinery/vending/chefdrobe,
 /turf/simulated/floor/plasteel{
 	icon_state = "showroomfloor"
 	},
@@ -27657,6 +27641,7 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
+/obj/machinery/vending/hydrodrobe,
 /turf/simulated/floor/plasteel{
 	icon_state = "hydrofloor"
 	},
@@ -28302,15 +28287,13 @@
 /turf/simulated/floor/plasteel,
 /area/atmos)
 "bjj" = (
-/obj/structure/closet/gmcloset{
-	name = "formal wardrobe"
-	},
 /obj/machinery/light/small{
 	dir = 4
 	},
 /obj/machinery/light_switch{
 	pixel_x = 27
 	},
+/obj/machinery/vending/bardrobe,
 /turf/simulated/floor/wood,
 /area/crew_quarters/bar)
 "bjk" = (
@@ -39872,6 +39855,7 @@
 /obj/machinery/alarm{
 	pixel_y = 24
 	},
+/obj/machinery/vending/cargodrobe,
 /turf/simulated/floor/plasteel,
 /area/quartermaster/storage)
 "bJa" = (
@@ -40408,7 +40392,7 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/bar)
 "bJW" = (
-/obj/structure/closet/wardrobe/chemistry_white,
+/obj/machinery/vending/chemdrobe,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "whiteyellow"
@@ -46133,7 +46117,7 @@
 /turf/simulated/floor/plasteel,
 /area/hallway/primary/central/se)
 "bUH" = (
-/obj/structure/closet/wardrobe/robotics_black,
+/obj/machinery/vending/robodrobe,
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},
@@ -46144,13 +46128,13 @@
 	},
 /area/medical/genetics)
 "bUJ" = (
-/obj/structure/closet/wardrobe/genetics_white,
 /obj/machinery/camera{
 	c_tag = "Medbay Genetics"
 	},
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 25
 	},
+/obj/machinery/vending/genedrobe,
 /turf/simulated/floor/plasteel{
 	icon_state = "whitepurplecorner"
 	},
@@ -54107,19 +54091,7 @@
 	},
 /area/medical/sleeper)
 "cjv" = (
-/obj/structure/closet/wardrobe/medic_white,
-/obj/item/clothing/head/surgery/blue,
-/obj/item/clothing/head/surgery/blue,
-/obj/item/clothing/head/surgery/green,
-/obj/item/clothing/head/surgery/green,
-/obj/item/clothing/head/surgery/purple,
-/obj/item/clothing/head/surgery/purple,
-/obj/item/clothing/suit/storage/fr_jacket,
-/obj/item/clothing/suit/storage/fr_jacket,
-/obj/item/clothing/suit/storage/fr_jacket,
-/obj/item/clothing/under/rank/medical/blue,
-/obj/item/clothing/under/rank/medical/green,
-/obj/item/clothing/under/rank/medical/purple,
+/obj/machinery/vending/medidrobe,
 /turf/simulated/floor/plasteel{
 	icon_state = "cafeteria"
 	},
@@ -61824,10 +61796,10 @@
 	},
 /area/medical/virology)
 "cxu" = (
-/obj/structure/closet/wardrobe/virology_white,
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/machinery/vending/virodrobe,
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "whitegreen"
@@ -64206,10 +64178,10 @@
 	},
 /area/toxins/misc_lab)
 "cCd" = (
-/obj/structure/closet/bombcloset,
 /obj/machinery/light_switch{
 	pixel_x = -23
 	},
+/obj/machinery/vending/scidrobe,
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},
@@ -64225,11 +64197,11 @@
 	},
 /area/toxins/misc_lab)
 "cCf" = (
-/obj/structure/closet/secure_closet/scientist,
 /obj/machinery/camera{
 	c_tag = "Research Test Lab West";
 	network = list("Research","SS13")
 	},
+/obj/structure/closet/bombcloset,
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},
@@ -71126,6 +71098,7 @@
 /obj/machinery/light_switch{
 	pixel_x = 27
 	},
+/obj/machinery/vending/engidrobe,
 /turf/simulated/floor/plasteel,
 /area/engine/equipmentstorage)
 "cPr" = (
@@ -83715,10 +83688,10 @@
 /obj/machinery/atmospherics/pipe/simple/visible/universal{
 	dir = 4
 	},
-/obj/structure/closet/wardrobe/atmospherics_yellow,
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/machinery/vending/atmosdrobe,
 /turf/simulated/floor/plasteel,
 /area/atmos)
 "dtk" = (
@@ -117135,7 +117108,7 @@ adQ
 aek
 aeA
 aoJ
-aoJ
+aoE
 apI
 anA
 ahk
@@ -117393,7 +117366,7 @@ aej
 aez
 anL
 aoE
-apH
+apJ
 aqA
 ahj
 aiP
@@ -118164,7 +118137,7 @@ amf
 aez
 ahe
 aoF
-apL
+apJ
 anx
 ago
 aiR
diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm
index c48b518fa19..3c5c3c5db07 100644
--- a/code/datums/supplypacks.dm
+++ b/code/datums/supplypacks.dm
@@ -228,6 +228,13 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
 	contains = list(/obj/item/vending_refill/security)
 	containername = "SecTech supply crate"
 
+/datum/supply_packs/security/vending/clothingvendor
+	name = "Security Clothing Vendors Crate"
+	cost = 40
+	contains = list(/obj/item/vending_refill/secdrobe,
+					/obj/item/vending_refill/detdrobe)
+	containername = "security clothing vendor crate"
+
 ////// Armor: Basic
 
 /datum/supply_packs/security/helmets
@@ -578,6 +585,13 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
 					/obj/item/vending_refill/youtool)
 	containername = "engineering supply crate"
 
+/datum/supply_packs/engineering/vending/clothingvendor
+	name = "Engineering Clothing Vendors Crate"
+	cost = 20
+	contains = list(/obj/item/vending_refill/engidrobe,
+					/obj/item/vending_refill/atmosdrobe)
+	containername = "engineering clothing vendor crate"
+
 /datum/supply_packs/engineering/powergamermitts
 	name = "Insulated Gloves Crate"
 	contains = list(/obj/item/clothing/gloves/color/yellow,
@@ -896,6 +910,14 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
 					/obj/item/vending_refill/wallmed)
 	containername = "medical vending crate"
 
+/datum/supply_packs/medical/clothingvendor
+	name = "Medical Clothing Vendors Crate"
+	cost = 20
+	contains = list(/obj/item/vending_refill/medidrobe,
+					/obj/item/vending_refill/chemdrobe,
+					/obj/item/vending_refill/virodrobe)
+	containername = "medical clothing vendors crate"
+
 /datum/supply_packs/medical/bloodpacks
 	name = "Blood Pack Variety Crate"
 	contains = list(/obj/item/reagent_containers/iv_bag,
@@ -1043,6 +1065,14 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
     containertype = /obj/structure/largecrate
     containername = "oil tank crate"
 
+/datum/supply_packs/science/vending/clothingvendor
+	name = "Science Clothing Vendors Crate"
+	cost = 20
+	contains = list(/obj/item/vending_refill/scidrobe,
+					/obj/item/vending_refill/robodrobe,
+					/obj/item/vending_refill/genedrobe,)
+	containername = "science clothing vendor crate"
+
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////// Organic /////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
@@ -1814,6 +1844,20 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
 	cost = 15
 	containername = "boxing supply crate"
 
+/datum/supply_packs/misc/vending/clothingvendor
+	name = "Service Clothing Vendors Crate"
+	cost = 20
+	contains = list(/obj/item/vending_refill/bardrobe,
+					/obj/item/vending_refill/chefdrobe,
+					/obj/item/vending_refill/hydrodrobe)
+	containername = "service clothing vendor crate"
+
+/datum/supply_packs/misc/vending/clothingvendor/cargo
+	name = "Cargo Clothing Vendors Crate"
+	cost = 20
+	contains = list(/obj/item/vending_refill/cargodrobe)
+	containername = "cargo clothing vendor crate"
+
 ///////////// Station Goals
 
 /datum/supply_packs/misc/station_goal
diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index fbb6a0ad3c3..4ae74e8be58 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -257,7 +257,21 @@ to destroy them and players will be able to make replacements.
 		"Robco Tool Maker" =					/obj/machinery/vending/engineering,
 		"BODA" =								/obj/machinery/vending/sovietsoda,
 		"SecTech" =								/obj/machinery/vending/security,
-		"CritterCare" =							/obj/machinery/vending/crittercare)
+		"CritterCare" =							/obj/machinery/vending/crittercare,
+		"SecDrobe" =							/obj/machinery/vending/secdrobe,
+		"DetDrobe" =							/obj/machinery/vending/detdrobe,
+		"MediDrobe" =							/obj/machinery/vending/medidrobe,
+		"ViroDrobe" =							/obj/machinery/vending/virodrobe,
+		"ChemDrobe" =							/obj/machinery/vending/chemdrobe,
+		"GeneDrobe" =							/obj/machinery/vending/genedrobe,
+		"SciDrobe" =							/obj/machinery/vending/scidrobe,
+		"RoboDrobe" =							/obj/machinery/vending/robodrobe,
+		"EngiDrobe" =							/obj/machinery/vending/engidrobe,
+		"AtmosDrobe" =							/obj/machinery/vending/atmosdrobe,
+		"CargoDrobe" =							/obj/machinery/vending/cargodrobe,
+		"ChefDrobe" =							/obj/machinery/vending/chefdrobe,
+		"BarDrobe" =							/obj/machinery/vending/bardrobe,
+		"HydroDrobe" =							/obj/machinery/vending/hydrodrobe)
 
 /obj/item/circuitboard/vendor/screwdriver_act(mob/user, obj/item/I)
 	. = TRUE
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index babae081e9d..30345c7d720 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -1778,3 +1778,326 @@
 /obj/machinery/vending/crittercare/free
 	prices = list()
 
+//Departmental clothing vendors
+
+/obj/machinery/vending/secdrobe
+	name = "\improper SecDrobe"
+	desc = "A vending machine for security and security-related clothing!"
+	icon_state = "secdrobe"
+	ads_list = list("Beat perps in style!", "It's red so you can't see the blood!", "You have the right to be fashionable!", "Now you can be the fashion police you always wanted to be!")
+	vend_reply = "Thank you for using the SecDrobe!"
+	products = list(/obj/item/clothing/under/rank/security = 4,
+					/obj/item/clothing/under/rank/security2 = 4,
+					/obj/item/clothing/under/rank/security/formal = 4,
+					/obj/item/clothing/under/rank/security/skirt = 4,
+					/obj/item/clothing/under/rank/security/corp = 4,
+					/obj/item/clothing/under/rank/dispatch = 4,
+					/obj/item/clothing/head/beret/sec = 4,
+					/obj/item/clothing/head/soft/sec = 4,
+					/obj/item/clothing/head/soft/sec/corp = 4,
+					/obj/item/clothing/suit/armor/secjacket = 4,
+					/obj/item/clothing/suit/hooded/wintercoat/security = 4,
+					/obj/item/clothing/gloves/color/black  = 4,
+					/obj/item/clothing/accessory/armband/sec = 6,
+					/obj/item/clothing/shoes/laceup = 4,
+					/obj/item/clothing/shoes/jackboots = 4,
+					/obj/item/clothing/shoes/jackboots/jacksandals = 4,
+					/obj/item/storage/backpack/security = 2,
+					/obj/item/storage/backpack/satchel_sec = 2,
+					/obj/item/storage/backpack/duffel/security = 2)
+	premium = list(/obj/item/clothing/mask/gas/sechailer/swat = 2,
+				   /obj/item/clothing/mask/balaclava = 1)
+	contraband = list(/obj/item/toy/figure/crew/secofficer = 1,
+					  /obj/item/toy/figure/crew/hos = 1)
+	refill_canister = /obj/item/vending_refill/secdrobe
+
+/obj/machinery/vending/detdrobe
+	name = "\improper DetDrobe"
+	desc = "A machine for all your detective needs, as long as you only need clothes."
+	icon_state = "detdrobe"
+	ads_list = list("Apply your brilliant deductive methods in style!", "They already smell of cigarettes!")
+	vend_reply = "Thank you for using the DetDrobe!"
+	products = list(/obj/item/clothing/under/det = 2,
+					/obj/item/clothing/suit/storage/det_suit = 2,
+					/obj/item/clothing/suit/storage/det_suit/forensics/red = 1,
+					/obj/item/clothing/suit/storage/det_suit/forensics/blue = 1,
+					/obj/item/clothing/suit/armor/vest/det_suit = 1,
+					/obj/item/clothing/head/det_hat = 2,
+					/obj/item/clothing/accessory/waistcoat = 2,
+					/obj/item/clothing/shoes/laceup = 2,
+					/obj/item/clothing/shoes/brown = 2,
+					/obj/item/clothing/shoes/jackboots = 2,
+					/obj/item/clothing/head/fedora = 1,
+					/obj/item/clothing/head/fedora/brownfedora = 1,
+					/obj/item/clothing/head/fedora/whitefedora = 1,
+					/obj/item/clothing/gloves/color/black = 2,
+					/obj/item/clothing/gloves/color/latex = 2,
+					/obj/item/reagent_containers/food/drinks/flask/detflask = 2,
+					/obj/item/storage/fancy/cigarettes/dromedaryco  = 5)
+	contraband = list(/obj/item/toy/figure/crew/detective = 1)
+	refill_canister = /obj/item/vending_refill/detdrobe
+
+/obj/machinery/vending/medidrobe
+	name = "\improper MediDrobe"
+	desc = "A vending machine rumoured to be capable of dispensing clothing for medical personnel."
+	icon_state = "medidrobe"
+	ads_list = list("Make those blood stains look fashionable!")
+	vend_reply = "Thank you for using the MediDrobe!"
+	products = list(/obj/item/clothing/under/rank/medical/blue = 3,
+					/obj/item/clothing/under/rank/medical/green = 3,
+					/obj/item/clothing/under/rank/medical/purple = 3,
+					/obj/item/clothing/under/rank/medical = 3,
+					/obj/item/clothing/under/rank/medical/skirt = 3,
+					/obj/item/clothing/under/rank/nurse = 3,
+					/obj/item/clothing/under/medigown = 3,
+					/obj/item/clothing/head/surgery/blue = 3,
+					/obj/item/clothing/head/surgery/green = 3,
+					/obj/item/clothing/head/surgery/purple = 3,
+					/obj/item/clothing/head/nursehat = 3,
+					/obj/item/clothing/head/beret/med = 3,
+					/obj/item/clothing/suit/hooded/wintercoat/medical = 3,
+					/obj/item/clothing/suit/storage/fr_jacket = 3,
+					/obj/item/clothing/suit/storage/labcoat = 3,
+					/obj/item/clothing/accessory/armband/med = 3,
+					/obj/item/clothing/accessory/armband/medgreen = 3,
+					/obj/item/clothing/shoes/laceup = 3,
+					/obj/item/clothing/shoes/white = 3,
+					/obj/item/clothing/shoes/sandal/white = 3,
+					/obj/item/storage/backpack/medic = 2,
+					/obj/item/storage/backpack/satchel_med = 2,
+					/obj/item/storage/backpack/duffel/medical = 2)
+	premium = list(/obj/item/clothing/gloves/color/latex/nitrile = 3)
+	contraband = list(/obj/item/toy/figure/crew/md = 1)
+	refill_canister = /obj/item/vending_refill/medidrobe
+
+/obj/machinery/vending/virodrobe
+	name = "\improper ViroDrobe"
+	desc = "An unsterilized machine for dispending virology related clothing."
+	icon_state = "virodrobe"
+	ads_list = list("Viruses getting you down? Nothing a change of clothes can't fix!", "Upgrade to sterilized clothing today!")
+	vend_reply = "Thank you for using the ViroDrobe!"
+	products = list(/obj/item/clothing/under/rank/virologist = 2,
+					/obj/item/clothing/under/rank/virologist/skirt = 2,
+					/obj/item/clothing/head/beret/med = 2,
+					/obj/item/clothing/suit/storage/labcoat/virologist = 2,
+					/obj/item/clothing/accessory/armband/med = 2,
+					/obj/item/clothing/mask/surgical = 2,
+					/obj/item/clothing/shoes/laceup = 2,
+					/obj/item/clothing/shoes/white = 2,
+					/obj/item/clothing/shoes/sandal/white = 2,
+					/obj/item/storage/backpack/virology = 2,
+					/obj/item/storage/backpack/satchel_vir = 2,
+					/obj/item/storage/backpack/duffel/virology = 2)
+	contraband = list(/obj/item/toy/figure/crew/virologist = 1)
+	refill_canister = /obj/item/vending_refill/virodrobe
+
+/obj/machinery/vending/chemdrobe
+	name = "\improper ChemDrobe"
+	desc = "A vending machine for dispensing chemistry related clothing."
+	icon_state = "chemdrobe"
+	ads_list = list("Our clothes are 0.5% more resistant to acid spills! Get yours now!")
+	vend_reply = "Thank you for using the ChemDrobe!"
+	products = list(/obj/item/clothing/under/rank/chemist = 2,
+					/obj/item/clothing/under/rank/chemist/skirt = 2,
+					/obj/item/clothing/head/beret/med = 2,
+					/obj/item/clothing/suit/storage/labcoat/chemist = 2,
+					/obj/item/clothing/accessory/armband/med = 2,
+					/obj/item/clothing/mask/gas = 2,
+					/obj/item/clothing/shoes/laceup = 2,
+					/obj/item/clothing/shoes/white = 2,
+					/obj/item/clothing/shoes/sandal/white = 2,
+					/obj/item/storage/bag/chemistry = 2,
+					/obj/item/storage/backpack/chemistry = 2,
+					/obj/item/storage/backpack/satchel_chem = 2,
+					/obj/item/storage/backpack/duffel/chemistry = 2)
+	contraband = list(/obj/item/toy/figure/crew/chemist = 1)
+	refill_canister = /obj/item/vending_refill/chemdrobe
+
+
+/obj/machinery/vending/genedrobe
+	name = "GeneDrobe"
+	desc = "A machine for dispensing clothing related to genetics."
+	icon_state = "genedrobe"
+	ads_list = "Perfect for the mad scientist in you!"
+	vend_reply = "Thank you for using the GeneDrobe!"
+
+	products = list(/obj/item/clothing/under/rank/geneticist = 3,
+					/obj/item/clothing/suit/storage/labcoat/genetics = 3,
+					/obj/item/clothing/shoes/laceup = 3,
+					/obj/item/clothing/shoes/white = 3,
+					/obj/item/clothing/shoes/sandal/white = 3,
+					/obj/item/storage/backpack/genetics = 2,
+					/obj/item/storage/backpack/satchel_gen = 2,
+					/obj/item/storage/backpack/duffel/genetics = 2,)
+	contraband = list(/obj/item/toy/figure/crew/geneticist = 1)
+	refill_canister = /obj/item/vending_refill/genedrobe
+
+/obj/machinery/vending/scidrobe
+	name = "SciDrobe"
+	desc = "A simple vending machine suitable to dispense well tailored science clothing. Endorsed by Space Cubans."
+	icon_state = "scidrobe"
+	ads_list = list("Longing for the smell of plasma burnt flesh?", "Buy your science clothing now!", "Made with 10% Auxetics, so you don't have to worry about losing your arm!")
+	vend_reply = "Thank you for using the SciDrobe!"
+	products = list(/obj/item/clothing/under/rank/scientist = 6,
+					/obj/item/clothing/under/rank/scientist/skirt = 3,
+					/obj/item/clothing/suit/hooded/wintercoat/science = 3,
+					/obj/item/clothing/suit/storage/labcoat/science = 3,
+					/obj/item/clothing/head/beret/sci = 3,
+					/obj/item/clothing/accessory/armband/science = 6,
+					/obj/item/clothing/shoes/laceup = 3,
+					/obj/item/clothing/shoes/white = 3,
+					/obj/item/clothing/shoes/sandal/white = 3,
+					/obj/item/storage/backpack/science = 2,
+					/obj/item/storage/backpack/satchel_tox = 2,
+					/obj/item/storage/backpack/duffel/science = 2,)
+	contraband = list(/obj/item/toy/figure/crew/rd = 1,
+				      /obj/item/toy/figure/crew/scientist = 1)
+	refill_canister = /obj/item/vending_refill/scidrobe
+
+/obj/machinery/vending/robodrobe
+	name = "RoboDrobe"
+	desc = "A vending machine designed to dispense clothing known only to roboticists."
+	icon_state = "robodrobe"
+	ads_list = list("You turn me TRUE, use defines!","0110001101101100011011110111010001101000011001010111001101101000011001010111001001100101")
+	vend_reply = "Thank you for using the RoboDrobe!"
+	products = list(/obj/item/clothing/under/rank/roboticist = 3,
+					/obj/item/clothing/under/rank/roboticist/skirt = 3,
+					/obj/item/clothing/suit/storage/labcoat = 3,
+					/obj/item/clothing/head/soft/black = 3,
+					/obj/item/clothing/gloves/fingerless = 3,
+					/obj/item/clothing/shoes/laceup = 3,
+					/obj/item/clothing/shoes/white = 3,
+					/obj/item/clothing/shoes/black = 3)
+	contraband = list(/obj/item/toy/figure/crew/roboticist = 1)
+	refill_canister = /obj/item/vending_refill/robodrobe
+
+/obj/machinery/vending/engidrobe
+	name = "EngiDrobe"
+	desc = "A vending machine renowned for vending industrial grade clothing."
+	icon_state = "engidrobe"
+	ads_list = list("Guaranteed to protect your feet from industrial accidents!", "Afraid of radiation? Then wear yellow!")
+	vend_reply = "Thank you for using the SciDrobe!"
+	products = list(/obj/item/clothing/under/rank/engineer = 6,
+					/obj/item/clothing/under/rank/engineer/skirt = 3,
+					/obj/item/clothing/suit/hooded/wintercoat/engineering = 3,
+					/obj/item/clothing/suit/storage/hazardvest = 3,
+					/obj/item/clothing/head/beret/eng = 3,
+					/obj/item/clothing/head/hardhat = 2,
+					/obj/item/clothing/head/hardhat/white = 2,
+					/obj/item/clothing/head/hardhat/orange = 2,
+					/obj/item/clothing/head/hardhat/dblue = 2,
+					/obj/item/clothing/accessory/armband/engine = 6,
+					/obj/item/clothing/shoes/laceup = 3,
+					/obj/item/clothing/shoes/workboots = 3,
+					/obj/item/storage/backpack/industrial = 2,
+					/obj/item/storage/backpack/satchel_eng = 2,
+					/obj/item/storage/backpack/duffel/engineering = 2,
+					/obj/item/storage/belt/utility = 2)
+	premium = list(/obj/item/storage/belt/utility/chief = 2,
+					/obj/item/clothing/gloves/color/yellow = 2)
+	contraband = list(/obj/item/toy/figure/crew/ce = 1,
+				      /obj/item/toy/figure/crew/engineer = 1)
+	refill_canister = /obj/item/vending_refill/engidrobe
+
+/obj/machinery/vending/atmosdrobe
+	name = "AtmosDrobe"
+	desc = "This relatively unknown vending machine delivers clothing for Atmospherics Technicians, an equally unknown job."
+	icon_state = "atmosdrobe"
+	ads_list = list("Guaranteed to protect your feet from atmospheric accidents!", "Get your inflammable clothing right here!")
+	vend_reply = "Thank you for using the AtmosDrobe!"
+	products = list(/obj/item/clothing/under/rank/atmospheric_technician  = 6,
+					/obj/item/clothing/under/rank/atmospheric_technician/skirt = 3,
+					/obj/item/clothing/suit/hooded/wintercoat/engineering/atmos = 3,
+					/obj/item/clothing/suit/storage/hazardvest = 3,
+					/obj/item/clothing/head/beret/atmos = 3,
+					/obj/item/clothing/head/hardhat = 2,
+					/obj/item/clothing/head/hardhat/red = 2,
+					/obj/item/clothing/head/hardhat/white = 2,
+					/obj/item/clothing/head/hardhat/orange = 2,
+					/obj/item/clothing/head/hardhat/dblue = 2,
+					/obj/item/clothing/gloves/color/black  = 3,
+					/obj/item/clothing/accessory/armband/engine = 3,
+					/obj/item/clothing/shoes/laceup = 3,
+					/obj/item/clothing/shoes/workboots = 3,
+					/obj/item/storage/backpack/industrial = 2,
+					/obj/item/storage/backpack/satchel_eng = 2,
+					/obj/item/storage/backpack/duffel/atmos = 2,
+					/obj/item/storage/belt/utility = 2)
+	premium = list(/obj/item/storage/belt/utility/chief = 2)
+	contraband = list(/obj/item/toy/figure/crew/atmos = 1)
+	refill_canister = /obj/item/vending_refill/atmosdrobe
+
+/obj/machinery/vending/cargodrobe
+	name = "CargoDrobe"
+	desc = "A highly advanced vending machine for buying cargo related clothing for free... most of the time."
+	icon_state = "cargodrobe"
+	ads_list = list("Upgraded Assistant Style! Pick yours today!", "These shorts are comfy and easy to wear, get yours now!")
+	vend_reply = "Thank you for using the CargoDrobe!"
+	products = list(/obj/item/clothing/under/rank/cargotech = 6,
+					/obj/item/clothing/under/rank/cargotech/skirt = 3,
+					/obj/item/clothing/suit/hooded/wintercoat/cargo = 3,
+					/obj/item/clothing/suit/storage/hazardvest = 3,
+					/obj/item/clothing/head/soft = 3,
+					/obj/item/clothing/head/hardhat/orange = 2,
+					/obj/item/clothing/gloves/fingerless = 6,
+					/obj/item/clothing/accessory/armband/cargo = 6,
+					/obj/item/clothing/shoes/black = 3,
+					/obj/item/clothing/shoes/workboots = 3)
+	contraband = list(/obj/item/toy/figure/crew/qm = 1,
+					  /obj/item/toy/figure/crew/cargotech = 1)
+	refill_canister = /obj/item/vending_refill/cargodrobe
+
+/obj/machinery/vending/chefdrobe
+	name = "ChefDrobe"
+	desc = "This vending machine might not dispense meat, but it certainly dispenses chef related clothing."
+	icon_state = "chefdrobe"
+	ads_list = list("Our clothes are guaranteed to protect you from food splatters!", "Comfortable enough for a CQC practice!")
+	vend_reply = "Thank you for using the ChefDrobe!"
+	products = list(/obj/item/clothing/under/rank/chef = 2,
+					/obj/item/clothing/under/waiter = 2,
+					/obj/item/clothing/suit/chef = 2,
+					/obj/item/clothing/suit/chef/classic = 2,
+					/obj/item/clothing/head/chefhat = 2,
+					/obj/item/clothing/head/soft/mime = 2,
+					/obj/item/clothing/shoes/laceup = 2,
+					/obj/item/clothing/shoes/white = 2,
+					/obj/item/clothing/shoes/black = 2,
+					/obj/item/clothing/accessory/waistcoat = 2)
+	contraband = list(/obj/item/toy/figure/crew/chef = 1)
+	refill_canister = /obj/item/vending_refill/chefdrobe
+
+/obj/machinery/vending/bardrobe
+	name = "BarDrobe"
+	desc = "A stylish vendor to dispense the most stylish bar clothing!"
+	icon_state = "bardrobe"
+	ads_list = list("Guaranteed to prevent stains from spilled drinks!")
+	vend_reply = "Thank you for using the BarDrobe!"
+	products = list(/obj/item/clothing/under/rank/bartender = 2,
+					/obj/item/clothing/under/sl_suit = 2,
+					/obj/item/clothing/head/that = 2,
+					/obj/item/clothing/head/soft/black = 2,
+					/obj/item/clothing/suit/blacktrenchcoat = 2,
+					/obj/item/clothing/shoes/laceup = 2,
+					/obj/item/clothing/shoes/black = 2,
+					/obj/item/clothing/accessory/waistcoat = 2,
+					/obj/item/reagent_containers/glass/rag = 3)
+	contraband = list(/obj/item/toy/figure/crew/bartender = 1)
+	refill_canister = /obj/item/vending_refill/bardrobe
+
+/obj/machinery/vending/hydrodrobe
+	name = "HydroDrobe"
+	desc = "A machine with a catchy name. It dispenses botany related clothing and gear."
+	icon_state = "hydrobe"
+	ads_list = list("Do you love soil? Then buy our clothes!", "Get outfits to match your green thumb here!")
+	vend_reply = "Thank you for using the HydroDrobe!"
+	products = list(/obj/item/clothing/under/rank/hydroponics  = 3,
+					/obj/item/reagent_containers/glass/bucket = 3,
+					/obj/item/clothing/suit/apron = 3,
+					/obj/item/clothing/suit/apron/overalls = 3,
+					/obj/item/clothing/mask/bandana/botany = 3,
+					/obj/item/clothing/accessory/armband/hydro = 3,
+					/obj/item/storage/backpack/botany = 2,
+					/obj/item/storage/backpack/satchel_hyd = 2,
+					/obj/item/storage/backpack/duffel/hydro = 2,)
+	contraband = list(/obj/item/toy/figure/crew/botanist = 1)
+	refill_canister = /obj/item/vending_refill/hydrodrobe
diff --git a/code/game/objects/items/weapons/vending_items.dm b/code/game/objects/items/weapons/vending_items.dm
index c4d4d5090e5..d4949b53679 100644
--- a/code/game/objects/items/weapons/vending_items.dm
+++ b/code/game/objects/items/weapons/vending_items.dm
@@ -152,3 +152,60 @@
 /obj/item/vending_refill/robotics
 	machine_name = "Robotech Deluxe"
 	icon_state = "refill_engi"
+
+//Departmental clothing vendors
+
+/obj/item/vending_refill/secdrobe
+	machine_name = "SecDrobe"
+	icon_state = "refill_clothes"
+
+/obj/item/vending_refill/detdrobe
+	machine_name = "DetDrobe"
+	icon_state = "refill_clothes"
+
+/obj/item/vending_refill/medidrobe
+	machine_name = "MediDrobe"
+	icon_state = "refill_clothes"
+
+/obj/item/vending_refill/virodrobe
+	machine_name = "ViroDrobe"
+	icon_state = "refill_clothes"
+
+/obj/item/vending_refill/chemdrobe
+	machine_name = "ChemDrobe"
+	icon_state = "refill_clothes"
+
+/obj/item/vending_refill/genedrobe
+	machine_name = "GeneDrobe"
+	icon_state = "refill_clothes"
+/obj/item/vending_refill/scidrobe
+	machine_name = "SciDrobe"
+	icon_state = "refill_clothes"
+
+/obj/item/vending_refill/robodrobe
+	machine_name = "RoboDrobe"
+	icon_state = "refill_clothes"
+
+/obj/item/vending_refill/engidrobe
+	machine_name = "EngiDrobe"
+	icon_state = "refill_clothes"
+
+/obj/item/vending_refill/atmosdrobe
+	machine_name = "AtmosDrobe"
+	icon_state = "refill_clothes"
+
+/obj/item/vending_refill/cargodrobe
+	machine_name = "CargoDrobe"
+	icon_state = "refill_clothes"
+
+/obj/item/vending_refill/chefdrobe
+	machine_name = "ChefDrobe"
+	icon_state = "refill_clothes"
+
+/obj/item/vending_refill/bardrobe
+	machine_name = "BarDrobe"
+	icon_state = "refill_clothes"
+
+/obj/item/vending_refill/hydrodrobe
+	machine_name = "HydroDrobe"
+	icon_state = "refill_clothes"
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 57aa92d0d9e..05958f278e3 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -329,18 +329,12 @@
 	close_sound = 'sound/machines/wooden_closet_close.ogg'
 
 /obj/structure/closet/secure_closet/detective/populate_contents()
-	new /obj/item/clothing/under/det(src)
-	new /obj/item/clothing/suit/storage/det_suit(src)
-	new /obj/item/clothing/suit/storage/det_suit/forensics/blue(src)
-	new /obj/item/clothing/suit/storage/det_suit/forensics/red(src)
-	new /obj/item/clothing/gloves/color/black/forensics(src)
-	new /obj/item/clothing/head/det_hat(src)
-	new /obj/item/clothing/shoes/brown(src)
 	new /obj/item/storage/box/evidence(src)
 	new /obj/item/clipboard(src)
+	new /obj/item/flash(src)
+	new /obj/item/restraints/handcuffs(src)
 	new /obj/item/radio/headset/headset_sec/alt(src)
 	new /obj/item/detective_scanner(src)
-	new /obj/item/clothing/suit/armor/vest/det_suit(src)
 	new /obj/item/ammo_box/c38(src)
 	new /obj/item/ammo_box/c38(src)
 	new /obj/item/gun/projectile/revolver/detective(src)
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
index bb3c0e531b0..1d54a9b94a3 100755
Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ