diff --git a/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm b/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
index b60bdf834b5b..91774e29442a 100644
--- a/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
+++ b/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
@@ -374,6 +374,7 @@
 	},
 /obj/item/gun/energy/lasercannon{
 	pixel_y = 5;
+	
 	},
 /obj/item/gun/energy/lasercannon,
 /obj/effect/turf_decal/industrial/hatch,
diff --git a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
index 367c10be8f82..84e10583d2e8 100644
--- a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
+++ b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
@@ -3910,7 +3910,7 @@
 /area/ruin/beach/oceantown/bar)
 "Vr" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /turf/open/floor/carpet,
 /area/ruin/beach/oceantown)
 "VI" = (
diff --git a/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm b/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm
index 5d3160ba0c1b..294dd1056431 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm
@@ -473,9 +473,7 @@
 /obj/structure/bed/double{
 	dir = 1
 	},
-/obj/item/bedsheet/dorms/double{
-	dir = 1
-	},
+/obj/effect/spawner/random/bedsheet/double,
 /turf/open/floor/plasteel/dark,
 /area/ruin/unpowered/crashed_holemaker)
 "iN" = (
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
index 9afe78eb2628..3e7b6497c3de 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
@@ -40,7 +40,7 @@
 "fD" = (
 /obj/structure/bed,
 /obj/effect/decal/cleanable/blood/bubblegum,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /turf/open/floor/wood,
 /area/ruin/powered)
 "fQ" = (
@@ -459,7 +459,7 @@
 /area/overmap_encounter/planetoid/cave/explored)
 "LZ" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /turf/open/floor/wood,
 /area/ruin/powered)
 "Nq" = (
@@ -554,7 +554,7 @@
 "WH" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /turf/open/floor/wood,
 /area/ruin/powered)
 "Ze" = (
diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
index d40ca2c82b27..7df736df9fef 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
@@ -167,7 +167,7 @@
 /area/overmap_encounter/planetoid/cave/explored)
 "bH" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/structure/curtain/cloth/grey,
 /obj/effect/decal/cleanable/shreds,
 /turf/open/floor/carpet/nanoweave/beige,
@@ -2223,7 +2223,7 @@
 /area/ruin/jungle/cavecrew/bridge)
 "Be" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/structure/curtain/cloth/grey,
 /turf/open/floor/carpet/red_gold,
 /area/ruin/jungle/cavecrew/dormitories)
diff --git a/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm b/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm
index 53390348a6d1..4429e0b8779a 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm
@@ -989,7 +989,7 @@
 /obj/structure/bed{
 	icon_state = "dirty_mattress"
 	},
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/railing{
 	color = "#A47449";
@@ -1446,7 +1446,7 @@
 	dir = 4;
 	layer = 3.9
 	},
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/structure/cable/yellow{
 	icon_state = "1-9"
 	},
@@ -3204,7 +3204,7 @@
 /obj/structure/bed{
 	icon_state = "dirty_mattress"
 	},
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/structure/cable/yellow{
 	icon_state = "0-5"
 	},
@@ -7185,7 +7185,7 @@
 /obj/structure/bed{
 	icon_state = "dirty_mattress"
 	},
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /turf/open/floor/wood/walnut,
 /area/ruin/jungle/paradise/dorms)
 "UC" = (
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_lava_canyon.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_lava_canyon.dmm
index 92fa7dfb9203..08b9f3a1940a 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_lava_canyon.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_lava_canyon.dmm
@@ -884,6 +884,7 @@
 "zb" = (
 /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner{
 	loot = list(/obj/item/melee/transforming/cleaving_saw,/obj/item/gun/energy/kinetic_accelerator,/obj/item/keycard/gatedrop/lavacanyon);
+	
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/overmap_encounter/planetoid/cave/explored)
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm
index 8ea61e8f27c2..18d540698390 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm
@@ -341,7 +341,7 @@
 /area/ruin/lavaland/factory/warehouse)
 "dc" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/structure/curtain/cloth,
 /obj/effect/turf_decal/corner/opaque/ntblue,
 /obj/effect/turf_decal/corner/opaque/ntblue{
@@ -3159,7 +3159,7 @@
 /area/ruin/lavaland/factory/dorms)
 "EP" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/structure/curtain/cloth,
 /obj/effect/turf_decal/corner/opaque/ntblue,
 /obj/effect/turf_decal/corner/opaque/ntblue{
@@ -5077,7 +5077,7 @@
 /area/overmap_encounter/planetoid/lava/explored)
 "YJ" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/structure/curtain/cloth,
 /obj/effect/turf_decal/corner/opaque/ntblue,
 /obj/effect/turf_decal/corner/opaque/ntblue{
diff --git a/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm b/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
index fcda4390a285..fb0fd710119b 100644
--- a/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
+++ b/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
@@ -214,7 +214,7 @@
 /area/ruin/rockplanet/nanotrasen)
 "db" = (
 /obj/structure/bed/pod,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood,
 /area/ruin/rockplanet/nanotrasen)
@@ -1565,7 +1565,7 @@
 /obj/structure/railing{
 	dir = 4
 	},
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /turf/open/floor/wood,
 /area/ruin/rockplanet/nanotrasen)
 "Ap" = (
@@ -1713,7 +1713,7 @@
 /area/overmap_encounter/planetoid/rockplanet/explored)
 "Cx" = (
 /obj/structure/bed/pod,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/machinery/light/dim/directional/east,
 /turf/open/floor/wood,
 /area/ruin/rockplanet/nanotrasen)
@@ -2507,7 +2507,7 @@
 /area/ruin/rockplanet/nanotrasen)
 "Rm" = (
 /obj/structure/bed/pod,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/machinery/light/dim/directional/east,
 /turf/open/floor/carpet/black,
 /area/ruin/rockplanet/nanotrasen)
@@ -2746,6 +2746,7 @@
 "WY" = (
 /obj/structure/frame/computer{
 	dir = 1;
+	
 	},
 /obj/effect/turf_decal/corner/opaque/red/diagonal,
 /turf/open/floor/plasteel/tech/techmaint,
diff --git a/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm b/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
index befb544e22c5..0ab2c87512a9 100644
--- a/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
+++ b/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
@@ -859,7 +859,7 @@
 	dir = 8;
 	icon_state = "dirty_mattress"
 	},
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /turf/open/floor/wood,
 /area/ruin/rockplanet/distillery/crew)
 "kn" = (
diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm
index b4929ae11f55..96bd39459371 100644
--- a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm
+++ b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm
@@ -699,7 +699,7 @@
 /area/ruin)
 "AI" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /turf/open/floor/wood,
 /area/ruin)
 "AR" = (
diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm
index 8594df51754f..17a16c3fffc6 100644
--- a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm
+++ b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm
@@ -848,7 +848,7 @@
 /area/ruin/whitesands/saloon)
 "zv" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /turf/open/floor/wood{
 	icon_state = "wood-broken5"
 	},
@@ -1355,7 +1355,7 @@
 /area/ruin/whitesands/saloon)
 "Pi" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /turf/open/floor/wood,
 /area/ruin/whitesands/saloon)
 "Px" = (
diff --git a/_maps/RandomRuins/SpaceRuins/corporate_mining.dmm b/_maps/RandomRuins/SpaceRuins/corporate_mining.dmm
index e86525dd3c7f..956466fc4be0 100644
--- a/_maps/RandomRuins/SpaceRuins/corporate_mining.dmm
+++ b/_maps/RandomRuins/SpaceRuins/corporate_mining.dmm
@@ -462,7 +462,7 @@
 /area/ruin/space/has_grav/corporatemine/bridge)
 "kZ" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/effect/turf_decal/spline/fancy/opaque/lightgrey{
 	dir = 4
 	},
@@ -2293,7 +2293,7 @@
 /area/ruin/space/has_grav/corporatemine/crewquarters)
 "ZU" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/effect/turf_decal/spline/fancy/opaque/lightgrey{
 	dir = 8
 	},
diff --git a/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm b/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm
index 5aac98edc7c1..a95a736daf14 100644
--- a/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm
+++ b/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm
@@ -3,7 +3,7 @@
 /obj/structure/bed,
 /obj/structure/curtain/cloth/grey,
 /obj/effect/turf_decal/corner/transparent/grey/diagonal,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/has_grav/powerpuzzle)
 "ae" = (
@@ -2446,7 +2446,7 @@
 /obj/structure/bed,
 /obj/structure/curtain/cloth/grey,
 /obj/effect/turf_decal/corner/transparent/grey/diagonal,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/machinery/light/small/broken/directional/north,
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/has_grav/powerpuzzle)
@@ -3273,7 +3273,7 @@
 /obj/structure/bed,
 /obj/structure/curtain/cloth/grey,
 /obj/effect/turf_decal/corner/transparent/grey/diagonal,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/machinery/light/small/broken/directional/south,
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/has_grav/powerpuzzle)
diff --git a/_maps/RandomRuins/SpaceRuins/spacemall.dmm b/_maps/RandomRuins/SpaceRuins/spacemall.dmm
index f1a8d719d07d..2bb1f41c0585 100644
--- a/_maps/RandomRuins/SpaceRuins/spacemall.dmm
+++ b/_maps/RandomRuins/SpaceRuins/spacemall.dmm
@@ -1306,7 +1306,7 @@
 	pixel_y = -30
 	},
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /turf/open/floor/wood,
 /area/ruin/space/has_grav/spacemall/dorms)
 "eV" = (
@@ -7631,7 +7631,7 @@
 /area/ruin/space/has_grav/spacemall)
 "CR" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/effect/decal/cleanable/blood,
 /obj/item/reagent_containers/food/snacks/spiderling{
 	pixel_y = 5;
@@ -9438,7 +9438,7 @@
 /area/ruin/space/has_grav/spacemall)
 "JE" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /turf/open/floor/wood,
 /area/ruin/space/has_grav/spacemall/dorms)
 "JF" = (
@@ -11865,7 +11865,7 @@
 /area/ruin/space/has_grav/spacemall/maint)
 "SD" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/item/toy/plush/slimeplushie{
 	pixel_y = -4;
 	pixel_x = 4
diff --git a/_maps/shuttles/independent/independent_beluga.dmm b/_maps/shuttles/independent/independent_beluga.dmm
index 44663dd4ab9c..ddbcfba512b3 100644
--- a/_maps/shuttles/independent/independent_beluga.dmm
+++ b/_maps/shuttles/independent/independent_beluga.dmm
@@ -2631,7 +2631,7 @@
 "zh" = (
 /obj/structure/bed,
 /obj/structure/curtain/cloth/grey,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/machinery/light/directional/south,
 /turf/open/floor/wood,
 /area/ship/crew/dorm)
@@ -3425,7 +3425,7 @@
 /area/ship/crew/canteen)
 "Hq" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/structure/curtain/bounty,
 /obj/structure/sign/poster/official/ian{
 	pixel_x = 32
@@ -3803,7 +3803,7 @@
 "Kc" = (
 /obj/structure/bed,
 /obj/structure/curtain/cloth/grey,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/machinery/light_switch{
 	pixel_x = -8;
 	pixel_y = -20;
@@ -3827,7 +3827,7 @@
 /area/ship/crew)
 "Ko" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/structure/curtain/bounty,
 /turf/open/floor/carpet/red,
 /area/ship/crew)
@@ -4118,7 +4118,7 @@
 "Nv" = (
 /obj/structure/bed,
 /obj/structure/curtain/cloth/grey,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /turf/open/floor/wood,
 /area/ship/crew/dorm)
 "Nw" = (
diff --git a/_maps/shuttles/independent/independent_box.dmm b/_maps/shuttles/independent/independent_box.dmm
index 78b9170d8866..f64c84ca5b33 100644
--- a/_maps/shuttles/independent/independent_box.dmm
+++ b/_maps/shuttles/independent/independent_box.dmm
@@ -968,7 +968,7 @@
 	dir = 8
 	},
 /obj/structure/bed/pod,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /turf/open/floor/carpet/blue,
 /area/ship/crew)
 "dr" = (
@@ -1421,7 +1421,7 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/medical)
 "mx" = (
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/structure/curtain/bounty,
 /obj/effect/turf_decal/siding/wood/corner{
 	dir = 4
diff --git a/_maps/shuttles/independent/independent_bubble.dmm b/_maps/shuttles/independent/independent_bubble.dmm
index d0d4c2e0ebf5..298a919bbaa7 100644
--- a/_maps/shuttles/independent/independent_bubble.dmm
+++ b/_maps/shuttles/independent/independent_bubble.dmm
@@ -248,7 +248,7 @@
 /turf/open/floor/plasteel/mono,
 /area/ship/hallway/central)
 "jr" = (
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/structure/bed,
 /obj/structure/curtain/bounty,
 /obj/effect/turf_decal/siding/wood{
@@ -905,7 +905,7 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "LK" = (
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/structure/bed,
 /obj/structure/curtain/bounty,
 /obj/effect/turf_decal/siding/wood{
diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm
index 9c9ed46a20bf..2383fb85b522 100644
--- a/_maps/shuttles/independent/independent_dwayne.dmm
+++ b/_maps/shuttles/independent/independent_dwayne.dmm
@@ -2083,7 +2083,7 @@
 /area/ship/external/dark)
 "Gl" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/machinery/airalarm/directional/east,
 /obj/item/radio/intercom/directional/south,
 /turf/open/floor/carpet,
@@ -2301,7 +2301,7 @@
 /area/ship/storage/eva)
 "JH" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/structure/cable/yellow{
 	icon_state = "4-10"
 	},
@@ -3458,7 +3458,7 @@
 /area/ship/engineering)
 "ZQ" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /turf/open/floor/carpet,
 /area/ship/crew/dorm)
 "ZR" = (
diff --git a/_maps/shuttles/independent/independent_kilo.dmm b/_maps/shuttles/independent/independent_kilo.dmm
index 3cd19d6f7acb..6bb1aa9fb75c 100644
--- a/_maps/shuttles/independent/independent_kilo.dmm
+++ b/_maps/shuttles/independent/independent_kilo.dmm
@@ -905,7 +905,7 @@
 /area/ship/cargo)
 "mz" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/machinery/light_switch{
 	pixel_x = 7;
 	pixel_y = 20
@@ -1789,7 +1789,7 @@
 /obj/structure/cable/pink{
 	icon_state = "1-6"
 	},
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/machinery/light/directional/west,
 /turf/open/floor/carpet,
 /area/ship/crew/dorm)
diff --git a/_maps/shuttles/independent/independent_lagoon.dmm b/_maps/shuttles/independent/independent_lagoon.dmm
index 5130aed76be3..2855c6e0d686 100644
--- a/_maps/shuttles/independent/independent_lagoon.dmm
+++ b/_maps/shuttles/independent/independent_lagoon.dmm
@@ -4873,7 +4873,7 @@
 /area/ship/hallway/aft)
 "GN" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
@@ -6155,7 +6155,7 @@
 /area/ship/hallway/port)
 "QI" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/effect/turf_decal/siding/wood{
 	dir = 6
 	},
diff --git a/_maps/shuttles/independent/independent_mudskipper.dmm b/_maps/shuttles/independent/independent_mudskipper.dmm
index e413057f49bd..05cb87a0d1ab 100644
--- a/_maps/shuttles/independent/independent_mudskipper.dmm
+++ b/_maps/shuttles/independent/independent_mudskipper.dmm
@@ -1404,7 +1404,7 @@
 /area/ship/hallway/aft)
 "Ft" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/structure/curtain/bounty,
 /obj/machinery/light_switch{
 	dir = 1;
@@ -2132,7 +2132,7 @@
 /area/ship/engineering/engine)
 "Vy" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/structure/curtain/bounty,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light/dim/directional/north,
diff --git a/_maps/shuttles/independent/independent_rigger.dmm b/_maps/shuttles/independent/independent_rigger.dmm
index 694a33702b64..deb7cbeeb45f 100644
--- a/_maps/shuttles/independent/independent_rigger.dmm
+++ b/_maps/shuttles/independent/independent_rigger.dmm
@@ -430,7 +430,7 @@
 	dir = 1
 	},
 /obj/structure/bed,
-/obj/item/bedsheet/random,
+/obj/effect/spawner/random/bedsheet,
 /obj/structure/curtain/bounty,
 /turf/open/floor/plasteel/grimy,
 /area/ship/crew/dorm)
@@ -3240,7 +3240,7 @@
 /area/ship/medical)
 "Ne" = (
 /obj/structure/bed,
-/obj/item/bedsheet/random,
+/obj/effect/spawner/random/bedsheet,
 /obj/structure/curtain/bounty,
 /turf/open/floor/plasteel/grimy,
 /area/ship/crew/dorm)
@@ -3680,7 +3680,7 @@
 	},
 /obj/structure/bed,
 /obj/structure/curtain/bounty,
-/obj/item/bedsheet/random,
+/obj/effect/spawner/random/bedsheet,
 /turf/open/floor/plasteel/grimy,
 /area/ship/crew/dorm)
 "Sj" = (
diff --git a/_maps/shuttles/independent/independent_schmiedeberg.dmm b/_maps/shuttles/independent/independent_schmiedeberg.dmm
index 6d35fb3b262d..bf97b9b1a44b 100644
--- a/_maps/shuttles/independent/independent_schmiedeberg.dmm
+++ b/_maps/shuttles/independent/independent_schmiedeberg.dmm
@@ -462,7 +462,7 @@
 /area/ship/engineering)
 "fM" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/effect/turf_decal/siding/wood/corner{
 	dir = 4
 	},
@@ -2977,7 +2977,7 @@
 	pixel_y = -32
 	},
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/structure/curtain/bounty,
 /obj/effect/turf_decal/siding/wood/corner{
 	dir = 1
diff --git a/_maps/shuttles/independent/independent_shetland.dmm b/_maps/shuttles/independent/independent_shetland.dmm
index 6cc96deccd90..39537794acb2 100644
--- a/_maps/shuttles/independent/independent_shetland.dmm
+++ b/_maps/shuttles/independent/independent_shetland.dmm
@@ -4361,7 +4361,7 @@
 "Li" = (
 /obj/structure/bed,
 /obj/structure/curtain/bounty,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/sign/poster/random{
 	pixel_x = -32;
@@ -4647,7 +4647,7 @@
 "MS" = (
 /obj/structure/bed,
 /obj/structure/curtain/bounty,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /turf/open/floor/plasteel/grimy,
 /area/ship/crew/dorm)
 "MT" = (
@@ -4676,7 +4676,7 @@
 "Ni" = (
 /obj/structure/bed,
 /obj/structure/curtain/bounty,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/sign/poster/random{
 	pixel_y = 32
@@ -4768,7 +4768,7 @@
 "Ok" = (
 /obj/structure/bed,
 /obj/structure/curtain/bounty,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
 	},
diff --git a/_maps/shuttles/independent/independent_sunskipper.dmm b/_maps/shuttles/independent/independent_sunskipper.dmm
index 3edffc72acbc..12f34a8991ac 100644
--- a/_maps/shuttles/independent/independent_sunskipper.dmm
+++ b/_maps/shuttles/independent/independent_sunskipper.dmm
@@ -1182,9 +1182,7 @@
 /obj/structure/bed{
 	dir = 1
 	},
-/obj/item/bedsheet/dorms{
-	dir = 1
-	},
+/obj/effect/spawner/random/bedsheet,
 /obj/structure/curtain/cloth/grey,
 /obj/structure/cable/green{
 	icon_state = "1-2"
diff --git a/_maps/shuttles/independent/independent_tranquility.dmm b/_maps/shuttles/independent/independent_tranquility.dmm
index d1e34b97e612..3d53cbdbed4e 100644
--- a/_maps/shuttles/independent/independent_tranquility.dmm
+++ b/_maps/shuttles/independent/independent_tranquility.dmm
@@ -1721,7 +1721,7 @@
 /area/ship/hallway/starboard)
 "nr" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/structure/curtain/cloth/grey,
 /obj/machinery/light/dim/directional/east,
 /obj/structure/sign/poster/contraband/gec{
@@ -4731,7 +4731,7 @@
 "LT" = (
 /obj/structure/bed,
 /obj/structure/curtain/cloth/grey,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
@@ -5755,7 +5755,7 @@
 /area/ship/crew/hydroponics)
 "Tl" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/structure/curtain/cloth/grey,
 /obj/machinery/light/dim/directional/east,
 /obj/structure/sign/poster/contraband/hacking_guide{
@@ -5891,7 +5891,7 @@
 /obj/structure/bed,
 /obj/structure/curtain/cloth/grey,
 /obj/machinery/light/dim/directional/north,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /turf/open/floor/carpet/black,
 /area/ship/crew/dorm/dormthree)
 "Up" = (
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm b/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm
index c07e81cefec8..1e65ca7f3773 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm
@@ -658,7 +658,7 @@
 /area/ship/engineering/atmospherics)
 "ga" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/structure/curtain/bounty,
 /obj/structure/window/reinforced{
 	dir = 4
@@ -1144,7 +1144,7 @@
 /area/ship/engineering/engine)
 "lb" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/structure/curtain/bounty,
 /turf/open/floor/plasteel/grimy,
 /area/ship/crew)
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
index e9ab200948c4..02d373b02c84 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
@@ -807,7 +807,7 @@
 /area/ship/science/robotics)
 "dq" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/effect/turf_decal/siding/wood{
 	dir = 10
 	},
@@ -1886,7 +1886,7 @@
 /area/ship/crew/dorm/dormtwo)
 "hM" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/effect/turf_decal/siding/wood{
 	dir = 6
 	},
@@ -4832,7 +4832,7 @@
 /area/ship/medical)
 "sr" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/effect/turf_decal/siding/wood{
 	dir = 9
 	},
@@ -7719,7 +7719,7 @@
 /area/ship/crew/canteen)
 "CP" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
@@ -10960,7 +10960,7 @@
 /area/ship/engineering/atmospherics)
 "OR" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
 	},
@@ -11810,7 +11810,7 @@
 /area/ship/hangar)
 "Sz" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/effect/turf_decal/siding/wood{
 	dir = 5
 	},
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm b/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm
index ce017fec067c..ece7dc017e3e 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm
@@ -4726,7 +4726,7 @@
 /obj/structure/window/reinforced/tinted/frosted{
 	dir = 8
 	},
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/structure/curtain/cloth/grey,
 /obj/machinery/light_switch{
 	dir = 8;
@@ -6434,7 +6434,7 @@
 	dir = 4
 	},
 /obj/structure/curtain/cloth/grey,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /turf/open/floor/wood,
 /area/ship/crew/dorm)
 "Lt" = (
diff --git a/_maps/shuttles/pirate/pirate_tortuga.dmm b/_maps/shuttles/pirate/pirate_tortuga.dmm
index 94ac117c6477..78fc99cf18b6 100644
--- a/_maps/shuttles/pirate/pirate_tortuga.dmm
+++ b/_maps/shuttles/pirate/pirate_tortuga.dmm
@@ -1580,7 +1580,7 @@
 	dir = 1
 	},
 /obj/structure/curtain/cloth,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/structure/extinguisher_cabinet/directional/north,
 /turf/open/floor/carpet,
 /area/ship/crew)
@@ -2054,7 +2054,7 @@
 "Ar" = (
 /obj/structure/bed,
 /obj/structure/curtain/cloth,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /turf/open/floor/carpet,
 /area/ship/crew)
 "Av" = (
@@ -2236,7 +2236,7 @@
 	dir = 1
 	},
 /obj/structure/curtain/cloth,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/machinery/airalarm/directional/north,
 /turf/open/floor/carpet,
 /area/ship/crew)
diff --git a/code/game/objects/effects/spawners/random.dm/decoration.dm b/code/game/objects/effects/spawners/random.dm/decoration.dm
index b9a305fb9fd0..7af7af7fe85b 100644
--- a/code/game/objects/effects/spawners/random.dm/decoration.dm
+++ b/code/game/objects/effects/spawners/random.dm/decoration.dm
@@ -9,7 +9,6 @@
 	loot = list(
 		/obj/item/stack/sheet/sandblock{amount = 30} = 25,
 		/obj/item/stack/sheet/mineral/wood{amount = 30} = 25,
-		/obj/item/stack/sheet/bronze/thirty = 20,
 		/obj/item/stack/tile/noslip{amount = 20} = 10,
 		/obj/item/stack/sheet/plastic{amount = 30} = 10,
 		/obj/item/stack/tile/pod{amount = 20} = 4,
@@ -23,9 +22,6 @@
 	loot = list(
 		/obj/item/stack/tile/carpet{amount = 30} = 35,
 		/obj/item/stack/tile/carpet/black{amount = 30} = 20,
-		/obj/item/stack/tile/carpet/donk/thirty = 15,
-		/obj/item/stack/tile/carpet/stellar/thirty = 15,
-		/obj/item/stack/tile/carpet/executive/thirty = 15,
 	)
 
 /obj/effect/spawner/random/decoration/ornament
@@ -35,8 +31,6 @@
 		/obj/item/flashlight/lamp = 35,
 		/obj/item/flashlight/lamp/green = 35,
 		/obj/item/flashlight/lantern = 10,
-		/obj/item/phone = 10,
-		/obj/item/flashlight/lantern/jade = 5,
 		/obj/item/flashlight/lamp/bananalamp = 5,
 	)
 /obj/effect/spawner/random/decoration/glowstick
@@ -56,6 +50,21 @@
 
 	glowstick.set_light_on(TRUE)
 
+/obj/effect/spawner/random/decoration/paint
+	name = "paint spawner"
+	icon_state = "paint"
+	loot_subtype_path = /obj/item/paint
+	loot = list()
+
+/obj/effect/spawner/random/decoration/flower
+	name = "random grown flower spawner"
+	icon_state = "flower"
+	loot = list(
+		/obj/item/reagent_containers/food/snacks/grown/poppy,
+		/obj/item/reagent_containers/food/snacks/grown/harebell,
+		/obj/item/reagent_containers/food/snacks/grown/trumpet,
+	)
+
 /obj/effect/spawner/random/flora
 	name = "random flora spawner"
 	loot = list(
@@ -97,6 +106,7 @@
 
 /obj/effect/spawner/random/flower
 	name = "random flower spawner"
+	icon_state = "flower"
 	loot = list(
 		/obj/structure/flora/ausbushes/brflowers,
 		/obj/structure/flora/ausbushes/ywflowers,
@@ -106,19 +116,3 @@
 		)
 	spawn_loot_count = 1
 
-/obj/effect/spawner/random/decoration/paint
-	name = "paint spawner"
-	icon_state = "paint"
-	loot_subtype_path = /obj/item/paint
-	loot = list()
-
-/obj/effect/spawner/random/decoration/flower
-	name = "random flower spawner"
-	icon_state = "flower"
-	loot = list(
-		/obj/item/reagent_containers/food/snacks/grown/poppy,
-		/obj/item/reagent_containers/food/snacks/grown/harebell,
-		/obj/item/reagent_containers/food/snacks/grown/trumpet,
-		/obj/item/reagent_containers/food/snacks/grown/sunflower,
-		/obj/item/reagent_containers/food/snacks/grown/rose,
-	)
diff --git a/code/game/objects/effects/spawners/random.dm/food_or_drink.dm b/code/game/objects/effects/spawners/random.dm/food_or_drink.dm
index 00a4fc76e056..300f94260ee1 100644
--- a/code/game/objects/effects/spawners/random.dm/food_or_drink.dm
+++ b/code/game/objects/effects/spawners/random.dm/food_or_drink.dm
@@ -6,8 +6,6 @@
 /obj/effect/spawner/random/food_or_drink/donkpockets
 	name = "donk pocket box spawner"
 	icon_state = "donkpocket"
-	spawn_loot_double = FALSE
-
 	loot = list(
 			/obj/item/storage/box/donkpockets/donkpocketspicy = 1,
 			/obj/item/storage/box/donkpockets/donkpocketteriyaki = 1,
@@ -17,6 +15,7 @@
 		)
 
 /obj/effect/spawner/random/food_or_drink/ration
+	name = "ration spawner"
 	icon_state = "pizzabox"
 	loot = list (
 		/obj/item/storage/ration/vegan_chili = 5,
@@ -45,7 +44,6 @@
 /obj/effect/spawner/random/food_or_drink/donut
 	name = "random donut" //donut :)
 	icon_state = "pizzabox"
-	spawn_loot_count = 1
 	loot = list(
 				/obj/item/reagent_containers/food/snacks/donut/apple = 1,
 				/obj/item/reagent_containers/food/snacks/donut/berry = 1,
@@ -63,7 +61,6 @@
 
 /obj/effect/spawner/random/food_or_drink/donut/jelly
 	name = "random jelly donut"
-	spawn_loot_count = 1
 	loot = list(
 				/obj/item/reagent_containers/food/snacks/donut/jelly/berry = 1,
 				/obj/item/reagent_containers/food/snacks/donut/jelly/apple = 1,
@@ -79,7 +76,6 @@
 
 /obj/effect/spawner/random/food_or_drink/donut/slimejelly
 	name = "random slimejelly donut"
-	spawn_loot_count = 1
 	loot = list(
 				/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/apple = 1,
 				/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/berry = 1,
diff --git a/code/game/objects/effects/spawners/random.dm/trash.dm b/code/game/objects/effects/spawners/random.dm/trash.dm
index 69520f002fc8..3c15e77106a3 100644
--- a/code/game/objects/effects/spawners/random.dm/trash.dm
+++ b/code/game/objects/effects/spawners/random.dm/trash.dm
@@ -206,7 +206,6 @@
 		/obj/structure/holosign/barrier/wetsign = 2,
 	)
 
-
 /obj/effect/spawner/random/trash/bucket
 	name = "bucket spawner"
 	icon_state = "caution"
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index f80875d0161b..4fb7ceac4527 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -138,6 +138,7 @@
 // Base version - place these on maps/templates.
 /obj/effect/mob_spawn/human
 	mob_type = /mob/living/carbon/human
+	icon_state = "corpsehuman"
 	//Human specific stuff.
 	var/mob_species = null		//Set to make them a mutant race such as lizard or skeleton. Uses the datum typepath instead of the ID.
 	var/datum/outfit/outfit = /datum/outfit	//If this is a path, it will be instanced in Initialize()
diff --git a/icons/effects/mapping/mapping_helpers.dmi b/icons/effects/mapping/mapping_helpers.dmi
index 115a133f04e2..430ac86c6db5 100644
Binary files a/icons/effects/mapping/mapping_helpers.dmi and b/icons/effects/mapping/mapping_helpers.dmi differ