From bc4bc1b9c39ec7edd06751b2d276c4ceef246a87 Mon Sep 17 00:00:00 2001
From: aeternaclose <127967350+aeternaclose@users.noreply.github.com>
Date: Tue, 16 Apr 2024 01:50:59 +0300
Subject: [PATCH] bugfix: Lavaland ruins baseturf bugfix (#4870)

nemnogo failov
---
 .../lavaland_biodome_clown_planet.dmm         |  7 +-
 .../LavaRuins/lavaland_biodome_green.dmm      | 18 ++--
 .../LavaRuins/lavaland_biodome_winter.dmm     | 53 +++++------
 .../lavaland_surface_althland_facility.dmm    | 19 ++--
 .../lavaland_surface_animal_hospital.dmm      | 38 ++++----
 .../lavaland_surface_ash_walker1.dmm          |  8 +-
 .../LavaRuins/lavaland_surface_golem_ship.dmm | 35 ++++----
 .../LavaRuins/lavaland_surface_grave.dmm      |  1 +
 .../LavaRuins/lavaland_surface_hermit.dmm     |  2 +-
 .../LavaRuins/lavaland_surface_legion.dmm     | 11 ++-
 .../lavaland_surface_monster_nest.dmm         | 15 +---
 .../LavaRuins/lavaland_surface_nest.dmm       |  6 +-
 .../LavaRuins/lavaland_surface_pirateship.dmm | 88 ++++++++++---------
 .../LavaRuins/lavaland_surface_sloth.dmm      |  6 +-
 .../LavaRuins/lavaland_surface_worldanvil.dmm |  1 +
 15 files changed, 150 insertions(+), 158 deletions(-)

diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
index b4ad0d13099..e5440eb0ffd 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
@@ -1107,11 +1107,6 @@
 /obj/effect/mapping_helpers/no_lava,
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/powered/clownplanet)
-"sF" = (
-/obj/effect/mapping_helpers/no_lava,
-/obj/effect/baseturf_helper/lava_land/surface,
-/turf/simulated/floor/noslip/lavaland,
-/area/lavaland/surface/outdoors/explored)
 "ye" = (
 /turf/simulated/floor/plating/lava/smooth,
 /area/ruin/powered/clownplanet)
@@ -1699,7 +1694,7 @@ ye
 cc
 "}
 (16,1,1) = {"
-sF
+eX
 CB
 YI
 cc
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_green.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_green.dmm
index 5339e02321a..1e076572ba0 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_green.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_green.dmm
@@ -174,11 +174,7 @@
 /turf/simulated/floor/pod,
 /area/ruin/powered/green_bio)
 "nK" = (
-/obj/structure/closet{
-	icon_closed = "cabinet_closed";
-	icon_opened = "cabinet_open";
-	icon_state = "cabinet_closed"
-	},
+/obj/structure/closet,
 /turf/simulated/floor/wood,
 /area/ruin/powered/green_bio)
 "og" = (
@@ -419,6 +415,10 @@
 	tag = "icon-redfull (NORTHWEST)"
 	},
 /area/ruin/powered/green_bio)
+"Du" = (
+/obj/effect/baseturf_helper/lava_land/surface,
+/turf/simulated/floor/indestructible/grass,
+/area/ruin/powered/green_bio)
 "DN" = (
 /obj/structure/dresser,
 /obj/machinery/light/small{
@@ -707,15 +707,11 @@
 /turf/simulated/floor/carpet,
 /area/ruin/powered/green_bio)
 "YL" = (
-/obj/structure/closet{
-	icon_closed = "cabinet_closed";
-	icon_opened = "cabinet_open";
-	icon_state = "cabinet_closed"
-	},
 /obj/machinery/light/small{
 	dir = 8;
 	light_power = 3
 	},
+/obj/structure/closet,
 /turf/simulated/floor/carpet,
 /area/ruin/powered/green_bio)
 "YQ" = (
@@ -1398,7 +1394,7 @@ gm
 Oy
 PE
 ol
-ol
+Du
 ol
 ol
 ol
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm
index 9180522e692..7d02f35fbf6 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm
@@ -182,7 +182,8 @@
 /turf/simulated/floor/carpet,
 /area/ruin/powered/snow_cabin)
 "aM" = (
-/turf/simulated/floor/carpet,
+/obj/effect/baseturf_helper/lava_land/surface,
+/turf/simulated/floor/wood/cold,
 /area/ruin/powered/snow_cabin)
 "aN" = (
 /obj/structure/bed/dogbed,
@@ -286,9 +287,6 @@
 /obj/machinery/vending/coffee,
 /turf/simulated/floor/pod/dark,
 /area/ruin/powered/snow_biodome)
-"fx" = (
-/turf/simulated/floor/carpet,
-/area/ruin/powered/snow_cabin)
 "gh" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -342,9 +340,6 @@
 /obj/structure/table,
 /turf/simulated/floor/plating,
 /area/ruin/powered/snow_biodome)
-"sf" = (
-/turf/simulated/floor/carpet,
-/area/ruin/powered/snow_cabin)
 "sE" = (
 /obj/item/twohanded/required/kirbyplants,
 /turf/simulated/floor/carpet,
@@ -373,11 +368,6 @@
 	},
 /turf/simulated/floor/carpet,
 /area/ruin/powered/snow_cabin)
-"vf" = (
-/obj/structure/bed,
-/obj/item/bedsheet/blue,
-/turf/simulated/floor/carpet,
-/area/ruin/powered/snow_cabin)
 "xU" = (
 /obj/item/storage/toolbox/mechanical,
 /turf/simulated/floor/pod/dark,
@@ -578,9 +568,6 @@
 	},
 /turf/simulated/floor/carpet,
 /area/ruin/powered/snow_cabin)
-"QI" = (
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors/explored)
 "QJ" = (
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/snacks/beans,
@@ -825,8 +812,8 @@ UW
 Wg
 Wg
 Wg
-QI
-QI
+tb
+tb
 aa
 aa
 aa
@@ -859,8 +846,8 @@ Wg
 aK
 Wg
 Wg
-QI
-QI
+tb
+tb
 aa
 aa
 aa
@@ -893,7 +880,7 @@ aQ
 ak
 Wg
 Wg
-QI
+tb
 tb
 aa
 aa
@@ -926,7 +913,7 @@ ak
 ak
 ak
 Wg
-QI
+tb
 tb
 aa
 aa
@@ -1141,8 +1128,8 @@ hk
 at
 Gf
 aD
-aM
-aM
+Bz
+Bz
 bD
 ak
 ak
@@ -1171,7 +1158,7 @@ aq
 aq
 aq
 Li
-fx
+Bz
 qI
 aq
 Zo
@@ -1205,7 +1192,7 @@ um
 Lf
 aq
 Cz
-vf
+Cz
 aq
 aq
 aD
@@ -1302,12 +1289,12 @@ tg
 as
 at
 aG
-aG
+aM
 Jl
 aG
 Ir
 at
-sf
+Bz
 bi
 ak
 ab
@@ -1553,7 +1540,7 @@ ak
 aC
 ak
 Wg
-QI
+tb
 tb
 aa
 aa
@@ -1586,7 +1573,7 @@ ak
 ak
 Wg
 Wg
-QI
+tb
 aa
 aa
 aa
@@ -1618,8 +1605,8 @@ ak
 ak
 Wg
 Wg
-QI
-QI
+tb
+tb
 aa
 aa
 aa
@@ -1650,8 +1637,8 @@ ak
 Wg
 Wg
 Wg
-QI
-QI
+tb
+tb
 aa
 aa
 aa
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm
index f4721a32889..c13c0bd460b 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm
@@ -39,8 +39,8 @@
 /area/ruin/unpowered)
 "aD" = (
 /obj/machinery/computer{
-	name = "Broken Computer";
-	desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages."
+	desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages.";
+	name = "Broken Computer"
 	},
 /turf/simulated/floor{
 	nitrogen = 23;
@@ -377,8 +377,8 @@
 	dir = 1
 	},
 /obj/structure/sign/atmosplaque{
-	name = "\improper Althland facility plaque";
 	desc = "A ruined and partially melted plaque bears words that are now faded and rusted, with some letters missing entirely. It reads: Est...ished by the Althland Mining...ration. In recog...on of the brave...who dared...harness...fiery heart...this world. May the...of our labor...shine as brightly...as the molten rivers...beneath our feet. The date of the facility's establishment at the bottom is obliterated, and the signatures of any founding miners are completely lost to time.";
+	name = "\improper Althland facility plaque";
 	pixel_y = 29
 	},
 /turf/simulated/floor/plasteel{
@@ -607,8 +607,8 @@
 	id = "mining_internal"
 	},
 /obj/item/stack/ore/bluespace_crystal{
-	pixel_y = 4;
-	pixel_x = 4
+	pixel_x = 4;
+	pixel_y = 4
 	},
 /turf/simulated/floor{
 	nitrogen = 23;
@@ -783,6 +783,7 @@
 /area/ruin/unpowered)
 "vz" = (
 /obj/effect/landmark/tiles/damageturf,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/simulated/floor/plasteel{
 	nitrogen = 23;
 	oxygen = 14;
@@ -1715,8 +1716,8 @@
 /area/ruin/unpowered)
 "Xd" = (
 /obj/machinery/computer{
-	name = "Broken Computer";
-	desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages."
+	desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages.";
+	name = "Broken Computer"
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor{
@@ -1747,8 +1748,8 @@
 /area/lavaland/surface/outdoors)
 "ZF" = (
 /obj/item/stack/sheet/mineral/gold{
-	pixel_y = -8;
-	pixel_x = -7
+	pixel_x = -7;
+	pixel_y = -8
 	},
 /obj/effect/landmark/tiles/damageturf,
 /obj/effect/decal/cleanable/dirt,
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm
index 1fe39b5a5db..ed6e2abf149 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm
@@ -17,8 +17,8 @@
 "ad" = (
 /obj/structure/flora/ausbushes/brflowers,
 /turf/simulated/floor/grass{
-	oxygen = 14;
 	nitrogen = 23;
+	oxygen = 14;
 	temperature = 300
 	},
 /area/lavaland/surface/outdoors)
@@ -194,8 +194,8 @@
 /obj/item/bodybag,
 /obj/item/reagent_containers/food/drinks/bottle/vodka,
 /turf/simulated/floor/grass{
-	oxygen = 14;
 	nitrogen = 23;
+	oxygen = 14;
 	temperature = 300
 	},
 /area/lavaland/surface/outdoors)
@@ -271,8 +271,8 @@
 /area/ruin/powered/animal_hospital)
 "aJ" = (
 /turf/simulated/floor/plasteel/grimy{
-	oxygen = 14;
 	nitrogen = 23;
+	oxygen = 14;
 	temperature = 300
 	},
 /area/lavaland/surface/outdoors)
@@ -640,12 +640,6 @@
 /obj/item/tank/internals/oxygen,
 /turf/simulated/floor/plasteel,
 /area/ruin/powered/animal_hospital)
-"bI" = (
-/obj/structure/sign/medbay/alt{
-	name = "animal hospital"
-	},
-/turf/simulated/wall/mineral/titanium/nodiagonal,
-/area/ruin/powered/animal_hospital)
 "bJ" = (
 /obj/machinery/door/airlock/multi_tile/glass{
 	name = "Ian's Pet Care"
@@ -655,24 +649,24 @@
 /area/ruin/powered/animal_hospital)
 "bL" = (
 /turf/simulated/floor/grass{
-	oxygen = 14;
 	nitrogen = 23;
+	oxygen = 14;
 	temperature = 300
 	},
 /area/lavaland/surface/outdoors)
 "bM" = (
 /obj/structure/flora/ausbushes/sunnybush,
 /turf/simulated/floor/grass{
-	oxygen = 14;
 	nitrogen = 23;
+	oxygen = 14;
 	temperature = 300
 	},
 /area/lavaland/surface/outdoors)
 "bO" = (
 /obj/structure/flora/ausbushes/ppflowers,
 /turf/simulated/floor/grass{
-	oxygen = 14;
 	nitrogen = 23;
+	oxygen = 14;
 	temperature = 300
 	},
 /area/lavaland/surface/outdoors)
@@ -743,8 +737,8 @@
 	dir = 6
 	},
 /turf/simulated/floor/grass{
-	oxygen = 14;
 	nitrogen = 23;
+	oxygen = 14;
 	temperature = 300
 	},
 /area/lavaland/surface/outdoors)
@@ -753,8 +747,8 @@
 	dir = 1
 	},
 /turf/simulated/floor/grass{
-	oxygen = 14;
 	nitrogen = 23;
+	oxygen = 14;
 	temperature = 300
 	},
 /area/lavaland/surface/outdoors)
@@ -763,8 +757,8 @@
 	dir = 10
 	},
 /turf/simulated/floor/grass{
-	oxygen = 14;
 	nitrogen = 23;
+	oxygen = 14;
 	temperature = 300
 	},
 /area/lavaland/surface/outdoors)
@@ -773,16 +767,16 @@
 	dir = 1
 	},
 /turf/simulated/floor/grass{
-	oxygen = 14;
 	nitrogen = 23;
+	oxygen = 14;
 	temperature = 300
 	},
 /area/lavaland/surface/outdoors)
 "cb" = (
 /obj/machinery/atmospherics/binary/valve,
 /turf/simulated/floor/grass{
-	oxygen = 14;
 	nitrogen = 23;
+	oxygen = 14;
 	temperature = 300
 	},
 /area/lavaland/surface/outdoors)
@@ -861,8 +855,8 @@
 "cn" = (
 /obj/machinery/light,
 /turf/simulated/floor/grass{
-	oxygen = 14;
 	nitrogen = 23;
+	oxygen = 14;
 	temperature = 300
 	},
 /area/lavaland/surface/outdoors)
@@ -932,8 +926,8 @@
 	dir = 4
 	},
 /turf/simulated/floor/grass{
-	oxygen = 14;
 	nitrogen = 23;
+	oxygen = 14;
 	temperature = 300
 	},
 /area/lavaland/surface/outdoors)
@@ -964,8 +958,8 @@
 	dir = 1
 	},
 /turf/simulated/floor/grass{
-	oxygen = 14;
 	nitrogen = 23;
+	oxygen = 14;
 	temperature = 300
 	},
 /area/lavaland/surface/outdoors)
@@ -975,8 +969,8 @@
 	dir = 1
 	},
 /turf/simulated/floor/grass{
-	oxygen = 14;
 	nitrogen = 23;
+	oxygen = 14;
 	temperature = 300
 	},
 /area/lavaland/surface/outdoors)
@@ -1276,7 +1270,7 @@ aL
 bs
 bB
 aP
-bI
+ae
 bM
 bL
 ab
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
index d1b986ea7a5..447e98ce9e4 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
@@ -462,7 +462,9 @@
 /obj/structure/stone_tile/cracked{
 	dir = 8
 	},
-/obj/item/stack/marker_beacon/ten,
+/obj/item/stack/marker_beacon/ten{
+	icon_state = "markerrandom"
+	},
 /turf/simulated/floor/indestructible/boss,
 /area/ruin/unpowered/ash_walkers)
 "bl" = (
@@ -1643,7 +1645,7 @@ ak
 ak
 ak
 ak
-am
+ak
 bF
 bE
 cb
@@ -1724,7 +1726,7 @@ cO
 "}
 (15,1,1) = {"
 ac
-ak
+am
 ak
 aw
 aI
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm
index 71f5efdf2f8..5956006f203 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm
@@ -11,8 +11,8 @@
 /obj/structure/table/reinforced,
 /obj/item/book/manual/research_and_development{
 	name = "Sacred Text of the Liberator";
-	pixel_y = 3;
-	pixel_x = -1
+	pixel_x = -1;
+	pixel_y = 3
 	},
 /obj/machinery/light{
 	on = 1
@@ -329,9 +329,9 @@
 /area/shuttle/freegolem)
 "oD" = (
 /obj/structure/shuttle/engine/heater{
+	dir = 8;
 	icon_state = "heater3x3";
-	tag = "icon-heater (NORTH)";
-	dir = 8
+	tag = "icon-heater (NORTH)"
 	},
 /obj/structure/window/reinforced/survival_pod{
 	dir = 4
@@ -462,8 +462,8 @@
 /area/shuttle/freegolem)
 "yw" = (
 /obj/structure/window/reinforced/survival_pod{
-	dir = 10;
-	density = 0
+	density = 0;
+	dir = 10
 	},
 /turf/simulated/floor/pod/dark,
 /area/shuttle/freegolem)
@@ -478,9 +478,9 @@
 /area/shuttle/freegolem)
 "zc" = (
 /obj/structure/sign/mining/survival{
-	tag = "icon-survival (NORTH)";
+	dir = 1;
 	icon_state = "survival";
-	dir = 1
+	tag = "icon-survival (NORTH)"
 	},
 /turf/simulated/wall/mineral/titanium/survival/pod,
 /area/shuttle/freegolem)
@@ -550,9 +550,9 @@
 /area/shuttle/freegolem)
 "Ct" = (
 /obj/structure/shuttle/engine/heater{
+	dir = 8;
 	icon_state = "heater3x3_side";
-	tag = "icon-heater (NORTH)";
-	dir = 8
+	tag = "icon-heater (NORTH)"
 	},
 /obj/structure/window/reinforced/survival_pod{
 	dir = 4
@@ -579,8 +579,8 @@
 /area/shuttle/freegolem)
 "Ev" = (
 /obj/structure/window/reinforced/survival_pod{
-	dir = 9;
-	density = 0
+	density = 0;
+	dir = 9
 	},
 /obj/effect/decal/warning_stripes/yellow/partial{
 	dir = 4
@@ -664,9 +664,9 @@
 /area/shuttle/freegolem)
 "LL" = (
 /obj/structure/shuttle/engine/heater{
+	dir = 8;
 	icon_state = "heater3x3_side_inv";
-	tag = "icon-heater (NORTH)";
-	dir = 8
+	tag = "icon-heater (NORTH)"
 	},
 /obj/structure/window/reinforced/survival_pod{
 	dir = 4
@@ -888,6 +888,11 @@
 /obj/machinery/floodlight,
 /turf/simulated/floor/pod/dark,
 /area/shuttle/freegolem)
+"ZP" = (
+/obj/effect/mapping_helpers/no_lava,
+/obj/effect/baseturf_helper/lava_land/surface,
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/ruin/powered/golem_ship)
 
 (1,1,1) = {"
 yB
@@ -1180,7 +1185,7 @@ cI
 cI
 cI
 cI
-Gs
+ZP
 fu
 "}
 (15,1,1) = {"
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_grave.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_grave.dmm
index 8ce7b413448..eefc3e1eb95 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_grave.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_grave.dmm
@@ -147,6 +147,7 @@
 /area/ruin/powered)
 "K" = (
 /obj/structure/stone_tile/slab/cracked,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/powered)
 "M" = (
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
index fdc04435af6..a1a51ba1950 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
@@ -177,7 +177,7 @@
 	},
 /area/ruin/powered)
 "K" = (
-/obj/effect/baseturf_helper,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/simulated/floor/plating,
 /area/ruin/powered)
 "M" = (
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_legion.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_legion.dmm
index 228872a5957..82215897be5 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_legion.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_legion.dmm
@@ -93,13 +93,18 @@
 	name = "battered shield"
 	},
 /obj/item/claymore{
-	name = "ancient sword";
+	block_chance = 40;
 	desc = "A cracked and blunted sword, clearly weathered over the ages.";
 	force = 30;
-	block_chance = 40
+	name = "ancient sword"
 	},
 /turf/simulated/floor/pod/light,
 /area/ruin/unpowered/misc_lavaruin)
+"V" = (
+/obj/effect/turf_decal/sand/plating,
+/obj/effect/baseturf_helper/lava_land/surface,
+/turf/simulated/floor/pod/light,
+/area/ruin/unpowered/misc_lavaruin)
 
 (1,1,1) = {"
 F
@@ -235,7 +240,7 @@ q
 q
 q
 a
-a
+V
 T
 q
 q
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_monster_nest.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_monster_nest.dmm
index 052745440a7..bb7b3091865 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_monster_nest.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_monster_nest.dmm
@@ -19,10 +19,6 @@
 /obj/effect/mapping_helpers/no_lava,
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
-"w" = (
-/obj/effect/mapping_helpers/no_lava,
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/template_noop)
 "E" = (
 /obj/structure/flora/ash/cacti,
 /obj/effect/mapping_helpers/no_lava,
@@ -33,11 +29,6 @@
 /obj/effect/mapping_helpers/no_lava,
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
-"W" = (
-/obj/effect/baseturf_helper/lava_land/surface,
-/obj/effect/mapping_helpers/no_lava,
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
 "X" = (
 /turf/simulated/mineral/random/volcanic,
 /area/lavaland/surface/outdoors)
@@ -55,7 +46,7 @@ a
 a
 a
 a
-w
+r
 a
 a
 a
@@ -110,12 +101,12 @@ X
 E
 r
 X
-W
+r
 d
 r
 r
 r
-w
+r
 "}
 (6,1,1) = {"
 a
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_nest.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_nest.dmm
index 55f62c1d9fe..ccc12f7d4c4 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_nest.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_nest.dmm
@@ -124,6 +124,10 @@
 /obj/effect/mob_spawn/human/miner/explorer,
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered)
+"A" = (
+/obj/effect/baseturf_helper/lava_land/surface,
+/turf/simulated/mineral/random/volcanic/hard,
+/area/ruin/unpowered)
 "B" = (
 /obj/effect/turf_decal/sand/plating,
 /obj/structure/spider/terrorweb/queen/builder,
@@ -897,7 +901,7 @@ n
 d
 m
 m
-m
+A
 O
 I
 m
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pirateship.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pirateship.dmm
index cedaf8f77af..526ba4b96c3 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pirateship.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pirateship.dmm
@@ -127,7 +127,7 @@
 "dT" = (
 /obj/effect/decal/cleanable/dust,
 /obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor{
+/turf/simulated/floor/pod/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -147,7 +147,7 @@
 /obj/effect/decal/warning_stripes/west,
 /obj/effect/landmark/tiles/burnturf,
 /obj/effect/decal/cleanable/dust,
-/turf/simulated/floor{
+/turf/simulated/floor/pod/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -287,7 +287,7 @@
 /obj/effect/decal/cleanable/dust,
 /obj/effect/landmark/tiles/burnturf,
 /obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor{
+/turf/simulated/floor/pod/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -309,7 +309,7 @@
 "gJ" = (
 /obj/effect/decal/warning_stripes/north,
 /obj/effect/decal/cleanable/dust,
-/turf/simulated/floor{
+/turf/simulated/floor/pod/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -323,7 +323,7 @@
 "gQ" = (
 /obj/effect/decal/cleanable/dust,
 /obj/effect/landmark/tiles/burnturf,
-/turf/simulated/floor{
+/turf/simulated/floor/pod/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -336,7 +336,7 @@
 "gV" = (
 /obj/effect/landmark/tiles/damageturf,
 /obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor{
+/turf/simulated/floor/mineral/plastitanium{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -471,10 +471,16 @@
 	},
 /area/ruin/powered/pirateship)
 "iT" = (
-/obj/effect/mapping_helpers/no_lava,
-/obj/effect/baseturf_helper/lava_land/surface/basalt,
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
+/obj/effect/spawner/window/shuttle/gray,
+/obj/machinery/door/poddoor/shutters{
+	id_tag = "pcarrier_windows"
+	},
+/turf/simulated/floor/plasteel/dark{
+	nitrogen = 23;
+	oxygen = 14;
+	temperature = 300
+	},
+/area/ruin/powered/pirateship)
 "iX" = (
 /obj/machinery/atmospherics/unary/vent_pump{
 	dir = 4;
@@ -525,7 +531,7 @@
 	pixel_y = 5
 	},
 /obj/effect/decal/cleanable/dust,
-/turf/simulated/floor{
+/turf/simulated/floor/pod/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -608,7 +614,7 @@
 /area/lavaland/surface/outdoors)
 "kQ" = (
 /obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor{
+/turf/simulated/floor/pod/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -673,7 +679,7 @@
 	dir = 8;
 	id_tag = "pcarrier_windows"
 	},
-/turf/simulated/floor{
+/turf/simulated/floor/plasteel/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -784,7 +790,7 @@
 	},
 /obj/effect/decal/cleanable/dust,
 /obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor{
+/turf/simulated/floor/plasteel/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -815,7 +821,7 @@
 	},
 /obj/effect/decal/cleanable/dust,
 /obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor{
+/turf/simulated/floor/plasteel/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -1019,7 +1025,7 @@
 "pB" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/landmark/tiles/damageturf,
-/turf/simulated/floor{
+/turf/simulated/floor/pod/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -1034,7 +1040,7 @@
 /obj/effect/decal/warning_stripes/north,
 /obj/effect/decal/warning_stripes/north,
 /obj/effect/decal/cleanable/dust,
-/turf/simulated/floor{
+/turf/simulated/floor/pod/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -1099,7 +1105,7 @@
 	pixel_x = -7
 	},
 /obj/effect/decal/cleanable/dust,
-/turf/simulated/floor{
+/turf/simulated/floor/plasteel/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -1118,7 +1124,7 @@
 "rE" = (
 /obj/effect/landmark/tiles/burnturf,
 /obj/effect/decal/cleanable/dust,
-/turf/simulated/floor{
+/turf/simulated/floor/pod/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -1141,7 +1147,7 @@
 "su" = (
 /obj/structure/grille/broken,
 /obj/effect/landmark/tiles/burnturf,
-/turf/simulated/floor{
+/turf/simulated/floor/pod/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -1161,7 +1167,7 @@
 	pixel_y = 10
 	},
 /obj/effect/decal/cleanable/dust,
-/turf/simulated/floor{
+/turf/simulated/floor/pod/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -1261,7 +1267,7 @@
 /obj/effect/decal/warning_stripes/northwest,
 /obj/effect/landmark/tiles/damageturf,
 /obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor{
+/turf/simulated/floor/pod/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -1310,7 +1316,7 @@
 	pixel_y = -5
 	},
 /obj/effect/landmark/tiles/burnturf,
-/turf/simulated/floor{
+/turf/simulated/floor/pod/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -1354,7 +1360,7 @@
 /area/ruin/powered/pirateship)
 "xz" = (
 /obj/effect/decal/cleanable/dust,
-/turf/simulated/floor{
+/turf/simulated/floor/pod/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -1370,7 +1376,7 @@
 /obj/effect/decal/cleanable/dust,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/clothing/shoes/jackboots,
-/turf/simulated/floor{
+/turf/simulated/floor/pod/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -1478,7 +1484,7 @@
 /obj/effect/decal/cleanable/glass{
 	pixel_x = -12
 	},
-/turf/simulated/floor{
+/turf/simulated/floor/mineral/plastitanium{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -1596,7 +1602,7 @@
 	},
 /obj/effect/landmark/tiles/damageturf,
 /obj/effect/decal/cleanable/dust,
-/turf/simulated/floor{
+/turf/simulated/floor/plasteel/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -1658,7 +1664,7 @@
 	},
 /obj/effect/decal/cleanable/dust,
 /obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor{
+/turf/simulated/floor/plasteel/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -1839,7 +1845,7 @@
 /obj/effect/landmark/tiles/damageturf,
 /obj/effect/decal/cleanable/dust,
 /obj/effect/decal/cleanable/dust,
-/turf/simulated/floor{
+/turf/simulated/floor/plasteel/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -1967,7 +1973,7 @@
 /obj/effect/landmark/tiles/damageturf,
 /obj/effect/decal/cleanable/dust,
 /obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor{
+/turf/simulated/floor/pod/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -1983,7 +1989,7 @@
 "HS" = (
 /obj/effect/landmark/tiles/damageturf,
 /obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor{
+/turf/simulated/floor/pod/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -2219,7 +2225,7 @@
 	color = "EDCBFF"
 	},
 /obj/effect/decal/cleanable/dust,
-/obj/effect/baseturf_helper/lava_land/surface/basalt,
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/simulated/floor/plasteel/dark{
 	nitrogen = 23;
 	oxygen = 14;
@@ -2284,7 +2290,7 @@
 	},
 /area/ruin/powered/pirateship)
 "MV" = (
-/turf/simulated/floor{
+/turf/simulated/floor/pod/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -2380,7 +2386,7 @@
 	},
 /obj/effect/decal/cleanable/dust,
 /obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor{
+/turf/simulated/floor/pod/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -2730,7 +2736,7 @@
 /obj/machinery/door/poddoor/shutters{
 	id_tag = "pcarrier_windows"
 	},
-/turf/simulated/floor{
+/turf/simulated/floor/pod/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -2738,7 +2744,7 @@
 /area/ruin/powered/pirateship)
 "RZ" = (
 /obj/effect/landmark/tiles/damageturf,
-/turf/simulated/floor{
+/turf/simulated/floor/pod/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -2929,7 +2935,7 @@
 /obj/effect/decal/cleanable/dust,
 /obj/effect/decal/cleanable/dust,
 /obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor{
+/turf/simulated/floor/plasteel/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -2962,7 +2968,7 @@
 "VY" = (
 /obj/effect/decal/cleanable/dust,
 /obj/effect/landmark/tiles/damageturf,
-/turf/simulated/floor{
+/turf/simulated/floor/pod/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -3239,7 +3245,7 @@
 "ZV" = (
 /obj/effect/landmark/tiles/damageturf,
 /obj/effect/decal/cleanable/dust,
-/turf/simulated/floor{
+/turf/simulated/floor/pod/dark{
 	nitrogen = 23;
 	oxygen = 14;
 	temperature = 300
@@ -3806,7 +3812,7 @@ VX
 eG
 eG
 eG
-RJ
+iT
 eG
 VX
 XL
@@ -4394,7 +4400,7 @@ XL
 QL
 QL
 QL
-iT
+QL
 QL
 QL
 QL
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm
index ee5e848fbf4..3b77eb0f646 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm
@@ -63,6 +63,10 @@
 /obj/item/reagent_containers/food/snacks/grown/citrus/orange,
 /turf/simulated/floor/wood/cold,
 /area/ruin/unpowered/misc_lavaruin)
+"J" = (
+/obj/effect/baseturf_helper/lava_land/surface,
+/turf/simulated/floor/carpet/green,
+/area/ruin/unpowered/misc_lavaruin)
 "M" = (
 /obj/machinery/vending/cola/free,
 /turf/simulated/floor/wood/cold,
@@ -241,7 +245,7 @@ z
 A
 g
 g
-D
+J
 A
 P
 P
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_worldanvil.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_worldanvil.dmm
index 9c65d310beb..c5e78a41235 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_worldanvil.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_worldanvil.dmm
@@ -56,6 +56,7 @@
 /obj/structure/stone_tile/block/cracked{
 	dir = 8
 	},
+/obj/effect/baseturf_helper/lava_land/surface,
 /turf/simulated/floor/plating/lava/smooth/lava_land_surface,
 /area/ruin/unpowered/misc_lavaruin)
 "md" = (