diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index d5aa0f7a918..fd521dd84f2 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -3246,7 +3246,8 @@
 	},
 /area/maintenance/fore2)
 "are" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/maintenance/fore2)
 "arf" = (
 /obj/machinery/computer/arcade{
@@ -4753,7 +4754,8 @@
 /turf/simulated/floor/plasteel,
 /area/maintenance/disposal)
 "auE" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/maintenance/disposal)
 "auF" = (
 /obj/machinery/power/emitter,
@@ -4788,7 +4790,8 @@
 /turf/simulated/floor/plating,
 /area/engine/controlroom)
 "auL" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/maintenance/electrical_shop)
 "auM" = (
 /obj/machinery/door/airlock/maintenance,
@@ -5605,7 +5608,8 @@
 /turf/simulated/floor/plasteel,
 /area/maintenance/fore2)
 "awx" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/security/checkpoint2)
 "awA" = (
 /obj/machinery/conveyor{
@@ -5825,7 +5829,8 @@
 /area/maintenance/fore)
 "awW" = (
 /obj/effect/decal/cleanable/fungus,
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/maintenance/fore)
 "awX" = (
 /turf/simulated/wall,
@@ -5846,7 +5851,8 @@
 /turf/simulated/floor/plasteel,
 /area/maintenance/fore2)
 "awZ" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/janitor)
 "axa" = (
 /obj/machinery/door/firedoor,
@@ -8728,7 +8734,8 @@
 	},
 /area/hallway/primary/fore)
 "aDH" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/maintenance/fore)
 "aDI" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -12212,7 +12219,8 @@
 /turf/simulated/floor/plasteel,
 /area/engine/controlroom)
 "aLp" = (
-/turf/simulated/wall/r_wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall/r_wall,
 /area/engine/controlroom)
 "aLq" = (
 /obj/effect/decal/warning_stripes/yellow/hollow,
@@ -12832,7 +12840,8 @@
 /turf/simulated/floor/plasteel/dark,
 /area/crew_quarters/bar)
 "aMY" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/maintenance/gambling_den)
 "aMZ" = (
 /obj/structure/cable{
@@ -21792,7 +21801,8 @@
 /turf/simulated/wall,
 /area/maintenance/starboard2)
 "bgt" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/maintenance/starboard2)
 "bgu" = (
 /obj/machinery/door/airlock/freezer{
@@ -26675,7 +26685,8 @@
 /turf/simulated/wall,
 /area/maintenance/starboard)
 "bqC" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/maintenance/starboard)
 "bqJ" = (
 /obj/structure/table,
@@ -46495,7 +46506,8 @@
 /turf/simulated/floor/plating,
 /area/turret_protected/aisat)
 "chv" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/teleporter)
 "chw" = (
 /obj/structure/lattice/catwalk,
@@ -46870,7 +46882,8 @@
 /area/maintenance/port)
 "ciq" = (
 /obj/effect/spawner/random_spawners/wall_rusted_maybe,
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/maintenance/port)
 "ciu" = (
 /obj/structure/chair/office/dark{
@@ -48282,7 +48295,8 @@
 /turf/simulated/wall/r_wall,
 /area/engine/engine_smes)
 "clw" = (
-/turf/simulated/wall/r_wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall/r_wall,
 /area/engine/engine_smes)
 "clx" = (
 /obj/machinery/light/small{
@@ -48808,7 +48822,8 @@
 /turf/simulated/floor/plating,
 /area/security/range)
 "cmI" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/security/range)
 "cmL" = (
 /obj/structure/lattice,
@@ -55974,7 +55989,8 @@
 	},
 /area/maintenance/port)
 "cCx" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/maintenance/port)
 "cCy" = (
 /obj/structure/reagent_dispensers/watertank,
@@ -56173,7 +56189,8 @@
 	},
 /area/hallway/primary/central)
 "cDe" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/crew_quarters/locker/locker_toilet)
 "cDf" = (
 /obj/effect/decal/warning_stripes/south,
@@ -56700,7 +56717,8 @@
 /turf/simulated/floor/plasteel/dark,
 /area/crew_quarters/fitness)
 "cEA" = (
-/turf/simulated/wall/r_wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall/r_wall,
 /area/engine/engineering)
 "cEB" = (
 /obj/structure/plasticflaps{
@@ -58496,7 +58514,8 @@
 /turf/simulated/floor/plasteel,
 /area/maintenance/starboard)
 "cIa" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/crew_quarters/fitness)
 "cIb" = (
 /obj/machinery/washing_machine,
@@ -58678,7 +58697,8 @@
 	},
 /area/maintenance/port)
 "cIw" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/maintenance/electrical)
 "cIx" = (
 /turf/simulated/wall,
@@ -64475,7 +64495,8 @@
 /turf/simulated/floor/plasteel,
 /area/hallway/secondary/exit)
 "cWc" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/medical/medbay3)
 "cWd" = (
 /turf/simulated/wall,
@@ -65173,7 +65194,8 @@
 	},
 /area/medical/medbay3)
 "cXI" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/medical/surgery)
 "cXJ" = (
 /turf/simulated/wall,
@@ -66343,7 +66365,8 @@
 /turf/space,
 /area/maintenance/starboardsolar)
 "daD" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/toxins/xenobiology)
 "daE" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -66837,7 +66860,8 @@
 /turf/simulated/floor/plating,
 /area/maintenance/port2)
 "dbM" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/maintenance/port2)
 "dbO" = (
 /obj/machinery/light{
@@ -71007,7 +71031,8 @@
 /turf/simulated/floor/plating,
 /area/maintenance/abandonedbar)
 "dku" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/maintenance/apmaint)
 "dkv" = (
 /obj/structure/table/wood,
@@ -74270,7 +74295,8 @@
 /turf/simulated/floor/plating,
 /area/maintenance/starboard)
 "dsk" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/hallway/secondary/construction)
 "dsl" = (
 /obj/machinery/door/airlock/maintenance,
@@ -76491,7 +76517,8 @@
 /turf/simulated/floor/plasteel/white,
 /area/toxins/mixing)
 "dxh" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/toxins/mixing)
 "dxi" = (
 /obj/structure/table/reinforced,
@@ -79465,7 +79492,8 @@
 	},
 /area/maintenance/starboard)
 "dDG" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/crew_quarters/theatre)
 "dDH" = (
 /obj/structure/dresser,
@@ -79529,7 +79557,8 @@
 /turf/simulated/floor/plasteel,
 /area/toxins/storage)
 "dDT" = (
-/turf/simulated/wall/r_wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall/r_wall,
 /area/toxins/mixing)
 "dDU" = (
 /obj/machinery/atmospherics/unary/portables_connector,
@@ -79642,7 +79671,8 @@
 /turf/simulated/wall,
 /area/maintenance/aft)
 "dEp" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/maintenance/aft)
 "dEq" = (
 /obj/effect/spawner/window/reinforced,
@@ -80010,7 +80040,8 @@
 /turf/simulated/floor/plasteel,
 /area/library/abandoned)
 "dFk" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/library/abandoned)
 "dFl" = (
 /obj/effect/spawner/random_spawners/blood_maybe,
@@ -84323,7 +84354,8 @@
 	},
 /area/hallway/secondary/exit)
 "dPS" = (
-/turf/simulated/wall/r_wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall/r_wall,
 /area/medical/virology)
 "dPT" = (
 /obj/structure/disposalpipe/segment,
@@ -84825,7 +84857,8 @@
 /turf/simulated/floor/plating,
 /area/maintenance/apmaint)
 "dQS" = (
-/turf/simulated/wall/r_wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall/r_wall,
 /area/maintenance/apmaint)
 "dQT" = (
 /obj/structure/table,
@@ -93543,7 +93576,8 @@
 	},
 /area/security/brig)
 "qET" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/maintenance/fsmaint)
 "qGn" = (
 /obj/machinery/hologram/holopad,
@@ -96784,7 +96818,8 @@
 	},
 /area/security/seceqstorage)
 "xPn" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/maintenance/abandonedbar)
 "xPW" = (
 /obj/machinery/light,
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_envy.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_envy.dmm
index 9af10e440c2..2628c8c4f24 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_envy.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_envy.dmm
@@ -9,7 +9,8 @@
 /turf/simulated/floor/plating/lava/smooth/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "d" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/ruin/unpowered/misc_lavaruin)
 "e" = (
 /obj/structure/mirror{
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm b/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
index fe74e127741..39918d7f8b9 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
@@ -15,7 +15,8 @@
 /turf/simulated/wall,
 /area/ruin/unpowered)
 "f" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/ruin/unpowered)
 "g" = (
 /turf/simulated/floor/plating,
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
index 7b0b45a34ee..ffa2baf681e 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
@@ -23,7 +23,8 @@
 /turf/simulated/floor/plating/airless,
 /area/template_noop)
 "af" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/template_noop)
 "ag" = (
 /obj/structure/lattice,
@@ -53,11 +54,13 @@
 /turf/simulated/floor/plasteel/dark,
 /area/ruin/space/ancientstation/hivebot)
 "al" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/ruin/space/ancientstation/comm)
 "am" = (
 /obj/structure/sign/poster/official/nanotrasen_logo,
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/ruin/space/ancientstation/comm)
 "an" = (
 /obj/effect/spawner/window/reinforced,
@@ -132,7 +135,8 @@
 /turf/simulated/wall,
 /area/ruin/space/ancientstation/hivebot)
 "az" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/ruin/space/ancientstation)
 "aA" = (
 /obj/structure/table,
@@ -207,7 +211,8 @@
 /area/ruin/space/ancientstation)
 "aK" = (
 /obj/structure/sign/poster/contraband/random,
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/ruin/space/ancientstation)
 "aL" = (
 /obj/structure/cable{
@@ -355,7 +360,8 @@
 /turf/simulated/floor/plasteel/airless,
 /area/ruin/space/ancientstation/betanorth)
 "bf" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/ruin/space/ancientstation/betanorth)
 "bg" = (
 /obj/effect/decal/cleanable/dirt,
@@ -454,7 +460,8 @@
 /area/ruin/space/ancientstation/comm)
 "bs" = (
 /obj/structure/sign/poster/official/cleanliness,
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/ruin/space/ancientstation)
 "bt" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -468,7 +475,8 @@
 /turf/simulated/floor/plating/airless,
 /area/template_noop)
 "bu" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/ruin/space/ancientstation/thetacorridor)
 "bv" = (
 /turf/simulated/wall,
@@ -509,7 +517,8 @@
 /area/ruin/space/ancientstation)
 "bD" = (
 /obj/structure/sign/greencross,
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/ruin/space/ancientstation)
 "bE" = (
 /obj/structure/cable{
@@ -567,7 +576,8 @@
 /area/ruin/space/ancientstation)
 "bL" = (
 /obj/structure/sign/science,
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/ruin/space/ancientstation)
 "bM" = (
 /obj/effect/spawner/window/reinforced,
@@ -588,10 +598,12 @@
 /area/ruin/space/ancientstation/thetacorridor)
 "bP" = (
 /obj/structure/sign/poster/official/science,
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/ruin/space/ancientstation/thetacorridor)
 "bQ" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/ruin/space/ancientstation/hivebot)
 "bR" = (
 /obj/effect/decal/cleanable/dirt,
@@ -860,7 +872,8 @@
 /turf/simulated/floor/plasteel,
 /area/ruin/space/ancientstation)
 "cA" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/ruin/space/ancientstation/hydroponics)
 "cB" = (
 /obj/effect/spawner/window/reinforced,
@@ -989,7 +1002,8 @@
 /area/ruin/space/ancientstation/betanorth)
 "cS" = (
 /obj/structure/sign/poster/official/nanomichi_ad,
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/ruin/space/ancientstation/betanorth)
 "cT" = (
 /obj/machinery/light/small{
@@ -999,7 +1013,8 @@
 /turf/simulated/floor/plasteel/airless,
 /area/ruin/space/ancientstation/betanorth)
 "cU" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/ruin/space/ancientstation/engi)
 "cV" = (
 /obj/structure/cable{
@@ -1089,7 +1104,8 @@
 /turf/simulated/floor/plating/airless,
 /area/template_noop)
 "dg" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/ruin/space/ancientstation/sec)
 "dh" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
@@ -1116,7 +1132,8 @@
 /turf/simulated/floor/plasteel,
 /area/ruin/space/ancientstation/thetacorridor)
 "dj" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/ruin/space/ancientstation/rnd)
 "dk" = (
 /obj/structure/transit_tube_pod{
@@ -1235,7 +1252,8 @@
 /area/ruin/space/ancientstation)
 "dA" = (
 /obj/structure/sign/poster/contraband/donut_corp,
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/ruin/space/ancientstation/sec)
 "dB" = (
 /obj/machinery/alarm/all_access{
@@ -1770,7 +1788,8 @@
 /area/ruin/space/ancientstation)
 "eN" = (
 /obj/structure/sign/poster/official/here_for_your_safety,
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/ruin/space/ancientstation/sec)
 "eO" = (
 /obj/structure/table,
@@ -2608,7 +2627,8 @@
 /turf/simulated/floor/plasteel,
 /area/ruin/space/ancientstation/engi)
 "gs" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/ruin/space/ancientstation/kitchen)
 "gt" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -3517,7 +3537,8 @@
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/ancientstation/atmo)
 "ip" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/ruin/space/ancientstation/atmo)
 "iq" = (
 /obj/effect/decal/cleanable/cobweb,
@@ -3554,7 +3575,8 @@
 	icon_state = "radiation";
 	name = "\improper HAZARDOUS RADIATION"
 	},
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/ruin/space/ancientstation/engi)
 "iu" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -3992,7 +4014,8 @@
 /turf/simulated/floor/plating,
 /area/ruin/space/ancientstation)
 "jt" = (
-/turf/simulated/wall/r_wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall/r_wall,
 /area/ruin/space/ancientstation/proto)
 "ju" = (
 /obj/structure/cable{
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp_tele.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp_tele.dmm
index fc92ec244fc..d386c35d508 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/ussp_tele.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp_tele.dmm
@@ -45,7 +45,8 @@
 /turf/simulated/floor/plating/airless,
 /area/derelict/teleporter)
 "j" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/derelict/teleporter)
 "k" = (
 /obj/structure/girder,
diff --git a/_maps/map_files/RandomZLevels/evil_santa.dmm b/_maps/map_files/RandomZLevels/evil_santa.dmm
index e2c9b383928..6d64cbde2cb 100644
--- a/_maps/map_files/RandomZLevels/evil_santa.dmm
+++ b/_maps/map_files/RandomZLevels/evil_santa.dmm
@@ -242,7 +242,8 @@
 	},
 /area/awaymission/challenge/main)
 "aM" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/awaymission/challenge/main)
 "aN" = (
 /obj/structure/inflatable/door,
diff --git a/_maps/map_files/RandomZLevels/moonoutpost19.dmm b/_maps/map_files/RandomZLevels/moonoutpost19.dmm
index 2b03184c865..e9b95139710 100644
--- a/_maps/map_files/RandomZLevels/moonoutpost19.dmm
+++ b/_maps/map_files/RandomZLevels/moonoutpost19.dmm
@@ -2279,7 +2279,8 @@
 	name = "MO19 Research"
 	})
 "dZ" = (
-/turf/simulated/wall/r_wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall/r_wall,
 /area/awaycontent/a2{
 	name = "MO19 Research"
 	})
@@ -2597,7 +2598,8 @@
 	name = "MO19 Research"
 	})
 "eK" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/awaycontent/a2{
 	name = "MO19 Research"
 	})
@@ -2698,7 +2700,8 @@
 /turf/simulated/wall,
 /area/awaycontent/a7)
 "eU" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/awaycontent/a7)
 "eV" = (
 /turf/simulated/wall/r_wall,
@@ -3257,7 +3260,8 @@
 /turf/simulated/floor/plating,
 /area/awaycontent/a7)
 "fP" = (
-/turf/simulated/wall/r_wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall/r_wall,
 /area/awaycontent/a7)
 "fQ" = (
 /obj/structure/cable{
@@ -3546,7 +3550,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/turf/simulated/wall/r_wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall/r_wall,
 /area/awaycontent/a2{
 	name = "MO19 Research"
 	})
@@ -4495,7 +4500,8 @@
 	name = "MO19 Research"
 	})
 "hJ" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/awaycontent/a1{
 	name = "MO19 Arrivals"
 	})
@@ -5207,7 +5213,8 @@
 	})
 "iU" = (
 /obj/machinery/computer/security/telescreen/entertainment,
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/awaycontent/a1{
 	name = "MO19 Arrivals"
 	})
diff --git a/_maps/map_files/RandomZLevels/terrorspiders.dmm b/_maps/map_files/RandomZLevels/terrorspiders.dmm
index b8e6be0b7eb..c28499261d5 100644
--- a/_maps/map_files/RandomZLevels/terrorspiders.dmm
+++ b/_maps/map_files/RandomZLevels/terrorspiders.dmm
@@ -9,7 +9,8 @@
 /turf/simulated/wall,
 /area/awaymission/UO71/plaza)
 "ad" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/awaymission/UO71/plaza)
 "ae" = (
 /obj/effect/decal/cleanable/dirt,
@@ -650,7 +651,8 @@
 /area/awaymission/UO71/plaza)
 "bV" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/awaymission/UO71/plaza)
 "bW" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -1910,7 +1912,8 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/UO71/plaza)
 "fa" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/awaymission/UO71/outside)
 "fb" = (
 /turf/simulated/wall,
@@ -1926,7 +1929,8 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/UO71/plaza)
 "fe" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/awaymission/UO71/centralhall)
 "ff" = (
 /obj/structure/disposalpipe/segment{
@@ -1951,7 +1955,8 @@
 /area/awaymission/UO71/plaza)
 "fh" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/awaymission/UO71/centralhall)
 "fi" = (
 /obj/structure/table/reinforced,
@@ -2189,10 +2194,12 @@
 /turf/simulated/wall,
 /area/awaymission/UO71/gateway)
 "fM" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/awaymission/UO71/gateway)
 "fN" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/awaymission/UO71/science)
 "fO" = (
 /turf/simulated/wall,
@@ -5349,7 +5356,8 @@
 /area/awaymission/UO71/gateway)
 "mR" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/awaymission/UO71/science)
 "mS" = (
 /obj/structure/reagent_dispensers/watertank,
@@ -5562,7 +5570,8 @@
 	},
 /area/awaymission/UO71/centralhall)
 "nr" = (
-/turf/simulated/wall/r_wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall/r_wall,
 /area/awaymission/UO71/eng)
 "ns" = (
 /obj/structure/chair/comfy/black{
@@ -5855,7 +5864,8 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/UO71/centralhall)
 "nT" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/awaymission/UO71/eng)
 "nU" = (
 /obj/machinery/door/firedoor,
@@ -7055,7 +7065,8 @@
 /turf/simulated/wall,
 /area/awaymission/UO71/medical)
 "pX" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/awaymission/UO71/medical)
 "pY" = (
 /obj/structure/cable{
@@ -9322,7 +9333,8 @@
 	desc = "A warning sign which reads 'DANGER - LETHAL BIOHAZARDS WITHIN'";
 	name = "CONTAINMENT AREA"
 	},
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/awaymission/UO71/mining)
 "ut" = (
 /turf/simulated/wall,
@@ -9730,7 +9742,8 @@
 	desc = "A warning sign which reads 'DANGER - LETHAL BIOHAZARDS WITHIN'";
 	name = "CONTAINMENT AREA"
 	},
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/awaymission/UO71/mining)
 "vm" = (
 /obj/machinery/atmospherics/binary/valve,
@@ -9983,7 +9996,8 @@
 /area/awaymission/UO71/mining)
 "vO" = (
 /obj/structure/sign/deathsposal,
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/awaymission/UO71/medical)
 "vP" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -10286,7 +10300,8 @@
 	},
 /area/awaymission/UO71/medical)
 "wu" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/awaymission/UO71/mining)
 "wv" = (
 /turf/simulated/wall,
@@ -11207,7 +11222,8 @@
 /obj/machinery/mineral/processing_unit_console{
 	machinedir = 8
 	},
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/awaymission/UO71/mining)
 "yo" = (
 /obj/structure/closet/emcloset,
@@ -11498,16 +11514,19 @@
 /area/awaymission/UO71/prince)
 "yZ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/awaymission/UO71/mining)
 "za" = (
 /obj/structure/sign/biohazard,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/awaymission/UO71/mining)
 "zb" = (
 /obj/structure/sign/biohazard,
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/awaymission/UO71/mining)
 "zc" = (
 /turf/simulated/wall/indestructible/syndicate,
@@ -11526,11 +11545,13 @@
 /turf/simulated/mineral/random/labormineral,
 /area/awaymission/UO71/queen)
 "zh" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/awaymission/UO71/queen)
 "zi" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/awaymission/UO71/queen)
 "zj" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -11843,7 +11864,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/awaymission/UO71/science)
 "IU" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index d3e51e50f5a..f063bbe294e 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -11810,7 +11810,8 @@
 /turf/simulated/floor/plating,
 /area/maintenance/abandonedbar)
 "aCP" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/maintenance/abandonedbar)
 "aCQ" = (
 /obj/structure/window/reinforced{
@@ -13211,7 +13212,8 @@
 /area/maintenance/abandonedbar)
 "aGd" = (
 /obj/effect/decal/cleanable/fungus,
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/maintenance/abandonedbar)
 "aGe" = (
 /obj/structure/table,
@@ -15825,7 +15827,8 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fpmaint2)
 "aMz" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/maintenance/fsmaint)
 "aMA" = (
 /turf/simulated/wall,
@@ -19110,7 +19113,8 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fsmaint)
 "aUf" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/maintenance/electrical)
 "aUg" = (
 /obj/structure/cable{
@@ -58176,7 +58180,8 @@
 /turf/simulated/floor/plating,
 /area/maintenance/apmaint)
 "cwA" = (
-/turf/simulated/wall/r_wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall/r_wall,
 /area/maintenance/apmaint)
 "cwB" = (
 /obj/machinery/light/small{
@@ -63773,7 +63778,8 @@
 	},
 /area/toxins/misc_lab)
 "cIJ" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/maintenance/aft2)
 "cIK" = (
 /turf/simulated/floor/wood{
@@ -79322,7 +79328,8 @@
 /turf/simulated/floor/engine,
 /area/engine/engineering)
 "iez" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/maintenance/apmaint)
 "ieI" = (
 /obj/machinery/atmospherics/binary/pump{
diff --git a/_maps/map_files/debug/smoothing.dmm b/_maps/map_files/debug/smoothing.dmm
index e57c9e182a9..60e3edce379 100644
--- a/_maps/map_files/debug/smoothing.dmm
+++ b/_maps/map_files/debug/smoothing.dmm
@@ -96,7 +96,8 @@
 /turf/simulated/floor/snow,
 /area/centcom)
 "B" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/centcom)
 "C" = (
 /turf/simulated/wall/mineral/uranium,
@@ -120,7 +121,8 @@
 /turf/simulated/floor/snow,
 /area/centcom)
 "I" = (
-/turf/simulated/wall/r_wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall/r_wall,
 /area/centcom)
 
 (1,1,1) = {"
diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm
index b0150156c1b..f3d604f4bd9 100644
--- a/_maps/map_files/generic/Lavaland.dmm
+++ b/_maps/map_files/generic/Lavaland.dmm
@@ -4153,7 +4153,8 @@
 /turf/simulated/floor/mineral/plastitanium/red,
 /area/shuttle/siberia)
 "qT" = (
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/mine/laborcamp)
 "rj" = (
 /obj/structure/chair{
@@ -4657,7 +4658,8 @@
 /area/shuttle/siberia)
 "Gp" = (
 /obj/structure/sign/poster/contraband/clown,
-/turf/simulated/wall/rust,
+/obj/effect/spawner/random_spawners/wall_rusted_always,
+/turf/simulated/wall,
 /area/mine/laborcamp)
 "GD" = (
 /obj/structure/sign/poster/contraband/lusty_xenomorph,
diff --git a/_maps/map_files/shuttles/admin_hospital.dmm b/_maps/map_files/shuttles/admin_hospital.dmm
index c02fd11d80c..7a6a9c612a5 100644
--- a/_maps/map_files/shuttles/admin_hospital.dmm
+++ b/_maps/map_files/shuttles/admin_hospital.dmm
@@ -214,15 +214,6 @@
 /obj/effect/spawner/window/shuttle,
 /turf/simulated/floor/plating,
 /area/shuttle/administration)
-"aQ" = (
-/obj/structure/chair{
-	dir = 4
-	},
-/obj/structure/chair/comfy/shuttle{
-	dir = 4
-	},
-/turf/simulated/floor/mineral/titanium,
-/area/shuttle/administration)
 "aR" = (
 /obj/structure/chair{
 	dir = 8
@@ -879,9 +870,9 @@ ab
 ah
 av
 aw
-aQ
+av
 aw
-aQ
+av
 bc
 aP
 aw
diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm
index c0c39e424b7..9fc986b3d2e 100644
--- a/code/game/turfs/simulated/walls_misc.dm
+++ b/code/game/turfs/simulated/walls_misc.dm
@@ -33,28 +33,6 @@
 /turf/simulated/wall/cult/devastate_wall()
 	new sheet_type(get_turf(src), sheet_amount)
 
-/turf/simulated/wall/rust
-	name = "!deprecated, use rust spawner! rusted wall"
-	icon_state = "outdated"
-	icon = 'icons/turf/walls.dmi'
-	smoothing_flags = null
-
-/turf/simulated/wall/rust/Initialize(mapload)
-	. = ..()
-	var/turf/simulated/wall/target = ChangeTurf(/turf/simulated/wall)
-	target.rust()
-
-/turf/simulated/wall/r_wall/rust
-	name = "!deprecated, use rust spawner! rusted reinforced wall"
-	icon = 'icons/turf/walls.dmi'
-	icon_state = "outdated"
-	smoothing_flags = null
-
-/turf/simulated/wall/r_wall/rust/Initialize(mapload)
-	. = ..()
-	var/turf/simulated/wall/r_wall/target = ChangeTurf(/turf/simulated/wall/r_wall)
-	target.rust()
-
 //Clockwork walls
 /turf/simulated/wall/clockwork
 	name = "clockwork wall"
diff --git a/tools/mapmerge2/map_scripts/rust_converter.txt b/tools/mapmerge2/map_scripts/rust_converter.txt
new file mode 100644
index 00000000000..dd3b852f1b7
--- /dev/null
+++ b/tools/mapmerge2/map_scripts/rust_converter.txt
@@ -0,0 +1,2 @@
+/turf/simulated/wall/r_wall/rust : /turf/simulated/wall/r_wall , /obj/effect/spawner/random_spawners/wall_rusted_always
+/turf/simulated/wall/rust : /turf/simulated/wall , /obj/effect/spawner/random_spawners/wall_rusted_always
diff --git a/tools/mapmerge2/requirements.txt b/tools/mapmerge2/requirements.txt
index 7d6e4fd41d9..c717c74d757 100644
--- a/tools/mapmerge2/requirements.txt
+++ b/tools/mapmerge2/requirements.txt
@@ -1,3 +1,3 @@
-pygit2==1.0.1
-bidict==0.13.1
-Pillow==9.0.1
+pygit2==1.9.2
+bidict==0.22.0
+Pillow==9.1.1