diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm
index ad4700d9ec2..52e2261f4c8 100644
--- a/_maps/map_files/stations/boxstation.dmm
+++ b/_maps/map_files/stations/boxstation.dmm
@@ -56633,7 +56633,6 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/item/storage/box/monkeycubes,
 /turf/simulated/floor/plasteel,
 /area/station/science/genetics)
 "fXp" = (
@@ -68432,24 +68431,11 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/disposal)
 "lNE" = (
-/obj/structure/rack{
-	dir = 8;
-	layer = 2.9
-	},
-/obj/item/storage/box/monkeycubes/wolpincubes,
-/obj/item/storage/box/monkeycubes/nian_worme_cubes,
 /obj/machinery/light,
-/obj/item/storage/box/monkeycubes/farwacubes{
-	pixel_x = -6
-	},
-/obj/item/storage/box/monkeycubes/neaeracubes,
-/obj/item/storage/box/monkeycubes/stokcubes{
-	pixel_x = 4;
-	pixel_y = -4
-	},
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
+/obj/structure/closet/secure_closet/genetics,
 /turf/simulated/floor/plasteel{
 	icon_state = "whitepurple"
 	},
diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm
index d159c958bb5..19a4c3b993e 100644
--- a/_maps/map_files/stations/cerestation.dmm
+++ b/_maps/map_files/stations/cerestation.dmm
@@ -88944,14 +88944,8 @@
 /turf/simulated/floor/plating,
 /area/station/hallway/primary/starboard/south)
 "uVC" = (
-/obj/structure/closet/secure_closet/personal/patient,
-/obj/item/storage/box/monkeycubes,
-/obj/item/storage/box/monkeycubes/farwacubes,
-/obj/item/storage/box/monkeycubes/neaeracubes,
-/obj/item/storage/box/monkeycubes/stokcubes,
-/obj/item/storage/box/monkeycubes/wolpincubes,
-/obj/item/storage/box/monkeycubes/nian_worme_cubes,
 /obj/machinery/requests_console/directional/west,
+/obj/structure/closet/secure_closet/genetics,
 /turf/simulated/floor/plasteel{
 	dir = 9;
 	icon_state = "whitepurple"
diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm
index 90ba1744be3..c39322991ad 100644
--- a/_maps/map_files/stations/deltastation.dmm
+++ b/_maps/map_files/stations/deltastation.dmm
@@ -57841,15 +57841,11 @@
 	},
 /area/station/science/genetics)
 "drR" = (
-/obj/structure/table/glass,
-/obj/item/storage/box/monkeycubes{
-	pixel_x = -3
-	},
-/obj/item/reagent_containers/spray/cleaner,
 /obj/machinery/light{
 	dir = 4
 	},
 /obj/structure/disposalpipe/segment,
+/obj/structure/closet/secure_closet/genetics,
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "whitepurple"
@@ -64056,6 +64052,7 @@
 	pixel_y = 10
 	},
 /obj/structure/disposalpipe/segment,
+/obj/item/reagent_containers/spray/cleaner,
 /turf/simulated/floor/plasteel{
 	icon_state = "whitepurplecorner"
 	},
diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm
index a4ec0e7aaed..0169c7bbe85 100644
--- a/_maps/map_files/stations/metastation.dmm
+++ b/_maps/map_files/stations/metastation.dmm
@@ -73768,13 +73768,7 @@
 	},
 /area/station/medical/chemistry)
 "pUh" = (
-/obj/item/storage/box/monkeycubes,
-/obj/item/storage/box/monkeycubes/stokcubes,
-/obj/item/storage/box/monkeycubes/neaeracubes,
-/obj/structure/table/glass,
-/obj/item/storage/box/monkeycubes/wolpincubes,
-/obj/item/storage/box/monkeycubes/nian_worme_cubes,
-/obj/item/storage/box/monkeycubes/farwacubes,
+/obj/structure/closet/secure_closet/genetics,
 /turf/simulated/floor/grass/no_creep,
 /area/station/science/genetics)
 "pUq" = (
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical_lockers.dm
index 9e8e7d49a9e..dddf8e330af 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical_lockers.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical_lockers.dm
@@ -232,3 +232,20 @@
 	new /obj/item/reagent_containers/glass/bottle/reagent/acetone(src)
 	new /obj/item/reagent_containers/glass/bottle/reagent/acid(src)
 	new /obj/item/reagent_containers/glass/bottle/reagent/diethylamine(src)
+
+/obj/structure/closet/secure_closet/genetics
+	name = "genetics test subject locker"
+	desc = "Storage for lesser form cubes."
+	icon_state = "genetics"
+	open_door_sprite = "med_door"
+	icon_opened = "med_open"
+	req_access = list(ACCESS_GENETICS)
+
+/obj/structure/closet/secure_closet/genetics/populate_contents()
+	new /obj/item/storage/box/monkeycubes(src)
+	new /obj/item/storage/box/monkeycubes/farwacubes(src)
+	new /obj/item/storage/box/monkeycubes/neaeracubes(src)
+	new /obj/item/storage/box/monkeycubes/nian_worme_cubes(src)
+	new /obj/item/storage/box/monkeycubes/stokcubes(src)
+	new /obj/item/storage/box/monkeycubes/wolpincubes(src)
+
diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi
index c9a4c513cf3..7ee905462de 100644
Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ