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 3433ee2ffdd..a5ca3c480c0 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm @@ -955,7 +955,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/effect/baseturf_helper/lava_land/surface, +/obj/effect/baseturf_helper/lava/mapping_lava, /turf/simulated/floor/lubed, /area/ruin/powered/clownplanet) "by" = ( diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm index 3ee31c383d4..6e3d2ccd98d 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm @@ -3,7 +3,7 @@ /turf/template_noop, /area/template_noop) "ab" = ( -/obj/effect/baseturf_helper/lava_land/surface, +/obj/effect/baseturf_helper/lava/mapping_lava, /turf/simulated/floor/plating/asteroid/snow/atmosphere, /area/ruin/powered/snow_biodome) "ac" = ( @@ -287,9 +287,9 @@ }, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/pod/dark{ - oxygen = 14; - nitrogen = 23; - temperature = 300 + oxygen = 8; + nitrogen = 14; + temperature = 500 }, /area/ruin/powered/snow_biodome) "jE" = ( diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm index c0fe43694a6..e805b02e993 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm @@ -1129,7 +1129,6 @@ /area/lavaland/surface/outdoors) "Es" = ( /obj/structure/lattice/catwalk/mining, -/obj/effect/baseturf_helper/lava_land/surface, /obj/effect/mapping_helpers/no_lava, /obj/structure/ladder/unusable, /turf/simulated/floor/chasm, @@ -1366,7 +1365,7 @@ /area/ruin/unpowered/althland_excavation) "Rf" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/baseturf_helper/lava_land/surface, +/obj/effect/baseturf_helper/lava/mapping_lava, /turf/simulated/floor/pod/light{ oxygen = 0; nitrogen = 0 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 87e12be1426..227fc04229b 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm @@ -2,9 +2,9 @@ "aa" = ( /obj/effect/landmark/burnturf, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/lavaland/surface/outdoors) "ab" = ( @@ -19,9 +19,9 @@ pixel_y = 3 }, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "af" = ( @@ -39,9 +39,9 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/computer/nonfunctional, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "aM" = ( @@ -53,9 +53,9 @@ invisibility = 101 }, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "bc" = ( @@ -64,9 +64,9 @@ /obj/effect/turf_decal/box/white, /obj/effect/turf_decal/caution/stand_clear/white, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "be" = ( @@ -82,9 +82,9 @@ /obj/effect/decal/cleanable/dirt, /obj/item/clothing/under/rank/cargo/miner, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "bP" = ( @@ -93,9 +93,9 @@ name = "Broken External Airlock" }, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "bT" = ( @@ -118,9 +118,9 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "cw" = ( @@ -128,9 +128,9 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/power/smes, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "cJ" = ( @@ -138,9 +138,9 @@ /obj/machinery/mech_bay_recharge_port, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "dh" = ( @@ -170,9 +170,9 @@ /obj/effect/decal/cleanable/dirt, /obj/item/stack/ore/plasma, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "eV" = ( @@ -181,9 +181,9 @@ /obj/machinery/computer/nonfunctional, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "fc" = ( @@ -191,9 +191,9 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/damageturf, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "fd" = ( @@ -204,9 +204,9 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "fm" = ( @@ -221,9 +221,9 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "fs" = ( @@ -232,18 +232,18 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/secure/loot, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "fv" = ( /mob/living/simple_animal/hostile/asteroid/hivelord/legion, /obj/structure/disposalpipe/segment, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "fB" = ( @@ -260,9 +260,9 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "fP" = ( @@ -276,9 +276,9 @@ /obj/effect/landmark/damageturf, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "gb" = ( @@ -288,9 +288,9 @@ invisibility = 101 }, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "gC" = ( @@ -311,9 +311,9 @@ pixel_x = -29 }, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "gE" = ( @@ -323,9 +323,9 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/damageturf, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "gF" = ( @@ -341,9 +341,9 @@ "hj" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "ho" = ( @@ -351,9 +351,9 @@ name = "Broken External Airlock" }, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "hx" = ( @@ -361,9 +361,9 @@ /obj/structure/grille/broken, /obj/effect/decal/cleanable/glass, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "hE" = ( @@ -374,9 +374,9 @@ }, /obj/effect/landmark/damageturf, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "hP" = ( @@ -385,9 +385,9 @@ /obj/structure/window/reinforced, /obj/machinery/conveyor/west, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "hY" = ( @@ -397,9 +397,9 @@ /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "ia" = ( @@ -415,9 +415,9 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "iq" = ( @@ -427,9 +427,9 @@ /obj/machinery/conveyor/west, /obj/machinery/mineral/unloading_machine, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "jb" = ( @@ -452,9 +452,9 @@ }, /obj/effect/landmark/damageturf, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "kn" = ( @@ -467,9 +467,9 @@ /obj/item/clothing/under/rank/cargo/miner, /mob/living/simple_animal/hostile/asteroid/hivelord/legion, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "kR" = ( @@ -481,9 +481,9 @@ /obj/item/storage/box/donkpockets/empty, /obj/item/storage/box/donkpockets/empty, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "lr" = ( @@ -491,9 +491,9 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/damageturf, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/lavaland/surface/outdoors) "lZ" = ( @@ -506,9 +506,9 @@ invisibility = 101 }, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "ms" = ( @@ -517,9 +517,9 @@ icon_state = "pipe-c" }, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "nm" = ( @@ -532,9 +532,9 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "nK" = ( @@ -544,9 +544,9 @@ /obj/item/shard, /obj/effect/decal/cleanable/glass, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "nN" = ( @@ -556,9 +556,9 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/glass, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/lavaland/surface/outdoors) "nQ" = ( @@ -566,9 +566,9 @@ /obj/effect/turf_decal/delivery/white/hollow, /obj/structure/ore_box, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "nX" = ( @@ -579,17 +579,17 @@ /area/ruin/unpowered/althland_processing) "oj" = ( /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "oG" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/lavaland/surface/outdoors) "pn" = ( @@ -602,9 +602,9 @@ /obj/item/clothing/under/rank/cargo/miner, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "pP" = ( @@ -614,9 +614,9 @@ /obj/effect/landmark/damageturf, /obj/effect/decal/cleanable/glass, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/lavaland/surface/outdoors) "qh" = ( @@ -636,9 +636,9 @@ invisibility = 101 }, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "qQ" = ( @@ -655,9 +655,9 @@ /obj/effect/landmark/damageturf, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "rf" = ( @@ -665,9 +665,9 @@ name = "Broken External Airlock" }, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/lavaland/surface/outdoors) "rw" = ( @@ -678,9 +678,9 @@ /obj/effect/landmark/damageturf, /obj/structure/disposalpipe/segment, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "rY" = ( @@ -688,9 +688,9 @@ /obj/item/clothing/under/rank/cargo/miner, /obj/item/paper/fluff/ruins/althland/journal, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/lavaland/surface/outdoors) "sa" = ( @@ -700,17 +700,17 @@ /obj/structure/window/reinforced, /obj/item/stack/sheet/mineral/silver, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "sg" = ( /obj/effect/landmark/damageturf, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/lavaland/surface/outdoors) "su" = ( @@ -722,9 +722,9 @@ }, /obj/effect/landmark/damageturf, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/lavaland/surface/outdoors) "sv" = ( @@ -742,9 +742,9 @@ /obj/item/pickaxe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "to" = ( @@ -752,9 +752,9 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/damageturf, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/lavaland/surface/outdoors) "tv" = ( @@ -764,9 +764,9 @@ /obj/machinery/constructable_frame/machine_frame, /obj/item/stack/cable_coil, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "tD" = ( @@ -775,9 +775,9 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "tS" = ( @@ -795,18 +795,18 @@ /obj/effect/turf_decal/caution/stand_clear/white, /obj/effect/turf_decal/box/white, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "ub" = ( /obj/item/clothing/under/rank/cargo/miner, /obj/effect/landmark/damageturf, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "uf" = ( @@ -814,9 +814,9 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/damageturf, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "ui" = ( @@ -832,9 +832,9 @@ /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "uM" = ( @@ -844,9 +844,9 @@ /obj/item/rack_parts, /obj/effect/landmark/damageturf, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "vf" = ( @@ -859,9 +859,9 @@ /obj/effect/landmark/burnturf, /obj/effect/landmark/damageturf, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "vl" = ( @@ -870,9 +870,9 @@ /obj/effect/decal/cleanable/dirt, /obj/item/storage/belt/mining/alt, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "vo" = ( @@ -884,9 +884,9 @@ /obj/effect/decal/remains/human, /obj/item/clothing/under/rank/cargo/miner, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "vM" = ( @@ -895,9 +895,9 @@ /obj/effect/landmark/damageturf, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/lavaland/surface/outdoors) "wZ" = ( @@ -905,9 +905,9 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "xK" = ( @@ -917,9 +917,9 @@ /obj/effect/landmark/damageturf, /obj/machinery/economy/vending/chinese, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "zd" = ( @@ -931,9 +931,9 @@ dir = 1 }, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "zp" = ( @@ -949,9 +949,9 @@ /obj/effect/landmark/burnturf, /mob/living/simple_animal/hostile/asteroid/hivelord/legion, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "zq" = ( @@ -966,9 +966,9 @@ icon_state = "pipe-c" }, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "zE" = ( @@ -980,9 +980,9 @@ invisibility = 101 }, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "zG" = ( @@ -995,9 +995,9 @@ /obj/effect/landmark/damageturf, /mob/living/simple_animal/hostile/asteroid/hivelord/legion, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "zO" = ( @@ -1005,18 +1005,18 @@ /obj/effect/landmark/damageturf, /obj/effect/decal/cleanable/glass, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/lavaland/surface/outdoors) "zR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/door_assembly/door_assembly_mhatch, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "zZ" = ( @@ -1025,9 +1025,9 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/conveyor/west, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Au" = ( @@ -1038,9 +1038,9 @@ /obj/effect/landmark/damageturf, /obj/structure/door_assembly/door_assembly_mhatch, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "AE" = ( @@ -1052,17 +1052,17 @@ dir = 8 }, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "AH" = ( /obj/effect/landmark/burnturf, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "AL" = ( @@ -1071,9 +1071,9 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/damageturf, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/lavaland/surface/outdoors) "AT" = ( @@ -1085,9 +1085,9 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/portable/pump, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "BG" = ( @@ -1099,9 +1099,9 @@ /obj/effect/landmark/damageturf, /obj/effect/decal/cleanable/glass, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "BM" = ( @@ -1109,9 +1109,9 @@ /obj/effect/landmark/burnturf, /obj/effect/landmark/damageturf, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "BO" = ( @@ -1123,9 +1123,9 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/damageturf, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "BX" = ( @@ -1138,9 +1138,9 @@ /obj/item/clothing/under/rank/cargo/miner, /obj/effect/landmark/damageturf, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "CF" = ( @@ -1155,18 +1155,18 @@ }, /obj/machinery/economy/vending/assist/free, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Dd" = ( /obj/structure/grille/broken, /obj/effect/decal/cleanable/glass, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/lavaland/surface/outdoors) "Dg" = ( @@ -1178,9 +1178,9 @@ "Dp" = ( /obj/machinery/disposal, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Dt" = ( @@ -1191,25 +1191,25 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Dv" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/door_assembly/door_assembly_mhatch, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Dz" = ( /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "DM" = ( @@ -1219,9 +1219,9 @@ /obj/effect/landmark/damageturf, /obj/structure/disposalpipe/segment, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Ec" = ( @@ -1231,9 +1231,9 @@ }, /obj/machinery/mineral/processing_unit, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Ek" = ( @@ -1249,9 +1249,9 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/damageturf, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Fd" = ( @@ -1263,9 +1263,9 @@ /obj/item/tank/internals/oxygen, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "FX" = ( @@ -1276,9 +1276,9 @@ dir = 8 }, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Ge" = ( @@ -1289,9 +1289,9 @@ invisibility = 101 }, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Gk" = ( @@ -1300,9 +1300,9 @@ /obj/effect/decal/remains/human, /obj/item/clothing/under/rank/cargo/miner, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Gt" = ( @@ -1311,9 +1311,9 @@ /obj/effect/landmark/damageturf, /obj/structure/disposalpipe/segment, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Gz" = ( @@ -1322,9 +1322,9 @@ icon_state = "pipe-c" }, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "GF" = ( @@ -1336,9 +1336,9 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/girder, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Hj" = ( @@ -1359,9 +1359,9 @@ }, /obj/effect/landmark/burnturf, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Hx" = ( @@ -1371,9 +1371,9 @@ /mob/living/simple_animal/hostile/asteroid/hivelord/legion, /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "HO" = ( @@ -1382,9 +1382,9 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Ic" = ( @@ -1394,26 +1394,26 @@ /obj/structure/closet/crate/miningcar, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "In" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/burnturf, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Io" = ( /obj/item/chair, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "IT" = ( @@ -1422,9 +1422,9 @@ /obj/effect/turf_decal/delivery/white/hollow, /obj/structure/ore_box, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Jw" = ( @@ -1436,9 +1436,9 @@ /obj/item/reagent_containers/drinks/cans/beer, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "JE" = ( @@ -1447,9 +1447,9 @@ /obj/machinery/mech_bay_recharge_port, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "JT" = ( @@ -1457,9 +1457,9 @@ /obj/item/shard, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "KJ" = ( @@ -1469,9 +1469,9 @@ /obj/effect/landmark/damageturf, /obj/machinery/atmospherics/portable/scrubber, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "KN" = ( @@ -1488,9 +1488,9 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/glass, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "KZ" = ( @@ -1506,9 +1506,9 @@ invisibility = 101 }, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Ln" = ( @@ -1518,9 +1518,9 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Lq" = ( @@ -1529,18 +1529,18 @@ }, /obj/effect/landmark/burnturf, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/lavaland/surface/outdoors) "LA" = ( /obj/effect/landmark/damageturf, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Ms" = ( @@ -1548,9 +1548,9 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/lavaland/surface/outdoors) "Mw" = ( @@ -1559,9 +1559,9 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/secure/loot, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "MO" = ( @@ -1574,18 +1574,18 @@ invisibility = 101 }, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "MY" = ( /obj/effect/landmark/burnturf, /obj/effect/decal/cleanable/glass, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/lavaland/surface/outdoors) "Nu" = ( @@ -1595,9 +1595,9 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Og" = ( @@ -1613,9 +1613,9 @@ /obj/effect/decal/cleanable/dirt, /obj/item/paper/fluff/ruins/althland/journal, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "OJ" = ( @@ -1624,9 +1624,9 @@ /obj/effect/landmark/burnturf, /obj/effect/landmark/damageturf, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "OW" = ( @@ -1634,18 +1634,18 @@ /obj/effect/decal/cleanable/dirt, /obj/item/t_scanner/adv_mining_scanner, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Pn" = ( /obj/structure/disposalpipe/segment, /obj/effect/landmark/burnturf, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Po" = ( @@ -1654,9 +1654,9 @@ /obj/item/shard, /obj/effect/decal/cleanable/glass, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Px" = ( @@ -1670,36 +1670,36 @@ invisibility = 101 }, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "PF" = ( /obj/structure/grille/broken, /obj/effect/decal/cleanable/glass, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "PJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/damageturf, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/lavaland/surface/outdoors) "PY" = ( /obj/structure/marker_beacon/dock_marker, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/lavaland/surface/outdoors) "Qj" = ( @@ -1707,9 +1707,9 @@ /obj/structure/closet/crate, /obj/item/clothing/mask/gas/explorer, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Qu" = ( @@ -1731,9 +1731,9 @@ }, /obj/effect/landmark/burnturf, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "RX" = ( @@ -1753,18 +1753,18 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/damageturf, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "TN" = ( /obj/effect/landmark/damageturf, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/lavaland/surface/outdoors) "TX" = ( @@ -1772,9 +1772,9 @@ dir = 2 }, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "UP" = ( @@ -1786,9 +1786,9 @@ invisibility = 101 }, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "UU" = ( @@ -1799,9 +1799,9 @@ icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Vj" = ( @@ -1812,9 +1812,9 @@ invisibility = 101 }, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "VJ" = ( @@ -1831,9 +1831,9 @@ "VO" = ( /obj/machinery/economy/vending/cigarette, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Wb" = ( @@ -1849,17 +1849,17 @@ pixel_y = 28 }, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Wl" = ( /obj/structure/grille, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Wp" = ( @@ -1870,9 +1870,9 @@ /obj/effect/landmark/burnturf, /obj/effect/decal/cleanable/glass, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/lavaland/surface/outdoors) "WQ" = ( @@ -1884,9 +1884,9 @@ pixel_y = 28 }, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Xn" = ( @@ -1900,9 +1900,9 @@ /obj/machinery/computer/nonfunctional, /obj/item/paper/fluff/ruins/althland/geology, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "XD" = ( @@ -1911,9 +1911,9 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/damageturf, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/lavaland/surface/outdoors) "XO" = ( @@ -1923,9 +1923,9 @@ /obj/effect/landmark/damageturf, /obj/effect/decal/cleanable/glass, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "XT" = ( @@ -1937,26 +1937,26 @@ /obj/effect/landmark/damageturf, /obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Yd" = ( /obj/structure/grille, /obj/item/shard, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/lavaland/surface/outdoors) "Yl" = ( /obj/structure/girder, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Yt" = ( @@ -1967,9 +1967,9 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Yx" = ( @@ -1977,9 +1977,9 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/unary/tank/oxygen_agent_b, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "YF" = ( @@ -1988,18 +1988,18 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "YK" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/damageturf, /turf/simulated/floor/plasteel{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "YN" = ( @@ -2007,9 +2007,9 @@ /obj/item/shard, /obj/effect/decal/cleanable/glass, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/lavaland/surface/outdoors) "Zi" = ( @@ -2021,9 +2021,9 @@ /obj/effect/landmark/burnturf, /obj/effect/landmark/damageturf, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "Zr" = ( @@ -2040,9 +2040,9 @@ /obj/structure/grille, /obj/item/shard, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "ZB" = ( @@ -2060,9 +2060,9 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/burnturf, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) "ZN" = ( @@ -2074,9 +2074,9 @@ pixel_y = 32 }, /turf/simulated/floor{ - temperature = 300; - oxygen = 14; - nitrogen = 23 + temperature = 500; + oxygen = 8; + nitrogen = 14 }, /area/ruin/unpowered/althland_processing) 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 8ace2a3f5fa..6acf26a68d3 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm @@ -67,7 +67,7 @@ /turf/simulated/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "am" = ( -/obj/effect/baseturf_helper/lava_land/surface, +/obj/effect/baseturf_helper/lava/mapping_lava, /turf/simulated/wall/indestructible/boss, /area/ruin/unpowered/ash_walkers) "aq" = ( diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm index 4bb27a916a9..5f76d0072f1 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm @@ -24,7 +24,7 @@ /turf/simulated/floor/engine/cult/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "h" = ( -/obj/effect/baseturf_helper/lava_land/surface, +/obj/effect/baseturf_helper/lava/mapping_lava, /turf/simulated/wall/cult, /area/ruin/unpowered/misc_lavaruin) "i" = ( diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_envy.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_envy.dmm index b35d9a6cc2d..ed374fef6be 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_envy.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_envy.dmm @@ -100,7 +100,7 @@ /turf/simulated/floor/plating, /area/ruin/unpowered/misc_lavaruin) "q" = ( -/obj/effect/baseturf_helper/lava_land/surface, +/obj/effect/baseturf_helper/lava/mapping_lava, /turf/simulated/floor/plating, /area/ruin/unpowered/misc_lavaruin) "A" = ( diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_fountain_hall.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_fountain_hall.dmm index 0cdba515672..7896750f423 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_fountain_hall.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_fountain_hall.dmm @@ -29,7 +29,7 @@ /turf/simulated/floor/engine/cult, /area/ruin/unpowered/misc_lavaruin) "i" = ( -/obj/effect/baseturf_helper/lava_land/surface, +/obj/effect/baseturf_helper/lava/mapping_lava, /turf/simulated/floor/engine/cult, /area/ruin/unpowered/misc_lavaruin) diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm index 4452d35ac9b..c0c70a88b39 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm @@ -9,7 +9,7 @@ /turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "d" = ( -/obj/effect/baseturf_helper/lava_land/surface, +/obj/effect/baseturf_helper/lava/mapping_lava, /turf/simulated/floor/plasteel/freezer, /area/ruin/powered/gluttony) "e" = ( diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_greed.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_greed.dmm index 648ba865ff6..b701d975b9d 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_greed.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_greed.dmm @@ -9,7 +9,7 @@ /turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "d" = ( -/obj/effect/baseturf_helper/lava_land/surface, +/obj/effect/baseturf_helper/lava/mapping_lava, /turf/simulated/floor/engine/cult, /area/ruin/powered/greed) "e" = ( diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm index 4cd633eeba3..1c5caf4700b 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm @@ -11,14 +11,11 @@ "d" = ( /obj/item/clothing/head/helmet/space/syndicate/orange, /obj/item/clothing/mask/breath, -/turf/simulated/floor/plating/asteroid/basalt, +/turf/simulated/floor/plating, /area/ruin/powered) "e" = ( /obj/item/clothing/suit/space/syndicate/orange, -/turf/simulated/floor/plating/asteroid/basalt, -/area/ruin/powered) -"f" = ( -/turf/simulated/floor/plating/asteroid/basalt, +/turf/simulated/floor/plating, /area/ruin/powered) "g" = ( /turf/simulated/floor/plating/asteroid{ @@ -60,8 +57,7 @@ /obj/item/seeds/reishi, /obj/item/seeds/plump, /obj/item/seeds/plump, -/obj/item/food/snacks/grown/mushroom/glowshroom, -/turf/simulated/floor/plating/asteroid/basalt, +/turf/simulated/floor/plating, /area/ruin/powered) "n" = ( /obj/machinery/hydroponics/soil, @@ -75,7 +71,7 @@ /obj/item/storage/bag/plants/portaseeder, /obj/item/storage/bag/ore, /obj/item/storage/firstaid/regular, -/turf/simulated/floor/plating/asteroid/basalt, +/turf/simulated/floor/plating, /area/ruin/powered) "q" = ( /obj/structure/glowshroom, @@ -85,7 +81,7 @@ /obj/structure/rack, /obj/item/pickaxe/emergency, /obj/item/tank/internals/oxygen, -/turf/simulated/floor/plating/asteroid/basalt, +/turf/simulated/floor/plating, /area/ruin/powered) "s" = ( /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, @@ -170,9 +166,9 @@ "J" = ( /obj/effect/spawner/window/shuttle, /turf/simulated/floor/plating{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/powered) "K" = ( @@ -181,7 +177,7 @@ /area/ruin/powered) "X" = ( /obj/item/flashlight/lantern, -/turf/simulated/floor/plating/asteroid/basalt, +/turf/simulated/floor/plating, /area/ruin/powered) (1,1,1) = {" @@ -316,7 +312,7 @@ b b b c -f +g o q K @@ -331,11 +327,11 @@ s (9,1,1) = {" b b -f -i g -f -f +i +o +g +g o o o @@ -352,9 +348,9 @@ d g j g +o +g g -f -f u o A @@ -385,7 +381,7 @@ s (12,1,1) = {" b b -f +o k X b diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hierophant.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hierophant.dmm index 51249894e4c..2eba0969e53 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hierophant.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hierophant.dmm @@ -27,7 +27,7 @@ /turf/simulated/floor/indestructible/hierophant/two, /area/ruin/unpowered/hierophant) "g" = ( -/obj/effect/baseturf_helper/lava_land/surface, +/obj/effect/baseturf_helper/lava/mapping_lava, /turf/simulated/floor/indestructible/hierophant/two, /area/ruin/unpowered/hierophant) 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 3dfde46fb55..f91d857af1d 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_monster_nest.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_monster_nest.dmm @@ -34,7 +34,7 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "W" = ( -/obj/effect/baseturf_helper/lava_land/surface, +/obj/effect/baseturf_helper/lava/mapping_lava, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm index c3df51e7874..93341452885 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm @@ -15,53 +15,53 @@ "e" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "f" = ( /obj/structure/table/wood, /obj/item/storage/box/cups, /turf/simulated/floor/wood{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "g" = ( /obj/structure/reagent_dispensers/water_cooler/pizzaparty, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "h" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "i" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "j" = ( /obj/item/food/snacks/mushroompizzaslice, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "k" = ( @@ -69,9 +69,9 @@ /obj/effect/spawner/lootdrop/pizzaparty, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "l" = ( @@ -83,54 +83,54 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/wood{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "m" = ( /obj/item/chair/wood/wings, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "n" = ( /obj/structure/glowshroom, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "o" = ( /obj/item/trash/plate, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "p" = ( /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "q" = ( /obj/item/chair/wood/wings, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "r" = ( @@ -141,33 +141,33 @@ name = "party hat" }, /turf/simulated/floor/wood{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "s" = ( /turf/simulated/floor/wood{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "t" = ( /obj/structure/chair/wood/wings, /obj/effect/decal/remains/human, /turf/simulated/floor/wood{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "u" = ( /obj/structure/glowshroom, /turf/simulated/floor/wood{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "v" = ( @@ -179,27 +179,27 @@ /obj/item/kitchen/utensil/fork, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "x" = ( /obj/structure/table/wood, /obj/effect/spawner/lootdrop/pizzaparty, /turf/simulated/floor/wood{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "y" = ( /obj/structure/table/wood, /obj/item/trash/plate, /turf/simulated/floor/wood{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "z" = ( @@ -207,9 +207,9 @@ /obj/structure/glowshroom, /obj/item/a_gift, /turf/simulated/floor/wood{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "A" = ( @@ -217,17 +217,17 @@ /obj/item/trash/plate, /obj/item/kitchen/utensil/fork, /turf/simulated/floor/wood{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "B" = ( -/obj/effect/baseturf_helper/lava_land/surface, +/obj/effect/baseturf_helper/lava/mapping_lava, /turf/simulated/floor/wood{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "C" = ( @@ -236,9 +236,9 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "D" = ( @@ -246,61 +246,61 @@ /obj/item/food/snacks/margheritapizzaslice, /obj/item/trash/plate, /turf/simulated/floor/wood{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "E" = ( /obj/structure/table/wood, /obj/item/food/snacks/meatpizzaslice, /turf/simulated/floor/wood{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "F" = ( /obj/structure/table/wood, /obj/item/food/snacks/sliceable/birthdaycake, /turf/simulated/floor/wood{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "G" = ( /obj/structure/table/wood, /turf/simulated/floor/wood{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "H" = ( /obj/item/chair/wood/wings, /turf/simulated/floor/wood{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "I" = ( /obj/item/kitchen/utensil/fork, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "J" = ( /obj/structure/glowshroom, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "K" = ( @@ -310,27 +310,27 @@ /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "L" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "M" = ( /obj/effect/decal/cleanable/dirt, /obj/item/a_gift, /turf/simulated/floor/wood{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "N" = ( @@ -342,9 +342,9 @@ /obj/item/kitchen/knife, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "P" = ( @@ -353,16 +353,16 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) "Q" = ( /turf/simulated/floor/plating{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/unpowered/misc_lavaruin) diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pride.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pride.dmm index 3f3cd85b2d4..9dd7728d1f8 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pride.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pride.dmm @@ -9,7 +9,7 @@ /turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "d" = ( -/obj/effect/baseturf_helper/lava_land/surface, +/obj/effect/baseturf_helper/lava/mapping_lava, /turf/simulated/floor/mineral/silver, /area/ruin/powered/pride) "e" = ( diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm index 01936b0ab7a..dcf482c025d 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm @@ -102,7 +102,7 @@ /turf/simulated/floor/plasteel/freezer, /area/ruin/powered/seedvault) "hO" = ( -/obj/effect/baseturf_helper/lava_land/surface, +/obj/effect/baseturf_helper/lava/mapping_lava, /turf/simulated/floor/plasteel/freezer, /area/ruin/powered/seedvault) "im" = ( diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm index c6a81c6289b..c161e65c398 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm @@ -38,7 +38,7 @@ }, /area/ruin/unpowered/misc_lavaruin) "h" = ( -/obj/effect/baseturf_helper/lava_land/surface, +/obj/effect/baseturf_helper/lava/mapping_lava, /turf/simulated/floor/sepia{ slowdown = 10 }, diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm index e785d01709e..1560a859565 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm @@ -93,7 +93,7 @@ /obj/structure/tubes, /obj/item/crowbar, /obj/effect/decal/cleanable/blood/drip, -/obj/effect/baseturf_helper/lava_land/surface, +/obj/effect/baseturf_helper/lava/mapping_lava, /turf/simulated/floor/pod/dark, /area/ruin/powered) "s" = ( 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 b3235be262d..8af0d326d27 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm @@ -32,7 +32,7 @@ /turf/simulated/floor/plating/abductor/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "k" = ( -/obj/effect/baseturf_helper/lava_land/surface, +/obj/effect/baseturf_helper/lava/mapping_lava, /turf/simulated/floor/plating/abductor/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "l" = ( diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm index c654511265e..9a6ba2b97df 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm @@ -9,7 +9,7 @@ /area/ruin/unpowered/xenonest) "c" = ( /obj/structure/alien/weeds, -/obj/effect/baseturf_helper/lava_land/surface, +/obj/effect/baseturf_helper/lava/mapping_lava, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/xenonest) "d" = ( @@ -36,15 +36,15 @@ /obj/structure/bed/nest, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/xenonest) -"j" = ( -/obj/structure/alien/weeds, -/mob/living/simple_animal/hostile/alien, -/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/ruin/unpowered/xenonest) "l" = ( /obj/structure/alien/weeds/node, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/xenonest) +"n" = ( +/obj/structure/alien/weeds, +/mob/living/simple_animal/hostile/alien/lavaland, +/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/xenonest) "o" = ( /obj/structure/alien/weeds, /obj/structure/bed/nest, @@ -60,7 +60,7 @@ /area/ruin/unpowered/xenonest) "t" = ( /obj/structure/alien/weeds, -/mob/living/simple_animal/hostile/alien/sentinel, +/mob/living/simple_animal/hostile/alien/sentinel/lavaland, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/xenonest) "u" = ( @@ -108,19 +108,12 @@ /area/ruin/unpowered/xenonest) "E" = ( /obj/structure/alien/weeds, -/mob/living/simple_animal/hostile/alien/drone{ - plants_off = 1 - }, +/mob/living/simple_animal/hostile/alien/drone/lavaland, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/xenonest) "F" = ( /obj/structure/alien/weeds, -/mob/living/simple_animal/hostile/alien/queen/large{ - desc = "A gigantic alien who is in charge of the hive and all of its loyal servants."; - name = "alien queen"; - pixel_x = -16; - plants_off = 1 - }, +/mob/living/simple_animal/hostile/alien/queen/large/lavaland, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/xenonest) "G" = ( @@ -142,14 +135,7 @@ /area/ruin/unpowered/xenonest) "K" = ( /obj/structure/alien/weeds/node, -/mob/living/simple_animal/hostile/alien, -/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/ruin/unpowered/xenonest) -"L" = ( -/obj/structure/alien/weeds/node, -/mob/living/simple_animal/hostile/alien/drone{ - plants_off = 1 - }, +/mob/living/simple_animal/hostile/alien/drone/lavaland, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/xenonest) "M" = ( @@ -169,15 +155,18 @@ "Q" = ( /obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood, -/mob/living/simple_animal/hostile/alien/drone{ - plants_off = 1 - }, +/mob/living/simple_animal/hostile/alien/drone/lavaland, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/xenonest) "R" = ( /obj/structure/alien/weeds, /turf/template_noop, /area/ruin/unpowered/xenonest) +"X" = ( +/obj/structure/alien/weeds/node, +/mob/living/simple_animal/hostile/alien/lavaland, +/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/xenonest) (1,1,1) = {" a @@ -683,7 +672,7 @@ a b b g -j +n g e b @@ -699,7 +688,7 @@ a a a b -E +n g b b @@ -854,7 +843,7 @@ a (22,1,1) = {" d f -j +E g b b @@ -967,7 +956,7 @@ a a b g -L +K b b b @@ -1084,7 +1073,7 @@ a b z C -j +n g e i @@ -1410,7 +1399,7 @@ b b g g -K +X g g b diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm index e3cd67a5917..44c07968631 100644 --- a/_maps/map_files/generic/Lavaland.dmm +++ b/_maps/map_files/generic/Lavaland.dmm @@ -109,17 +109,7 @@ /turf/simulated/floor/plasteel/white, /area/mine/laborcamp) "au" = ( -/obj/structure/rack, -/obj/item/storage/bag/ore, -/obj/item/pickaxe/safety, -/obj/item/flashlight/lantern, -/obj/item/mining_scanner, -/obj/effect/decal/cleanable/dirt, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/beanie/orange, -/obj/item/clothing/gloves/fingerless, -/obj/item/clothing/shoes/workboots, -/obj/item/clothing/suit/storage/hazardvest, +/obj/machinery/suit_storage_unit/gulag, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -777,7 +767,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/effect/baseturf_helper/asteroid/basalt, +/obj/effect/baseturf_helper/lava_land, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkfull" @@ -909,7 +899,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plating/lavaland_air, /area/shuttle/mining) "ci" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -1056,7 +1046,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/baseturf_helper/asteroid/basalt, +/obj/effect/baseturf_helper/lava_land, /turf/simulated/floor/plasteel, /area/mine/laborcamp) "cz" = ( @@ -1619,7 +1609,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/baseturf_helper/asteroid/basalt, +/obj/effect/baseturf_helper/lava_land, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkfull" @@ -2124,7 +2114,7 @@ d2 = 8; icon_state = "4-9" }, -/obj/effect/baseturf_helper/asteroid/basalt, +/obj/effect/baseturf_helper/lava_land, /turf/simulated/floor/plasteel, /area/mine/outpost/mechbay) "eE" = ( @@ -2394,7 +2384,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plating/lavaland_air, /area/shuttle/mining) "fd" = ( /obj/structure/fans/tiny, @@ -2556,7 +2546,7 @@ /turf/simulated/floor/plating, /area/mine/outpost/production) "fv" = ( -/obj/effect/baseturf_helper/asteroid/basalt, +/obj/effect/baseturf_helper/lava_land, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkfull" @@ -3422,7 +3412,7 @@ /obj/structure/sign/poster/random{ pixel_x = -32 }, -/obj/effect/baseturf_helper/asteroid/basalt, +/obj/effect/baseturf_helper/lava_land, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) "ir" = ( @@ -3783,7 +3773,7 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "kA" = ( -/obj/effect/baseturf_helper/asteroid/basalt, +/obj/effect/baseturf_helper/lava_land, /turf/simulated/floor/mineral/titanium, /area/shuttle/siberia) "kI" = ( @@ -4955,7 +4945,7 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors/outpost/catwalk) "rM" = ( -/obj/effect/baseturf_helper/asteroid/basalt, +/obj/effect/baseturf_helper/lava_land, /turf/simulated/floor/mineral/titanium, /area/shuttle/mining) "rP" = ( @@ -5662,7 +5652,7 @@ /area/mine/outpost/medbay) "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{ @@ -5691,7 +5681,7 @@ icon_state = "1-2" }, /obj/effect/spawner/random_spawners/dirt_maybe, -/obj/effect/baseturf_helper/asteroid/basalt, +/obj/effect/baseturf_helper/lava_land, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkfull" @@ -5749,13 +5739,6 @@ }, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors/outpost/catwalk) -"xR" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "browncorner" - }, -/area/mine/laborcamp) "xS" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -5821,7 +5804,7 @@ /area/mine/laborcamp) "yp" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/baseturf_helper/asteroid/basalt, +/obj/effect/baseturf_helper/lava_land, /turf/simulated/floor/plating, /area/mine/outpost/production) "yq" = ( @@ -5889,7 +5872,7 @@ dir = 9; network = list("Mining Outpost") }, -/obj/effect/baseturf_helper/asteroid/basalt, +/obj/effect/baseturf_helper/lava_land, /turf/simulated/floor/carpet, /area/mine/outpost/quartermaster) "yO" = ( @@ -6142,7 +6125,7 @@ /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) "Av" = ( -/obj/effect/baseturf_helper/asteroid/basalt, +/obj/effect/baseturf_helper/lava_land, /turf/simulated/floor/plasteel{ icon_regular_floor = "yellowsiding"; icon_state = "tranquillite" @@ -6756,7 +6739,7 @@ /area/mine/outpost/lockers) "EF" = ( /obj/item/cigbutt, -/obj/effect/baseturf_helper/asteroid/basalt, +/obj/effect/baseturf_helper/lava_land, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkfull" @@ -7175,16 +7158,6 @@ icon_state = "darkfull" }, /area/mine/outpost/hallway/west) -"HK" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/mine/laborcamp) "HS" = ( /obj/structure/cable{ d1 = 1; @@ -7194,7 +7167,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/baseturf_helper/asteroid/basalt, +/obj/effect/baseturf_helper/lava_land, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull"; dir = 8 @@ -7313,7 +7286,7 @@ d2 = 4 }, /obj/item/radio/beacon, -/obj/effect/baseturf_helper/asteroid/basalt, +/obj/effect/baseturf_helper/lava_land, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkfull" @@ -7496,7 +7469,7 @@ c_tag = "Mining Outpost - Custodial Storage"; network = list("Mining Outpost") }, -/obj/effect/baseturf_helper/asteroid/basalt, +/obj/effect/baseturf_helper/lava_land, /turf/simulated/floor/plasteel{ icon_state = "darkgreencorners" }, @@ -8264,10 +8237,16 @@ }, /area/mine/outpost/hallway/east) "QE" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/structure/rack, +/obj/item/storage/bag/ore, +/obj/item/pickaxe/safety, +/obj/item/flashlight/lantern, +/obj/item/mining_scanner, +/obj/item/clothing/mask/breath, +/obj/item/clothing/head/beanie/orange, +/obj/item/clothing/gloves/fingerless, +/obj/item/clothing/shoes/workboots, +/obj/item/clothing/suit/storage/hazardvest, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -8577,7 +8556,7 @@ /obj/structure/cable/cyan{ icon_state = "1-4" }, -/obj/effect/baseturf_helper/asteroid/basalt, +/obj/effect/baseturf_helper/lava_land, /turf/simulated/floor/plasteel/dark, /area/mine/outpost/comms) "Ta" = ( @@ -8618,7 +8597,7 @@ dir = 1 }, /obj/effect/spawner/random_spawners/dirt_maybe, -/obj/effect/baseturf_helper/asteroid/basalt, +/obj/effect/baseturf_helper/lava_land, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/east) "Ts" = ( @@ -8729,6 +8708,16 @@ /obj/effect/spawner/random_spawners/dirt_maybe, /turf/simulated/floor/catwalk, /area/mine/outpost/engineering) +"Uq" = ( +/obj/machinery/suit_storage_unit/gulag, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "brown" + }, +/area/mine/laborcamp) "Ur" = ( /obj/structure/stone_tile/block, /obj/structure/stone_tile{ @@ -9033,7 +9022,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/baseturf_helper/asteroid/basalt, +/obj/effect/baseturf_helper/lava_land, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkfull" @@ -15214,10 +15203,10 @@ ar NG qT ME +Ss +FO QE -xR -bk -HK +Rd ug Vt JZ @@ -16236,10 +16225,10 @@ an an an aq -Ss -FO au -Rd +au +au +Uq tZ LQ JZ diff --git a/_maps/map_files/templates/biodome_beach.dmm b/_maps/map_files/templates/biodome_beach.dmm index 994144d3207..8fcff913987 100644 --- a/_maps/map_files/templates/biodome_beach.dmm +++ b/_maps/map_files/templates/biodome_beach.dmm @@ -283,7 +283,7 @@ /turf/simulated/floor/pod, /area/ruin/powered/beach) "br" = ( -/obj/effect/baseturf_helper/lava_land/surface, +/obj/effect/baseturf_helper/lava/mapping_lava, /turf/simulated/floor/beach/sand, /area/ruin/powered/beach) "bx" = ( @@ -428,9 +428,9 @@ dir = 4 }, /turf/simulated/floor/pod/light{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/powered/beach) "lM" = ( @@ -546,9 +546,9 @@ dir = 8 }, /turf/simulated/floor/pod/light{ - nitrogen = 23; - oxygen = 14; - temperature = 300 + nitrogen = 14; + oxygen = 8; + temperature = 500 }, /area/ruin/powered/beach) "TW" = ( diff --git a/code/__DEFINES/atmospherics_defines.dm b/code/__DEFINES/atmospherics_defines.dm index 24f271ed8c4..fa2355a729f 100644 --- a/code/__DEFINES/atmospherics_defines.dm +++ b/code/__DEFINES/atmospherics_defines.dm @@ -39,7 +39,7 @@ #define MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND 4 //Minimum temperature difference before group processing is suspended #define MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER 0.5 //Minimum temperature difference before the gas temperatures are just set to be equal #define MINIMUM_TEMPERATURE_FOR_SUPERCONDUCTION (T20C+10) -#define MINIMUM_TEMPERATURE_START_SUPERCONDUCTION (T20C+200) +#define MINIMUM_TEMPERATURE_START_SUPERCONDUCTION (T20C+230) //HEAT TRANSFER COEFFICIENTS //Must be between 0 and 1. Values closer to 1 equalize temperature faster diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 73b05491d0c..afd96150aec 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -169,9 +169,16 @@ name = "mining suit storage unit" suit_type = /obj/item/clothing/suit/hooded/explorer mask_type = /obj/item/clothing/mask/gas/explorer + boots_type = /obj/item/clothing/shoes/workboots/mining storage_type = /obj/item/gps/mining req_access = list(ACCESS_MINING_STATION) +/obj/machinery/suit_storage_unit/gulag + name = "gulag suit storage unit" + suit_type = /obj/item/clothing/suit/space/prisoner_gulag + helmet_type = /obj/item/clothing/head/space/prisoner_gulag + mask_type = /obj/item/clothing/mask/breath + /obj/machinery/suit_storage_unit/cmo name = "chief medical officer's suit storage unit" mask_type = /obj/item/clothing/mask/breath diff --git a/code/game/turfs/simulated/floor/asteroid_floors.dm b/code/game/turfs/simulated/floor/asteroid_floors.dm index bb56be30dff..daa1ec59b87 100644 --- a/code/game/turfs/simulated/floor/asteroid_floors.dm +++ b/code/game/turfs/simulated/floor/asteroid_floors.dm @@ -146,16 +146,16 @@ ///////Surface. The surface is warm, but survivable without a suit. Internals are required. The floors break to chasms, which drop you into the underground. /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface - oxygen = 14 - nitrogen = 23 - temperature = 300 + oxygen = 8 + nitrogen = 14 + temperature = 500 planetary_atmos = TRUE baseturf = /turf/simulated/floor/lava/mapping_lava /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface_hard - oxygen = 14 - nitrogen = 23 - temperature = 300 + oxygen = 8 + nitrogen = 14 + temperature = 500 planetary_atmos = TRUE color = COLOR_FLOOR_HARD_ROCK baseturf = /turf/simulated/floor/lava/lava_land_surface @@ -199,9 +199,9 @@ GLOBAL_LIST_INIT(megafauna_spawn_list, list(/mob/living/simple_animal/hostile/me data_having_type = /turf/simulated/floor/plating/asteroid/airless/cave/volcanic/has_data turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface - oxygen = 14 - nitrogen = 23 - temperature = 300 + oxygen = 8 + nitrogen = 14 + temperature = 500 /// subtype for producing a tunnel with given data /turf/simulated/floor/plating/asteroid/airless/cave/volcanic/has_data diff --git a/code/game/turfs/simulated/floor/chasm.dm b/code/game/turfs/simulated/floor/chasm.dm index fbd869220f4..b157d90ce11 100644 --- a/code/game/turfs/simulated/floor/chasm.dm +++ b/code/game/turfs/simulated/floor/chasm.dm @@ -173,9 +173,9 @@ drop_z = z - 1 /turf/simulated/floor/chasm/straight_down/lava_land_surface - oxygen = 14 - nitrogen = 23 - temperature = 300 + oxygen = 8 + nitrogen = 14 + temperature = 500 planetary_atmos = TRUE baseturf = /turf/simulated/floor/chasm/straight_down/lava_land_surface //Chasms should not turn into lava light_range = 2 diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index 17264977073..5f448fb6075 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -49,9 +49,9 @@ temperature = 180 /turf/simulated/floor/wood/lavaland_air - nitrogen = 23 - oxygen = 14 - temperature = 300 + nitrogen = 14 + oxygen = 8 + temperature = 500 /turf/simulated/floor/grass name = "grass patch" diff --git a/code/game/turfs/simulated/floor/indestructible.dm b/code/game/turfs/simulated/floor/indestructible.dm index 2cccdda0274..6d43bd23a86 100644 --- a/code/game/turfs/simulated/floor/indestructible.dm +++ b/code/game/turfs/simulated/floor/indestructible.dm @@ -44,9 +44,9 @@ icon = 'icons/turf/floors.dmi' icon_state = "necro1" baseturf = /turf/simulated/floor/indestructible/necropolis - oxygen = 14 - nitrogen = 23 - temperature = 300 + oxygen = 8 + nitrogen = 14 + temperature = 500 planetary_atmos = TRUE footstep = FOOTSTEP_LAVA barefootstep = FOOTSTEP_LAVA @@ -69,9 +69,9 @@ icon = 'icons/turf/floors/boss_floors.dmi' icon_state = "boss" baseturf = /turf/simulated/floor/indestructible/boss - oxygen = 14 - nitrogen = 23 - temperature = 300 + oxygen = 8 + nitrogen = 14 + temperature = 500 planetary_atmos = TRUE /turf/simulated/floor/indestructible/boss/air @@ -83,9 +83,9 @@ name = "floor" icon = 'icons/turf/floors/hierophant_floor.dmi' icon_state = "floor" - oxygen = 14 - nitrogen = 23 - temperature = 300 + oxygen = 8 + nitrogen = 14 + temperature = 500 planetary_atmos = TRUE smoothing_flags = SMOOTH_CORNERS diff --git a/code/game/turfs/simulated/floor/lava.dm b/code/game/turfs/simulated/floor/lava.dm index e718e0dec43..8d32d83a35e 100644 --- a/code/game/turfs/simulated/floor/lava.dm +++ b/code/game/turfs/simulated/floor/lava.dm @@ -160,9 +160,9 @@ return /turf/simulated/floor/lava/lava_land_surface - temperature = 300 - oxygen = 14 - nitrogen = 23 + temperature = 500 + oxygen = 8 + nitrogen = 14 planetary_atmos = TRUE baseturf = /turf/simulated/floor/chasm/straight_down/lava_land_surface @@ -256,9 +256,9 @@ icon_state = "mappinglava" base_icon_state = "mappinglava" baseturf = /turf/simulated/floor/lava/mapping_lava - temperature = 300 - oxygen = 14 - nitrogen = 23 + temperature = 500 + oxygen = 8 + nitrogen = 14 planetary_atmos = TRUE diff --git a/code/game/turfs/simulated/floor/mineral_floors.dm b/code/game/turfs/simulated/floor/mineral_floors.dm index d33d5a8d2f3..cdccd2d67eb 100644 --- a/code/game/turfs/simulated/floor/mineral_floors.dm +++ b/code/game/turfs/simulated/floor/mineral_floors.dm @@ -284,6 +284,6 @@ return //unburnable /turf/simulated/floor/plating/abductor/lavaland_air - temperature = 300 - oxygen = 14 - nitrogen = 23 + temperature = 500 + oxygen = 8 + nitrogen = 14 diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm index 8a1de89314e..b8c69683e90 100644 --- a/code/game/turfs/simulated/floor/misc_floor.dm +++ b/code/game/turfs/simulated/floor/misc_floor.dm @@ -4,9 +4,9 @@ smoothing_flags = NONE /turf/simulated/floor/vault/lavaland_air - temperature = 300 - oxygen = 14 - nitrogen = 23 + temperature = 500 + oxygen = 8 + nitrogen = 14 planetary_atmos = TRUE baseturf = /turf/simulated/floor/chasm/straight_down/lava_land_surface @@ -142,9 +142,9 @@ return /turf/simulated/floor/noslip/lavaland - oxygen = 14 - nitrogen = 23 - temperature = 300 + oxygen = 8 + nitrogen = 14 + temperature = 500 planetary_atmos = TRUE /turf/simulated/floor/lubed @@ -219,9 +219,9 @@ uses_overlay = FALSE /turf/simulated/floor/clockwork/lavaland_air - nitrogen = 23 - oxygen = 14 - temperature = 300 + nitrogen = 14 + oxygen = 8 + temperature = 500 /turf/simulated/floor/catwalk name = "catwalk" diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index 428dae3e720..c3350fe8f5b 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -169,9 +169,9 @@ name = "plating" /turf/simulated/floor/plating/lavaland_air - temperature = 300 - oxygen = 14 - nitrogen = 23 + temperature = 500 + oxygen = 8 + nitrogen = 14 /turf/simulated/floor/engine name = "reinforced floor" @@ -242,9 +242,9 @@ return /turf/simulated/floor/engine/cult/lavaland_air - nitrogen = 23 - oxygen = 14 - temperature = 300 + nitrogen = 14 + oxygen = 8 + temperature = 500 //air filled floors; used in atmos pressure chambers diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm index 108f5a51d83..1ec9dd8fdd3 100644 --- a/code/game/turfs/simulated/minerals.dm +++ b/code/game/turfs/simulated/minerals.dm @@ -279,9 +279,9 @@ environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/simulated/floor/lava/mapping_lava - oxygen = 14 - nitrogen = 23 - temperature = 300 + oxygen = 8 + nitrogen = 14 + temperature = 500 defer_change = 1 mineralSpawnChanceList = list( /turf/simulated/mineral/uranium/volcanic = 35, /turf/simulated/mineral/diamond/volcanic = 30, /turf/simulated/mineral/gold/volcanic = 45, /turf/simulated/mineral/titanium/volcanic = 45, @@ -299,9 +299,9 @@ environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/simulated/floor/lava/mapping_lava - oxygen = 14 - nitrogen = 23 - temperature = 300 + oxygen = 8 + nitrogen = 14 + temperature = 500 defer_change = 1 mineralChance = 10 @@ -321,9 +321,9 @@ environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/simulated/floor/lava/mapping_lava - oxygen = 14 - nitrogen = 23 - temperature = 300 + oxygen = 8 + nitrogen = 14 + temperature = 500 defer_change = 1 mineralSpawnChanceList = list( /turf/simulated/mineral/uranium/volcanic = 3, /turf/simulated/mineral/diamond/volcanic = 1, /turf/simulated/mineral/gold/volcanic = 8, /turf/simulated/mineral/titanium/volcanic = 8, @@ -341,9 +341,9 @@ environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface - oxygen = 14 - nitrogen = 23 - temperature = 300 + oxygen = 8 + nitrogen = 14 + temperature = 500 defer_change = 1 /turf/simulated/mineral/uranium @@ -356,9 +356,9 @@ environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface - oxygen = 14 - nitrogen = 23 - temperature = 300 + oxygen = 8 + nitrogen = 14 + temperature = 500 defer_change = 1 /turf/simulated/mineral/diamond @@ -371,9 +371,9 @@ environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface - oxygen = 14 - nitrogen = 23 - temperature = 300 + oxygen = 8 + nitrogen = 14 + temperature = 500 defer_change = 1 /turf/simulated/mineral/gold @@ -386,9 +386,9 @@ environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface - oxygen = 14 - nitrogen = 23 - temperature = 300 + oxygen = 8 + nitrogen = 14 + temperature = 500 defer_change = 1 /turf/simulated/mineral/silver @@ -401,9 +401,9 @@ environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface - oxygen = 14 - nitrogen = 23 - temperature = 300 + oxygen = 8 + nitrogen = 14 + temperature = 500 defer_change = 1 /turf/simulated/mineral/titanium @@ -416,9 +416,9 @@ environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface - oxygen = 14 - nitrogen = 23 - temperature = 300 + oxygen = 8 + nitrogen = 14 + temperature = 500 defer_change = 1 /turf/simulated/mineral/plasma @@ -431,9 +431,9 @@ environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface - oxygen = 14 - nitrogen = 23 - temperature = 300 + oxygen = 8 + nitrogen = 14 + temperature = 500 defer_change = 1 /turf/simulated/mineral/clown @@ -447,9 +447,9 @@ environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface - oxygen = 14 - nitrogen = 23 - temperature = 300 + oxygen = 8 + nitrogen = 14 + temperature = 500 defer_change = 1 /turf/simulated/mineral/mime @@ -462,9 +462,9 @@ environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface - oxygen = 14 - nitrogen = 23 - temperature = 300 + oxygen = 8 + nitrogen = 14 + temperature = 500 defer_change = 1 /turf/simulated/mineral/bscrystal @@ -478,18 +478,18 @@ environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface - oxygen = 14 - nitrogen = 23 - temperature = 300 + oxygen = 8 + nitrogen = 14 + temperature = 500 defer_change = 1 /turf/simulated/mineral/volcanic environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt baseturf = /turf/simulated/floor/plating/asteroid/basalt - oxygen = 14 - nitrogen = 23 - temperature = 300 + oxygen = 8 + nitrogen = 14 + temperature = 500 /turf/simulated/mineral/volcanic/lava_land_surface environment_type = "basalt" @@ -602,9 +602,9 @@ environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface - oxygen = 14 - nitrogen = 23 - temperature = 300 + oxygen = 8 + nitrogen = 14 + temperature = 500 defer_change = 1 #undef GIBTONITE_UNSTRUCK diff --git a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm index d3b6ef921d1..7857e9b60a2 100644 --- a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm +++ b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm @@ -225,6 +225,8 @@ if(our_excited_group) last_share_check() +#define LAVALAND_TEMPERATURE 500 + if(planetary_atmos) //share our air with the "atmosphere" "above" the turf var/datum/gas_mixture/G = new G.oxygen = oxygen @@ -233,7 +235,7 @@ G.toxins = toxins G.sleeping_agent = sleeping_agent G.agent_b = agent_b - G.temperature = initial(temperature) // Temperature is modified at runtime; we only care about the turf's initial temperature + G.temperature = LAVALAND_TEMPERATURE // Temperature is modified at runtime; we only care about the turf's initial temperature G.archive() if(!air.compare(G)) if(!our_excited_group) @@ -243,6 +245,8 @@ air.share(G, adjacent_turfs_length) last_share_check() +#undef LAVALAND_TEMPERATURE + air.react() update_visuals() @@ -260,7 +264,6 @@ if(!our_excited_group && remove == 1) SSair.remove_from_active(src) - /turf/simulated/proc/archive() if(air) //For open space like floors air.archive() @@ -442,7 +445,7 @@ if(conductivity_directions & direction) var/turf/neighbor = get_step(src,direction) - if(!neighbor.thermal_conductivity) + if(!neighbor?.thermal_conductivity) continue if(issimulatedturf(neighbor)) //anything under this subtype will share in the exchange @@ -472,7 +475,8 @@ else mimic_temperature_solid(neighbor, neighbor.thermal_conductivity) - radiate_to_spess() + if(!planetary_atmos) + radiate_to_spess() //Conduct with air on my tile if I have it if(air) diff --git a/code/modules/awaymissions/mission_code/beach.dm b/code/modules/awaymissions/mission_code/beach.dm index 88e5426a374..0fc750def0b 100644 --- a/code/modules/awaymissions/mission_code/beach.dm +++ b/code/modules/awaymissions/mission_code/beach.dm @@ -114,9 +114,9 @@ linkedcontroller.decalinpool += A /turf/simulated/floor/beach/away/water/lavaland_air - nitrogen = 23 - oxygen = 14 - temperature = 300 + nitrogen = 14 + oxygen = 8 + temperature = 500 planetary_atmos = TRUE /// for boundary "walls" diff --git a/code/modules/clothing/gloves/misc_gloves.dm b/code/modules/clothing/gloves/misc_gloves.dm index 27dae34d50e..87b4f8cc5a8 100644 --- a/code/modules/clothing/gloves/misc_gloves.dm +++ b/code/modules/clothing/gloves/misc_gloves.dm @@ -62,6 +62,7 @@ strip_delay = 40 body_parts_covered = ARMS cold_protection = ARMS + heat_protection = ARMS min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT resistance_flags = NONE diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 7c45bb6ca1c..2fb402bf66b 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -56,6 +56,7 @@ desc = "A military-grade gas mask that can be connected to an air supply." icon_state = "gas_mining" actions_types = list(/datum/action/item_action/adjust) + flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 10, ACID = 35) resistance_flags = FIRE_PROOF can_toggle = TRUE diff --git a/code/modules/clothing/shoes/misc_shoes.dm b/code/modules/clothing/shoes/misc_shoes.dm index 40e71c54356..cbae56614a1 100644 --- a/code/modules/clothing/shoes/misc_shoes.dm +++ b/code/modules/clothing/shoes/misc_shoes.dm @@ -208,6 +208,10 @@ desc = "Steel-toed mining boots for mining in hazardous environments. Very good at keeping toes uncrushed." icon_state = "explorer" resistance_flags = FIRE_PROOF + cold_protection = FEET|LEGS + min_cold_protection_temperature = SHOES_MIN_TEMP_PROTECT + heat_protection = FEET|LEGS + max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT /obj/item/clothing/shoes/winterboots name = "winter boots" diff --git a/code/modules/clothing/suits/armor_suits.dm b/code/modules/clothing/suits/armor_suits.dm index e77935fd9b1..e4b0d2432e6 100644 --- a/code/modules/clothing/suits/armor_suits.dm +++ b/code/modules/clothing/suits/armor_suits.dm @@ -802,7 +802,9 @@ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/pickaxe, /obj/item/spear, /obj/item/organ/internal/regenerative_core/legion, /obj/item/kitchen/knife/combat/survival) armor = list(MELEE = 25, BULLET = 5, LASER = 15, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 75, ACID = 75) //a fair alternative to bone armor, requiring alternative materials and gaining a suit slot hoodtype = /obj/item/clothing/head/hooded/goliath - body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS + heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS + max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT /obj/item/clothing/head/hooded/goliath name = "goliath cloak hood" @@ -812,6 +814,9 @@ armor = list(MELEE = 25, BULLET = 5, LASER = 15, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 75, ACID = 75) flags = BLOCKHAIR flags_cover = HEADCOVERSEYES + body_parts_covered = HEAD + heat_protection = HEAD + max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT /obj/item/clothing/suit/armor/bone name = "bone armor" @@ -820,4 +825,6 @@ item_state = "bonearmor" blood_overlay_type = "armor" armor = list(MELEE = 25, BULLET = 15, LASER = 15, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 50) - body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS + heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS + max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index a52cc4d9f46..b0abf709371 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -51,10 +51,14 @@ name = "lava baseturf editor" baseturf = /turf/simulated/floor/lava -/obj/effect/baseturf_helper/lava_land/surface - name = "lavaland baseturf editor" +/obj/effect/baseturf_helper/lava/mapping_lava + name = "mapping lava baseturf editor" baseturf = /turf/simulated/floor/lava/mapping_lava +/obj/effect/baseturf_helper/lava_land + name = "lavaland baseturf editor" + baseturf = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface + /obj/effect/mapping_helpers icon = 'icons/effects/mapping_helpers.dmi' icon_state = "" @@ -169,4 +173,3 @@ /obj/effect/mapping_helpers/airlock/windoor/autoname/desk/payload(obj/machinery/door/window/windoor) if(windoor.dir == dir) windoor.name = "[get_area_name(windoor, TRUE)] Desk" - diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm index 7406e490394..2a03b5ced24 100644 --- a/code/modules/mining/equipment/explorer_gear.dm +++ b/code/modules/mining/equipment/explorer_gear.dm @@ -33,6 +33,8 @@ flags_cover = HEADCOVERSEYES min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT + cold_protection = HEAD + heat_protection = HEAD armor = list(MELEE = 20, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 50, RAD = 50, FIRE = 50, ACID = 50) resistance_flags = FIRE_PROOF @@ -49,6 +51,7 @@ icon_state = "hostile_env" item_state = "hostile_env" max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT + heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS|FEET resistance_flags = FIRE_PROOF | LAVA_PROOF slowdown = 0 armor = list(MELEE = 120, BULLET = 35, LASER = 25, ENERGY = 25, BOMB = 150, RAD = INFINITY, FIRE = INFINITY, ACID = INFINITY) @@ -86,6 +89,7 @@ flags = BLOCKHAIR w_class = WEIGHT_CLASS_NORMAL max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT + heat_protection = HEAD armor = list(MELEE = 120, BULLET = 35, LASER = 25, ENERGY = 25, BOMB = 150, RAD = INFINITY, FIRE = INFINITY, ACID = INFINITY) resistance_flags = FIRE_PROOF | LAVA_PROOF @@ -97,3 +101,41 @@ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi', "Unathi" = 'icons/mob/clothing/species/unathi/head.dmi' ) + +/obj/item/clothing/suit/space/prisoner_gulag + name = "prisoner gulag suit" + desc = "An unarmored heat resistant mining suit, heavy and uncomfortable as a punishment in itself." + icon_state = "hardsuit_gulag" + item_state = "hardsuit_gulag" + w_class = WEIGHT_CLASS_BULKY + gas_transfer_coefficient = 0.90 + permeability_coefficient = 0.50 + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS + allowed = list(/obj/item/flashlight,/obj/item/tank/internals/emergency_oxygen,/obj/item/extinguisher) + slowdown = 1 + armor = list(MELEE = 10, BULLET = 5, LASER = 10, ENERGY = 5, BOMB = 50, RAD = 10, FIRE = 50, ACID = 50) + flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL + heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS + max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT + cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS + min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT + strip_delay = 60 + put_on_delay = 60 + allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe) + resistance_flags = FIRE_PROOF + hide_tail_by_species = list("Vox" , "Vulpkanin" , "Unathi" , "Tajaran") + +/obj/item/clothing/head/space/prisoner_gulag + name = "gulag helmet" + desc = "A metallic helmet designed to operate with the mining suit, while dense it offers little protection aside heat." + icon_state = "hardsuit_gulag" + item_state = "hardsuit_gulag" + body_parts_covered = HEAD + flags = BLOCKHAIR + flags_cover = HEADCOVERSEYES + min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT + max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT + cold_protection = HEAD + heat_protection = HEAD + armor = list(MELEE = 10, BULLET = 5, LASER = 10, ENERGY = 5, BOMB = 50, RAD = 10, FIRE = 50, ACID = 50) + resistance_flags = FIRE_PROOF diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm index e77fd3b2172..070713dd758 100644 --- a/code/modules/mining/minebot.dm +++ b/code/modules/mining/minebot.dm @@ -20,6 +20,7 @@ maxHealth = 125 melee_damage_lower = 15 melee_damage_upper = 15 + maxbodytemp = INFINITY obj_damage = 10 environment_smash = 0 check_friendly_fire = TRUE diff --git a/code/modules/mob/living/carbon/human/species/unathi.dm b/code/modules/mob/living/carbon/human/species/unathi.dm index a463c0c29e0..9faf4ae4c51 100644 --- a/code/modules/mob/living/carbon/human/species/unathi.dm +++ b/code/modules/mob/living/carbon/human/species/unathi.dm @@ -24,9 +24,9 @@ cold_level_2 = 220 //Default 200 cold_level_3 = 140 //Default 120 - heat_level_1 = 380 //Default 360 - Higher is better - heat_level_2 = 420 //Default 400 - heat_level_3 = 480 //Default 460 + heat_level_1 = 505 //Default 360 - Higher is better + heat_level_2 = 540 //Default 400 + heat_level_3 = 600 //Default 460 flesh_color = "#34AF10" reagent_tag = PROCESS_ORG diff --git a/code/modules/mob/living/simple_animal/hostile/alien_types.dm b/code/modules/mob/living/simple_animal/hostile/alien_types.dm index 38eb627a191..453bae0aee2 100644 --- a/code/modules/mob/living/simple_animal/hostile/alien_types.dm +++ b/code/modules/mob/living/simple_animal/hostile/alien_types.dm @@ -164,3 +164,14 @@ /mob/living/simple_animal/hostile/alien/maid/can_clean() return TRUE +/mob/living/simple_animal/hostile/alien/lavaland + maxbodytemp = INFINITY + +/mob/living/simple_animal/hostile/alien/drone/lavaland + maxbodytemp = INFINITY + +/mob/living/simple_animal/hostile/alien/sentinel/lavaland + maxbodytemp = INFINITY + +/mob/living/simple_animal/hostile/alien/queen/large/lavaland + maxbodytemp = INFINITY diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm index 76469fd9356..272e89a219e 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm @@ -637,6 +637,7 @@ Difficulty: Hard robust_searching = TRUE ranged_ignores_vision = TRUE stat_attack = UNCONSCIOUS + maxbodytemp = INFINITY var/range = 3 var/mob/living/simple_animal/hostile/megafauna/ancient_robot/core = null var/fake_max_hp = 300 diff --git a/code/modules/surgery/organs/organ_datums/lung_datum.dm b/code/modules/surgery/organs/organ_datums/lung_datum.dm index 2bec8cdc8d1..1478f496ed7 100644 --- a/code/modules/surgery/organs/organ_datums/lung_datum.dm +++ b/code/modules/surgery/organs/organ_datums/lung_datum.dm @@ -331,6 +331,9 @@ /datum/organ/lungs/ashwalker safe_oxygen_min = 4 // 4x as efficient as regular Unathi, can comfortably breathe on lavaland + heat_level_1_threshold = 505 + heat_level_2_threshold = 540 + heat_level_3_threshold = 600 /datum/organ/lungs/advanced_cyber/New(obj/item/organ/internal/link_em) . = ..() diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 2b23a2110ec..e682e29d83b 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index d5d99a310bd..dc17eb619e1 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 15ad6193a60..1818a6d857b 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 4e500d259d2..db1ca801771 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ