From 52a2a90966f527a9d7076a67d57d68b2bd5584d6 Mon Sep 17 00:00:00 2001 From: LightFire53 Date: Fri, 17 Jun 2022 04:19:23 -0700 Subject: [PATCH] Fixes Area Shenanigans on Labour Camp, Derelict 5, and CharlieStation (#17987) * Area tweaks * Update oldstation.dm * When you are Near Space * 2 missed lattices... I love catching things I missed in a screenshot... I need a finer comb. --- .../RandomRuins/SpaceRuins/derelict5.dmm | 42 +-- .../RandomRuins/SpaceRuins/oldstation.dmm | 336 +++++++++--------- _maps/map_files/generic/Lavaland.dmm | 19 +- .../mission_code/ruins/oldstation.dm | 4 +- 4 files changed, 199 insertions(+), 202 deletions(-) diff --git a/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm b/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm index 39918d7f8b9..6759557c8f7 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm @@ -5,9 +5,6 @@ "b" = ( /turf/simulated/mineral, /area/ruin/unpowered) -"c" = ( -/turf/simulated/mineral, -/area/space/nearstation) "d" = ( /turf/simulated/floor/plating/asteroid/airless, /area/ruin/unpowered) @@ -65,9 +62,6 @@ /obj/machinery/door/airlock/external, /turf/simulated/floor/plating, /area/ruin/unpowered) -"r" = ( -/turf/simulated/floor/plating/asteroid/airless, -/area/space/nearstation) (1,1,1) = {" a @@ -853,8 +847,8 @@ b d d d -r -r +d +d a a a @@ -895,8 +889,8 @@ b d d d -r -r +d +d d d d @@ -937,7 +931,7 @@ b d d d -r +d d d d @@ -979,7 +973,7 @@ b d d d -r +d d d d @@ -1021,7 +1015,7 @@ b d d d -r +d d d d @@ -1063,7 +1057,7 @@ d d d d -r +d d d d @@ -1105,7 +1099,7 @@ b d d d -r +d d d d @@ -1123,7 +1117,7 @@ b a a a -c +b a a a @@ -1147,7 +1141,7 @@ b d d d -r +d d d d @@ -1189,7 +1183,7 @@ b b b b -r +d d d d @@ -1229,9 +1223,9 @@ b b b b -c -c -c +b +b +b d d d @@ -1271,9 +1265,9 @@ b b b b -c -c -c +b +b +b d d d diff --git a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm index ffa2baf681e..cfc3149c87d 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm @@ -21,15 +21,11 @@ /area/ruin/space/ancientstation/hivebot) "ae" = ( /turf/simulated/floor/plating/airless, -/area/template_noop) +/area/space/nearstation) "af" = ( /obj/effect/spawner/random_spawners/wall_rusted_always, /turf/simulated/wall, -/area/template_noop) -"ag" = ( -/obj/structure/lattice, -/turf/template_noop, -/area/template_noop) +/area/space/nearstation) "ah" = ( /turf/simulated/floor/plasteel/dark, /area/ruin/space/ancientstation/hivebot) @@ -191,7 +187,7 @@ "aH" = ( /obj/item/solar_assembly, /turf/template_noop, -/area/template_noop) +/area/space/nearstation) "aI" = ( /obj/machinery/light/small{ dir = 8 @@ -473,7 +469,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plating/airless, -/area/template_noop) +/area/space/nearstation) "bu" = ( /obj/effect/spawner/random_spawners/wall_rusted_always, /turf/simulated/wall, @@ -694,7 +690,7 @@ "cc" = ( /obj/structure/girder, /turf/simulated/floor/plating/airless, -/area/template_noop) +/area/space/nearstation) "cd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -751,7 +747,7 @@ "ck" = ( /obj/structure/lattice/catwalk, /turf/simulated/floor/plating/airless, -/area/template_noop) +/area/space/nearstation) "cl" = ( /obj/structure/transit_tube/station/reverse, /obj/effect/decal/cleanable/dirt, @@ -885,14 +881,14 @@ icon_state = "0-4" }, /turf/simulated/floor/plating/airless, -/area/template_noop) +/area/space/nearstation) "cD" = ( /obj/structure/cable/yellow{ d2 = 8; icon_state = "0-8" }, /turf/simulated/floor/plating/airless, -/area/template_noop) +/area/space/nearstation) "cE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -922,7 +918,7 @@ }, /obj/machinery/power/solar, /turf/simulated/floor/plating/airless, -/area/template_noop) +/area/space/nearstation) "cI" = ( /obj/effect/decal/cleanable/dirt, /obj/item/pickaxe, @@ -1042,7 +1038,7 @@ "cX" = ( /obj/structure/transit_tube, /turf/template_noop, -/area/template_noop) +/area/space/nearstation) "cY" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -1062,7 +1058,7 @@ /obj/item/solar_assembly, /obj/structure/lattice, /turf/template_noop, -/area/template_noop) +/area/space/nearstation) "dc" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ @@ -1098,11 +1094,11 @@ icon_state = "E-W-Pass" }, /turf/template_noop, -/area/template_noop) +/area/space/nearstation) "df" = ( /obj/structure/cable/yellow, /turf/simulated/floor/plating/airless, -/area/template_noop) +/area/space/nearstation) "dg" = ( /obj/effect/spawner/random_spawners/wall_rusted_always, /turf/simulated/wall, @@ -1140,7 +1136,7 @@ dir = 4 }, /turf/template_noop, -/area/template_noop) +/area/space/nearstation) "dl" = ( /obj/item/stack/cable_coil, /turf/template_noop, @@ -1156,7 +1152,7 @@ icon_state = "N-S" }, /turf/template_noop, -/area/template_noop) +/area/space/nearstation) "do" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -1172,7 +1168,7 @@ icon_state = "0-8" }, /turf/simulated/floor/plating/airless, -/area/template_noop) +/area/space/nearstation) "dq" = ( /obj/machinery/atmospherics/unary/vent_pump{ dir = 8 @@ -1762,7 +1758,7 @@ }, /obj/structure/lattice/catwalk, /turf/simulated/floor/plating/airless, -/area/template_noop) +/area/space/nearstation) "eL" = ( /obj/machinery/light{ dir = 4 @@ -2935,7 +2931,7 @@ }, /obj/structure/lattice/catwalk, /turf/simulated/floor/plating/airless, -/area/template_noop) +/area/space/nearstation) "hg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -2988,7 +2984,7 @@ amount = 2 }, /turf/simulated/floor/plating/airless, -/area/template_noop) +/area/space/nearstation) "hm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -3062,7 +3058,7 @@ }, /obj/structure/lattice/catwalk, /turf/simulated/floor/plating/airless, -/area/template_noop) +/area/space/nearstation) "ht" = ( /obj/structure/cable{ d1 = 1; @@ -3241,7 +3237,7 @@ }, /obj/structure/lattice/catwalk, /turf/simulated/floor/plating/airless, -/area/template_noop) +/area/space/nearstation) "hK" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -3644,7 +3640,7 @@ }, /obj/structure/lattice/catwalk, /turf/simulated/floor/plating/airless, -/area/template_noop) +/area/space/nearstation) "iC" = ( /obj/structure/cable{ d1 = 4; @@ -3754,7 +3750,7 @@ }, /obj/structure/lattice/catwalk, /turf/simulated/floor/plating, -/area/template_noop) +/area/space/nearstation) "iP" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -3763,7 +3759,7 @@ }, /obj/structure/lattice/catwalk, /turf/simulated/floor/plating, -/area/template_noop) +/area/space/nearstation) "iQ" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, @@ -4051,7 +4047,7 @@ }, /obj/structure/lattice/catwalk, /turf/simulated/floor/plating/airless, -/area/template_noop) +/area/space/nearstation) "jx" = ( /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt, @@ -4370,7 +4366,7 @@ }, /obj/structure/lattice/catwalk, /turf/simulated/floor/plating/airless, -/area/template_noop) +/area/space/nearstation) "km" = ( /obj/structure/cable{ d1 = 1; @@ -4457,7 +4453,7 @@ }, /obj/structure/lattice/catwalk, /turf/simulated/floor/plating, -/area/template_noop) +/area/space/nearstation) "kw" = ( /obj/machinery/atmospherics/unary/vent_pump{ dir = 8 @@ -4670,7 +4666,7 @@ "kZ" = ( /obj/structure/lattice/catwalk, /turf/simulated/floor/plating, -/area/template_noop) +/area/space/nearstation) "la" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -5095,6 +5091,10 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/ruin/space/ancientstation/thetacorridor) +"uQ" = ( +/obj/structure/lattice, +/turf/template_noop, +/area/space/nearstation) "AY" = ( /obj/machinery/recharge_station, /obj/effect/decal/cleanable/dirt, @@ -5136,11 +5136,11 @@ aa aa aV aV -ag +uQ aV aV aa -ag +uQ aV aV aa @@ -5153,7 +5153,7 @@ aa aa aa in -ag +uQ in in in @@ -5163,7 +5163,7 @@ kk ku kC aa -ag +uQ aa aa aa @@ -5192,14 +5192,14 @@ be be ei aV -ag -ag -ag +uQ +uQ +uQ ae -ag -ag -ag -ag +uQ +uQ +uQ +uQ io lr lr @@ -5243,7 +5243,7 @@ eA aa aa aa -ag +uQ aa aa aa @@ -5276,7 +5276,7 @@ aa aa aa aa -ag +uQ aV aV bf @@ -5291,7 +5291,7 @@ bf aW aV aa -ag +uQ aa aa aa @@ -5325,7 +5325,7 @@ aa aa aa aa -ag +uQ aV bo be @@ -5344,14 +5344,14 @@ aa aa aa aa -ag +uQ lr in in aa aa aa -ag +uQ aa aa aa @@ -5389,19 +5389,19 @@ fs be aV gV -ag -ag -ag -ag +uQ +uQ +uQ +uQ lr lr in in aa -ag +uQ aa aa -ag +uQ aa aa aa @@ -5438,7 +5438,7 @@ bz bf aW aa -ag +uQ aa aa aa @@ -5447,7 +5447,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -5486,7 +5486,7 @@ be gB aa aa -ag +uQ aa aa aa @@ -5495,7 +5495,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -5516,7 +5516,7 @@ aa aa aa aa -ag +uQ ab aa bf @@ -5525,15 +5525,15 @@ bY be bf aV -ag +uQ aV eB aV fu go aV -ag -ag +uQ +uQ ae aa aa @@ -5543,7 +5543,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -5562,7 +5562,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -5572,8 +5572,8 @@ bz bW bz bf -ag -ag +uQ +uQ aa aV aV @@ -5581,17 +5581,17 @@ fv aV aV aa -ag +uQ ae aa aa aa -ag +uQ aa aa aa aa -ag +uQ aa aa aa @@ -5612,7 +5612,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -5624,9 +5624,9 @@ aW aa aa aa -ag +uQ fv -ag +uQ aa aa af @@ -5634,11 +5634,11 @@ cc aa aa aa -ag +uQ aa aa aa -ag +uQ aa aa aa @@ -5659,30 +5659,30 @@ aa aa aa aa -ag +uQ aa aa -ag +uQ aa aa cX aa aa -ag +uQ aa aa aa aa -ag +uQ aa aa aa aa -ag +uQ aa aa aa -ag +uQ aa aa aa @@ -5706,8 +5706,8 @@ aa aa aa aa -ag -ag +uQ +uQ aa aa aa @@ -5716,28 +5716,28 @@ aa de aa aa -ag +uQ aa aa aa aa -ag +uQ aa aa aa aa -ag +uQ aa aa aa -ag +uQ aa aa aa aa aa aa -ag +uQ aa aa aa @@ -5755,8 +5755,8 @@ aa aa aa aa -ag -ag +uQ +uQ aa aa aa @@ -5775,7 +5775,7 @@ aa cC ae ae -ag +uQ ae ae cH @@ -5784,7 +5784,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -5803,7 +5803,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -5811,7 +5811,7 @@ aa aa cX aa -ag +uQ ck ck hf @@ -5827,11 +5827,11 @@ kZ iO kZ iP -ag +uQ aa aa aa -ag +uQ aa aH ab @@ -5851,7 +5851,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -5871,7 +5871,7 @@ aa ae cC ae -ag +uQ ae ae ae @@ -5899,7 +5899,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -5907,7 +5907,7 @@ aa aa cX aa -ag +uQ ck ck eK @@ -5927,7 +5927,7 @@ df aa aa aa -ag +uQ ab ab kH @@ -5947,7 +5947,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -5967,14 +5967,14 @@ aa ae ae ae -ag +uQ ae ae ae aa aa aa -ag +uQ aa aa ab @@ -5995,7 +5995,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -6003,7 +6003,7 @@ aa aa cX aa -ag +uQ eK hf ck @@ -6019,7 +6019,7 @@ ck hf hf kl -ag +uQ aa aa aa @@ -6043,7 +6043,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -6063,7 +6063,7 @@ aa ae cD ae -ag +uQ ae cD cD @@ -6071,9 +6071,9 @@ aa aa aa aa -ag +uQ aa -ag +uQ aa aa aa @@ -6091,7 +6091,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -6100,7 +6100,7 @@ aa cX aa aa -ag +uQ aa aa aa @@ -6110,16 +6110,16 @@ eC aa aa aa -ag +uQ aa aa aa -ag +uQ aa aa aa aa -ag +uQ aa aa aa @@ -6139,7 +6139,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -6148,7 +6148,7 @@ aa cX aa aa -ag +uQ aa aa aa @@ -6158,16 +6158,16 @@ eC aa aa aa -ag +uQ aa aa aa -ag +uQ aa aa aa aa -ag +uQ aa aa aa @@ -6187,7 +6187,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -6210,12 +6210,12 @@ cU aa aa aa -ag +uQ aa aa aa aa -ag +uQ aa aa aa @@ -6235,7 +6235,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -6258,12 +6258,12 @@ cU aa aa aa -ag +uQ aa aa aa aa -ag +uQ aa aa aa @@ -6283,7 +6283,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -6311,7 +6311,7 @@ cU aa aa aa -ag +uQ aa aa aa @@ -6331,7 +6331,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -6359,7 +6359,7 @@ cU aa aa aa -ag +uQ aa aa aa @@ -6379,7 +6379,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -6407,7 +6407,7 @@ cU aa aa aa -ag +uQ aa aa aa @@ -6427,7 +6427,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -6455,7 +6455,7 @@ cU aa aa aa -ag +uQ aa aa aa @@ -7290,7 +7290,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -7319,7 +7319,7 @@ az aa aa aa -ag +uQ aa aa aa @@ -7338,7 +7338,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -7367,7 +7367,7 @@ az aa aa aa -ag +uQ aa aa aa @@ -7385,7 +7385,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -7415,7 +7415,7 @@ az aa aa aa -ag +uQ aa aa aa @@ -7435,7 +7435,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -7463,7 +7463,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -7511,7 +7511,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -7559,7 +7559,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -7592,9 +7592,9 @@ aa aa aa aa -ag +uQ bt -ag +uQ aa aa aa @@ -7607,7 +7607,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -7640,9 +7640,9 @@ aa dn aa aa -ag +uQ bt -ag +uQ aa aa aa @@ -7655,7 +7655,7 @@ aa aa aa aa -ag +uQ aa aa ab @@ -7688,9 +7688,9 @@ ab ab aa aa -ag +uQ bt -ag +uQ aa aa aa @@ -7703,7 +7703,7 @@ aa aa aa aa -ag +uQ aa aa ab @@ -7721,7 +7721,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -7736,9 +7736,9 @@ ab ab ab aa -ag +uQ bt -ag +uQ aa aa aa @@ -7751,7 +7751,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -7771,7 +7771,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -7799,7 +7799,7 @@ bu aa aa aa -ag +uQ aa aa aa @@ -7847,7 +7847,7 @@ bu aa aa aa -ag +uQ aa aa aa @@ -7866,7 +7866,7 @@ aa aa aa aa -ag +uQ aa aa aa @@ -7895,7 +7895,7 @@ bu aa aa aa -ag +uQ aa aa aa @@ -7912,8 +7912,8 @@ aa aa aa aa -ag -ag +uQ +uQ aa aa aa @@ -7943,7 +7943,7 @@ bu aa aa aa -ag +uQ aa aa aa @@ -7991,7 +7991,7 @@ bu aa aa aa -ag +uQ aa aa aa @@ -8039,7 +8039,7 @@ bu aa aa aa -ag +uQ aa aa aa diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm index f3d604f4bd9..b565b249f50 100644 --- a/_maps/map_files/generic/Lavaland.dmm +++ b/_maps/map_files/generic/Lavaland.dmm @@ -871,7 +871,7 @@ /turf/simulated/floor/plasteel{ icon_state = "darkredcorners" }, -/area/mine/laborcamp) +/area/mine/laborcamp/security) "ca" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair{ @@ -4221,7 +4221,7 @@ dir = 4; icon_state = "darkredcorners" }, -/area/mine/laborcamp) +/area/mine/laborcamp/security) "sP" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -4427,7 +4427,7 @@ }, /obj/structure/lattice/catwalk, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/mine/laborcamp) +/area/mine/laborcamp/security) "xM" = ( /obj/structure/ore_box, /obj/machinery/light/small{ @@ -4831,7 +4831,7 @@ }, /obj/structure/lattice/catwalk, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/mine/laborcamp) +/area/mine/laborcamp/security) "LO" = ( /obj/effect/spawner/window, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -4882,7 +4882,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/mine/laborcamp) +/area/mine/laborcamp/security) "Nj" = ( /obj/machinery/door/airlock{ name = "Restroom" @@ -4945,6 +4945,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/mine/living_quarters) +"PX" = ( +/turf/simulated/wall, +/area/mine/laborcamp/security) "QE" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -10088,9 +10091,9 @@ ao aq aJ aq -aq +PX Ni -aq +PX aj aD aj @@ -10347,7 +10350,7 @@ hQ aq bZ sO -ap +cG aj aj aj diff --git a/code/modules/awaymissions/mission_code/ruins/oldstation.dm b/code/modules/awaymissions/mission_code/ruins/oldstation.dm index 551e500ebfc..c353f2753ee 100644 --- a/code/modules/awaymissions/mission_code/ruins/oldstation.dm +++ b/code/modules/awaymissions/mission_code/ruins/oldstation.dm @@ -325,7 +325,7 @@ /area/ruin/space/ancientstation/betanorth name = "Beta Station North Corridor" - icon_state = "blue" + icon_state = "purple" /area/ruin/space/ancientstation/solar name = "Station Solar Array" @@ -342,7 +342,7 @@ /area/ruin/space/ancientstation/hydroponics name = "Charlie Station Hydroponics" - icon_state = "garden" + icon_state = "hydro" /area/ruin/space/ancientstation/kitchen name = "Charlie Station Kitchen"