diff --git a/_maps/RandomRuins/JungleRuins/jungle_pirate.dmm b/_maps/RandomRuins/JungleRuins/jungle_pirate.dmm
index 739244a8b282..0f06ae783e3d 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_pirate.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_pirate.dmm
@@ -51,6 +51,8 @@
 "iw" = (
 /obj/item/ammo_box/c45,
 /obj/structure/table/wood/poker,
+/obj/item/ammo_box/c45,
+/obj/item/ammo_box/c45,
 /turf/open/floor/wood,
 /area/ruin/unpowered)
 "iC" = (
@@ -97,6 +99,7 @@
 "nD" = (
 /obj/item/ammo_box/a40mm,
 /obj/structure/table/wood/poker,
+/obj/item/ammo_box/a40mm,
 /turf/open/floor/wood,
 /area/ruin/unpowered)
 "of" = (
@@ -265,7 +268,6 @@
 /turf/open/floor/wood,
 /area/ruin/unpowered)
 "LD" = (
-/obj/item/ammo_box/c45_speedloader,
 /obj/structure/table/wood/poker,
 /turf/open/floor/wood,
 /area/ruin/unpowered)
@@ -316,7 +318,11 @@
 /obj/item/gun/ballistic/shotgun/brimstone,
 /obj/item/gun/ballistic/shotgun/brimstone,
 /obj/item/gun/ballistic/shotgun/brimstone,
-/obj/item/gun/grenadelauncher,
+/obj/item/gun/ballistic/revolver/grenadelauncher,
+/obj/item/spacecash/bundle/c500,
+/obj/item/spacecash/bundle/c500,
+/obj/item/spacecash/bundle/c500,
+/obj/item/spacecash/bundle/c500,
 /turf/open/floor/wood,
 /area/ruin/unpowered)
 "SA" = (
diff --git a/_maps/RandomRuins/JungleRuins/jungle_witch.dmm b/_maps/RandomRuins/JungleRuins/jungle_witch.dmm
index 70080ddae51b..58b5f38f83ae 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_witch.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_witch.dmm
@@ -9,7 +9,6 @@
 	pixel_y = 1
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/item/gun/magic/wand/nothing,
 /obj/structure/table/wood/fancy,
 /turf/open/floor/wood,
 /area/ruin/powered)
@@ -82,7 +81,6 @@
 "nV" = (
 /obj/item/bedsheet/black,
 /obj/structure/bed,
-/mob/living/simple_animal/hostile/dark_wizard,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /obj/item/clothing/gloves/combat/wizard,
 /turf/open/floor/wood,
@@ -237,10 +235,6 @@
 /obj/structure/trap/chill,
 /turf/open/water/jungle/lit,
 /area/overmap_encounter/planetoid/jungle/explored)
-"Go" = (
-/mob/living/simple_animal/hostile/dark_wizard,
-/turf/open/floor/wood,
-/area/ruin/powered)
 "Gx" = (
 /mob/living/simple_animal/pet/cat/Runtime{
 	name = "Witches Familiar"
@@ -387,7 +381,7 @@ ym
 Kc
 Kc
 Uy
-Go
+Kc
 Kc
 Eq
 wI
diff --git a/_maps/RandomRuins/RockRuins/rockplanet_cult.dmm b/_maps/RandomRuins/RockRuins/rockplanet_cult.dmm
index c1ed6773992d..a9bbc02a0a78 100644
--- a/_maps/RandomRuins/RockRuins/rockplanet_cult.dmm
+++ b/_maps/RandomRuins/RockRuins/rockplanet_cult.dmm
@@ -31,7 +31,6 @@
 /turf/open/floor/plasteel/dark,
 /area/overmap_encounter/planetoid/rockplanet/explored)
 "h" = (
-/obj/item/stack/sheet/runed_metal/ten,
 /obj/structure/table/wood/fancy/red,
 /turf/open/floor/plating/rust,
 /area/overmap_encounter/planetoid/rockplanet/explored)
diff --git a/_maps/RandomRuins/RockRuins/rockplanet_wizard.dmm b/_maps/RandomRuins/RockRuins/rockplanet_wizard.dmm
index c70c29c88132..3af43be21bab 100644
--- a/_maps/RandomRuins/RockRuins/rockplanet_wizard.dmm
+++ b/_maps/RandomRuins/RockRuins/rockplanet_wizard.dmm
@@ -24,8 +24,8 @@
 /turf/open/floor/mineral/plastitanium,
 /area/overmap_encounter/planetoid/rockplanet/explored)
 "i" = (
-/mob/living/simple_animal/hostile/dark_wizard,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/trap,
 /turf/open/floor/mineral/plastitanium,
 /area/overmap_encounter/planetoid/rockplanet/explored)
 "k" = (
@@ -58,10 +58,12 @@
 /area/overmap_encounter/planetoid/rockplanet/explored)
 "t" = (
 /obj/structure/mineral_door/iron,
+/obj/effect/spawner/trap,
 /turf/open/floor/mineral/plastitanium,
 /area/overmap_encounter/planetoid/rockplanet/explored)
 "u" = (
 /obj/structure/closet/crate/miningcar,
+/obj/item/clothing/suit/space/hardsuit/shielded/wizard,
 /turf/open/floor/mineral/plastitanium,
 /area/overmap_encounter/planetoid/rockplanet/explored)
 "x" = (
@@ -86,6 +88,12 @@
 /area/overmap_encounter/planetoid/rockplanet/explored)
 "C" = (
 /obj/effect/decal/cleanable/crayon,
+/obj/effect/spawner/trap,
+/turf/open/floor/mineral/plastitanium,
+/area/overmap_encounter/planetoid/rockplanet/explored)
+"D" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/gibspawner/robot,
 /turf/open/floor/mineral/plastitanium,
 /area/overmap_encounter/planetoid/rockplanet/explored)
 "E" = (
@@ -97,6 +105,10 @@
 /obj/effect/decal/cleanable/cobweb,
 /turf/open/floor/mineral/plastitanium,
 /area/overmap_encounter/planetoid/rockplanet/explored)
+"F" = (
+/obj/effect/gibspawner,
+/turf/open/floor/mineral/plastitanium,
+/area/overmap_encounter/planetoid/rockplanet/explored)
 "H" = (
 /obj/structure/closet/crate/freezer/blood,
 /obj/effect/decal/cleanable/blood/old,
@@ -114,6 +126,7 @@
 /area/overmap_encounter/planetoid/rockplanet/explored)
 "L" = (
 /obj/item/candle/infinite,
+/obj/effect/gibspawner/generic/animal,
 /turf/open/floor/mineral/plastitanium,
 /area/overmap_encounter/planetoid/rockplanet/explored)
 "M" = (
@@ -142,7 +155,7 @@
 /turf/open/floor/mineral/plastitanium,
 /area/overmap_encounter/planetoid/rockplanet/explored)
 "R" = (
-/mob/living/simple_animal/hostile/dark_wizard,
+/obj/effect/spawner/trap,
 /turf/open/floor/mineral/plastitanium,
 /area/overmap_encounter/planetoid/rockplanet/explored)
 "S" = (
@@ -161,8 +174,6 @@
 /area/overmap_encounter/planetoid/rockplanet/explored)
 "V" = (
 /obj/structure/table/wood,
-/obj/item/clothing/head/helmet/knight,
-/obj/item/clothing/suit/armor/riot/knight,
 /turf/open/floor/mineral/plastitanium,
 /area/overmap_encounter/planetoid/rockplanet/explored)
 "Z" = (
@@ -201,8 +212,8 @@ a
 m
 d
 I
-i
-T
+e
+R
 E
 m
 a
@@ -211,8 +222,8 @@ a
 r
 B
 s
-T
-T
+R
+F
 z
 T
 N
@@ -221,8 +232,8 @@ r
 (5,1,1) = {"
 r
 M
-e
-R
+D
+T
 S
 C
 e
@@ -233,10 +244,10 @@ t
 r
 H
 y
-T
+R
 T
 L
-T
+R
 o
 r
 "}
diff --git a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm
index a1bfbbcabd83..ad3e83b5d22a 100644
--- a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm
+++ b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm
@@ -333,7 +333,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/mob_spawn/human/scientist,
 /obj/effect/decal/cleanable/blood/bubblegum,
-/obj/item/switchblade,
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav)
 "ln" = (
diff --git a/_maps/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/RandomRuins/SpaceRuins/onehalf.dmm
index c6865869604a..135d6cd5f2c7 100644
--- a/_maps/RandomRuins/SpaceRuins/onehalf.dmm
+++ b/_maps/RandomRuins/SpaceRuins/onehalf.dmm
@@ -138,11 +138,6 @@
 /obj/machinery/vending/snack,
 /turf/open/floor/plasteel/cult/airless,
 /area/ruin/space/has_grav/onehalf)
-"ay" = (
-/obj/structure/lattice,
-/obj/item/stack/sheet/runed_metal,
-/turf/open/space/basic,
-/area/space/nearstation)
 "az" = (
 /obj/machinery/washing_machine,
 /turf/open/floor/plasteel/airless,
@@ -257,11 +252,6 @@
 /obj/machinery/door/airlock,
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/onehalf)
-"aT" = (
-/obj/structure/lattice,
-/obj/item/stack/sheet/runed_metal,
-/turf/open/space,
-/area/space/nearstation)
 "aU" = (
 /obj/effect/turf_decal/solarpanel,
 /obj/machinery/power/solar,
@@ -814,11 +804,6 @@
 	},
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/onehalf)
-"cr" = (
-/obj/structure/girder/displaced,
-/obj/item/stack/sheet/runed_metal,
-/turf/open/floor/plasteel/cult/airless,
-/area/space/nearstation)
 "cs" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
@@ -1673,10 +1658,6 @@
 	},
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/onehalf)
-"BD" = (
-/obj/item/stack/sheet/runed_metal,
-/turf/open/floor/plasteel/cult/airless,
-/area/ruin/space/has_grav/onehalf)
 "Cl" = (
 /obj/structure/lattice,
 /obj/structure/railing{
@@ -1752,11 +1733,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating/airless,
 /area/ruin/space/has_grav/onehalf)
-"FC" = (
-/obj/structure/girder/reinforced,
-/obj/item/stack/sheet/runed_metal,
-/turf/open/floor/plating/airless,
-/area/ruin/space/has_grav/onehalf)
 "Ga" = (
 /obj/effect/turf_decal/solarpanel,
 /obj/machinery/power/solar,
@@ -1780,12 +1756,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/onehalf)
-"Gv" = (
-/obj/structure/frame/computer{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/ruin/space/has_grav/onehalf)
 "GC" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/grille,
@@ -2388,7 +2358,7 @@ aa
 cE
 aa
 cE
-aT
+cE
 aa
 aa
 aa
@@ -2466,7 +2436,7 @@ cj
 er
 aa
 aa
-cr
+Xk
 aH
 aa
 aa
@@ -2687,7 +2657,7 @@ aa
 aH
 aH
 cX
-ay
+aH
 aa
 aa
 "}
@@ -2787,8 +2757,8 @@ OE
 WP
 bo
 ax
-FC
-FC
+bQ
+bQ
 cj
 aa
 aa
@@ -2902,7 +2872,7 @@ aa
 aH
 cD
 aa
-BD
+Dw
 Ep
 aa
 aa
@@ -3008,7 +2978,7 @@ ch
 ws
 tB
 cL
-BD
+Dw
 Dw
 dd
 aW
@@ -3366,7 +3336,7 @@ bU
 UM
 cp
 ZX
-Gv
+Ra
 Ra
 cU
 YE
diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_fortress_of_solitide.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_fortress_of_solitide.dmm
index b795826ec6c2..ab321f20c55e 100644
--- a/_maps/RandomRuins/WasteRuins/wasteplanet_fortress_of_solitide.dmm
+++ b/_maps/RandomRuins/WasteRuins/wasteplanet_fortress_of_solitide.dmm
@@ -2163,10 +2163,6 @@
 /area/ruin/powered)
 "uB" = (
 /obj/structure/table/wood,
-/obj/item/switchblade{
-	pixel_x = -3;
-	pixel_y = 4
-	},
 /obj/item/coin/antagtoken{
 	pixel_x = 4;
 	pixel_y = -2
@@ -4649,6 +4645,11 @@
 	},
 /turf/open/floor/plating,
 /area/ruin/powered)
+"RA" = (
+/obj/item/clothing/suit/space/hardsuit/shielded,
+/obj/structure/safe,
+/turf/open/floor/plating/rust,
+/area/ruin/powered)
 "RG" = (
 /obj/machinery/door/airlock/maintenance{
 	name = "The Serpentorium";
@@ -7281,7 +7282,7 @@ in
 xx
 zK
 YB
-av
+RA
 XF
 JX
 wM