diff --git a/_maps/shuttles/shiptest/independent_litieguai.dmm b/_maps/shuttles/shiptest/independent_litieguai.dmm
index d290a28d565d..0b3d0c54d603 100644
--- a/_maps/shuttles/shiptest/independent_litieguai.dmm
+++ b/_maps/shuttles/shiptest/independent_litieguai.dmm
@@ -225,21 +225,8 @@
 "fn" = (
 /obj/machinery/firealarm/directional/west,
 /obj/machinery/airalarm/directional/south,
-/obj/structure/closet/crate/freezer/surplus_limbs{
-	name = "organ freezer"
-	},
-/obj/item/organ/stomach,
-/obj/item/organ/stomach,
-/obj/item/organ/lungs,
-/obj/item/organ/liver,
-/obj/item/organ/liver,
-/obj/item/organ/eyes,
-/obj/item/organ/eyes,
-/obj/item/organ/heart,
-/obj/item/organ/heart,
-/obj/item/organ/ears,
-/obj/item/organ/ears,
 /obj/effect/turf_decal/industrial/hatch/red,
+/obj/structure/closet/crate/freezer/surplus_limbs/organs,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/medical)
 "fp" = (
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index 0b63d56546a5..d8f53246fc23 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -175,6 +175,24 @@
 	new /obj/item/bodypart/leg/left/robot/surplus/vox(src)
 	new /obj/item/bodypart/leg/right/robot/surplus/vox(src)
 
+/obj/structure/closet/crate/freezer/surplus_limbs/organs
+	name = "organ freezer"
+	desc = "A crate containing a variety of spare limbs and organs."
+
+/obj/structure/closet/crate/freezer/surplus_limbs/organs/PopulateContents()
+	. = ..()
+	new /obj/item/organ/stomach(src)
+	new /obj/item/organ/stomach(src)
+	new /obj/item/organ/lungs(src)
+	new /obj/item/organ/liver(src)
+	new /obj/item/organ/liver(src)
+	new /obj/item/organ/eyes(src)
+	new /obj/item/organ/eyes(src)
+	new /obj/item/organ/heart(src)
+	new /obj/item/organ/heart(src)
+	new /obj/item/organ/ears(src)
+	new /obj/item/organ/ears(src)
+
 /obj/structure/closet/crate/radiation
 	desc = "A crate with a radiation sign on it."
 	name = "radiation crate"