From 685e0ee50683968d2312f64d431c0e6a53503632 Mon Sep 17 00:00:00 2001 From: GDN <96800819+GDNgit@users.noreply.github.com> Date: Wed, 20 Sep 2023 06:47:46 -0500 Subject: [PATCH] fixes a bunch of turfs being active roundstart (#22233) * fixes a bunch of turfs being active roundstart * some ruins * qwerty dun broke it * main stations * that should do it * i'm blowing up qwerty * should be it * empty commit to check ci * merge fix * yippie * joyous * lavaland tax * regex w * I'm gonna fax mapmerge a low teir god gif * SOMEONE ELSE GOTTA GET FAXED * Update code/controllers/subsystem/SSair.dm Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> --------- Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> --- _maps/map_files/Delta/delta.dmm | 38 ++++-- _maps/map_files/MetaStation/MetaStation.dmm | 2 +- .../lavaland_bridge_horizontal_1.dmm | 2 +- .../lavaland_bridge_horizontal_2.dmm | 2 +- .../lavaland_bridge_horizontal_5.dmm | 6 +- .../lavaland_bridge_vertical_1.dmm | 2 +- .../lavaland_bridge_vertical_2.dmm | 2 +- .../lavaland_bridge_vertical_5.dmm | 8 +- .../LavaRuins/lavaland_biodome_beach.dmm | 12 +- .../LavaRuins/lavaland_biodome_winter.dmm | 26 ++-- .../lavaland_surface_ash_walker1.dmm | 18 +-- .../LavaRuins/lavaland_surface_cultaltar.dmm | 48 ++------ .../lavaland_surface_dead_ratvar.dmm | 84 +++---------- .../LavaRuins/lavaland_surface_golem_ship.dmm | 4 +- .../LavaRuins/lavaland_surface_ufo_crash.dmm | 28 ++--- .../RandomRuins/SpaceRuins/abandonedzoo.dmm | 61 +++++----- .../RandomRuins/SpaceRuins/blowntcommsat.dmm | 19 +-- .../RandomRuins/SpaceRuins/debris1.dmm | 38 +++--- .../RandomRuins/SpaceRuins/debris2.dmm | 48 +++----- .../RandomRuins/SpaceRuins/debris3.dmm | 8 +- .../RandomRuins/SpaceRuins/emptyshell.dmm | 8 +- .../RandomRuins/SpaceRuins/meatpackers.dmm | 87 ++++++------- .../RandomRuins/SpaceRuins/moonoutpost19.dmm | 63 ++++------ .../RandomRuins/SpaceRuins/oldstation.dmm | 60 ++------- .../RandomRuins/SpaceRuins/onehalf.dmm | 25 ++-- .../RandomRuins/SpaceRuins/spacebar.dmm | 19 +-- .../SpaceRuins/syndicatedruglab.dmm | 4 +- .../SpaceRuins/syndiecakesfactory.dmm | 45 +++---- .../SpaceRuins/turretedoutpost.dmm | 6 +- .../map_files/RandomRuins/SpaceRuins/ussp.dmm | 6 +- .../RandomRuins/SpaceRuins/wizardcrash.dmm | 2 +- _maps/map_files/cerestation/cerestation.dmm | 115 +++++++++--------- _maps/map_files/cyberiad/cyberiad.dmm | 51 ++++---- _maps/map_files/generic/Lavaland.dmm | 32 ++--- code/controllers/subsystem/SSair.dm | 19 ++- .../turfs/simulated/floor/asteroid_floors.dm | 6 +- .../game/turfs/simulated/floor/fancy_floor.dm | 5 + .../turfs/simulated/floor/indestructible.dm | 5 + code/game/turfs/simulated/floor/lava.dm | 4 +- .../turfs/simulated/floor/mineral_floors.dm | 8 ++ code/game/turfs/simulated/floor/misc_floor.dm | 12 ++ code/game/turfs/simulated/floor/plating.dm | 29 +++++ code/game/turfs/simulated/minerals.dm | 2 +- code/game/turfs/simulated/river.dm | 4 +- code/modules/admin/admin_verbs.dm | 1 + code/modules/admin/verbs/debug.dm | 7 ++ .../awaymissions/mission_code/beach.dm | 6 + .../modules/ruins/lavalandruin_code/puzzle.dm | 6 +- code/modules/ruins/spaceruin_code/voyager.dm | 3 + 49 files changed, 523 insertions(+), 573 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index ce1ca2f9bad..74f91fef9b9 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -14445,7 +14445,7 @@ dir = 2; icon_state = "pipe-c" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/station/maintenance/incinerator) "aSy" = ( /obj/machinery/door/poddoor{ @@ -15444,8 +15444,8 @@ "aUA" = ( /obj/effect/landmark/damageturf, /turf/simulated/floor/plasteel/airless{ - dir = 5; - icon_state = "darkblue" + icon_state = "darkblue"; + dir = 5 }, /area/space/nearstation) "aUB" = ( @@ -37304,7 +37304,7 @@ "bQx" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/bluegrid{ - nitrogen = 500; + nitrogen = 100; oxygen = 0; temperature = 80 }, @@ -56270,7 +56270,9 @@ /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) "cIO" = ( -/turf/simulated/floor/plasteel/dark/nitrogen, +/turf/simulated/floor/plasteel/dark/nitrogen{ + temperature = 80 + }, /area/station/science/xenobiology) "cIP" = ( /obj/machinery/suit_storage_unit/engine, @@ -56794,14 +56796,14 @@ "cKp" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on, /turf/simulated/floor/bluegrid{ - nitrogen = 500; + nitrogen = 100; oxygen = 0; temperature = 80 }, /area/station/science/xenobiology) "cKq" = ( /turf/simulated/floor/bluegrid{ - nitrogen = 500; + nitrogen = 100; oxygen = 0; temperature = 80 }, @@ -57421,19 +57423,25 @@ /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8 }, -/turf/simulated/floor/plasteel/dark/nitrogen, +/turf/simulated/floor/plasteel/dark/nitrogen{ + temperature = 80 + }, /area/station/science/xenobiology) "cLT" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/turf/simulated/floor/plasteel/dark/nitrogen, +/turf/simulated/floor/plasteel/dark/nitrogen{ + temperature = 80 + }, /area/station/science/xenobiology) "cLU" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 }, -/turf/simulated/floor/plasteel/dark/nitrogen, +/turf/simulated/floor/plasteel/dark/nitrogen{ + temperature = 80 + }, /area/station/science/xenobiology) "cLW" = ( /obj/machinery/door/airlock/maintenance, @@ -60014,7 +60022,9 @@ c_tag = "Xeno Kill Room"; network = list("Research","SS13") }, -/turf/simulated/floor/plasteel/dark/nitrogen, +/turf/simulated/floor/plasteel/dark/nitrogen{ + temperature = 80 + }, /area/station/science/xenobiology) "cSD" = ( /obj/structure/bed/roller, @@ -90066,6 +90076,10 @@ }, /turf/simulated/floor/plasteel/white, /area/station/medical/virology) +"oEG" = ( +/obj/structure/grille, +/turf/simulated/floor/plating/airless, +/area/space/nearstation) "oFL" = ( /obj/machinery/power/apc{ dir = 8; @@ -154529,7 +154543,7 @@ aaa aaa abj abj -btJ +oEG abj csj rEQ diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 46e3e11384c..becd45fa5cb 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -91726,7 +91726,7 @@ name = "engine outlet injector"; volume_rate = 200 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/station/engineering/control) "xrm" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, diff --git a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_1.dmm b/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_1.dmm index 2d2a3b57b75..b3a1d6baffe 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_1.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_1.dmm @@ -3,7 +3,7 @@ /turf/simulated/wall/clockwork, /area/lavaland/surface/outdoors/unexplored/danger) "b" = ( -/turf/simulated/floor/clockwork, +/turf/simulated/floor/clockwork/lavaland_air, /area/lavaland/surface/outdoors/unexplored/danger) "c" = ( /turf/template_noop, diff --git a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_2.dmm b/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_2.dmm index 7996a2aa6d4..60b50b4d189 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_2.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_2.dmm @@ -3,7 +3,7 @@ /turf/simulated/wall/cult, /area/lavaland/surface/outdoors/unexplored/danger) "b" = ( -/turf/simulated/floor/engine/cult, +/turf/simulated/floor/engine/cult/lavaland_air, /area/lavaland/surface/outdoors/unexplored/danger) "c" = ( /turf/template_noop, diff --git a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_5.dmm b/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_5.dmm index 29b681cae82..48af1bb498c 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_5.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_5.dmm @@ -3,18 +3,18 @@ /turf/simulated/wall/mineral/wood/nonmetal, /area/lavaland/surface/outdoors/unexplored/danger) "b" = ( -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/lavaland_air, /area/lavaland/surface/outdoors/unexplored/danger) "c" = ( /turf/template_noop, /area/lavaland/surface/outdoors/unexplored/danger) "v" = ( -/turf/simulated/floor/wood{ +/turf/simulated/floor/wood/lavaland_air{ icon_state = "wood-broken3" }, /area/lavaland/surface/outdoors/unexplored/danger) "C" = ( -/turf/simulated/floor/wood{ +/turf/simulated/floor/wood/lavaland_air{ icon_state = "wood-broken7" }, /area/lavaland/surface/outdoors/unexplored/danger) diff --git a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_1.dmm b/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_1.dmm index 473e4df56c6..dca66633eba 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_1.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_1.dmm @@ -3,7 +3,7 @@ /turf/simulated/wall/clockwork, /area/lavaland/surface/outdoors/unexplored/danger) "b" = ( -/turf/simulated/floor/clockwork, +/turf/simulated/floor/clockwork/lavaland_air, /area/lavaland/surface/outdoors/unexplored/danger) "c" = ( /turf/template_noop, diff --git a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_2.dmm b/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_2.dmm index 44eb0610f50..02fd1e0a69f 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_2.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_2.dmm @@ -3,7 +3,7 @@ /turf/simulated/wall/cult, /area/lavaland/surface/outdoors/unexplored/danger) "b" = ( -/turf/simulated/floor/engine/cult, +/turf/simulated/floor/engine/cult/lavaland_air, /area/lavaland/surface/outdoors/unexplored/danger) "c" = ( /turf/template_noop, diff --git a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_5.dmm b/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_5.dmm index 15f612927e4..08c69910726 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_5.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_5.dmm @@ -1,9 +1,9 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/lavaland_air, /area/lavaland/surface/outdoors/unexplored/danger) "b" = ( -/turf/simulated/floor/wood{ +/turf/simulated/floor/wood/lavaland_air{ broken = 1; icon_state = "wood-broken" }, @@ -12,7 +12,7 @@ /turf/template_noop, /area/lavaland/surface/outdoors/unexplored/danger) "q" = ( -/turf/simulated/floor/wood{ +/turf/simulated/floor/wood/lavaland_air{ icon_state = "wood-broken3" }, /area/lavaland/surface/outdoors/unexplored/danger) @@ -20,7 +20,7 @@ /turf/simulated/wall/mineral/wood, /area/lavaland/surface/outdoors/unexplored/danger) "S" = ( -/turf/simulated/floor/wood{ +/turf/simulated/floor/wood/lavaland_air{ icon_state = "wood-broken7" }, /area/lavaland/surface/outdoors/unexplored/danger) diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index 537b5ec4927..f7eb15fe52d 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -432,7 +432,11 @@ /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/pod/light, +/turf/simulated/floor/pod/light{ + nitrogen = 23; + oxygen = 14; + temperature = 300 + }, /area/ruin/powered/beach) "lM" = ( /obj/structure/dresser, @@ -550,7 +554,11 @@ /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/pod/light, +/turf/simulated/floor/pod/light{ + nitrogen = 23; + oxygen = 14; + temperature = 300 + }, /area/ruin/powered/beach) "TW" = ( /obj/structure/table/reinforced, diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm index fb1bfa1fac8..f1b2e315b9e 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm @@ -286,7 +286,11 @@ dir = 1 }, /obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/pod/dark, +/turf/simulated/floor/pod/dark{ + oxygen = 14; + nitrogen = 23; + temperature = 300 + }, /area/ruin/powered/snow_biodome) "jE" = ( /obj/effect/decal/cleanable/blood/drip, @@ -325,13 +329,13 @@ /area/ruin/powered/snow_biodome) "tk" = ( /obj/effect/decal/cleanable/blood, -/turf/simulated/floor/mineral/silver, +/turf/simulated/floor/mineral/silver/biodome_snow, /area/ruin/powered/snow_biodome) "tl" = ( /turf/simulated/floor/pod/light, /area/ruin/powered/snow_biodome) "tZ" = ( -/turf/simulated/floor/mineral/silver, +/turf/simulated/floor/mineral/silver/biodome_snow, /area/ruin/powered/snow_biodome) "uz" = ( /obj/effect/spawner/window, @@ -350,7 +354,7 @@ "zT" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/blood/footprints, -/turf/simulated/floor/mineral/silver, +/turf/simulated/floor/mineral/silver/biodome_snow, /area/ruin/powered/snow_biodome) "AM" = ( /obj/machinery/economy/vending/coffee/free, @@ -375,7 +379,7 @@ "Ex" = ( /obj/structure/barricade/wooden, /obj/structure/barricade/wooden/crude/snow, -/turf/simulated/floor/mineral/silver, +/turf/simulated/floor/mineral/silver/biodome_snow, /area/ruin/powered/snow_biodome) "Ez" = ( /obj/structure/fans/tiny, @@ -391,7 +395,7 @@ /area/ruin/powered/snow_biodome) "GS" = ( /obj/item/paper/fluff/ruins/snowbiodome/altar, -/turf/simulated/floor/mineral/silver, +/turf/simulated/floor/mineral/silver/biodome_snow, /area/ruin/powered/snow_biodome) "Hn" = ( /obj/effect/decal/cleanable/blood/writing, @@ -413,19 +417,19 @@ /area/ruin/powered/snow_biodome) "MU" = ( /obj/structure/flora/rock/icy, -/turf/simulated/floor/mineral/silver, +/turf/simulated/floor/mineral/silver/biodome_snow, /area/ruin/powered/snow_biodome) "Oj" = ( /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/mineral/silver, +/turf/simulated/floor/mineral/silver/biodome_snow, /area/ruin/powered/snow_biodome) "Pf" = ( /obj/effect/decal/cleanable/blood/old, /obj/structure/sacrificealtar, /obj/item/kitchen/knife/combat/survival/bone, -/turf/simulated/floor/mineral/silver, +/turf/simulated/floor/mineral/silver/biodome_snow, /area/ruin/powered/snow_biodome) "PD" = ( /obj/machinery/door/airlock/hatch, @@ -466,7 +470,7 @@ /area/ruin/powered/snow_biodome) "XR" = ( /obj/effect/mob_spawn/human/corpse/skeleton, -/turf/simulated/floor/mineral/silver, +/turf/simulated/floor/mineral/silver/biodome_snow, /area/ruin/powered/snow_biodome) (1,1,1) = {" @@ -1222,7 +1226,7 @@ MA ak ti ak -MA +tZ aC ak ak 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 43f7a869753..f2a9bfbdf41 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm @@ -224,11 +224,11 @@ /obj/structure/stone_tile/surrounding_tile{ dir = 8 }, -/turf/simulated/floor/plating/lava/smooth, +/turf/simulated/floor/plating/lava/smooth/lava_land_surface, /area/ruin/unpowered/ash_walkers) "aI" = ( /obj/structure/stone_tile/block/cracked, -/turf/simulated/floor/plating/lava/smooth, +/turf/simulated/floor/plating/lava/smooth/lava_land_surface, /area/ruin/unpowered/ash_walkers) "aJ" = ( /obj/structure/stone_tile/surrounding_tile/cracked, @@ -239,7 +239,7 @@ /obj/structure/stone_tile/surrounding_tile{ dir = 8 }, -/turf/simulated/floor/plating/lava/smooth, +/turf/simulated/floor/plating/lava/smooth/lava_land_surface, /area/ruin/unpowered/ash_walkers) "aK" = ( /obj/structure/stone_tile/block/cracked{ @@ -311,17 +311,17 @@ /obj/structure/stone_tile/block/cracked{ dir = 4 }, -/turf/simulated/floor/plating/lava/smooth, +/turf/simulated/floor/plating/lava/smooth/lava_land_surface, /area/ruin/unpowered/ash_walkers) "aU" = ( /obj/structure/lavaland/ash_walker, -/turf/simulated/floor/plating/lava/smooth, +/turf/simulated/floor/plating/lava/smooth/lava_land_surface, /area/ruin/unpowered/ash_walkers) "aV" = ( /obj/structure/stone_tile/block{ dir = 8 }, -/turf/simulated/floor/plating/lava/smooth, +/turf/simulated/floor/plating/lava/smooth/lava_land_surface, /area/ruin/unpowered/ash_walkers) "aW" = ( /obj/structure/stone_tile/block{ @@ -390,13 +390,13 @@ /obj/structure/stone_tile/surrounding_tile{ dir = 1 }, -/turf/simulated/floor/plating/lava/smooth, +/turf/simulated/floor/plating/lava/smooth/lava_land_surface, /area/ruin/unpowered/ash_walkers) "be" = ( /obj/structure/stone_tile/block{ dir = 1 }, -/turf/simulated/floor/plating/lava/smooth, +/turf/simulated/floor/plating/lava/smooth/lava_land_surface, /area/ruin/unpowered/ash_walkers) "bf" = ( /obj/structure/stone_tile/surrounding_tile/cracked{ @@ -409,7 +409,7 @@ /obj/structure/stone_tile/surrounding_tile{ dir = 4 }, -/turf/simulated/floor/plating/lava/smooth, +/turf/simulated/floor/plating/lava/smooth/lava_land_surface, /area/ruin/unpowered/ash_walkers) "bg" = ( /obj/structure/stone_tile/block{ diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm index eb87e9f8e66..f1f9088b64a 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm @@ -3,11 +3,7 @@ /turf/template_noop, /area/template_noop) "b" = ( -/turf/simulated/floor/engine/cult{ - nitrogen = 23; - oxygen = 24; - temperature = 300 - }, +/turf/simulated/floor/engine/cult/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "c" = ( /turf/simulated/floor/plating/lava/smooth/mapping_lava, @@ -25,11 +21,7 @@ /area/ruin/unpowered/misc_lavaruin) "g" = ( /obj/effect/decal/cleanable/blood/old, -/turf/simulated/floor/engine/cult{ - nitrogen = 23; - oxygen = 24; - temperature = 300 - }, +/turf/simulated/floor/engine/cult/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "h" = ( /obj/effect/baseturf_helper/lava_land/surface, @@ -38,38 +30,22 @@ "i" = ( /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/blood/old, -/turf/simulated/floor/engine/cult{ - nitrogen = 23; - oxygen = 24; - temperature = 300 - }, +/turf/simulated/floor/engine/cult/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "k" = ( /obj/effect/decal/remains/human, /obj/item/melee/cultblade, -/turf/simulated/floor/engine/cult{ - nitrogen = 23; - oxygen = 24; - temperature = 300 - }, +/turf/simulated/floor/engine/cult/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "l" = ( /obj/effect/decal/remains/human, /obj/item/clothing/shoes/cult, /obj/item/clothing/suit/hooded/cultrobes, -/turf/simulated/floor/engine/cult{ - nitrogen = 23; - oxygen = 24; - temperature = 300 - }, +/turf/simulated/floor/engine/cult/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "m" = ( /obj/effect/decal/remains/human, -/turf/simulated/floor/engine/cult{ - nitrogen = 23; - oxygen = 24; - temperature = 300 - }, +/turf/simulated/floor/engine/cult/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "o" = ( /obj/effect/rune/narsie{ @@ -89,22 +65,14 @@ message = "You've made a grave mistake, haven't you?"; name = "ohfuck" }, -/turf/simulated/floor/engine/cult{ - nitrogen = 23; - oxygen = 24; - temperature = 300 - }, +/turf/simulated/floor/engine/cult/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "q" = ( /obj/effect/decal/remains/human, /obj/item/clothing/shoes/cult, /obj/item/clothing/suit/hooded/cultrobes, /obj/effect/decal/cleanable/blood/old, -/turf/simulated/floor/engine/cult{ - nitrogen = 23; - oxygen = 24; - temperature = 300 - }, +/turf/simulated/floor/engine/cult/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "s" = ( /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm index 6db766c602d..e87308c6161 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm @@ -15,11 +15,7 @@ /area/lavaland/surface/outdoors/unexplored) "e" = ( /obj/item/stack/tile/brass, -/turf/simulated/floor/clockwork{ - nitrogen = 23; - oxygen = 14; - temperature = 300 - }, +/turf/simulated/floor/clockwork/lavaland_air, /area/lavaland/surface/outdoors/unexplored) "f" = ( /turf/simulated/mineral/volcanic/lava_land_surface, @@ -29,11 +25,7 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors/unexplored) "h" = ( -/turf/simulated/floor/clockwork{ - nitrogen = 23; - oxygen = 14; - temperature = 300 - }, +/turf/simulated/floor/clockwork/lavaland_air, /area/lavaland/surface/outdoors/unexplored) "i" = ( /obj/structure/grille/ratvar/broken, @@ -44,11 +36,7 @@ /area/lavaland/surface/outdoors/unexplored) "k" = ( /obj/item/clockwork/alloy_shards/small, -/turf/simulated/floor/clockwork{ - nitrogen = 23; - oxygen = 14; - temperature = 300 - }, +/turf/simulated/floor/clockwork/lavaland_air, /area/lavaland/surface/outdoors/unexplored) "l" = ( /turf/simulated/floor/plating/lava/smooth/mapping_lava, @@ -67,11 +55,7 @@ /area/lavaland/surface/outdoors/unexplored) "p" = ( /obj/item/clockwork/alloy_shards/medium, -/turf/simulated/floor/clockwork{ - nitrogen = 23; - oxygen = 14; - temperature = 300 - }, +/turf/simulated/floor/clockwork/lavaland_air, /area/lavaland/surface/outdoors/unexplored) "q" = ( /obj/structure/lattice/catwalk/clockwork, @@ -83,11 +67,7 @@ /area/lavaland/surface/outdoors/unexplored) "s" = ( /obj/item/clockwork/alloy_shards/large, -/turf/simulated/floor/clockwork{ - nitrogen = 23; - oxygen = 14; - temperature = 300 - }, +/turf/simulated/floor/clockwork/lavaland_air, /area/lavaland/surface/outdoors/unexplored) "t" = ( /obj/item/stack/tile/brass, @@ -95,11 +75,7 @@ /area/lavaland/surface/outdoors/unexplored) "u" = ( /obj/structure/grille/ratvar, -/turf/simulated/floor/clockwork{ - nitrogen = 23; - oxygen = 14; - temperature = 300 - }, +/turf/simulated/floor/clockwork/lavaland_air, /area/lavaland/surface/outdoors/unexplored) "v" = ( /obj/item/clockwork/alloy_shards/medium, @@ -108,60 +84,32 @@ /area/lavaland/surface/outdoors/unexplored) "w" = ( /obj/structure/grille/ratvar/broken, -/turf/simulated/floor/clockwork{ - nitrogen = 23; - oxygen = 14; - temperature = 300 - }, +/turf/simulated/floor/clockwork/lavaland_air, /area/lavaland/surface/outdoors/unexplored) "x" = ( /obj/structure/clockwork/wall_gear, /obj/item/stack/tile/brass, -/turf/simulated/floor/clockwork{ - nitrogen = 23; - oxygen = 14; - temperature = 300 - }, +/turf/simulated/floor/clockwork/lavaland_air, /area/lavaland/surface/outdoors/unexplored) "y" = ( /obj/item/clockwork/component/geis_capacitor/fallen_armor, -/turf/simulated/floor/clockwork{ - nitrogen = 23; - oxygen = 14; - temperature = 300 - }, +/turf/simulated/floor/clockwork/lavaland_air, /area/lavaland/surface/outdoors/unexplored) "z" = ( /obj/structure/clockwork/wall_gear, -/turf/simulated/floor/clockwork{ - nitrogen = 23; - oxygen = 14; - temperature = 300 - }, +/turf/simulated/floor/clockwork/lavaland_air, /area/lavaland/surface/outdoors/unexplored) "A" = ( /obj/item/clockwork/alloy_shards/clockgolem_remains, -/turf/simulated/floor/clockwork{ - nitrogen = 23; - oxygen = 14; - temperature = 300 - }, +/turf/simulated/floor/clockwork/lavaland_air, /area/lavaland/surface/outdoors/unexplored) "B" = ( /obj/item/clockwork/weapon/ratvarian_spear, -/turf/simulated/floor/clockwork{ - nitrogen = 23; - oxygen = 14; - temperature = 300 - }, +/turf/simulated/floor/clockwork/lavaland_air, /area/lavaland/surface/outdoors/unexplored) "C" = ( /obj/item/clockwork/alloy_shards/medium/gear_bit, -/turf/simulated/floor/clockwork{ - nitrogen = 23; - oxygen = 14; - temperature = 300 - }, +/turf/simulated/floor/clockwork/lavaland_air, /area/lavaland/surface/outdoors/unexplored) "D" = ( /obj/structure/grille/ratvar, @@ -173,11 +121,7 @@ /area/lavaland/surface/outdoors/unexplored) "F" = ( /obj/structure/dead_ratvar, -/turf/simulated/floor/clockwork{ - nitrogen = 23; - oxygen = 14; - temperature = 300 - }, +/turf/simulated/floor/clockwork/lavaland_air, /area/lavaland/surface/outdoors/unexplored) "G" = ( /obj/item/stack/tile/brass/fifty, 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 48f520bc450..ddac1a8be3b 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm @@ -33,14 +33,14 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/lavaland_air, /area/shuttle/freegolem) "i" = ( /obj/structure/shuttle/engine/propulsion{ dir = 4; icon_state = "burst_l" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/lavaland_air, /area/shuttle/freegolem) "j" = ( /obj/machinery/light/small, diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm index e473128c8e4..b3235be262d 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm @@ -7,66 +7,66 @@ /area/lavaland/surface/outdoors) "c" = ( /obj/machinery/abductor/experiment/broken, -/turf/simulated/floor/plating/abductor, +/turf/simulated/floor/plating/abductor/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "d" = ( /turf/simulated/wall/mineral/abductor, /area/ruin/unpowered/misc_lavaruin) "e" = ( -/turf/simulated/floor/plating/abductor, +/turf/simulated/floor/plating/abductor/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "g" = ( /obj/machinery/abductor/pad, -/turf/simulated/floor/plating/abductor, +/turf/simulated/floor/plating/abductor/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "h" = ( /obj/item/hemostat/alien, -/turf/simulated/floor/plating/abductor, +/turf/simulated/floor/plating/abductor/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "i" = ( /obj/effect/mob_spawn/human/corpse/abductor, -/turf/simulated/floor/plating/abductor, +/turf/simulated/floor/plating/abductor/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "j" = ( /obj/structure/closet/abductor, -/turf/simulated/floor/plating/abductor, +/turf/simulated/floor/plating/abductor/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "k" = ( /obj/effect/baseturf_helper/lava_land/surface, -/turf/simulated/floor/plating/abductor, +/turf/simulated/floor/plating/abductor/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "l" = ( /obj/machinery/optable/abductor, /obj/item/cautery/alien, -/turf/simulated/floor/plating/abductor, +/turf/simulated/floor/plating/abductor/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "m" = ( /obj/structure/table/abductor, /obj/item/storage/box/alienhandcuffs, -/turf/simulated/floor/plating/abductor, +/turf/simulated/floor/plating/abductor/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "n" = ( /obj/item/scalpel/alien, /obj/item/surgical_drapes, -/turf/simulated/floor/plating/abductor, +/turf/simulated/floor/plating/abductor/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "o" = ( /obj/item/retractor/alien, -/turf/simulated/floor/plating/abductor, +/turf/simulated/floor/plating/abductor/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "p" = ( /obj/machinery/abductor/gland_dispenser, -/turf/simulated/floor/plating/abductor, +/turf/simulated/floor/plating/abductor/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "q" = ( /obj/structure/table/abductor, /obj/item/surgicaldrill/alien, /obj/item/circular_saw/alien, -/turf/simulated/floor/plating/abductor, +/turf/simulated/floor/plating/abductor/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "r" = ( /obj/structure/bed/abductor, -/turf/simulated/floor/plating/abductor, +/turf/simulated/floor/plating/abductor/lavaland_air, /area/ruin/unpowered/misc_lavaruin) (1,1,1) = {" diff --git a/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm index eec6d946f58..59e24208ce1 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm @@ -11,7 +11,7 @@ d2 = 4; icon_state = "0-4" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/unpowered) "ac" = ( /obj/effect/spawner/window/reinforced, @@ -36,7 +36,7 @@ d2 = 8; icon_state = "2-8" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/unpowered) "ae" = ( /obj/machinery/shieldwallgen{ @@ -53,7 +53,7 @@ d2 = 2; icon_state = "0-2" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/unpowered) "af" = ( /obj/machinery/shieldwallgen{ @@ -64,7 +64,7 @@ d2 = 8; icon_state = "0-8" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/unpowered) "ag" = ( /obj/effect/spawner/window/reinforced, @@ -226,7 +226,7 @@ icon_state = "2-4"; tag = "" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/unpowered) "aF" = ( /obj/structure/cable{ @@ -627,7 +627,7 @@ icon_state = "0-8" }, /obj/machinery/shieldwallgen, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/unpowered) "bu" = ( /obj/structure/flora/ausbushes/sunnybush, @@ -674,23 +674,19 @@ icon_state = "dark" }, /area/ruin/space/unpowered) -"bB" = ( -/obj/structure/alien/weeds, -/turf/simulated/floor/plating, -/area/ruin/space/unpowered) "bC" = ( /obj/structure/alien/weeds/node, /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/unpowered) "bD" = ( /obj/item/clothing/mask/facehugger{ icon_state = "facehugger_dead"; stat = 2 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/unpowered) "bE" = ( /obj/structure/flora/ausbushes/sparsegrass, @@ -720,7 +716,7 @@ /area/ruin/space/unpowered) "bK" = ( /obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/space/nearstation) "bL" = ( /obj/machinery/light/small{ @@ -739,11 +735,11 @@ /obj/item/shard{ icon_state = "small" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/unpowered) "bO" = ( /obj/item/shard, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/unpowered) "bP" = ( /obj/structure/lattice, @@ -761,14 +757,14 @@ tag = "" }, /obj/structure/cable, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/unpowered) "bR" = ( /obj/structure/disposalpipe/trunk{ dir = 1 }, /obj/structure/disposaloutlet, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/space/nearstation) "bS" = ( /obj/structure/cable{ @@ -778,18 +774,18 @@ }, /obj/structure/cable, /obj/machinery/shieldwallgen, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/unpowered) "bT" = ( /obj/structure/grille, /obj/item/shard{ icon_state = "medium" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/unpowered) "bU" = ( /obj/structure/grille/broken, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/unpowered) "bV" = ( /obj/machinery/shieldwallgen, @@ -799,10 +795,17 @@ /obj/item/shard, /turf/space, /area/space/nearstation) +"ov" = ( +/turf/simulated/floor/plating/airless, +/area/ruin/space/unpowered) "Hv" = ( /obj/item/gps/ruin, /turf/simulated/wall/r_wall, /area/ruin/space/unpowered) +"Qh" = ( +/obj/structure/alien/weeds, +/turf/simulated/floor/plating/airless, +/area/ruin/space/unpowered) (1,1,1) = {" aa @@ -1105,8 +1108,8 @@ ay bl at ac -bB -bB +Qh +Qh bD bH ac @@ -1130,7 +1133,7 @@ ac bC bH bH -bv +ov bT aa "} @@ -1150,8 +1153,8 @@ ba aL aD bD -bB -bv +Qh +ov bO bU bW @@ -1171,10 +1174,10 @@ aQ aQ aQ ac -bB -bB -bv -bv +Qh +Qh +ov +ov bP aa "} diff --git a/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm b/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm index 1f39b2b403f..48f5e43beb8 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm @@ -85,7 +85,7 @@ /area/ruin/space/tcommsat) "fS" = ( /obj/structure/rack, -/turf/simulated/floor/plasteel{ +/turf/simulated/floor/plasteel/airless{ icon_state = "dark" }, /area/ruin/space/tcommsat) @@ -172,7 +172,7 @@ "le" = ( /obj/structure/rack, /obj/item/storage/toolbox/syndicate, -/turf/simulated/floor/plasteel{ +/turf/simulated/floor/plasteel/airless{ icon_state = "dark" }, /area/ruin/space/tcommsat) @@ -242,7 +242,7 @@ "oZ" = ( /obj/structure/rack, /obj/item/circuitboard/teleporter, -/turf/simulated/floor/plasteel{ +/turf/simulated/floor/plasteel/airless{ icon_state = "dark" }, /area/ruin/space/tcommsat) @@ -722,6 +722,11 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating/airless, /area/ruin/space/tcommsat) +"UK" = ( +/turf/simulated/floor/plasteel/airless{ + icon_state = "dark" + }, +/area/ruin/space/tcommsat) "UP" = ( /obj/structure/window/reinforced{ dir = 8 @@ -1088,7 +1093,7 @@ Wr Is Wc Wr -sb +UK le Wr zE @@ -1142,7 +1147,7 @@ Wr Wc Is ot -sb +UK fS Wr Jr @@ -1196,7 +1201,7 @@ Cq Sp Wc jk -sb +UK oZ ot Jr @@ -1250,7 +1255,7 @@ Wr Is Sp Wr -sb +UK fS Wr Jr diff --git a/_maps/map_files/RandomRuins/SpaceRuins/debris1.dmm b/_maps/map_files/RandomRuins/SpaceRuins/debris1.dmm index 6ded44da79a..672218a60d9 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/debris1.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/debris1.dmm @@ -38,14 +38,6 @@ /obj/item/stack/cable_coil/cut, /turf/space, /area/space) -"m" = ( -/obj/effect/spawner/random_spawners/grille_often, -/turf/space, -/area/space) -"n" = ( -/obj/effect/spawner/random_spawners/grille_maybe, -/turf/space, -/area/space) "o" = ( /obj/random/tool, /turf/space, @@ -79,11 +71,11 @@ /turf/space, /area/space) "y" = ( -/turf/simulated/floor/plating/burnt, +/turf/simulated/floor/plating/burnt/airless, /area/space) "z" = ( /obj/item/stack/sheet/metal, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/space) "B" = ( /obj/structure/lattice, @@ -103,18 +95,18 @@ icon_state = "4-8"; tag = "" }, -/turf/simulated/floor/plating/burnt, +/turf/simulated/floor/plating/burnt/airless, /area/space) "E" = ( /obj/item/stack/rods, /turf/space, /area/space) "F" = ( -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/space) "G" = ( /obj/random/toolbox, -/turf/simulated/floor/plating/burnt, +/turf/simulated/floor/plating/burnt/airless, /area/space) "I" = ( /obj/structure/grille/broken, @@ -134,18 +126,18 @@ pixel_y = -24 }, /obj/structure/cable, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/space) "Q" = ( /obj/effect/decal/cleanable/shreds{ pixel_x = 4; pixel_y = 3 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/space) "T" = ( /obj/structure/girder, -/turf/simulated/floor/plating/burnt, +/turf/simulated/floor/plating/burnt/airless, /area/space) "U" = ( /obj/effect/spawner/random_barrier/wall_probably, @@ -159,7 +151,7 @@ /area/space) "Y" = ( /obj/item/shard, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/space) "Z" = ( /obj/item/stack/sheet/metal, @@ -236,7 +228,7 @@ a a d X -m +X X X X @@ -259,7 +251,7 @@ a r X g -F +y X E I @@ -309,7 +301,7 @@ X E Y X -n +X X h E @@ -382,7 +374,7 @@ X E X X -n +X r a "} @@ -507,11 +499,11 @@ T X Z X -n +X v X z -n +X X Z X diff --git a/_maps/map_files/RandomRuins/SpaceRuins/debris2.dmm b/_maps/map_files/RandomRuins/SpaceRuins/debris2.dmm index d2933543a54..97bf2280955 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/debris2.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/debris2.dmm @@ -25,7 +25,7 @@ /area/space) "l" = ( /obj/structure/girder, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/space) "m" = ( /obj/structure/grille/broken, @@ -39,7 +39,7 @@ /obj/machinery/door/airlock/command{ max_integrity = 40 }, -/turf/simulated/floor/plating/burnt, +/turf/simulated/floor/plating/burnt/airless, /area/space) "p" = ( /mob/living/simple_animal/hostile/carp, @@ -73,7 +73,7 @@ /obj/structure/door_assembly/door_assembly_vault{ anchored = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/space) "z" = ( /obj/item/stack/rods, @@ -103,8 +103,7 @@ /turf/space, /area/template_noop) "F" = ( -/obj/effect/landmark/burnturf, -/turf/simulated/floor, +/turf/simulated/floor/plating/burnt/airless, /area/space) "G" = ( /obj/structure/safe, @@ -135,9 +134,6 @@ /obj/item/shard, /turf/space, /area/space) -"M" = ( -/turf/simulated/floor, -/area/space) "N" = ( /obj/item/clothing/suit/bio_suit/virology, /turf/space, @@ -171,16 +167,12 @@ /obj/structure/lattice, /turf/space, /area/template_noop) -"W" = ( -/obj/effect/landmark/burnturf, -/turf/simulated/floor/plating/burnt, -/area/space) "X" = ( /turf/space, /area/space) "Y" = ( /obj/structure/girder/reinforced, -/turf/simulated/floor/plating/damaged, +/turf/simulated/floor/plating/damaged/airless, /area/space) "Z" = ( /obj/machinery/computer/pandemic, @@ -263,10 +255,10 @@ U d X w -M +b c U -M +b T V I @@ -278,17 +270,17 @@ a (5,1,1) = {" a Y -M -F -F +b +D +D q d z m -F -M -F -M +D +b +D +b T I I @@ -390,8 +382,8 @@ a s I T -M -F +b +D T X X @@ -413,12 +405,12 @@ I I T c -F +D T X X c -F +D b j D @@ -435,7 +427,7 @@ C I T X -M +b N s I @@ -463,7 +455,7 @@ I I u j -W +D c U T diff --git a/_maps/map_files/RandomRuins/SpaceRuins/debris3.dmm b/_maps/map_files/RandomRuins/SpaceRuins/debris3.dmm index 5b29e38cc39..303bc7dc35d 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/debris3.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/debris3.dmm @@ -4,7 +4,7 @@ /area/template_noop) "b" = ( /obj/item/stack/rods, -/turf/simulated/floor/plating/damaged, +/turf/simulated/floor/plating/damaged/airless, /area/template_noop) "c" = ( /obj/item/trash/popcorn, @@ -79,10 +79,10 @@ /area/template_noop) "x" = ( /obj/structure/bookcase/random, -/turf/simulated/floor/plating/damaged, +/turf/simulated/floor/plating/damaged/airless, /area/template_noop) "z" = ( -/turf/simulated/floor/plating/damaged, +/turf/simulated/floor/plating/damaged/airless, /area/template_noop) "A" = ( /turf/space, @@ -98,7 +98,7 @@ /area/template_noop) "F" = ( /obj/random/tool, -/turf/simulated/floor/plating/damaged, +/turf/simulated/floor/plating/damaged/airless, /area/template_noop) "G" = ( /obj/item/poster/random_official, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/emptyshell.dmm b/_maps/map_files/RandomRuins/SpaceRuins/emptyshell.dmm index a40da654ef9..8d3bac1752a 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/emptyshell.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/emptyshell.dmm @@ -78,8 +78,8 @@ b a a b -d -d +h +h b a a @@ -94,10 +94,10 @@ b c c c -d h h -d +h +h c c c diff --git a/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm b/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm index 274a650d32f..dd11ede058e 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm @@ -2132,7 +2132,7 @@ /obj/item/clothing/head/bio_hood, /obj/item/clothing/suit/bio_suit, /obj/item/clothing/gloves/color/black, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered) "gJ" = ( /turf/simulated/floor/engine, @@ -2146,24 +2146,21 @@ /area/ruin/unpowered/BMPship/Fore) "gM" = ( /obj/effect/gibspawner/robot, -/turf/simulated, +/turf/simulated/floor/plating/airless, /area/ruin/unpowered/BMPship/Fore) "gN" = ( /obj/structure/reagent_dispensers/beerkeg, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered) "gO" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/cans/beer, /obj/item/grenade/chem_grenade/drugs, -/turf/simulated/floor/plating, -/area/ruin/powered) -"gP" = ( -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered) "gQ" = ( /obj/effect/decal/cleanable/blood, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered) "gR" = ( /obj/structure/bed, @@ -2190,26 +2187,26 @@ "gU" = ( /obj/effect/decal/cleanable/blood/drip, /obj/item/clothing/mask/gas/syndicate, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered) "gV" = ( /obj/item/ammo_casing{ pixel_y = 3 }, /obj/effect/decal/cleanable/blood/drip, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered) "gW" = ( /obj/machinery/door/airlock/external{ name = "Crackden Airlock" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered) "gX" = ( /obj/machinery/door/airlock/external{ name = "Plain Airlock" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered) "gY" = ( /obj/machinery/door/airlock/titanium, @@ -2277,13 +2274,13 @@ "hh" = ( /obj/structure/table, /obj/item/storage/toolbox/syndicate, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered) "hi" = ( /obj/item/ammo_casing{ pixel_y = 3 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered) "hj" = ( /obj/structure/closet/crate, @@ -2305,15 +2302,15 @@ /obj/item/reagent_containers/glass/beaker/drugs/meth, /obj/item/reagent_containers/glass/beaker/drugs/meth, /obj/item/reagent_containers/glass/beaker/drugs/meth, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered) "hm" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered) "hn" = ( /obj/item/reagent_containers/food/snacks/chips, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered) "ho" = ( /obj/effect/spawner/window/shuttle, @@ -2346,25 +2343,21 @@ "ht" = ( /obj/structure/table, /obj/machinery/kitchen_machine/microwave, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered) "hu" = ( /obj/machinery/chem_dispenser, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered) "hv" = ( /obj/machinery/chem_master, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered) "hw" = ( /obj/machinery/floodlight{ in_use = 1 }, -/turf/simulated/floor/plating, -/area/ruin/powered) -"hx" = ( -/obj/machinery/atmospherics/portable/canister/air, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered) "hy" = ( /turf/simulated/mineral/random/high_chance/clown, @@ -3695,8 +3688,8 @@ aK aK aK gO -gP -gP +bd +bd ht aK aK @@ -3745,11 +3738,11 @@ aK aK aK gI -gP -gP +bd +bd hm -gP -hx +bd +gB aK aK aK @@ -3796,10 +3789,10 @@ aK aK aK aK -gP +bd hi -gP -gP +bd +bd hw aK aK @@ -3848,8 +3841,8 @@ aK aK gN gQ -gP -gP +bd +bd hu aK aK @@ -3899,8 +3892,8 @@ aK aK aK gU -gP -gP +bd +bd hv aK aK @@ -3950,10 +3943,10 @@ bc aK aK gV -gP -gP -gP -gP +bd +bd +bd +bd aK aK aK @@ -4000,8 +3993,8 @@ be aJ bc aK -gP -gP +bd +bd hn hw aK @@ -4053,7 +4046,7 @@ bc aK gW aK -gP +bd aK aK aK @@ -4102,7 +4095,7 @@ bd bd bc aK -gP +bd aK aK aK @@ -4153,7 +4146,7 @@ aJ bd bc aK -gP +bd aK aJ aJ diff --git a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm index 276b3d8a977..0a93480dd92 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm @@ -5,9 +5,6 @@ "ab" = ( /turf/simulated/mineral, /area/ruin/space/unpowered) -"ac" = ( -/turf/simulated/floor/plating/asteroid, -/area/ruin/space/unpowered) "ad" = ( /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/unpowered) @@ -2733,7 +2730,7 @@ pixel_x = -3; pixel_y = 6 }, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plating, /area/ruin/space/unpowered) "fk" = ( /obj/structure/table, @@ -2742,7 +2739,7 @@ pixel_y = 6 }, /obj/effect/landmark/burnturf, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plating, /area/ruin/space/unpowered) "fl" = ( /obj/structure/table, @@ -2924,7 +2921,7 @@ /obj/structure/sign/poster/official/ue_no{ pixel_y = 32 }, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plating, /area/ruin/space/unpowered) "fJ" = ( /obj/structure/sign/science{ @@ -3254,7 +3251,7 @@ }, /obj/effect/landmark/damageturf, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/airless, /area/ruin/space/unpowered) "go" = ( /obj/structure/cable{ @@ -3268,7 +3265,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/airless, /area/ruin/space/unpowered) "gp" = ( /obj/machinery/light/small{ @@ -3284,7 +3281,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/airless, /area/ruin/space/unpowered) "gq" = ( /obj/structure/cable{ @@ -3298,7 +3295,7 @@ }, /obj/effect/landmark/burnturf, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/airless, /area/ruin/space/unpowered) "gr" = ( /obj/structure/cable{ @@ -3541,11 +3538,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/space/unpowered) -"gP" = ( -/obj/effect/landmark/damageturf, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/space/unpowered) "gQ" = ( /turf/simulated/floor/plating/airless{ name = "plating" @@ -3571,7 +3563,7 @@ "gT" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/airless, /area/ruin/space/unpowered) "gU" = ( /obj/machinery/door/firedoor{ @@ -4702,7 +4694,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/airless, /area/ruin/space/unpowered) "jJ" = ( /obj/machinery/alarm/monitor{ @@ -4988,13 +4980,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/airless, /area/ruin/space/unpowered) -"WQ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/plasteel, -/area/ruin/space/unpowered) (1,1,1) = {" aa @@ -6500,7 +6485,7 @@ aa ab ab ab -ac +ad ad ad ad @@ -6560,7 +6545,7 @@ aa ab ab ab -ac +ad ad ad ad @@ -6620,7 +6605,7 @@ aa ab ab ab -ac +ad ad ad ad @@ -6867,7 +6852,7 @@ ad ad ad ad -ac +ad ab ab ab @@ -6926,8 +6911,8 @@ ab ad ad ad -ac -ac +ad +ad ab ab ab @@ -6986,7 +6971,7 @@ ab ad ad ad -ac +ad ab ab ab @@ -7010,7 +6995,7 @@ ab ad fM gm -gP +yh fM ad ad @@ -7045,8 +7030,8 @@ ab ab ab ad -ac -ac +ad +ad ab ab af @@ -7190,7 +7175,7 @@ ad ae aM gp -WQ +gS aM hz ad @@ -7250,7 +7235,7 @@ ad ad fM gq -ak +Of aM aL aM @@ -7310,7 +7295,7 @@ fc fn fN gr -gP +yh aM hA cm @@ -7503,7 +7488,7 @@ jB jI jQ gS -ak +Of Of kl fM @@ -7667,7 +7652,7 @@ ad ab ab aL -fr +cm aA gd aL diff --git a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm index 83556eb8308..5a9170d64f6 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm @@ -86,7 +86,7 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/ancientstation/hivebot) "as" = ( -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/ancientstation/hivebot) "at" = ( /obj/effect/decal/cleanable/dirt, @@ -2018,13 +2018,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/airless, /area/ruin/ancientstation/betanorth) -"ft" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/ancientstation/betanorth) "fu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -3734,24 +3727,6 @@ }, /turf/simulated/floor/plasteel, /area/ruin/ancientstation/powered) -"iO" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/lattice/catwalk, -/turf/simulated/floor/plating, -/area/space/nearstation) -"iP" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/lattice/catwalk, -/turf/simulated/floor/plating, -/area/space/nearstation) "iQ" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, @@ -4431,15 +4406,6 @@ }, /turf/simulated/floor/plating/airless, /area/ruin/ancientstation/atmo) -"kv" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/lattice/catwalk, -/turf/simulated/floor/plating, -/area/space/nearstation) "kw" = ( /obj/machinery/atmospherics/unary/vent_pump{ dir = 8 @@ -4649,10 +4615,6 @@ /obj/structure/particle_accelerator/power_box, /turf/simulated/floor/plating, /area/ruin/ancientstation/thetacorridor) -"kZ" = ( -/obj/structure/lattice/catwalk, -/turf/simulated/floor/plating, -/area/space/nearstation) "la" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -5417,7 +5379,7 @@ bf bf bf bz -ft +fs bz bf aW @@ -5802,15 +5764,15 @@ hf ck ck hs -iO -iO -iP -kZ -kv -kZ -iO -kZ -iP +hf +hf +jw +ck +kl +ck +hf +ck +jw uQ aa aa diff --git a/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm index 8fa882385c4..f7ed945514f 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm @@ -357,7 +357,7 @@ "aU" = ( /obj/item/stack/sheet/metal, /obj/effect/landmark/damageturf, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/onehalf/hallway) "aV" = ( /obj/machinery/door/airlock/medical/glass{ @@ -480,7 +480,7 @@ dir = 4 }, /obj/effect/landmark/damageturf, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/onehalf/hallway) "bj" = ( /obj/structure/disposalpipe/segment{ @@ -590,7 +590,7 @@ dir = 4 }, /obj/effect/landmark/damageturf, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/onehalf/hallway) "bv" = ( /obj/structure/disposalpipe/segment{ @@ -700,9 +700,6 @@ /obj/effect/landmark/damageturf, /turf/simulated/floor/plasteel/airless, /area/ruin/space/onehalf/hallway) -"bM" = ( -/turf/simulated/floor/plating, -/area/ruin/space/onehalf/hallway) "bN" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -721,7 +718,7 @@ /area/ruin/space/onehalf/hallway) "bR" = ( /obj/effect/landmark/damageturf, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/onehalf/hallway) "bS" = ( /obj/structure/disposalpipe/segment, @@ -738,7 +735,7 @@ /obj/structure/disposalpipe/segment, /obj/item/stack/rods, /obj/effect/landmark/damageturf, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/onehalf/hallway) "bX" = ( /turf/simulated/wall/r_wall, @@ -749,7 +746,7 @@ }, /obj/item/shard, /obj/effect/landmark/damageturf, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/onehalf/hallway) "ca" = ( /obj/structure/disposalpipe/segment, @@ -815,7 +812,7 @@ icon_state = "1-2" }, /obj/effect/landmark/damageturf, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/onehalf/hallway) "ck" = ( /obj/structure/girder/reinforced, @@ -823,7 +820,7 @@ /area/space/nearstation) "cl" = ( /obj/effect/landmark/damageturf, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/space/nearstation) "cm" = ( /obj/structure/lattice, @@ -943,7 +940,7 @@ icon_state = "1-2" }, /obj/effect/landmark/damageturf, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/onehalf/hallway) "cA" = ( /obj/structure/disposalpipe/trunk{ @@ -1154,7 +1151,7 @@ "dj" = ( /obj/structure/grille, /obj/item/shard, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/onehalf/hallway) "dk" = ( /obj/effect/spawner/window/reinforced, @@ -1446,7 +1443,7 @@ aT bd bv ak -bM +aj aa aa aa diff --git a/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm b/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm index d6d9f8f5e14..a68837612a7 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm @@ -82,7 +82,7 @@ "au" = ( /obj/structure/fans/tiny, /obj/machinery/door/poddoor/preopen, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/powered) "av" = ( /obj/structure/table/wood, @@ -170,7 +170,7 @@ "aP" = ( /obj/effect/decal/warning_stripes/north, /obj/structure/marker_beacon/dock_marker, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/powered) "aQ" = ( /obj/effect/spawner/window/reinforced, @@ -325,7 +325,7 @@ /area/ruin/space/powered/bar) "bo" = ( /obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/powered) "bq" = ( /obj/machinery/light, @@ -336,7 +336,7 @@ /area/space/nearstation) "bt" = ( /obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/powered) "bF" = ( /obj/machinery/light/small{ @@ -665,7 +665,7 @@ }, /obj/effect/decal/warning_stripes/south, /obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/powered) "DT" = ( /obj/structure/toilet{ @@ -734,6 +734,9 @@ icon_state = "dark" }, /area/ruin/space/powered/bar) +"JK" = ( +/turf/simulated/floor/plating/asteroid/ancient, +/area/ruin/space/powered) "JW" = ( /obj/structure/rack{ dir = 1 @@ -891,7 +894,7 @@ "RX" = ( /obj/effect/decal/warning_stripes/south, /obj/structure/marker_beacon/dock_marker, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/powered) "Sy" = ( /turf/simulated/floor/plasteel{ @@ -957,7 +960,7 @@ }, /obj/effect/decal/warning_stripes/north, /obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/powered) "ZM" = ( /obj/machinery/light{ @@ -1929,7 +1932,7 @@ ai ai ai ai -ag +JK ai ag ag diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm index 52edd31f2f8..34c499b0f78 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm @@ -253,7 +253,7 @@ dir = 4 }, /obj/structure/disposaloutlet, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/syndicate_druglab) "Fq" = ( /obj/structure/closet/cabinet, @@ -282,7 +282,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/syndicate_druglab) "Hj" = ( /obj/machinery/hydroponics/constructable, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm index f5ad3f8b9a7..062f5ecf81b 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm @@ -223,7 +223,7 @@ /area/ruin/space/unpowered) "hF" = ( /obj/effect/landmark/damageturf, -/turf/simulated/floor/engine, +/turf/simulated/floor/engine/airless, /area/ruin/space/unpowered) "hH" = ( /obj/structure/railing/corner, @@ -298,7 +298,7 @@ /area/ruin/space/unpowered) "ls" = ( /obj/structure/dispenser/oxygen, -/turf/simulated/floor/engine, +/turf/simulated/floor/engine/airless, /area/ruin/space/unpowered) "lZ" = ( /turf/simulated/floor/plating/airless, @@ -630,7 +630,7 @@ /area/ruin/space/unpowered) "xy" = ( /obj/machinery/suit_storage_unit, -/turf/simulated/floor/engine, +/turf/simulated/floor/engine/airless, /area/ruin/space/unpowered) "xO" = ( /turf/simulated/floor/plasteel{ @@ -675,7 +675,7 @@ /turf/simulated/floor/engine, /area/ruin/space/unpowered) "zt" = ( -/turf/simulated/floor/plating/damaged, +/turf/simulated/floor/plating/damaged/airless, /area/ruin/space/unpowered) "AP" = ( /obj/structure/table/reinforced, @@ -956,6 +956,9 @@ icon_state = "dark" }, /area/ruin/space/unpowered) +"LN" = ( +/turf/simulated/floor/engine/airless, +/area/ruin/space/unpowered) "LV" = ( /obj/structure/chair/comfy/black{ dir = 8 @@ -1068,7 +1071,7 @@ /obj/item/flag/syndi{ anchored = 1 }, -/turf/simulated/floor/engine, +/turf/simulated/floor/engine/airless, /area/ruin/space/unpowered) "OU" = ( /mob/living/simple_animal/hostile/alien/sentinel{ @@ -2102,9 +2105,9 @@ xO yU wV EJ -sh -sh -sh +LN +LN +LN lZ lZ NQ @@ -2144,9 +2147,9 @@ xO xO xO vR -sh +LN hF -sh +LN hF zt Hy @@ -2186,11 +2189,11 @@ xO xO Jt EJ -sh -sh -sh -sh -sh +LN +LN +LN +LN +LN EJ EJ EJ @@ -2229,10 +2232,10 @@ ub EJ EJ EJ -sh -sh -sh -sh +LN +LN +LN +LN oH OK OK @@ -2272,8 +2275,8 @@ EJ OK oH OP -sh -sh +LN +LN ls EJ OK diff --git a/_maps/map_files/RandomRuins/SpaceRuins/turretedoutpost.dmm b/_maps/map_files/RandomRuins/SpaceRuins/turretedoutpost.dmm index bc1fb78f2d7..d444f1809b6 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/turretedoutpost.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/turretedoutpost.dmm @@ -8,7 +8,7 @@ /area/space/nearstation) "c" = ( /obj/structure/grille, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/space/unpowered) "d" = ( /turf/simulated/wall/r_wall, @@ -654,7 +654,7 @@ d j k d -k +l d E J @@ -674,7 +674,7 @@ d k k d -k +l d d d diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm index ab834b5b2ea..64e3b401358 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm @@ -5109,10 +5109,6 @@ icon_state = "floorgrime" }, /area/ruin/space/derelict/hallway/primary) -"mi" = ( -/obj/effect/landmark/damageturf, -/turf/simulated/floor/plasteel, -/area/ruin/space/derelict/hallway/primary) "mj" = ( /obj/structure/flora/rock/pile, /turf/simulated/floor/plating/airless, @@ -10171,7 +10167,7 @@ fJ kX lB lO -mi +mz my jA nd diff --git a/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm b/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm index 1a8d777b24a..a443506ad95 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm @@ -470,7 +470,7 @@ dir = 1; layer = 2.9 }, -/turf/simulated/floor/mineral/plasma, +/turf/simulated/floor/plating/airless, /area/ruin/space/unpowered) "bG" = ( /obj/structure/shuttle/engine/propulsion, diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm index f352ccd617e..f6a8135e5a8 100644 --- a/_maps/map_files/cerestation/cerestation.dmm +++ b/_maps/map_files/cerestation/cerestation.dmm @@ -30126,7 +30126,7 @@ /obj/machinery/atmospherics/unary/outlet_injector/on{ dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/station/maintenance/turbine) "cVu" = ( /obj/structure/sign/fire, @@ -35897,7 +35897,7 @@ /obj/structure/railing{ dir = 8 }, -/turf/simulated/floor/plating{ +/turf/simulated/floor/plating/airless{ icon_state = "asteroidplating" }, /area/station/hallway/spacebridge/servsci) @@ -37623,8 +37623,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 10; +/turf/simulated/floor/plasteel/dark/telecomms{ icon_state = "bcircuit" }, /area/station/science/server/coldroom) @@ -45711,8 +45710,7 @@ d2 = 4; icon_state = "0-4" }, -/turf/simulated/floor/plasteel{ - dir = 10; +/turf/simulated/floor/plasteel/dark/telecomms{ icon_state = "bcircuit" }, /area/station/science/server/coldroom) @@ -48430,7 +48428,7 @@ /area/station/science/misc_lab) "igy" = ( /obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/arrival/station) "igZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -50607,8 +50605,7 @@ pixel_y = 28; name = "custom placement" }, -/turf/simulated/floor/plasteel{ - dir = 10; +/turf/simulated/floor/plasteel/dark/telecomms{ icon_state = "bcircuit" }, /area/station/science/server/coldroom) @@ -56365,8 +56362,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 6 }, -/turf/simulated/floor/plasteel{ - dir = 10; +/turf/simulated/floor/plasteel/dark/telecomms{ icon_state = "bcircuit" }, /area/station/science/server/coldroom) @@ -57671,7 +57667,7 @@ dir = 1 }, /obj/structure/disposalpipe/trunk, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/station/maintenance/disposal/westalt) "leh" = ( /obj/structure/grille/broken, @@ -64149,7 +64145,7 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/station/maintenance/disposal/external/east) "nln" = ( /obj/structure/cable/orange{ @@ -64878,8 +64874,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 5 }, -/turf/simulated/floor/plasteel{ - dir = 10; +/turf/simulated/floor/plasteel/dark/telecomms{ icon_state = "bcircuit" }, /area/station/science/server/coldroom) @@ -69165,7 +69160,7 @@ /obj/machinery/atmospherics/unary/outlet_injector/on{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/station/science/test_chamber) "oVa" = ( /obj/structure/cable/orange{ @@ -77506,7 +77501,7 @@ /obj/structure/railing{ dir = 4 }, -/turf/simulated/floor/plating{ +/turf/simulated/floor/plating/airless{ icon_state = "asteroidplating" }, /area/station/hallway/spacebridge/servsci) @@ -112493,9 +112488,9 @@ rNK rNK rNK rNK -vva -vva -vva +abE +abE +abE cRv abW abW @@ -112750,7 +112745,7 @@ rNK rNK rNK cRv -vva +abE cRv cRv cRv @@ -113263,7 +113258,7 @@ rNK rNK rNK rNK -vva +abE cRv abW abW @@ -113520,7 +113515,7 @@ rNK rNK rNK rNK -vva +abE cRv abW hzK @@ -136156,11 +136151,11 @@ rNK rNK rNK rNK -vva -vva -vva -vva -vva +abE +abE +abE +abE +abE cRv cRv abW @@ -136417,8 +136412,8 @@ cRv cRv cRv cRv -vva -vva +abE +abE cRv cRv cRv @@ -136675,12 +136670,12 @@ abW abW cRv cRv -vva -vva -vva -vva -vva -vva +abE +abE +abE +abE +abE +abE cRv abW abW @@ -136933,11 +136928,11 @@ aaf aaf wIp cRv -vva +abE cRv cRv cRv -vva +abE cRv abW abW @@ -137194,15 +137189,15 @@ abW cRv abW cRv -vva +abE cRv abW abW abW abW cRv -vva -vva +abE +abE cRv cRv npV @@ -137451,7 +137446,7 @@ aaf abW abW cRv -vva +abE cRv abW abW @@ -137459,8 +137454,8 @@ abW cRv cRv cRv -vva -vva +abE +abE cRv aKp cSm @@ -137708,7 +137703,7 @@ aaf abW abW cRv -vva +abE cRv abW abW @@ -137717,8 +137712,8 @@ cRv rNK rNK rNK -vva -vva +abE +abE aKp uts ieC @@ -137965,7 +137960,7 @@ aaf abW abW cRv -vva +abE cRv cRv cRv @@ -137975,7 +137970,7 @@ cRv rNK rNK rNK -vva +abE aKp aKp qBa @@ -138222,17 +138217,17 @@ aaf abW abW cRv -vva -vva -vva -vva +abE +abE +abE +abE cRv abW cRv rNK rNK rNK -vva +abE cRv abW jSL @@ -138482,14 +138477,14 @@ cRv cRv cRv cRv -vva +abE cRv abW cRv rNK rNK rNK -vva +abE cRv cRv wZL @@ -138739,7 +138734,7 @@ abW abW abW cRv -vva +abE cRv cRv cRv @@ -138747,7 +138742,7 @@ rNK rNK rNK rNK -vva +abE rNK euP dkw @@ -138996,7 +138991,7 @@ cRv cRv abW cRv -vva +abE cRv cRv rNK @@ -139253,7 +139248,7 @@ rNK cRv cRv cRv -vva +abE cRv cRv rNK diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index ea4d79e15c2..39121222323 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -58245,7 +58245,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/turf/simulated/floor/engine, +/turf/simulated/floor/engine/xenobio, /area/station/science/xenobiology) "dwg" = ( /obj/machinery/computer/arcade/orion_trail{ @@ -61937,7 +61937,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/turf/simulated/floor/engine, +/turf/simulated/floor/engine/xenobio, /area/station/science/xenobiology) "fpO" = ( /obj/effect/landmark/spawner/nukedisc_respawn, @@ -62534,7 +62534,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/engine, +/turf/simulated/floor/engine/xenobio, /area/station/science/xenobiology) "fFY" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -62713,7 +62713,7 @@ dir = 4 }, /turf/simulated/floor/bluegrid{ - nitrogen = 500; + nitrogen = 100; oxygen = 0; temperature = 80 }, @@ -62926,12 +62926,8 @@ /turf/simulated/floor/plasteel, /area/station/public/dorms) "fSi" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4; - autolink_id = "evamaint_vent" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/fpmaint2) +/turf/simulated/floor/engine/xenobio, +/area/station/science/xenobiology) "fSM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, @@ -69740,7 +69736,7 @@ dir = 1; network = list("Research","SS13") }, -/turf/simulated/floor/engine, +/turf/simulated/floor/engine/xenobio, /area/station/science/xenobiology) "jIX" = ( /obj/effect/decal/cleanable/dirt, @@ -74077,10 +74073,6 @@ /obj/effect/decal/cleanable/blood/drip, /turf/simulated/floor/plating, /area/station/maintenance/aft) -"lYv" = ( -/obj/effect/spawner/random_barrier/floor_probably, -/turf/simulated/floor/plating, -/area/station/maintenance/asmaint) "lYX" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/decal/cleanable/cobweb, @@ -76005,7 +75997,7 @@ name = "Hardened Bomb-Test Security Camera"; network = list("Toxins","Research","SS13") }, -/turf/simulated/floor/indestructible, +/turf/simulated/floor/indestructible/airless, /area/station/science/toxins/test) "noq" = ( /obj/machinery/conveyor/west{ @@ -76677,7 +76669,7 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/simulated/floor/engine, +/turf/simulated/floor/engine/xenobio, /area/station/science/xenobiology) "nIO" = ( /obj/structure/cable{ @@ -79492,7 +79484,6 @@ /turf/simulated/floor/engine, /area/station/maintenance/turbine) "pnB" = ( -/obj/effect/spawner/random_barrier/floor_probably, /obj/machinery/atmospherics/pipe/simple/hidden/purple, /obj/structure/cable{ d1 = 1; @@ -82101,7 +82092,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden, /obj/effect/landmark/spawner/rev, /turf/simulated/floor/bluegrid{ - nitrogen = 500; + nitrogen = 100; oxygen = 0; temperature = 80 }, @@ -87002,7 +86993,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/engine, +/turf/simulated/floor/engine/xenobio, /area/station/science/xenobiology) "tMT" = ( /obj/structure/cable{ @@ -87158,7 +87149,7 @@ dir = 8 }, /turf/simulated/floor/bluegrid{ - nitrogen = 500; + nitrogen = 100; oxygen = 0; temperature = 80 }, @@ -91611,7 +91602,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/station/maintenance/fpmaint2) "wwZ" = ( /obj/effect/spawner/window/reinforced/polarized{ @@ -112504,7 +112495,7 @@ doE doE wpU eIz -fSi +eIz xXP aLx blG @@ -140609,9 +140600,9 @@ cEH tfN kiq cBR -cJK +fSi nIF -cJK +fSi ecZ kMc kdc @@ -140868,7 +140859,7 @@ oDE iun fpG fMb -cJK +fSi oJr cQC dhR @@ -141382,7 +141373,7 @@ hOz iun dvM tQn -cJK +fSi oJr sFy dhR @@ -141637,9 +141628,9 @@ oto tPD jPb cBR -cJK +fSi fET -cJK +fSi ecZ bUx dFe @@ -148820,7 +148811,7 @@ iZV ciY mQX ciY -lYv +csL ciY ciY ciY diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm index d475aa32d98..66b40491f16 100644 --- a/_maps/map_files/generic/Lavaland.dmm +++ b/_maps/map_files/generic/Lavaland.dmm @@ -782,7 +782,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/lattice/catwalk/mining, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) "bR" = ( /obj/machinery/recharge_station, @@ -800,7 +800,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/lattice/catwalk/mining, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) "bT" = ( /obj/machinery/door/airlock/mining{ @@ -829,7 +829,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plating/lavaland_air, /area/shuttle/mining) "bW" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -1162,7 +1162,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/lattice/catwalk/mining, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) "cI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1236,7 +1236,7 @@ icon_state = "4-8" }, /obj/structure/lattice/catwalk/mining, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) "cP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -1247,7 +1247,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/lattice/catwalk/mining, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) "cQ" = ( /turf/simulated/wall/r_wall, @@ -1916,7 +1916,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /obj/structure/lattice/catwalk/mining, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) "ed" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -2520,7 +2520,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plating/lavaland_air, /area/shuttle/mining) "fd" = ( /obj/structure/closet/emcloset, @@ -2987,7 +2987,7 @@ icon_state = "2-8" }, /obj/structure/lattice/catwalk/mining, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) "fY" = ( /obj/machinery/economy/vending/assist/free, @@ -3195,7 +3195,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/lattice/catwalk/mining, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) "gr" = ( /obj/structure/stone_tile{ @@ -3309,7 +3309,7 @@ icon_state = "1-2" }, /obj/structure/lattice/catwalk/mining, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) "gB" = ( /obj/structure/stone_tile/block{ @@ -5040,7 +5040,7 @@ /area/mine/laborcamp) "wt" = ( /obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plating/lavaland_air, /area/shuttle/siberia) "wD" = ( /obj/effect/decal/remains/human, @@ -5052,7 +5052,7 @@ dir = 1; layer = 2.9 }, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plating/lavaland_air, /area/shuttle/siberia) "wY" = ( /obj/item/clothing/mask/gas/clown_hat, @@ -5072,7 +5072,7 @@ /area/mine/mechbay) "xo" = ( /obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plating/lavaland_air, /area/shuttle/mining) "xx" = ( /obj/machinery/light/small{ @@ -5210,7 +5210,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/lattice/catwalk/mining, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) "zy" = ( /turf/simulated/wall, @@ -6110,7 +6110,7 @@ /obj/machinery/door/airlock{ name = "Catwalk Airlock" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/lavaland_air, /area/mine/eva) "Ss" = ( /obj/structure/rack, diff --git a/code/controllers/subsystem/SSair.dm b/code/controllers/subsystem/SSair.dm index 63f5e0854f9..0a97e76490e 100644 --- a/code/controllers/subsystem/SSair.dm +++ b/code/controllers/subsystem/SSair.dm @@ -78,9 +78,9 @@ SUBSYSTEM_DEF(air) /datum/controller/subsystem/air/Initialize() setup_overlays() // Assign icons and such for gas-turf-overlays icon_manager = new() // Sets up icon manager for pipes - if(length(active_turfs)) - log_debug("Failed sanity check: active_turfs is not empty before initialization ([length(active_turfs)])") setup_allturfs() + if(length(active_turfs)) + throw_error_on_active_roundstart_turfs() setup_atmos_machinery(GLOB.machines) setup_pipenets(GLOB.machines) for(var/obj/machinery/atmospherics/A in machinery_to_construct) @@ -398,6 +398,21 @@ SUBSYSTEM_DEF(air) GLOB.plmaster = new /obj/effect/overlay/turf/plasma GLOB.slmaster = new /obj/effect/overlay/turf/sleeping_agent +/datum/controller/subsystem/air/proc/throw_error_on_active_roundstart_turfs() + // Can't properly test lavaland due to Init order issues and EVERYTHING being surrounded by rocks, as such we just ignore any turfs on that level + var/list/active_turfs_we_care_about = list() + var/z_level_to_exclude = level_name_to_num(MINING) + for(var/turf/is_lavaland_turf in active_turfs) + if(is_lavaland_turf.z != z_level_to_exclude) + active_turfs_we_care_about += is_lavaland_turf + if(!length(active_turfs_we_care_about)) + return + log_debug("Turfs were active before init! Please check the runtime logger for information on the specific turfs.") + stack_trace("Failed sanity check: active_turfs is not empty before init ([length(active_turfs)], turfs are as follows:)") + for(var/turf/shouldnt_be_active in active_turfs_we_care_about) + stack_trace("[shouldnt_be_active] was active before init, turf x=[shouldnt_be_active.x], turf y=[shouldnt_be_active.y], turf z=[shouldnt_be_active.z], turf area=[shouldnt_be_active.loc]") + message_admins("[shouldnt_be_active] was active before init, [ADMIN_JMP(shouldnt_be_active)])") + #undef SSAIR_PIPENETS #undef SSAIR_ATMOSMACHINERY #undef SSAIR_ACTIVETURFS diff --git a/code/game/turfs/simulated/floor/asteroid_floors.dm b/code/game/turfs/simulated/floor/asteroid_floors.dm index d35956aa030..0503d80f9fa 100644 --- a/code/game/turfs/simulated/floor/asteroid_floors.dm +++ b/code/game/turfs/simulated/floor/asteroid_floors.dm @@ -302,14 +302,16 @@ GLOBAL_LIST_INIT(megafauna_spawn_list, list(/mob/living/simple_animal/hostile/me for(var/turf/NT in circleviewturfs(T, tempradius)) var/distance = (max(get_dist(T, NT), 1)) //Get dist throws -1 if same turf if(prob(min(probmodifer / distance, 100))) - if(ismineralturf(NT) || istype(NT, /turf/simulated/floor/plating/asteroid)) //No spawning on lava / other ruins + if((ismineralturf(NT) || istype(NT, /turf/simulated/floor/plating/asteroid)) && !istype(NT.loc, /area/ruin)) //No spawning on lava / other ruins SpawnFloor(NT, 50) //Room has higher probabilty. if(prob(25)) tempradius = round(tempradius / 3) - var/turf/oasis_lake = pickweight(list(/turf/simulated/floor/plating/lava/smooth/lava_land_surface = 4, /turf/simulated/floor/plating/lava/smooth/lava_land_surface/plasma = 4, /turf/simulated/floor/chasm/straight_down/lava_land_surface = 4, /turf/simulated/floor/plating/lava/smooth/mapping_lava = 6, /turf/simulated/floor/beach/away/water = 1, /turf/simulated/floor/plating/asteroid = 1)) + var/turf/oasis_lake = pickweight(list(/turf/simulated/floor/plating/lava/smooth/lava_land_surface = 4, /turf/simulated/floor/plating/lava/smooth/lava_land_surface/plasma = 4, /turf/simulated/floor/chasm/straight_down/lava_land_surface = 4, /turf/simulated/floor/plating/lava/smooth/mapping_lava = 6, /turf/simulated/floor/beach/away/water/lavaland_air = 1, /turf/simulated/floor/plating/asteroid = 1)) if(oasis_lake == /turf/simulated/floor/plating/asteroid) new /obj/effect/spawner/oasisrock(T, tempradius) for(var/turf/oasis in circleviewturfs(T, tempradius)) + if(istype(oasis.loc, /area/ruin)) + continue oasis.ChangeTurf(oasis_lake, ignore_air = TRUE) /obj/effect/spawner/oasisrock diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index 7b71867ff4c..3ef9491677c 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -42,6 +42,11 @@ nitrogen = 82 temperature = 180 +/turf/simulated/floor/wood/lavaland_air + nitrogen = 23 + oxygen = 14 + temperature = 300 + /turf/simulated/floor/grass name = "grass patch" icon = 'icons/turf/floors/grass.dmi' diff --git a/code/game/turfs/simulated/floor/indestructible.dm b/code/game/turfs/simulated/floor/indestructible.dm index 58ab2b29708..a2343a5e061 100644 --- a/code/game/turfs/simulated/floor/indestructible.dm +++ b/code/game/turfs/simulated/floor/indestructible.dm @@ -33,6 +33,11 @@ /turf/simulated/floor/indestructible/mech_melee_attack(obj/mecha/M) return +/turf/simulated/floor/indestructible/airless + oxygen = 0 + nitrogen = 0 + temperature = TCMB + /turf/simulated/floor/indestructible/necropolis name = "necropolis floor" desc = "It's regarding you suspiciously." diff --git a/code/game/turfs/simulated/floor/lava.dm b/code/game/turfs/simulated/floor/lava.dm index e38727c402e..6ebf8ca8621 100644 --- a/code/game/turfs/simulated/floor/lava.dm +++ b/code/game/turfs/simulated/floor/lava.dm @@ -142,6 +142,8 @@ /turf/simulated/floor/plating/lava/smooth/airless temperature = TCMB + oxygen = 0 + nitrogen = 0 /turf/simulated/floor/plating/lava/smooth/lava_land_surface/plasma name = "liquid plasma" @@ -245,6 +247,6 @@ /turf/simulated/floor/plating/lava/smooth/mapping_lava/LateInitialize() . = ..() - ChangeTurf(SSmapping.lavaland_theme) + ChangeTurf(SSmapping.lavaland_theme, ignore_air = TRUE) diff --git a/code/game/turfs/simulated/floor/mineral_floors.dm b/code/game/turfs/simulated/floor/mineral_floors.dm index 20d87446a5e..fb75450a8a5 100644 --- a/code/game/turfs/simulated/floor/mineral_floors.dm +++ b/code/game/turfs/simulated/floor/mineral_floors.dm @@ -86,6 +86,9 @@ floor_tile = /obj/item/stack/tile/mineral/silver/fancy icons = list("silverfancy","silverfancy_dam") +/turf/simulated/floor/mineral/silver/biodome_snow + temperature = 180 + //TITANIUM (shuttle) /turf/simulated/floor/mineral/titanium @@ -279,3 +282,8 @@ /turf/simulated/floor/plating/abductor2/burn_tile() return //unburnable + +/turf/simulated/floor/plating/abductor/lavaland_air + temperature = 300 + oxygen = 14 + nitrogen = 23 diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm index c73a3add217..9f2a665bf04 100644 --- a/code/game/turfs/simulated/floor/misc_floor.dm +++ b/code/game/turfs/simulated/floor/misc_floor.dm @@ -3,6 +3,13 @@ icon_state = "rockvault" smoothing_flags = NONE +/turf/simulated/floor/vault/lavaland_air + temperature = 300 + oxygen = 14 + nitrogen = 23 + planetary_atmos = TRUE + baseturf = /turf/simulated/floor/chasm/straight_down/lava_land_surface + /turf/simulated/wall/vault icon = 'icons/turf/walls.dmi' icon_state = "rockvault" @@ -210,6 +217,11 @@ baseturf = /turf/simulated/floor/clockwork/reebe uses_overlay = FALSE +/turf/simulated/floor/clockwork/lavaland_air + nitrogen = 23 + oxygen = 14 + temperature = 300 + /turf/simulated/floor/catwalk name = "catwalk" desc = "A catwalk for easier inspection of cable and pipe installations." diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index a86676ef130..48459592e82 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -27,6 +27,16 @@ . = ..() burn_tile() +/turf/simulated/floor/plating/damaged/airless + oxygen = 0 + nitrogen = 0 + temperature = TCMB + +/turf/simulated/floor/plating/burnt/airless + oxygen = 0 + nitrogen = 0 + temperature = TCMB + /turf/simulated/floor/plating/update_icon_state() if(!broken && !burnt) icon_state = icon_plating //Because asteroids are 'platings' too. @@ -158,6 +168,11 @@ . = ..() name = "plating" +/turf/simulated/floor/plating/lavaland_air + temperature = 300 + oxygen = 14 + nitrogen = 23 + /turf/simulated/floor/engine name = "reinforced floor" icon_state = "engine" @@ -226,6 +241,11 @@ /turf/simulated/floor/engine/cult/narsie_act() return +/turf/simulated/floor/engine/cult/lavaland_air + nitrogen = 23 + oxygen = 14 + temperature = 300 + //air filled floors; used in atmos pressure chambers /turf/simulated/floor/engine/n20 @@ -261,6 +281,15 @@ oxygen = 2644 nitrogen = 10580 +/turf/simulated/floor/engine/xenobio + oxygen = 0 + temperature = 80 + nitrogen = 100 + +/turf/simulated/floor/engine/airless + oxygen = 0 + nitrogen = 0 + temperature = TCMB /turf/simulated/floor/engine/singularity_pull(S, current_size) ..() diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm index 4e2697eced5..888deff4c87 100644 --- a/code/game/turfs/simulated/minerals.dm +++ b/code/game/turfs/simulated/minerals.dm @@ -146,7 +146,7 @@ . = ..() if (prob(mineralChance)) var/path = pickweight(mineralSpawnChanceList) - var/turf/T = ChangeTurf(path, FALSE, TRUE) + var/turf/T = ChangeTurf(path, FALSE, TRUE, TRUE) if(T && ismineralturf(T)) var/turf/simulated/mineral/M = T diff --git a/code/game/turfs/simulated/river.dm b/code/game/turfs/simulated/river.dm index 883ea8f4a4e..20a9b1a89c7 100644 --- a/code/game/turfs/simulated/river.dm +++ b/code/game/turfs/simulated/river.dm @@ -46,8 +46,8 @@ cur_dir = get_dir(cur_turf, target_turf) cur_turf = get_step(cur_turf, cur_dir) - if(cur_turf == null) //This might be the fuck up. Kill the loop if this happens - message_admins("Encountered a null turf in river loop.") + if(isnull(cur_turf)) //This might be the fuck up. Kill the loop if this happens + stack_trace("Encountered a null turf in river loop, target turf was [target_turf], x=[target_turf.x], y=[target_turf.y].") break var/area/new_area = get_area(cur_turf) if(!istype(new_area, whitelist_area) || (cur_turf.flags & NO_LAVA_GEN)) //Rivers will skip ruins diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 667f07d1e6f..f5418f6a7f5 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -296,6 +296,7 @@ GLOBAL_LIST_INIT(admin_verbs_maintainer, list( verbs += /client/proc/ss_breakdown verbs += /client/proc/show_gc_queues verbs += /client/proc/toggle_mctabs + verbs += /client/proc/visualise_active_turfs spawn(1) // This setting exposes the profiler for people with R_VIEWRUNTIMES. They must still have it set in cfg/admin.txt control_freak = 0 diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 454fc9ea048..895bb877fa1 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -967,6 +967,11 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) if(confirm != "Im sure") return + var/display_turfs_overlay = FALSE + var/do_display_turf_overlay = alert(usr, "Would you like to have all active turfs have a client side overlay applied as well?", "Optional", "Yep", "Nope") + if(do_display_turf_overlay == "Yep") + display_turfs_overlay = TRUE + message_admins("[key_name_admin(usr)] is visualising active atmos turfs. Server may lag.") var/list/zlevel_turf_indexes = list() @@ -977,6 +982,8 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) if(!zlevel_turf_indexes["[T.z]"]) zlevel_turf_indexes["[T.z]"] = list() zlevel_turf_indexes["[T.z]"] |= T + if(display_turfs_overlay) + usr.client.images += image('icons/effects/alphacolors.dmi', T, "red") CHECK_TICK // Sort the keys diff --git a/code/modules/awaymissions/mission_code/beach.dm b/code/modules/awaymissions/mission_code/beach.dm index 113e646730e..4f13fb23550 100644 --- a/code/modules/awaymissions/mission_code/beach.dm +++ b/code/modules/awaymissions/mission_code/beach.dm @@ -112,6 +112,12 @@ if(istype(A, /obj/effect/decal/cleanable)) // Better a typecheck than looping through thousands of turfs everyday linkedcontroller.decalinpool += A +/turf/simulated/floor/beach/away/water/lavaland_air + nitrogen = 23 + oxygen = 14 + temperature = 300 + planetary_atmos = TRUE + /turf/simulated/floor/beach/away/water/dense //for boundary "walls" density = TRUE baseturf = /turf/simulated/floor/beach/away/water/dense diff --git a/code/modules/ruins/lavalandruin_code/puzzle.dm b/code/modules/ruins/lavalandruin_code/puzzle.dm index 828a9fd0f35..5320a16f12b 100644 --- a/code/modules/ruins/lavalandruin_code/puzzle.dm +++ b/code/modules/ruins/lavalandruin_code/puzzle.dm @@ -5,7 +5,7 @@ invisibility = INVISIBILITY_ABSTRACT anchored = TRUE var/list/elements - var/floor_type = /turf/simulated/floor/vault + var/floor_type = /turf/simulated/floor/vault/lavaland_air var/finished = FALSE var/reward_type = /obj/item/reagent_containers/food/snacks/cookie var/element_type = /obj/structure/puzzle_element @@ -171,7 +171,7 @@ //Setup random empty tile empty_tile_id = pick_n_take(left_ids) var/turf/empty_tile_turf = get_turf_for_id(empty_tile_id) - empty_tile_turf.ChangeTurf(floor_type, keep_icon = FALSE, ignore_air = FALSE) + empty_tile_turf.ChangeTurf(floor_type, keep_icon = FALSE, ignore_air = TRUE) var/mutable_appearance/MA = new(puzzle_pieces["[empty_tile_id]"]) MA.layer = empty_tile_turf.layer + 0.1 empty_tile_turf.add_overlay(MA) @@ -180,7 +180,7 @@ var/list/empty_spots = left_ids.Copy() for(var/spot_id in empty_spots) var/turf/T = get_turf_for_id(spot_id) - T = T.ChangeTurf(floor_type, keep_icon = FALSE, ignore_air = FALSE) + T = T.ChangeTurf(floor_type, keep_icon = FALSE, ignore_air = TRUE) var/obj/structure/puzzle_element/E = new element_type(T) elements += E var/chosen_id = pick_n_take(left_ids) diff --git a/code/modules/ruins/spaceruin_code/voyager.dm b/code/modules/ruins/spaceruin_code/voyager.dm index 8dde5e094e1..ac4c8c81b84 100644 --- a/code/modules/ruins/spaceruin_code/voyager.dm +++ b/code/modules/ruins/spaceruin_code/voyager.dm @@ -24,3 +24,6 @@ smoothing_flags = NONE base_icon_state = "plastitanium_wall" explosion_block = 4 + oxygen = 0 + nitrogen = 0 + temperature = TCMB