From 47fced18436f8e5facf2a2aac2e825d7d6a6f4f4 Mon Sep 17 00:00:00 2001 From: Mazian Date: Fri, 19 Jan 2024 17:08:11 -0500 Subject: [PATCH] adds a second elevator to tether (#6282) --- code/game/area/Tether_areas.dm | 40 + code/modules/turbolift/turbolift_map.dm | 1 + maps/generic/turbolifts.dm | 11 + maps/tether/levels/midpoint.dmm | 1667 +++++++++++++++-------- maps/tether/levels/station1.dmm | 343 +++-- maps/tether/levels/station2.dmm | 1009 +++++++------- maps/tether/levels/surface1.dmm | 1176 ++++++++-------- maps/tether/levels/surface2.dmm | 1273 +++++++++-------- maps/tether/levels/surface3.dmm | 1576 ++++++++++++--------- 9 files changed, 3917 insertions(+), 3179 deletions(-) diff --git a/code/game/area/Tether_areas.dm b/code/game/area/Tether_areas.dm index d0dcba548a4..95783f74638 100644 --- a/code/game/area/Tether_areas.dm +++ b/code/game/area/Tether_areas.dm @@ -58,6 +58,43 @@ lift_floor_name = "Chapel, Cargo, EVA, Gateway" lift_announce_str = "Arriving at Station Level 2." +/area/turbolift/tether/elevator_two/transit + name = "tether (midway)" + lift_floor_label = "Tether Midpoint" + lift_floor_name = "Midpoint" + lift_announce_str = "Arriving at tether midway point." + delay_time = 5 SECONDS + +/area/turbolift/t_surface/elevator_two/level1 + name = "surface (level 1)" + lift_floor_label = "Surface 1" + lift_floor_name = "Tram, Dorms, Mining, Surf. EVA" + lift_announce_str = "Arriving at Base Level 1." + +/area/turbolift/t_surface/elevator_two/level2 + name = "surface (level 2)" + lift_floor_label = "Surface 2" + lift_floor_name = "Atmos, Maintenance" + lift_announce_str = "Arriving at Base Level 2." + +/area/turbolift/t_surface/elevator_two/level3 + name = "surface (level 3)" + lift_floor_label = "Surface 3" + lift_floor_name = "Bar, Bridge, Pool, Science" + lift_announce_str = "Arriving at Base Level 3." + +/area/turbolift/t_station/elevator_two/level1 + name = "asteroid (level 1)" + lift_floor_label = "Asteroid 1" + lift_floor_name = "AI Core, Eng, Exploration, Secondary Bridge" + lift_announce_str = "Arriving at Station Level 1." + +/area/turbolift/t_station/elevator_two/level2 + name = "asteroid (level 2)" + lift_floor_label = "Asteroid 2" + lift_floor_name = "Chapel, Cargo, EVA, Gateway" + lift_announce_str = "Arriving at Station Level 2." + /area/vacant/vacant_restaurant_upper name = "\improper Vacant Restaurant" icon_state = "vacant_site" @@ -1443,6 +1480,9 @@ requires_power = FALSE +/area/tether/elevator/two + name = "\improper Tether Elevator Two" + /area/tether/midpoint name = "\improper Tether Midpoint" diff --git a/code/modules/turbolift/turbolift_map.dm b/code/modules/turbolift/turbolift_map.dm index 28dc4a09f6d..b9995571d4b 100644 --- a/code/modules/turbolift/turbolift_map.dm +++ b/code/modules/turbolift/turbolift_map.dm @@ -200,6 +200,7 @@ qdel(thing) if(checking.type == floor_type) // Don't build over empty space on lower levels. var/obj/machinery/door/airlock/lift/newdoor = new door_type(checking) + newdoor.setDir(got_rotated_by_maploader ? got_rotated_by_maploader : dir) if(internal) lift.doors += newdoor newdoor.lift = cfloor diff --git a/maps/generic/turbolifts.dm b/maps/generic/turbolifts.dm index 17782312088..73fd8510eb0 100644 --- a/maps/generic/turbolifts.dm +++ b/maps/generic/turbolifts.dm @@ -94,6 +94,17 @@ /area/turbolift/t_station/level2 ) +/obj/turbolift_map_holder/tether/two + dir = WEST + areas_to_use = list( + /area/turbolift/t_surface/elevator_two/level1, + /area/turbolift/t_surface/elevator_two/level2, + /area/turbolift/t_surface/elevator_two/level3, + /area/turbolift/tether/elevator_two/transit, + /area/turbolift/t_station/elevator_two/level1, + /area/turbolift/t_station/elevator_two/level2 + ) + /**Euthenia Lifts */ diff --git a/maps/tether/levels/midpoint.dmm b/maps/tether/levels/midpoint.dmm index 566ddf7ed85..3e10839ea87 100644 --- a/maps/tether/levels/midpoint.dmm +++ b/maps/tether/levels/midpoint.dmm @@ -15,11 +15,32 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) +"ak" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/obj/machinery/air_alarm{ + pixel_y = 26 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "aP" = ( /obj/effect/blocker, /obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, /turf/simulated/sky/virgo3b, /area/tether/transit) +"aS" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 6 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "bq" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -27,6 +48,9 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) +"bS" = ( +/turf/simulated/open, +/area/tether/elevator) "bU" = ( /obj/structure/cable{ icon_state = "2-8" @@ -58,6 +82,49 @@ }, /turf/simulated/floor/plating, /area/maintenance/tether_midpoint) +"dz" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/green/bordercorner, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"eB" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/obj/machinery/camera/network/civilian, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"gm" = ( +/turf/simulated/open, +/area/tether/elevator/two) +"gH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "gQ" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -72,34 +139,89 @@ /obj/structure/grille, /turf/simulated/floor/plating, /area/maintenance/tether_midpoint) -"ir" = ( -/turf/simulated/sky/virgo3b, -/area/tether/transit) +"in" = ( +/obj/machinery/air_alarm{ + pixel_y = 26 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/bordercorner{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"iR" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "jC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, /turf/simulated/floor/wood, /area/tether/midpoint) +"ku" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/monodark, +/area/tether/midpoint) "kY" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/tether/elevator) "lq" = ( /turf/simulated/floor/wood, /area/tether/midpoint) +"mr" = ( +/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, +/obj/effect/blocker, +/turf/simulated/sky/virgo3b, +/area/tether/transit) "mP" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/midpoint) -"ns" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/tether/midpoint) -"nz" = ( -/turf/simulated/floor/tiled/dark, -/area/tether/midpoint) "nM" = ( /obj/structure/table/gamblingtable, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -136,6 +258,12 @@ /obj/machinery/vending/boozeomat, /turf/simulated/floor/wood, /area/tether/midpoint) +"oZ" = ( +/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, +/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, +/obj/effect/blocker, +/turf/simulated/sky/virgo3b, +/area/tether/transit) "pc" = ( /obj/structure/table/gamblingtable, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -144,10 +272,26 @@ /turf/simulated/floor/wood, /area/tether/midpoint) "qm" = ( -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) +"qp" = ( +/turf/simulated/floor/tiled/monodark, +/area/tether/midpoint) +"rh" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/monodark, +/area/tether/midpoint) "sg" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -193,11 +337,17 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) -"vf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable{ - icon_state = "1-2" +"tk" = ( +/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, +/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, +/turf/simulated/sky/virgo3b, +/area/tether/transit) +"uz" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) @@ -228,37 +378,42 @@ /obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, /turf/simulated/sky/virgo3b, /area/tether/transit) -"yj" = ( -/obj/machinery/holoposter{ - pixel_y = -30 +"yx" = ( +/obj/machinery/light{ + dir = 1 }, -/obj/structure/cable{ - icon_state = "1-4" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) "yF" = ( -/obj/machinery/air_alarm{ - pixel_y = 26 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable{ - icon_state = "2-8" + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 9 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) "zk" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/computer/timeclock/premade/east, -/turf/simulated/floor/tiled/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/monodark, /area/tether/midpoint) "zm" = ( /obj/machinery/light/small{ @@ -292,6 +447,18 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/open, /area/maintenance/tether_midpoint) +"AL" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/obj/machinery/camera/network/civilian{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "AM" = ( /obj/structure/table/woodentable, /obj/machinery/camera/network/civilian{ @@ -313,6 +480,28 @@ /obj/structure/disposalpipe/up, /turf/simulated/floor/plating, /area/maintenance/tether_midpoint) +"Ch" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"CE" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/tether/elevator/two) "CI" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -340,8 +529,10 @@ /turf/simulated/floor/wood, /area/tether/midpoint) "DG" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled/monodark, /area/tether/midpoint) "Ea" = ( /obj/structure/table/woodentable, @@ -377,19 +568,49 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) -"Hx" = ( +"Hl" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"Hu" = ( +/obj/machinery/light, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/green/border, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"Hx" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/bordercorner{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) "Id" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass{ - dir = 1 +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/floor_decal/corner/green/border{ + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) @@ -400,15 +621,34 @@ /obj/machinery/disposal, /turf/simulated/floor/wood, /area/tether/midpoint) +"Ix" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "IR" = ( /obj/structure/table/bench/padded, /turf/simulated/floor/wood, /area/tether/midpoint) -"Ji" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +"Jc" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/monodark, +/area/tether/midpoint) +"Ji" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/monodark, /area/tether/midpoint) "Jt" = ( /obj/machinery/light{ @@ -425,6 +665,15 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) +"Kf" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 10 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "Kk" = ( /obj/structure/table/gamblingtable, /obj/item/reagent_containers/food/drinks/shaker, @@ -436,6 +685,23 @@ /obj/random/plushie, /turf/simulated/floor/plating, /area/maintenance/tether_midpoint) +"LU" = ( +/obj/machinery/holoposter{ + pixel_y = -30 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border, +/obj/effect/floor_decal/corner/green/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "NI" = ( /obj/structure/table/woodentable, /obj/machinery/chemical_dispenser/catering/bar_soft{ @@ -456,28 +722,15 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) -"Ov" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/dark, -/area/tether/midpoint) "PV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/machinery/light{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) @@ -499,10 +752,98 @@ /turf/simulated/floor/wood, /area/tether/midpoint) "Rd" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/bordercorner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"Rk" = ( +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/green/border, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"So" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 6 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"Sy" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/green/border, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"SE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"SY" = ( /obj/machinery/fire_alarm/north_mount, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 5 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 5 + }, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) "TY" = ( @@ -514,16 +855,42 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) +"UI" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 9 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "Vk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/wood, /area/tether/midpoint) +"VH" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/green/border, +/obj/machinery/camera/network/civilian{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "VM" = ( /obj/machinery/light, /turf/simulated/floor/wood, /area/tether/midpoint) +"Wh" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "Wz" = ( /obj/structure/table/woodentable, /obj/machinery/chemical_dispenser/catering/bar_alc{ @@ -531,6 +898,28 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) +"Xf" = ( +/turf/simulated/wall/prepainted, +/area/tether/transit) +"XL" = ( +/obj/structure/aquarium/prefilled, +/turf/simulated/floor/tiled/monodark, +/area/tether/midpoint) +"XM" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/tether/elevator/two) +"XU" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "XZ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -540,6 +929,29 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/open, /area/maintenance/tether_midpoint) +"Ya" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border, +/obj/effect/floor_decal/corner/green/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "Yc" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -557,12 +969,46 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/tether_midpoint) +"YH" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"YS" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/machinery/computer/timeclock/premade/east, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"YT" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/green/border, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "YW" = ( /obj/structure/bed/chair/comfy/black{ dir = 4 }, /turf/simulated/floor/wood, /area/tether/midpoint) +"Zf" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 5 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "Zy" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -586,6 +1032,17 @@ "ZM" = ( /turf/simulated/wall/prepainted, /area/tether/midpoint) +"ZQ" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/bordercorner, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) (1,1,1) = {" xd @@ -23155,10 +23612,10 @@ yi hi sg qm -kY -kY -kY -kY +bS +bS +bS +bS qm il hi @@ -23349,10 +23806,10 @@ yi hi sg qm -kY -kY -kY -kY +bS +bS +bS +bS qm vA hi @@ -23543,10 +24000,10 @@ yi hi sg qm -kY -kY -kY -kY +bS +bS +bS +bS qm vA hi @@ -23737,10 +24194,10 @@ yi hi sg qm -kY -kY -kY -kY +bS +bS +bS +bS qm LL hi @@ -24121,18 +24578,18 @@ yi yi yi yi -yi +Xf ZM yF -Ov -vf -vf -vf +PV +Id +Id +Id Id PV -yj +Kf ZM -yi +Xf yi yi yi @@ -24315,18 +24772,18 @@ yi yi yi yi -ZM -ZM +mP +UI Rd Ji -ns -nz -nz +zk +zk +zk zk DG Hx -ZM -ZM +Kf +mP yi yi yi @@ -24510,16 +24967,16 @@ yi yi yi mP -CN -Og -bY -ZM -Ke -PZ -ZM -Vk -bU -Jt +uz +rh +Jc +XL +XL +XL +XL +ku +qp +YT mP yi yi @@ -24704,16 +25161,16 @@ yi yi yi mP -YW -Og -sR -ZM -ZM -ZM -ZM -ZA -lq -YW +uz +rh +qp +qp +qp +qp +qp +qp +qp +YT mP yi yi @@ -24897,18 +25354,18 @@ yi yi yi yi -mP -Ea -Og -bY -AV -sQ -sQ -ad -Vk -lq -AM -mP +ZM +ak +dz +Wh +Wh +Wh +Wh +AL +Wh +YH +YT +ZM yi yi yi @@ -25092,16 +25549,16 @@ yi yi yi mP -As -Og -bY -IR -IR -IR -IR -Vk -lq -As +uz +Hu +XM +XM +CE +CE +XM +XM +yx +YT mP yi yi @@ -25286,16 +25743,16 @@ yi yi yi mP -ZL -Og -jC -aj -lq -lq -sM -oe -lq -ZL +uz +Sy +XM +gm +gm +gm +gm +XM +uz +YT mP yi yi @@ -25480,16 +25937,16 @@ yi yi yi mP -YW -Og -IR -He -IR -IR -NS -IR -lq -YW +uz +Sy +XM +gm +gm +gm +gm +XM +uz +YT mP yi yi @@ -25673,18 +26130,18 @@ yi yi yi yi -mP -sQ -Og -QN -pc -Kk -QN -nM -QN -lq -sQ -mP +ZM +eB +Sy +XM +gm +gm +gm +gm +XM +uz +VH +ZM yi yi yi @@ -25868,16 +26325,16 @@ yi yi yi mP -As -bq -vu -gQ -lq -lq -lq -QG -lq -As +Zf +Ya +XM +gm +gm +gm +gm +XM +ZQ +aS mP yi yi @@ -26061,18 +26518,18 @@ yi yi yi yi -mP -mP -mP ZM -TY -lq -lq -VM ZM -mP -mP -mP +iR +XM +XM +XM +XM +XM +XM +Rk +ZM +ZM yi yi yi @@ -26255,18 +26712,18 @@ yi yi yi yi -yi -yi -yi -mP -Io -Wz -NI -oo -mP -yi -yi -yi +ZM +ZM +in +Ch +gH +gH +gH +gH +SE +LU +ZM +ZM yi yi yi @@ -26449,18 +26906,18 @@ yi yi yi yi -yi -yi -yi -mP -mP -mP -mP -mP -mP -yi -yi -yi +ZM +ZM +SY +Ix +XU +Wh +Wh +YS +Hl +So +ZM +ZM yi yi yi @@ -26643,18 +27100,18 @@ yi yi yi yi -yi -yi -yi -ir -ir -ir -ir -ir -ir -yi -yi -yi +mP +CN +Og +bY +ZM +Ke +PZ +ZM +Vk +bU +Jt +mP yi yi yi @@ -26837,18 +27294,18 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +mP +YW +Og +sR +ZM +ZM +ZM +ZM +ZA +lq +YW +mP yi yi yi @@ -27031,18 +27488,18 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +mP +Ea +Og +bY +AV +sQ +sQ +ad +Vk +lq +AM +mP yi yi yi @@ -27225,18 +27682,18 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +mP +As +Og +bY +IR +IR +IR +IR +Vk +lq +As +mP yi yi yi @@ -27419,18 +27876,18 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +mP +ZL +Og +jC +aj +lq +lq +sM +oe +lq +ZL +mP yi yi yi @@ -27613,18 +28070,18 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +mP +YW +Og +IR +He +IR +IR +NS +IR +lq +YW +mP yi yi yi @@ -27797,34 +28254,34 @@ yi yi yi aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +mP +sQ +Og +QN +pc +Kk +QN +nM +QN +lq +sQ +mP +yi +yi +yi +yi +yi +yi aP yi yi @@ -27990,6 +28447,7 @@ yi yi yi yi +mr yi yi yi @@ -28000,26 +28458,25 @@ yi yi yi yi +mP +As +bq +vu +gQ +lq +lq +lq +QG +lq +As +mP yi yi yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +mr yi yi yi @@ -28184,6 +28641,7 @@ yi yi yi yi +mr yi yi yi @@ -28194,26 +28652,25 @@ yi yi yi yi +mP +mP +mP +ZM +TY +lq +lq +VM +ZM +mP +mP +mP yi yi yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +mr yi yi yi @@ -28378,6 +28835,7 @@ yi yi yi yi +mr yi yi yi @@ -28391,6 +28849,12 @@ yi yi yi yi +mP +Io +Wz +NI +oo +mP yi yi yi @@ -28400,14 +28864,7 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi +mr yi yi yi @@ -28572,6 +29029,7 @@ yi yi yi yi +mr yi yi yi @@ -28585,6 +29043,12 @@ yi yi yi yi +mP +mP +mP +mP +mP +mP yi yi yi @@ -28594,14 +29058,7 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi +mr yi yi yi @@ -28766,6 +29223,17 @@ yi yi yi yi +mr +yi +yi +yi +yi +yi +yi +yi +yi +yi +tk yi yi yi @@ -28784,18 +29252,7 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +mr yi yi yi @@ -28960,6 +29417,17 @@ yi yi yi yi +mr +yi +yi +yi +yi +yi +yi +yi +yi +yi +tk yi yi yi @@ -28978,18 +29446,7 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +mr yi yi yi @@ -29154,6 +29611,17 @@ yi yi yi yi +mr +yi +yi +yi +yi +yi +yi +yi +yi +yi +tk yi yi yi @@ -29172,18 +29640,7 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +mr yi yi yi @@ -29348,6 +29805,17 @@ yi yi yi yi +mr +yi +yi +yi +yi +yi +yi +yi +yi +yi +tk yi yi yi @@ -29366,18 +29834,7 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +mr yi yi yi @@ -29542,36 +29999,36 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +oZ +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr yi yi yi @@ -29746,19 +30203,19 @@ yi yi yi yi +tk +tk +tk +tk yi yi yi yi yi yi -yi -yi -yi -yi -yi -yi -yi +tk +tk +tk yi yi yi @@ -29940,19 +30397,19 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk yi yi yi @@ -30718,23 +31175,23 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -xd -xd -xd -xd -yi -yi +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk yi yi yi @@ -30923,10 +31380,10 @@ yi yi yi yi -xd -xd -xd -xd +yi +yi +yi +yi yi yi yi @@ -31100,7 +31557,20 @@ xd xd xd xd -xd +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +yi +tk +yi yi yi yi @@ -31108,19 +31578,6 @@ yi yi yi yi -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd yi yi yi @@ -31294,27 +31751,6 @@ xd xd xd xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd yi yi yi @@ -31327,6 +31763,27 @@ yi yi yi yi +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi yi yi yi @@ -31488,29 +31945,29 @@ xd xd xd xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -yi +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk yi +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk yi yi yi @@ -31682,27 +32139,27 @@ xd xd xd xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi yi yi yi @@ -31876,30 +32333,30 @@ xd xd xd xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +yi +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +yi xd xd xd @@ -32070,30 +32527,30 @@ xd xd xd xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi xd xd xd diff --git a/maps/tether/levels/station1.dmm b/maps/tether/levels/station1.dmm index b2600873fa9..f507b9ed277 100644 --- a/maps/tether/levels/station1.dmm +++ b/maps/tether/levels/station1.dmm @@ -3046,6 +3046,12 @@ }, /turf/simulated/floor/tiled/white, /area/hallway/secondary/escape/medical_escape_pod_hallway) +"fY" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) "fZ" = ( /obj/machinery/computer/station_alert/all{ dir = 4 @@ -4873,8 +4879,8 @@ /area/bridge/secondary) "jX" = ( /obj/machinery/door/airlock/multi_tile/metal{ - name = "Cryogenic Storage"; - dir = 8 + dir = 8; + name = "Cryogenic Storage" }, /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -5375,15 +5381,13 @@ dir = 4 }, /obj/machinery/door/airlock/multi_tile/metal/mait{ - name = "Maintenance Access"; - dir = 4 + dir = 4; + name = "Maintenance Access" }, /turf/simulated/floor/tiled, /area/hallway/station/docks) "kX" = ( -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) "kY" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ @@ -9495,6 +9499,9 @@ "ts" = ( /turf/simulated/floor/wood/broken, /area/maintenance/station/eng_lower) +"tt" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/tether/elevator/two) "tu" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -12878,15 +12885,15 @@ "AE" = ( /obj/machinery/door/blast/regular{ density = 0; + dir = 4; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; - opacity = 0; - dir = 4 + opacity = 0 }, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ - name = "CE Polarized"; - id = "ce_office" + id = "ce_office"; + name = "CE Polarized" }, /obj/effect/paint_stripe/sun, /turf/simulated/floor, @@ -13981,8 +13988,8 @@ /area/maintenance/abandonedlibrary) "CK" = ( /obj/machinery/door/airlock/multi_tile/metal/mait{ - req_one_access = list(5,67); - dir = 4 + dir = 4; + req_one_access = list(5,67) }, /obj/machinery/door/firedoor/glass, /obj/structure/cable{ @@ -16546,6 +16553,9 @@ /obj/machinery/light/flamp/noshade, /turf/simulated/floor/grass, /area/hallway/station/atrium) +"HS" = ( +/turf/simulated/open, +/area/tether/elevator/two) "HV" = ( /turf/simulated/wall/prepainted/engineering, /area/engineering/hallway) @@ -18505,16 +18515,9 @@ /obj/random/cutout, /turf/simulated/floor, /area/constructionsite) -"LS" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) +"LU" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/tether/elevator/two) "LV" = ( /obj/machinery/sleeper{ dir = 4 @@ -18805,8 +18808,8 @@ "Mz" = ( /obj/structure/cable/green, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ - name = "CE Polarized"; - id = "ce_office" + id = "ce_office"; + name = "CE Polarized" }, /obj/effect/paint_stripe/sun, /turf/simulated/floor, @@ -21078,13 +21081,6 @@ "Rs" = ( /turf/simulated/wall/prepainted/engineering/atmos, /area/engineering/atmos/backup) -"Rt" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/simulated/floor/grass, -/area/hallway/station/atrium) "Ru" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -22361,9 +22357,7 @@ /area/hallway/station/docks) "TO" = ( /obj/structure/sign/deck1, -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) "TP" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -25144,6 +25138,9 @@ }, /turf/simulated/floor, /area/constructionsite) +"Zv" = ( +/turf/simulated/open, +/area/tether/elevator) "Zw" = ( /turf/simulated/mineral/vacuum, /area/mine/explored/upper_level) @@ -47986,10 +47983,10 @@ qU Sa IW kX -uW -uW -uW -uW +Zv +Zv +Zv +Zv kX fz ek @@ -48180,10 +48177,10 @@ mj yI IW kX -uW -uW -uW -uW +Zv +Zv +Zv +Zv kX fz sT @@ -48374,10 +48371,10 @@ IW IW IW kX -uW -uW -uW -uW +Zv +Zv +Zv +Zv kX fz Tg @@ -48568,10 +48565,10 @@ GX ym UX kX -uW -uW -uW -uW +Zv +Zv +Zv +Zv kX fz Cp @@ -49731,12 +49728,12 @@ gq Fo az az -Fo -rQ ui +OA +OA +OA +dz ui -rQ -Fo Fo Fo Fo @@ -49925,13 +49922,13 @@ Fo Fo Ld UA +LU +LU +tt +tt +LU +LU Fo -Fo -ui -ui -Fo -Hy -UA Qe uy Fo @@ -50119,13 +50116,13 @@ Fo Fo tx tx +LU +HS +HS +HS +HS +LU Fo -Fo -ui -ui -Fo -Hy -Ie gZ el Fo @@ -50313,13 +50310,13 @@ Fo mL sR mL -sR -uM -ui -ui -sR -Hy -UA +LU +HS +HS +HS +HS +LU +Fo xT el Fo @@ -50504,15 +50501,15 @@ ZP RV cf sR -NI -NI -NI -NI -NI -NI -hJ -hJ -mL +Fo +Fo +Fo +LU +HS +HS +HS +HS +LU Fo Dq Ub @@ -50698,17 +50695,17 @@ iD pU cf uM -fQ -ho -ho -ho -ho -Ka -PC -hJ -sR Fo -UA +Fo +Fo +LU +HS +HS +HS +HS +LU +Fo +Ie UA Fo SA @@ -50891,16 +50888,16 @@ bZ iD pU cf -ui -qt -hJ -hJ -hJ -hJ -Ka -PC -hJ -HR +Fo +Fo +Fo +Fo +LU +LU +LU +LU +LU +LU Fo tx tx @@ -51086,17 +51083,17 @@ iD pU cf ui -iJ -hk -iq -eb -hJ -SE -PC -hJ ui ui ui +fY +ui +ui +ui +ui +fY +ui +ui ui ui cf @@ -51278,21 +51275,21 @@ Vv Fd iD Vn -KB -rj -vq -le -pV -Tk +cf +NI +NI +NI +NI +NI hJ -SE -PC hJ ui ui ui ui ui +ui +ui cf vg PW @@ -51473,15 +51470,15 @@ iD iD lm cf -ui -Mg -hJ -hJ -hJ -hJ -Ka +fQ +ho +ho +ho +ho +SE PC -hJ +ui +Fo HR Fo az @@ -51667,15 +51664,15 @@ zK au Uq cf -uM -pg -RY -RY -RY -RY -Ka -PC +qt hJ +hJ +hJ +hJ +SE +PC +ui +Fo sR Fo ON @@ -51861,15 +51858,15 @@ GG au SQ cf -sR -fH -fH -fH -fH -fH -fH -hJ +iJ +hk +iq +eb hJ +SE +PC +ui +Fo mL Fo Bx @@ -52054,14 +52051,14 @@ QO Om au Jv -cf -Fo -mL -sR -mL -sR -uM -ui +KB +vq +le +pV +Tk +hJ +SE +PC ui sR Hy @@ -52249,13 +52246,13 @@ OU au Vn cf -Fo -Fo -az -az -Fo -Fo -ui +Mg +hJ +hJ +hJ +hJ +Ka +PC ui Fo Hy @@ -52443,13 +52440,13 @@ lQ au Fz cf -Fo -Fo -ON -UA -Fo -Fo -ui +pg +RY +RY +RY +RY +Ka +PC ui Fo Hy @@ -52637,13 +52634,13 @@ Dy au IE yy -Rt -Fo -tx -tx -Fo -rQ -ui +fH +fH +fH +fH +fH +fH +hJ ui rQ Fo @@ -52831,7 +52828,7 @@ lV au by SF -LS +lM rj rj rj diff --git a/maps/tether/levels/station2.dmm b/maps/tether/levels/station2.dmm index 06dbb8d45c2..8f90ad6c99b 100644 --- a/maps/tether/levels/station2.dmm +++ b/maps/tether/levels/station2.dmm @@ -308,22 +308,20 @@ /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "aK" = ( -/obj/machinery/light, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, /obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor{ dir = 8 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -22 +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) @@ -665,8 +663,6 @@ /turf/simulated/floor/tiled, /area/security/customs) "bu" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, @@ -676,6 +672,12 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/lightgrey/bordercorner, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "bv" = ( @@ -761,8 +763,8 @@ /area/quartermaster/foyer) "bC" = ( /obj/machinery/door/airlock/maintenance/cargo{ - req_one_access = list(1,5,31,38,47,48); - name = "Magmatic Rift Leap Pad" + name = "Magmatic Rift Leap Pad"; + req_one_access = list(1,5,31,38,47,48) }, /turf/simulated/floor/tiled, /area/quartermaster/office) @@ -927,6 +929,16 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) +"bS" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "bT" = ( /obj/structure/bed/chair{ dir = 4 @@ -1215,29 +1227,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/quartermaster/foyer) -"cB" = ( -/obj/machinery/computer/guestpass{ - pixel_y = 32 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "cC" = ( /turf/space, /area/mine/explored/upper_level) @@ -1290,8 +1279,8 @@ /area/quartermaster/foyer) "cF" = ( /obj/machinery/door/airlock/multi_tile/glass{ - name = "Chapel Services"; - dir = 8 + dir = 8; + name = "Chapel Services" }, /obj/machinery/door/firedoor{ dir = 8 @@ -1842,13 +1831,14 @@ /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) "dP" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) @@ -2199,9 +2189,7 @@ /area/vacant/vacant_restaurant_upper) "ez" = ( /obj/structure/sign/deck2, -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) "eA" = ( /obj/machinery/suit_cycler/pilot, @@ -2736,19 +2724,6 @@ /obj/structure/sign/department/chapel, /turf/simulated/wall/prepainted/civilian, /area/hallway/station/port) -"fD" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "fE" = ( /obj/structure/sign/directions/evac, /turf/simulated/wall/prepainted, @@ -3089,12 +3064,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "gu" = ( @@ -3205,6 +3180,29 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) +"gF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "gG" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -3578,9 +3576,9 @@ /area/engineering/foyer_mezzenine) "hq" = ( /obj/machinery/door/airlock/voidcraft{ - name = "mining outpost ferry hatch"; + frequency = 2020; id_tag = "mining_docking"; - frequency = 2020 + name = "mining outpost ferry hatch" }, /turf/simulated/shuttle/floor/voidcraft/dark, /area/shuttle/mining_outpost/shuttle) @@ -4419,28 +4417,6 @@ }, /turf/space, /area/space) -"iW" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/item/radio/intercom{ - dir = 4; - pixel_x = 24 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "iX" = ( /obj/machinery/light/spot{ dir = 8; @@ -4923,6 +4899,22 @@ /obj/item/folder/red, /turf/simulated/floor/wood, /area/tether/station/visitorhallway/office) +"jY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor, +/area/maintenance/station/cargo) "jZ" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 @@ -6397,24 +6389,6 @@ /obj/machinery/holopad, /turf/simulated/floor/tiled/monotile, /area/quartermaster/office) -"mV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "mW" = ( /obj/machinery/light{ dir = 1 @@ -6834,7 +6808,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "nS" = ( @@ -7108,7 +7085,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "ou" = ( @@ -7130,20 +7106,6 @@ }, /turf/simulated/floor/wood, /area/tether/exploration/pathfinder_office) -"ox" = ( -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/lightgrey/bordercorner, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "oy" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -7241,19 +7203,6 @@ /obj/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) -"oJ" = ( -/obj/machinery/power/apc/south_mount, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/structure/cable, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "oK" = ( /obj/machinery/air_alarm{ dir = 4; @@ -7798,6 +7747,16 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/chapel/main) +"pQ" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor, +/area/maintenance/station/cargo) "pR" = ( /obj/machinery/light, /obj/structure/bed/chair/shuttle{ @@ -7865,11 +7824,12 @@ /obj/machinery/status_display{ pixel_y = 30 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + icon_state = "2-4" }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) @@ -7918,23 +7878,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/quartermaster/foyer) -"qb" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/machinery/door/firedoor{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/structure/sign/poster/nanotrasen{ - pixel_y = -32 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "qc" = ( /obj/machinery/newscaster{ pixel_x = 28 @@ -8317,18 +8260,9 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/effect/floor_decal/borderfloor{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "qS" = ( @@ -8747,6 +8681,9 @@ /obj/effect/floor_decal/corner/lightgrey/bordercorner2{ dir = 5 }, +/obj/machinery/camera/network/tether{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/hallway/station/port) "rH" = ( @@ -9053,6 +8990,32 @@ /obj/structure/sign/warning/secure_area, /turf/simulated/wall/r_wall/prepainted/command, /area/security/nuke_storage) +"sn" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) +"so" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "sp" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/sleep/spacedorm1) @@ -9260,8 +9223,8 @@ /area/hallway/station/port) "sL" = ( /obj/machinery/door/airlock/multi_tile/glass{ - name = "Stairwell"; - dir = 8 + dir = 8; + name = "Stairwell" }, /obj/effect/floor_decal/steeldecal/steel_decals_central1, /obj/machinery/door/firedoor/glass, @@ -9359,15 +9322,6 @@ }, /turf/simulated/floor, /area/maintenance/station/cargo) -"sT" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "sU" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -9533,26 +9487,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/lounge) -"tk" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/machinery/fire_alarm/north_mount, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "tl" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -9795,8 +9729,16 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor, -/area/maintenance/station/cargo) +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "tL" = ( /obj/machinery/power/apc/east_mount, /obj/structure/cable{ @@ -9944,25 +9886,6 @@ /obj/random/contraband, /turf/simulated/floor/tiled/dark, /area/tether/station/visitorhallway/lounge) -"ua" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "ub" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, @@ -10111,6 +10034,15 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/port) +"ut" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "uu" = ( /turf/simulated/mineral/floor/vacuum, /area/mine/explored/upper_level) @@ -10392,7 +10324,7 @@ pixel_x = -22 }, /turf/simulated/floor/tiled, -/area/hallway/station/port) +/area/hallway/station/starboard) "uR" = ( /obj/structure/disposalpipe/segment, /obj/spawner/window/low_wall/reinforced/full/firelocks, @@ -10771,9 +10703,6 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "vD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -11189,21 +11118,16 @@ /turf/simulated/floor/tiled, /area/engineering/locker_room) "ws" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "wt" = ( @@ -11301,6 +11225,19 @@ /obj/map_helper/airlock/door/simple, /turf/simulated/floor/plating, /area/quartermaster/storage) +"wC" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "wD" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 @@ -11480,7 +11417,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/hallway/station/port) +/area/hallway/station/starboard) "wX" = ( /obj/effect/floor_decal/rust, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -11869,6 +11806,12 @@ }, /turf/simulated/floor, /area/maintenance/station/eng_upper) +"xM" = ( +/obj/structure/sign/directions/cargo{ + dir = 4 + }, +/turf/simulated/wall/r_wall/prepainted, +/area/tether/elevator/two) "xN" = ( /obj/structure/bed/chair/sofa/brown/right{ dir = 8 @@ -13135,17 +13078,15 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "Ax" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 + dir = 4; + icon_state = "pipe-c" }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) @@ -14210,6 +14151,9 @@ }, /turf/simulated/floor/tiled, /area/engineering/foyer_mezzenine) +"Cz" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/tether/elevator/two) "CA" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -14757,10 +14701,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai) -"DG" = ( -/obj/item/radio/beacon, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "DH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -14939,24 +14879,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/office) -"Ea" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "Eb" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -15361,6 +15283,18 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"EP" = ( +/obj/machinery/light, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "EQ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -15723,6 +15657,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/chapel/chapel_morgue) +"FF" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "FG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -15943,17 +15884,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/lounge) -"Gj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "Gk" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -16010,23 +15940,19 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/cargo) "Gq" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, -/obj/machinery/camera/network/tether{ - dir = 9 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 }, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/lightgrey/bordercorner, /turf/simulated/floor/tiled, -/area/hallway/station/port) +/area/hallway/station/starboard) "Gr" = ( /obj/machinery/air_alarm{ dir = 1; @@ -16402,6 +16328,42 @@ }, /turf/simulated/floor, /area/tether/station/burial) +"Hd" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) +"He" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Hf" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -16985,6 +16947,28 @@ "Ir" = ( /turf/simulated/floor/plating, /area/maintenance/station/cargo) +"Is" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/tether/elevator/two) +"It" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/camera/network/tether{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Iu" = ( /obj/structure/bed/chair/wood/wings{ dir = 1 @@ -17301,9 +17285,7 @@ /turf/simulated/floor, /area/maintenance/station/eng_upper) "Ji" = ( -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) "Jj" = ( /obj/structure/disposalpipe/segment{ @@ -18128,6 +18110,12 @@ "KO" = ( /turf/simulated/floor/outdoors/grass/heavy/interior, /area/tether/station/visitorhallway/lounge) +"KP" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "KQ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -18417,6 +18405,17 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, /area/hallway/station/starboard) +"Ls" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/lightgrey/bordercorner, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Lt" = ( /obj/structure/table/reinforced, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -18856,21 +18855,6 @@ /obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/carpet/bcarpet, /area/tether/station/public_meeting_room) -"Ml" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet{ - dir = 1; - pixel_y = -32 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "Mm" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/airless, @@ -19301,6 +19285,30 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) +"Ni" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/light, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Nj" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 @@ -20687,12 +20695,39 @@ }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/office) +"Qa" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Qb" = ( /obj/structure/table/reinforced, /obj/item/storage/firstaid/regular, /obj/item/storage/firstaid/regular, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) +"Qc" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Qd" = ( /turf/simulated/wall, /area/chapel/main) @@ -22067,6 +22102,16 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) +"Tf" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Tg" = ( /obj/effect/floor_decal/techfloor, /obj/effect/floor_decal/techfloor{ @@ -22296,6 +22341,9 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) +"TA" = ( +/turf/simulated/open, +/area/tether/elevator) "TB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -22429,16 +22477,6 @@ dir = 1 }, /area/tether/exploration) -"TP" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 5 - }, -/obj/structure/closet/emcloset, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "TQ" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor, @@ -22464,6 +22502,30 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) +"TU" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "TV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -23057,20 +23119,8 @@ /turf/simulated/floor/tiled, /area/hallway/station/starboard) "Vh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) +/turf/simulated/open, +/area/tether/elevator/two) "Vi" = ( /obj/structure/closet/secure_closet/atmos_personal, /obj/effect/floor_decal/borderfloor, @@ -23207,25 +23257,6 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/tether/station/public_meeting_room) -"Vv" = ( -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "Vw" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8; @@ -24395,6 +24426,15 @@ /obj/random/junk, /turf/simulated/floor, /area/maintenance/station/eng_upper) +"XD" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "XE" = ( /obj/structure/noticeboard, /turf/simulated/wall/prepainted/cargo, @@ -24619,16 +24659,6 @@ /obj/structure/sign/deck2, /turf/simulated/wall/prepainted/civilian, /area/tether/station/stairs_two) -"Ye" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "Yf" = ( /obj/effect/floor_decal/industrial/outline/red, /obj/machinery/portable_atmospherics/canister/phoron, @@ -24921,19 +24951,6 @@ }, /turf/simulated/floor/bluegrid, /area/ai) -"YM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "YN" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -25063,28 +25080,6 @@ }, /turf/simulated/floor/wood, /area/tether/exploration/pathfinder_office) -"Za" = ( -/obj/machinery/atm{ - pixel_y = 30 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "Zb" = ( /obj/item/storage/secure/safe{ pixel_x = -24 @@ -25264,6 +25259,27 @@ }, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) +"Zr" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Zs" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -25617,24 +25633,13 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "ZZ" = ( @@ -48214,10 +48219,10 @@ vj Gh uX Ji -Hb -Hb -Hb -Hb +TA +TA +TA +TA Ji Yl uX @@ -48408,10 +48413,10 @@ Wj Mx uX Ji -Hb -Hb -Hb -Hb +TA +TA +TA +TA Ji Yl uX @@ -48602,10 +48607,10 @@ gH Nt uX Ji -Hb -Hb -Hb -Hb +TA +TA +TA +TA Ji bk uX @@ -48796,10 +48801,10 @@ bw qh uX Ji -Hb -Hb -Hb -Hb +TA +TA +TA +TA Ji dB uX @@ -49381,7 +49386,7 @@ gB WS WS WS -YM +qS aJ ot nR @@ -49574,9 +49579,9 @@ Ym xT pp pp -Ye +pp ws -ox +pp ZY qR Gq @@ -49768,12 +49773,12 @@ UP EJ EJ EJ -Gj +EJ dP -cm -wN -NC -Fv +KP +Qc +XD +so fE Pt Fv @@ -49960,15 +49965,15 @@ wk eG gG Ld -WS -DG -sT -Vh -cm -NC -PB -gp -gp +Sb +Sb +Sb +Lw +Ls +TU +ut +EP +lV VB gp Fv @@ -50153,16 +50158,16 @@ Dz Ok rn NC -fD -WS -WS -sT -Vh -cm -NC -Ca +Is +Is +Cz +Cz +Is +xM +Qa +bS tK -mO +pQ kD mr Fv @@ -50347,16 +50352,16 @@ Dz Ok Ok NC -TP -iW -eG -ua +Is Vh -cm -NC -gp -VB -gp +Vh +Vh +Vh +Is +Qa +ut +gF +lV So PB Fv @@ -50541,15 +50546,15 @@ jq jq EM NC -NC -NC -NC -Vv -Ea -oJ -NC -gp -VB +Is +Vh +Vh +Vh +Vh +Is +Qa +ut +gF lV lV lV @@ -50735,15 +50740,15 @@ Zx jq EM EM -EM -EM -NC -cB -mV -qb -NC -gp -VB +Is +Vh +Vh +Vh +Vh +Is +Qa +ut +gF lV EM EM @@ -50929,15 +50934,15 @@ VZ jq jq EM -EM -EM -NC -Za -vD -cm -NC -jc -VB +Is +Vh +Vh +Vh +Vh +Is +Qa +ut +gF lV EM uu @@ -51123,15 +51128,15 @@ HG Ny jq EM -EM -EM -NC -tk -vD -Ml -NC -gp -VB +Is +Is +Is +Is +Is +Is +Qa +ut +gF lV EM uu @@ -51320,12 +51325,12 @@ EM EM EM NC -MD -vD +sn aK -NC -PB -VB +aK +Zr +ut +Ni lV EM uu @@ -51515,11 +51520,11 @@ EM EM NC pW -vD -cm -NC -gp -VB +FF +FF +Tf +Hd +gF lV EM uu @@ -51711,9 +51716,9 @@ NC MD Ax bu -NC -gp -VB +wC +It +He lV EM uu @@ -51906,8 +51911,8 @@ tA vD Bm NC -gp -VB +lV +jY lV EM uu diff --git a/maps/tether/levels/surface1.dmm b/maps/tether/levels/surface1.dmm index 04252986503..bd2a8a5d43b 100644 --- a/maps/tether/levels/surface1.dmm +++ b/maps/tether/levels/surface1.dmm @@ -602,6 +602,9 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) +"aqB" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/tether/elevator/two) "aqJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -926,20 +929,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virology) -"axp" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/machinery/fire_alarm/north_mount, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "axr" = ( /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/grass, @@ -1420,6 +1409,22 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) +"aKe" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 9 + }, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "aKB" = ( /obj/machinery/fire_alarm/south_mount{ pixel_y = -25 @@ -2160,6 +2165,20 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) +"bhf" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "bhU" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 @@ -2259,8 +2278,8 @@ /obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/steeldecal/steel_decals_central1, /obj/machinery/door/airlock/multi_tile/glass{ - name = "Construction Site"; - dir = 8 + dir = 8; + name = "Construction Site" }, /turf/simulated/floor/tiled/monofloor, /area/tether/surfacebase/surface_one_hall) @@ -2644,22 +2663,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) -"bwo" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "bws" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -3049,6 +3052,24 @@ /obj/machinery/atmospherics/pipe/tank/oxygen, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) +"bFr" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "bFv" = ( /obj/structure/sign/biohazard, /turf/simulated/wall/prepainted, @@ -3872,6 +3893,20 @@ }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/outpost/solars_outside) +"cdp" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "cdU" = ( /obj/structure/railing{ dir = 8 @@ -4282,8 +4317,8 @@ dir = 9 }, /obj/machinery/airlock_sensor/phoron/airlock_interior{ - pixel_y = 24; - pixel_x = 33 + pixel_x = 33; + pixel_y = 24 }, /obj/map_helper/airlock/sensor/int_sensor, /turf/simulated/floor/tiled, @@ -4863,6 +4898,39 @@ /obj/structure/table/borosilicate, /turf/simulated/floor/wood, /area/vacant/vacant_bar) +"cCq" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"cCs" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "cCw" = ( /turf/simulated/wall/prepainted/science, /area/maintenance/lower/solars) @@ -6043,6 +6111,12 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost) +"djJ" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "dkx" = ( /obj/structure/cable{ icon_state = "4-8" @@ -6371,10 +6445,6 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/visitor_dining) -"drC" = ( -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "drK" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -7181,6 +7251,9 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/maintenance/lower/public_garden_maintenance) +"dNT" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/tether/surfacebase/surface_one_hall) "dOp" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -7510,18 +7583,6 @@ /obj/machinery/light/small, /turf/simulated/floor/plating, /area/storage/surface_eva) -"dYB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/button/remote/airlock{ - id = "elevescaper"; - name = "elevator escape button"; - pixel_y = 32 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) "dYC" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 9 @@ -8225,12 +8286,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cargostore) -"erH" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) "esy" = ( /obj/structure/bed/chair/comfy/black{ dir = 4 @@ -8318,14 +8373,8 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/cargostore/warehouse) -"exA" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner{ - dir = 4 - }, -/turf/simulated/floor/tiled, +"exw" = ( +/turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/surface_one_hall) "exV" = ( /obj/structure/disposalpipe/segment, @@ -8535,7 +8584,12 @@ /turf/simulated/floor/virgo3b, /area/tether/surfacebase/outside/outside1) "eDq" = ( -/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "eDJ" = ( @@ -8592,19 +8646,6 @@ outdoors = 0 }, /area/tether/surfacebase/old_tram) -"eFe" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "eFC" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -9351,31 +9392,6 @@ }, /turf/simulated/floor/plating, /area/vacant/vacant_site) -"fdb" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "fdG" = ( /mob/living/simple_mob/animal/passive/gaslamp, /turf/simulated/floor/outdoors/grass/sif/virgo3b, @@ -9388,19 +9404,8 @@ /turf/simulated/floor/tiled, /area/crew_quarters/locker) "fea" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/newscaster{ - pixel_y = 30 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "fey" = ( @@ -9634,6 +9639,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/machinery/camera/network/tether{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "fjH" = ( @@ -12568,21 +12576,6 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/tether/surfacebase/funny/mimeoffice) -"gCI" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/machinery/computer/timeclock/premade/south, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "gCK" = ( /obj/structure/bed/chair/comfy/black, /obj/effect/floor_decal/borderfloor{ @@ -13416,22 +13409,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) -"hdA" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "hdR" = ( /obj/machinery/conveyor{ dir = 4; @@ -13550,18 +13527,6 @@ "hhh" = ( /turf/simulated/wall/prepainted/cargo, /area/tether/surfacebase/cargostore/office) -"hhC" = ( -/obj/machinery/light, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "hhW" = ( /obj/structure/bed/psych, /turf/simulated/floor/carpet/blue, @@ -14660,6 +14625,18 @@ }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/outpost/solars_outside) +"hKr" = ( +/obj/machinery/light, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "hKC" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -14717,6 +14694,15 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos) +"hLB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "hLP" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, @@ -14995,24 +14981,23 @@ /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) "hRQ" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "hSe" = ( @@ -15581,32 +15566,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/weaponsrange) -"iiJ" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/camera/network/northern_star{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "iji" = ( /obj/machinery/atmospherics/pipe/simple/visible/red, /turf/simulated/floor/tiled/white, @@ -17741,6 +17700,14 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) +"jsX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "jta" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -18107,6 +18074,21 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) +"jEh" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "jEQ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -18139,8 +18121,8 @@ /obj/machinery/camera/network/research, /obj/machinery/floodlight, /obj/machinery/airlock_sensor/phoron/airlock_exterior{ - pixel_y = 24; - pixel_x = 1 + pixel_x = 1; + pixel_y = 24 }, /obj/map_helper/airlock/sensor/ext_sensor, /turf/simulated/floor/tiled/steel_dirty/virgo3b, @@ -19988,18 +19970,19 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "kHm" = ( -/obj/structure/disposalpipe/up{ - dir = 1 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 }, -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) -"kHy" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 }, -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/lightgrey/bordercorner, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "kHK" = ( /obj/structure/disposalpipe/trunk, /obj/structure/disposaloutlet, @@ -20020,10 +20003,12 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/cargostore) "kHQ" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "kIr" = ( /obj/machinery/atmospherics/valve/digital{ dir = 4 @@ -20067,6 +20052,22 @@ }, /turf/simulated/floor/tiled, /area/rnd/hallway) +"kKu" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) "kLL" = ( /obj/structure/window/reinforced{ dir = 1 @@ -20246,6 +20247,15 @@ outdoors = 0 }, /area/tether/surfacebase/old_tram) +"kRe" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/tether/surfacebase/surface_one_hall) "kRR" = ( /obj/machinery/computer/security/telescreen/entertainment{ desc = "Looks like it's on the fishing channel. I wonder what else is on?"; @@ -20309,23 +20319,6 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/rnd/outpost/storage) -"kSL" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/newscaster{ - pixel_y = -30 - }, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "kSO" = ( /obj/structure/closet/crate/bin, /obj/machinery/light{ @@ -20896,13 +20889,18 @@ /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) "lfi" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 6 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 6 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -25 }, -/obj/structure/flora/pottedplant, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "lfB" = ( @@ -21312,22 +21310,6 @@ /obj/machinery/atmospherics/pipe/simple/visible/universal, /turf/simulated/floor, /area/rnd/outpost/atmos) -"lqT" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/status_display{ - pixel_y = 30 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "lqW" = ( /obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, @@ -21377,6 +21359,15 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost) +"lrw" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "lsw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -21543,6 +21534,24 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virology) +"lwW" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "lxe" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -22187,22 +22196,22 @@ /turf/simulated/floor/tiled/steel_dirty, /area/rnd/tankstorage) "lSg" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) @@ -23536,9 +23545,16 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/funny/clownoffice) "mCf" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/structure/closet/firecloset, +/obj/machinery/light, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "mCy" = ( @@ -24237,10 +24253,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos) -"mSA" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) "mSR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -24865,30 +24877,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) -"nlW" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "nmq" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 @@ -25269,16 +25257,14 @@ /turf/simulated/floor/plating, /area/storage/surface_eva) "nxC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/maintenance/engi{ - id_tag = "elevescaper"; - name = "Elevator Maintenance" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "nxI" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -26066,8 +26052,8 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals_central1, /obj/machinery/door/airlock/multi_tile/glass{ - name = "Laundry"; - dir = 8 + dir = 8; + name = "Laundry" }, /obj/structure/cable/orange{ icon_state = "4-8" @@ -26097,22 +26083,6 @@ /obj/machinery/atmospherics/pipe/manifold/visible/purple, /turf/simulated/floor/tiled, /area/engineering/atmos/processing) -"nYy" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "nYA" = ( /obj/structure/closet, /obj/random/maintenance/clean, @@ -26335,6 +26305,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "ofG" = ( @@ -26626,13 +26599,20 @@ /turf/simulated/floor/reinforced/airless, /area/rnd/outpost/chamber) "oou" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/structure/disposalpipe/segment, /obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "opd" = ( @@ -27015,16 +26995,17 @@ /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "oDt" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) @@ -27589,18 +27570,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) -"oUb" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/glass, -/obj/structure/catwalk, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techfloor, -/area/tether/surfacebase/surface_one_hall) "oUl" = ( /turf/simulated/floor/plating, /area/engineering/atmos/processing) @@ -28043,9 +28012,7 @@ /area/tether/surfacebase/surface_one_hall) "pha" = ( /obj/structure/sign/deck/first, -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) "phe" = ( /obj/random/junk, @@ -28686,6 +28653,24 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cargostore) +"pwO" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "pxc" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -29095,8 +29080,8 @@ /obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/steeldecal/steel_decals_central1, /obj/machinery/door/airlock/multi_tile/glass{ - name = "Cafe"; - dir = 8 + dir = 8; + name = "Cafe" }, /obj/structure/cable/orange{ icon_state = "4-8" @@ -29493,16 +29478,15 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/public_garden_maintenance) "pUN" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, /obj/effect/floor_decal/borderfloor{ - dir = 1 + dir = 9 }, /obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 + dir = 9 }, -/obj/machinery/station_map{ - pixel_y = 32 - }, -/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "pUR" = ( @@ -29627,6 +29611,19 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) +"pXK" = ( +/obj/machinery/light, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "pYd" = ( /obj/machinery/power/apc/south_mount, /obj/structure/cable/green, @@ -30242,8 +30239,17 @@ /turf/simulated/floor/tiled, /area/crew_quarters/locker) "qqd" = ( -/obj/machinery/door/firedoor{ - dir = 1 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) @@ -30437,12 +30443,6 @@ /obj/random/maintenance/cargo, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/emergency_storage/atrium) -"qvs" = ( -/obj/structure/sign/directions/evac{ - name = "\improper Secondary Evacuation Route" - }, -/turf/simulated/wall/prepainted, -/area/tether/surfacebase/surface_one_hall) "qvz" = ( /obj/machinery/power/apc/east_mount, /obj/effect/floor_decal/borderfloor{ @@ -31457,8 +31457,8 @@ "qVb" = ( /obj/machinery/light, /obj/machinery/airlock_sensor/phoron/airlock_exterior{ - pixel_y = -24; - pixel_x = 1 + pixel_x = 1; + pixel_y = -24 }, /obj/map_helper/airlock/sensor/ext_sensor, /turf/simulated/floor/tiled/steel_dirty/virgo3b, @@ -31595,7 +31595,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, -/obj/machinery/power/apc/high, +/obj/machinery/power/apc/high{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "qZv" = ( @@ -31795,9 +31797,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "ree" = ( -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) "ren" = ( /obj/effect/floor_decal/borderfloor{ @@ -32036,21 +32036,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost) -"rik" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "rjV" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/machinery/light/small, @@ -32365,6 +32350,17 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/research) +"rwM" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/tether/surfacebase/surface_one_hall) "rxf" = ( /obj/structure/cable{ icon_state = "1-2" @@ -32771,12 +32767,6 @@ /obj/effect/floor_decal/industrial/warning/dust, /turf/simulated/floor/reinforced, /area/rnd/testingroom) -"rIq" = ( -/obj/structure/sign/directions/evac{ - dir = 4 - }, -/turf/simulated/wall/prepainted, -/area/tether/surfacebase/surface_one_hall) "rIs" = ( /obj/structure/railing{ dir = 1 @@ -33923,14 +33913,21 @@ /turf/simulated/wall/prepainted, /area/rnd/testingroom) "sld" = ( -/obj/machinery/camera/network/northern_star, -/obj/effect/floor_decal/borderfloor{ +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 5 +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 1 }, -/obj/structure/flora/pottedplant, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "sle" = ( @@ -34182,10 +34179,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) -"sqv" = ( -/obj/structure/table, -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) "sqw" = ( /obj/structure/grille, /obj/structure/railing{ @@ -34363,11 +34356,6 @@ /obj/structure/table/bench/wooden, /turf/simulated/floor/grass, /area/tether/surfacebase/surface_one_hall) -"suw" = ( -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/lightgrey/bordercorner, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "sux" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 @@ -34892,20 +34880,23 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "sMA" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/effect/floor_decal/corner/lightgrey/border, +/obj/turbolift_map_holder/tether/two, +/turf/simulated/floor/holofloor/tiled/dark, +/area/tether/elevator/two) +"sML" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "sMV" = ( @@ -35439,13 +35430,6 @@ outdoors = 0 }, /area/tether/surfacebase/old_tram) -"taw" = ( -/obj/structure/closet/crate, -/obj/random/unidentified_medicine, -/obj/random/firstaid, -/obj/random/drinkbottle, -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) "taF" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -35870,6 +35854,24 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside1) +"tqc" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "tqe" = ( /turf/simulated/floor/outdoors/dirt/virgo3b, /area/tether/surfacebase/outside/outside1) @@ -37036,13 +37038,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/tram) -"tYy" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) "tZm" = ( /turf/simulated/wall/prepainted{ can_open = 1 @@ -37195,6 +37190,17 @@ "ucB" = ( /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/processing) +"ucF" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "ucO" = ( /obj/machinery/atmospherics/pipe/manifold/visible/purple{ dir = 1 @@ -37246,11 +37252,6 @@ }, /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm3) -"ufd" = ( -/obj/structure/grille, -/obj/structure/railing, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_one_hall) "ufe" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -38115,6 +38116,12 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) +"uIm" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "uIy" = ( /obj/structure/sign/warning{ name = "\improper STAND AWAY FROM TRACK EDGE" @@ -39292,23 +39299,14 @@ }, /turf/simulated/wall/prepainted, /area/tether/surfacebase/medical/first_aid_west) +"vno" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) "vny" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) +/turf/simulated/floor/holofloor/tiled/dark, +/area/tether/elevator/two) "vnS" = ( /obj/machinery/atmospherics/component/binary/pump/on{ dir = 4; @@ -39354,8 +39352,8 @@ /area/tether/surfacebase/outside/outside1) "vpR" = ( /obj/machinery/door/airlock/multi_tile/glass{ - name = "Laundry"; - dir = 8 + dir = 8; + name = "Laundry" }, /obj/effect/floor_decal/steeldecal/steel_decals_central1, /obj/structure/cable/orange{ @@ -39425,6 +39423,9 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) +"vrR" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/maintenance/lower/research) "vsp" = ( /obj/machinery/atmospherics/component/binary/pump/on{ dir = 1; @@ -39549,6 +39550,18 @@ }, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/tether/surfacebase/outside/outside1) +"vwP" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "vwW" = ( /obj/machinery/light/small/flicker{ dir = 1 @@ -40952,9 +40965,6 @@ /area/rnd/outpost/heating) "weY" = ( /obj/effect/floor_decal/borderfloor, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/floor_decal/corner/lightgrey/border, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 @@ -40962,15 +40972,14 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, -/obj/structure/disposalpipe/junction/yjunction{ +/obj/structure/disposalpipe/junction{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/structure/cable{ + icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "wfq" = ( @@ -41466,14 +41475,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) -"wqu" = ( -/obj/structure/table/rack, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) "wqL" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" @@ -41567,22 +41568,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) -"wsJ" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "wsR" = ( /obj/structure/bed/chair/wood, /turf/simulated/floor/carpet, @@ -42643,11 +42628,6 @@ }, /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/tether/surfacebase/outside/outside1) -"wXU" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "wXZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -43278,6 +43258,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "xqC" = ( @@ -43429,6 +43413,18 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) +"xuk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "xuD" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -68033,7 +68029,7 @@ vAp vAp pha ree -rOS +bLp fey bLp uCh @@ -68217,17 +68213,17 @@ tZw ryX glh tZw -uWW -tZw -kyJ -tZw +rOS +rOS +kRe +rOS rOS pUN -drC -drC +qqd +qqd qqd mCf -rOS +bLp mCS bLp uCh @@ -68411,17 +68407,17 @@ tZw ryX nDV tZw -uWW -tZw -dYB -uWW rOS +aKe +qqd +pwO +tqc sld -exA lOQ -suw +djJ +lOQ lfi -rOS +bLp sRo bLp uCh @@ -68605,17 +68601,17 @@ dmr ryX tZw tZw -tZw -tZw +rOS +jEh nxC -tZw -rOS -rOS +fea +jsX +fea fea eDq -hhC -rOS -rOS +lOQ +ucF +vno sRo bLp uCh @@ -68799,17 +68795,17 @@ tZw ryX xTb iDS -tZw -kHy -huJ +rOS +jEh +hLB kHm -iDS -rOS -lqT -aKM -gCI -rOS -mSA +lwW +cCs +lOQ +uIm +lOQ +ucF +bLp fey bLp uCh @@ -68993,17 +68989,17 @@ tZw ryX tZw iDS -tZw -sqv -iDS -tZw -tZw rOS -wsJ -lOQ +jEh +hLB +ucF +dNT +vwP oDt -rOS -tYy +oDt +oDt +pXK +bLp vOr bLp uCh @@ -69187,17 +69183,17 @@ tZw ryX tZw iDS -tZw -taw -iDS -tZw -uWW rOS -axp -lOQ -kSL -rOS -wqu +jEh +hLB +ucF +aqB +aqB +vny +vny +aqB +aqB +vrR fey bLp uCh @@ -69381,16 +69377,16 @@ tZw ryX cuc tZw -tZw -tZw +rOS +sML kHQ -rOS -rOS -rOS -hdA -ccr +bhf +aqB +vny +vny +vny sMA -rOS +aqB ajv fey bLp @@ -69575,17 +69571,17 @@ tZw ryX qYX pKf -pKf -pKf -pKf -rOS -lUe -ufd -nYy -lOQ +exw +jEh +hLB +hKr +aqB vny -qvs -bLp +vny +vny +vny +aqB +vrR azH bLp bLp @@ -69770,15 +69766,15 @@ ryX tZw rOS rOS -pKf -pKf -rOS -rOS -rOS -bwo -lOQ -nlW -oUb +jEh +hLB +ucF +aqB +vny +vny +vny +vny +aqB oou sse lcn @@ -69964,16 +69960,16 @@ ryX tZw lUe rOS -erH -pKf -pKf -pKf -qYX -eFe -lOQ -iiJ -rIq -sZP +jEh +hLB +ucF +aqB +vny +vny +vny +vny +aqB +cCq rUW sZP sZP @@ -70158,16 +70154,16 @@ kim rOS dzJ rOS -rOS -rOS -rOS -rOS -rOS -rik -wXU -fdb -rOS -bLp +bFr +xuk +cdp +aqB +aqB +aqB +aqB +aqB +aqB +cCq bLp bLp bLp @@ -70349,19 +70345,19 @@ pMt nUI cZw nUI -nUI +cZw qAV ljx lSg -gAj +lrw hRQ xqk fjo ofq uGu weY -rOS -uCh +rwM +kKu uCh uCh bLp diff --git a/maps/tether/levels/surface2.dmm b/maps/tether/levels/surface2.dmm index 776be7a059e..9a1a2d19973 100644 --- a/maps/tether/levels/surface2.dmm +++ b/maps/tether/levels/surface2.dmm @@ -401,19 +401,6 @@ /obj/machinery/light/small, /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) -"aqv" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/yellow/border, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 9 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "aqZ" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/common, @@ -522,11 +509,17 @@ }, /turf/simulated/floor/wood, /area/vacant/vacant_bar_upper) +"auz" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/yellow/border, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "auT" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/camera/network/tether, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "avt" = ( @@ -1446,17 +1439,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/evastorage) -"bdU" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/effect/floor_decal/corner/yellow/border{ - dir = 6 - }, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/corner/yellow/bordercorner2, -/turf/simulated/floor/tiled, -/area/engineering/lower/lobby) "bdX" = ( /obj/machinery/door/window/brigdoor/eastleft{ name = "Slime Pen 3"; @@ -3055,14 +3037,6 @@ "chq" = ( /turf/simulated/wall/prepainted/engineering/atmos, /area/tether/surfacebase/emergency_storage/atmos) -"chC" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/fire_alarm/south_mount{ - pixel_y = -26 - }, -/obj/effect/floor_decal/corner/yellow/border, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "chK" = ( /obj/effect/debris/cleanable/blood, /turf/simulated/floor, @@ -3397,15 +3371,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/security/brig/bathroom) -"ctj" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/engineering/lower/lobby) "ctt" = ( /obj/structure/bed/chair, /obj/item/radio/intercom{ @@ -4408,7 +4373,7 @@ /obj/structure/sign/warning/caution{ name = "\improper CAUTION - DANGEROUS EQUIPMENT AND DROPS" }, -/turf/simulated/wall/prepainted/engineering/atmos, +/turf/simulated/wall/r_wall/prepainted, /area/engineering/lower/lobby) "deB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -4646,19 +4611,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) -"dnw" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/requests_console{ - announcementConsole = 1; - department = "Bridge"; - departmentType = 5; - name = "Bridge RC"; - pixel_y = 32 - }, -/turf/simulated/floor/wood, -/area/bridge/meeting_room) "doq" = ( /obj/machinery/space_heater, /obj/structure/window/reinforced{ @@ -4822,6 +4774,9 @@ }, /turf/simulated/floor/wood, /area/rnd/breakroom) +"dwA" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/tether/elevator/two) "dwC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -4849,6 +4804,24 @@ /obj/structure/stairs/spawner/west, /turf/simulated/floor/tiled/techfloor, /area/chapel/main) +"dBJ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/yellow/bordercorner2{ + dir = 6 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "dCm" = ( /obj/machinery/recharge_station, /obj/machinery/light/small{ @@ -4874,15 +4847,6 @@ "dCW" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/tcommsat/computer) -"dDb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "dDl" = ( /obj/structure/table/glass, /obj/item/folder/white_rd, @@ -6074,12 +6038,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/tether/surfacebase/fish_farm) -"ewg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/engineering/lower/breakroom) "ewU" = ( /turf/simulated/floor/tiled, /area/janitor) @@ -6127,15 +6085,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) -"eyw" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "eyK" = ( /obj/structure/railing{ dir = 1 @@ -6156,19 +6105,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) -"eAI" = ( -/obj/effect/floor_decal/borderfloor/shifted{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border/shifted{ - dir = 1 - }, -/obj/effect/floor_decal/corner/yellow{ - dir = 5 - }, -/obj/structure/bed/chair, -/turf/simulated/floor/tiled, -/area/engineering/lower/lobby) "eAR" = ( /obj/machinery/door/firedoor/glass, /obj/structure/disposalpipe/segment, @@ -6190,6 +6126,11 @@ "eBn" = ( /turf/simulated/floor/wood, /area/vacant/vacant_bar_upper) +"eBq" = ( +/obj/machinery/light, +/obj/effect/floor_decal/borderfloor, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "eBr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -7303,6 +7244,9 @@ /obj/random/maintenance/clean, /turf/simulated/floor/plating, /area/maintenance/lower/south) +"fsv" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/tether/elevator/two) "fsz" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -7475,10 +7419,10 @@ initialize_directions = 1; internal_pressure_bound = 4000; internal_pressure_bound_default = 4000; + on = 1; pressure_checks = 2; pressure_checks_default = 2; - pump_direction = 0; - on = 1 + pump_direction = 0 }, /turf/simulated/floor/bluegrid{ initial_gas_mix = "n2=500;TEMP=80"; @@ -8011,12 +7955,6 @@ /obj/item/seeds/random, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) -"fPs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/engineering/lower/lobby) "fQs" = ( /obj/machinery/door/airlock/research{ name = "Xenobiology Lab"; @@ -8029,6 +7967,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) +"fQu" = ( +/obj/structure/lattice, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/open, +/area/tether/surfacebase/surface_two_hall) "fQB" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -8091,6 +8036,15 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/patient_a) +"fSE" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "fSS" = ( /obj/structure/closet/wardrobe/pjs, /obj/item/handcuffs/fuzzy, @@ -8260,6 +8214,18 @@ /obj/item/slime_extract/grey, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) +"fXt" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/structure/window/basic{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "fXL" = ( /obj/machinery/door/airlock/medical{ name = "Morgue"; @@ -8381,6 +8347,14 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_two) +"gcD" = ( +/obj/structure/railing, +/obj/structure/lattice, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/open, +/area/tether/surfacebase/surface_two_hall) "gcP" = ( /obj/machinery/light/small{ dir = 4 @@ -8464,6 +8438,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/wood, /area/bridge/meeting_room) "ggP" = ( @@ -8504,6 +8481,17 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) +"gis" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "giu" = ( /obj/structure/bed/chair/comfy/black, /obj/structure/disposalpipe/segment, @@ -8547,6 +8535,9 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_two) +"gku" = ( +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "gkJ" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -9380,6 +9371,18 @@ "gIp" = ( /turf/simulated/wall/prepainted, /area/tether/surfacebase/reading_room) +"gIz" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/structure/window/basic{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 5 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "gII" = ( /turf/simulated/wall/prepainted/science, /area/rnd/breakroom/bathroom) @@ -9829,21 +9832,9 @@ /turf/simulated/floor/plating, /area/maintenance/lower/south) "hal" = ( -/obj/effect/floor_decal/borderfloor{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner/yellow/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 6 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "han" = ( @@ -10102,6 +10093,15 @@ /obj/effect/floor_decal/corner/yellow/border, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) +"hmg" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "hmG" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -10114,15 +10114,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/security/detective) -"hmV" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "hnc" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -10226,14 +10217,6 @@ /obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/lower/atmos_eva) -"hra" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, -/obj/effect/floor_decal/corner/yellow/border, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "hrp" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -11208,11 +11191,6 @@ }, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) -"iaN" = ( -/obj/item/storage/fancy/cigar/havana, -/obj/random/drinkbottle, -/turf/simulated/floor/plating, -/area/tether/surfacebase/surface_two_hall) "ibj" = ( /obj/structure/table/steel, /obj/item/flashlight/lamp, @@ -11579,6 +11557,15 @@ }, /turf/simulated/floor/plating, /area/maintenance/asmaint2) +"iqy" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "iqG" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/visible/supply, @@ -12016,15 +12003,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) -"iBN" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/status_display{ - pixel_y = 30 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "iCc" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -12431,6 +12409,14 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) +"iON" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "iOU" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -12763,6 +12749,15 @@ /obj/random/action_figure, /turf/simulated/floor/plating, /area/maintenance/lower/rnd) +"jfJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "jfO" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -13666,12 +13661,8 @@ /area/maintenance/lower/south) "jNa" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1 + dir = 9 }, -/obj/machinery/station_map{ - pixel_y = 32 - }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "jNW" = ( @@ -14323,16 +14314,6 @@ "knU" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/tether/surfacebase/security/armory) -"koC" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "kph" = ( /obj/structure/bed/chair/comfy/brown{ dir = 8 @@ -14431,25 +14412,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) -"ktp" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/effect/floor_decal/corner/yellow/border{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 4 - }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal, -/turf/simulated/floor/tiled, -/area/engineering/lower/lobby) "kts" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -14602,6 +14564,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/mining) +"kyJ" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "kyL" = ( /obj/random/junk, /turf/simulated/floor, @@ -15040,6 +15008,15 @@ initial_gas_mix = "n2=100;TEMP=80" }, /area/tcommsat/chamber) +"kTv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "kTy" = ( /obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ @@ -15084,20 +15061,6 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/lower/breakroom) -"kUM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/junction{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/engineering/lower/lobby) "kVf" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, @@ -15365,6 +15328,18 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/south) +"ldD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "lej" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -15372,16 +15347,6 @@ /obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/interrogation) -"lez" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/machinery/camera/network/tether{ - dir = 5 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "lfa" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -15534,6 +15499,18 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) +"lot" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/structure/window/basic{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "loz" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/tether/surfacebase/medical/uppersouthstairwell) @@ -15632,9 +15609,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "ltL" = ( -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) "luJ" = ( /obj/structure/closet/hydrant{ @@ -15990,14 +15965,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/command) -"lGn" = ( -/obj/machinery/button/windowtint{ - dir = 1; - id = "meetingroom"; - pixel_x = -25 - }, -/turf/simulated/floor/wood, -/area/bridge/meeting_room) "lGJ" = ( /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 1; @@ -16007,10 +15974,10 @@ initialize_directions = 1; internal_pressure_bound = 4000; internal_pressure_bound_default = 4000; + on = 1; pressure_checks = 2; pressure_checks_default = 2; - pump_direction = 0; - on = 1 + pump_direction = 0 }, /turf/simulated/floor/bluegrid{ initial_gas_mix = "n2=100;TEMP=80"; @@ -16594,6 +16561,9 @@ /obj/effect/floor_decal/corner/yellow/bordercorner2, /turf/simulated/floor/tiled/monotile, /area/engineering/atmos) +"mek" = ( +/turf/simulated/open, +/area/tether/elevator/two) "meI" = ( /obj/machinery/air_alarm{ dir = 4; @@ -16869,6 +16839,11 @@ /obj/structure/bed/chair/comfy/black{ dir = 4 }, +/obj/machinery/button/windowtint{ + dir = 1; + id = "meetingroom"; + pixel_x = -25 + }, /turf/simulated/floor/carpet/turcarpet, /area/bridge/meeting_room) "mqq" = ( @@ -17208,11 +17183,12 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "mCn" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/yellow/border, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/corner/yellow/bordercorner2, -/obj/machinery/light/small, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 10 + }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "mCJ" = ( @@ -17259,6 +17235,24 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) +"mEa" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/yellow/bordercorner2{ + dir = 5 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "mEu" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 6 @@ -17539,15 +17533,6 @@ /obj/structure/stairs/spawner/north, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) -"mQF" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/machinery/newscaster{ - pixel_y = -30 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "mQK" = ( /obj/structure/catwalk, /obj/structure/disposalpipe/segment{ @@ -17567,11 +17552,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) -"mQU" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/plating, -/area/tether/surfacebase/surface_two_hall) "mRb" = ( /obj/structure/catwalk, /obj/effect/floor_decal/techfloor, @@ -18389,6 +18369,25 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/bar) +"nrN" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "nrR" = ( /obj/structure/railing{ dir = 1 @@ -18648,10 +18647,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 }, -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -25 - }, /obj/effect/floor_decal/corner/yellow/border, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) @@ -19482,27 +19477,6 @@ /obj/effect/paint_stripe/sun, /turf/simulated/floor/plating, /area/tcommsat/chamber) -"ogt" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/yellow/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/engineering/lower/lobby) "ogv" = ( /obj/machinery/light{ dir = 8 @@ -19714,12 +19688,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) -"opc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/engineering/lower/breakroom) "ope" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -19743,6 +19711,16 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) +"opu" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 22 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "opH" = ( /obj/effect/floor_decal/rust, /obj/structure/disposalpipe/segment{ @@ -19789,9 +19767,9 @@ external_pressure_bound = 140; external_pressure_bound_default = 140; icon_state = "map_vent_out"; + on = 1; pressure_checks = 0; - pressure_checks_default = 0; - on = 1 + pressure_checks_default = 0 }, /turf/simulated/floor/bluegrid{ initial_gas_mix = "n2=100;TEMP=80"; @@ -19867,21 +19845,12 @@ /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officeb) "ovx" = ( -/obj/effect/floor_decal/borderfloor{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner/yellow/border{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 5 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "owe" = ( @@ -20445,18 +20414,11 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/warden) -"oUl" = ( -/obj/structure/symbol/da{ - pixel_x = 32 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, -/area/maintenance/lower/rnd) "oUu" = ( /obj/item/material/twohanded/baseballbat{ desc = "This bat looks very off."; - integrity_max = 500; - integrity = 500 + integrity = 500; + integrity_max = 500 }, /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, @@ -20512,6 +20474,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting/storage) +"oVn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "oVD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 4 @@ -20613,14 +20584,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) -"pas" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "paL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 5 @@ -20854,6 +20817,10 @@ /obj/structure/bed/chair/comfy/black{ dir = 4 }, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -23 + }, /turf/simulated/floor/carpet/turcarpet, /area/bridge/meeting_room) "pkL" = ( @@ -21905,6 +21872,12 @@ }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officea) +"qaz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "qaI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -22526,6 +22499,11 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) +"qwy" = ( +/obj/item/storage/fancy/cigar/havana, +/obj/random/drinkbottle, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) "qwX" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -22941,17 +22919,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/maintenance/lower/public_garden_maintenance/upper) -"qPM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "qPX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -23495,14 +23462,6 @@ "rlx" = ( /turf/simulated/mineral, /area/maintenance/readingrooms) -"rmq" = ( -/obj/structure/closet/crate, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/cargo, -/obj/random/maintenance/research, -/turf/simulated/floor/plating, -/area/maintenance/lower/rnd) "rmF" = ( /obj/machinery/holopad, /turf/simulated/floor/tiled/white, @@ -23824,6 +23783,10 @@ }, /turf/simulated/floor/carpet, /area/engineering/lower/breakroom) +"rxJ" = ( +/obj/machinery/door/airlock/glass/atmos, +/turf/simulated/floor/tiled, +/area/engineering/lower/lobby) "rxK" = ( /obj/structure/table/woodentable, /obj/item/paper_bin, @@ -23911,6 +23874,12 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) +"rDm" = ( +/obj/structure/sign/warning/caution{ + name = "\improper CAUTION - DANGEROUS EQUIPMENT AND DROPS" + }, +/turf/simulated/wall/prepainted/engineering/atmos, +/area/tether/surfacebase/emergency_storage/atmos) "rDp" = ( /obj/landmark/spawnpoint/job/command_secretary, /obj/structure/bed/chair/comfy/black{ @@ -24691,7 +24660,9 @@ /turf/simulated/floor/tiled/techfloor, /area/chapel/main) "sjZ" = ( -/obj/machinery/holopad, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "sku" = ( @@ -24799,6 +24770,9 @@ /obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) +"smB" = ( +/turf/simulated/open, +/area/tether/elevator) "snb" = ( /obj/machinery/light/small{ dir = 8 @@ -25058,6 +25032,7 @@ /obj/structure/closet/hydrant{ pixel_x = -32 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "sum" = ( @@ -25367,13 +25342,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) -"sCV" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -23 - }, -/turf/simulated/floor/wood, -/area/bridge/meeting_room) "sDd" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -25535,15 +25503,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) -"sIk" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "sIp" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -25747,19 +25706,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) -"sQW" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "sRh" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -25886,18 +25832,6 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_two) -"sVU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 5 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "sWl" = ( /obj/structure/catwalk, /obj/structure/disposalpipe/segment{ @@ -26086,13 +26020,6 @@ /obj/landmark/spawnpoint/job/scientist, /turf/simulated/floor/wood, /area/rnd/breakroom) -"tgb" = ( -/obj/structure/grille, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "tgr" = ( /obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ @@ -26410,6 +26337,7 @@ /obj/machinery/newscaster{ pixel_y = -30 }, +/obj/effect/floor_decal/corner/yellow/border, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "tse" = ( @@ -26504,6 +26432,18 @@ /obj/structure/stairs/spawner/north, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) +"twl" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "twA" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -27114,6 +27054,15 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/maintenance/asmaint2) +"ufj" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "ufA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -27957,13 +27906,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) -"uIP" = ( -/obj/machinery/door/airlock/glass{ - name = "Atmospherics" - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel_grid, -/area/engineering/lower/lobby) "uJg" = ( /turf/simulated/wall/prepainted/engineering/atmos, /area/tether/surfacebase/east_stairs_two) @@ -28094,6 +28036,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) +"uQj" = ( +/obj/effect/floor_decal/borderfloor, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "uQs" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -28591,6 +28540,13 @@ /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/outdoors/beach/sand/desert/indoors, /area/tether/surfacebase/fish_farm) +"viH" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/turf/simulated/open, +/area/tether/surfacebase/surface_two_hall) "vjG" = ( /obj/machinery/door/firedoor, /obj/effect/floor_decal/borderfloorwhite{ @@ -28636,6 +28592,12 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) +"vkz" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "vkN" = ( /obj/structure/table/rack/shelf/steel, /obj/item/clothing/suit/armor/vest/alt{ @@ -28656,13 +28618,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting/storage) -"vlA" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/open, -/area/tether/surfacebase/surface_two_hall) "vml" = ( /obj/machinery/vending/medical{ dir = 8 @@ -29137,6 +29092,19 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) +"vCH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "vCS" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -29791,6 +29759,10 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/bathroom) +"wdy" = ( +/obj/machinery/photocopier, +/turf/simulated/floor/wood, +/area/bridge/meeting_room) "wdF" = ( /obj/structure/cable{ icon_state = "2-4" @@ -29932,6 +29904,17 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) +"wje" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor/corner2, +/obj/effect/floor_decal/corner/yellow/bordercorner2, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "wjg" = ( /obj/structure/railing, /obj/effect/floor_decal/rust, @@ -30196,6 +30179,16 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/bar) +"wut" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 4 + }, +/obj/machinery/door/airlock/glass/atmos, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "wuu" = ( /obj/structure/ladder{ pixel_y = 16 @@ -30203,16 +30196,6 @@ /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) -"wuI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/glass{ - name = "Atmospherics" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel_grid, -/area/engineering/lower/lobby) "wvd" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 6 @@ -30534,8 +30517,8 @@ /turf/simulated/floor/plating, /area/maintenance/lower/north) "wFw" = ( -/obj/structure/cable/cyan{ - icon_state = "4-8" +/obj/structure/disposalpipe/segment{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -30543,13 +30526,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "wFz" = ( @@ -30833,8 +30809,10 @@ /turf/simulated/floor/plating, /area/maintenance/lower/south) "wSs" = ( -/obj/effect/floor_decal/borderfloor, -/obj/structure/closet/firecloset, +/obj/machinery/light, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "wSE" = ( @@ -30942,6 +30920,9 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/reading_room) +"wVr" = ( +/turf/simulated/wall/prepainted/engineering/atmos, +/area/tether/surfacebase/surface_two_hall) "wWc" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -30995,6 +30976,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) +"wXK" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "wXZ" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 @@ -31117,19 +31104,6 @@ }, /turf/simulated/floor/lino, /area/tether/surfacebase/security/detective/officea) -"xdM" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/yellow/border, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "xdX" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -31240,6 +31214,15 @@ }, /turf/simulated/open, /area/tether/surfacebase/security/middlehall) +"xiw" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "xjC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/random/trash, @@ -31481,10 +31464,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) @@ -55295,10 +55280,10 @@ eUG eUG tIz ltL -qCo -qCo -qCo -qCo +smB +smB +smB +smB ltL waY myN @@ -55489,10 +55474,10 @@ eUG eUG tIz ltL -qCo -qCo -qCo -qCo +smB +smB +smB +smB ltL waY myN @@ -55683,10 +55668,10 @@ eUG eUG tIz ltL -qCo -qCo -qCo -qCo +smB +smB +smB +smB ltL waY aGQ @@ -55877,10 +55862,10 @@ eUG eUG tIz ltL -qCo -qCo -qCo -qCo +smB +smB +smB +smB ltL waY lzn @@ -56260,15 +56245,15 @@ ceV eUG eUG eUG -eUG -eUG -eUG -eCd +xbU +xbU +xbU +xbU xbU jNa -omd -omd -tav +kYp +kYp +kYp wSs aGQ hfj @@ -56454,17 +56439,17 @@ mhp eUG eUG eUG -eUG -eUG -eUG -eUG xbU -eyw -rEB +ufj +kYp +kYp +kYp +axF +nlg sjZ -hgt -mQF -chq +nlg +xyY +rDm chq aUV chq @@ -56646,19 +56631,19 @@ hKp xSX kIy qvW -eUG -eUG -eUG -eUG eCd eCd xbU -mMl +osn +oVn auT +auT +auT +auT +jfJ nlg -vRc -dev -rwY +xyY +ykZ hTt eZL hLM @@ -56839,21 +56824,21 @@ xSX wcp kYf kIy -rmq -eCd -eCd -eCd -eCd -eCd dik -xSX -mQU +eCd +eCd +xbU osn +nmC +hgt +gnx +rEB nlg -chC -rwY -lRz -paL +dtU +nlg +xyY +ykZ +vfT asR etH kmq @@ -57033,21 +57018,21 @@ mqq fHS mWI dHb -mWI -mWI -oUl -mWI -mWI -mWI vAK -xSX +eCd +eCd xbU -iBN -nlg -hmf +osn +nmC +eBq +bXq +xiw +gnx +gnx +gnx +wXK ykZ -lRz -qdR +vfT asR vqA phS @@ -57227,21 +57212,21 @@ xSX vqk xSX kIy -xSX +eCd eCd eCd xbU -xbU -xbU -xbU -xbU -xbU -koC -dDb -hra -ykZ -lRz -vFZ +hmg +ldD +uQj +dwA +dwA +fsv +fsv +dwA +dwA +dev +vfT asR fNh kmq @@ -57421,21 +57406,21 @@ xSX vuJ xSX kIy -xSX epZ jdR -iaN +qwy xbU -ryd -xbU -ryd -rvO -hmV -hRJ -hmf -ykZ -eAI -fPs +osn +nmC +xyY +dwA +mek +mek +mek +mek +dwA +lRz +paL asR rel mhk @@ -57619,17 +57604,17 @@ xbU xbU xbU xbU -xbU -tgb -xbU -xbU -xbU -pas -qPM -aqv -rwY -mjL -fPs +osn +nmC +xyY +dwA +mek +mek +mek +mek +dwA +lRz +qdR asR rel dJg @@ -57813,17 +57798,17 @@ kYp rEx uAp sul -kYp -sIk -rEx -kYp -lez axF -hRJ -nlg -uIP -ctj -fPs +nmC +xyY +dwA +mek +mek +mek +mek +dwA +lRz +qdR cTh yeM ndZ @@ -58006,18 +57991,18 @@ ceR fpm fpm fpm -fpm -fpm -fpm -fpm -fpm scQ fpm wmR -xdM -ykZ -ogt -fPs +xyY +dwA +mek +mek +mek +mek +dwA +lRz +vFZ xRC vfT fLk @@ -58200,17 +58185,17 @@ ifz ifz ifz ifz -ifz -ifz -ifz -ifz -ifz klm yib -sQW -sVU -wuI -kUM +hRJ +vRc +dwA +dwA +dwA +dwA +dwA +dwA +mjL xqf pKJ eob @@ -58394,21 +58379,21 @@ eYy eYy eYy eYy -eYy -eYy -eWN -eYy -eYy -vlA -vaB -vzK +viH +fXt +hRJ +kyJ +kYp +kYp +kYp +kYp mCn -rwY -ktp +rxJ +vfT ovx wFw hal -bdU +vfT rwY eMx wGC @@ -58588,21 +58573,21 @@ jSr jSr jSr jSr -jSr -jSr -tNg -jSr -jSr wnY -vaB -vzK -hmf -vHS -rja -rja -hxl -rja -rja +fXt +kTv +fpm +fpm +fpm +fpm +vCH +auz +iON +vkz +gis +twl +qaz +gku vHS vpR pQc @@ -58777,26 +58762,26 @@ jSr jSr jSr jSr -iPB -iPB -ejq -iPB -iPB -ejq -iPB -iPB +jSr +jSr +jSr jSr jSr wnY -vaB +gIz +iqy +iqy +lot +lot +yib vzK nzi -vHS -fkB -nYw -qrM -kUL -lAb +wut +fSE +mEa +nrN +dBJ +wje vHS qJc dWG @@ -58972,25 +58957,25 @@ jSr jSr jSr iPB -dnw -vmF -sCV -lGn -vmF -ibB +iPB +ejq iPB iPB -tNg -keO +ejq +iPB +iPB +iPB +fQu +gcD vaB vzK hmf vHS -yiw -eYk -dfG -hzI -ixR +rja +rja +hxl +rja +rja vHS vpR pQc @@ -59171,7 +59156,7 @@ www pkE mqd voF -vmF +ibB lMm ejq tNg @@ -59179,12 +59164,12 @@ wnY vaB vzK hmf -rja -ewg -hto -evx -tiX -opc +vHS +fkB +nYw +qrM +kUL +lAb vHS vpR pQc @@ -59373,12 +59358,12 @@ wnY vaB vzK hmf -rja -qYR -hnf -rxB -uoh -pPd +vHS +yiw +eYk +dfG +hzI +ixR vHS vcA ddx @@ -59568,11 +59553,11 @@ vaB vzK hmf rja -gtw -hto -evx -tiX -gtw +qYR +hnf +rxB +uoh +pPd vHS eMx eMx @@ -59761,11 +59746,11 @@ keO vaB vzK mqr -vHS -cLg -gtw -dwC +rja gtw +hto +evx +tiX gtw vHS rWU @@ -59946,7 +59931,7 @@ vMY bvC nUB itT -vmF +wdy eDR iPB iPB @@ -59956,11 +59941,11 @@ vaB vzK hmf vHS -uSl -vZz -xrj -kur -llZ +cLg +gtw +dwC +gtw +gtw vHS lyX eRg @@ -60150,11 +60135,11 @@ vaB vzK trY vHS -vHS -vHS -vHS -vHS -vHS +uSl +vZz +xrj +kur +llZ vHS xnd omD @@ -60342,13 +60327,13 @@ jSr wnY vaB vzK -gwt -dPs -ryd -xbU -tLs -tLs -tLs +hmf +wVr +wVr +wVr +uJg +uJg +uJg eAU itk dSc @@ -60536,9 +60521,9 @@ jSr wnY vaB vzK -vCB -xbU -xbU +gwt +dPs +ryd xbU tLs tLs @@ -60924,7 +60909,7 @@ tNg keO vaB vzK -xyY +vCB xbU uHT mcX @@ -62086,7 +62071,7 @@ nlg nhR gHy cYz -gnx +opu gnx juK xbU diff --git a/maps/tether/levels/surface3.dmm b/maps/tether/levels/surface3.dmm index 0b2a2a44cc6..9d5e103587a 100644 --- a/maps/tether/levels/surface3.dmm +++ b/maps/tether/levels/surface3.dmm @@ -237,8 +237,8 @@ /area/tether/surfacebase/surface_three_hall) "adV" = ( /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ - name = "surfsurgery2"; - id = "surfsurgery2" + id = "surfsurgery2"; + name = "surfsurgery2" }, /obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, @@ -259,14 +259,20 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) "aeK" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 8 }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aeX" = ( @@ -286,6 +292,15 @@ }, /turf/simulated/open, /area/tether/surfacebase/public_garden_three) +"afv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "afz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -924,27 +939,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) -"avT" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/structure/window/basic{ - dir = 4 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "awe" = ( /obj/machinery/door/airlock{ id_tag = "barbackdoor"; @@ -1345,9 +1339,7 @@ /area/library) "aGP" = ( /obj/structure/sign/deck/third, -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) "aGV" = ( /obj/structure/disposalpipe/segment{ @@ -1571,6 +1563,18 @@ /obj/item/radio/phone, /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) +"aLR" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "aMa" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/borderfloor, @@ -2998,20 +3002,8 @@ /turf/simulated/floor/wood, /area/library) "bAz" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/machinery/power/apc/south_mount, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) +/turf/simulated/open, +/area/tether/elevator/two) "bAK" = ( /obj/structure/bed/chair/sofa/brown/left{ dir = 1 @@ -3543,10 +3535,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/captain) -"bPN" = ( -/obj/machinery/camera/network/command, -/turf/simulated/floor/tiled/dark, -/area/bridge) "bPV" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -3707,6 +3695,25 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) +"bWf" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "bWr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor, @@ -3928,16 +3935,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"cbM" = ( -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "ccd" = ( /obj/machinery/media/jukebox, /obj/machinery/fire_alarm/north_mount, @@ -4334,25 +4331,6 @@ /obj/structure/bed/chair/sofa/black/left, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"cow" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/corner/blue/bordercorner{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "cox" = ( /obj/machinery/vending/security{ dir = 4 @@ -4374,6 +4352,26 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"coV" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/machinery/camera/network/tether, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 5 + }, +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 24 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "cqo" = ( /obj/structure/table/woodentable, /obj/item/paper_bin{ @@ -4383,6 +4381,25 @@ /obj/item/pen, /turf/simulated/floor/carpet, /area/library) +"crl" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "crm" = ( /obj/machinery/light/small{ dir = 4 @@ -4397,6 +4414,22 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +"crP" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "csz" = ( /obj/structure/reagent_dispensers/watertank, /obj/item/reagent_containers/glass/bucket, @@ -5245,22 +5278,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) -"cUn" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "cUJ" = ( /obj/effect/floor_decal/spline/plain{ dir = 5 @@ -5703,14 +5720,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/hallway/primary/fore) -"diq" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass/command{ - name = "Bridge"; - req_access = list(19) - }, -/turf/simulated/floor/tiled/dark, -/area/bridge) "diK" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -6337,6 +6346,14 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +"dBm" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/hallway/lower/third_south) "dBH" = ( /obj/machinery/botany/editor, /obj/effect/floor_decal/borderfloor{ @@ -6497,25 +6514,6 @@ dir = 4 }, /area/hallway/lower/third_south) -"dFK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "dHm" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -6626,6 +6624,9 @@ /obj/machinery/light{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/primary/port) "dJf" = ( @@ -7118,6 +7119,21 @@ /obj/item/beach_ball, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) +"dYS" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "dZl" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -7185,6 +7201,23 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) +"eaC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "eaP" = ( /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/tiled, @@ -7325,27 +7358,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"ehm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/status_display{ - pixel_y = 30 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "eho" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 8 @@ -7355,6 +7367,12 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) +"ehy" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "ehG" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 @@ -7714,17 +7732,14 @@ /area/tether/surfacebase/security/iaa/officecommon) "etf" = ( /obj/machinery/light, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, /obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 + dir = 10 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 +/obj/effect/floor_decal/borderfloor{ + dir = 6 }, -/obj/structure/sign/directions/evac{ - dir = 1; - pixel_y = -32 +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 6 }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) @@ -8594,22 +8609,18 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "eST" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 +/obj/effect/floor_decal/borderfloor{ + dir = 10 }, -/obj/machinery/camera/network/tether{ - dir = 4 +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 10 }, -/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "eTd" = ( @@ -8931,6 +8942,21 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) +"feZ" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "ffs" = ( /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) @@ -9141,6 +9167,22 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) +"flb" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "flc" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -9402,7 +9444,7 @@ dir = 8 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 + dir = 8 }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) @@ -9577,20 +9619,6 @@ /obj/effect/floor_decal/corner/red/bordercorner2, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) -"fBy" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "fBE" = ( /obj/machinery/space_heater, /obj/effect/floor_decal/techfloor, @@ -10672,6 +10700,28 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) +"gbq" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "geu" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -10700,6 +10750,12 @@ /obj/structure/flora/ausbushes/leafybush, /turf/simulated/floor/grass, /area/hydroponics) +"ggC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/hallway/lower/third_south) "ghk" = ( /obj/machinery/door/airlock/multi_tile/glass{ name = "Medbay Storage"; @@ -10961,6 +11017,9 @@ /obj/machinery/camera/network/civilian, /turf/simulated/floor/tiled/freezer/cold, /area/crew_quarters/freezer) +"gpp" = ( +/turf/simulated/floor/plating, +/area/hallway/lower/third_south) "gpz" = ( /turf/simulated/wall/prepainted/command, /area/tether/surfacebase/security/iaa/officea) @@ -11020,6 +11079,9 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "grq" = ( @@ -11373,30 +11435,12 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "gzU" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/blue/bordercorner2{ - dir = 6 - }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "gAM" = ( @@ -11440,10 +11484,25 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "gDK" = ( -/obj/structure/railing{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/simulated/open, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 10 + }, +/turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "gEL" = ( /obj/machinery/portable_atmospherics/canister/phoron, @@ -11536,6 +11595,11 @@ /obj/machinery/light, /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) +"gJC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "gJU" = ( /turf/simulated/wall, /area/hallway/lower/third_south) @@ -12252,6 +12316,12 @@ /obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_decon) +"hfu" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "hfy" = ( /turf/simulated/wall/prepainted/science, /area/rnd/research/researchdivision) @@ -13244,14 +13314,14 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "hRE" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/floor_decal/steeldecal/steel_decals6, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "hRM" = ( @@ -13338,6 +13408,21 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +"hVA" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "hVU" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -14289,21 +14374,6 @@ "iwC" = ( /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) -"iwI" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -25 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "ixe" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -14318,10 +14388,23 @@ /turf/simulated/floor/tiled, /area/hallway/primary/fore) "ixf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "ixs" = ( @@ -14928,6 +15011,21 @@ dir = 10 }, /obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/bordercorner{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "iPt" = ( @@ -14996,8 +15094,8 @@ /area/rnd/xenobiology/xenoflora) "iRQ" = ( /obj/machinery/door/window{ - name = "Dealer's Seat"; - dir = 4 + dir = 4; + name = "Dealer's Seat" }, /turf/simulated/floor/carpet/bcarpet, /area/tether/surfacebase/barbackmaintenance) @@ -15401,6 +15499,14 @@ /obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) +"jcG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "jdy" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -15606,6 +15712,25 @@ "jjc" = ( /turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/upperhall) +"jjy" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "jjJ" = ( /obj/machinery/vending/fitness, /turf/simulated/floor/tiled, @@ -15824,18 +15949,19 @@ /obj/structure/flora/pottedplant/stoutbush, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) -"jps" = ( -/obj/structure/disposalpipe/segment{ +"jqi" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "jqH" = ( @@ -15946,19 +16072,6 @@ /obj/landmark/spawnpoint/job/entertainer, /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) -"jsx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "jsD" = ( /obj/structure/table/bench/wooden, /turf/simulated/floor/wood, @@ -16312,22 +16425,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/fore) -"jDg" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "jDv" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 @@ -17195,6 +17292,21 @@ }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) +"kiy" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "kiG" = ( /obj/machinery/door/airlock/multi_tile/glass{ dir = 8; @@ -17668,6 +17780,15 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge) +"kAD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "kBl" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -17890,6 +18011,9 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) +"kJa" = ( +/turf/simulated/wall/prepainted/civilian, +/area/hallway/lower/third_south) "kJi" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -18002,6 +18126,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "kOG" = ( @@ -18101,6 +18228,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/primary/port) "kTj" = ( @@ -18230,6 +18360,14 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/bar) +"kXp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "kXv" = ( /obj/machinery/door/airlock/maintenance/common, /obj/effect/floor_decal/industrial/warning{ @@ -18787,9 +18925,9 @@ dir = 4 }, /obj/machinery/door/airlock/multi_tile/glass/polarized{ + dir = 8; id_tint = "saunatint"; - name = "Sauna"; - dir = 8 + name = "Sauna" }, /turf/simulated/floor/wood, /area/triumph/surfacebase/sauna) @@ -19892,7 +20030,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "lWD" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, @@ -20496,10 +20633,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) -"mpF" = ( -/obj/structure/sign/department/biblio, -/turf/simulated/wall, -/area/library) "mpY" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -20540,28 +20673,6 @@ /obj/machinery/holopad, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) -"mra" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = 24 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "mrW" = ( /obj/structure/bed/chair{ dir = 1 @@ -20628,6 +20739,9 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"mtC" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/hallway/lower/third_south) "mtS" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -21309,10 +21423,15 @@ /obj/machinery/station_map{ pixel_y = 32 }, -/obj/effect/floor_decal/borderfloor/cee{ - dir = 1 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 9 }, -/obj/effect/floor_decal/corner/lightgrey/bordercee, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "mNt" = ( @@ -21634,25 +21753,6 @@ }, /turf/simulated/floor/lino, /area/crew_quarters/bar) -"mVM" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "mWf" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 8 @@ -21668,18 +21768,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/port) -"mWU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "mXn" = ( /obj/structure/closet/firecloset, /obj/machinery/atmospherics/component/unary/vent_pump/on, @@ -22437,6 +22525,10 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/hallway/primary/port) "ntv" = ( @@ -22520,9 +22612,7 @@ /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) "nvV" = ( -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) "nwl" = ( /obj/structure/sign/poster{ @@ -23337,15 +23427,16 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "nQz" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, /obj/structure/closet/firecloset, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "nQQ" = ( @@ -23699,6 +23790,9 @@ /obj/machinery/atm{ pixel_y = 30 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/primary/port) "ocI" = ( @@ -24236,6 +24330,9 @@ }, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/hallway/primary/port) "opJ" = ( @@ -24299,6 +24396,25 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/iaa) +"osl" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "osB" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 8 @@ -24706,6 +24822,25 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +"oDX" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "oEg" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -24757,10 +24892,12 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) "oFU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "oFZ" = ( @@ -24831,8 +24968,17 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_main) "oIl" = ( -/obj/machinery/door/firedoor{ - dir = 1 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) @@ -25429,15 +25575,13 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/blue/bordercorner2{ - dir = 5 - }, /obj/machinery/light{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "oZC" = ( @@ -26155,22 +26299,6 @@ "prs" = ( /turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_south_airlock) -"prv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "prB" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, @@ -26957,6 +27085,9 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/processing) +"pOp" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/tether/elevator/two) "pOF" = ( /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -27002,6 +27133,22 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) +"pPL" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "pPW" = ( /obj/structure/railing{ dir = 1 @@ -28045,6 +28192,15 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) +"qul" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "qux" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -28782,6 +28938,18 @@ /area/crew_quarters/bar) "qUG" = ( /obj/machinery/door/firedoor, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "qUY" = ( @@ -28816,6 +28984,24 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/library) +"qWc" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "qWg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -29281,25 +29467,6 @@ "ria" = ( /turf/simulated/floor/lino, /area/crew_quarters/bar) -"rjb" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass/command{ - dir = 1; - name = "Bridge"; - req_access = list(19) - }, -/obj/machinery/door/blast/regular{ - closed_layer = 10; - density = 0; - icon_state = "pdoor0"; - id = "bridge blast"; - layer = 1; - name = "Bridge Blast Doors"; - opacity = 0; - open_layer = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/bridge) "rjS" = ( /obj/structure/table/glass, /obj/machinery/light_switch{ @@ -29338,13 +29505,17 @@ /turf/simulated/floor/tiled/techfloor, /area/vacant/vacant_shop) "rkU" = ( -/obj/structure/disposalpipe/segment{ +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/corner/lightgrey/border{ dir = 4 }, /turf/simulated/floor/tiled, @@ -29418,28 +29589,6 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/tourbus/general) -"rou" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/structure/window/basic{ - dir = 4 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "roN" = ( /obj/machinery/air_alarm{ dir = 1; @@ -29722,15 +29871,6 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/plating, /area/rnd/research_storage) -"rxn" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "rxv" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -30224,28 +30364,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) -"rPD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "rPL" = ( /obj/machinery/newscaster{ pixel_y = 30 @@ -30357,6 +30475,12 @@ /obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/research) +"rRX" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "rSM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -30639,6 +30763,25 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) +"rZE" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "rZS" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/tether/elevator) @@ -31647,6 +31790,22 @@ }, /turf/simulated/floor/plating, /area/tether/surfacebase/southhall) +"sDD" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "sDF" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 @@ -31978,11 +32137,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) -"sMZ" = ( -/obj/structure/grille, -/obj/structure/railing, -/turf/simulated/floor/tiled/techmaint, -/area/hallway/lower/third_south) "sNk" = ( /obj/machinery/holopad, /turf/simulated/floor/tiled/techfloor, @@ -33210,6 +33364,9 @@ /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/grass, /area/hydroponics) +"tCR" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/tether/elevator/two) "tDK" = ( /obj/machinery/computer/atmos_alert{ dir = 8 @@ -33487,6 +33644,23 @@ }, /turf/simulated/shuttle/floor/black, /area/shuttle/tether) +"tLw" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "tLK" = ( /obj/machinery/power/apc/south_mount{ req_access = list(); @@ -33538,13 +33712,6 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) -"tMF" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing, -/turf/simulated/open, -/area/tether/surfacebase/surface_three_hall) "tMI" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -33759,15 +33926,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) -"tRx" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "tRN" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -34094,30 +34252,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) -"tYN" = ( -/obj/machinery/light, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 9 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "tYY" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -35704,6 +35838,9 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/machinery/camera/network/tether, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/primary/port) "uRH" = ( @@ -35738,6 +35875,28 @@ /obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/public_garden_three) +"uSB" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "uSK" = ( /obj/machinery/door/airlock{ id_tag = "bathroomlock17"; @@ -36445,6 +36604,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/primary/port) "vqw" = ( @@ -36925,6 +37085,27 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +"vGn" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/item/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_x = 24 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "vGG" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -37019,6 +37200,9 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "vJD" = ( @@ -37293,6 +37477,9 @@ }, /turf/simulated/floor/carpet, /area/tether/surfacebase/library/study) +"vRi" = ( +/turf/simulated/open, +/area/tether/elevator) "vRx" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -37338,14 +37525,17 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "vRG" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner{ - dir = 4 - }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/machinery/door/firedoor, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "vRI" = ( @@ -37713,6 +37903,24 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_decon) +"vXY" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "vYa" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -38139,15 +38347,6 @@ }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) -"wmP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "wmQ" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -39590,18 +39789,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"xgL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "xhp" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -39792,11 +39979,23 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "xnO" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) @@ -40232,23 +40431,6 @@ }, /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) -"xyG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/camera/network/tether, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "xyK" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -40380,6 +40562,9 @@ dir = 4 }, /obj/structure/disposalpipe/junction, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "xCJ" = ( @@ -40499,6 +40684,28 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_main) +"xGb" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "xGi" = ( /obj/structure/table/steel, /obj/effect/floor_decal/borderfloor{ @@ -40575,23 +40782,6 @@ }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) -"xHU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/fire_alarm/north_mount, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "xIc" = ( /obj/effect/shuttle_landmark{ base_area = /area/tether/surfacebase/shuttle_pad; @@ -40861,6 +41051,26 @@ /obj/structure/cable/green, /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) +"xOe" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "xOq" = ( /obj/structure/railing{ dir = 4 @@ -40890,6 +41100,17 @@ /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/research_storage) +"xPN" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "xQe" = ( /obj/machinery/light_switch{ pixel_y = 25 @@ -41177,6 +41398,21 @@ }, /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) +"xXs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "xXz" = ( /obj/machinery/papershredder, /obj/machinery/air_alarm{ @@ -41234,6 +41470,16 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_three) +"xZh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "xZr" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -41387,8 +41633,8 @@ /area/tether/surfacebase/north_stairs_three) "yeu" = ( /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ - name = "surfsurgery1"; - id = "surfsurgery1" + id = "surfsurgery1"; + name = "surfsurgery1" }, /obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, @@ -64131,10 +64377,10 @@ cyt ebZ xYd nvV -rZS -rZS -rZS -rZS +vRi +vRi +vRi +vRi nvV ovU oKJ @@ -64325,10 +64571,10 @@ lSR qKD xYd nvV -rZS -rZS -rZS -rZS +vRi +vRi +vRi +vRi nvV ovU liW @@ -64519,10 +64765,10 @@ aVN eGm xYd nvV -rZS -rZS -rZS -rZS +vRi +vRi +vRi +vRi nvV ovU mcx @@ -64713,10 +64959,10 @@ cyt eGm xYd nvV -rZS -rZS -rZS -rZS +vRi +vRi +vRi +vRi nvV ovU gCz @@ -64903,7 +65149,7 @@ fYm lHP fZp bvv -aVN +cyt eGm xYd nvV @@ -65097,8 +65343,8 @@ fYm dna fZp bvv -aVN -eGm +cyt +pbQ xYd xYd mNm @@ -65288,15 +65534,15 @@ its cUL sYI fYm -oKU +qWc vqr ntl -cyt -eGm -eGm -pbQ -xYd -mra +vXY +flb +xGb +flb +jjy +pXZ pXZ qpO kNe @@ -65483,15 +65729,15 @@ lHr roN fYm ocA -fZp -bvv -aVN -eGm -eGm -eGm -vNK -prv -cbM +kiy +xPN +xZh +kXp +jcG +nmQ +nmQ +nmQ +oMt oFU xtM oua @@ -65677,17 +65923,17 @@ iIJ xjn fYm uRE -kpP -bvv -aVN -eGm -eGm -eGm -vNK -xyG -jsx +xXs +dYS +tLw +jqi +oDX +pPL +rZE +pXZ +pXZ fvy -odE +vGn mMd odE wDK @@ -65871,17 +66117,17 @@ fYm fYm fYm dIO -kpP +xXs bvv -cyt -eGm -eGm -eGm xYd -mVM +xYd +dBm +mtC +coV +rkU rkU etf -ucY +kJa ucY ucY ucY @@ -66064,18 +66310,18 @@ cFx dEh ptF nrO -lHP -kpP +sDD +xXs iGD -cyt xYd -xYd -xYd -xYd -xHU -rkU -iwI -ucY +gpp +ggC +tCR +tCR +pOp +pOp +tCR +tCR rhH jIV kVB @@ -66258,18 +66504,18 @@ dgz ixt ptF nav -lHP -kpP +sDD +xXs bvv -cyt xYd -xYd -pJQ -sMZ -rPD -xgL +gpp +ggC +tCR bAz -ucY +bAz +bAz +bAz +tCR kFH oRO jPA @@ -66455,15 +66701,15 @@ ptF kSN opq nUm -cyt xYd xYd -xYd -xYd -ehm -jps -cUn -ucY +dBm +tCR +bAz +bAz +bAz +bAz +tCR suk vQT pXe @@ -66652,12 +66898,12 @@ osB kTG wyc eST -kTG -dFK -jDg -mWU -fBy -ucY +tCR +bAz +bAz +bAz +bAz +tCR ucY oYS ucY @@ -66840,18 +67086,18 @@ aUe iHe iHe iHe -iHe +qul xCs -iHe -iHe +kAD +gJC lWD ixf -iHe -tRx -wmP -rxn -fBy -fyE +tCR +bAz +bAz +bAz +bAz +tCR lrz nRX wyX @@ -67034,18 +67280,18 @@ jPj dYm dYm dYm -dYm -dYm +uSB +gbq oZj iOW gzU -rou -avT -avT -cow -pAa -tYN -mpF +xOe +tCR +tCR +tCR +tCR +tCR +tCR dbL blA ncd @@ -67231,12 +67477,12 @@ dyJ dyJ dyJ qVC -rjb -qVC +feZ +ehy gDK -gDK -tMF -quL +eaC +eaC +eaC xnO aeK uIO @@ -67425,13 +67671,13 @@ qix bPe rXR qVC -bPN -qVC -sHq -sHq -jiB -quL -szv +feZ +hfu +afv +rRX +rRX +rRX +pAa hRE tcx uOF @@ -67619,12 +67865,12 @@ dVF lRy okn qVC -fza -qVC -sHq -sHq -jiB -quL +aLR +hVA +bWf +osl +crP +crl szv icz gAM @@ -67813,7 +68059,7 @@ rYh aDh aDh qVC -diq +qVC qVC qVC qVC