From c2f14117c49e671b9aa0d63f16b600c60ec62efe Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 5 Feb 2018 02:09:45 -0600 Subject: [PATCH] [MIRROR] Lava map slights (#5273) * Lava map slights (#35201) * Updates a few maps a tad on lavaland * Adds two freezers to syndicate lavaland for some chefing * Lava map slights --- .../lavaland_biodome_clown_planet.dmm | 13 ++++ .../lavaland_surface_animal_hospital.dmm | 6 ++ .../lavaland_surface_ash_walker1.dmm | 60 +++++++++++++++++++ .../lavaland_surface_biodome_winter.dmm | 60 +++++++++++-------- .../lavaland_surface_blooddrunk1.dmm | 2 +- .../lavaland_surface_blooddrunk2.dmm | 2 +- .../lavaland_surface_blooddrunk3.dmm | 2 +- .../LavaRuins/lavaland_surface_cube.dmm | 3 +- .../LavaRuins/lavaland_surface_cultaltar.dmm | 5 +- .../LavaRuins/lavaland_surface_envy.dmm | 8 ++- .../LavaRuins/lavaland_surface_golem_ship.dmm | 17 ++++-- .../LavaRuins/lavaland_surface_hierophant.dmm | 2 +- .../lavaland_surface_random_ripley.dmm | 56 +++++------------ .../lavaland_surface_syndicate_base1.dmm | 21 +------ 14 files changed, 155 insertions(+), 102 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm index ab405c0927..e1a0283aad 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm @@ -833,15 +833,18 @@ }, /area/ruin/powered/clownplanet) "eX" = ( +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/noslip{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, /area/lavaland/surface/outdoors/explored) "gX" = ( +/obj/effect/mapping_helpers/no_lava, /turf/open/chasm/lavaland, /area/lavaland/surface/outdoors/explored) "hY" = ( /obj/machinery/light, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/powered/clownplanet) "pv" = ( @@ -856,6 +859,7 @@ "CB" = ( /obj/item/paper/crumpled/bloody/ruins/lavaland/clown_planet/hope, /obj/effect/decal/cleanable/blood/old, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/noslip{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, @@ -865,6 +869,7 @@ color = "#2F3000"; name = "stealth banana peel" }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors/explored) "LH" = ( @@ -874,11 +879,13 @@ name = "THE TRIAL OF HONKITUDE" }, /obj/structure/disposalpipe/trunk, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/noslip{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, /area/ruin/powered/clownplanet) "Mv" = ( +/obj/effect/mapping_helpers/no_lava, /mob/living/simple_animal/hostile/retaliate/clown, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors/explored) @@ -886,6 +893,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/powered/clownplanet) "TD" = ( @@ -893,27 +901,32 @@ /obj/structure/disposaloutlet{ dir = 1 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/noslip{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, /area/ruin/powered/clownplanet) "Xm" = ( /obj/item/clothing/head/cone, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/noslip{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, /area/lavaland/surface/outdoors/explored) "XO" = ( +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors/explored) "Yf" = ( /obj/machinery/light{ dir = 1 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/powered/clownplanet) "YI" = ( /obj/machinery/light/small, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/noslip{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm index 3f05b33fe5..b75d7c5233 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm @@ -3,6 +3,7 @@ /turf/template_noop, /area/template_noop) "ab" = ( +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "ac" = ( @@ -558,14 +559,17 @@ "bT" = ( /obj/item/pickaxe, /obj/effect/decal/cleanable/blood/old, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "bU" = ( /obj/effect/decal/remains/human, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "bV" = ( /obj/effect/decal/cleanable/blood/old, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "bW" = ( @@ -686,6 +690,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cq" = ( @@ -765,6 +770,7 @@ /obj/machinery/light{ dir = 1 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cG" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm index 4ce05157f3..b1830b2ad4 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm @@ -496,6 +496,7 @@ dir = 8 }, /obj/item/pickaxe, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "bp" = ( @@ -613,6 +614,7 @@ /obj/structure/stone_tile/block{ dir = 8 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "bB" = ( @@ -640,11 +642,13 @@ /obj/structure/stone_tile/surrounding_tile{ dir = 8 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "bF" = ( /obj/structure/stone_tile/slab, /obj/effect/decal/cleanable/blood, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "bG" = ( @@ -674,22 +678,27 @@ /obj/structure/stone_tile{ dir = 4 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "bM" = ( +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "bN" = ( /obj/structure/stone_tile, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "bO" = ( /obj/structure/stone_tile/cracked, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "bP" = ( /obj/structure/stone_tile/block, /obj/item/twohanded/spear, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "bQ" = ( @@ -700,6 +709,7 @@ /obj/structure/stone_tile{ dir = 1 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "bR" = ( @@ -711,10 +721,12 @@ dir = 4 }, /obj/structure/stone_tile/center, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "bS" = ( /obj/structure/stone_tile/slab, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "bT" = ( @@ -729,6 +741,7 @@ }, /obj/structure/stone_tile/center, /obj/effect/decal/cleanable/blood, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "bU" = ( @@ -739,27 +752,32 @@ /obj/structure/stone_tile{ dir = 4 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "bV" = ( /obj/structure/stone_tile/block/cracked, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "bW" = ( /obj/structure/stone_tile/surrounding_tile/cracked, /obj/structure/ore_box, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "bX" = ( /obj/structure/stone_tile/cracked{ dir = 1 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "bY" = ( /obj/structure/stone_tile{ dir = 8 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "bZ" = ( @@ -769,12 +787,14 @@ /obj/structure/stone_tile/cracked{ dir = 8 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cb" = ( /obj/structure/stone_tile{ dir = 1 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cd" = ( @@ -782,6 +802,7 @@ /obj/structure/stone_tile{ dir = 8 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "ce" = ( @@ -791,6 +812,7 @@ /obj/structure/stone_tile/block/cracked{ dir = 4 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cf" = ( @@ -804,12 +826,14 @@ /obj/item/pickaxe, /obj/item/pickaxe, /obj/item/pickaxe, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cg" = ( /obj/structure/stone_tile/cracked{ dir = 4 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "ch" = ( @@ -821,6 +845,7 @@ /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 8 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "ci" = ( @@ -832,6 +857,7 @@ /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 4 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cj" = ( @@ -847,6 +873,7 @@ /obj/structure/stone_tile{ dir = 4 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cl" = ( @@ -857,12 +884,14 @@ dir = 8 }, /obj/item/twohanded/spear, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cm" = ( /obj/structure/stone_tile/block{ dir = 4 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cn" = ( @@ -870,6 +899,7 @@ /obj/structure/stone_tile/block/cracked{ dir = 1 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "co" = ( @@ -877,6 +907,7 @@ /obj/structure/stone_tile/block{ dir = 1 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cp" = ( @@ -890,6 +921,7 @@ /obj/structure/stone_tile/cracked{ dir = 8 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cr" = ( @@ -901,12 +933,14 @@ /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 1 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cs" = ( /obj/structure/stone_tile/block/cracked{ dir = 1 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "ct" = ( @@ -920,12 +954,14 @@ /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 4 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cu" = ( /obj/structure/stone_tile/block/cracked{ dir = 8 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cv" = ( @@ -940,6 +976,7 @@ }, /obj/structure/stone_tile/cracked, /obj/effect/decal/cleanable/blood, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cz" = ( @@ -1005,6 +1042,7 @@ /obj/structure/stone_tile/cracked{ dir = 1 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cJ" = ( @@ -1012,6 +1050,7 @@ /obj/structure/stone_tile/cracked{ dir = 8 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cK" = ( @@ -1019,6 +1058,7 @@ /obj/structure/stone_tile/block/cracked{ dir = 1 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cL" = ( @@ -1126,10 +1166,12 @@ /obj/structure/stone_tile/block{ dir = 4 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "dd" = ( /obj/structure/stone_tile/surrounding_tile/cracked, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "de" = ( @@ -1139,6 +1181,7 @@ /obj/structure/stone_tile/block{ dir = 8 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "df" = ( @@ -1149,11 +1192,13 @@ /obj/structure/stone_tile/cracked{ dir = 4 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "dg" = ( /obj/structure/bonfire/dense, /obj/structure/stone_tile/center, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "di" = ( @@ -1165,6 +1210,7 @@ /obj/structure/stone_tile/cracked{ dir = 1 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "dj" = ( @@ -1172,6 +1218,7 @@ /obj/structure/stone_tile/block{ dir = 1 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "dk" = ( @@ -1179,6 +1226,7 @@ dir = 1 }, /obj/structure/stone_tile/block, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "dl" = ( @@ -1189,6 +1237,7 @@ /obj/structure/stone_tile/cracked{ dir = 8 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "dn" = ( @@ -1198,6 +1247,7 @@ /obj/structure/stone_tile/block/cracked{ dir = 8 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "do" = ( @@ -1205,6 +1255,7 @@ dir = 8 }, /obj/structure/reagent_dispensers/watertank, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "dp" = ( @@ -1212,6 +1263,7 @@ /obj/structure/stone_tile/cracked{ dir = 1 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "dq" = ( @@ -1219,6 +1271,7 @@ /obj/structure/stone_tile{ dir = 4 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "dr" = ( @@ -1230,10 +1283,12 @@ dir = 8 }, /obj/structure/stone_tile/center, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "ds" = ( /obj/structure/stone_tile/block, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "dt" = ( @@ -1245,6 +1300,7 @@ dir = 8 }, /obj/structure/stone_tile/center, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "du" = ( @@ -1269,11 +1325,13 @@ /obj/structure/stone_tile/block/cracked{ dir = 4 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "dx" = ( /obj/item/device/flashlight/lantern, /obj/structure/stone_tile/center, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "dy" = ( @@ -1281,6 +1339,7 @@ /obj/structure/stone_tile/block{ dir = 8 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "dz" = ( @@ -1300,6 +1359,7 @@ dir = 4 }, /obj/structure/stone_tile/center, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "dB" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm index b870db266c..2eab6d5f27 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm @@ -303,6 +303,7 @@ /obj/machinery/light/built{ dir = 1 }, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/pod/dark{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, @@ -312,6 +313,10 @@ /obj/structure/fans/tiny, /turf/open/floor/pod/dark, /area/ruin/powered/snow_biodome) +"tb" = ( +/obj/effect/mapping_helpers/no_lava, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors/explored) "tl" = ( /turf/open/floor/pod/light, /area/ruin/powered/snow_biodome) @@ -385,6 +390,11 @@ /obj/item/paper_bin, /turf/open/floor/pod/dark, /area/ruin/powered/snow_biodome) +"Qa" = ( +/obj/effect/mapping_helpers/no_lava, +/obj/effect/mapping_helpers/no_lava, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors/explored) "QI" = ( /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors/explored) @@ -572,7 +582,7 @@ ak Wg Wg QI -QI +tb aa "} (6,1,1) = {" @@ -604,7 +614,7 @@ ak ak Wg QI -QI +tb aa "} (7,1,1) = {" @@ -636,7 +646,7 @@ ak bM Wg Wg -QI +tb aa "} (8,1,1) = {" @@ -668,8 +678,8 @@ ak az ak Wg -QI -QI +tb +tb "} (9,1,1) = {" aa @@ -701,7 +711,7 @@ ak ak Wg hA -QI +tb "} (10,1,1) = {" Wg @@ -732,8 +742,8 @@ ak ak ak Wg -QI -QI +tb +tb "} (11,1,1) = {" Wg @@ -765,7 +775,7 @@ Wg Wg Wg Wg -QI +tb "} (12,1,1) = {" Wg @@ -797,7 +807,7 @@ Wg Dd Dd Wg -QI +tb "} (13,1,1) = {" Wg @@ -829,7 +839,7 @@ Wg Mp dS Wg -QI +tb "} (14,1,1) = {" Wg @@ -861,7 +871,7 @@ Wg tl tl Wg -QI +tb "} (15,1,1) = {" Wg @@ -893,7 +903,7 @@ aO tl tl Ez -QI +Qa "} (16,1,1) = {" Wg @@ -925,7 +935,7 @@ aP tl tl aP -QI +Qa "} (17,1,1) = {" Wg @@ -957,7 +967,7 @@ Wg tl tl Wg -QI +tb "} (18,1,1) = {" Wg @@ -989,7 +999,7 @@ Wg HP dS Wg -QI +tb "} (19,1,1) = {" Wg @@ -1021,7 +1031,7 @@ Wg QK AM Wg -QI +tb "} (20,1,1) = {" Wg @@ -1053,7 +1063,7 @@ Wg Wg Wg Wg -QI +tb "} (21,1,1) = {" Wg @@ -1084,8 +1094,8 @@ ak ak ak Wg -QI -QI +tb +tb "} (22,1,1) = {" aa @@ -1117,7 +1127,7 @@ ak ak Wg hA -QI +tb "} (23,1,1) = {" aa @@ -1148,8 +1158,8 @@ ak ak ak Wg -QI -QI +tb +tb "} (24,1,1) = {" aa @@ -1180,7 +1190,7 @@ ak bM Wg Wg -QI +tb aa "} (25,1,1) = {" @@ -1212,7 +1222,7 @@ aC ak Wg QI -QI +tb aa "} (26,1,1) = {" diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk1.dmm index 398c4b6c98..430c211c87 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk1.dmm @@ -1,4 +1,4 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/template_noop, /area/template_noop) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk2.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk2.dmm index 3143123d32..82fc034946 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk2.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk2.dmm @@ -1,4 +1,4 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/template_noop, /area/template_noop) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk3.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk3.dmm index adc8bf05dd..138cefc338 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk3.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk3.dmm @@ -1,4 +1,4 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/template_noop, /area/template_noop) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_cube.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_cube.dmm index 59d066dacf..56b68ef60f 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_cube.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_cube.dmm @@ -1,4 +1,4 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) @@ -14,6 +14,7 @@ /area/lavaland/surface/outdoors) "e" = ( /obj/machinery/wish_granter, +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm index b2145363fa..eee442825e 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm @@ -89,9 +89,6 @@ "s" = ( /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered) -"t" = ( -/turf/closed/wall/mineral/cult, -/area/ruin/unpowered) (1,1,1) = {" a @@ -186,7 +183,7 @@ c b b l -t +d k b b diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm index 68f86cc20c..62485f8581 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm @@ -101,6 +101,10 @@ /obj/machinery/door/airlock/hatch, /turf/open/floor/plating, /area/ruin/unpowered) +"A" = ( +/obj/effect/mapping_helpers/no_lava, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) (1,1,1) = {" a @@ -209,7 +213,7 @@ i i i d -a +A a "} (6,1,1) = {" @@ -231,7 +235,7 @@ i i i p -a +A a "} (7,1,1) = {" diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm index b3b73379ff..14a190040f 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm @@ -234,6 +234,11 @@ /obj/machinery/light/small, /turf/open/floor/mineral/titanium/purple, /area/ruin/powered/golem_ship) +"T" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/titanium, +/turf/open/floor/mineral/titanium/purple, +/area/ruin/powered/golem_ship) "U" = ( /obj/effect/mob_spawn/human/golem/adamantine, /obj/machinery/light/small, @@ -288,12 +293,12 @@ a a b b -b +H b r l G -b +T b b a @@ -517,7 +522,7 @@ f b "} (16,1,1) = {" -b +T e I b @@ -532,10 +537,10 @@ B b V f -b +T "} (17,1,1) = {" -b +T f f b @@ -550,7 +555,7 @@ C b f f -b +T "} (18,1,1) = {" b diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_hierophant.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_hierophant.dmm index 2e7e02b73e..cad120c3f2 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_hierophant.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_hierophant.dmm @@ -1,4 +1,4 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/closed/indestructible/riveted/hierophant, /area/ruin/unpowered/hierophant) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm index 833d619e62..809e520279 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm @@ -1,4 +1,4 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/template_noop, /area/lavaland/surface/outdoors) @@ -21,64 +21,36 @@ (1,1,1) = {" a -a -a -a -a -a +b +b +b a "} (2,1,1) = {" -a -a b +c b +c b -a -a "} (3,1,1) = {" -a -b -c -b -c -b -a -"} -(4,1,1) = {" -a b c d e b -a +"} +(4,1,1) = {" +b +c +c +b +b "} (5,1,1) = {" -a b -c -c +b b b a "} -(6,1,1) = {" -a -b -b -b -b -a -a -"} -(7,1,1) = {" -a -a -a -a -a -a -a -"} diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index af4a5f5f4d..7bb31b7f50 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -96,9 +96,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/floorgrime, /area/ruin/unpowered/syndicate_lava_base/chemistry) -"cO" = ( -/turf/closed/wall/mineral/plastitanium/explosive, -/area/ruin/unpowered/syndicate_lava_base/chemistry) "dc" = ( /obj/machinery/light/small{ dir = 8 @@ -3572,14 +3569,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/ruin/unpowered/syndicate_lava_base/engineering) -"jX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/turf/closed/wall/mineral/plastitanium/explosive, -/area/ruin/unpowered/syndicate_lava_base/engineering) "jY" = ( /obj/structure/chair{ dir = 1 @@ -4649,7 +4638,6 @@ /turf/open/floor/plasteel/dark, /area/ruin/unpowered/syndicate_lava_base/bar) "mc" = ( -/obj/structure/closet/crate, /obj/item/storage/box/donkpockets{ pixel_x = -2; pixel_y = 6 @@ -4673,6 +4661,9 @@ icon_state = "1-8" }, /obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/freezer/kitchen/maintenance{ + req_access = null + }, /turf/open/floor/plasteel/dark, /area/ruin/unpowered/syndicate_lava_base/bar) "md" = ( @@ -5902,9 +5893,6 @@ /obj/item/pen, /turf/open/floor/plasteel/dark, /area/ruin/unpowered/syndicate_lava_base/telecomms) -"ow" = ( -/turf/closed/wall/mineral/plastitanium/explosive, -/area/ruin/unpowered/syndicate_lava_base/arrivals) "ox" = ( /obj/structure/grille, /obj/structure/window/plastitanium, @@ -5914,9 +5902,6 @@ }, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/arrivals) -"oy" = ( -/turf/closed/wall/mineral/plastitanium/explosive, -/area/ruin/unpowered/syndicate_lava_base/medbay) "oz" = ( /turf/open/floor/engine{ initial_gas_mix = "o2=14;n2=23;TEMP=300"