From 2cbccfc3337cdf7d6c587f1ebac7b9fee1365257 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 15 Aug 2019 21:03:17 -0400 Subject: [PATCH] Mow --- maps/tether/submaps/aerostat/aerostat.dmm | 208 +-- maps/tether/submaps/beach/beach.dmm | 210 ++-- maps/tether/submaps/space/debrisfield.dmm | 206 +-- maps/tether/submaps/tether_ships.dmm | 1392 ++++++++++----------- maps/tether/tether-05-station1.dmm | 400 +++--- maps/tether/tether-07-station3.dmm | 918 +++----------- 6 files changed, 1359 insertions(+), 1975 deletions(-) diff --git a/maps/tether/submaps/aerostat/aerostat.dmm b/maps/tether/submaps/aerostat/aerostat.dmm index 0e58d82cb0..4ed1152b1c 100644 --- a/maps/tether/submaps/aerostat/aerostat.dmm +++ b/maps/tether/submaps/aerostat/aerostat.dmm @@ -4742,10 +4742,10 @@ aw aw aw aw -aw -aw -aw -aw +cv +cv +cv +cv aw aw aw @@ -4874,21 +4874,21 @@ aw aw aw aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv aw aw aw @@ -5016,21 +5016,21 @@ aw aw aw aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv aw aw aw @@ -5157,15 +5157,15 @@ aw aw aw aw -aw -aw -aw -aw -aw -aw -aw -aw -aw +cv +cv +cv +cv +cv +cv +cv +cv +cv cv cv cv @@ -5299,24 +5299,24 @@ aw aw aw aw +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv aw aw aw -cv -cv -cv -cv -cv -cv -cv -cv -cv -cv -cv -cv -cv -aw -aw aw aw aw @@ -5440,25 +5440,25 @@ aw aw aw aw +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv aw aw aw -cv -cv -cv -cv -cv -cv -cv -cv -cv -cv -cv -cv -cv -cv -aw -aw aw aw aw @@ -5582,9 +5582,9 @@ aw aw aw aw -aw -aw -aw +cv +cv +cv cv cv cv @@ -5724,9 +5724,6 @@ aw aw aw aw -aw -aw -aw cv cv cv @@ -5739,7 +5736,10 @@ cv cv cv cv -aw +cv +cv +cv +cv aw aw aw @@ -5866,9 +5866,6 @@ aw aw aw aw -aw -aw -aw cv cv cv @@ -5881,7 +5878,10 @@ cv cv cv cv -aw +cv +cv +cv +cv aw aw aw @@ -6008,9 +6008,9 @@ aw aw aw aw -aw -aw -aw +cv +cv +cv cv cv cv @@ -6151,8 +6151,8 @@ aw aw aw aw -aw -aw +cv +cv cv cv cv @@ -6293,8 +6293,8 @@ aw aw aw aw -aw -aw +cv +cv cv cv cv @@ -6436,8 +6436,8 @@ aw aw aw aw -aw -aw +cv +cv cv cv cv @@ -6578,14 +6578,14 @@ aw aw aw aw -aw -aw -aw -aw -aw -aw -aw -aw +cv +cv +cv +cv +cv +cv +cv +cv cv cv cv @@ -6732,8 +6732,8 @@ aw aw cc cY -aw -aw +cv +cv aw aw aw diff --git a/maps/tether/submaps/beach/beach.dmm b/maps/tether/submaps/beach/beach.dmm index 640ad0bff5..a9dd088557 100644 --- a/maps/tether/submaps/beach/beach.dmm +++ b/maps/tether/submaps/beach/beach.dmm @@ -8218,10 +8218,10 @@ aa aa aa aa -aa -aa -aa -aa +bm +bm +bm +bm aa aa aa @@ -8350,21 +8350,21 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm aa aa aa @@ -8492,14 +8492,14 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa +bm +bm +bm +bm +bm +bm +bm +bm bm bm bm @@ -8633,9 +8633,9 @@ aa aa aa aa -aa -aa -aa +bm +bm +bm bm bm bm @@ -8775,23 +8775,23 @@ aa aa aa aa +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm aa aa -bm -bm -bm -bm -bm -bm -bm -bm -bm -bm -bm -bm -bm -bm -aa aa aa aa @@ -8916,9 +8916,9 @@ aa aa aa aa -aa -aa -aa +bm +bm +bm bm bm bm @@ -9058,9 +9058,6 @@ aa aa aa aa -aa -aa -aa bm bm bm @@ -9073,7 +9070,10 @@ bm bm bm bm -aa +bm +bm +bm +bm aa aa aa @@ -9200,9 +9200,6 @@ aa aa aa aa -aa -aa -aa bm bm bm @@ -9215,7 +9212,10 @@ bm bm bm bm -aa +bm +bm +bm +bm aa aa bs @@ -9342,9 +9342,9 @@ aa aa aa aa -aa -aa -aa +bm +bm +bm bm bm bm @@ -9484,9 +9484,9 @@ aa aa aa aa -aa -aa -aa +bm +bm +bm bm bm bm @@ -9627,23 +9627,23 @@ aa aa aa aa +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm aa aa -bm -bm -bm -bm -bm -bm -bm -bm -bm -bm -bm -bm -bm -bm -aa aa aa aa @@ -9769,9 +9769,9 @@ aa aa aa aa -aa -aa -aa +bm +bm +bm bm bm bm @@ -9912,14 +9912,14 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa +bm +bm +bm +bm +bm +bm +bm +bm bm bm bm @@ -10054,21 +10054,21 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm +bm aa aa aa @@ -10208,8 +10208,8 @@ aa aa aa aa -aa -aa +bm +bm aa aa aa diff --git a/maps/tether/submaps/space/debrisfield.dmm b/maps/tether/submaps/space/debrisfield.dmm index 56ad612f88..26c799cad5 100644 --- a/maps/tether/submaps/space/debrisfield.dmm +++ b/maps/tether/submaps/space/debrisfield.dmm @@ -8623,10 +8623,10 @@ b b b b -b -b -b -b +f +f +f +f b b b @@ -8755,21 +8755,21 @@ b b b b -b -b -b -b -b -b -b -b -b -b -b -b -b -b -b +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f b b b @@ -8897,14 +8897,14 @@ b b b b -b -b -b -b -b -b -b -b +f +f +f +f +f +f +f +f f f f @@ -9038,9 +9038,9 @@ b b b b -b -b -b +f +f +f f f f @@ -9180,23 +9180,23 @@ b b b b +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f b b -f -f -f -f -f -f -f -f -f -f -f -f -f -f -b b b b @@ -9321,9 +9321,9 @@ a b b b -b -b -b +f +f +f f f f @@ -9463,9 +9463,9 @@ a b b b -b -b -b +f +f +f f f f @@ -9605,9 +9605,9 @@ a b b b -b -b -b +f +f +f f f f @@ -9747,9 +9747,9 @@ a b b b -b -b -b +f +f +f f f f @@ -9889,9 +9889,9 @@ a b b b -b -b -b +f +f +f f f f @@ -10032,23 +10032,23 @@ b b b b +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f b b -f -f -f -f -f -f -f -f -f -f -f -f -f -f -b b b b @@ -10174,9 +10174,9 @@ b b b b -b -b -b +f +f +f f f f @@ -10317,14 +10317,14 @@ b b b b -b -b -b -b -b -b -b -b +f +f +f +f +f +f +f +f f f f @@ -10459,21 +10459,21 @@ b b b b -b -b -b -b -b -b -b -b -b -b -b -b -b -b -b +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f b b b @@ -10613,8 +10613,8 @@ b b b b -b -b +f +f b b b diff --git a/maps/tether/submaps/tether_ships.dmm b/maps/tether/submaps/tether_ships.dmm index 1b341bcefc..9d0817e6a9 100644 --- a/maps/tether/submaps/tether_ships.dmm +++ b/maps/tether/submaps/tether_ships.dmm @@ -1802,15 +1802,6 @@ }, /turf/unsimulated/wall, /area/space) -"eJ" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - direction = 8; - name = "thrower_escapeshuttletop(left)"; - tiles = 0 - }, -/turf/space/sandyscroll, -/area/space) "eK" = ( /obj/structure/catwalk, /obj/machinery/vending/tool, @@ -1859,19 +1850,6 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/holofloor/desert, /area/houseboat/holodeck/desert) -"eT" = ( -/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, -/turf/space/sandyscroll, -/area/space) -"eU" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - direction = 4; - name = "thrower_escapeshuttletop(right)"; - tiles = 0 - }, -/turf/space/sandyscroll, -/area/space) "eW" = ( /obj/structure/railing{ icon_state = "railing0"; @@ -2636,15 +2614,6 @@ "hf" = ( /turf/space/transit/east, /area/shuttle/large_escape_pod1/transit) -"hg" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - direction = 8; - name = "thrower_escapeshuttletop(left)"; - tiles = 0 - }, -/turf/space/bluespace, -/area/space) "hh" = ( /obj/effect/floor_decal/transit/orange{ dir = 8 @@ -2680,19 +2649,6 @@ "hk" = ( /turf/simulated/sky/virgo3b/south, /area/shuttle/tether/transit) -"hl" = ( -/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, -/turf/space/bluespace, -/area/space) -"hm" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - direction = 4; - name = "thrower_escapeshuttletop(right)"; - tiles = 0 - }, -/turf/space/bluespace, -/area/space) "hn" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -2771,15 +2727,6 @@ icon_state = "rock" }, /area/space) -"hy" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - direction = 8; - name = "thrower_escapeshuttletop(left)"; - tiles = 0 - }, -/turf/space/transit/south, -/area/space) "hz" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -2790,28 +2737,6 @@ }, /turf/space/transit/south, /area/space) -"hA" = ( -/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, -/turf/space/transit/south, -/area/space) -"hB" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - direction = 4; - name = "thrower_escapeshuttletop(right)"; - tiles = 0 - }, -/turf/space/transit/south, -/area/space) -"hC" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - direction = 8; - name = "thrower_escapeshuttletop(left)"; - tiles = 0 - }, -/turf/space, -/area/space) "hD" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -2822,19 +2747,6 @@ }, /turf/space, /area/space) -"hE" = ( -/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, -/turf/space, -/area/space) -"hF" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - direction = 4; - name = "thrower_escapeshuttletop(right)"; - tiles = 0 - }, -/turf/space, -/area/space) "hG" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -3518,12 +3430,12 @@ gU gU gU gU -gU -gU -gU -gU -gU -gU +eO +eO +eO +eO +eO +eO gU gU dQ @@ -3542,12 +3454,12 @@ et et et et -et -et -et -et -et -et +hj +hj +hj +hj +hj +hj et et et @@ -3568,12 +3480,12 @@ hp hp hp hp -hp -hp -hp -hp -hp -hp +hz +hz +hz +hz +hz +hz hp hp hp @@ -3650,23 +3562,23 @@ gU gU gU gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU +eO +eO +eO +eO +eO +eO +eO +eO +eO +eO +eO +hd +hd +hd +hd +eO +eO gU dQ aa @@ -3676,22 +3588,22 @@ et et et et -et -et -et -et -et -et -et -et -et -et -et -et -et -et -et -et +hj +hj +hj +hj +hj +hj +hj +hj +hj +hj +hj +fg +fg +fg +fg +hj et et gV @@ -3702,23 +3614,23 @@ hp hp hp hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp +hz +hz +hz +hz +hz +hz +hz +hz +hz +hz +hz +hq +hq +hq +hq +hz +hz hp ht aa @@ -3792,23 +3704,23 @@ gU gU gU gU -gU -gU -gU -gU -gU -gU eO +hd +hd +hd +hd +hd +hd +hd +hd +hd +hd +hd +hd +hd +hd +hd eO -eO -eO -eO -eO -eO -eO -eO -gU -gU gU dQ aa @@ -3818,22 +3730,22 @@ et et et et -et -et -et -et -et -et hj -hj -hj -hj -hj -hj -hj -hj -hj -et +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg et et gV @@ -3844,23 +3756,23 @@ hp hp hp hp -hp -hp -hp -hp -hp -hp hz +hq +hq +hq +hq +hq +hq +hq +hq +hq +hq +hq +hq +hq +hq +hq hz -hz -hz -hz -hz -hz -hz -hz -hp -hp hp ht aa @@ -3933,14 +3845,16 @@ gU gU gU gU -gU eO eO -eO -eO -eO -eO -eJ +hd +hd +hd +hd +hd +hd +hd +hd hd hd hd @@ -3950,8 +3864,6 @@ hd hd eO gU -gU -gU dQ aa gV @@ -3959,14 +3871,8 @@ et et et et -et hj hj -hj -hj -hj -hj -hg fg fg fg @@ -3974,8 +3880,14 @@ fg fg fg fg -hj -et +fg +fg +fg +fg +fg +fg +fg +fg et et gV @@ -3985,14 +3897,16 @@ hp hp hp hp -hp hz hz -hz -hz -hz -hz -hy +hq +hq +hq +hq +hq +hq +hq +hq hq hq hq @@ -4002,8 +3916,6 @@ hq hq hz hp -hp -hp ht aa "} @@ -4075,8 +3987,10 @@ gU gU gU gU -eU -eJ +eO +hd +hd +hd hd hd hd @@ -4092,8 +4006,6 @@ hd hd eO gU -gU -gU dQ aa gV @@ -4101,23 +4013,23 @@ et et et et -hg -hg -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg hj -et +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg et et gV @@ -4128,7 +4040,9 @@ hp hp hp hz -hy +hq +hq +hq hq hq hq @@ -4144,8 +4058,6 @@ hq hq hz hp -hp -hp ht aa "} @@ -4216,7 +4128,7 @@ dQ gU gU gU -gU +eO eO hd hd @@ -4232,9 +4144,9 @@ hd hd hd hd +hd +eO eO -gU -gU gU dQ aa @@ -4242,7 +4154,7 @@ gV et et et -et +hj hj fg fg @@ -4258,17 +4170,17 @@ fg fg fg fg +fg hj et et -et gV dJ ht hp hp hp -hp +hz hz hq hq @@ -4284,9 +4196,9 @@ hq hq hq hq +hq +hz hz -hp -hp hp ht aa @@ -4358,8 +4270,10 @@ dQ gU gU gU -gU -eJ +eO +hd +hd +hd hd hd hd @@ -4376,16 +4290,16 @@ hd eO eO gU -gU -gU dQ dJ gV et et et -et -hg +hj +fg +fg +fg fg fg fg @@ -4400,8 +4314,6 @@ fg fg fg hj -hj -et et et gV @@ -4410,8 +4322,10 @@ ht hp hp hp -hp -hy +hz +hq +hq +hq hq hq hq @@ -4428,8 +4342,6 @@ hq hz hz hp -hp -hp ht aa "} @@ -4500,8 +4412,11 @@ dQ gU gU gU -gU -eJ +eO +hd +hd +hd +hd hd hd hd @@ -4515,9 +4430,6 @@ hd hd hd eO -eO -gU -gU gU gU dQ @@ -4526,8 +4438,11 @@ gV et et et -et -hg +hj +fg +fg +fg +fg fg fg fg @@ -4541,9 +4456,6 @@ fg fg fg hj -hj -et -et et et gV @@ -4552,8 +4464,11 @@ ht hp hp hp -hp -hy +hz +hq +hq +hq +hq hq hq hq @@ -4567,9 +4482,6 @@ hq hq hq hz -hz -hp -hp hp hp ht @@ -4642,8 +4554,11 @@ dQ gU gU gU -gU -eT +eO +hd +hd +hd +hd hd hd hd @@ -4657,9 +4572,6 @@ hd hd hd eO -eO -gU -gU gU gU dQ @@ -4668,8 +4580,11 @@ gV et et et -et -hl +hj +fg +fg +fg +fg fg fg fg @@ -4683,9 +4598,6 @@ fg fg fg hj -hj -et -et et et gV @@ -4694,8 +4606,11 @@ ht hp hp hp -hp -hA +hz +hq +hq +hq +hq hq hq hq @@ -4709,9 +4624,6 @@ hq hq hq hz -hz -hp -hp hp hp ht @@ -4784,8 +4696,10 @@ dQ gU gU gU -gU -eU +eO +hd +hd +hd hd hd hd @@ -4802,16 +4716,16 @@ hd eO gU gU -gU -gU dQ aa gV et et et -et -hm +hj +fg +fg +fg fg fg fg @@ -4828,16 +4742,16 @@ fg hj et et -et -et gV dJ ht hp hp hp -hp -hB +hz +hq +hq +hq hq hq hq @@ -4854,8 +4768,6 @@ hq hz hp hp -hp -hp ht aa "} @@ -4926,8 +4838,10 @@ dQ gU gU gU -gU -eU +eO +hd +hd +hd hd hd hd @@ -4944,16 +4858,16 @@ hd eO eO gU -gU -gU dQ aa gV et et et -et -hm +hj +fg +fg +fg fg fg fg @@ -4968,8 +4882,6 @@ fg fg fg hj -hj -et et et gV @@ -4978,8 +4890,10 @@ ht hp hp hp -hp -hB +hz +hq +hq +hq hq hq hq @@ -4996,8 +4910,6 @@ hq hz hz hp -hp -hp ht aa "} @@ -5068,8 +4980,9 @@ dQ gU gU gU -gU -eU +eO +eO +hd hd hd hd @@ -5085,8 +4998,7 @@ hd hd hd eO -gU -gU +eO gU dQ aa @@ -5094,8 +5006,9 @@ gV et et et -et -hm +hj +hj +fg fg fg fg @@ -5113,15 +5026,15 @@ fg hj et et -et gV dJ ht hp hp hp -hp -hB +hz +hz +hq hq hq hq @@ -5137,8 +5050,7 @@ hq hq hq hz -hp -hp +hz hp ht aa @@ -5211,8 +5123,10 @@ gU gU gU gU -eU -eU +eO +hd +hd +hd hd hd hd @@ -5228,8 +5142,6 @@ hd hd eO gU -gU -gU dQ aa gV @@ -5237,23 +5149,23 @@ et et et et -hg -hm -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg hj -et +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg et et gV @@ -5263,8 +5175,10 @@ hp hp hp hp -hB -hB +hz +hq +hq +hq hq hq hq @@ -5280,8 +5194,6 @@ hq hq hz hp -hp -hp ht aa "} @@ -5353,14 +5265,16 @@ gU gU gU gU -gU eO eO -eO -eO -eO -eO -eU +hd +hd +hd +hd +hd +hd +hd +hd hd hd hd @@ -5370,8 +5284,6 @@ hd hd eO gU -gU -gU dQ aa gV @@ -5379,14 +5291,8 @@ et et et et -et hj hj -hj -hj -hj -hj -hm fg fg fg @@ -5394,8 +5300,14 @@ fg fg fg fg -hj -et +fg +fg +fg +fg +fg +fg +fg +fg et et gV @@ -5405,14 +5317,16 @@ hp hp hp hp -hp hz hz -hz -hz -hz -hz -hB +hq +hq +hq +hq +hq +hq +hq +hq hq hq hq @@ -5422,8 +5336,6 @@ hq hq hz hp -hp -hp ht aa "} @@ -5496,23 +5408,23 @@ gU gU gU gU -gU -gU -gU -gU -gU -gU eO +hd +hd +hd +hd +hd +hd +hd +hd +hd +hd +hd +hd +hd +hd +hd eO -eO -eO -eO -eO -eO -eO -eO -gU -gU gU dQ aa @@ -5522,22 +5434,22 @@ et et et et -et -et -et -et -et -et hj -hj -hj -hj -hj -hj -hj -hj -hj -et +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg et et gV @@ -5548,23 +5460,23 @@ hp hp hp hp -hp -hp -hp -hp -hp -hp hz +hq +hq +hq +hq +hq +hq +hq +hq +hq +hq +hq +hq +hq +hq +hq hz -hz -hz -hz -hz -hz -hz -hz -hp -hp hp ht aa @@ -5638,23 +5550,23 @@ gU gU gU gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU -gU +eO +eO +eO +eO +eO +eO +eO +eO +eO +eO +eO +eO +eO +hd +hd +eO +eO gU dQ aa @@ -5664,22 +5576,22 @@ et et et et -et -et -et -et -et -et -et -et -et -et -et -et -et -et -et -et +hj +hj +hj +hj +hj +hj +hj +hj +hj +hj +hj +hj +hj +fg +fg +hj et et gV @@ -5690,23 +5602,23 @@ hp hp hp hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp +hz +hz +hz +hz +hz +hz +hz +hz +hz +hz +hz +hz +hz +hq +hq +hz +hz hp ht aa @@ -5792,10 +5704,10 @@ gU gU gU gU -gU -gU -gU -gU +eO +eO +eO +eO gU gU dQ @@ -5816,10 +5728,10 @@ et et et et -et -et -et -et +hj +hj +hj +hj et et et @@ -5844,10 +5756,10 @@ hp hp hp hp -hp -hp -hp -hp +hz +hz +hz +hz hp hp ht @@ -6952,12 +6864,12 @@ hc hc hc hc -hc -hc -hc -hc -hc -hc +ho +ho +ho +ho +ho +ho hc hc gO @@ -6978,12 +6890,12 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa +hD +hD +hD +hD +hD +hD aa aa hu @@ -7084,23 +6996,23 @@ hc hc hc hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc +ho +ho +ho +ho +ho +ho +ho +ho +ho +ho +ho +gP +gP +gP +gP +ho +ho hc gO dJ @@ -7110,23 +7022,23 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +hD +hD +hD +hD +hD +hD +hD +hD +hD +hD +hD +he +he +he +he +hD +hD aa hu aa @@ -7226,23 +7138,23 @@ hc hc hc hc -hc -hc -hc -hc -hc -hc ho +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP ho -ho -ho -ho -ho -ho -ho -ho -hc -hc hc gO dJ @@ -7252,23 +7164,23 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa hD +he +he +he +he +he +he +he +he +he +he +he +he +he +he +he hD -hD -hD -hD -hD -hD -hD -hD -aa -aa aa hu aa @@ -7367,14 +7279,16 @@ hc hc hc hc -hc ho ho -ho -ho -ho -ho -hn +gP +gP +gP +gP +gP +gP +gP +gP gP gP gP @@ -7384,8 +7298,6 @@ gP gP ho hc -hc -hc gO dJ hu @@ -7393,14 +7305,16 @@ aa aa aa aa -aa hD hD -hD -hD -hD -hD -hC +he +he +he +he +he +he +he +he he he he @@ -7410,8 +7324,6 @@ he he hD aa -aa -aa hu aa "} @@ -7509,8 +7421,10 @@ hc hc hc hc -hr -hn +ho +gP +gP +gP gP gP gP @@ -7526,8 +7440,6 @@ gP gP ho hc -hc -hc gO dJ hu @@ -7536,7 +7448,9 @@ aa aa aa hD -hC +he +he +he he he he @@ -7552,8 +7466,6 @@ he he hD aa -aa -aa hu aa "} @@ -7650,7 +7562,7 @@ gO hc hc hc -hc +ho ho gP gP @@ -7666,9 +7578,9 @@ gP gP gP gP +gP +ho ho -hc -hc hc gO dJ @@ -7676,7 +7588,7 @@ hu aa aa aa -aa +hD hD he he @@ -7692,9 +7604,9 @@ he he he he +he +hD hD -aa -aa aa hu aa @@ -7792,8 +7704,10 @@ gO hc hc hc -hc -hn +ho +gP +gP +gP gP gP gP @@ -7810,16 +7724,16 @@ gP ho ho hc -hc -hc gO dJ hu aa aa aa -aa -hC +hD +he +he +he he he he @@ -7836,8 +7750,6 @@ he hD hD aa -aa -aa hu aa "} @@ -7934,8 +7846,11 @@ gO hc hc hc -hc -hn +ho +gP +gP +gP +gP gP gP gP @@ -7949,9 +7864,6 @@ gP gP gP ho -ho -hc -hc hc hc gO @@ -7960,8 +7872,11 @@ hu aa aa aa -aa -hC +hD +he +he +he +he he he he @@ -7975,9 +7890,6 @@ he he he hD -hD -aa -aa aa aa hu @@ -8076,8 +7988,11 @@ gO hc hc hc -hc -gO +ho +gP +gP +gP +gP gP gP gP @@ -8091,9 +8006,6 @@ gP gP gP ho -ho -hc -hc hc hc gO @@ -8102,8 +8014,11 @@ hu aa aa aa -aa -hE +hD +he +he +he +he he he he @@ -8117,9 +8032,6 @@ he he he hD -hD -aa -aa aa aa hu @@ -8218,8 +8130,10 @@ gO hc hc hc -hc -hr +ho +gP +gP +gP gP gP gP @@ -8236,16 +8150,16 @@ gP ho hc hc -hc -hc gO dJ hu aa aa aa -aa -hF +hD +he +he +he he he he @@ -8262,8 +8176,6 @@ he hD aa aa -aa -aa hu aa "} @@ -8360,8 +8272,10 @@ gO hc hc hc -hc -hr +ho +gP +gP +gP gP gP gP @@ -8378,16 +8292,16 @@ gP ho ho hc -hc -hc gO dJ hu aa aa aa -aa -hF +hD +he +he +he he he he @@ -8404,8 +8318,6 @@ he hD hD aa -aa -aa hu aa "} @@ -8502,8 +8414,9 @@ gO hc hc hc -hc -hr +ho +ho +gP gP gP gP @@ -8519,8 +8432,7 @@ gP gP gP ho -hc -hc +ho hc gO dJ @@ -8528,8 +8440,9 @@ hu aa aa aa -aa -hF +hD +hD +he he he he @@ -8545,8 +8458,7 @@ he he he hD -aa -aa +hD aa hu aa @@ -8645,8 +8557,10 @@ hc hc hc hc -hr -hr +ho +gP +gP +gP gP gP gP @@ -8662,8 +8576,6 @@ gP gP ho hc -hc -hc gO dJ hu @@ -8672,7 +8584,9 @@ aa aa aa hD -hF +he +he +he he he he @@ -8688,8 +8602,6 @@ he he hD aa -aa -aa hu aa "} @@ -8787,14 +8699,16 @@ hc hc hc hc -hc ho ho -ho -ho -ho -ho -hr +gP +gP +gP +gP +gP +gP +gP +gP gP gP gP @@ -8804,8 +8718,6 @@ gP gP ho hc -hc -hc gO dJ hu @@ -8813,14 +8725,16 @@ aa aa aa aa -aa hD hD -hD -hD -hD -hD -hF +he +he +he +he +he +he +he +he he he he @@ -8830,8 +8744,6 @@ he he hD aa -aa -aa hu aa "} @@ -8930,23 +8842,23 @@ hc hc hc hc -hc -hc -hc -hc -hc -hc ho +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP ho -ho -ho -ho -ho -ho -ho -ho -hc -hc hc gO dJ @@ -8956,23 +8868,23 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa hD +he +he +he +he +he +he +he +he +he +he +he +he +he +he +he hD -hD -hD -hD -hD -hD -hD -hD -aa -aa aa hu aa @@ -9072,23 +8984,23 @@ hc hc hc hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc -hc +ho +ho +ho +ho +ho +ho +ho +ho +ho +ho +ho +ho +ho +gP +gP +ho +ho hc gO dJ @@ -9098,23 +9010,23 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +hD +hD +hD +hD +hD +hD +hD +hD +hD +hD +hD +hD +hD +he +he +hD +hD aa hu aa @@ -9226,10 +9138,10 @@ hc hc hc hc -hc -hc -hc -hc +ho +ho +ho +ho hc hc gO @@ -9252,10 +9164,10 @@ aa aa aa aa -aa -aa -aa -aa +hD +hD +hD +hD aa aa hu diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 7f47ce8918..653861507d 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -10336,12 +10336,6 @@ "ayp" = ( /turf/space, /area/shuttle/excursion/tether_dockarm) -"ayq" = ( -/obj/effect/landmark{ - name = "carpspawn" - }, -/turf/space, -/area/shuttle/excursion/tether_dockarm) "ays" = ( /obj/structure/cable{ d1 = 1; @@ -25453,10 +25447,10 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa +ayp +ayp +ayp +ayp aaa aaa aaa @@ -25585,21 +25579,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp aaa aaa aaa @@ -25727,21 +25721,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp aaa aaa aaa @@ -25868,15 +25862,15 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp ayp ayp ayp @@ -26010,24 +26004,24 @@ aaa aaa aaa aaa +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp aaa aaa aaa -ayp -ayp -ayp -ayp -ayp -ayp -ayp -ayp -ayp -ayp -ayp -ayp -ayp -aaa -aaa aaa aaa aaa @@ -26151,9 +26145,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa ayp ayp ayp @@ -26167,7 +26158,10 @@ ayp ayp ayp ayp -ayq +ayp +ayp +ayp +aab aaa aaa aaa @@ -26293,9 +26287,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +ayp +ayp +ayp ayp ayp ayp @@ -26435,9 +26429,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa ayp ayp ayp @@ -26450,7 +26441,10 @@ ayp ayp ayp ayp -aaa +ayp +ayp +ayp +ayp aaa aaa aaa @@ -26577,9 +26571,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa ayp ayp ayp @@ -26592,7 +26583,10 @@ ayp ayp ayp ayp -aaa +ayp +ayp +ayp +ayp aaa aaa aaa @@ -26719,9 +26713,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +ayp +ayp +ayp ayp ayp ayp @@ -26862,8 +26856,8 @@ aac aac cbM cbM -aaa -aaa +ayp +ayp ayp ayp ayp @@ -27004,8 +26998,8 @@ bYP bYP aac aac -aac -aaa +ayp +ayp ayp ayp ayp @@ -27147,8 +27141,8 @@ bYP aac aac aac -aaa -aaa +ayp +ayp ayp ayp ayp @@ -27289,14 +27283,14 @@ bYP aac aac aac -aac -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp ayp ayp ayp @@ -27443,8 +27437,8 @@ aaa bGo bHt bJl -aaa -aaa +ayp +ayp aaa aaa aaa @@ -37318,10 +37312,10 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa +aaf +aaf +aaf +aaf aaa aaa aaa @@ -37450,21 +37444,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf aaa aaa aaa @@ -37592,14 +37586,14 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf aaf aaf aaf @@ -37733,9 +37727,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +aaf +aaf +aaf aaf aaf aaf @@ -37875,23 +37869,23 @@ aaa aaa aaa aaa +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf aaa aaa -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaa aaa aaa aaa @@ -38016,9 +38010,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +aaf +aaf +aaf aaf aaf aaf @@ -38158,9 +38152,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa aaf aaf aaf @@ -38173,7 +38164,10 @@ aaf aaf aaf aaf -aaa +aaf +aaf +aaf +aaf aaa aaa aaa @@ -38300,9 +38294,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa aaf aaf aaf @@ -38315,7 +38306,10 @@ aaf aaf aaf aaf -aaa +aaf +aaf +aaf +aaf aaa aaa aaa @@ -38442,9 +38436,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +aaf +aaf +aaf aaf aaf aaf @@ -38584,9 +38578,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +aaf +aaf +aaf aaf aaf aaf @@ -38727,23 +38721,23 @@ aaa aaa aaa aaa +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf aaa aaa -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaa aaa aaa aaa @@ -38869,9 +38863,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +aaf +aaf +aaf aaf aaf aaf @@ -39012,14 +39006,14 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf aaf aaf aaf @@ -39154,21 +39148,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf aaa aaa aaa @@ -39308,8 +39302,8 @@ aaa aaa aaa aaa -aaa -aaa +aaf +aaf aaa aaa aaa diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index be0543942a..b3c2bbdbd3 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -1969,22 +1969,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) -"di" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "shuttle blast"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/turf/simulated/floor/plating, -/area/shuttle/excursion/tether) "dj" = ( /turf/simulated/wall/thull, /area/shuttle/excursion/tether) @@ -2133,14 +2117,6 @@ /obj/structure/bed/padded, /obj/item/weapon/bedsheet/brown, /obj/structure/curtain/open/bed, -/obj/machinery/alarm{ - breach_detection = 0; - dir = 8; - icon_state = "alarm0"; - pixel_x = 25; - rcon_setting = 3; - report_danger_level = 0 - }, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "dz" = ( @@ -2470,12 +2446,16 @@ "ea" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/shuttle/excursion/tether) "eb" = ( -/obj/machinery/door/airlock/hatch, +/obj/machinery/door/airlock/hatch{ + req_one_access = list(67) + }, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_ridged, /area/shuttle/excursion/tether) "ec" = ( @@ -2653,21 +2633,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) -"er" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - icon_state = "intact-scrubbers"; - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/shuttle/excursion/tether) "es" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/railing{ @@ -2745,16 +2710,6 @@ /turf/simulated/floor/tiled, /area/security/hallway) "ex" = ( -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/manifold4w/visible/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/visible/supply, /turf/simulated/floor/tiled, @@ -2922,20 +2877,6 @@ /obj/random/junk, /turf/simulated/floor, /area/maintenance/station/ai) -"eR" = ( -/obj/structure/bed/chair/shuttle, -/obj/structure/cable/cyan{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 28 - }, -/turf/simulated/floor/tiled, -/area/shuttle/excursion/tether) "eS" = ( /obj/item/frame, /obj/effect/floor_decal/rust, @@ -3317,12 +3258,10 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 4 }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/door/airlock/hatch{ + req_one_access = list(67) }, -/obj/machinery/door/airlock/hatch, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_ridged, /area/shuttle/excursion/tether) "fy" = ( @@ -3548,6 +3487,7 @@ /obj/random/tech_supply, /obj/random/tech_supply, /obj/random/tech_supply, +/obj/item/weapon/storage/belt/utility/full, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "fW" = ( @@ -6152,11 +6092,6 @@ dir = 1 }, /obj/structure/closet/secure_closet/guncabinet/excursion, -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22 - }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "jZ" = ( @@ -6436,11 +6371,6 @@ /area/crew_quarters/heads/hos) "kw" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -6462,11 +6392,6 @@ master_tag = "expshuttle_docker"; pixel_y = -24 }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "ky" = ( @@ -6475,11 +6400,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold4w/visible, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "kz" = ( @@ -6719,11 +6639,6 @@ /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 4 }, -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "kR" = ( @@ -28436,11 +28351,6 @@ /area/maintenance/station/elevator) "SO" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/structure/closet/walllocker/emerglocker{ pixel_x = 32 }, @@ -28473,17 +28383,9 @@ name = "Shuttle Blast Doors"; opacity = 0 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, -/area/tether/exploration) -"SR" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume/wall_mounted{ - dir = 1; - frequency = 1380; - id_tag = "expshuttle_docker_pump_out_external"; - power_rating = 20000 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/space) +/area/shuttle/excursion/tether) "ST" = ( /obj/machinery/firealarm{ dir = 8; @@ -28502,7 +28404,7 @@ /obj/structure/shuttle/engine/propulsion, /turf/simulated/floor/reinforced, /turf/simulated/shuttle/plating/airless/carry, -/area/tether/exploration) +/area/shuttle/excursion/tether) "Td" = ( /obj/structure/cable/green{ d1 = 1; @@ -28518,16 +28420,6 @@ /turf/simulated/floor/carpet, /area/security/breakroom) "Ti" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply, /turf/simulated/floor/tiled, @@ -28544,7 +28436,7 @@ /obj/item/clothing/suit/space/void/pilot, /obj/item/clothing/head/helmet/space/void/pilot, /turf/simulated/floor/tiled, -/area/tether/exploration) +/area/shuttle/excursion/tether) "Tp" = ( /obj/structure/cable{ d1 = 1; @@ -28564,11 +28456,6 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "Tu" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/visible/supply{ icon_state = "intact-supply"; dir = 5 @@ -28598,10 +28485,8 @@ id_tag = "expshuttle_docker_pump_out_internal" }, /obj/structure/cable/cyan, -/obj/machinery/power/apc{ - dir = 2; - name = "south bump"; - pixel_y = -28 +/obj/machinery/oxygen_pump{ + pixel_y = -32 }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) @@ -28612,7 +28497,7 @@ /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techfloor/grid, -/area/tether/exploration) +/area/shuttle/excursion/tether) "TO" = ( /obj/structure/table/woodentable, /obj/item/weapon/storage/secure/safe{ @@ -28634,21 +28519,14 @@ /turf/simulated/floor/wood, /area/security/breakroom) "TT" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/door/airlock/hatch{ + req_one_access = newlist() }, -/obj/machinery/door/airlock/hatch, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_ridged, /area/shuttle/excursion/tether) -"TV" = ( -/obj/structure/table/steel, -/obj/item/clothing/head/pilot, -/turf/simulated/shuttle/floor/black, -/area/space) "TX" = ( /obj/machinery/alarm{ dir = 8; @@ -28667,15 +28545,6 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/techfloor/grid, /area/tether/exploration) -"Uk" = ( -/obj/structure/bed/chair/shuttle, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/shuttle/excursion/tether) "Um" = ( /obj/machinery/sleep_console, /turf/simulated/floor/tiled, @@ -28694,11 +28563,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) -"Uo" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/space_heater, -/turf/simulated/shuttle/floor/darkred, -/area/space) "Up" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ @@ -28746,11 +28610,6 @@ /area/security/eva) "Us" = ( /obj/structure/bed/chair/shuttle, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/alarm{ frequency = 1441; @@ -28762,11 +28621,6 @@ /obj/machinery/computer/security, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) -"Uv" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/shuttle/plating, -/area/space) "Uw" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -28788,11 +28642,6 @@ /area/crew_quarters/heads/hos) "Uz" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/firealarm{ @@ -28803,18 +28652,14 @@ /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "UB" = ( -/obj/machinery/power/apc{ - dir = 2; - name = "south bump"; - pixel_y = -28 - }, -/obj/structure/cable/cyan{ - d2 = 4; - icon_state = "0-4" - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/machinery/alarm{ + dir = 1; + icon_state = "alarm0"; + pixel_y = -22 + }, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "UC" = ( @@ -28834,10 +28679,6 @@ /obj/structure/bed/chair/shuttle, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) -"UH" = ( -/obj/structure/bed/chair/shuttle, -/turf/simulated/shuttle/floor/black, -/area/space) "UJ" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -28845,9 +28686,6 @@ }, /turf/simulated/wall/thull, /area/shuttle/excursion/tether) -"UK" = ( -/turf/simulated/wall/thull, -/area/tether/exploration) "UL" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 @@ -28858,11 +28696,6 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 10 }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "UM" = ( @@ -28872,7 +28705,7 @@ }, /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techfloor/grid, -/area/tether/exploration) +/area/shuttle/excursion/tether) "UO" = ( /obj/structure/cable/green{ icon_state = "0-4" @@ -28893,12 +28726,7 @@ pixel_y = 26 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/tether/exploration) -"UQ" = ( -/obj/machinery/portable_atmospherics/powered/pump/filled, -/obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/shuttle/floor/darkred, -/area/space) +/area/shuttle/excursion/tether) "UR" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume/wall_mounted{ dir = 8; @@ -28907,7 +28735,7 @@ power_rating = 20000 }, /turf/simulated/wall/thull, -/area/tether/exploration) +/area/shuttle/excursion/tether) "US" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -28963,20 +28791,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) -"UY" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/shuttle/plating, -/area/space) -"UZ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 9 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/space) "Vd" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -29018,7 +28832,7 @@ /obj/item/weapon/tank/emergency/oxygen/engi, /obj/item/weapon/pickaxe, /turf/simulated/floor/tiled, -/area/tether/exploration) +/area/shuttle/excursion/tether) "Vg" = ( /obj/machinery/atmospherics/pipe/manifold/visible/supply{ dir = 8 @@ -29027,19 +28841,8 @@ dir = 1 }, /obj/structure/closet/crate/freezer/rations, -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22 - }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) -"Vi" = ( -/obj/machinery/atmospherics/pipe/tank/air{ - dir = 4 - }, -/turf/simulated/shuttle/floor/darkred, -/area/space) "Vl" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/floodlight, @@ -29067,12 +28870,6 @@ }, /turf/simulated/floor/tiled, /area/security/lobby) -"Vo" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 9 - }, -/turf/simulated/wall/thull, -/area/tether/exploration) "Vp" = ( /obj/structure/cable/green{ d1 = 2; @@ -29081,19 +28878,6 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) -"Vq" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/excursion/tether) -"Vs" = ( -/obj/machinery/door/airlock/voidcraft, -/turf/simulated/shuttle/floor/black, -/area/space) "Vu" = ( /obj/structure/flight_left, /turf/simulated/floor/tiled, @@ -29104,20 +28888,6 @@ }, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) -"Vx" = ( -/turf/simulated/shuttle/floor/black, -/area/space) -"Vy" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/space) -"VA" = ( -/turf/simulated/shuttle/wall/voidcraft, -/area/space) "VB" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -29132,8 +28902,9 @@ name = "Shuttle Blast Doors"; opacity = 0 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, -/area/tether/exploration) +/area/shuttle/excursion/tether) "VD" = ( /obj/machinery/atmospherics/binary/pump, /obj/machinery/atmospherics/pipe/simple/hidden/universal{ @@ -29146,7 +28917,7 @@ pixel_x = -32 }, /turf/simulated/floor/tiled, -/area/tether/exploration) +/area/shuttle/excursion/tether) "VI" = ( /obj/machinery/light{ dir = 4 @@ -29198,25 +28969,13 @@ dir = 10 }, /turf/simulated/wall/thull, -/area/tether/exploration) +/area/shuttle/excursion/tether) "VR" = ( /obj/machinery/atmospherics/binary/pump{ dir = 8 }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) -"VS" = ( -/obj/machinery/shuttle_sensor{ - dir = 6; - id_tag = "shuttlesens_exp_int" - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/space) "VU" = ( /obj/machinery/conveyor{ dir = 8; @@ -29245,13 +29004,6 @@ "Wg" = ( /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) -"Wj" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4 - }, -/obj/machinery/meter, -/turf/simulated/shuttle/floor/darkred, -/area/space) "Wk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -29262,22 +29014,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) -"Wm" = ( -/obj/machinery/door/airlock/voidcraft/vertical{ - frequency = 1380; - id_tag = "expshuttle_door_Ri" - }, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1380; - master_tag = "expshuttle_docker"; - pixel_y = -24 - }, -/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ - dir = 8 - }, -/turf/simulated/shuttle/floor/black, -/area/space) "Wn" = ( /obj/structure/disposalpipe/segment, /turf/simulated/wall/thull, @@ -29285,17 +29021,7 @@ "Ws" = ( /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/wall/thull, -/area/tether/exploration) -"Wu" = ( -/obj/machinery/light{ - icon_state = "tube1"; - dir = 8 - }, -/obj/structure/closet/walllocker/emerglocker{ - pixel_x = -32 - }, -/turf/simulated/shuttle/floor/black, -/area/space) +/area/shuttle/excursion/tether) "Wx" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -29310,8 +29036,9 @@ name = "Shuttle Blast Doors"; opacity = 0 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, -/area/tether/exploration) +/area/shuttle/excursion/tether) "WB" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -29327,11 +29054,6 @@ }, /turf/simulated/floor/tiled/white, /area/security/security_bathroom) -"WC" = ( -/obj/effect/floor_decal/industrial/outline/red, -/obj/structure/closet/secure_closet/guncabinet/excursion, -/turf/simulated/shuttle/floor/darkred, -/area/space) "WD" = ( /obj/structure/flight_right, /turf/simulated/floor/tiled, @@ -29344,40 +29066,9 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/tether/exploration) -"WH" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 10 - }, -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/space) -"WJ" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ - dir = 8 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/space) -"WL" = ( -/obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; - dir = 1 - }, -/turf/simulated/shuttle/floor/black, -/area/space) -"WQ" = ( -/obj/structure/bed/chair/comfy/blue{ - icon_state = "comfychair_preview"; - dir = 1 - }, -/turf/simulated/shuttle/floor/black, -/area/space) +/area/shuttle/excursion/tether) "WR" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "WS" = ( @@ -29421,28 +29112,11 @@ }, /turf/simulated/floor/wood, /area/security/breakroom) -"Xg" = ( -/obj/machinery/shuttle_sensor{ - dir = 2; - id_tag = "shuttlesens_exp_psg" - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/space) "Xi" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 9 }, @@ -29458,10 +29132,6 @@ d2 = 4; icon_state = "0-4" }, -/obj/structure/cable/cyan{ - d2 = 8; - icon_state = "0-8" - }, /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 9 }, @@ -29493,14 +29163,7 @@ icon_state = "0-8" }, /turf/simulated/floor/tiled/techfloor/grid, -/area/tether/exploration) -"Xq" = ( -/obj/structure/bed/chair/shuttle{ - icon_state = "shuttle_chair"; - dir = 1 - }, -/turf/simulated/shuttle/floor/black, -/area/space) +/area/shuttle/excursion/tether) "Xr" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -29508,23 +29171,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/visible/yellow, /turf/simulated/floor/reinforced, -/area/tether/exploration) -"Xt" = ( -/obj/machinery/shuttle_sensor{ - dir = 5; - id_tag = "shuttlesens_exp" - }, -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 4 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/space) -"Xy" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 10 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/space) +/area/shuttle/excursion/tether) "XA" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -29534,7 +29181,7 @@ dir = 6 }, /turf/simulated/floor/reinforced, -/area/tether/exploration) +/area/shuttle/excursion/tether) "XB" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -29544,42 +29191,24 @@ dir = 10 }, /turf/simulated/floor/reinforced, -/area/tether/exploration) +/area/shuttle/excursion/tether) "XC" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 5 }, /turf/simulated/wall/thull, -/area/tether/exploration) +/area/shuttle/excursion/tether) "XE" = ( /obj/machinery/conveyor_switch/oneway{ id = "shuttle_inbound" }, /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/plating, -/area/tether/exploration) +/area/shuttle/excursion/tether) "XG" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, /area/security/eva) -"XJ" = ( -/obj/machinery/button/remote/airlock{ - desiredstate = 1; - dir = 4; - icon_state = "doorctrl0"; - id = "expshuttle_door_cargo"; - name = "hatch bolt control"; - pixel_x = -32; - req_one_access = list(19,43,67); - specialfunctions = 4 - }, -/obj/machinery/door/airlock/multi_tile/metal{ - icon_state = "door_locked"; - id_tag = "expshuttle_door_cargo"; - locked = 1 - }, -/turf/simulated/shuttle/floor/black, -/area/space) "XN" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -29589,25 +29218,7 @@ dir = 1 }, /turf/simulated/floor/reinforced, -/area/tether/exploration) -"XO" = ( -/obj/machinery/door/airlock/voidcraft/vertical{ - icon_state = "door_locked"; - id_tag = "expshuttle_door_L"; - locked = 1 - }, -/obj/machinery/button/remote/airlock{ - desiredstate = 1; - dir = 1; - icon_state = "doorctrl0"; - id = "expshuttle_door_L"; - name = "hatch bolt control"; - pixel_y = -28; - req_one_access = list(19,43,67); - specialfunctions = 4 - }, -/turf/simulated/shuttle/floor/black, -/area/space) +/area/shuttle/excursion/tether) "XR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -29621,13 +29232,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) -"XS" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - icon_state = "warningcorner"; - dir = 1 - }, -/turf/simulated/shuttle/floor/black, -/area/space) "XT" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -29665,11 +29269,6 @@ /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 9 }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "Yi" = ( @@ -29703,16 +29302,6 @@ icon_state = "intact"; dir = 6 }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/manifold4w/visible/supply, /obj/machinery/atmospherics/pipe/manifold4w/visible/scrubbers, /turf/simulated/floor/tiled, @@ -29736,21 +29325,6 @@ }, /turf/simulated/floor/reinforced, /area/tether/exploration) -"Yx" = ( -/obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; - dir = 8 - }, -/turf/simulated/shuttle/floor/black, -/area/space) -"YC" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/shuttle/plating, -/area/space) "YD" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -29793,12 +29367,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) -"YR" = ( -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/tram{ - name = "\improper Shuttle Scrubber" - }, -/turf/simulated/shuttle/floor/darkred, -/area/space) "YT" = ( /turf/simulated/wall, /area/security/breakroom) @@ -29816,31 +29384,16 @@ }, /turf/space, /area/space) -"YY" = ( -/obj/machinery/light{ - icon_state = "tube1"; - dir = 4 - }, -/obj/structure/closet/walllocker/emerglocker{ - pixel_x = 32 - }, -/turf/simulated/shuttle/floor/black, -/area/space) "Za" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/door/airlock/hatch{ + req_one_access = newlist() }, -/obj/machinery/door/airlock/hatch, /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_ridged, /area/shuttle/excursion/tether) -"Zc" = ( -/turf/simulated/floor/reinforced, -/area/space) "Zd" = ( /obj/machinery/conveyor{ dir = 4; @@ -29848,29 +29401,6 @@ }, /obj/structure/plasticflaps, /turf/simulated/floor/plating, -/area/tether/exploration) -"Zg" = ( -/obj/structure/cable/cyan{ - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/cable/cyan{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/power/apc{ - dir = 2; - name = "south bump"; - pixel_y = -28 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - icon_state = "intact-scrubbers"; - dir = 4 - }, -/turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "Zk" = ( /obj/effect/floor_decal/industrial/warning{ @@ -29881,43 +29411,12 @@ /area/shuttle/excursion/tether) "Zo" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) -"Zv" = ( -/obj/machinery/door/airlock/voidcraft/vertical{ - frequency = 1380; - id_tag = "expshuttle_door_Ro" - }, -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 4 - }, -/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ - dir = 6; - frequency = 1380; - id_tag = "expshuttle_exterior_sensor"; - master_tag = "expshuttle_docker"; - pixel_x = 4; - pixel_y = 28 - }, -/turf/simulated/shuttle/floor/black, -/area/space) -"Zw" = ( -/obj/machinery/light, -/obj/effect/floor_decal/industrial/warning/corner, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/turf/simulated/shuttle/floor/black, -/area/space) "Zy" = ( /obj/structure/disposaloutlet{ dir = 8 @@ -29926,14 +29425,14 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/tether/exploration) +/area/shuttle/excursion/tether) "ZB" = ( /obj/machinery/shuttle_sensor{ dir = 5; id_tag = "shuttlesens_exp" }, /turf/simulated/wall/thull, -/area/tether/exploration) +/area/shuttle/excursion/tether) "ZD" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 9 @@ -29959,34 +29458,22 @@ pixel_y = 28 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/tether/exploration) +/area/shuttle/excursion/tether) "ZG" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, /obj/machinery/meter, -/obj/structure/cable/cyan{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 28 +/obj/machinery/alarm{ + frequency = 1441; + pixel_y = 22 }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) -"ZK" = ( -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/space) "ZL" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/door/airlock/hatch{ + req_one_access = list(67) }, -/obj/machinery/door/airlock/hatch, /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 4 }, @@ -29994,6 +29481,7 @@ icon_state = "intact-scrubbers"; dir = 4 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_ridged, /area/shuttle/excursion/tether) "ZM" = ( @@ -30005,17 +29493,12 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/security/eva) -"ZQ" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/shuttle/floor/black, -/area/space) "ZT" = ( /obj/effect/floor_decal/industrial/hatch/yellow, -/obj/structure/cable/cyan, -/obj/machinery/power/apc{ - dir = 2; - name = "south bump"; - pixel_y = -28 +/obj/machinery/alarm{ + dir = 1; + icon_state = "alarm0"; + pixel_y = -22 }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) @@ -30027,17 +29510,12 @@ pixel_y = -26 }, /turf/simulated/floor/tiled, -/area/tether/exploration) +/area/shuttle/excursion/tether) "ZW" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "ZX" = ( @@ -40751,8 +40229,8 @@ cK cK XE Zd -UK -UK +dj +dj cK ms Oz @@ -40881,19 +40359,19 @@ bX cE cK cK -UK -UK +dj +dj Wx -UK +dj Wx -UK +dj Wx -UK -UK -UK +dj +dj +dj Zy WG -UK +dj XA SY ms @@ -41023,10 +40501,10 @@ cp cE cK cK -UK +dj Tl ZU -UK +dj Vf VE Vw @@ -41164,7 +40642,7 @@ be bX cE cK -UK +dj dj dW UB @@ -41299,19 +40777,19 @@ aa aa aa aa -TV +aa aa aa be bX cE cK -di +VB dy dY Tu dj -eR +UE Wg YI dj @@ -41320,7 +40798,7 @@ Zk WR ZT iX -Vo +ZD cK ms nz @@ -41438,7 +40916,7 @@ aa aa aa aa -WC +aa aa aa aa @@ -41447,7 +40925,7 @@ aa be bX cE -UK +dj dj dj dj @@ -41459,7 +40937,7 @@ Vm dj Xa jZ -Vq +WR Xo XN SY @@ -41573,14 +41051,14 @@ aa aa aa aa -VA -VS -XO -VA -VA -ZK aa -Uo +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -41593,9 +41071,9 @@ VB Vu dC ea -er +fj ea -Uk +UE fj Ys ea @@ -41715,14 +41193,14 @@ aa aa aa aa -VA aa -WL -ZQ -YR -VA aa -UQ +aa +aa +aa +aa +aa +aa aa aa aa @@ -41857,12 +41335,12 @@ aa aa aa aa -VA aa -WL -ZQ -YR -VA +aa +aa +aa +aa +aa aa aa aa @@ -41877,7 +41355,7 @@ VB WD dE dj -Zg +fj dj dj fx @@ -41999,23 +41477,23 @@ aa aa aa aa -VA -aa -WL -Zw -ZK -VA aa aa aa aa -TV +aa +aa +aa +aa +aa +aa +aa aa aa be bX cE -UK +dj dj dj dj @@ -42141,12 +41619,12 @@ aa aa aa aa -Uv -Yx -XS -ZQ -XJ -Zc +aa +aa +aa +aa +aa +aa aa aa aa @@ -42158,7 +41636,7 @@ be bX cE cK -di +VB Tq ec Xk @@ -42283,12 +41761,12 @@ aa aa aa aa -Vs -Vx -Vx -ZQ -Vx -Zc +aa +aa +aa +aa +aa +aa aa aa aa @@ -42300,7 +41778,7 @@ be bX cE cK -UK +dj dj eg Xl @@ -42443,10 +41921,10 @@ cp cE cK cK -UK +dj UO Xp -UK +dj UM TJ ZX @@ -42585,19 +42063,19 @@ bX cE cK cK -UK -UK +dj +dj SQ -UK -UK -UK +dj +dj +dj UR UR VQ Ws ZE ZB -UK +dj XB SY ms @@ -42739,8 +42217,8 @@ cK cK cK cK -UK -UK +dj +dj cK ms mq @@ -42855,12 +42333,12 @@ aa aa aa aa -VA aa -Wm -WJ -WJ -SR +aa +aa +aa +aa +aa aa aa aa @@ -42997,12 +42475,12 @@ aa aa aa aa -VA aa aa aa -WH -SR +aa +aa +aa aa aa aa @@ -43139,12 +42617,12 @@ aa aa aa aa -VA aa aa aa -Vi -VA +aa +aa +aa aa aa aa @@ -43281,12 +42759,12 @@ aa aa aa aa -VA aa aa aa -Wj -VA +aa +aa +aa aa aa aa @@ -43423,12 +42901,12 @@ aa aa aa aa -VA -Xy -Zv -Xt -UZ -ZK +aa +aa +aa +aa +aa +aa aa aa aa @@ -43704,13 +43182,13 @@ aa aa aa aa -Zc -VA -YC -VA aa -VA -VA +aa +aa +aa +aa +aa +aa aa aa aa @@ -43846,12 +43324,12 @@ aa aa aa aa -VA -ZK aa -VA aa -Wu +aa +aa +aa +aa aa aa aa @@ -43988,12 +43466,12 @@ aa aa aa aa -Vy aa aa -VA aa -Vx +aa +aa +aa aa aa aa @@ -44130,13 +43608,13 @@ aa aa aa aa -Vy aa -WQ -Uv -UH -Vx -Xq +aa +aa +aa +aa +aa +aa aa aa aa @@ -44274,11 +43752,11 @@ aa aa aa aa -Vx -Vs -Vx -Vx -Vx +aa +aa +aa +aa +aa aa aa aa @@ -44416,10 +43894,10 @@ aa aa aa aa -WQ -Uv -UH -Vx +aa +aa +aa +aa aa aa aa @@ -44558,11 +44036,11 @@ aa aa aa aa -Vx -Xg -UH -Vx -Xq +aa +aa +aa +aa +aa aa aa aa @@ -44698,13 +44176,13 @@ aa aa aa aa -VA -ZK aa -VA -UH -YY -Xq +aa +aa +aa +aa +aa +aa aa aa aa @@ -44840,13 +44318,13 @@ aa aa aa aa -Zc -VA -UY -VA aa -VA -VA +aa +aa +aa +aa +aa +aa aa aa aa