From 2c65f5c6b5b4decf98e8eae689c88144a6754394 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Tue, 21 Nov 2017 09:41:37 -0500 Subject: [PATCH 1/2] Fixes dynamic lighting / nearstation area issues. --- _maps/RandomRuins/SpaceRuins/abandonedzoo.dmm | 4 +- _maps/RandomRuins/SpaceRuins/derelict2.dmm | 8 +- _maps/RandomRuins/SpaceRuins/oldstation.dmm | 4 +- _maps/RandomRuins/SpaceRuins/vaporwave.dmm | 2 +- _maps/RandomZLevels/Academy.dmm | 12 +- _maps/RandomZLevels/caves.dmm | 4 +- _maps/RandomZLevels/centcomAway.dmm | 10 +- _maps/RandomZLevels/challenge.dmm | 22 +- _maps/RandomZLevels/research.dmm | 22 +- _maps/RandomZLevels/spacebattle.dmm | 46 ++-- _maps/RandomZLevels/undergroundoutpost45.dmm | 4 +- _maps/RandomZLevels/wildwest.dmm | 40 +-- _maps/map_files/BoxStation/BoxStation.dmm | 228 +++++++++++---- .../map_files/Deltastation/DeltaStation2.dmm | 256 ++++++++--------- _maps/map_files/MetaStation/MetaStation.dmm | 260 +++++++++--------- _maps/map_files/OmegaStation/OmegaStation.dmm | 23 +- _maps/map_files/PubbyStation/PubbyStation.dmm | 230 ++++++++-------- _maps/map_files/debug/runtimestation.dmm | 4 +- _maps/shuttles/emergency_asteroid.dmm | 2 +- 19 files changed, 652 insertions(+), 529 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm index 1e3ae17ff8..05911c954b 100644 --- a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm +++ b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm @@ -671,7 +671,7 @@ "bK" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "bL" = ( /obj/machinery/light/small{ dir = 8 @@ -717,7 +717,7 @@ }, /obj/structure/disposaloutlet, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "bS" = ( /obj/structure/cable{ icon_state = "1-4" diff --git a/_maps/RandomRuins/SpaceRuins/derelict2.dmm b/_maps/RandomRuins/SpaceRuins/derelict2.dmm index de0b5d578f..98e6de9263 100644 --- a/_maps/RandomRuins/SpaceRuins/derelict2.dmm +++ b/_maps/RandomRuins/SpaceRuins/derelict2.dmm @@ -7,7 +7,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "c" = ( /obj/machinery/door/airlock/external, /turf/open/floor/plating, @@ -17,7 +17,7 @@ dir = 8 }, /turf/open/space, -/area/space) +/area/space/nearstation) "e" = ( /obj/structure/window/reinforced{ dir = 4 @@ -52,7 +52,7 @@ "k" = ( /obj/structure/window/reinforced, /turf/open/space, -/area/space) +/area/space/nearstation) "l" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -92,7 +92,7 @@ dir = 1 }, /turf/open/space, -/area/space) +/area/space/nearstation) "q" = ( /obj/machinery/light/small{ dir = 8 diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index 47c38240c2..f580b26a81 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -1228,7 +1228,7 @@ "dF" = ( /obj/structure/lattice, /turf/template_noop, -/area/space) +/area/space/nearstation) "dG" = ( /turf/open/floor/plasteel/airless, /area/template_noop) @@ -2498,7 +2498,7 @@ dir = 4 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "gG" = ( /obj/effect/spawner/structure/window/hollow/reinforced, /obj/structure/cable{ diff --git a/_maps/RandomRuins/SpaceRuins/vaporwave.dmm b/_maps/RandomRuins/SpaceRuins/vaporwave.dmm index 0b489899ed..3a4010784a 100644 --- a/_maps/RandomRuins/SpaceRuins/vaporwave.dmm +++ b/_maps/RandomRuins/SpaceRuins/vaporwave.dmm @@ -5,7 +5,7 @@ "b" = ( /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "c" = ( /obj/structure/lattice, /turf/open/floor/plating/asteroid/airless, diff --git a/_maps/RandomZLevels/Academy.dmm b/_maps/RandomZLevels/Academy.dmm index 9d7262bf9b..a724ded444 100644 --- a/_maps/RandomZLevels/Academy.dmm +++ b/_maps/RandomZLevels/Academy.dmm @@ -10,7 +10,7 @@ faction = list("wizard") }, /turf/open/space, -/area/space) +/area/space/nearstation) "ad" = ( /obj/structure/filingcabinet/filingcabinet, /turf/open/floor/carpet, @@ -183,7 +183,7 @@ /area/awaymission/academy/headmaster) "aG" = ( /turf/closed/indestructible/rock, -/area/space) +/area/space/nearstation) "aH" = ( /obj/structure/cable{ icon_state = "1-2" @@ -231,7 +231,7 @@ "aP" = ( /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "aQ" = ( /obj/machinery/door/airlock/gold{ locked = 1 @@ -1240,7 +1240,7 @@ "eu" = ( /obj/singularity/academy, /turf/open/space, -/area/space) +/area/space/nearstation) "ev" = ( /obj/structure/window/reinforced{ dir = 8 @@ -2988,7 +2988,7 @@ icon_state = "medium" }, /turf/open/space, -/area/space) +/area/space/nearstation) "jC" = ( /obj/machinery/igniter, /turf/open/floor/plating, @@ -3916,7 +3916,7 @@ /area/awaymission/academy/academycellar) "mY" = ( /turf/closed/mineral/random, -/area/space) +/area/space/nearstation) "mZ" = ( /turf/closed/indestructible/fakeglass{ icon_state = "fakewindows"; diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm index b3f2c3ace4..cfbd187283 100644 --- a/_maps/RandomZLevels/caves.dmm +++ b/_maps/RandomZLevels/caves.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( /turf/closed/indestructible/rock, -/area/space) +/area/space/nearstation) "ab" = ( /turf/open/space, /area/space) @@ -2680,7 +2680,7 @@ "gW" = ( /obj/effect/mapping_helpers/planet_z, /turf/closed/indestructible/rock, -/area/space) +/area/space/nearstation) (1,1,1) = {" aa diff --git a/_maps/RandomZLevels/centcomAway.dmm b/_maps/RandomZLevels/centcomAway.dmm index 7bc21af557..4b4b130079 100644 --- a/_maps/RandomZLevels/centcomAway.dmm +++ b/_maps/RandomZLevels/centcomAway.dmm @@ -335,7 +335,7 @@ "bk" = ( /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "bl" = ( /obj/machinery/door/poddoor{ id = "XCCHangar1"; @@ -2332,7 +2332,7 @@ "iv" = ( /obj/effect/spawner/structure/window/hollow/reinforced, /turf/open/floor/plating, -/area/space) +/area/space/nearstation) "iw" = ( /obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, @@ -3135,19 +3135,19 @@ dir = 1 }, /turf/open/space, -/area/space) +/area/space/nearstation) "kU" = ( /obj/structure/shuttle/engine/propulsion{ dir = 1 }, /turf/open/space, -/area/space) +/area/space/nearstation) "kV" = ( /obj/structure/shuttle/engine/propulsion/left{ dir = 1 }, /turf/open/space, -/area/space) +/area/space/nearstation) "kW" = ( /obj/structure/table, /obj/item/device/paicard, diff --git a/_maps/RandomZLevels/challenge.dmm b/_maps/RandomZLevels/challenge.dmm index bf68b5a106..282a1fc07f 100644 --- a/_maps/RandomZLevels/challenge.dmm +++ b/_maps/RandomZLevels/challenge.dmm @@ -718,7 +718,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "cn" = ( /turf/open/floor/circuit, /area/awaymission/challenge/end) @@ -732,7 +732,7 @@ dir = 8 }, /turf/open/space, -/area/space) +/area/space/nearstation) "cq" = ( /obj/structure/table/wood, /obj/item/melee/chainofcommand, @@ -787,14 +787,14 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "cz" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 8 }, /turf/open/space, -/area/space) +/area/space/nearstation) "cA" = ( /obj/structure/sign/securearea, /turf/closed/indestructible{ @@ -840,7 +840,7 @@ dir = 1 }, /turf/open/space, -/area/space) +/area/space/nearstation) "cI" = ( /obj/structure/window/reinforced{ dir = 1 @@ -849,7 +849,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "cJ" = ( /obj/structure/window/reinforced{ dir = 8 @@ -858,7 +858,7 @@ dir = 1 }, /turf/open/space, -/area/space) +/area/space/nearstation) "cK" = ( /obj/structure/window/reinforced{ dir = 4 @@ -867,7 +867,7 @@ dir = 1 }, /turf/open/space, -/area/space) +/area/space/nearstation) "cL" = ( /obj/structure/window/reinforced{ dir = 1 @@ -876,7 +876,7 @@ dir = 8 }, /turf/open/space, -/area/space) +/area/space/nearstation) "cM" = ( /obj/effect/spawner/structure/window/hollow/reinforced/directional{ dir = 9 @@ -998,7 +998,7 @@ }, /obj/structure/window/reinforced, /turf/open/space, -/area/space) +/area/space/nearstation) "de" = ( /obj/effect/spawner/structure/window/hollow/reinforced/end, /turf/open/floor/plating, @@ -1040,7 +1040,7 @@ }, /obj/structure/window/reinforced, /turf/open/space, -/area/space) +/area/space/nearstation) "dk" = ( /obj/machinery/door/airlock/centcom{ name = "Gateway Access"; diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm index 3481d2187a..e70503f68f 100644 --- a/_maps/RandomZLevels/research.dmm +++ b/_maps/RandomZLevels/research.dmm @@ -4,10 +4,10 @@ /area/space) "ab" = ( /turf/closed/mineral, -/area/space) +/area/space/nearstation) "ac" = ( /turf/open/floor/plating/asteroid/airless, -/area/space) +/area/space/nearstation) "ad" = ( /turf/closed/mineral, /area/awaymission/research/exterior) @@ -268,7 +268,7 @@ amount = 50 }, /turf/open/floor/plating/asteroid/airless, -/area/space) +/area/space/nearstation) "aY" = ( /obj/structure/cable{ icon_state = "1-2" @@ -355,7 +355,7 @@ "bk" = ( /obj/item/bikehorn, /turf/open/floor/plating/asteroid/airless, -/area/space) +/area/space/nearstation) "bl" = ( /turf/closed/wall/r_wall, /area/awaymission/research/interior/gateway) @@ -449,7 +449,7 @@ "by" = ( /obj/item/clothing/mask/gas/clown_hat, /turf/open/floor/plating/asteroid/airless, -/area/space) +/area/space/nearstation) "bz" = ( /turf/open/floor/plasteel/dark, /area/awaymission/research/interior/gateway) @@ -3756,7 +3756,7 @@ /area/awaymission/research/interior/dorm) "ln" = ( /turf/open/floor/plasteel, -/area/space) +/area/space/nearstation) "lo" = ( /obj/structure/table/wood, /obj/structure/bedsheetbin, @@ -4343,23 +4343,23 @@ /area/awaymission/research/interior/escapepods) "na" = ( /turf/closed/wall/mineral/plasma, -/area/space) +/area/space/nearstation) "nb" = ( /obj/structure/table/wood, /obj/item/spellbook/oneuse/random, /turf/open/floor/mineral/plasma, -/area/space) +/area/space/nearstation) "nc" = ( /mob/living/simple_animal/hostile/creature, /turf/open/floor/mineral/plasma, -/area/space) +/area/space/nearstation) "nd" = ( /obj/structure/healingfountain, /turf/open/floor/mineral/plasma, -/area/space) +/area/space/nearstation) "ne" = ( /turf/open/floor/mineral/plasma, -/area/space) +/area/space/nearstation) (1,1,1) = {" aa diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm index 77c0206bb4..c82be4fdfe 100644 --- a/_maps/RandomZLevels/spacebattle.dmm +++ b/_maps/RandomZLevels/spacebattle.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( /turf/closed/mineral/random, -/area/space) +/area/space/nearstation) "ab" = ( /turf/open/space, /area/space) @@ -2476,46 +2476,46 @@ "ix" = ( /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "iy" = ( /obj/effect/mob_spawn/human/syndicatesoldier, /turf/open/space, -/area/space) +/area/space/nearstation) "iz" = ( /turf/closed/wall/mineral/plastitanium, -/area/space) +/area/space/nearstation) "iA" = ( /turf/open/space, /turf/closed/wall/mineral/plastitanium{ dir = 1; icon_state = "diagonalWall3" }, -/area/space) +/area/space/nearstation) "iB" = ( /obj/machinery/sleeper, /turf/open/floor/mineral/plastitanium/airless, -/area/space) +/area/space/nearstation) "iC" = ( /turf/open/floor/mineral/plastitanium/airless, -/area/space) +/area/space/nearstation) "iD" = ( /obj/effect/mob_spawn/human/syndicatesoldier, /turf/open/floor/mineral/plastitanium/airless, -/area/space) +/area/space/nearstation) "iE" = ( /turf/closed/mineral/clown, -/area/space) +/area/space/nearstation) "iF" = ( /obj/machinery/door/airlock/external, /turf/open/floor/plasteel/airless{ icon_state = "floor4"; dir = 10 }, -/area/space) +/area/space/nearstation) "iG" = ( /obj/item/stack/rods, /turf/open/floor/mineral/plastitanium/airless, -/area/space) +/area/space/nearstation) "iH" = ( /turf/open/space, /turf/closed/wall/mineral/plastitanium{ @@ -2536,7 +2536,7 @@ "iK" = ( /obj/machinery/sleeper, /turf/open/floor/plasteel/airless, -/area/space) +/area/space/nearstation) "iL" = ( /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate5) @@ -2549,14 +2549,14 @@ /turf/closed/wall/mineral/plastitanium{ icon_state = "diagonalWall3" }, -/area/space) +/area/space/nearstation) "iO" = ( /turf/open/space, /turf/closed/wall/mineral/plastitanium{ dir = 4; icon_state = "diagonalWall3" }, -/area/space) +/area/space/nearstation) "iP" = ( /obj/machinery/sleeper, /turf/open/floor/mineral/plastitanium, @@ -2574,11 +2574,11 @@ dir = 1 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "iS" = ( /obj/structure/shuttle/engine/propulsion, /turf/open/space, -/area/space) +/area/space/nearstation) "iT" = ( /obj/machinery/door/airlock/external, /turf/open/floor/mineral/plastitanium, @@ -2672,7 +2672,7 @@ /area/awaymission/spacebattle/syndicate6) "jk" = ( /turf/open/floor/plating/asteroid/airless, -/area/space) +/area/space/nearstation) "jl" = ( /turf/closed/wall/mineral/plasma, /area/awaymission/spacebattle/secret) @@ -3083,11 +3083,11 @@ "kE" = ( /obj/item/shard, /turf/open/space, -/area/space) +/area/space/nearstation) "kF" = ( /obj/item/stack/rods, /turf/open/space, -/area/space) +/area/space/nearstation) "kG" = ( /obj/item/ammo_casing/c10mm, /obj/item/ammo_casing/c10mm, @@ -3106,17 +3106,17 @@ "kI" = ( /obj/item/stack/sheet/metal, /turf/open/space, -/area/space) +/area/space/nearstation) "kJ" = ( /obj/item/shard, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "kK" = ( /obj/structure/lattice, /obj/item/stack/rods, /turf/open/space, -/area/space) +/area/space/nearstation) "kL" = ( /obj/structure/closet/crate, /obj/item/stock_parts/cell/high, @@ -3127,7 +3127,7 @@ "kM" = ( /obj/effect/mapping_helpers/planet_z, /turf/closed/mineral/random, -/area/space) +/area/space/nearstation) (1,1,1) = {" aa diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index 2cb44fa1d6..7a48d610df 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -5224,7 +5224,7 @@ /turf/open/floor/plasteel/white{ heat_capacity = 1e+006 }, -/area/space) +/area/space/nearstation) "la" = ( /obj/machinery/shower{ pixel_y = 15 @@ -13141,7 +13141,7 @@ "zi" = ( /obj/effect/mapping_helpers/planet_z, /turf/open/space, -/area/space) +/area/space/nearstation) (1,1,1) = {" aa diff --git a/_maps/RandomZLevels/wildwest.dmm b/_maps/RandomZLevels/wildwest.dmm index 249c9b5402..60402ca23d 100644 --- a/_maps/RandomZLevels/wildwest.dmm +++ b/_maps/RandomZLevels/wildwest.dmm @@ -153,7 +153,7 @@ /area/awaymission/wildwest/vaultdoors) "aG" = ( /turf/closed/mineral, -/area/space) +/area/space/nearstation) "aH" = ( /turf/closed/mineral/diamond, /area/awaymission/wildwest/mines) @@ -259,7 +259,7 @@ /area/awaymission/wildwest/mines) "bg" = ( /turf/closed/wall/mineral/sandstone, -/area/space) +/area/space/nearstation) "bh" = ( /obj/structure/closet/crate/large, /turf/open/floor/plating, @@ -307,7 +307,7 @@ "br" = ( /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "bs" = ( /obj/effect/mine/sound/bwoink, /obj/item/ammo_box/c10mm, @@ -326,14 +326,14 @@ icon_state = "fwindow" }, /turf/open/space, -/area/space) +/area/space/nearstation) "bw" = ( /obj/structure/lattice, /obj/structure/window/reinforced{ icon_state = "fwindow" }, /turf/open/space, -/area/space) +/area/space/nearstation) "bx" = ( /obj/structure/closet/secure_closet/freezer/fridge, /turf/open/floor/plasteel/cafeteria{ @@ -435,7 +435,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bP" = ( /turf/closed/wall/mineral/sandstone, /area/awaymission/wildwest/gov) @@ -490,7 +490,7 @@ dir = 8 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bU" = ( /obj/structure/chair/wood/normal{ dir = 4 @@ -513,7 +513,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bX" = ( /obj/structure/window/reinforced{ icon_state = "fwindow"; @@ -670,12 +670,12 @@ dir = 8 }, /turf/open/space, -/area/space) +/area/space/nearstation) "cu" = ( /obj/structure/lattice, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "cv" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/carpet, @@ -959,7 +959,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "dp" = ( /obj/structure/bed, /obj/item/bedsheet/brown, @@ -1216,7 +1216,7 @@ dir = 1 }, /turf/open/space, -/area/space) +/area/space/nearstation) "ee" = ( /obj/structure/lattice, /obj/structure/window/reinforced{ @@ -1224,7 +1224,7 @@ dir = 1 }, /turf/open/space, -/area/space) +/area/space/nearstation) "ef" = ( /obj/structure/window/reinforced{ icon_state = "fwindow"; @@ -1234,7 +1234,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "eg" = ( /obj/structure/window/reinforced{ icon_state = "fwindow"; @@ -1262,7 +1262,7 @@ dir = 8 }, /turf/open/space, -/area/space) +/area/space/nearstation) "ej" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/plating/ironsand{ @@ -1682,7 +1682,7 @@ icon_state = "fwindow" }, /turf/open/space, -/area/space) +/area/space/nearstation) "fz" = ( /obj/structure/window/reinforced{ icon_state = "fwindow"; @@ -1692,7 +1692,7 @@ icon_state = "fwindow" }, /turf/open/space, -/area/space) +/area/space/nearstation) "fA" = ( /obj/structure/window/reinforced{ icon_state = "fwindow"; @@ -1797,7 +1797,7 @@ }, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "fO" = ( /mob/living/simple_animal/hostile/syndicate, /turf/open/floor/plasteel, @@ -1896,10 +1896,10 @@ dir = 8 }, /turf/open/floor/plasteel/airless, -/area/space) +/area/space/nearstation) "gd" = ( /turf/open/floor/plasteel/airless, -/area/space) +/area/space/nearstation) "ge" = ( /obj/effect/mob_spawn/human/miner/rig, /turf/open/floor/plasteel, diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index f2d2bd78b7..b8aabe0645 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -14,7 +14,7 @@ width = 18 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aae" = ( /obj/effect/landmark/carpspawn, /turf/open/space, @@ -22,17 +22,17 @@ "aaf" = ( /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "aag" = ( /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/space/nearstation) "aah" = ( /obj/structure/sign/securearea{ pixel_y = -32 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aai" = ( /turf/closed/wall/r_wall, /area/security/prison) @@ -257,17 +257,17 @@ pixel_y = -32 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aaS" = ( /obj/structure/grille, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "aaT" = ( /obj/structure/lattice, /obj/structure/grille, /turf/open/space, -/area/space) +/area/space/nearstation) "aaU" = ( /obj/machinery/computer/arcade, /turf/open/floor/plasteel/floorgrime, @@ -305,7 +305,7 @@ /obj/structure/lattice, /obj/structure/grille/broken, /turf/open/space, -/area/space) +/area/space/nearstation) "abb" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 @@ -739,7 +739,7 @@ "abY" = ( /obj/structure/grille, /turf/open/space, -/area/space) +/area/space/nearstation) "abZ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -923,7 +923,7 @@ }, /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/space/nearstation) "acx" = ( /obj/structure/cable{ icon_state = "1-2" @@ -935,7 +935,7 @@ /obj/structure/lattice, /obj/item/stack/cable_coil/random, /turf/open/space, -/area/space) +/area/space/nearstation) "acz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/turf_decal/stripes/line{ @@ -1444,7 +1444,7 @@ pixel_x = 32 }, /turf/open/space, -/area/space) +/area/space/nearstation) "adC" = ( /obj/structure/table, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -3880,7 +3880,7 @@ "aiS" = ( /obj/item/stack/rods, /turf/open/space, -/area/space) +/area/space/nearstation) "aiT" = ( /turf/closed/wall, /area/security/processing) @@ -6396,7 +6396,7 @@ /area/maintenance/port/fore) "aoV" = ( /turf/open/space, -/area/space/nearstation) +/area/space) "aoW" = ( /obj/structure/table, /obj/item/stamp, @@ -7031,7 +7031,7 @@ name = "lavaland" }, /turf/open/space, -/area/space) +/area/space/nearstation) "aqH" = ( /turf/closed/wall/mineral/titanium, /area/shuttle/pod_2) @@ -8975,7 +8975,7 @@ width = 18 }, /turf/open/space, -/area/space) +/area/space/nearstation) "avU" = ( /obj/item/paper/crumpled, /turf/open/floor/plasteel/airless{ @@ -10466,6 +10466,7 @@ /turf/closed/wall, /area/maintenance/port/fore) "azH" = ( +<<<<<<< HEAD /obj/machinery/power/apc{ areastring = "/area/maintenance/bar/cafe"; dir = 1; @@ -10489,6 +10490,17 @@ icon_state = "wood-broken5" }, /area/maintenance/bar/cafe) +======= +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/space, +/area/space/nearstation) +"azI" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/space, +/area/space/nearstation) +>>>>>>> e7197ec... Nearstation fixes (#32931) "azJ" = ( /obj/machinery/gateway{ dir = 9 @@ -12803,7 +12815,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aFr" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -13524,7 +13536,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aGY" = ( /obj/machinery/airalarm{ pixel_y = 25 @@ -32852,7 +32864,7 @@ pixel_y = 32 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bDj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -48285,7 +48297,7 @@ name = "lavaland" }, /turf/open/space, -/area/space) +/area/space/nearstation) "cpg" = ( /obj/structure/table, /obj/item/storage/lockbox/loyalty, @@ -49236,7 +49248,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "crI" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/general/visible{ @@ -49250,7 +49262,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "crK" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/junction{ dir = 8 @@ -49299,14 +49311,14 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "crU" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 10 }, /turf/open/space, -/area/space) +/area/space/nearstation) "crV" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 8 @@ -49341,7 +49353,7 @@ }, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "csa" = ( /obj/effect/spawner/structure/window/plasma/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -49353,7 +49365,7 @@ dir = 9 }, /turf/open/space, -/area/space) +/area/space/nearstation) "csc" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, @@ -49382,7 +49394,7 @@ dir = 1 }, /turf/open/space, -/area/space) +/area/space/nearstation) "csj" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/junction{ dir = 8 @@ -49399,7 +49411,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "csm" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 1 @@ -49409,12 +49421,12 @@ "csn" = ( /obj/structure/transit_tube/horizontal, /turf/open/space, -/area/space) +/area/space/nearstation) "cso" = ( /obj/structure/lattice, /obj/structure/transit_tube/crossing/horizontal, /turf/open/space, -/area/space) +/area/space/nearstation) "csq" = ( /obj/machinery/computer/security/telescreen{ desc = "Used for watching the turbine vent."; @@ -49453,7 +49465,7 @@ /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /turf/open/space, -/area/space) +/area/space/nearstation) "csu" = ( /obj/structure/closet/firecloset, /turf/open/floor/plasteel/dark, @@ -49464,17 +49476,17 @@ }, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "csw" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/yellow/visible, /turf/open/space, -/area/space) +/area/space/nearstation) "csx" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /turf/open/space, -/area/space) +/area/space/nearstation) "csy" = ( /obj/structure/table, /obj/item/weldingtool, @@ -49486,7 +49498,7 @@ "csz" = ( /obj/effect/landmark/carpspawn, /turf/open/space, -/area/space/nearstation) +/area/space) "csA" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "engsm"; @@ -49538,7 +49550,7 @@ /obj/machinery/atmospherics/pipe/simple/yellow/visible, /obj/structure/transit_tube/crossing/horizontal, /turf/open/space, -/area/space) +/area/space/nearstation) "csN" = ( /obj/structure/transit_tube/horizontal, /turf/open/floor/plating, @@ -49645,7 +49657,7 @@ /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/yellow/visible, /turf/open/space, -/area/space) +/area/space/nearstation) "ctg" = ( /obj/structure/closet/emcloset, /turf/open/floor/plating, @@ -49750,7 +49762,7 @@ /area/ai_monitored/turret_protected/aisat_interior) "ctv" = ( /turf/closed/wall/r_wall, -/area/space) +/area/space/nearstation) "ctw" = ( /obj/machinery/airalarm{ dir = 4; @@ -49877,14 +49889,14 @@ }, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "ctO" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 5 }, /turf/open/space, -/area/space) +/area/space/nearstation) "ctP" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -50756,7 +50768,7 @@ start_active = 1 }, /turf/open/space, -/area/space) +/area/space/nearstation) "cvG" = ( /obj/machinery/porta_turret/ai{ dir = 4; @@ -50803,7 +50815,7 @@ start_active = 1 }, /turf/open/space, -/area/space) +/area/space/nearstation) "cvL" = ( /obj/structure/sign/securearea{ pixel_x = 32 @@ -51317,7 +51329,7 @@ name = "lavaland" }, /turf/open/space, -/area/space) +/area/space/nearstation) "cwW" = ( /obj/machinery/status_display, /turf/closed/wall/mineral/titanium, @@ -51440,7 +51452,7 @@ /obj/structure/lattice, /obj/effect/landmark/carpspawn, /turf/open/space, -/area/space) +/area/space/nearstation) "cxo" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -5; @@ -52391,7 +52403,7 @@ name = "lavaland" }, /turf/open/space, -/area/space) +/area/space/nearstation) "czO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -52537,7 +52549,7 @@ dir = 1 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "cAg" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel/cafeteria, @@ -52846,7 +52858,7 @@ start_active = 1 }, /turf/open/space, -/area/space) +/area/space/nearstation) "cAV" = ( /obj/structure/cable{ icon_state = "1-2" @@ -52881,7 +52893,7 @@ start_active = 1 }, /turf/open/space, -/area/space) +/area/space/nearstation) "cAY" = ( /obj/structure/cable{ icon_state = "4-8" @@ -52943,7 +52955,7 @@ start_active = 1 }, /turf/open/space, -/area/space) +/area/space/nearstation) "cBg" = ( /obj/effect/spawner/structure/window/reinforced, /obj/effect/landmark/event_spawn, @@ -53241,7 +53253,7 @@ width = 18 }, /turf/open/space, -/area/space) +/area/space/nearstation) "cBX" = ( /obj/docking_port/stationary{ dheight = 9; @@ -53254,7 +53266,7 @@ width = 18 }, /turf/open/space, -/area/space) +/area/space/nearstation) "cBY" = ( /obj/docking_port/stationary{ dheight = 9; @@ -53267,7 +53279,7 @@ width = 18 }, /turf/open/space, -/area/space) +/area/space/nearstation) "cBZ" = ( /obj/structure/table/wood, /obj/item/clothing/under/burial, @@ -53824,7 +53836,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "cDY" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/orange/visible{ @@ -53918,7 +53930,7 @@ }, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "cEr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/stripes/line{ @@ -54067,7 +54079,7 @@ dir = 5 }, /turf/open/space, -/area/space) +/area/space/nearstation) "cEK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 @@ -54215,21 +54227,21 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "cFn" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 6 }, /turf/open/space, -/area/space) +/area/space/nearstation) "cFo" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 10 }, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "cFu" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -55805,7 +55817,7 @@ turf_type = /turf/open/space }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qlk" = ( /obj/docking_port/stationary{ dheight = 9; @@ -55818,7 +55830,7 @@ width = 18 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qll" = ( /obj/machinery/door/airlock/titanium{ name = "recovery shuttle external airlock" @@ -60110,8 +60122,104 @@ /obj/structure/chair/office/light{ dir = 1 }, +<<<<<<< HEAD /obj/structure/cable{ icon_state = "0-4" +======= +/turf/open/floor/mineral/titanium, +/area/shuttle/abandoned) +"Qod" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space/basic, +/area/space/nearstation) +"Qoe" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space/basic, +/area/space/nearstation) +"Qof" = ( +/obj/structure/lattice, +/obj/structure/grille/broken, +/turf/open/space/basic, +/area/space/nearstation) +"Qog" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space/basic, +/area/space/nearstation) +"Qoh" = ( +/obj/structure/lattice, +/obj/structure/grille/broken, +/turf/open/space/basic, +/area/space/nearstation) +"Qoi" = ( +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) +"Qoj" = ( +/obj/structure/lattice, +/obj/structure/grille/broken, +/turf/open/space/basic, +/area/space/nearstation) +"Qok" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space/basic, +/area/space/nearstation) +"Qol" = ( +/obj/structure/grille, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"Qom" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space/basic, +/area/space/nearstation) +"Qon" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space/basic, +/area/space/nearstation) +"Qoo" = ( +/obj/structure/lattice, +/obj/structure/grille/broken, +/turf/open/space/basic, +/area/space/nearstation) +"Qop" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space/basic, +/area/space/nearstation) +"Qoq" = ( +/obj/structure/lattice, +/obj/structure/grille/broken, +/turf/open/space/basic, +/area/space/nearstation) +"Qor" = ( +/obj/structure/lattice, +/obj/structure/grille/broken, +/turf/open/space/basic, +/area/space/nearstation) +"Qos" = ( +/obj/structure/grille, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"Qot" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space/basic, +/area/space/nearstation) +"Qou" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space/basic, +/area/space/nearstation) +"Qov" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 +>>>>>>> e7197ec... Nearstation fixes (#32931) }, /turf/open/floor/plasteel, /area/engine/gravity_generator) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 9953989a3f..7a3a16ec78 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -10,11 +10,11 @@ /obj/structure/lattice, /obj/structure/grille, /turf/open/space, -/area/space) +/area/space/nearstation) "aad" = ( /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "aae" = ( /obj/machinery/power/tracker, /obj/structure/cable{ @@ -139,14 +139,14 @@ name = "lavaland" }, /turf/open/space, -/area/space) +/area/space/nearstation) "aat" = ( /obj/docking_port/stationary/random{ id = "pod_lavaland2"; name = "lavaland" }, /turf/open/space, -/area/space) +/area/space/nearstation) "aau" = ( /obj/structure/lattice/catwalk, /obj/effect/landmark/xeno_spawn, @@ -538,7 +538,7 @@ "abj" = ( /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/space/nearstation) "abk" = ( /obj/machinery/vending/hydroseeds, /obj/effect/decal/cleanable/dirt{ @@ -3336,7 +3336,7 @@ width = 18 }, /turf/open/space, -/area/space) +/area/space/nearstation) "agP" = ( /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; @@ -4528,7 +4528,7 @@ "ajr" = ( /obj/structure/grille, /turf/closed/wall/r_wall, -/area/space) +/area/space/nearstation) "ajs" = ( /obj/structure/table, /obj/item/storage/briefcase, @@ -9138,14 +9138,14 @@ dir = 6 }, /turf/open/space, -/area/space) +/area/space/nearstation) "atJ" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 10 }, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "atK" = ( /obj/structure/table/reinforced, /obj/item/device/analyzer{ @@ -9794,7 +9794,7 @@ }, /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/space/nearstation) "auQ" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 @@ -9802,14 +9802,14 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/space/nearstation) "auR" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 }, /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/space/nearstation) "auS" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/junction{ dir = 8 @@ -10370,7 +10370,7 @@ }, /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/space/nearstation) "awa" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 @@ -10378,7 +10378,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "awb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/bot, @@ -10880,13 +10880,13 @@ }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /turf/open/space, -/area/space) +/area/space/nearstation) "axq" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 9 }, /turf/open/space, -/area/space) +/area/space/nearstation) "axr" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/bot, @@ -11998,7 +11998,7 @@ }, /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/space/nearstation) "azO" = ( /obj/structure/sign/securearea{ pixel_x = -32 @@ -13626,12 +13626,12 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/space/nearstation) "aDl" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "aDm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -13707,7 +13707,7 @@ /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/space, -/area/space) +/area/space/nearstation) "aDx" = ( /obj/structure/sink{ dir = 8; @@ -14218,7 +14218,7 @@ /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/space, -/area/space) +/area/space/nearstation) "aEB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -14587,7 +14587,7 @@ /obj/structure/lattice, /obj/structure/grille/broken, /turf/open/space, -/area/space) +/area/space/nearstation) "aFp" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -16815,7 +16815,7 @@ /area/security/prison) "aJD" = ( /turf/closed/wall, -/area/space) +/area/space/nearstation) "aJE" = ( /obj/machinery/power/solar_control{ dir = 4; @@ -17503,7 +17503,7 @@ /obj/structure/lattice/catwalk, /obj/item/wrench, /turf/open/space, -/area/space) +/area/space/nearstation) "aLc" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall/r_wall, @@ -18325,28 +18325,28 @@ dir = 5 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aMN" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aMO" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aMP" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 10 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aMQ" = ( /obj/structure/table/wood, /obj/item/clothing/glasses/sunglasses, @@ -20396,7 +20396,7 @@ dir = 4 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "aRn" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on, /obj/structure/disposalpipe/segment{ @@ -21302,7 +21302,7 @@ dir = 5 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aSQ" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/general/visible{ @@ -21312,7 +21312,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aSR" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/general/visible{ @@ -21322,7 +21322,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aSS" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/general/visible{ @@ -21332,7 +21332,7 @@ dir = 9 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aST" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/floor/plasteel/vault{ @@ -25683,7 +25683,7 @@ name = "lavaland" }, /turf/open/space, -/area/space) +/area/space/nearstation) "bbA" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/structure/sign/securearea{ @@ -29999,12 +29999,12 @@ "bkE" = ( /obj/structure/window/reinforced, /turf/open/space, -/area/space) +/area/space/nearstation) "bkF" = ( /obj/structure/window/reinforced, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "bkG" = ( /obj/machinery/light/small{ dir = 8 @@ -30910,7 +30910,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bmE" = ( /obj/structure/window/reinforced{ dir = 1; @@ -30951,7 +30951,7 @@ dir = 8 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bmI" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 4; @@ -31142,7 +31142,7 @@ dir = 9 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bne" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/costume, @@ -31650,7 +31650,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bof" = ( /obj/structure/window/reinforced{ dir = 8 @@ -31689,7 +31689,7 @@ dir = 8 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bok" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ @@ -32408,7 +32408,7 @@ }, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "bpG" = ( /obj/structure/window/reinforced{ dir = 1; @@ -32484,7 +32484,7 @@ }, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "bpO" = ( /turf/open/floor/engine/vacuum, /area/engine/atmos) @@ -33518,7 +33518,7 @@ dir = 8 }, /turf/open/space, -/area/space) +/area/space/nearstation) "brM" = ( /obj/structure/window/reinforced{ dir = 1; @@ -33526,14 +33526,14 @@ }, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "brN" = ( /obj/structure/window/reinforced{ dir = 1; layer = 2.9 }, /turf/open/space, -/area/space) +/area/space/nearstation) "brO" = ( /obj/structure/lattice, /obj/structure/window/reinforced{ @@ -33541,7 +33541,7 @@ layer = 2.9 }, /turf/open/space, -/area/space) +/area/space/nearstation) "brP" = ( /obj/structure/lattice, /obj/structure/window/reinforced{ @@ -33550,7 +33550,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/space, -/area/space) +/area/space/nearstation) "brQ" = ( /obj/structure/lattice/catwalk, /obj/structure/window/reinforced{ @@ -33558,7 +33558,7 @@ layer = 2.9 }, /turf/open/space, -/area/space) +/area/space/nearstation) "brR" = ( /obj/structure/lattice, /obj/structure/window/reinforced{ @@ -33567,7 +33567,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/space, -/area/space) +/area/space/nearstation) "brS" = ( /obj/structure/lattice, /obj/structure/window/reinforced{ @@ -33578,7 +33578,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "brT" = ( /obj/machinery/light/small{ dir = 8 @@ -34551,7 +34551,7 @@ dir = 8 }, /turf/open/space, -/area/space) +/area/space/nearstation) "btG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, @@ -34569,7 +34569,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "btK" = ( /obj/machinery/camera{ c_tag = "Atmospherics - Mix Cell"; @@ -35545,7 +35545,7 @@ "bvJ" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/space) +/area/space/nearstation) "bvK" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/delivery, @@ -43955,7 +43955,7 @@ dir = 8 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bLx" = ( /obj/structure/table/reinforced, /obj/item/bodypart/chest/robot, @@ -44989,7 +44989,7 @@ dir = 8 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bNv" = ( /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -45047,7 +45047,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bNC" = ( /obj/structure/window/reinforced{ dir = 8 @@ -45094,7 +45094,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bNG" = ( /obj/structure/lattice/catwalk, /obj/structure/cable/white{ @@ -45104,7 +45104,7 @@ dir = 10 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bNH" = ( /obj/structure/lattice/catwalk, /obj/structure/cable/white{ @@ -45114,7 +45114,7 @@ dir = 6 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bNI" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -46042,7 +46042,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/space, -/area/space) +/area/space/nearstation) "bPL" = ( /obj/machinery/light/small, /obj/structure/sign/vacuum{ @@ -46851,7 +46851,7 @@ dir = 8 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bRy" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/machinery/portable_atmospherics/canister/air, @@ -46989,16 +46989,16 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bRO" = ( /obj/structure/lattice, /obj/structure/window/reinforced, /turf/open/space, -/area/space) +/area/space/nearstation) "bRP" = ( /obj/structure/sign/vacuum, /turf/closed/wall, -/area/space) +/area/space/nearstation) "bRQ" = ( /obj/structure/lattice, /obj/structure/transit_tube/curved/flipped{ @@ -47006,12 +47006,12 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bRR" = ( /obj/structure/lattice, /obj/structure/transit_tube/crossing/horizontal, /turf/open/space, -/area/space) +/area/space/nearstation) "bRS" = ( /obj/structure/lattice, /obj/structure/transit_tube/curved{ @@ -47019,7 +47019,7 @@ dir = 8 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bRT" = ( /obj/structure/lattice/catwalk, /obj/structure/cable/white{ @@ -47029,7 +47029,7 @@ dir = 5 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bRU" = ( /obj/structure/lattice/catwalk, /obj/structure/cable/white{ @@ -47039,7 +47039,7 @@ dir = 9 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bRV" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -47782,7 +47782,7 @@ network = list("SS13") }, /turf/open/space, -/area/space) +/area/space/nearstation) "bTm" = ( /obj/structure/window/reinforced{ dir = 8 @@ -48037,14 +48037,14 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bTK" = ( /obj/structure/lattice/catwalk, /obj/structure/window/reinforced{ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bTL" = ( /obj/structure/window/reinforced{ dir = 8 @@ -49345,14 +49345,14 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bVW" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bVX" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -49363,7 +49363,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bVY" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -49371,7 +49371,7 @@ }, /obj/structure/transit_tube/crossing/horizontal, /turf/open/space, -/area/space) +/area/space/nearstation) "bVZ" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -49379,7 +49379,7 @@ }, /obj/structure/transit_tube/horizontal, /turf/open/space, -/area/space) +/area/space/nearstation) "bWa" = ( /obj/structure/lattice/catwalk, /obj/structure/window/reinforced{ @@ -49393,7 +49393,7 @@ dir = 8 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bWb" = ( /obj/structure/window/reinforced{ dir = 8 @@ -50572,7 +50572,7 @@ /obj/structure/lattice, /obj/structure/transit_tube/diagonal, /turf/open/space, -/area/space) +/area/space/nearstation) "bYn" = ( /obj/structure/window/reinforced{ dir = 8 @@ -51672,7 +51672,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "caq" = ( /obj/structure/lattice, /obj/structure/transit_tube/curved/flipped{ @@ -51680,7 +51680,7 @@ dir = 8 }, /turf/open/space, -/area/space) +/area/space/nearstation) "car" = ( /turf/closed/wall/r_wall, /area/engine/engineering) @@ -53204,7 +53204,7 @@ dir = 4 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "cdC" = ( /turf/open/floor/plating/airless, /area/engine/engineering) @@ -55080,7 +55080,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "chi" = ( /obj/structure/cable/white{ icon_state = "0-2" @@ -55232,7 +55232,7 @@ dir = 8 }, /turf/open/space, -/area/space) +/area/space/nearstation) "cht" = ( /obj/structure/window/reinforced{ dir = 1; @@ -55243,7 +55243,7 @@ layer = 2.9 }, /turf/open/space, -/area/space) +/area/space/nearstation) "chu" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/stripes/line, @@ -55987,21 +55987,21 @@ network = list("Singularity") }, /turf/open/space, -/area/space) +/area/space/nearstation) "ciZ" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ icon_state = "2-4" }, /turf/open/space, -/area/space) +/area/space/nearstation) "cja" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ icon_state = "4-8" }, /turf/open/space, -/area/space) +/area/space/nearstation) "cjb" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -56011,14 +56011,14 @@ icon_state = "4-8" }, /turf/open/space, -/area/space) +/area/space/nearstation) "cjc" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ icon_state = "2-8" }, /turf/open/space, -/area/space) +/area/space/nearstation) "cjd" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -56604,26 +56604,26 @@ icon_state = "1-2" }, /turf/open/space, -/area/space) +/area/space/nearstation) "ckv" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "ckw" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "ckx" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "cky" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -56631,7 +56631,7 @@ }, /obj/machinery/power/tesla_coil, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "ckz" = ( /obj/structure/cable{ icon_state = "1-2" @@ -56640,7 +56640,7 @@ dir = 8 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "ckA" = ( /obj/effect/decal/cleanable/oil, /obj/machinery/door/poddoor/shutters/preopen{ @@ -57256,7 +57256,7 @@ dir = 8 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "clS" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -57265,7 +57265,7 @@ anchored = 1 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "clT" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -57274,7 +57274,7 @@ anchored = 1 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "clU" = ( /obj/structure/cable{ icon_state = "1-2" @@ -57283,7 +57283,7 @@ dir = 4 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "clV" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "engpa"; @@ -58148,7 +58148,7 @@ icon_state = "1-2" }, /turf/open/space, -/area/space) +/area/space/nearstation) "cnB" = ( /obj/structure/cable{ icon_state = "0-8" @@ -58157,7 +58157,7 @@ dir = 8 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "cnC" = ( /obj/structure/sign/radiation, /turf/closed/wall/r_wall, @@ -59373,24 +59373,24 @@ }, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "cqk" = ( /obj/structure/lattice, /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/space, -/area/space) +/area/space/nearstation) "cql" = ( /obj/structure/lattice/catwalk, /obj/structure/window/reinforced, /turf/open/space, -/area/space) +/area/space/nearstation) "cqm" = ( /obj/structure/lattice, /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/space, -/area/space) +/area/space/nearstation) "cqn" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -59399,19 +59399,19 @@ /obj/structure/lattice, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "cqo" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "cqp" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "cqq" = ( /obj/structure/cable{ icon_state = "1-2" @@ -59941,7 +59941,7 @@ pixel_y = 32 }, /turf/open/space, -/area/space) +/area/space/nearstation) "crE" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -59991,17 +59991,17 @@ }, /obj/machinery/power/tesla_coil, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "crJ" = ( /obj/item/wrench, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "crK" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "crL" = ( /obj/structure/cable{ icon_state = "1-4" @@ -60013,7 +60013,7 @@ dir = 4 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "crM" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -60800,17 +60800,17 @@ dir = 10 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "ctn" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "cto" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "ctp" = ( /obj/item/wrench, /turf/open/floor/plating, @@ -62850,7 +62850,7 @@ anchored = 1 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "cxB" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -62859,7 +62859,7 @@ anchored = 1 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "cxC" = ( /obj/machinery/power/rad_collector/anchored, /obj/machinery/power/rad_collector/anchored, @@ -63701,14 +63701,14 @@ dir = 1 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "czp" = ( /obj/structure/cable{ icon_state = "0-2" }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "czq" = ( /obj/structure/cable{ icon_state = "0-2" @@ -63716,14 +63716,14 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/power/tesla_coil, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "czr" = ( /obj/structure/cable{ icon_state = "1-2" }, /obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "czs" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "engpa"; @@ -64337,14 +64337,14 @@ network = list("Singularity") }, /turf/open/space, -/area/space) +/area/space/nearstation) "cAH" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ icon_state = "1-4" }, /turf/open/space, -/area/space) +/area/space/nearstation) "cAI" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -64354,14 +64354,14 @@ icon_state = "4-8" }, /turf/open/space, -/area/space) +/area/space/nearstation) "cAJ" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ icon_state = "1-8" }, /turf/open/space, -/area/space) +/area/space/nearstation) "cAK" = ( /obj/machinery/power/rad_collector/anchored, /obj/effect/decal/cleanable/dirt, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 60bda8f631..e8267edb99 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -14,7 +14,7 @@ width = 18 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aac" = ( /obj/effect/landmark/carpspawn, /turf/open/space, @@ -22,12 +22,12 @@ "aaf" = ( /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "aag" = ( /obj/structure/grille, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "aah" = ( /obj/structure/cable{ icon_state = "0-2" @@ -39,11 +39,11 @@ /obj/structure/grille/broken, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "aaj" = ( /obj/structure/grille, /turf/open/space, -/area/space) +/area/space/nearstation) "aak" = ( /obj/structure/cable{ icon_state = "1-2" @@ -831,7 +831,7 @@ "ack" = ( /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/space/nearstation) "acl" = ( /obj/structure/cable, /obj/machinery/power/solar{ @@ -1565,7 +1565,7 @@ network = list("SS13") }, /turf/open/space, -/area/space) +/area/space/nearstation) "adE" = ( /turf/open/floor/plating, /area/crew_quarters/fitness/recreation) @@ -1588,7 +1588,7 @@ name = "lavaland" }, /turf/open/space, -/area/space) +/area/space/nearstation) "adH" = ( /obj/structure/chair{ dir = 1 @@ -6517,12 +6517,12 @@ /area/engine/gravity_generator) "anS" = ( /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "anT" = ( /obj/structure/lattice, /obj/structure/grille, /turf/open/space, -/area/space) +/area/space/nearstation) "anU" = ( /obj/structure/disposalpipe/trunk{ dir = 4 @@ -7271,7 +7271,7 @@ "apq" = ( /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "apr" = ( /obj/machinery/navbeacon{ codes_txt = "delivery;dir=1"; @@ -7814,7 +7814,7 @@ /obj/structure/lattice, /obj/structure/grille/broken, /turf/open/space, -/area/space) +/area/space/nearstation) "aqC" = ( /obj/machinery/space_heater, /obj/structure/sign/securearea{ @@ -9778,7 +9778,7 @@ opened = 1 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "auD" = ( /obj/structure/closet/crate{ icon_state = "crateopen"; @@ -10377,7 +10377,7 @@ pixel_y = 2 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "avJ" = ( /obj/machinery/door/airlock/external, /turf/open/floor/plating, @@ -11563,7 +11563,7 @@ }, /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/space/nearstation) "ayf" = ( /obj/structure/closet/crate, /obj/item/stack/sheet/glass{ @@ -11571,7 +11571,7 @@ }, /obj/item/stack/rods, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "ayg" = ( /obj/structure/table, /turf/open/floor/mineral/titanium/blue, @@ -11972,7 +11972,7 @@ }, /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/space/nearstation) "aze" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" @@ -11983,7 +11983,7 @@ "azg" = ( /obj/item/stack/cable_coil, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "azh" = ( /turf/open/floor/mineral/titanium/blue, /area/shuttle/mining) @@ -17966,7 +17966,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aLp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -18032,7 +18032,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aLx" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -18339,12 +18339,12 @@ "aMq" = ( /obj/structure/window/reinforced, /turf/open/space, -/area/space) +/area/space/nearstation) "aMr" = ( /obj/structure/window/reinforced, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "aMs" = ( /obj/machinery/door/airlock/external{ name = "Supply Dock Airlock"; @@ -18805,7 +18805,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aNx" = ( /obj/structure/window/reinforced{ dir = 1; @@ -18856,7 +18856,7 @@ }, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "aND" = ( /obj/effect/spawner/structure/window/shuttle, /turf/open/floor/plating, @@ -19530,14 +19530,14 @@ pixel_y = 1 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aOV" = ( /obj/structure/window/reinforced{ dir = 1; pixel_y = 1 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aOW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/lattice/catwalk, @@ -19552,13 +19552,13 @@ pixel_y = 1 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aOY" = ( /obj/structure/window/reinforced{ dir = 8 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aOZ" = ( /turf/closed/wall/mineral/titanium, /area/shuttle/pod_1) @@ -21265,7 +21265,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aSE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 @@ -21284,7 +21284,7 @@ }, /obj/structure/window/reinforced, /turf/open/space, -/area/space) +/area/space/nearstation) "aSH" = ( /obj/structure/chair{ dir = 4 @@ -21848,7 +21848,7 @@ }, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "aTR" = ( /obj/structure/window/reinforced{ dir = 1; @@ -22522,7 +22522,7 @@ dir = 8 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aVl" = ( /obj/machinery/porta_turret/ai{ dir = 4 @@ -23154,7 +23154,7 @@ dir = 10 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aWL" = ( /obj/machinery/ai_status_display{ pixel_x = -32 @@ -24066,7 +24066,7 @@ }, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "aYy" = ( /obj/machinery/camera{ c_tag = "AI Chamber - Port"; @@ -26323,7 +26323,7 @@ dir = 8 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bcS" = ( /turf/closed/wall/mineral/titanium, /area/shuttle/arrival) @@ -27059,7 +27059,7 @@ name = "EXTERNAL AIRLOCK" }, /turf/closed/wall/r_wall, -/area/space) +/area/space/nearstation) "bes" = ( /obj/structure/window/reinforced{ dir = 8 @@ -27951,7 +27951,7 @@ layer = 2.9 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bgo" = ( /obj/structure/window/reinforced{ dir = 4 @@ -27961,7 +27961,7 @@ layer = 2.9 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bgq" = ( /obj/structure/chair, /turf/open/floor/mineral/titanium/blue, @@ -28956,7 +28956,7 @@ name = "lavaland" }, /turf/open/space, -/area/space) +/area/space/nearstation) "bij" = ( /obj/effect/spawner/structure/window/shuttle, /turf/open/floor/plating, @@ -30575,28 +30575,28 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "blv" = ( /obj/structure/lattice, /obj/structure/transit_tube/crossing/horizontal, /turf/open/space, -/area/space) +/area/space/nearstation) "blw" = ( /obj/structure/transit_tube/curved{ dir = 8 }, /turf/open/space, -/area/space) +/area/space/nearstation) "blx" = ( /turf/closed/wall, -/area/space) +/area/space/nearstation) "bly" = ( /obj/structure/window/reinforced{ dir = 4 }, /obj/structure/window/reinforced, /turf/open/space, -/area/space) +/area/space/nearstation) "blA" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on, /obj/structure/window/reinforced, @@ -31479,7 +31479,7 @@ "bno" = ( /obj/structure/transit_tube/diagonal, /turf/open/space, -/area/space) +/area/space/nearstation) "bnp" = ( /obj/structure/window/reinforced{ dir = 1; @@ -32502,7 +32502,7 @@ /area/security/checkpoint/customs) "bpu" = ( /turf/closed/wall/r_wall, -/area/space) +/area/space/nearstation) "bpv" = ( /obj/structure/sign/securearea{ pixel_y = 32 @@ -32527,7 +32527,7 @@ }, /obj/structure/transit_tube/horizontal, /turf/open/space, -/area/space) +/area/space/nearstation) "bpx" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -32538,7 +32538,7 @@ }, /obj/structure/transit_tube/crossing/horizontal, /turf/open/space, -/area/space) +/area/space/nearstation) "bpy" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -32549,7 +32549,7 @@ }, /obj/structure/transit_tube/horizontal, /turf/open/space, -/area/space) +/area/space/nearstation) "bpz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -32562,7 +32562,7 @@ dir = 8 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bpA" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -32572,7 +32572,7 @@ icon_state = "4-8" }, /turf/open/space, -/area/space) +/area/space/nearstation) "bpB" = ( /obj/structure/window/reinforced{ dir = 4 @@ -32585,7 +32585,7 @@ icon_state = "4-8" }, /turf/open/space, -/area/space) +/area/space/nearstation) "bpC" = ( /obj/structure/window/reinforced{ dir = 8 @@ -33787,7 +33787,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "brN" = ( /obj/structure/window/reinforced{ dir = 4 @@ -33812,7 +33812,7 @@ "brO" = ( /obj/structure/transit_tube/diagonal/topleft, /turf/open/space, -/area/space) +/area/space/nearstation) "brP" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -34080,7 +34080,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bsk" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -34823,14 +34823,14 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "btJ" = ( /obj/structure/lattice, /obj/structure/transit_tube/curved/flipped{ dir = 8 }, /turf/open/space, -/area/space) +/area/space/nearstation) "btK" = ( /obj/structure/window/reinforced{ dir = 1; @@ -34838,7 +34838,7 @@ }, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "btL" = ( /turf/closed/wall/r_wall, /area/tcommsat/computer) @@ -37456,12 +37456,12 @@ /obj/structure/lattice, /obj/structure/grille, /turf/closed/wall/r_wall, -/area/space) +/area/space/nearstation) "bzj" = ( /obj/structure/grille, /obj/structure/lattice, /turf/closed/wall/r_wall, -/area/space) +/area/space/nearstation) "bzk" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -38201,7 +38201,7 @@ }, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "bAT" = ( /obj/structure/window/reinforced{ dir = 4 @@ -38211,7 +38211,7 @@ pixel_y = 2 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bAU" = ( /obj/machinery/microwave{ pixel_y = 4 @@ -38290,7 +38290,7 @@ }, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "bBc" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/bot, @@ -38961,7 +38961,7 @@ }, /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/space, -/area/space) +/area/space/nearstation) "bCA" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/yellow/visible{ @@ -40713,7 +40713,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bFZ" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/green/visible{ @@ -42024,7 +42024,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bJc" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ dir = 8; @@ -42043,13 +42043,13 @@ /obj/structure/lattice, /obj/structure/lattice, /turf/closed/wall/r_wall, -/area/space) +/area/space/nearstation) "bJf" = ( /obj/structure/lattice, /obj/structure/grille, /obj/structure/lattice, /turf/closed/wall/r_wall, -/area/space) +/area/space/nearstation) "bJg" = ( /obj/machinery/message_server, /turf/open/floor/circuit/telecomms/mainframe, @@ -42097,7 +42097,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bJm" = ( /obj/machinery/telecomms/bus/preset_two, /turf/open/floor/circuit/telecomms/mainframe, @@ -42780,7 +42780,7 @@ /obj/structure/lattice, /obj/structure/lattice, /turf/closed/wall/r_wall, -/area/space) +/area/space/nearstation) "bKL" = ( /obj/machinery/telecomms/processor/preset_two, /turf/open/floor/circuit/telecomms/mainframe, @@ -52815,31 +52815,31 @@ /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/green/visible, /turf/open/space, -/area/space) +/area/space/nearstation) "cfv" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/yellow/visible, /turf/open/space, -/area/space) +/area/space/nearstation) "cfw" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/manifold/yellow/visible{ dir = 8 }, /turf/open/space, -/area/space) +/area/space/nearstation) "cfx" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 9 }, /turf/open/space, -/area/space) +/area/space/nearstation) "cfy" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/space, -/area/space) +/area/space/nearstation) "cfz" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -55926,7 +55926,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/general/visible, /turf/open/space, -/area/space) +/area/space/nearstation) "cmd" = ( /obj/machinery/door/airlock/glass{ autoclose = 0; @@ -57794,7 +57794,7 @@ dir = 5 }, /turf/open/space, -/area/space) +/area/space/nearstation) "cpN" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 8 @@ -57812,7 +57812,7 @@ /obj/structure/lattice/catwalk, /obj/item/wrench, /turf/open/space, -/area/space) +/area/space/nearstation) "cpQ" = ( /obj/structure/chair/stool, /turf/open/floor/wood{ @@ -58490,7 +58490,7 @@ dir = 5 }, /turf/open/space, -/area/space) +/area/space/nearstation) "crd" = ( /obj/structure/disposaloutlet{ dir = 2 @@ -58500,7 +58500,7 @@ }, /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/space/nearstation) "cre" = ( /obj/structure/sign/fire, /turf/closed/wall/r_wall, @@ -59645,11 +59645,11 @@ use_power = 0 }, /turf/open/space, -/area/space) +/area/space/nearstation) "ctm" = ( /obj/structure/grille/broken, /turf/open/space, -/area/space) +/area/space/nearstation) "ctn" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -61056,14 +61056,14 @@ }, /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/space/nearstation) "cwg" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/space/nearstation) "cwh" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -64633,7 +64633,7 @@ dir = 8 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "cDv" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -65254,7 +65254,7 @@ "cEA" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/space) +/area/space/nearstation) "cEB" = ( /obj/structure/chair{ dir = 4 @@ -67372,7 +67372,7 @@ pixel_x = -32 }, /turf/open/space, -/area/space) +/area/space/nearstation) "cIz" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -67667,7 +67667,7 @@ }, /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/space/nearstation) "cJg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/item/bedsheet/medical, @@ -69292,13 +69292,13 @@ dir = 6 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "cMu" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "cMv" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -69802,7 +69802,7 @@ dir = 1 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "cNs" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 1 @@ -72217,7 +72217,7 @@ name = "lavaland" }, /turf/open/space, -/area/space) +/area/space/nearstation) "cSQ" = ( /obj/machinery/door/window/northleft{ dir = 4; @@ -72669,7 +72669,7 @@ width = 18 }, /turf/open/space, -/area/space) +/area/space/nearstation) "cUH" = ( /obj/structure/table/optable, /turf/open/floor/plasteel/white, @@ -72681,7 +72681,7 @@ name = "lavaland" }, /turf/open/space, -/area/space) +/area/space/nearstation) "cUM" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -75797,7 +75797,7 @@ width = 18 }, /turf/open/space, -/area/space) +/area/space/nearstation) "dbC" = ( /obj/docking_port/stationary{ dheight = 9; @@ -75810,7 +75810,7 @@ width = 18 }, /turf/open/space, -/area/space) +/area/space/nearstation) "dbD" = ( /obj/docking_port/stationary{ dheight = 9; @@ -75823,7 +75823,7 @@ width = 18 }, /turf/open/space, -/area/space) +/area/space/nearstation) "dbE" = ( /obj/machinery/plantgenes, /obj/effect/turf_decal/stripes/line{ @@ -77736,32 +77736,32 @@ "dgd" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /turf/open/space, -/area/space) +/area/space/nearstation) "dge" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/space/nearstation) "dgf" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 6 }, /turf/open/space, -/area/space) +/area/space/nearstation) "dgg" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 6 }, /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/space/nearstation) "dgh" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 6 }, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "dgi" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/floor/plating, @@ -77772,7 +77772,7 @@ }, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "dgk" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -77780,7 +77780,7 @@ }, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "dgm" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 @@ -77788,7 +77788,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "dgo" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 @@ -77808,33 +77808,33 @@ dir = 10 }, /turf/open/space, -/area/space) +/area/space/nearstation) "dgt" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "dgu" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /turf/open/space, -/area/space) +/area/space/nearstation) "dgv" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 9 }, /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/space/nearstation) "dgw" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/space, -/area/space) +/area/space/nearstation) "dgz" = ( /obj/structure/closet/toolcloset, /obj/effect/turf_decal/delivery, @@ -77845,49 +77845,49 @@ /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/space, -/area/space) +/area/space/nearstation) "dgB" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 5 }, /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/space/nearstation) "dgI" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 5 }, /turf/open/space, -/area/space) +/area/space/nearstation) "dgJ" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "dgK" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "dgM" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 10 }, /turf/open/space, -/area/space) +/area/space/nearstation) "dgN" = ( /obj/structure/lattice, /obj/structure/grille, /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/space, -/area/space) +/area/space/nearstation) "dgO" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/space, -/area/space) +/area/space/nearstation) "dgS" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -77899,7 +77899,7 @@ /obj/structure/transit_tube/horizontal, /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/space, -/area/space) +/area/space/nearstation) "dha" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/green/visible{ @@ -77907,7 +77907,7 @@ }, /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/space, -/area/space) +/area/space/nearstation) "dhc" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/yellow/visible{ @@ -77915,7 +77915,7 @@ }, /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/space, -/area/space) +/area/space/nearstation) "dhe" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 10 @@ -77970,7 +77970,7 @@ dir = 9 }, /turf/open/space, -/area/space) +/area/space/nearstation) "dhn" = ( /obj/structure/table, /obj/item/poster/random_contraband, @@ -80613,35 +80613,35 @@ width = 18 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "EDb" = ( /obj/structure/grille, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "EDc" = ( /obj/structure/grille, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "EDd" = ( /obj/structure/grille, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "EDe" = ( /obj/structure/grille, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "EDf" = ( /obj/structure/grille, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "EDg" = ( /obj/structure/grille, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "EDh" = ( /obj/structure/grille, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "EDi" = ( /obj/docking_port/mobile{ callTime = 250; diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 84befb0baf..d449da13dc 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -19,17 +19,17 @@ "aae" = ( /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "aaf" = ( /obj/structure/lattice, /obj/structure/grille, /turf/open/space, -/area/space) +/area/space/nearstation) "aag" = ( /obj/structure/lattice, /obj/structure/grille/broken, /turf/open/space, -/area/space) +/area/space/nearstation) "aah" = ( /obj/structure/sign/securearea, /turf/closed/wall, @@ -34034,7 +34034,7 @@ width = 18 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "sws" = ( /obj/docking_port/stationary{ dheight = 9; @@ -34047,7 +34047,22 @@ width = 18 }, /turf/open/space, +<<<<<<< HEAD /area/space) +======= +/area/space/nearstation) +"swt" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/rnd/protolathe/department/service, +/turf/open/floor/plasteel/redyellow, +/area/crew_quarters/bar/atrium) +"swu" = ( +/obj/machinery/rnd/protolathe/department/medical, +/turf/closed/wall, +/area/medical/medbay/zone3) +>>>>>>> e7197ec... Nearstation fixes (#32931) (1,1,1) = {" aaa diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 9a015e9a32..96b543b37a 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -14,16 +14,16 @@ width = 18 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aby" = ( /obj/structure/lattice, /obj/structure/grille, /turf/open/space, -/area/space) +/area/space/nearstation) "abI" = ( /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "abJ" = ( /obj/structure/lattice, /obj/machinery/camera/motion{ @@ -32,7 +32,7 @@ network = list("MiniSat") }, /turf/open/space, -/area/space) +/area/space/nearstation) "abN" = ( /obj/effect/landmark/carpspawn, /turf/open/space, @@ -176,7 +176,7 @@ network = list("MiniSat") }, /turf/open/space, -/area/space) +/area/space/nearstation) "acn" = ( /obj/machinery/porta_turret/ai{ dir = 4 @@ -268,7 +268,7 @@ network = list("MiniSat") }, /turf/open/space, -/area/space) +/area/space/nearstation) "acw" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -435,11 +435,11 @@ /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/space, -/area/space) +/area/space/nearstation) "acO" = ( /obj/structure/grille/broken, /turf/open/space, -/area/space) +/area/space/nearstation) "acP" = ( /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/AIsatextAP) @@ -827,7 +827,7 @@ /obj/structure/grille, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "adS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, @@ -904,7 +904,7 @@ /obj/structure/lattice, /obj/structure/grille/broken, /turf/open/space, -/area/space) +/area/space/nearstation) "aee" = ( /turf/open/floor/plating, /area/ai_monitored/turret_protected/AIsatextAP) @@ -1528,7 +1528,7 @@ "afJ" = ( /obj/effect/landmark/carpspawn, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "afK" = ( /obj/machinery/atmospherics/components/unary/tank/air{ dir = 1 @@ -1998,7 +1998,7 @@ /obj/structure/transit_tube, /obj/structure/lattice/catwalk, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "agT" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -2088,11 +2088,11 @@ pixel_y = 20 }, /turf/open/space, -/area/space) +/area/space/nearstation) "ahi" = ( /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/space/nearstation) "ahj" = ( /obj/item/device/radio/intercom{ freerange = 0; @@ -2177,16 +2177,16 @@ network = list("MiniSat") }, /turf/open/space, -/area/space) +/area/space/nearstation) "ahs" = ( /obj/structure/lattice/catwalk, /obj/structure/transit_tube, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "aht" = ( /obj/structure/lattice, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "ahu" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -2421,7 +2421,7 @@ /obj/structure/lattice/catwalk, /obj/structure/transit_tube/crossing, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "ahS" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -3146,7 +3146,7 @@ width = 18 }, /turf/open/space, -/area/space) +/area/space/nearstation) "ajB" = ( /obj/item/storage/box/mousetraps, /turf/open/floor/plating, @@ -3831,7 +3831,7 @@ }, /obj/structure/lattice/catwalk, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "alb" = ( /turf/open/floor/wood, /area/maintenance/department/crew_quarters/dorms) @@ -4118,7 +4118,7 @@ /obj/structure/transit_tube/diagonal, /obj/structure/lattice, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "alP" = ( /turf/open/floor/plating{ burnt = 1; @@ -4482,17 +4482,17 @@ }, /obj/structure/lattice/catwalk, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "amB" = ( /obj/structure/transit_tube/crossing/horizontal, /obj/structure/lattice/catwalk, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "amC" = ( /obj/structure/transit_tube/horizontal, /obj/structure/lattice/catwalk, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "amD" = ( /obj/structure/transit_tube/curved/flipped{ icon_state = "curved1"; @@ -4500,7 +4500,7 @@ }, /obj/structure/lattice/catwalk, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "amF" = ( /turf/open/floor/wood{ broken = 1; @@ -4760,7 +4760,7 @@ "anl" = ( /obj/structure/transit_tube/diagonal, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "anm" = ( /obj/machinery/door/airlock/maintenance/abandoned{ name = "Pete's Speakeasy"; @@ -5628,14 +5628,14 @@ /obj/structure/transit_tube/diagonal/crossing, /obj/structure/lattice, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "app" = ( /obj/machinery/camera{ c_tag = "Bridge Starboard Exterior"; dir = 1 }, /turf/open/space, -/area/space) +/area/space/nearstation) "apq" = ( /obj/machinery/gateway{ dir = 8 @@ -5866,7 +5866,7 @@ /obj/structure/transit_tube/curved, /obj/structure/lattice/catwalk, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "apT" = ( /turf/closed/wall/r_wall, /area/ai_monitored/nuke_storage) @@ -6160,7 +6160,7 @@ /obj/structure/window/reinforced, /obj/structure/lattice, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "aqH" = ( /obj/structure/cable{ icon_state = "2-4" @@ -6570,7 +6570,7 @@ }, /obj/structure/lattice, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "arG" = ( /obj/structure/cable{ icon_state = "1-2" @@ -12856,7 +12856,7 @@ pixel_y = 32 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aGp" = ( /obj/structure/lattice, /obj/structure/sign/logo{ @@ -12864,7 +12864,7 @@ pixel_y = 32 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aGq" = ( /obj/structure/lattice, /obj/structure/sign/logo{ @@ -12872,7 +12872,7 @@ pixel_y = 32 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aGr" = ( /obj/structure/lattice, /obj/structure/sign/logo{ @@ -12880,7 +12880,7 @@ pixel_y = 32 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aGs" = ( /obj/structure/lattice, /obj/structure/sign/logo{ @@ -12888,7 +12888,7 @@ pixel_y = 32 }, /turf/open/space, -/area/space) +/area/space/nearstation) "aGt" = ( /obj/machinery/vending/cola, /obj/effect/turf_decal/delivery, @@ -25481,7 +25481,7 @@ }, /obj/structure/lattice, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "bkF" = ( /turf/closed/wall/r_wall, /area/science/xenobiology) @@ -30667,7 +30667,7 @@ dir = 8 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "bwp" = ( /obj/machinery/door/airlock/external, /turf/open/floor/pod/light, @@ -32318,7 +32318,7 @@ "bzy" = ( /obj/structure/grille, /turf/open/space, -/area/space) +/area/space/nearstation) "bzz" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/chair{ @@ -32827,7 +32827,7 @@ dir = 4 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "bAJ" = ( /obj/structure/transit_tube/horizontal, /obj/structure/window/reinforced/fulltile, @@ -33368,7 +33368,7 @@ "bBV" = ( /obj/structure/transit_tube/curved, /turf/open/space, -/area/space) +/area/space/nearstation) "bBW" = ( /turf/open/space, /area/space) @@ -33897,7 +33897,7 @@ /obj/structure/transit_tube, /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/space/nearstation) "bDg" = ( /obj/machinery/atmospherics/components/unary/tank/air{ dir = 2 @@ -35063,7 +35063,7 @@ width = 5 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bFF" = ( /obj/machinery/atmospherics/components/unary/tank/air{ dir = 1 @@ -35476,7 +35476,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bGE" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -35501,11 +35501,11 @@ "bGH" = ( /obj/structure/window/reinforced, /turf/open/space, -/area/space) +/area/space/nearstation) "bGI" = ( /obj/structure/window/reinforced, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "bGK" = ( /obj/structure/closet/boxinggloves, /turf/open/floor/plating{ @@ -35962,7 +35962,7 @@ "bHI" = ( /obj/structure/grille/broken, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "bHJ" = ( /turf/open/floor/plating, /area/chapel/dock) @@ -35990,7 +35990,7 @@ layer = 2.9 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "bHP" = ( /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plasteel/dark, @@ -36464,7 +36464,7 @@ layer = 2.9 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "bIU" = ( /obj/effect/spawner/structure/window/reinforced, /turf/closed/wall, @@ -36501,7 +36501,7 @@ layer = 2.9 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "bIZ" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -36945,7 +36945,7 @@ }, /obj/structure/lattice, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "bKa" = ( /obj/machinery/airalarm{ dir = 4; @@ -37364,7 +37364,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bLb" = ( /obj/machinery/atmospherics/pipe/simple{ dir = 4 @@ -37516,7 +37516,7 @@ layer = 2.9 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bLt" = ( /obj/effect/decal/cleanable/oil{ icon_state = "floor6" @@ -37936,7 +37936,7 @@ layer = 2.9 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "bMs" = ( /obj/structure/cable{ icon_state = "1-2" @@ -37993,7 +37993,7 @@ }, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "bMA" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/engine, @@ -38281,7 +38281,7 @@ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bNo" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 8; @@ -38305,7 +38305,7 @@ /obj/structure/window/reinforced, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "bNs" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating/airless, @@ -38388,7 +38388,7 @@ }, /obj/structure/lattice/catwalk, /turf/open/space, -/area/space) +/area/space/nearstation) "bNF" = ( /obj/item/stack/medical/bruise_pack, /turf/open/floor/plasteel/dark, @@ -38719,7 +38719,7 @@ }, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "bOw" = ( /turf/open/floor/plating/asteroid, /area/chapel/asteroid{ @@ -39010,21 +39010,21 @@ }, /obj/structure/lattice, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "bPk" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bPl" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 9 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bPm" = ( /obj/structure/lattice/catwalk, /turf/open/space, @@ -39095,21 +39095,21 @@ /obj/machinery/atmospherics/pipe/manifold/cyan/hidden, /obj/structure/lattice, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "bPw" = ( /obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ dir = 1 }, /obj/structure/lattice, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "bPx" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, /obj/structure/lattice, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "bPy" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 @@ -39117,14 +39117,14 @@ /obj/structure/lattice, /obj/structure/disposalpipe/segment, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "bPz" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 9 }, /obj/structure/lattice, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "bPA" = ( /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, @@ -39354,7 +39354,7 @@ }, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "bQj" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -39661,14 +39661,14 @@ }, /obj/structure/window/reinforced, /turf/open/space, -/area/space) +/area/space/nearstation) "bQR" = ( /obj/structure/window/reinforced{ dir = 8 }, /obj/structure/window/reinforced, /turf/open/space, -/area/space) +/area/space/nearstation) "bQS" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/maintenance, @@ -40003,7 +40003,7 @@ /obj/structure/window/reinforced, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "bRD" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating, @@ -40297,7 +40297,7 @@ dir = 8 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bSo" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -40592,20 +40592,20 @@ dir = 8 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bTa" = ( /obj/structure/disposalpipe/segment{ dir = 6 }, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "bTb" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "bTc" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment{ @@ -41019,7 +41019,7 @@ /obj/structure/disposalpipe/segment, /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "bTX" = ( /obj/structure/table, /obj/item/storage/box/mousetraps, @@ -41248,7 +41248,7 @@ dir = 10 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bUB" = ( /obj/docking_port/stationary{ dheight = 9; @@ -41261,7 +41261,7 @@ width = 18 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bUC" = ( /obj/structure/flora/ausbushes/fernybush, /turf/open/floor/plating/asteroid, @@ -41274,14 +41274,14 @@ dir = 6 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bUE" = ( /obj/structure/lattice, /obj/structure/disposalpipe/segment{ dir = 9 }, /turf/open/space, -/area/space) +/area/space/nearstation) "bUF" = ( /obj/structure/table, /obj/item/stack/cable_coil, @@ -41612,7 +41612,7 @@ }, /obj/machinery/atmospherics/pipe/simple/purple/visible, /turf/open/space, -/area/space) +/area/space/nearstation) "bVn" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ dir = 8; @@ -41630,11 +41630,11 @@ dir = 4 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "bVr" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "bVs" = ( /obj/structure/mopbucket, /obj/item/mop, @@ -41989,7 +41989,7 @@ /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/purple/visible, /turf/open/space, -/area/space) +/area/space/nearstation) "bWe" = ( /obj/machinery/air_sensor{ frequency = 1441; @@ -42356,7 +42356,7 @@ }, /obj/machinery/atmospherics/pipe/simple/purple/visible, /turf/open/space, -/area/space) +/area/space/nearstation) "bWT" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 8; @@ -42874,7 +42874,7 @@ /obj/machinery/atmospherics/pipe/simple/purple/visible, /obj/structure/lattice, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "bYz" = ( /obj/machinery/door/morgue{ name = "Confession Booth" @@ -43246,12 +43246,12 @@ /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/green/visible, /turf/open/space, -/area/space) +/area/space/nearstation) "bZe" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/space, -/area/space) +/area/space/nearstation) "bZf" = ( /obj/machinery/power/apc{ dir = 8; @@ -44760,7 +44760,7 @@ "cdm" = ( /obj/structure/lattice/catwalk, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "cdo" = ( /turf/open/floor/carpet, /area/chapel/office) @@ -45869,7 +45869,7 @@ "cgP" = ( /obj/structure/transit_tube, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "cgQ" = ( /obj/machinery/light/small{ dir = 8 @@ -45924,10 +45924,10 @@ /area/space/nearstation) "cgW" = ( /turf/open/space, -/area/space/nearstation) +/area/space) "cgX" = ( /turf/open/space/basic, -/area/space/nearstation) +/area/space) "cgY" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -46292,7 +46292,7 @@ "cig" = ( /obj/structure/transit_tube/crossing, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "cih" = ( /obj/structure/cable{ icon_state = "1-2" @@ -47257,7 +47257,7 @@ width = 18 }, /turf/open/space, -/area/space) +/area/space/nearstation) "clu" = ( /obj/machinery/camera{ c_tag = "Telecomms External Fore"; @@ -47266,7 +47266,7 @@ start_active = 1 }, /turf/open/space, -/area/space) +/area/space/nearstation) "clv" = ( /turf/closed/mineral/iron, /area/mine/explored{ @@ -47287,7 +47287,7 @@ dir = 10 }, /turf/open/space, -/area/space) +/area/space/nearstation) "clz" = ( /obj/machinery/door/airlock/external{ cyclelinkeddir = 2; @@ -47646,7 +47646,7 @@ network = list("Telecomms") }, /turf/open/space, -/area/space) +/area/space/nearstation) "cmu" = ( /obj/machinery/status_display{ pixel_x = -32 @@ -47708,7 +47708,7 @@ network = list("Telecomms") }, /turf/open/space, -/area/space) +/area/space/nearstation) "cmA" = ( /obj/structure/cable{ icon_state = "1-2" @@ -47974,7 +47974,7 @@ network = list("Telecomms") }, /turf/open/space, -/area/space) +/area/space/nearstation) "cnz" = ( /obj/structure/lattice, /obj/machinery/camera/motion{ @@ -47983,7 +47983,7 @@ network = list("Telecomms") }, /turf/open/space, -/area/space) +/area/space/nearstation) "cnA" = ( /obj/docking_port/stationary{ dheight = 9; @@ -47996,7 +47996,7 @@ width = 18 }, /turf/open/space, -/area/space) +/area/space/nearstation) "cnC" = ( /obj/machinery/turretid{ control_area = "/area/ai_monitored/turret_protected/aisat_interior"; @@ -48802,14 +48802,14 @@ "cqS" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "cqU" = ( /obj/structure/window/reinforced{ dir = 4 }, /obj/structure/window/reinforced, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "cqV" = ( /obj/structure/chair/office/light{ dir = 1 @@ -48830,7 +48830,7 @@ /obj/structure/disposalpipe/segment, /obj/structure/lattice, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "crb" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating/airless, @@ -48841,7 +48841,7 @@ dir = 8 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "crg" = ( /obj/structure/chair/wood/normal, /turf/open/floor/plasteel/dark, @@ -48884,7 +48884,7 @@ /obj/structure/lattice, /obj/structure/disposalpipe/segment, /turf/open/space, -/area/space) +/area/space/nearstation) "crt" = ( /obj/structure/table/wood/fancy, /obj/item/folder, @@ -48910,7 +48910,7 @@ dir = 5 }, /turf/open/space, -/area/space) +/area/space/nearstation) "crz" = ( /obj/machinery/door/airlock/external{ cyclelinkeddir = 4; @@ -49029,7 +49029,7 @@ dir = 8 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "crS" = ( /obj/machinery/airalarm{ frequency = 1439; @@ -49486,7 +49486,7 @@ dir = 1 }, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "ctV" = ( /obj/structure/closet, /obj/item/clothing/suit/holidaypriest, @@ -50302,7 +50302,7 @@ layer = 2.9 }, /turf/open/space, -/area/space) +/area/space/nearstation) "cwO" = ( /obj/item/device/flashlight/lantern, /turf/open/floor/plasteel/dark, @@ -50313,7 +50313,7 @@ layer = 2.9 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "cwS" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, @@ -50335,7 +50335,7 @@ pixel_y = 1 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "cxh" = ( /obj/structure/window/reinforced{ dir = 1; @@ -50346,7 +50346,7 @@ layer = 2.9 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "cxk" = ( /obj/structure/window/reinforced{ dir = 1; @@ -50357,7 +50357,7 @@ layer = 2.9 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "cxn" = ( /obj/machinery/newscaster{ pixel_x = -32; @@ -51114,7 +51114,7 @@ width = 18 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "cBP" = ( /obj/machinery/smoke_machine, /turf/open/floor/plasteel/white, diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm index 0872c7dbaa..4692a11ef3 100644 --- a/_maps/map_files/debug/runtimestation.dmm +++ b/_maps/map_files/debug/runtimestation.dmm @@ -5,10 +5,10 @@ "ab" = ( /obj/structure/lattice, /turf/open/space, -/area/space) +/area/space/nearstation) "ac" = ( /turf/open/space, -/area/space/nearstation) +/area/space) "ad" = ( /turf/closed/wall/r_wall, /area/maintenance/department/bridge) diff --git a/_maps/shuttles/emergency_asteroid.dmm b/_maps/shuttles/emergency_asteroid.dmm index 14252f3e0f..1a15338675 100644 --- a/_maps/shuttles/emergency_asteroid.dmm +++ b/_maps/shuttles/emergency_asteroid.dmm @@ -24,7 +24,7 @@ /area/shuttle/escape) "ag" = ( /turf/open/space, -/area/space/nearstation) +/area/space) "ah" = ( /obj/effect/spawner/structure/window/shuttle, /turf/open/floor/plating, From 5d5d4451a93ddd93c14742f274fff73e407c7d91 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Tue, 21 Nov 2017 14:35:43 -0500 Subject: [PATCH 2/2] fixes merge conflicts --- _maps/map_files/BoxStation/BoxStation.dmm | 164 +++--------------- _maps/map_files/OmegaStation/OmegaStation.dmm | 15 -- 2 files changed, 28 insertions(+), 151 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index b8aabe0645..5e36e72d0d 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -10466,7 +10466,6 @@ /turf/closed/wall, /area/maintenance/port/fore) "azH" = ( -<<<<<<< HEAD /obj/machinery/power/apc{ areastring = "/area/maintenance/bar/cafe"; dir = 1; @@ -10490,17 +10489,6 @@ icon_state = "wood-broken5" }, /area/maintenance/bar/cafe) -======= -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/space, -/area/space/nearstation) -"azI" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/space, -/area/space/nearstation) ->>>>>>> e7197ec... Nearstation fixes (#32931) "azJ" = ( /obj/machinery/gateway{ dir = 9 @@ -57468,89 +57456,89 @@ /obj/structure/lattice, /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qoe" = ( /obj/structure/lattice, /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qof" = ( /obj/structure/lattice, /obj/structure/grille/broken, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qog" = ( /obj/structure/lattice, /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qoh" = ( /obj/structure/lattice, /obj/structure/grille/broken, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qoi" = ( /obj/structure/lattice, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qoj" = ( /obj/structure/lattice, /obj/structure/grille/broken, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qok" = ( /obj/structure/lattice, /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qol" = ( /obj/structure/grille, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "Qom" = ( /obj/structure/lattice, /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qon" = ( /obj/structure/lattice, /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qoo" = ( /obj/structure/lattice, /obj/structure/grille/broken, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qop" = ( /obj/structure/lattice, /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qoq" = ( /obj/structure/lattice, /obj/structure/grille/broken, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qor" = ( /obj/structure/lattice, /obj/structure/grille/broken, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qos" = ( /obj/structure/grille, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "Qot" = ( /obj/structure/lattice, /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qou" = ( /obj/structure/lattice, /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qov" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ @@ -57659,39 +57647,39 @@ "QoM" = ( /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "QoN" = ( /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "QoO" = ( /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "QoP" = ( /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "QoQ" = ( /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "QoR" = ( /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "QoS" = ( /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "QoT" = ( /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "QoU" = ( /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "QoV" = ( /obj/structure/window/reinforced, /obj/vehicle/secway, @@ -58686,7 +58674,7 @@ /area/maintenance/bar/cafe) "Qri" = ( /obj/machinery/power/apc{ - areastring = "/area/crew_quarters/theatre/mime"; + areastring = "/area/crew_quarters/theatre/clown"; dir = 2; name = "Clown's Office APC"; pixel_x = 1; @@ -60122,104 +60110,8 @@ /obj/structure/chair/office/light{ dir = 1 }, -<<<<<<< HEAD /obj/structure/cable{ icon_state = "0-4" -======= -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) -"Qod" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) -"Qoe" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) -"Qof" = ( -/obj/structure/lattice, -/obj/structure/grille/broken, -/turf/open/space/basic, -/area/space/nearstation) -"Qog" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) -"Qoh" = ( -/obj/structure/lattice, -/obj/structure/grille/broken, -/turf/open/space/basic, -/area/space/nearstation) -"Qoi" = ( -/obj/structure/lattice, -/turf/open/space/basic, -/area/space/nearstation) -"Qoj" = ( -/obj/structure/lattice, -/obj/structure/grille/broken, -/turf/open/space/basic, -/area/space/nearstation) -"Qok" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) -"Qol" = ( -/obj/structure/grille, -/turf/open/floor/plating/airless, -/area/space/nearstation) -"Qom" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) -"Qon" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) -"Qoo" = ( -/obj/structure/lattice, -/obj/structure/grille/broken, -/turf/open/space/basic, -/area/space/nearstation) -"Qop" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) -"Qoq" = ( -/obj/structure/lattice, -/obj/structure/grille/broken, -/turf/open/space/basic, -/area/space/nearstation) -"Qor" = ( -/obj/structure/lattice, -/obj/structure/grille/broken, -/turf/open/space/basic, -/area/space/nearstation) -"Qos" = ( -/obj/structure/grille, -/turf/open/floor/plating/airless, -/area/space/nearstation) -"Qot" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) -"Qou" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) -"Qov" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 ->>>>>>> e7197ec... Nearstation fixes (#32931) }, /turf/open/floor/plasteel, /area/engine/gravity_generator) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index d449da13dc..1eb515a49b 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -34047,22 +34047,7 @@ width = 18 }, /turf/open/space, -<<<<<<< HEAD -/area/space) -======= /area/space/nearstation) -"swt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/rnd/protolathe/department/service, -/turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar/atrium) -"swu" = ( -/obj/machinery/rnd/protolathe/department/medical, -/turf/closed/wall, -/area/medical/medbay/zone3) ->>>>>>> e7197ec... Nearstation fixes (#32931) (1,1,1) = {" aaa