diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm
index eb38fe5f0d97..cdaf1df78295 100644
--- a/maps/map_files/BigRed/BigRed.dmm
+++ b/maps/map_files/BigRed/BigRed.dmm
@@ -29621,6 +29621,10 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/asphalt/cement_sunbleached/cement_sunbleached3,
 /area/bigredv2/outside/nw)
+"sab" = (
+/obj/structure/closet/l3closet/general,
+/turf/open/floor/white,
+/area/bigredv2/outside/virology)
 "sao" = (
 /obj/structure/machinery/light{
 	dir = 4
@@ -43539,7 +43543,7 @@ nIY
 nof
 mnV
 aoD
-nGL
+sab
 bPC
 aoD
 aQz
diff --git a/maps/map_files/CORSAT/Corsat.dmm b/maps/map_files/CORSAT/Corsat.dmm
index 673e042c2139..5ddf50c1aed4 100644
--- a/maps/map_files/CORSAT/Corsat.dmm
+++ b/maps/map_files/CORSAT/Corsat.dmm
@@ -12958,7 +12958,7 @@
 /turf/open/floor/corsat/bluecorner/east,
 /area/corsat/sigma/airlock/control)
 "gbg" = (
-/obj/structure/closet/l3closet,
+/obj/structure/closet/l3closet/general,
 /obj/structure/machinery/light,
 /turf/open/floor/corsat/plate,
 /area/corsat/gamma/biodome/virology)
@@ -27468,7 +27468,7 @@
 /turf/open/floor/corsat/retrosquareslight,
 /area/corsat/theta/biodome/complex)
 "nIj" = (
-/obj/structure/closet/l3closet,
+/obj/structure/closet/l3closet/janitor,
 /turf/open/floor/corsat/yellow/northeast,
 /area/corsat/omega/maint)
 "nIu" = (
@@ -27832,7 +27832,7 @@
 /turf/open/floor/corsat/redcorner,
 /area/corsat/sigma/south/security)
 "nUw" = (
-/obj/structure/closet/l3closet,
+/obj/structure/closet/l3closet/general,
 /turf/open/floor/corsat/plate,
 /area/corsat/gamma/biodome/virology)
 "nUS" = (
@@ -41549,7 +41549,7 @@
 /turf/open/floor/corsat/lightplate,
 /area/corsat/theta/biodome/hydroeast)
 "vpD" = (
-/obj/structure/closet/l3closet,
+/obj/structure/closet/l3closet/general,
 /turf/open/floor/corsat/yellow,
 /area/corsat/omega/control)
 "vpG" = (
diff --git a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm
index 8f0576a8cbe8..d1ba560171cf 100644
--- a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm
+++ b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm
@@ -6907,7 +6907,7 @@
 /turf/open/floor/prison/floor_plate,
 /area/fiorina/station/telecomm/lz1_cargo)
 "fkl" = (
-/obj/structure/closet/l3closet,
+/obj/structure/closet/l3closet/general,
 /turf/open/floor/prison,
 /area/fiorina/tumor/aux_engi)
 "fkL" = (
@@ -11428,6 +11428,10 @@
 /area/fiorina/lz/near_lzI)
 "iFn" = (
 /obj/structure/janitorialcart,
+/obj/item/clothing/head/bio_hood/janitor{
+	pixel_x = -4;
+	pixel_y = 5
+	},
 /turf/open/floor/prison,
 /area/fiorina/station/disco)
 "iFO" = (
@@ -30036,8 +30040,9 @@
 /area/fiorina/station/medbay)
 "wXf" = (
 /obj/structure/closet/cabinet,
-/obj/item/clothing/suit/bio_suit,
-/obj/item/clothing/head/bio_hood,
+/obj/item/clothing/under/rank/janitor,
+/obj/item/clothing/suit/bio_suit/janitor,
+/obj/item/clothing/head/bio_hood/janitor,
 /turf/open/floor/wood,
 /area/fiorina/station/civres_blue)
 "wXy" = (
diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
index 688ab7d779ea..ce2e3d97ac5d 100644
--- a/maps/map_files/USS_Almayer/USS_Almayer.dmm
+++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -17932,7 +17932,7 @@
 /turf/open/floor/almayer/aicore/no_build,
 /area/almayer/command/airoom)
 "gid" = (
-/obj/structure/closet/l3closet/scientist,
+/obj/structure/closet/l3closet/general,
 /obj/structure/window/reinforced{
 	dir = 8;
 	health = 80
@@ -22593,7 +22593,7 @@
 /turf/closed/wall/almayer,
 /area/almayer/maint/hull/upper/u_m_p)
 "hRs" = (
-/obj/structure/closet/l3closet/medical,
+/obj/structure/closet/l3closet/virology,
 /turf/open/floor/almayer/redfull,
 /area/almayer/medical/upper_medical)
 "hRu" = (
@@ -28361,7 +28361,7 @@
 /turf/open/floor/almayer/plate,
 /area/almayer/living/briefing)
 "jOh" = (
-/obj/structure/closet/l3closet/scientist,
+/obj/structure/closet/l3closet/general,
 /obj/structure/window/reinforced{
 	dir = 8;
 	health = 80
@@ -35531,7 +35531,7 @@
 /turf/open/floor/almayer/blue/east,
 /area/almayer/living/basketball)
 "mrS" = (
-/obj/structure/closet/l3closet/scientist,
+/obj/structure/closet/l3closet/general,
 /obj/structure/machinery/light{
 	dir = 8
 	},