From 49384e61eedb0e6d30fcf4da9b4fe30779f2845a Mon Sep 17 00:00:00 2001 From: SmArtKar <44720187+SmArtKar@users.noreply.github.com> Date: Mon, 19 Aug 2024 01:01:07 +0300 Subject: [PATCH] Fixes active turfs on crashsite ruin (#85935) ## About The Pull Request Water and breached pod had stationside atmos and were creating a ton of active turfs roundstart ## Changelog :cl: fix: Fixed active turfs on crashsite ruin /:cl: --- .../LavaRuins/lavaland_surface_crashsite.dmm | 16 +++++++++++----- code/game/turfs/open/floor/mineral_floor.dm | 4 ++++ code/game/turfs/open/water.dm | 4 ++++ 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_crashsite.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_crashsite.dmm index 1c6b04bab94..828e7b7f743 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_crashsite.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_crashsite.dmm @@ -59,10 +59,10 @@ /area/ruin/unpowered) "k" = ( /obj/structure/girder, -/turf/open/floor/plating, +/turf/open/floor/plating/lavaland_atmos, /area/ruin/unpowered) "l" = ( -/turf/open/water, +/turf/open/water/lavaland_atmos, /area/lavaland/surface) "m" = ( /obj/machinery/door/airlock/survival_pod/glass, @@ -85,6 +85,12 @@ "q" = ( /turf/closed/wall/mineral/titanium/interior, /area/ruin/unpowered) +"r" = ( +/obj/machinery/door/airlock/titanium{ + name = "Escape Pod Airlock" + }, +/turf/open/floor/mineral/titanium/blue/lavaland_atmos, +/area/ruin/unpowered) "s" = ( /turf/open/floor/pod/dark, /area/ruin/powered) @@ -119,7 +125,7 @@ dir = 1 }, /obj/effect/mob_spawn/corpse/human/engineer, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/mineral/titanium/blue/lavaland_atmos, /area/ruin/unpowered) "z" = ( /obj/item/book/manual/fish_catalog, @@ -154,7 +160,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/mineral/titanium/blue/lavaland_atmos, /area/ruin/unpowered) "J" = ( /obj/machinery/smartfridge/survival_pod{ @@ -476,7 +482,7 @@ o O y I -b +r a a R diff --git a/code/game/turfs/open/floor/mineral_floor.dm b/code/game/turfs/open/floor/mineral_floor.dm index e8be1331378..a8cf2a6f37d 100644 --- a/code/game/turfs/open/floor/mineral_floor.dm +++ b/code/game/turfs/open/floor/mineral_floor.dm @@ -97,6 +97,10 @@ /turf/open/floor/mineral/titanium/blue/airless initial_gas_mix = AIRLESS_ATMOS +/turf/open/floor/mineral/titanium/blue/lavaland_atmos + initial_gas_mix = LAVALAND_DEFAULT_ATMOS + planetary_atmos = TRUE + /turf/open/floor/mineral/titanium/white icon_state = "titanium_white" floor_tile = /obj/item/stack/tile/mineral/titanium/white diff --git a/code/game/turfs/open/water.dm b/code/game/turfs/open/water.dm index 5dcfa85961d..83987ee7b54 100644 --- a/code/game/turfs/open/water.dm +++ b/code/game/turfs/open/water.dm @@ -42,3 +42,7 @@ baseturfs = /turf/open/water/beach immerse_overlay_color = "#7799AA" fishing_datum = /datum/fish_source/ocean/beach + +/turf/open/water/lavaland_atmos + initial_gas_mix = LAVALAND_DEFAULT_ATMOS + planetary_atmos = TRUE