Merge remote-tracking branch 'upstream/master'

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm

@@ -723,13 +723,6 @@
 /obj/item/stack/sheet/metal,
 /turf/simulated/floor/plating/lavaland_air,
 /area/ruin/unpowered/althland_excavation)
-"jT" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random_spawners/wall_rusted_maybe,
-/turf/simulated/wall/r_wall,
-/area/ruin/unpowered/althland_excavation)
 "kh" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/mecha_wreckage/ripley,
@@ -786,7 +779,6 @@
 /turf/simulated/floor/plating/lavaland_air,
 /area/ruin/unpowered/althland_excavation)
 "nw" = (
-/obj/effect/decal/cleanable/dirt,
 /obj/effect/landmark/damageturf,
 /obj/effect/spawner/random_spawners/wall_rusted_maybe,
 /turf/simulated/wall/r_wall,
@@ -873,11 +865,6 @@
 /obj/effect/spawner/random_spawners/wall_rusted_maybe,
 /turf/simulated/wall/r_wall,
 /area/ruin/unpowered/althland_excavation)
-"sp" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random_spawners/wall_rusted_maybe,
-/turf/simulated/wall/r_wall,
-/area/ruin/unpowered/althland_excavation)
 "sA" = (
 /obj/structure/railing,
 /obj/effect/decal/cleanable/dirt,
@@ -1679,13 +1666,13 @@ yb
 bO
 nw
 gh
-jT
+TN
 Wt
 RG
 tj
-jT
+TN
 Zy
-sp
+TN
 aq
 dp
 Cs
@@ -1702,7 +1689,7 @@ oh
 Mm
 Mm
 TN
-sp
+TN
 aU
 Lt
 am
@@ -1828,7 +1815,7 @@ Ei
 (9,1,1) = {"
 Mm
 TN
-sp
+TN
 bC
 zw
 TN

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm

@@ -409,12 +409,6 @@
 /obj/structure/ore_box,
 /turf/simulated/floor/plasteel/lavaland_air,
 /area/ruin/unpowered/althland_processing)
-"nX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/stack/ore,
-/obj/effect/spawner/random_spawners/wall_rusted_maybe,
-/turf/simulated/wall/r_wall,
-/area/ruin/unpowered/althland_processing)
 "oj" = (
 /turf/simulated/floor/plating/lavaland_air,
 /area/ruin/unpowered/althland_processing)
@@ -517,12 +511,6 @@
 /obj/effect/landmark/damageturf,
 /turf/simulated/floor/plating/lavaland_air,
 /area/lavaland/surface/outdoors)
-"sv" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random_spawners/wall_rusted_always,
-/turf/simulated/wall/r_wall,
-/area/ruin/unpowered/althland_processing)
 "sB" = (
 /obj/effect/mapping_helpers/no_lava,
 /obj/structure/disposalpipe/trunk,
@@ -759,11 +747,6 @@
 /obj/effect/landmark/damageturf,
 /turf/simulated/floor/plating/lavaland_air,
 /area/lavaland/surface/outdoors)
-"AT" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/wall/r_wall,
-/area/ruin/unpowered/althland_processing)
 "BB" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/portable/pump,
@@ -785,11 +768,6 @@
 /obj/effect/landmark/damageturf,
 /turf/simulated/floor/plating/lavaland_air,
 /area/ruin/unpowered/althland_processing)
-"BO" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random_spawners/wall_rusted_maybe,
-/turf/simulated/wall/r_wall,
-/area/ruin/unpowered/althland_processing)
 "BV" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/landmark/damageturf,
@@ -1213,12 +1191,6 @@
 	},
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
-"QE" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random_spawners/wall_rusted_maybe,
-/turf/simulated/wall/r_wall,
-/area/ruin/unpowered/althland_processing)
 "RL" = (
 /obj/item/stack/sheet/metal{
 	amount = 5
@@ -1726,7 +1698,7 @@ KZ
 ab
 ui
 ui
-QE
+ui
 Lg
 ui
 ab
@@ -1773,7 +1745,7 @@ jb
 ab
 ab
 ui
-QE
+ui
 af
 BM
 Hz
@@ -1811,7 +1783,7 @@ ab
 ab
 af
 af
-AT
+Au
 Wb
 kR
 fc
@@ -1871,7 +1843,7 @@ bT
 JT
 zZ
 qn
-nX
+ui
 ui
 ui
 VJ
@@ -1957,7 +1929,7 @@ bT
 um
 um
 ui
-BO
+ui
 zR
 ui
 bT
@@ -2016,7 +1988,7 @@ ui
 iq
 MO
 eH
-BO
+ui
 ab
 ap
 ab
@@ -2158,7 +2130,7 @@ ab
 ab
 ui
 ui
-BO
+ui
 ui
 ui
 ab
@@ -2308,7 +2280,7 @@ bT
 ui
 ui
 nK
-sv
+um
 lZ
 ui
 Yd
@@ -2596,7 +2568,7 @@ af
 af
 ui
 ui
-BO
+ui
 ho
 ui
 bT

_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm

@@ -167,7 +167,7 @@
 /turf/simulated/floor/plasteel,
 /area/ruin/space/unpowered)
 "xs" = (
-/obj/effect/decal/cleanable/fungus,
+/obj/effect/spawner/random/fungus/frequent,
 /turf/simulated/floor/plasteel,
 /area/ruin/space/unpowered)
 "xQ" = (

_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm

@@ -5531,10 +5531,6 @@
 	},
 /turf/simulated/floor/engine,
 /area/ruin/space/moonbase19)
-"sy" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/wall/r_wall,
-/area/ruin/space/moonbase19)
 "sF" = (
 /obj/effect/spawner/random_spawners/wall_rusted_always,
 /turf/simulated/wall/indestructible/riveted,
@@ -14703,7 +14699,7 @@ Wd
 rL
 mh
 Mv
-sy
+ag
 tX
 tX
 Dd
@@ -16017,7 +16013,7 @@ OZ
 VR
 af
 bP
-sy
+ag
 af
 tX
 tX