diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 34f41b19f3f3..6cacb6332efe 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -1487,6 +1487,14 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "\improper Dormitory Room 11" icon_state = "crew_quarters" +/area/crew_quarters/sleep/Dorm_12 + name = "\improper Dormitory Room 12" + icon_state = "crew_quarters" + +/area/crew_quarters/sleep/Dorm_13 + name = "\improper Dormitory Room 13" + icon_state = "crew_quarters" + /area/crew_quarters/showers name = "\improper Unisex Showers" icon_state = "recreation_area_restroom" diff --git a/maps/endeavour/levels/deck1.dmm b/maps/endeavour/levels/deck1.dmm index ad1d805a0ba5..c7066a3a3ae9 100644 --- a/maps/endeavour/levels/deck1.dmm +++ b/maps/endeavour/levels/deck1.dmm @@ -59,6 +59,15 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "adZ" = ( @@ -189,6 +198,19 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/coffee_shop) +"aiX" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "aka" = ( /obj/machinery/porta_turret/stationary, /obj/effect/floor_decal/industrial/outline/yellow, @@ -317,6 +339,13 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) +"apc" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/hallway/secondary/docking_hallway2) "apf" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -344,6 +373,16 @@ /obj/structure/window/basic/full, /turf/simulated/floor/plating, /area/endeavour/surfacebase/sauna) +"apW" = ( +/obj/structure/sign/directions/elevator{ + dir = 4 + }, +/obj/structure/sign/directions/bridge{ + dir = 4; + pixel_y = 7 + }, +/turf/simulated/wall/prepainted/civilian, +/area/endeavour/hallway/d1fwdmaint) "aqI" = ( /obj/effect/floor_decal/techfloor, /obj/effect/floor_decal/corner/red/border, @@ -373,6 +412,7 @@ /obj/machinery/camera/network/civilian{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) "arM" = ( @@ -386,6 +426,9 @@ icon_state = "4-8" }, /obj/item/radio/beacon, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "arP" = ( @@ -428,17 +471,22 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "atm" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/navblue/border{ +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/door/firedoor{ dir = 8 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +/obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1afthall) +/area/endeavour/hallway/d1portamidhall) "atN" = ( /obj/structure/bed/chair/sofa/brown/right{ dir = 4 @@ -494,6 +542,9 @@ /obj/effect/floor_decal/corner/mauve/bordercorner{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) "awW" = ( @@ -602,6 +653,7 @@ /obj/structure/sign/warning/evac{ pixel_x = -32 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "aCq" = ( @@ -632,6 +684,15 @@ /obj/effect/floor_decal/corner/navblue/border, /obj/effect/floor_decal/borderfloorblack/corner2, /obj/effect/floor_decal/corner/navblue/bordercorner2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "aDc" = ( @@ -664,6 +725,21 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) +"aEv" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "aEK" = ( /obj/structure/bookcase{ name = "bookcase (Fiction)" @@ -672,8 +748,8 @@ /turf/simulated/floor/wood, /area/library) "aEU" = ( -/turf/simulated/wall/prepainted/engineering/atmos, -/area/endeavour/hallway/d1fwdmaint) +/turf/simulated/wall/prepainted/civilian, +/area/vacant/vacant_bar) "aFa" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/coffee_shop) @@ -714,17 +790,10 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "aFD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, +/obj/structure/disposalpipe/segment, +/obj/item/radio/beacon, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardafthall) +/area/hallway/secondary/docking_hallway) "aGj" = ( /turf/simulated/floor/carpet/tealcarpet, /area/endeavour/hallway/d1fwdmaint) @@ -735,7 +804,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/machinery/holoposter{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "aGw" = ( @@ -761,13 +832,12 @@ /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "aGG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "aGH" = ( @@ -837,6 +907,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals8{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "aHN" = ( @@ -864,6 +937,13 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/secondary/docking_hallway) +"aIx" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/maintenance/tool_storage) "aID" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -885,6 +965,18 @@ "aIM" = ( /turf/simulated/floor/tiled, /area/rnd/misc_lab) +"aIU" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "aIY" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 1 @@ -905,6 +997,9 @@ icon_state = "1-2" }, /obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/wood, /area/crew_quarters/captain) "aJQ" = ( @@ -1047,7 +1142,7 @@ /area/endeavour/hallway/d1aftmaint) "aNV" = ( /turf/simulated/floor/airless, -/area/rnd/misc_lab) +/area/space) "aPj" = ( /obj/structure/closet/coffin/comfy, /turf/simulated/floor/tiled, @@ -1099,19 +1194,20 @@ /obj/effect/floor_decal/corner/navblue/border, /obj/effect/floor_decal/borderfloorblack/corner2, /obj/effect/floor_decal/corner/navblue/bordercorner2, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "aRC" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "aSd" = ( @@ -1143,12 +1239,6 @@ /obj/effect/floor_decal/corner/navblue/bordercorner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "aUs" = ( @@ -1189,15 +1279,12 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/machinery/newscaster{ pixel_y = 32 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "aVu" = ( @@ -1230,19 +1317,16 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/civilian) +"aWe" = ( +/obj/effect/floor_decal/steeldecal/steel_decals_central7, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardforhall) "aWO" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navgold/border{ +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/structure/cable{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardforhall) "aWP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -1426,6 +1510,20 @@ /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/grass, /area/hydroponics/garden) +"bdJ" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/orange{ + 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/steel, +/area/endeavour/hallway/d1portforhall) "bdP" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -1439,7 +1537,6 @@ /obj/effect/floor_decal/corner/navgold/bordercorner2{ dir = 1 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -1608,7 +1705,6 @@ dir = 8 }, /obj/spawner/window/low_wall/borosillicate/reinforced/full, -/obj/effect/paint_stripe/commandblue, /obj/effect/paint/commandblue, /turf/simulated/shuttle/floor/voidcraft, /area/bridge/office) @@ -1726,6 +1822,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "bsl" = ( @@ -1813,13 +1912,11 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "bwE" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "bwJ" = ( @@ -1829,12 +1926,6 @@ /turf/simulated/floor/water/pool, /area/endeavour/surfacebase/sauna) "bxc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor{ dir = 8 }, @@ -1874,6 +1965,27 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d1fwdmaint) +"byU" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "bzz" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -2029,13 +2141,10 @@ /area/rnd/misc_lab) "bHE" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "bHQ" = ( @@ -2098,6 +2207,8 @@ /obj/machinery/light{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "bIF" = ( @@ -2145,9 +2256,8 @@ /turf/simulated/floor/wood, /area/hydroponics/garden) "bLC" = ( -/obj/machinery/cryopod/robot/door/shuttle, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d1afthall) +/turf/simulated/wall/r_wall/prepainted/civilian, +/area/crew_quarters/lounge) "bLW" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -2164,11 +2274,12 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1fwdhall) "bMi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -2231,6 +2342,12 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "bPB" = ( @@ -2343,6 +2460,9 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) "bTg" = ( @@ -2505,6 +2625,9 @@ /obj/machinery/door/firedoor{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "cdx" = ( @@ -2515,12 +2638,6 @@ /area/maintenance/substation/command) "cdK" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable/orange{ icon_state = "4-8" }, @@ -2545,15 +2662,9 @@ /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/excursion/cargo) "cfh" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, -/area/hallway/secondary/docking_hallway2) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/carpet/bcarpet, +/area/library) "cfl" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/glass{ @@ -2680,6 +2791,12 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/endeavour/hallway/d1aftmaint) +"cke" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/heads/hop) "ckq" = ( /obj/machinery/air_alarm{ pixel_y = 22 @@ -2740,6 +2857,10 @@ dir = 8; pixel_x = -24 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "cmM" = ( @@ -2801,7 +2922,7 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d1aftmaint) "cqc" = ( -/turf/simulated/wall/prepainted, +/turf/simulated/wall/prepainted/civilian, /area/exploration) "cqF" = ( /obj/structure/cable/green{ @@ -2940,6 +3061,11 @@ /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/structure/disposalpipe/sortjunction{ + dir = 1; + name = "FD Office"; + sortType = "FD Office" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1fwdhall) "cwi" = ( @@ -2966,8 +3092,11 @@ /obj/effect/floor_decal/corner/navgold/bordercorner2{ dir = 9 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) @@ -3013,21 +3142,19 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/courser_dock) "czG" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 1 +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/effect/floor_decal/borderfloorblack/corner2{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/corner/navgold/bordercorner2{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardafthall) +/area/endeavour/hallway/d1portamidhall) "czH" = ( /obj/effect/floor_decal/spline/fancy{ dir = 1 @@ -3131,9 +3258,31 @@ }, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) +"cDX" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "cEb" = ( -/turf/simulated/wall/prepainted, +/turf/simulated/wall/prepainted/civilian, /area/endeavour/surfacebase/sauna) +"cEM" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/exploration) "cEN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -3173,8 +3322,8 @@ /obj/effect/floor_decal/corner/navgold/bordercorner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "cGq" = ( @@ -3228,6 +3377,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/hydroponics/garden) "cIw" = ( @@ -3282,6 +3432,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/docking_hallway) "cKS" = ( @@ -3324,8 +3477,15 @@ }, /turf/simulated/floor/plating, /area/hallway/secondary/docking_hallway) +"cMA" = ( +/obj/structure/table/bench/wooden, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/hydroponics/garden) "cMJ" = ( -/turf/simulated/wall/r_wall/prepainted, +/turf/simulated/wall/r_wall/prepainted/civilian, /area/endeavour/surfacebase/tram) "cMQ" = ( /obj/effect/floor_decal/industrial/outline/red, @@ -3338,8 +3498,37 @@ }, /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) +"cNq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/wood, +/area/hydroponics/garden) +"cNT" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "cOc" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/chapel) "cOe" = ( @@ -3398,17 +3587,19 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) "cPY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/effect/floor_decal/techfloor/orange, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 9 }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1portamidhall) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/secondary/docking_hallway2) "cQp" = ( /obj/machinery/light{ dir = 1 @@ -3422,6 +3613,13 @@ /obj/effect/floor_decal/corner/navblue/bordercorner{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "cQR" = ( @@ -3586,17 +3784,26 @@ /obj/machinery/door/firedoor{ dir = 1 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardafthall) +"cVD" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardafthall) +/turf/simulated/floor/tiled, +/area/exploration) "cVE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/vending/hydroseeds, @@ -3739,6 +3946,22 @@ /obj/item/toy/plushie/coffee_fox, /turf/simulated/floor/wood/broken, /area/endeavour/hallway/d1fwdmaint) +"dbq" = ( +/obj/effect/floor_decal/steeldecal/steel_decals_central7, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardafthall) "ddG" = ( /obj/structure/table/rack, /obj/item/tool/wrench, @@ -3768,7 +3991,6 @@ dir = 4 }, /obj/structure/flora/ausbushes/ppflowers, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/grass, /area/hydroponics/garden) "dfS" = ( @@ -3782,9 +4004,13 @@ /turf/simulated/floor/water/deep/indoors, /area/hydroponics/garden) "dfU" = ( -/obj/effect/shuttle_landmark/endeavour/deck4/specops, -/turf/space, -/area/space) +/obj/effect/floor_decal/industrial/warning/full, +/obj/structure/lattice, +/obj/structure/disposalpipe/down{ + dir = 2 + }, +/turf/simulated/open, +/area/maintenance/substation/dock) "dgm" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -3808,19 +4034,27 @@ /turf/simulated/floor/wood, /area/crew_quarters/lounge) "dhk" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/reinforced, /area/space) "dhv" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "dhw" = ( @@ -3877,22 +4111,31 @@ /turf/simulated/floor/plating, /area/maintenance/substation/civilian) "dkh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/sign/directions/bridge{ + dir = 4; + pixel_y = 7 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/structure/sign/directions/evac{ + dir = 8; + pixel_y = -7 }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/structure/sign/directions/elevator{ + dir = 4 }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1portamidhall) +/turf/simulated/wall/prepainted/civilian, +/area/endeavour/hallway/d1fwdmaint) "dkm" = ( /obj/structure/table/rack/shelf/steel, /obj/item/stack/flag/red, /turf/simulated/floor/plating, /area/endeavour/hallway/d1aftmaint) +"dkq" = ( +/obj/effect/floor_decal/steeldecal/steel_decals_central7, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "dkB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -3983,17 +4226,21 @@ /obj/effect/floor_decal/corner/navblue/bordercorner{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "doZ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/cable{ - icon_state = "4-8" + dir = 4 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) @@ -4025,18 +4272,15 @@ /turf/simulated/floor/plating, /area/maintenance/chapel) "dqz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/structure/cable{ icon_state = "4-8" }, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "dqY" = ( @@ -4153,6 +4397,14 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/library/study) +"duk" = ( +/obj/effect/floor_decal/techfloor/orange, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/secondary/docking_hallway2) "duF" = ( /obj/machinery/camera/network/command, /obj/machinery/atmospherics/component/unary/vent_pump/on, @@ -4172,6 +4424,10 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) "dvq" = ( @@ -4179,7 +4435,19 @@ dir = 8 }, /turf/simulated/floor/wood, -/area/endeavour/hallway/d1afthall) +/area/crew_quarters/lounge) +"dwQ" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardamidhall) "dyH" = ( /obj/effect/floor_decal/grass_edge, /obj/structure/lightpost, @@ -4226,6 +4494,7 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 10 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "dAR" = ( @@ -4261,6 +4530,21 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/library/study) +"dCe" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4; + use_power = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1afthall) "dCl" = ( /obj/effect/floor_decal/chapel{ dir = 4 @@ -4280,7 +4564,7 @@ pixel_y = -24; dir = 8 }, -/turf/simulated/wall/prepainted, +/turf/simulated/wall/prepainted/civilian, /area/maintenance/tool_storage) "dDt" = ( /obj/effect/floor_decal/borderfloor{ @@ -4351,6 +4635,10 @@ /obj/machinery/door/firedoor{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "dGc" = ( @@ -4421,6 +4709,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/substation/dock) "dJb" = ( @@ -4467,6 +4756,13 @@ /area/chapel/main) "dKn" = ( /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, /obj/machinery/door/airlock/multi_tile/glass{ dir = 1; name = "Exploration Public Lobby" @@ -4492,12 +4788,18 @@ "dLH" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "dMa" = ( @@ -4546,6 +4848,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "dOB" = ( @@ -4678,7 +4983,7 @@ /obj/machinery/door/blast/regular, /obj/machinery/atmospheric_field_generator/perma, /turf/simulated/floor/plating, -/area/space) +/area/hallway/secondary/docking_hallway) "dTx" = ( /obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ @@ -4771,8 +5076,9 @@ /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) "dYN" = ( -/turf/space, -/area/hallway/secondary/docking_hallway) +/obj/structure/sign/deck/first, +/turf/simulated/wall/r_wall/prepainted/civilian, +/area/station/stairs_one) "dYO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -4797,7 +5103,7 @@ /turf/simulated/floor/lino, /area/crew_quarters/coffee_shop) "dZr" = ( -/turf/simulated/wall/prepainted, +/turf/simulated/wall/prepainted/civilian, /area/maintenance/substation/dock) "dZv" = ( /obj/structure/table/reinforced, @@ -4893,6 +5199,20 @@ /obj/structure/closet/firecloset, /turf/simulated/floor/plating, /area/endeavour/hallway/d1aftmaint) +"ecz" = ( +/obj/structure/sign/directions/elevator{ + dir = 4 + }, +/obj/structure/sign/directions/evac{ + dir = 8; + pixel_y = -7 + }, +/obj/structure/sign/directions/bridge{ + dir = 4; + pixel_y = 7 + }, +/turf/simulated/wall/r_wall/prepainted/command, +/area/crew_quarters/heads/hop) "ecK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/industrial/warning{ @@ -4963,6 +5283,9 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "eeY" = ( @@ -5095,15 +5418,16 @@ }, /area/endeavour/command/turrets) "elR" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /obj/effect/paint/commandblue, /turf/simulated/shuttle/floor/voidcraft, /area/bridge/office) "emu" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, /obj/effect/floor_decal/techfloor/orange, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) "emK" = ( @@ -5193,8 +5517,8 @@ /area/library/study) "eoY" = ( /obj/item/radio/beacon, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) @@ -5204,6 +5528,15 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/lounge) +"epQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "erf" = ( /obj/machinery/door/firedoor/glass{ dir = 8 @@ -5284,6 +5617,10 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) "esI" = ( @@ -5492,7 +5829,7 @@ /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "eAX" = ( -/obj/structure/bed/chair/shuttle{ +/obj/structure/bed/chair/bay/shuttle{ dir = 8 }, /obj/structure/panic_button{ @@ -5501,7 +5838,7 @@ /turf/simulated/floor/tiled, /area/shuttle/excursion/general) "eCj" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /obj/effect/paint/violet, /turf/simulated/floor/plating, /area/crew_quarters/lounge) @@ -5630,7 +5967,7 @@ /turf/simulated/floor/water/pool, /area/endeavour/surfacebase/sauna) "eFW" = ( -/turf/simulated/wall/r_wall/prepainted, +/turf/simulated/wall/r_wall/prepainted/civilian, /area/endeavour/hallway/d1afthall) "eGo" = ( /obj/structure/closet/emcloset, @@ -5777,7 +6114,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/chapel/main) "eNv" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /turf/simulated/floor, /area/endeavour/hallway/d1fwdmaint) "eNz" = ( @@ -5824,20 +6161,19 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "eOe" = ( -/obj/effect/floor_decal/borderfloorblack/corner{ - dir = 4 +/obj/structure/sign/directions/evac{ + dir = 8; + pixel_y = -7 }, -/obj/effect/floor_decal/corner/navblue/bordercorner{ +/obj/structure/sign/directions/elevator{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/structure/sign/directions/bridge{ + dir = 4; + pixel_y = 7 }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1portamidhall) +/turf/simulated/wall/prepainted/civilian, +/area/maintenance/substation/civilian) "eOl" = ( /turf/simulated/floor/wood, /area/library) @@ -5894,12 +6230,6 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/sauna) "ePX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/structure/cable/orange{ icon_state = "2-8" }, @@ -5979,28 +6309,36 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/machinery/holoposter{ pixel_y = 32 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "eTc" = ( /obj/effect/floor_decal/techfloor/orange, /obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) "eTg" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) "eTt" = ( @@ -6059,6 +6397,8 @@ dir = 5 }, /obj/machinery/air_alarm/east_mount, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1afthall) "eUW" = ( @@ -6134,6 +6474,8 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "eWE" = ( @@ -6196,13 +6538,15 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/structure/table/woodentable, /obj/item/clothing/glasses/omnihud/all, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/captain) "eYV" = ( /turf/simulated/floor/plating, /area/vacant/vacant_bar) "eYW" = ( -/obj/machinery/disposal, /turf/simulated/floor/wood, /area/bridge/office) "eZI" = ( @@ -6266,6 +6610,12 @@ /obj/structure/cable/green{ 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/steel, /area/endeavour/hallway/d1portforhall) "fbG" = ( @@ -6393,13 +6743,15 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "ffU" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "pathfinder_office" }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1afthall) +/obj/effect/paint/violet, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/exploration/pathfinder_office) "fge" = ( /obj/structure/bed/chair/sofa/black/right{ dir = 1 @@ -6413,6 +6765,14 @@ }, /turf/simulated/floor/tiled/monodark, /area/bridge) +"fho" = ( +/obj/effect/floor_decal/techfloor/orange, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled/dark, +/area/hallway/secondary/docking_hallway2) "fhC" = ( /obj/machinery/suit_cycler{ req_access = null @@ -6422,6 +6782,24 @@ "fhK" = ( /turf/simulated/wall/prepainted/civilian, /area/hallway/secondary/docking_hallway) +"fit" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/monofloor{ + dir = 4 + }, +/area/hallway/secondary/docking_hallway2) "fiu" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_external{ @@ -6452,12 +6830,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) "fjy" = ( @@ -6474,7 +6846,7 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "fjB" = ( -/obj/structure/bed/chair/shuttle{ +/obj/structure/bed/chair/bay/shuttle{ dir = 8 }, /turf/simulated/floor/tiled, @@ -6514,14 +6886,14 @@ /turf/simulated/floor/tiled/monotile, /area/exploration/explorer_prep) "fkZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) @@ -6535,6 +6907,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/exploration) "flG" = ( @@ -6554,6 +6927,18 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) +"flH" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "flK" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -6664,6 +7049,16 @@ /obj/structure/flora/pottedplant/shoot, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/tram) +"foM" = ( +/obj/effect/floor_decal/techfloor/orange, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/secondary/docking_hallway2) "fpV" = ( /obj/machinery/atmospherics/portables_connector{ name = "Engine Fuel Port" @@ -6691,6 +7086,8 @@ /obj/effect/floor_decal/corner/navgold/bordercorner2{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1afthall) "fqC" = ( @@ -6699,9 +7096,21 @@ }, /turf/simulated/floor/tiled, /area/shuttle/excursion/cockpit) +"fqL" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardforhall) "fre" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/plating, /area/maintenance/substation/dock) "frn" = ( @@ -6744,12 +7153,32 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/captain) +"fsH" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portamidhall) "fsN" = ( /obj/machinery/vending/coffee, /obj/machinery/light/small, /turf/simulated/floor/carpet/bcarpet, /area/library) "fsR" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/docking_hallway) "fsX" = ( @@ -6835,6 +7264,14 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) +"ftZ" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/lattice, +/obj/structure/disposalpipe/down{ + dir = 8 + }, +/turf/simulated/open, +/area/maintenance/substation/dock) "fuz" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -6883,6 +7320,10 @@ /obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) "fvo" = ( @@ -6907,12 +7348,13 @@ "fvL" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, /obj/machinery/camera/network/civilian{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "fxw" = ( @@ -6935,6 +7377,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "fyz" = ( @@ -7056,6 +7501,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/wood, /area/library) "fDJ" = ( @@ -7085,6 +7533,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/carpet/tealcarpet, /area/shuttle/civvie/general) +"fEG" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/violet, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/exploration) "fET" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 1 @@ -7362,7 +7816,7 @@ name = "NSV Endeavour's Builder's Plate"; desc = "The Armstrong-Hawker Shipbuilding company would like to thank the following for the contributions to the design: Dáire van der Waals, M.D., Ph.D.; Ruminous Melro, B.S.E; Hammond McGuire Sr., M.S.E.. Their work was essential in the design and manufacture of this vessel, and those of her class in the years to follow." }, -/turf/simulated/wall/prepainted, +/turf/simulated/wall/prepainted/civilian, /area/station/stairs_one) "fNJ" = ( /obj/machinery/light, @@ -7381,6 +7835,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/wood, /area/library) "fOo" = ( @@ -7405,6 +7863,9 @@ /obj/effect/floor_decal/corner/mauve/bordercorner{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) "fPp" = ( @@ -7532,6 +7993,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/machinery/light{ + dir = 4; + use_power = 0 + }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) "fUM" = ( @@ -7539,14 +8004,11 @@ /area/exploration/meeting) "fVc" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "fVM" = ( @@ -7762,6 +8224,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "gdn" = ( @@ -7823,6 +8286,7 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/substation/dock) "ggX" = ( @@ -7887,6 +8351,12 @@ /obj/effect/floor_decal/corner/navgold/border, /obj/effect/floor_decal/borderfloorblack/corner2, /obj/effect/floor_decal/corner/navgold/bordercorner2, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "giY" = ( @@ -8013,6 +8483,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) "glY" = ( @@ -8043,6 +8516,8 @@ dir = 4 }, /obj/machinery/fire_alarm/east_mount, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "gmJ" = ( @@ -8125,6 +8600,9 @@ name = "Station Intercom (General)"; pixel_y = 26 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "gpv" = ( @@ -8140,7 +8618,12 @@ /obj/effect/floor_decal/corner/navgold/bordercorner{ dir = 4 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "gqq" = ( @@ -8178,7 +8661,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/mimeoffice) "grq" = ( -/turf/simulated/wall/prepainted, +/turf/simulated/wall/prepainted/civilian, /area/endeavour/hallway/d1starboardamidhall) "gsj" = ( /obj/machinery/holopad, @@ -8335,20 +8818,14 @@ /turf/simulated/floor/water/deep/indoors, /area/hydroponics/garden) "gAA" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardforhall) +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/multi_tile/glass/civilian, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/wood, +/area/hydroponics/garden) "gBE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor{ dir = 8 }, @@ -8363,6 +8840,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals2{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/hallway/secondary/docking_hallway) "gBG" = ( @@ -8448,6 +8929,12 @@ dir = 1 }, /obj/machinery/door/airlock/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "gEb" = ( @@ -8502,6 +8989,21 @@ }, /turf/simulated/floor/tiled, /area/exploration/pathfinder_office) +"gGU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "gGW" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -8545,6 +9047,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "gJj" = ( @@ -8568,12 +9073,8 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) "gKk" = ( @@ -8631,6 +9132,12 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) +"gLF" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/captain) "gMk" = ( /obj/machinery/shieldwallgen, /obj/effect/floor_decal/industrial/outline/yellow, @@ -8724,12 +9231,6 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d1aftmaint) "gQc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, @@ -8738,6 +9239,25 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) +"gQH" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardforhall) "gQU" = ( /obj/structure/bookcase{ name = "bookcase (Reference)" @@ -8814,6 +9334,10 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/courser_dock) +"gWb" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/steel, +/area/hallway/secondary/docking_hallway) "gWe" = ( /obj/machinery/door/airlock{ id_tag = "bathroomlock15"; @@ -8878,6 +9402,7 @@ /obj/machinery/camera/network/civilian{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "gZb" = ( @@ -8939,6 +9464,9 @@ /area/bridge) "hbA" = ( /obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/wood, /area/hydroponics/garden) "hbF" = ( @@ -8980,6 +9508,12 @@ /obj/effect/floor_decal/corner/navgold/bordercorner{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "hdp" = ( @@ -9098,10 +9632,6 @@ "hfY" = ( /turf/simulated/floor/airless/ceiling, /area/space) -"hgm" = ( -/obj/structure/event/prop/mining_truck, -/turf/simulated/floor/plating, -/area/maintenance/substation/dock) "hgn" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/wood, @@ -9121,10 +9651,8 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/sauna) "hgE" = ( -/obj/effect/paint/violet, -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/endeavour/exploration/hallway_aft) +/turf/simulated/wall/r_wall/prepainted/civilian, +/area/hallway/secondary/docking_hallway) "hgJ" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor{ @@ -9133,6 +9661,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/substation/dock) "hgT" = ( @@ -9144,6 +9673,7 @@ }, /obj/machinery/door/airlock/glass, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1fwdhall) "hho" = ( @@ -9159,11 +9689,15 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "hhy" = ( @@ -9221,6 +9755,8 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "hjz" = ( @@ -9250,18 +9786,18 @@ /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) "hlC" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "hlO" = ( @@ -9271,6 +9807,13 @@ /obj/effect/floor_decal/corner/navblue/bordercorner{ dir = 8 }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "hlP" = ( @@ -9281,12 +9824,6 @@ }, /turf/simulated/floor/tiled, /area/shuttle/excursion/general) -"hmO" = ( -/obj/machinery/camera/network/outside{ - dir = 1 - }, -/turf/simulated/floor/airless/ceiling, -/area/endeavour/hallway/d1aftmaint) "hnl" = ( /obj/effect/floor_decal/steeldecal/steel_decals2, /turf/simulated/floor/tiled/steel, @@ -9299,6 +9836,9 @@ dir = 10 }, /obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "hnG" = ( @@ -9344,8 +9884,21 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) +"hqh" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "hqs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -9425,6 +9978,16 @@ /obj/structure/flora/ausbushes/stalkybush, /turf/simulated/floor/water/deep/indoors, /area/hydroponics/garden) +"hsI" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/maintenance/tool_storage) "htr" = ( /obj/machinery/shield_diffuser, /obj/map_helper/airlock/door/ext_door, @@ -9483,7 +10046,7 @@ /area/exploration/excursion_dock) "hvp" = ( /obj/machinery/atmospherics/pipe/manifold/visible, -/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/reinforced/airless, /area/rnd/test_area) "hvu" = ( @@ -9561,11 +10124,14 @@ /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) "hAH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/disposalpipe/segment{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) @@ -9682,7 +10248,7 @@ /turf/simulated/floor/water/pool, /area/endeavour/surfacebase/sauna) "hGQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 }, /turf/simulated/floor/tiled/steel, @@ -9706,10 +10272,10 @@ /turf/simulated/floor/tiled/monodark, /area/bridge) "hIY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/obj/item/radio/beacon, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) "hJE" = ( @@ -9747,6 +10313,7 @@ /obj/structure/cable/cyan{ icon_state = "0-8" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "hJW" = ( @@ -9756,12 +10323,13 @@ "hJZ" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "hLu" = ( @@ -9826,6 +10394,7 @@ dir = 8; light_range = 12 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1fwdhall) "hOH" = ( @@ -9844,7 +10413,11 @@ "hOL" = ( /obj/structure/sign/directions/evac{ dir = 8; - pixel_y = -8 + pixel_y = -7 + }, +/obj/structure/sign/directions/bridge{ + dir = 4; + pixel_y = 7 }, /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/coffee_shop) @@ -9871,6 +10444,7 @@ /obj/structure/cable/orange{ icon_state = "1-8" }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "hPQ" = ( @@ -9922,10 +10496,13 @@ /obj/machinery/newscaster{ pixel_y = 32 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "hRu" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /obj/effect/paint/violet, /turf/simulated/floor/plating, /area/endeavour/exploration/hallway_aft) @@ -9958,12 +10535,21 @@ }, /turf/simulated/floor/tiled, /area/hallway/secondary/docking_hallway2) +"hTf" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardamidhall) "hTg" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) @@ -10021,8 +10607,6 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/coffee_shop) "hUM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -10115,10 +10699,10 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 4 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) @@ -10172,6 +10756,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "hYA" = ( @@ -10223,12 +10810,6 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/sauna) "hZy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/orange{ icon_state = "2-8" }, @@ -10250,10 +10831,19 @@ /obj/machinery/camera/network/exploration{ dir = 1 }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/exploration) "ibq" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central4, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "ibx" = ( @@ -10350,6 +10940,13 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/hallway) +"ieu" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/maintenance/tool_storage) "ifc" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -10424,6 +11021,10 @@ /obj/effect/floor_decal/corner/brown/bordercorner2{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/exploration/pathfinder_office) "ihK" = ( @@ -10489,12 +11090,8 @@ /turf/simulated/floor/wood, /area/library) "ikY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "ilb" = ( @@ -10551,6 +11148,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/bridge/hallway) "ilO" = ( @@ -10586,6 +11184,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "ioL" = ( @@ -10603,6 +11202,22 @@ "ipC" = ( /turf/simulated/wall/r_wall/prepainted/exploration, /area/exploration/pilot_prep) +"ipM" = ( +/obj/effect/floor_decal/steeldecal/steel_decals_central7, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "ipN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -10625,6 +11240,9 @@ /obj/structure/cable/orange{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "iqj" = ( @@ -10649,6 +11267,18 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d1fwdmaint) +"iqr" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/holoposter{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/docking_hallway) "iqI" = ( /obj/effect/floor_decal/corner/blue{ dir = 1 @@ -10681,8 +11311,6 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -10735,6 +11363,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "ivm" = ( @@ -10777,7 +11408,7 @@ /area/chapel/main) "iwD" = ( /obj/effect/shuttle_landmark/automatic/station_dockpoint1, -/turf/space, +/turf/space/basic, /area/space) "iwF" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -10925,6 +11556,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "iAO" = ( @@ -10955,6 +11589,9 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "iBm" = ( @@ -10992,6 +11629,13 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1fwdhall) +"iCH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "iCK" = ( /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; @@ -11037,12 +11681,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) "iFj" = ( @@ -11144,10 +11784,8 @@ /turf/simulated/floor/wood, /area/library) "iLb" = ( -/obj/machinery/door/firedoor/glass, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/hallway/secondary/docking_hallway2) +/turf/simulated/wall/prepainted/civilian, +/area/maintenance/tool_storage) "iLv" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/machinery/air_alarm{ @@ -11212,6 +11850,12 @@ /obj/structure/table/reinforced, /turf/simulated/floor/carpet/tealcarpet, /area/shuttle/civvie/general) +"iOg" = ( +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portamidhall) "iOq" = ( /obj/machinery/camera/network/exploration, /obj/effect/floor_decal/borderfloor{ @@ -11344,11 +11988,11 @@ "iTz" = ( /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/navgold/bordercorner, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "iUW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -11388,10 +12032,12 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "iWI" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/effect/floor_decal/techfloor/orange{ dir = 1 }, +/obj/machinery/holoposter{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) "iWW" = ( @@ -11433,6 +12079,12 @@ /obj/machinery/newscaster{ pixel_y = 32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "iYo" = ( @@ -11449,6 +12101,9 @@ icon_state = "4-8" }, /obj/machinery/fire_alarm/south_mount, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "iYx" = ( @@ -11496,6 +12151,12 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "iZR" = ( @@ -11517,7 +12178,6 @@ /turf/simulated/floor/tiled/white, /area/exploration/medical) "jbd" = ( -/obj/machinery/disposal, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -11599,6 +12259,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "jeQ" = ( @@ -11612,6 +12275,13 @@ }, /turf/simulated/floor/water/pool, /area/endeavour/surfacebase/sauna) +"jfK" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "jgV" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -11653,7 +12323,12 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "jjf" = ( @@ -11679,6 +12354,12 @@ /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = 27 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "jkz" = ( @@ -11689,18 +12370,13 @@ /turf/simulated/floor/tiled, /area/rnd/test_area) "jkD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) "jkE" = ( @@ -11734,6 +12410,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/bridge/hallway) "jlB" = ( @@ -11761,17 +12440,24 @@ /area/endeavour/hallway/d1starboardforhall) "jlN" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor{ dir = 1 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) +"jlS" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "jmh" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/brflowers, @@ -11842,6 +12528,10 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) "joU" = ( @@ -11862,6 +12552,7 @@ /turf/simulated/floor/plating, /area/exploration/courser_dock) "jpf" = ( +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "jpl" = ( @@ -12006,6 +12697,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/exploration/meeting) "jty" = ( @@ -12291,6 +12983,10 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/substation/dock) "jEW" = ( @@ -12304,6 +13000,10 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "jFO" = ( @@ -12350,10 +13050,9 @@ /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) "jGp" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "jGs" = ( @@ -12400,6 +13099,7 @@ icon_state = "0-4" }, /obj/machinery/power/apc/west_mount, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "jHq" = ( @@ -12409,10 +13109,7 @@ /obj/effect/floor_decal/corner/navblue/bordercorner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/tiled/steel, @@ -12512,6 +13209,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "jMJ" = ( @@ -12534,11 +13234,11 @@ /turf/simulated/floor/tiled, /area/exploration/explorer_prep) "jMU" = ( -/turf/simulated/wall/prepainted, -/area/chapel/main) +/turf/simulated/wall/prepainted/civilian, +/area/maintenance/substation/civilian) "jNb" = ( /turf/simulated/floor/plating, -/area/rnd/misc_lab) +/area/space) "jNg" = ( /turf/space, /area/space) @@ -12599,6 +13299,12 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) "jPj" = ( @@ -12608,6 +13314,20 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/courser_dock) +"jPz" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, +/obj/item/radio/intercom{ + dir = 8; + pixel_x = -24 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1afthall) "jPH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -12700,6 +13420,7 @@ "jTs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/carpet/bcarpet, /area/library) "jTI" = ( @@ -12730,14 +13451,14 @@ /turf/simulated/floor/tiled/white, /area/exploration/medical) "jTR" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/cable/green{ - icon_state = "4-8" + dir = 10 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) @@ -12799,7 +13520,7 @@ "jVG" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor, -/turf/simulated/floor/plating, +/turf/simulated/wall/prepainted/civilian, /area/maintenance/substation/dock) "jWm" = ( /obj/structure/cable/green{ @@ -12836,6 +13557,9 @@ }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/exploration) "jWP" = ( @@ -12885,8 +13609,6 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -12956,14 +13678,17 @@ /turf/simulated/floor/wood, /area/bridge/meeting_room) "kah" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 + dir = 4 }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) @@ -12978,6 +13703,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "kaO" = ( @@ -13060,6 +13788,7 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/substation/dock) "kdX" = ( @@ -13080,6 +13809,9 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "keD" = ( @@ -13189,12 +13921,6 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/structure/cable/green{ icon_state = "2-8" }, @@ -13259,6 +13985,13 @@ /obj/structure/bed/chair/comfy/brown, /turf/simulated/floor/carpet/bcarpet, /area/library) +"kkN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/hydroponics/garden) "klV" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -13303,8 +14036,25 @@ /obj/machinery/camera/network/civilian{ dir = 4 }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) +"kos" = ( +/obj/effect/floor_decal/steeldecal/steel_decals_central7, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardamidhall) "kov" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -13319,6 +14069,9 @@ /obj/effect/floor_decal/corner/navgold/bordercorner{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "kpN" = ( @@ -13359,15 +14112,12 @@ /turf/simulated/floor/carpet/bcarpet, /area/library/study) "kru" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "krO" = ( @@ -13383,11 +14133,32 @@ }, /turf/simulated/floor/grass, /area/hydroponics/garden) +"kta" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardforhall) "ktu" = ( /obj/machinery/disposal, /obj/machinery/light, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/wood, /area/exploration/meeting) +"ktx" = ( +/obj/structure/table/bench/wooden, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/hydroponics/garden) "kuZ" = ( /obj/machinery/light/small{ dir = 4 @@ -13483,6 +14254,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) "kyG" = ( @@ -13501,6 +14275,12 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/courser_dock) +"kzG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/wood, +/area/library) "kAg" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -13514,8 +14294,17 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, -/turf/simulated/floor/plating, +/turf/simulated/wall/prepainted/civilian, /area/maintenance/substation/dock) +"kAE" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "kAO" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -13529,6 +14318,9 @@ /obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/exploration) "kBk" = ( @@ -13584,6 +14376,10 @@ /obj/structure/flora/ausbushes/sunnybush, /turf/simulated/floor/grass, /area/hydroponics/garden) +"kDV" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardforhall) "kEh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -13735,7 +14531,7 @@ /turf/simulated/floor/plating, /area/maintenance/substation/civilian) "kIy" = ( -/obj/structure/bed/chair/shuttle{ +/obj/structure/bed/chair/bay/shuttle{ dir = 8 }, /turf/simulated/floor/tiled, @@ -13744,7 +14540,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 6 }, -/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/reinforced/airless, /area/rnd/test_area) "kJh" = ( @@ -13795,6 +14591,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/exploration) "kKH" = ( @@ -13802,6 +14605,10 @@ /obj/effect/floor_decal/corner/navgold/bordercorner, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) +"kKK" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1afthall) "kLc" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -13906,6 +14713,21 @@ /obj/machinery/light/flamp, /turf/simulated/floor/wood, /area/endeavour/hallway/d1fwdmaint) +"kNE" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardafthall) "kNK" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -13998,6 +14820,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "kPR" = ( @@ -14005,8 +14830,6 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d1aftmaint) "kPV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -14025,6 +14848,15 @@ }, /turf/simulated/floor/plating, /area/endeavour/hallway/d1aftmaint) +"kQE" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/fire_alarm/south_mount, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardforhall) "kQS" = ( /obj/structure/table/bench, /turf/simulated/floor/plating, @@ -14051,6 +14883,7 @@ /obj/machinery/door/airlock/glass{ name = "Primary Tool Storage" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) "kSZ" = ( @@ -14147,11 +14980,14 @@ /area/hallway/secondary/docking_hallway) "kWj" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "kWo" = ( @@ -14183,6 +15019,16 @@ "kXM" = ( /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) +"kYw" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1afthall) "kYx" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -14224,7 +15070,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 }, -/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/reinforced/airless, /area/rnd/test_area) "laK" = ( @@ -14319,6 +15165,12 @@ /obj/effect/floor_decal/steeldecal/steel_decals1{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "lgr" = ( @@ -14360,6 +15212,12 @@ name = "Station Intercom (General)"; pixel_y = 26 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "ljP" = ( @@ -14402,9 +15260,10 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 8 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "llY" = ( @@ -14473,7 +15332,6 @@ /turf/simulated/floor/plating, /area/exploration/courser_dock) "lnR" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/effect/floor_decal/techfloor/orange{ dir = 1 }, @@ -14483,6 +15341,18 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) +"lnV" = ( +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1afthall) "loh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -14500,6 +15370,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1fwdhall) "loQ" = ( @@ -14609,6 +15482,9 @@ /obj/machinery/camera/network/civilian{ dir = 9 }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/carpet/bcarpet, /area/library) "lul" = ( @@ -14663,6 +15539,23 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/maintenance/substation/civilian) +"lxY" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/disposalpipe/sortjunction{ + dir = 4; + name = "HoS Office"; + sortType = "HoS Office" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardafthall) "lyH" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -14676,12 +15569,13 @@ /obj/effect/floor_decal/corner/navgold/bordercorner2{ dir = 8 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, /obj/machinery/light{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "lyX" = ( @@ -14742,6 +15636,7 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "lAI" = ( @@ -14751,6 +15646,7 @@ /turf/simulated/floor/wood/broken, /area/endeavour/hallway/d1fwdmaint) "lAM" = ( +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/monofloor, /area/exploration) "lAO" = ( @@ -14769,6 +15665,9 @@ "lAY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "lBc" = ( @@ -14873,7 +15772,7 @@ /turf/simulated/floor/wood, /area/lawoffice) "lHm" = ( -/turf/simulated/wall/prepainted, +/turf/simulated/wall/prepainted/civilian, /area/endeavour/hallway/d1starboardafthall) "lIc" = ( /obj/item/gun/energy/lasertag/red, @@ -14895,10 +15794,10 @@ /area/rnd/test_area) "lJv" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "lJy" = ( @@ -14909,6 +15808,16 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) +"lJC" = ( +/obj/structure/sign/directions/elevator{ + dir = 4 + }, +/obj/structure/sign/directions/evac{ + dir = 8; + pixel_y = -7 + }, +/turf/simulated/wall/r_wall/prepainted/civilian, +/area/station/stairs_one) "lKq" = ( /obj/machinery/camera/network/command{ dir = 9 @@ -14951,14 +15860,17 @@ /area/library/study) "lLu" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) @@ -15173,6 +16085,15 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "lSz" = ( @@ -15199,8 +16120,23 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "lUh" = ( -/turf/simulated/wall/prepainted, +/turf/simulated/wall/prepainted/civilian, /area/endeavour/hallway/d1fwdhall) +"lUE" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "lVq" = ( /obj/machinery/power/apc/north_mount, /mob/living/simple_mob/animal/passive/mimepet, @@ -15330,14 +16266,12 @@ /turf/simulated/floor/wood, /area/lawoffice) "mbU" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/effect/floor_decal/steeldecal/steel_decals_central7, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1portforhall) +/area/endeavour/hallway/d1starboardforhall) "mbY" = ( /obj/landmark/spawnpoint/job/pilot, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -15367,12 +16301,22 @@ icon_state = "1-8" }, /obj/machinery/light, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "mct" = ( /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/exploration) "mcN" = ( @@ -15507,19 +16451,17 @@ /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "mgA" = ( /turf/simulated/wall/prepainted/exploration, /area/crew_quarters/lounge) "mho" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "mhL" = ( @@ -15546,6 +16488,8 @@ /obj/effect/floor_decal/corner/navgold/bordercorner2{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "mic" = ( @@ -15585,8 +16529,21 @@ /obj/effect/floor_decal/corner/beige/bordercorner2{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark, /area/bridge/hallway) +"mjz" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardamidhall) "mjY" = ( /obj/structure/table/reinforced, /obj/item/radio, @@ -15629,9 +16586,24 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/lounge/kitchen_freezer) +"mlk" = ( +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "mlA" = ( /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hop) +"mlQ" = ( +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "mma" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -15668,7 +16640,7 @@ /turf/simulated/floor/plating, /area/maintenance/station/exploration) "mmO" = ( -/turf/simulated/wall/prepainted, +/turf/simulated/wall/prepainted/civilian, /area/crew_quarters/lounge) "mnd" = ( /obj/effect/floor_decal/spline/plain{ @@ -15708,6 +16680,21 @@ /obj/machinery/computer/security, /turf/simulated/floor/tiled/monodark, /area/bridge) +"mpa" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 6 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardforhall) "mpL" = ( /obj/structure/table/bench/wooden, /turf/simulated/floor/tiled/freezer, @@ -15718,6 +16705,15 @@ }, /turf/simulated/floor/plating, /area/endeavour/hallway/d1aftmaint) +"mrv" = ( +/obj/structure/sign/directions/science{ + pixel_y = 3 + }, +/obj/structure/sign/directions/cargo{ + pixel_y = -4 + }, +/turf/simulated/wall/r_wall/prepainted/civilian, +/area/station/stairs_one) "mrA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -15952,10 +16948,12 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1fwdhall) "mAo" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -16016,6 +17014,10 @@ /obj/effect/floor_decal/corner/mauve/bordercorner{ dir = 8 }, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, /turf/simulated/floor/tiled, /area/exploration) "mDd" = ( @@ -16049,12 +17051,48 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/lounge/kitchen_freezer) -"mER" = ( -/obj/machinery/light/small{ +"mEr" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/wood, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardforhall) +"mEO" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) +"mER" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/holoposter{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "mFi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -16071,6 +17109,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) "mFk" = ( @@ -16079,7 +17120,7 @@ id_tag = "civvie_dock"; req_one_access = list(67) }, -/turf/simulated/wall/r_wall/prepainted, +/turf/simulated/wall/r_wall/prepainted/civilian, /area/hallway/secondary/docking_hallway) "mFr" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -16096,6 +17137,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) "mGw" = ( @@ -16139,13 +17181,10 @@ /turf/simulated/floor/tiled, /area/rnd/misc_lab) "mHc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/item/radio/beacon, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/radio/beacon, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "mHi" = ( @@ -16168,6 +17207,10 @@ "mHu" = ( /turf/simulated/wall/prepainted/civilian, /area/hallway/primary/aft) +"mHv" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "mIj" = ( /obj/structure/flora/pottedplant/minitree, /obj/machinery/fire_alarm/north_mount{ @@ -16191,6 +17234,9 @@ pixel_y = 27 }, /obj/machinery/camera/network/civilian, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "mJt" = ( @@ -16267,10 +17313,18 @@ /turf/simulated/floor/tiled, /area/gateway/prep_room) "mMw" = ( -/obj/structure/sign/directions/bridge{ +/obj/structure/sign/directions/elevator{ dir = 4 }, -/turf/simulated/wall/prepainted, +/obj/structure/sign/directions/bridge{ + dir = 4; + pixel_y = 7 + }, +/obj/structure/sign/directions/evac{ + dir = 8; + pixel_y = -7 + }, +/turf/simulated/wall/prepainted/civilian, /area/station/stairs_one) "mMT" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -16278,9 +17332,6 @@ }, /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/coffee_shop) -"mNs" = ( -/turf/simulated/floor/airless/ceiling, -/area/rnd/misc_lab) "mNu" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, @@ -16311,6 +17362,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1fwdhall) "mOK" = ( @@ -16375,12 +17427,6 @@ /area/exploration/meeting) "mRz" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/item/radio/beacon, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) @@ -16450,6 +17496,12 @@ /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = 27 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "mUi" = ( @@ -16514,6 +17566,8 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "mWK" = ( @@ -16611,7 +17665,7 @@ /turf/simulated/floor/lino, /area/crew_quarters/coffee_shop) "mYb" = ( -/turf/simulated/wall/prepainted, +/turf/simulated/wall/prepainted/civilian, /area/hydroponics/garden) "mYF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -16631,6 +17685,13 @@ /obj/effect/paint_stripe/palebottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/coffee_shop) +"mYI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/hydroponics/garden) "mZn" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -16644,8 +17705,16 @@ /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_fore) "mZA" = ( -/turf/simulated/floor/airless/ceiling, -/area/endeavour/hallway/d1aftmaint) +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardforhall) "mZV" = ( /obj/machinery/air_alarm/north_mount, /obj/machinery/light{ @@ -16666,6 +17735,7 @@ /obj/effect/floor_decal/corner/mauve/bordercorner{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/exploration) "nbg" = ( @@ -16715,12 +17785,6 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/secondary/docking_hallway) "nfe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -16757,11 +17821,14 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "ngG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 + dir = 10 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) @@ -16792,6 +17859,9 @@ /obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled, /area/exploration) +"niH" = ( +/turf/simulated/wall/prepainted/civilian, +/area/maintenance/substation/command) "njM" = ( /obj/effect/floor_decal/steeldecal/steel_decals5, /obj/item/clothing/under/swimsuit/stripper/cowbikini, @@ -16829,15 +17899,16 @@ /turf/simulated/wall/r_wall/prepainted/exploration, /area/exploration/explorer_prep) "nkw" = ( -/obj/effect/floor_decal/borderfloorblack/corner{ - dir = 1 +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, -/obj/effect/floor_decal/corner/navgold/bordercorner{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardforhall) +/area/endeavour/hallway/d1starboardamidhall) "nkN" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -16875,6 +17946,7 @@ /obj/machinery/door/firedoor{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1fwdhall) "nlI" = ( @@ -16997,6 +18069,16 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) +"nqu" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/steel, +/area/hallway/secondary/docking_hallway) "nqx" = ( /obj/structure/bed/chair/bay/chair/padded/red/smallnest, /obj/random/plushie, @@ -17035,6 +18117,12 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "nrb" = ( @@ -17066,6 +18154,9 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "nsi" = ( @@ -17175,6 +18266,9 @@ /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, /obj/machinery/air_alarm/south_mount, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "nwm" = ( @@ -17205,6 +18299,9 @@ pixel_y = -24 }, /obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/exploration/pathfinder_office) "nwU" = ( @@ -17215,16 +18312,11 @@ /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1starboardafthall) "nxf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/item/radio/beacon, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "nxI" = ( @@ -17354,7 +18446,7 @@ /area/exploration/courser_dock) "nCl" = ( /obj/structure/symbol/sa, -/turf/simulated/wall/prepainted, +/turf/simulated/wall/prepainted/civilian, /area/maintenance/substation/dock) "nCE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -17372,6 +18464,7 @@ /obj/structure/cable/cyan{ icon_state = "2-4" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "nEa" = ( @@ -17400,6 +18493,18 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads/blueshield) +"nFp" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardafthall) "nFx" = ( /obj/structure/table/glass, /turf/simulated/floor/tiled/freezer, @@ -17459,6 +18564,7 @@ "nHB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/secondary/docking_hallway) "nHC" = ( @@ -17518,6 +18624,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/wood, /area/library) "nJD" = ( @@ -17579,12 +18689,14 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 26 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "nMh" = ( @@ -17800,18 +18912,13 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "nUI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 9 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "nVc" = ( @@ -17869,9 +18976,6 @@ "nXJ" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, /obj/machinery/camera/network/civilian{ dir = 1 }, @@ -17900,7 +19004,6 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" @@ -17908,24 +19011,21 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "nYt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "nYu" = ( /obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" + dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/substation/dock) +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "nYy" = ( /obj/structure/window/reinforced{ dir = 1 @@ -17956,7 +19056,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /obj/effect/paint/violet, /turf/simulated/floor/tiled/techfloor/grid, /area/endeavour/exploration/hallway_aft) @@ -17976,6 +19076,9 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) "obT" = ( @@ -18086,16 +19189,17 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/station/exploration) "ogq" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/structure/cable/orange{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/item/radio/beacon, -/turf/simulated/floor/tiled/dark, -/area/hallway/secondary/docking_hallway2) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portamidhall) "ogK" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, @@ -18135,6 +19239,9 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/glass, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "oiy" = ( @@ -18388,6 +19495,7 @@ /obj/effect/floor_decal/corner/beige/border{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/bridge/hallway) "orE" = ( @@ -18455,13 +19563,15 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "owg" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "own" = ( @@ -18478,6 +19588,13 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge) +"owF" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardamidhall) "oxc" = ( /turf/simulated/wall/prepainted, /area/maintenance/chapel) @@ -18498,6 +19615,9 @@ dir = 1 }, /obj/machinery/door/airlock/glass, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "oxf" = ( @@ -18525,6 +19645,23 @@ name = "Station Intercom (General)"; pixel_y = 26 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) +"oxV" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "oyd" = ( @@ -18629,8 +19766,7 @@ name = "Bridge Lockdown"; opacity = 0 }, -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/commandblue, +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/airless/ceiling, /area/bridge) "oDE" = ( @@ -18655,13 +19791,26 @@ }, /turf/simulated/floor/tiled, /area/exploration/explorer_prep) -"oFd" = ( +"oEW" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) +"oFd" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, @@ -18820,6 +19969,9 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/glass, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "oNQ" = ( @@ -18845,18 +19997,18 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d1fwdhall) "oPk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/machinery/door/firedoor{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "oPo" = ( @@ -18886,6 +20038,10 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/endeavour/hallway/d1fwdmaint) +"oRd" = ( +/obj/structure/sign/department/biblio, +/turf/simulated/wall/prepainted/civilian, +/area/library) "oRe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -19002,6 +20158,12 @@ /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/carpet/purcarpet, /area/exploration/meeting) +"oWx" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardforhall) "oWB" = ( /obj/structure/lightpost, /obj/effect/floor_decal/grass_edge{ @@ -19047,20 +20209,24 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "oXj" = ( /obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 1; - name = "Exploration Public Lobby" - }, /obj/effect/floor_decal/borderfloor{ dir = 8 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 8 }, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 1; + name = "Exploration Public Lobby" + }, /turf/simulated/floor/tiled, /area/exploration) "oYa" = ( @@ -19134,6 +20300,7 @@ }, /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/mauve/bordercorner, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/exploration) "pbT" = ( @@ -19150,10 +20317,14 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/secondary/docking_hallway2) +"pcl" = ( +/obj/structure/sign/nanotrasen, +/turf/simulated/wall/r_wall/prepainted/command, +/area/crew_quarters/captain) "pcv" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/obj/spawner/window/borosillicate/reinforced/full/firelocks, /obj/effect/paint/purplegray, +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/test_area) "pcA" = ( @@ -19172,6 +20343,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) "pcK" = ( @@ -19249,6 +20423,20 @@ /obj/structure/table/bench/wooden, /turf/simulated/floor/tiled/dark, /area/chapel/main) +"pfv" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass_external{ + req_one_access = null + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/techfloor/grid, +/area/hallway/secondary/docking_hallway2) "pfA" = ( /obj/machinery/door/airlock/multi_tile/glass{ name = "Exploration Department"; @@ -19261,18 +20449,21 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/exploration) "pfG" = ( -/obj/structure/sign/directions/command{ - dir = 4; - pixel_y = 36 +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/obj/effect/floor_decal/techfloor{ +/obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/endeavour/hallway/d1afthall) +/obj/machinery/holoposter{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardafthall) "pfO" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -19434,6 +20625,7 @@ /area/endeavour/surfacebase/sauna) "plJ" = ( /obj/effect/floor_decal/steeldecal/steel_decals2, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "pmD" = ( @@ -19455,15 +20647,13 @@ /turf/simulated/floor/tiled, /area/exploration) "pmO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "pmP" = ( @@ -19487,14 +20677,17 @@ /turf/simulated/floor/plating, /area/chapel/main) "pmX" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/green{ icon_state = "1-8" }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/sortjunction{ + dir = 8; + name = "Cafe"; + sortType = "Cafe" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "pnz" = ( @@ -19580,15 +20773,12 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/sauna) "pql" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "pqr" = ( @@ -19624,6 +20814,12 @@ /obj/machinery/camera/network/civilian{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "psb" = ( @@ -19637,6 +20833,8 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "psG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1afthall) "ptG" = ( @@ -19725,13 +20923,11 @@ }, /turf/simulated/floor/tiled/white, /area/endeavour/surfacebase/sauna) +"pvL" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/maintenance/tool_storage) "pwe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -19811,7 +21007,15 @@ "pBW" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "pCg" = ( @@ -19841,10 +21045,10 @@ "pDa" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central7, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 10 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) @@ -19939,6 +21143,19 @@ /obj/machinery/power/apc/north_mount, /turf/simulated/floor/plating, /area/maintenance/substation/command) +"pIX" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1afthall) "pJd" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -19950,6 +21167,10 @@ dir = 4; use_power = 0 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "pJi" = ( @@ -19967,10 +21188,20 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) +"pKV" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "pLC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -20010,8 +21241,7 @@ /turf/simulated/floor/tiled, /area/rnd/test_area) "pNt" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/commandblue, +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/airless/ceiling, /area/bridge) "pNM" = ( @@ -20021,8 +21251,24 @@ }, /turf/simulated/floor/carpet, /area/endeavour/hallway/d1fwdmaint) +"pNW" = ( +/obj/effect/floor_decal/steeldecal/steel_decals_central7, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1afthall) "pOh" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/endeavour/hallway/d1fwdmaint) "pOB" = ( @@ -20062,6 +21308,12 @@ "pQg" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "pQo" = ( @@ -20129,6 +21381,17 @@ }, /turf/simulated/floor/tiled, /area/shuttle/excursion/general) +"pUQ" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/camera/network/civilian{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardforhall) "pVE" = ( /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -20143,20 +21406,26 @@ dir = 6 }, /obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/exploration/medical) "pVQ" = ( /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/navblue/bordercorner, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "pWq" = ( @@ -20166,6 +21435,20 @@ }, /turf/simulated/floor/tiled/dark, /area/gateway) +"pWz" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/green{ + 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/steel, +/area/endeavour/hallway/d1portforhall) "pWE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -20179,12 +21462,14 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "pWN" = ( -/obj/machinery/camera/network/outside, -/turf/space, -/area/hallway/secondary/docking_hallway) +/turf/simulated/wall/r_wall/prepainted/civilian, +/area/endeavour/hallway/d1aftmaint) "pXa" = ( /obj/structure/bed/chair/bay/comfy/black, /turf/simulated/floor/tiled/monodark, @@ -20211,11 +21496,17 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1fwdhall) "qcV" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "qdq" = ( @@ -20224,6 +21515,21 @@ }, /turf/simulated/floor/wood, /area/endeavour/hallway/d1fwdmaint) +"qdt" = ( +/obj/structure/sign/directions/security{ + pixel_y = -10 + }, +/obj/structure/sign/directions/medical{ + pixel_y = 4 + }, +/obj/structure/sign/directions/cryo{ + pixel_y = -3 + }, +/obj/structure/sign/directions/engineering{ + pixel_y = 11 + }, +/turf/simulated/wall/r_wall/prepainted/civilian, +/area/station/stairs_one) "qdE" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -20250,20 +21556,19 @@ /turf/simulated/floor/tiled, /area/hallway/secondary/docking_hallway) "qek" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/effect/floor_decal/corner/navgold/border{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardforhall) +/area/endeavour/hallway/d1portforhall) "qer" = ( /obj/machinery/atmospherics/valve{ name = "Waste" @@ -20407,12 +21712,6 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/courser_dock) "qke" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -20426,6 +21725,20 @@ /obj/structure/target_stake, /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) +"qks" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, +/obj/machinery/air_alarm/west_mount, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardamidhall) "qku" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -20479,6 +21792,13 @@ /obj/effect/paint_stripe/violet, /turf/simulated/shuttle/floor/voidcraft, /area/shuttle/excursion/cockpit) +"qmr" = ( +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1afthall) "qmC" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -20662,10 +21982,22 @@ /obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) "qvn" = ( -/turf/simulated/floor/wood, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "qvM" = ( /obj/effect/floor_decal/borderfloor, @@ -20717,6 +22049,13 @@ "qyL" = ( /turf/simulated/shuttle/wall/voidcraft/blue, /area/endeavour/hallway/d1fwdhall) +"qzb" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1afthall) "qzh" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -20730,6 +22069,31 @@ }, /turf/simulated/floor/lino, /area/chapel/office) +"qzr" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardforhall) +"qzv" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardafthall) "qzE" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -20763,13 +22127,15 @@ /turf/simulated/floor/carpet/blucarpet, /area/lawoffice) "qAf" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "qBg" = ( @@ -20880,6 +22246,9 @@ /obj/effect/floor_decal/corner/mauve/bordercorner{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) "qFo" = ( @@ -20911,6 +22280,17 @@ /obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/bridge) +"qJu" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/sortjunction{ + dir = 4; + name = "Security Checkpoint"; + sortType = "Security Checkpoint" + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/secondary/docking_hallway) "qJE" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 5 @@ -20932,8 +22312,9 @@ /obj/effect/floor_decal/corner/navgold/bordercorner2{ dir = 9 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) @@ -20949,6 +22330,7 @@ /obj/effect/floor_decal/corner/beige/bordercorner{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/bridge/hallway) "qKF" = ( @@ -20975,6 +22357,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/captain) "qLH" = ( @@ -21006,6 +22389,32 @@ /obj/machinery/holopad, /turf/simulated/floor/lino, /area/chapel/office) +"qLX" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) +"qMB" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "qME" = ( /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) @@ -21085,6 +22494,26 @@ }, /turf/simulated/floor/tiled/dark, /area/chapel/main) +"qOD" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/item/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 26 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portamidhall) "qOI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -21129,15 +22558,19 @@ /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) "qQg" = ( -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ id = "pathfinder_office" }, /obj/effect/paint/violet, /turf/simulated/floor/plating, /area/exploration/pathfinder_office) +"qQG" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/docking_hallway2) "qQJ" = ( /obj/machinery/light/small, /turf/simulated/floor/plating, @@ -21334,6 +22767,22 @@ /obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) +"qZl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1afthall) "qZu" = ( /obj/landmark/spawnpoint/job/clown, /obj/machinery/power/apc/south_mount, @@ -21452,18 +22901,27 @@ "rdz" = ( /turf/simulated/floor/tiled, /area/exploration/explorer_prep) -"reM" = ( +"reC" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardforhall) +"reM" = ( /obj/machinery/door/firedoor{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/disposalpipe/segment{ + dir = 4 }, /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/steel, @@ -21485,6 +22943,15 @@ /obj/effect/floor_decal/corner/navgold/bordercorner2{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "rfr" = ( @@ -21497,6 +22964,26 @@ }, /turf/simulated/floor/grass, /area/hydroponics/garden) +"rgx" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portamidhall) "rgG" = ( /obj/structure/toilet{ dir = 4 @@ -21515,6 +23002,7 @@ dir = 8 }, /obj/machinery/door/airlock, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) "rgW" = ( @@ -21552,6 +23040,9 @@ icon_state = "4-8" }, /obj/machinery/air_alarm/south_mount, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "rkb" = ( @@ -21656,6 +23147,20 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) +"rmX" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "rmZ" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; @@ -21727,13 +23232,15 @@ /turf/simulated/floor/tiled, /area/shuttle/excursion/general) "rqe" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "rqv" = ( @@ -21801,7 +23308,7 @@ /area/endeavour/hallway/d1fwdmaint) "ruI" = ( /obj/structure/sign/deck/first, -/turf/simulated/wall/prepainted, +/turf/simulated/wall/prepainted/civilian, /area/endeavour/hallway/d1aftmaint) "rvc" = ( /obj/machinery/air_alarm{ @@ -21821,16 +23328,13 @@ /area/exploration/excursion_dock) "rvA" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/item/radio/beacon, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "rwD" = ( @@ -21877,6 +23381,25 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/excursion_dock) +"rzp" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/exploration) "rzL" = ( /obj/effect/floor_decal/spline/plain{ dir = 9 @@ -21929,6 +23452,9 @@ /obj/machinery/door/firedoor{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "rBw" = ( @@ -21956,12 +23482,16 @@ "rCo" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "rCw" = ( @@ -22168,6 +23698,19 @@ /obj/item/flashlight/lamp/green, /turf/simulated/floor/wood, /area/library) +"rMy" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/steel, +/area/hallway/secondary/docking_hallway) "rNe" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -22217,10 +23760,6 @@ /turf/simulated/floor/wood, /area/library) "rRP" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/light/small, /turf/simulated/floor/plating, @@ -22262,6 +23801,16 @@ "rTu" = ( /turf/simulated/wall/r_wall/prepainted/exploration, /area/rnd/research/testingrange) +"rTL" = ( +/obj/effect/floor_decal/techfloor/orange, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/secondary/docking_hallway2) "rTZ" = ( /turf/simulated/floor/tiled, /area/endeavour/surfacebase/tram) @@ -22286,8 +23835,9 @@ "rVd" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) @@ -22317,6 +23867,19 @@ }, /turf/simulated/floor/wood, /area/endeavour/surfacebase/sauna) +"rVM" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1afthall) "rVV" = ( /turf/simulated/wall/r_wall/prepainted/exploration, /area/gateway) @@ -22328,6 +23891,7 @@ dir = 4 }, /obj/machinery/holopad, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/carpet/bcarpet, /area/library) "rWf" = ( @@ -22395,6 +23959,8 @@ /obj/machinery/vending/wallmed1{ pixel_x = 32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "saq" = ( @@ -22452,6 +24018,7 @@ /obj/effect/floor_decal/corner/beige/bordercorner2{ dir = 6 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/bridge/hallway) "scr" = ( @@ -22479,6 +24046,15 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) +"sdj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardforhall) "seH" = ( /obj/machinery/light{ dir = 1 @@ -22498,6 +24074,7 @@ /obj/effect/floor_decal/corner/mauve/bordercorner{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) "sfh" = ( @@ -22539,6 +24116,12 @@ "sho" = ( /obj/effect/floor_decal/techfloor/orange, /obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) "shJ" = ( @@ -22593,6 +24176,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "sjU" = ( @@ -22640,7 +24226,7 @@ /turf/simulated/floor/tiled, /area/hallway/secondary/docking_hallway) "skI" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /obj/effect/paint/commandblue, /turf/simulated/shuttle/floor/voidcraft, /area/bridge/meeting_room) @@ -22657,7 +24243,11 @@ /turf/simulated/wall/r_wall/prepainted/civilian, /area/shuttle/civvie/general) "slW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/tiled/steel, @@ -22691,8 +24281,8 @@ /turf/simulated/floor/plating, /area/maintenance/chapel) "sne" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, /turf/simulated/floor/grass, /area/hydroponics/garden) @@ -22754,6 +24344,9 @@ /obj/effect/floor_decal/corner/mauve/border, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/exploration) "ssZ" = ( @@ -22829,7 +24422,7 @@ /turf/simulated/wall/r_wall/prepainted/command, /area/teleporter) "svt" = ( -/turf/simulated/wall/prepainted, +/turf/simulated/wall/prepainted/civilian, /area/endeavour/hallway/d1portamidhall) "svI" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -22855,10 +24448,9 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/courser_dock) "sxq" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/violet, -/turf/simulated/floor/plating, -/area/endeavour/hallway/d1afthall) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardafthall) "sxN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -22953,14 +24545,14 @@ /turf/simulated/floor/tiled/dark, /area/teleporter) "sAT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/structure/cable/green{ + icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 + dir = 8 }, -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) @@ -23015,6 +24607,15 @@ "sDi" = ( /turf/simulated/wall/prepainted/civilian, /area/chapel/main) +"sDJ" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "sDP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -23043,6 +24644,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "sEx" = ( @@ -23174,6 +24778,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) +"sJO" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, +/obj/machinery/air_alarm/west_mount, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1afthall) "sKH" = ( /obj/structure/plasticflaps/mining, /obj/machinery/conveyor{ @@ -23221,8 +24836,12 @@ /turf/simulated/floor/wood, /area/crew_quarters/coffee_shop) "sNQ" = ( -/turf/simulated/wall/r_wall/prepainted/exploration, -/area/endeavour/hallway/d1afthall) +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardafthall) "sNR" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -23331,7 +24950,7 @@ pixel_x = -32 }, /turf/simulated/floor/wood, -/area/endeavour/hallway/d1afthall) +/area/crew_quarters/lounge) "sQX" = ( /obj/machinery/air_alarm{ pixel_y = 22 @@ -23397,12 +25016,42 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/chapel) +"sTI" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "sUh" = ( -/obj/structure/disposalpipe/up, -/obj/effect/floor_decal/industrial/warning/full, -/obj/structure/lattice, -/turf/simulated/open, -/area/maintenance/substation/dock) +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "sUx" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -23415,6 +25064,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hop) "sVb" = ( @@ -23451,6 +25104,18 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) +"sXO" = ( +/obj/effect/floor_decal/steeldecal/steel_decals_central7, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "sYp" = ( /obj/effect/floor_decal/industrial/warning/full, /obj/structure/cable{ @@ -23472,6 +25137,12 @@ /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = 27 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "sYy" = ( @@ -23480,6 +25151,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/lounge/kitchen_freezer) "sZj" = ( +/obj/structure/sign/nanotrasen, /turf/simulated/wall/r_wall, /area/hallway/secondary/docking_hallway2) "sZk" = ( @@ -23510,6 +25182,10 @@ /obj/effect/floor_decal/corner/mauve/bordercorner{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/exploration) "sZF" = ( @@ -23585,10 +25261,16 @@ /turf/simulated/floor/wood, /area/library) "tcd" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardforhall) +/area/endeavour/hallway/d1afthall) "tdX" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -23599,6 +25281,12 @@ /obj/machinery/holoposter{ pixel_y = 32 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "tep" = ( @@ -23904,17 +25592,22 @@ /turf/simulated/floor/plating, /area/rnd/research/testingrange) "trw" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 8 +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/orange{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +/obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/tiled/steel, -/area/hallway/secondary/docking_hallway) +/area/endeavour/hallway/d1portforhall) "trx" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -23937,6 +25630,11 @@ icon_state = "4-8" }, /obj/machinery/light, +/obj/structure/disposalpipe/sortjunction/flipped{ + dir = 4; + name = "HoP Office"; + sortType = "HoP Office" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "tsf" = ( @@ -24069,10 +25767,10 @@ /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/navgold/bordercorner, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) @@ -24130,6 +25828,13 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techfloor/grid, /area/endeavour/hallway/d1afthall) +"twe" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/carpet/bcarpet, +/area/library) "twp" = ( /obj/machinery/shower{ pixel_y = 8 @@ -24191,10 +25896,8 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "txk" = ( -/obj/effect/paint/violet, -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/crew_quarters/lounge) +/turf/simulated/wall/prepainted/civilian, +/area/maintenance/substation/exploration) "txl" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/glass{ @@ -24262,15 +25965,15 @@ /area/crew_quarters/coffee_shop) "tBJ" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "tBO" = ( @@ -24640,30 +26343,27 @@ /area/exploration) "tOv" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central7, -/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/cable/orange{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1portamidhall) -"tOJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 10 }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portamidhall) +"tOJ" = ( /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "tOO" = ( @@ -24695,6 +26395,10 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/sauna) "tQg" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "tQt" = ( @@ -24760,6 +26464,10 @@ pixel_x = -28; pixel_y = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/wood, /area/crew_quarters/captain) "tUY" = ( @@ -24786,6 +26494,9 @@ department = "Head of Personnel's Office" }, /obj/structure/table/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hop) "tVX" = ( @@ -24895,16 +26606,19 @@ /area/bridge/hallway) "uaP" = ( /obj/effect/floor_decal/borderfloorblack{ - dir = 8 + dir = 1 }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 8 +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/holoposter{ + pixel_y = 32 }, /turf/simulated/floor/tiled/steel, -/area/hallway/secondary/docking_hallway) +/area/endeavour/hallway/d1starboardafthall) "uba" = ( /turf/simulated/floor/tiled/dark, /area/exploration/courser_dock) @@ -24962,6 +26676,21 @@ /obj/machinery/door/firedoor{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardamidhall) +"ubW" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "ucd" = ( @@ -25132,6 +26861,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1fwdhall) "uhT" = ( @@ -25145,6 +26877,12 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "ujr" = ( @@ -25215,6 +26953,31 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/chapel/main) +"ulm" = ( +/obj/structure/sign/directions/elevator{ + dir = 4 + }, +/obj/structure/sign/directions/bridge{ + dir = 4; + pixel_y = 7 + }, +/turf/simulated/wall/prepainted/civilian, +/area/chapel/main) +"ulK" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardforhall) "ulS" = ( /obj/machinery/door/airlock/multi_tile/glass{ dir = 1; @@ -25370,6 +27133,9 @@ /area/chapel/office) "uru" = ( /obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hop) "urL" = ( @@ -25403,15 +27169,12 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/endeavour/surfacebase/tram) "usu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "usG" = ( @@ -25455,6 +27218,10 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) "utU" = ( @@ -25517,6 +27284,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/carpet/bcarpet, /area/library) "uvX" = ( @@ -25697,6 +27465,9 @@ /obj/effect/floor_decal/corner/mauve/bordercorner{ dir = 1 }, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) "uBH" = ( @@ -25857,6 +27628,19 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge) +"uJC" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/light, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "uKB" = ( /obj/machinery/light, /turf/simulated/floor/tiled/techfloor/grid, @@ -25912,12 +27696,6 @@ /turf/simulated/floor/tiled, /area/exploration/medical) "uNx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -26099,6 +27877,15 @@ /obj/machinery/door/firedoor{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "uVf" = ( @@ -26119,6 +27906,19 @@ /obj/map_helper/access_helper/airlock/station/service/clown, /turf/simulated/floor/plating, /area/crew_quarters/clownoffice) +"uWb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/sortjunction{ + dir = 8; + name = "Pathfinder's Office"; + sortType = "Pathfinder's Office" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1afthall) "uWF" = ( /obj/item/radio/intercom{ dir = 8; @@ -26173,6 +27973,10 @@ dir = 9 }, /obj/machinery/light, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "uXz" = ( @@ -26232,6 +28036,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "vaR" = ( @@ -26352,7 +28159,7 @@ /turf/simulated/floor/plating, /area/shuttle/courser/general) "vdF" = ( -/turf/simulated/wall/r_wall/prepainted, +/turf/simulated/wall/r_wall/prepainted/civilian, /area/station/stairs_one) "vdU" = ( /obj/structure/cable{ @@ -26380,15 +28187,39 @@ /turf/simulated/floor/wood, /area/endeavour/hallway/d1fwdmaint) "veS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1portforhall) +"veZ" = ( +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1afthall) +"vfg" = ( +/obj/effect/floor_decal/steeldecal/steel_decals_central7, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portamidhall) "vgg" = ( /obj/machinery/recharger/wallcharger{ pixel_x = 33 @@ -26498,6 +28329,8 @@ dir = 8 }, /obj/machinery/air_alarm/west_mount, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "vkr" = ( @@ -26572,16 +28405,21 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1fwdhall) "vmH" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "vmX" = ( /obj/machinery/computer/arcade/orion_trail, /turf/simulated/floor/plating, /area/endeavour/hallway/d1aftmaint) +"vnO" = ( +/obj/effect/floor_decal/steeldecal/steel_decals_central7, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardamidhall) "vnQ" = ( /obj/machinery/vending/snack, /obj/effect/floor_decal/borderfloorblack{ @@ -26626,6 +28464,9 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "vpK" = ( @@ -26639,13 +28480,13 @@ /turf/simulated/floor/plating, /area/vacant/vacant_bar) "vpL" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "vpO" = ( @@ -26728,6 +28569,13 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/hallway) +"vso" = ( +/obj/structure/sign/directions/bridge{ + dir = 4; + pixel_y = 8 + }, +/turf/simulated/wall/prepainted/civilian, +/area/endeavour/hallway/d1fwdmaint) "vsG" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, @@ -26743,6 +28591,16 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) +"vsP" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1afthall) "vtb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -26776,6 +28634,8 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "vuf" = ( @@ -26801,17 +28661,30 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "vwv" = ( /obj/structure/cable/orange{ icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "vwC" = ( @@ -26824,16 +28697,12 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/machinery/light{ dir = 4; use_power = 0 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "vwK" = ( @@ -26859,6 +28728,14 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) +"vwY" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/violet, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/exploration/medical) "vxr" = ( /obj/machinery/door/blast/regular, /obj/machinery/atmospheric_field_generator/perma, @@ -26900,6 +28777,13 @@ }, /turf/simulated/floor/holofloor/tiled/dark, /area/endeavour/hallway/d1fwdhall) +"vAm" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/secondary/docking_hallway) "vBg" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 9 @@ -26972,6 +28856,12 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "vCO" = ( @@ -27004,6 +28894,9 @@ /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = 27 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "vDR" = ( @@ -27028,6 +28921,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/library) "vEi" = ( +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/monofloor{ dir = 1 }, @@ -27088,6 +28982,13 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) +"vEP" = ( +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portamidhall) "vFv" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -27110,6 +29011,20 @@ }, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) +"vGD" = ( +/obj/structure/sign/directions/evac{ + dir = 8; + pixel_y = -7 + }, +/obj/structure/sign/directions/elevator{ + dir = 4 + }, +/obj/structure/sign/directions/bridge{ + dir = 4; + pixel_y = 7 + }, +/turf/simulated/wall/prepainted/civilian, +/area/hydroponics/garden) "vGJ" = ( /turf/simulated/wall/r_wall/prepainted, /area/crew_quarters/captain) @@ -27125,6 +29040,12 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/tiled, /area/shuttle/excursion/general) +"vHL" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "vHP" = ( /obj/machinery/light/small{ dir = 4 @@ -27144,6 +29065,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "vIH" = ( @@ -27170,6 +29094,12 @@ dir = 8; pixel_x = -24 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "vJp" = ( @@ -27280,11 +29210,20 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "vOo" = ( /obj/structure/sign/deck/first, -/turf/simulated/wall/prepainted, +/turf/simulated/wall/prepainted/civilian, /area/endeavour/hallway/d1fwdmaint) "vQw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -27326,7 +29265,7 @@ /area/maintenance/substation/civilian) "vRx" = ( /obj/structure/sign/deck/first, -/turf/simulated/wall/prepainted, +/turf/simulated/wall/prepainted/civilian, /area/station/stairs_one) "vSp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -27375,6 +29314,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "vUK" = ( @@ -27428,6 +29371,7 @@ }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/exploration) "vWs" = ( @@ -27560,6 +29504,9 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "weh" = ( @@ -27592,6 +29539,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) +"wfp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1afthall) "wfu" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 4 @@ -27720,7 +29682,7 @@ /turf/simulated/floor/tiled/monodark, /area/crew_quarters/lounge) "wki" = ( -/turf/simulated/wall/prepainted, +/turf/simulated/wall/prepainted/civilian, /area/endeavour/hallway/d1portforhall) "wkB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -27836,18 +29798,29 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "wpi" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) +"wpv" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "wpZ" = ( /obj/machinery/bodyscanner{ dir = 8 @@ -27872,6 +29845,9 @@ /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/captain) "wqV" = ( @@ -27881,9 +29857,10 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 4 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "wrh" = ( @@ -28105,6 +30082,10 @@ }, /turf/simulated/floor/plating, /area/crew_quarters/heads/hop) +"wyH" = ( +/obj/structure/sign/nanotrasen, +/turf/simulated/wall/r_wall/prepainted/command, +/area/bridge/hallway) "wyP" = ( /obj/landmark/spawnpoint/job/librarian, /obj/machinery/newscaster{ @@ -28117,20 +30098,12 @@ /turf/simulated/floor/carpet/bcarpet, /area/library/study) "wyW" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 8 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/obj/machinery/camera/network/civilian{ +/obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/turf/simulated/floor/tiled/steel, -/area/hallway/secondary/docking_hallway) +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled/dark, +/area/hallway/secondary/docking_hallway2) "wyX" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -28234,6 +30207,13 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "wBM" = ( @@ -28415,6 +30395,9 @@ /area/hallway/secondary/docking_hallway) "wIX" = ( /obj/machinery/computer/secure_data, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/docking_hallway2) "wJf" = ( @@ -28503,6 +30486,10 @@ /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/wood, /area/exploration/meeting) "wPl" = ( @@ -28623,6 +30610,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1fwdhall) "wUJ" = ( @@ -28634,20 +30622,27 @@ /obj/effect/paint_stripe/violet, /turf/simulated/shuttle/floor/voidcraft, /area/shuttle/excursion/general) -"wVY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +"wVF" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardforhall) +"wVY" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, +/obj/item/radio/beacon, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) "wWq" = ( -/turf/simulated/wall/prepainted, +/turf/simulated/wall/prepainted/civilian, /area/station/stairs_one) "wWR" = ( /obj/machinery/fire_alarm/north_mount, @@ -28655,13 +30650,18 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/tram) "wWT" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/structure/cable/orange{ icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "wXh" = ( @@ -28807,11 +30807,15 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "xeT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "xfa" = ( @@ -28858,6 +30862,12 @@ /obj/structure/table/woodentable, /turf/simulated/floor/wood, /area/endeavour/hallway/d1fwdmaint) +"xgi" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portamidhall) "xgA" = ( /obj/structure/table/woodentable, /turf/simulated/floor/carpet/bcarpet, @@ -28876,6 +30886,7 @@ /area/endeavour/hallway/d1starboardafthall) "xgP" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central7, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "xgT" = ( @@ -28904,6 +30915,9 @@ "xiw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/docking_hallway) "xjh" = ( @@ -28974,6 +30988,7 @@ /obj/structure/cable/cyan{ icon_state = "1-2" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "xnh" = ( @@ -29083,6 +31098,7 @@ /obj/machinery/door/firedoor{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/maintenance/substation/dock) "xri" = ( @@ -29148,10 +31164,25 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/captain) +"xtn" = ( +/obj/structure/sign/directions/elevator{ + dir = 4 + }, +/obj/structure/sign/directions/evac{ + dir = 8; + pixel_y = -7 + }, +/obj/structure/sign/directions/bridge{ + dir = 4; + pixel_y = 7 + }, +/turf/simulated/wall/prepainted/civilian, +/area/maintenance/substation/civilian) "xtJ" = ( /obj/machinery/door/firedoor{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/library) "xtP" = ( @@ -29163,8 +31194,10 @@ /obj/structure/railing{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/lightpost, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/grass, /area/hydroponics/garden) "xuc" = ( @@ -29273,17 +31306,29 @@ /area/crew_quarters/coffee_shop) "xwO" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) +"xwT" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 1 + }, +/obj/machinery/holoposter{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "xxb" = ( /obj/effect/floor_decal/spline/plain{ dir = 5 @@ -29315,6 +31360,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/wood, /area/crew_quarters/captain) "xxD" = ( @@ -29462,17 +31511,17 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hop) "xCy" = ( -/obj/effect/floor_decal/borderfloorblack{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/corner/navgold/border{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1portamidhall) "xDl" = ( /obj/machinery/atmospherics/pipe/tank/phoron{ dir = 8 @@ -29482,8 +31531,12 @@ "xEw" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) @@ -29496,6 +31549,12 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "xEQ" = ( @@ -29522,6 +31581,18 @@ /obj/item/radio/beacon, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) +"xGj" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "xGk" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -29659,6 +31730,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hop) "xMN" = ( @@ -29686,6 +31758,15 @@ }, /turf/simulated/floor/wood, /area/bridge/meeting_room) +"xOD" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "xON" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -29708,8 +31789,15 @@ /area/endeavour/hallway/d1portforhall) "xPg" = ( /obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) +"xPn" = ( +/obj/effect/shuttle_landmark/endeavour/deck4/specops, +/turf/space/basic, +/area/space) "xPF" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -29738,6 +31826,15 @@ /obj/structure/cable/orange{ icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "xQD" = ( @@ -29834,6 +31931,21 @@ /obj/machinery/light, /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/excursion_dock) +"xUB" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardamidhall) "xUH" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -29872,6 +31984,10 @@ "xWL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/exploration) "xYB" = ( @@ -29938,6 +32054,9 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "ybg" = ( @@ -29947,14 +32066,21 @@ /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "ybw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardforhall) +"ybU" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/light, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) @@ -30134,6 +32260,8 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "yfL" = ( @@ -30147,7 +32275,7 @@ /area/endeavour/hallway/d1portforhall) "ygA" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/reinforced/airless, /area/rnd/test_area) "yhF" = ( @@ -30162,6 +32290,13 @@ icon_state = "4-8" }, /obj/machinery/computer/timeclock/premade/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "yiH" = ( @@ -30222,6 +32357,12 @@ dir = 1 }, /obj/machinery/computer/timeclock/premade/north, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "ylC" = ( @@ -32653,8 +34794,8 @@ xRj xRj xRj xRj -dkX -dkX +qTI +qTI vxr vxr vxr @@ -32847,8 +34988,8 @@ xRj xRj xRj xRj -dkX -dkX +qTI +qTI joA joA joA @@ -33041,8 +35182,8 @@ xRj xRj xRj xRj -dkX -dkX +qTI +qTI joA joA joA @@ -33235,8 +35376,8 @@ xRj xRj xRj xRj -dkX -dkX +qTI +qTI joA joA joA @@ -33429,8 +35570,8 @@ xRj xRj xRj xRj -dkX -dkX +qTI +qTI joA joA joA @@ -33623,8 +35764,8 @@ xRj xRj xRj ePJ -dkX -dkX +qTI +qTI joA joA joA @@ -33817,8 +35958,8 @@ xRj xRj xRj xRj -dkX -dkX +qTI +qTI joA joA joA @@ -34011,8 +36152,8 @@ xRj xRj xRj xRj -dkX -dkX +qTI +qTI eav joA joA @@ -34205,8 +36346,8 @@ xRj xRj xRj xRj -dkX -dkX +qTI +qTI joA hSl wwz @@ -34251,10 +36392,10 @@ xRj xRj xRj xRj -sQl -sQl -sQl -sQl +mSg +mSg +mSg +mSg jNg jNg jNg @@ -34399,8 +36540,8 @@ xRj fZu xRj xRj -dkX -dkX +qTI +qTI joA joA suA @@ -34445,10 +36586,10 @@ xRj xRj xRj xRj -sQl -sQl -sQl -sQl +mSg +mSg +mSg +mSg jNg jNg jNg @@ -34593,8 +36734,8 @@ dkX dkX dkX dkX -dkX -dkX +qTI +qTI joA joA suA @@ -34639,10 +36780,10 @@ dTn dTn dTn dTn -sQl -sQl -sQl -sQl +hgE +mSg +mSg +mSg jNg jNg jNg @@ -34833,9 +36974,9 @@ tAk tAk tAk tAk -sQl -sQl -sQl +hgE +mSg +mSg xRj xRj xRj @@ -35028,7 +37169,7 @@ tAk tAk tAk tAk -sQl +mSg xRj xRj xRj @@ -35222,7 +37363,7 @@ tAk tAk tAk eiz -sQl +mSg nof xRj xRj @@ -35416,7 +37557,7 @@ xxD xxD kwV fIt -sQl +mSg xRj xRj xRj @@ -35610,7 +37751,7 @@ tAk tAk nei tAk -sQl +mSg usG fOo xRj @@ -35804,7 +37945,7 @@ tMy yiH nei tAk -sQl +mSg usY usG xRj @@ -35998,7 +38139,7 @@ nwz njW nei tAk -sQl +mSg usG fOo xRj @@ -36142,7 +38283,7 @@ gBG gBG dXL uNb -gBG +vwY bkR bkR kbw @@ -36192,7 +38333,7 @@ nKO uRE nei tAk -sQl +mSg xRj xRj xRj @@ -36386,7 +38527,7 @@ eCo uRE nei tAk -sQl +mSg xRj xRj xRj @@ -36580,7 +38721,7 @@ iPS eJe nei fIt -sQl +mSg xRj xRj xRj @@ -36774,7 +38915,7 @@ yiH pCg nei tAk -sQl +mSg xRj xRj jNg @@ -36968,7 +39109,7 @@ uFy tAk nei tAk -sQl +mSg nof xRj jNg @@ -37162,7 +39303,7 @@ yiH pbi nei eiz -sQl +mSg xRj xRj jNg @@ -37356,7 +39497,7 @@ uFy tAk nei tAk -sQl +mSg xRj xRj jNg @@ -37504,7 +39645,7 @@ jsu mRl kxB fUg -hgE +hRu joA joA suA @@ -37550,7 +39691,7 @@ yiH tAk nei tAk -sQl +mSg xRj xRj jNg @@ -37698,7 +39839,7 @@ jsu jRq pcA hbS -hgE +hRu nsi jQM bAB @@ -37716,7 +39857,7 @@ vSp joA joA qTI -nZb +cMJ seH lDt tmL @@ -37744,7 +39885,7 @@ yiH tAk nei tAk -sQl +mSg xRj xRj jNg @@ -37910,7 +40051,7 @@ hwW joA aKN qTI -nZb +cMJ wym wym wym @@ -37937,8 +40078,8 @@ kfH oeE tAk nei -wBM -sQl +hgE +mSg xRj xRj jNg @@ -37947,7 +40088,7 @@ jNg jNg jNg jNg -dfU +jNg jNg jNg xRj @@ -38092,19 +40233,19 @@ pOB pzo pzo pzo -txk -txk -txk +eCj +eCj +eCj pzo -txk -txk -txk +eCj +eCj +eCj pzo eCj -sxq -sxq -sNQ -sNQ +eCj +eCj +pzo +bLC wWR rTZ ito @@ -38131,9 +40272,8 @@ ert tAk tAk nei -wBM -sQl -xRj +hgE +mSg xRj xRj xRj @@ -38142,6 +40282,7 @@ xRj xRj xRj xRj +xPn xRj xRj xRj @@ -38295,8 +40436,8 @@ wTD wTD iqj wTD -qvn -qvn +wTD +wTD sQR bLC rTZ @@ -38325,8 +40466,8 @@ ert tAk tAk nei -wBM -sQl +hgE +mSg xRj xRj xRj @@ -38489,9 +40630,9 @@ yaG wTD wTD wTD -mER +yaG dvq -qvn +wTD bLC rTZ rTZ @@ -38519,8 +40660,8 @@ tAk tAk tAk nei -sQl -sQl +hgE +mSg xRj xRj xRj @@ -38532,7 +40673,7 @@ jNg ijU htr ijU -dYN +jNg xRj xRj xRj @@ -38683,13 +40824,13 @@ mmO oAh oiy wkh -aNK -aNK -aNK -aNK -aNK -aNK -sti +vwC +vwC +vwC +pWN +pWN +pWN +pWN tvS eFW eFW @@ -38713,8 +40854,8 @@ tAk tAk tAk egF -sQl -sQl +hgE +mSg nof xRj jNg @@ -38726,7 +40867,7 @@ jNg ijU dry ijU -pWN +dYk xRj xRj xRj @@ -38873,17 +41014,17 @@ uHc maw pJi toF -aNK -aNK -aNK -aNK -aNK -aNK -aNK +vwC +vwC +vwC +vwC +vwC +vwC +vwC sWz efK wim -sti +pWN apf agD pgL @@ -38907,8 +41048,8 @@ tAk tAk tAk nei -sQl -sQl +hgE +mSg xRj xRj jNg @@ -39067,9 +41208,9 @@ epw iVk rbl qVN -aNK +vwC +jLe jLe -wim jLe jLe jLe @@ -39101,8 +41242,8 @@ vYA xxD xxD wvb -sQl -sQl +hgE +mSg xRj xRj jNg @@ -39259,20 +41400,20 @@ mgA mgA fcl jPH -aNK -aNK -aNK -wim +vwC +vwC +vwC +jLe aLP wim wim -sti -sti -sti -sti -sti -sti -pfG +pWN +pWN +pWN +pWN +pWN +pWN +amu pgL pgL pgL @@ -39283,23 +41424,23 @@ cMJ cMJ cMJ cMJ -wBM -wBM -wBM -wBM +hgE +hgE +hgE +hgE mFk qdM ydR -wBM -wBM -wBM -wBM -wBM -wBM -wBM -wBM -wBM -wBM +hgE +hgE +hgE +hgE +hgE +hgE +hgE +hgE +hgE +hgE ijU ijU ijU @@ -39307,7 +41448,7 @@ ijU ijU gKK eoY -eTc +fYz mTa bew hoc @@ -39453,47 +41594,47 @@ iaB bMm cCy ahL -aNK +vwC efK efK -wim +jLe sWz wim wim -sti +pWN xvH clV -wHF -atm +sJO +vsP dAK -kHh -kHh -kHh -kHh +kKK +kKK +kKK +kKK xgP aBC -vll +vsP jGP -clV -atm +jPz +vsP gdd -vll +vsP gXC -vll -tsf +vsP +nqu dvb esN uke iZf kUp -trw -uaP +tsf +tsf iBm myN tsf tsf -wyW -uaP +iBm +tsf tkc bIF edR @@ -39646,46 +41787,46 @@ mct mBH oXj flf -ahL -aNK +cVD +vwC jLe jLe jLe jLe jLe wim -sti +pWN rlK usu -pFt +pwe +qvn kru -pFt -pFt -pFt -pFt -pFt -pFt -pFt +pwe +pwe +pwe +pwe +pwe +pwe bMi hUM -pFt +qvn kru isW -pFt -pFt +pwe +pwe pwe kWd -kWd +qJu cPS -uke -esN -esN +rMy +gWb +aFD hIY -hGQ -esN +vAm +gWb rgH -esN -esN +gWb +gWb slW hGQ sZj @@ -39693,7 +41834,7 @@ gEI gEI jzE ijU -xHD +iWI xVw fYz ijU @@ -39841,21 +41982,21 @@ juq opn jQF ssN -aNK +vwC jLe jLe jLe jLe jLe efK -sti +pWN rlK -tBJ +pNW iTz -wqV -yfG +pIX +rVM sae -pJd +dCe yfG yfG gmx @@ -39865,8 +42006,8 @@ fqB pJd wqV vts -yfG -yfG +tcd +tcd vwD qMR xiw @@ -39882,14 +42023,14 @@ msS wup est mFr -fiu -vKp +pfv +fit vKp fza fiu aIY gJJ -fYz +rTL ijU xRj xRj @@ -40035,7 +42176,7 @@ nis bMm cwi jWs -aNK +vwC jLe jLe jLe @@ -40071,19 +42212,19 @@ loX fhK fhK fhK -wBM -wBM -wBM -wBM -wBM +hgE +hgE +hgE +hgE +hgE ijU -iLb +apc eGS ijU etm aCx jkD -fYz +duk ijU xRj xRj @@ -40229,7 +42370,7 @@ vpR hTA cCy jWs -aNK +vwC jLe jLe jLe @@ -40238,7 +42379,7 @@ iDg iDg lOm kHh -pmO +wfp kHh fVP iDg @@ -40256,7 +42397,7 @@ bzz dKp xNI dZr -fmb +iqr fsR gWh fhK @@ -40277,7 +42418,7 @@ gja etm jmM oFd -fYz +foM ijU xRj xRj @@ -40423,7 +42564,7 @@ brd hTA cCy jWs -aNK +vwC ckc ckc jLe @@ -40443,7 +42584,7 @@ dZr xNI xNI xNI -hgm +xNI xNI dnc xNI @@ -40465,12 +42606,12 @@ nct nct syO ijU -gEI +qQG gEI tyc etm iWI -cfh +eTg emu xSt jNg @@ -40617,9 +42758,9 @@ vpR hTA cCy jWs -aNK -aNK -aNK +vwC +vwC +vwC fVV wWq wWq @@ -40664,8 +42805,8 @@ gEI nMh etm xls -wVY -fYz +xVw +foM xSt jNg jNg @@ -40820,7 +42961,7 @@ wHF vll vll jYp -pmO +wfp lOq fIO vjB @@ -41007,14 +43148,14 @@ cCy jWs cqc xAO -kHh -kHh -kHh -kHh +qzb +qmr +kKK +kKK plJ -kHh -kHh -pmO +kKK +kKK +qZl kHh kHh kHh @@ -41052,7 +43193,7 @@ ePs kpN etm hRF -wVY +xVw qva ijU usY @@ -41202,7 +43343,7 @@ jWs cqc vnQ kHh -kHh +mEO rkY lEq rkY @@ -41390,13 +43531,13 @@ tZN fsb xWL vWf -hTA -cCy +fEG +cEM sZB dKn -jYp -kHh -kHh +kYw +kKK +veZ rkY lEq rkY @@ -41417,7 +43558,7 @@ xuM xuM xuM sNR -sUh +xuM rRP cWc fmb @@ -41440,8 +43581,8 @@ aVF joU etm nWQ -wVY -fYz +wyW +duk xSt jNg jNg @@ -41585,12 +43726,12 @@ pMo kAO lBV bMm -aUH +rzp pbB kKt doM mgv -pFt +uWb tYZ tvO tYZ @@ -41612,7 +43753,7 @@ xET xET saT xNI -nYu +xNI cWc qNt fsR @@ -41633,8 +43774,8 @@ qfY vYM bnJ pbY -iWI -ogq +xHD +eTg emu xSt jNg @@ -41776,7 +43917,7 @@ qTj qTj qQg poP -qQg +ffU qTj bMm tGb @@ -41829,7 +43970,7 @@ tVX etm xHD wVY -fYz +foM xSt jNg jNg @@ -41978,7 +44119,7 @@ eZR cqc rrh tBJ -aBr +lnV ceM oYx oYx @@ -41990,7 +44131,7 @@ kHh pnA oNV vpL -ffU +dNj dZr sQX cWc @@ -41998,9 +44139,9 @@ sYp lVB xuM hxr -sUh +dfU shj -xuM +ftZ cWc umU uRN @@ -42022,8 +44163,8 @@ vYM kcJ etm xHD -wVY -fYz +wyW +fho xSt jNg jNg @@ -42363,10 +44504,10 @@ bmL qTj gPV efK -aNK +vwC xfm ovq -xEy +rmX piy gas atX @@ -42416,7 +44557,7 @@ muZ qVT aJQ xRj -xRj +iwD xRj xRj xRj @@ -42557,11 +44698,11 @@ emL qTj gPV wim -aNK +vwC phl fnJ -wNy -piy +oxV +ecz mlA nuL jHH @@ -42569,7 +44710,7 @@ jtY nVG mlA rbV -piy +ecz axR nVE vIw @@ -42605,7 +44746,7 @@ pfX gaj eus iFe -fYz +cPY nwm inw mdo @@ -42754,7 +44895,7 @@ wLB npN ojQ fnJ -wNy +oxV piy piy piy @@ -42764,7 +44905,7 @@ piy piy piy piy -axR +pfG oHo vIw dZr @@ -42945,10 +45086,10 @@ qTj qTj gPV wim -aNK +vwC ojQ fnJ -wNy +oxV piy tVb fCr @@ -43139,10 +45280,10 @@ wim wim gPV wim -aNK +vwC pvA dkB -wNy +oxV piy vcl qzE @@ -43150,12 +45291,12 @@ gvc wzN nuL lrq -mlA +cke hDt axR nVE iYr -dJe +aEU dJe dJe dJe @@ -43333,10 +45474,10 @@ wim ibx sjt wim -aNK +vwC uqH dth -wNy +oxV piy puC qrE @@ -43349,7 +45490,7 @@ piy cHu oHo vIw -dJe +aEU eYV eYV vpK @@ -43527,10 +45668,10 @@ wim gPV wim wim -aNK +vwC qXN dth -wNy +oxV piy dgm jxt @@ -43543,7 +45684,7 @@ xLn ioz lAz trN -dJe +aEU pFN rEv eYV @@ -43721,10 +45862,10 @@ wim gPV wim aLP -aNK +vwC bRG pDa -wNy +trw piy piy piy @@ -43734,10 +45875,10 @@ kPv piy piy piy -czG +nxJ qAf dLH -dJe +aEU vuf eYV pbT @@ -43915,10 +46056,10 @@ wim gPV wim wim -aNK +vwC xdS -dth -wNy +mHv +aEv piy mgg woe @@ -43929,9 +46070,9 @@ vqA uLN piy axR -oHo -vIw -dJe +sNQ +kNE +aEU sja eYV eYV @@ -44109,10 +46250,10 @@ wim gPV wim wim -aNK -jie +vwC +ojQ vmH -hJZ +sUh piy rcm raV @@ -44122,10 +46263,10 @@ bEg twp ftU piy -axR +pfG nUI yiz -dJe +aEU lkN eYV eYV @@ -44303,10 +46444,10 @@ wim gPV wim wim -aNK +vwC fFk -dth -wNy +mlQ +qMB piy piy piy @@ -44317,9 +46458,9 @@ piy piy piy axR -oHo -vIw -dJe +vEK +qzv +aEU oAT eYV eYV @@ -44497,11 +46638,11 @@ wim gPV wim wim -aNK +vwC ojQ -dth -wNy -aNK +mlQ +qMB +vwC jLe ciZ jLe @@ -44509,11 +46650,11 @@ jLe wim wim wim -aNK +vwC cHu -oHo -vIw -dJe +vEK +qzv +aEU qtu kvM xdJ @@ -44691,11 +46832,11 @@ aNK wHj aNK aNK -aNK +vwC vEN -dth -wNy -aNK +mlQ +qMB +vwC wim wim wim @@ -44705,9 +46846,9 @@ jLe jLe nzK lPB -oHo -vIw -dJe +vEK +qzv +aEU dJe dJe dJe @@ -44885,19 +47026,19 @@ etS gPV iMr wim -aNK +vwC trx jlN -xEy -aNK -aNK -aNK -aNK -aNK -aNK -aNK -aNK -aNK +cNT +vwC +vwC +vwC +vwC +vwC +vwC +vwC +vwC +vwC ffi cVp uUX @@ -45081,7 +47222,7 @@ wim wim ruI ojQ -dth +mlQ xQm asR oRw @@ -45273,10 +47414,10 @@ etS gPV wim wim -aNK +vwC phl -dth -jpf +mlQ +aIU oDE wCQ tHB @@ -45467,21 +47608,21 @@ etS cpU wim wLB -aNK +vwC nuG aSA ngG -wNy -pEr -pEr -pEr -pEr -pEr +wpv +jMU +jMU +jMU +jMU +jMU qTR -pEr -pEr +jMU +xtn axR -oHo +vEK vNY hnz pul @@ -45661,21 +47802,21 @@ etS cpU wim wim -aNK -aNK +vwC +vwC vEN -dth -wNy -pEr +vHL +bdJ +jMU rGD heq heq heq sxY pPL -pEr +jMU axR -aFD +vEK doZ saW pul @@ -45856,11 +47997,11 @@ qzh wim wim wim -aNK +vwC bRG -dth -wNy -pEr +vHL +bdJ +jMU kgt pEr pEr @@ -46050,18 +48191,18 @@ wim wim wim wim -aNK +vwC fFk -pDa -wNy -pEr +dkq +bdJ +jMU vBH etW pEr wAt pPL pPL -pEr +jMU cHu vEK iuy @@ -46244,11 +48385,11 @@ jLe jLe jLe eca -aNK +vwC phl -dth -wNy -pEr +vHL +bdJ +jMU vDR hWC vRj @@ -46440,16 +48581,16 @@ jLe jLe dDB ojQ -dth -wNy -pEr +vHL +bdJ +eOe djQ lBc pEr mWe cGJ qfo -pEr +jMU aFB wmH jeN @@ -46634,17 +48775,17 @@ wim efK npN ojQ -dth -wNy -pEr +vHL +bdJ +jMU pEr pEr pEr kWt nQy pEr -pEr -pEr +jMU +jMU jTT cdv qLH @@ -46660,7 +48801,7 @@ mJP eOl eOl nJA -mJP +cfh ltO dsD uze @@ -46826,11 +48967,11 @@ wim wim wim wim -aNK +vwC uqH -dth -wNy -pEr +nYu +flH +jMU cSr pPL pPL @@ -47020,11 +49161,11 @@ wim wim wim wim -aNK +vwC pKc -vmH +iCH hJZ -pEr +jMU abZ kIs kIs @@ -47032,21 +49173,21 @@ wsZ uQz pPL eGo -pEr +jMU jkq -iuy -lPB +lxY +sxq xtJ -wAB -mJP -mJP -mJP +twe +cfh +cfh +cfh uvU jTs jTs rVX -fDJ -fDJ +kzG +kzG fOe xoy dsD @@ -47214,23 +49355,23 @@ wim wim wim wim -aNK +vwC sYx -jlN +sXO xEy -pEr -pEr -pEr -pEr +jMU +jMU +jMU +jMU aYQ -pEr -pEr -pEr -pEr +jMU +jMU +jMU +jMU eTb rqe nXJ -dsD +oRd bSd bMt kNK @@ -47410,7 +49551,7 @@ aFa aFa aFa ylz -dth +vHL aGw opz cBe @@ -47422,7 +49563,7 @@ tkX oHx uzH iZH -iuy +nFp saW vLq iKm @@ -47603,7 +49744,7 @@ kvQ nSH fLt mYH -ojQ +veS nYt sqc yfL @@ -47616,7 +49757,7 @@ rYG bIw nVY vBM -jeN +dbq cOe dsD jAq @@ -47798,7 +49939,7 @@ piB tLv mYH leE -fnJ +kAE oDE eNB uGL @@ -47991,18 +50132,18 @@ mMT mMT mMT mYH -ojQ -fnJ +veS +kAE wNy -vdF +dYN wXu -lDc +mrv ngd nwU eMO vdF wXu -vdF +lJC wkL jeN saW @@ -48186,7 +50327,7 @@ eaK rzS aFa oxw -fnJ +kAE qUh nYy iDg @@ -48359,7 +50500,7 @@ bdl bdl bdl sti -mZA +hfY sti wim wim @@ -48379,7 +50520,7 @@ dGT aDo goT hOL -eCz +byU rvA qUh nYy @@ -48553,7 +50694,7 @@ joZ joZ joZ sti -mZA +hfY sti akq wim @@ -48573,7 +50714,7 @@ cbd hQD cVf kOV -cBN +qLX pmX eUP vdF @@ -48582,9 +50723,9 @@ vdF cuR wPz qOo -lDc +qdt wXu -vdF +dYN xgB iuy baf @@ -48742,12 +50883,12 @@ hfY hfY usG usY -mZA -mZA -mZA -mZA -mZA -hmO +hfY +hfY +hfY +hfY +hfY +iQi sti wim wim @@ -48767,8 +50908,8 @@ eaK gnc rBZ dCX -aSm -fnJ +sTI +kAE fef ukf ukf @@ -48936,12 +51077,12 @@ xRj hfY usG usG -mZA -mZA -mZA -mZA -mZA -mZA +hfY +hfY +hfY +hfY +hfY +hfY sti wim wim @@ -48961,8 +51102,8 @@ eaK wtM noo aFa -ojQ -fnJ +veS +kAE oDE uGL uGL @@ -49130,12 +51271,12 @@ xRj xRj xRj hfY -mZA -mZA -mZA -mZA -mZA -mZA +hfY +hfY +hfY +hfY +hfY +hfY sti wim jLe @@ -49155,8 +51296,8 @@ eaK eaK nPI aFa -pvA -dkB +oEW +mlk wNy wki wki @@ -49167,7 +51308,7 @@ lHm lHm lHm lHm -xgB +uaP lLu hdn mWz @@ -49184,7 +51325,7 @@ hjh mWz eWl bIB -vkl +qks llV mWz vJi @@ -49324,12 +51465,12 @@ xRj xRj xRj hfY -mZA -mZA -mZA -mZA -mZA -mZA +hfY +hfY +hfY +hfY +hfY +hfY sti wim jLe @@ -49350,9 +51491,9 @@ svI jKd mYH jie -vmH -hJZ -oxc +xOD +wNy +wUJ uze uze uze @@ -49360,7 +51501,7 @@ sTF uze uze uze -oxc +wUJ hYA dqz hlC @@ -49373,12 +51514,12 @@ kPV kPV qke aGG -veS +pql jXs kPV kPV kPV -kPV +aGG pql iUW sAT @@ -49518,12 +51659,12 @@ xRj xRj xRj hfY -mZA -mZA -mZA -mZA -mZA -mZA +hfY +hfY +hfY +hfY +hfY +hfY sti wim jLe @@ -49543,10 +51684,10 @@ dQJ ljP jKd mYH -ojQ -pDa +veS +dkq wNy -oxc +wUJ dqm whp whp @@ -49554,7 +51695,7 @@ xTY uze uze fAe -oxc +wUJ hvO fyb sCh @@ -49566,14 +51707,14 @@ xUN xUN xUN giY -xCy +xUN xUN tWo xUN xUN xUN xUN -xCy +xUN dJH mYF jJh @@ -49740,7 +51881,7 @@ aFa gDF reM hev -oxc +wUJ sTF uze uze @@ -49748,7 +51889,7 @@ uze fAe oxc oxc -oxc +wUJ grq oNH lMT @@ -49931,10 +52072,10 @@ hVl aFa aFa aFa -jWP -cPY +qOD +xgi sOS -bjg +txk nOh bjg bjg @@ -49943,7 +52084,7 @@ bjg bjg iLD iLD -bjg +txk gpc kCB ptG @@ -50126,9 +52267,9 @@ fZy fZy fBm hWM -hAH +xgi iVd -bjg +txk lkX uWM bjg @@ -50137,7 +52278,7 @@ iLD iLD iLD iLD -bjg +txk hRp sCh ycC @@ -50322,7 +52463,7 @@ xHh nRa kef xRT -bjg +txk rHo eVc rqD @@ -50515,8 +52656,8 @@ fZy mmC kEh qcV -mYb -bjg +vGD +txk eyU ybg bjg @@ -50525,7 +52666,7 @@ tWk iLD iLD ojn -bjg +txk vDK sCh lSz @@ -50687,7 +52828,7 @@ hfY hfY jNb aNV -mNs +hfY qTb pSA aIM @@ -50708,18 +52849,18 @@ har fZy enD tOv -acA +atm mYb -bjg -bjg -bjg -bjg +txk +txk +txk +txk hfQ eAL -bjg -bjg -bjg -bjg +txk +txk +txk +txk yaO oPk nqO @@ -50881,7 +53022,7 @@ hfY hfY aNV aNV -mNs +hfY qTb pSA dlC @@ -50914,10 +53055,10 @@ gaE qXL qXL nAf -aWO +jLq mho fvL -sDi +ulm urc urc urc @@ -51095,7 +53236,7 @@ muT dos fZy eVQ -dkh +aRC rCo nAf jVj @@ -51109,9 +53250,9 @@ tCW hEs nAf jLq -kCB -jJh -jMU +vnO +xUB +sDi aPj aPj aPj @@ -51279,7 +53420,7 @@ wim wim wim kQd -aNK +vwC fZy fZy mWX @@ -51303,7 +53444,7 @@ sBk dmO nAf jLq -sCh +dwQ ibq eDy dKl @@ -51483,8 +53624,8 @@ eRR eRR bWR uvX -kEh -mne +ogq +fsH nAf ofn fmO @@ -51499,7 +53640,7 @@ nAf jLq kCB ofq -jMU +sDi aPj aPj aPj @@ -51693,7 +53834,7 @@ nAf jLq sCh ykX -jMU +sDi sDi sDi sDi @@ -51874,7 +54015,7 @@ bve fjy qcV nAf -ooD +bNR sne sFu jxe @@ -51887,7 +54028,7 @@ nAf jLq jwq lSz -oxc +wUJ uze uze uze @@ -52081,7 +54222,7 @@ nAf jLq sCh uXz -oxc +wUJ uze nZR uze @@ -52457,7 +54598,7 @@ kEh iAU nAf rbW -rbW +cMA rbW tTD tTD @@ -52469,7 +54610,7 @@ nAf gJc sCh cSo -oxc +wUJ oxc oxc oxc @@ -52651,19 +54792,19 @@ iGp lAY aMu ihi -ihi -ihi +mYI +kkN ihi ihi ihi rSO ihi -ihi -aMu +cNq +gAA jFy fVc hYM -oxc +wUJ uze uze uze @@ -52842,11 +54983,11 @@ cEb cEb jWP kEh -sZv +xgi ixz tTD tTD -tTD +gjv tTD quY tTD @@ -53035,12 +55176,12 @@ iQL pRV cEb nkQ -fjy +vfg aCQ nAf rbW rbW -rbW +ktx tTD tTD rbW @@ -53049,8 +55190,8 @@ sPy dtm nAf sEj -kCB -lSz +kos +nkw rCH xch dRe @@ -53229,8 +55370,8 @@ iQL yey cEb hPQ -kEh -qcV +vEP +hAH nAf dfE dfE @@ -53243,8 +55384,8 @@ gvL vSI nAf jLq -sCh -lSz +mho +hTf oeW mGw tsX @@ -53437,8 +55578,8 @@ okP tFC nAf jLq -sCh -lSz +owF +mjz oeW iVV tsX @@ -53617,8 +55758,8 @@ nRR hZk cEb itz -kEh -qcV +iOg +czG nAf nxI hsu @@ -53630,8 +55771,8 @@ ofn bNR cTV nAf -aWO -mho +jLq +ubW cxt oeW noZ @@ -53811,8 +55952,8 @@ dIE dIE dIE mAC -kEh -qcV +iOg +czG nAf czH oYJ @@ -54005,8 +56146,8 @@ rVI aMy dIE twz -kEh -qcV +iOg +czG nAf xPV ikk @@ -54393,8 +56534,8 @@ xKz vyg dIE hYO -kEh -qcV +iOg +czG nAf hEs bNR @@ -54587,8 +56728,8 @@ rln tbQ dIE hYO -kEh -qcV +iOg +czG nAf dAR ksB @@ -54783,17 +56924,17 @@ dIE sQg gBE acA -uTr -uTr -uTr -uTr -uTr -uTr -uTr -uTr -uTr -uTr -uTr +ogT +ogT +ogT +ogT +ogT +ogT +ogT +ogT +ogT +ogT +ogT ubV xSm vik @@ -54975,9 +57116,9 @@ esr vdw dIE hAP -kEh -iAU -uTr +iOg +rgx +dkh maa maa maa @@ -54987,11 +57128,11 @@ maa maa maa maa -uTr +ogT gJc rCE lSz -uTr +ogT maa maa maa @@ -55169,8 +57310,8 @@ kim gAb dIE hYO -kEh -sZv +iOg +xCy gED byt byt @@ -55185,7 +57326,7 @@ cfl nrF rCE lSz -uTr +ogT maa maa maa @@ -55362,24 +57503,24 @@ dIE dIE dIE dIE -aGl +hYO bHE aRA -uTr -uTr +ogT +ogT byt xTb tjQ tjQ tjQ oiK -uTr -uTr -uTr +ogT +ogT +apW eez gOX kiC -uTr +ogT byt byt byt @@ -55545,7 +57686,7 @@ ris maa maa byt -uTr +ogT cPf eRR sxX @@ -55557,23 +57698,23 @@ sxX eRR ovE uvX -kEh +vEP cQC ydG -uTr +ogT maa xqf maa byt byt dNZ -uTr +ogT eGI uAt -nkw -jGp -gAA -uTr +koX +bAu +vsG +ogT maa maa maa @@ -55754,20 +57895,20 @@ sZv hZy vwv mne -uTr +ogT maa vlU maa byt byt maa -uTr +ogT iXX ikY xeT cxE cVc -uTr +ogT pQQ maa maa @@ -55933,7 +58074,7 @@ ris sIg byt maa -uTr +ogT xln gnm gnm @@ -55945,23 +58086,23 @@ gnm gnm jsq gnm -eOe +bve kah mne -uTr +ogT maa vlU maa maa maa maa -uTr +ogT tdX -bAu +jGp hYj fmw xpv -uTr +ogT maa maa kfn @@ -56127,40 +58268,40 @@ ris uTr izR uTr -uTr -uTr -uTr -uTr -uTr -pcK +ogT +ogT +ogT +ogT +ogT +iLb dDd -pcK -pcK -pcK -pcK -pcK +iLb +iLb +iLb +iLb +iLb nGa pWE iXl -aLV +niH stV kiQ aLV aLV aLV aLV -aLV -uhY -fcc -itm -uTr -uTr +niH +ulK +mbU +kQE +ogT +ogT +ogT uTr uTr uTr uTr maa -maa fta maa ogT @@ -56336,18 +58477,18 @@ snQ ojQ oXb lJy -aLV +niH wAL yme aDX aLV kYE hff -aLV -uhY -bAu +niH +reC +jux nwc -uTr +ogT pbo aGj aMl @@ -56521,8 +58662,8 @@ ixA ixA uyI bpw -lia -rXC +hsI +ieu rXC rXC rXC @@ -56530,18 +58671,18 @@ snQ eCz kaL lJy -aLV +niH tzx lmB oVe lCd ghn meH -aLV +niH uhY -bAu -vsG -uTr +jux +qzr +ogT wqe aGj dam @@ -56716,15 +58857,15 @@ maa yek bpw ePN -rXC -rXC -rXC -rXC +aIx +pvL +pvL +pvL kRq jpf -kaL +ipM uwI -aLV +niH oZB cdx wmU @@ -56734,8 +58875,8 @@ uWI cvv uhY mRz -prV -uTr +pUQ +ogT aGj nHX tme @@ -56918,18 +59059,18 @@ snQ aSm oXb lJy -aLV +niH txl -aLV -aLV -aLV +niH +niH +niH ctS bBw -aLV +niH mTU -bAu -cVc -uTr +jux +ybU +ogT uTr uTr uTr @@ -57121,9 +59262,9 @@ wCh uTX udj cFO -tcd -vsG -uTr +jux +qzr +apW nQR nqz bRa @@ -57303,7 +59444,7 @@ gug rXC rkb snQ -jie +ojQ wWT pVQ khS @@ -57316,8 +59457,8 @@ ush aZE gpx jGp -gAA -uTr +qzr +ogT dBa hfG uTr @@ -57498,20 +59639,20 @@ rXC tXo snQ ojQ -dth -lJy -aEU -aEU -aEU -aEU -aEU -aEU -aEU -aEU +iCH +hqh +ogT +ogT +ogT +ogT +ogT +ogT +ogT +ogT liZ -bAu -vsG -uTr +aWO +qzr +ogT uTr uTr uTr @@ -57692,20 +59833,20 @@ rXC ctD snQ eCz -dth -uwI -aEU +nYu +uJC +ogT ssc eFE -aEU +ogT dMB -aEU +ogT rgG -aEU -uhY -bAu +ogT +gQH +kDV uXy -uTr +ogT maa maa maa @@ -57887,17 +60028,17 @@ jrM mNB cBN kWj -bOP -aEU -aEU +jlS +vso +ogT rba -aEU +ogT rqv -aEU +ogT rqv -aEU -iXX -fcc +ogT +mEr +aWe jux izR byt @@ -58080,20 +60221,20 @@ bHg iMc snQ aSm -dth -lJy -aEU +vHL +qek +ogT rui pjd pjd pjd uqY qsG -aEU +ogT rfe -bAu +sdj oJK -uTr +ogT maa maa maa @@ -58272,22 +60413,22 @@ uTr uTr uTr uTr -uTr -eCz -mbU +ogT +xwT +vHL hhr aLm sIK eFE -aEU +ogT eFE -aEU +ogT eFE cXS -jux +oWx bAu itm -uTr +ogT iLP tlI tlI @@ -58470,18 +60611,18 @@ wrE dBE tOJ bOP -aEU +ogT vaT xAa -aEU +ogT qtB nUC -aEU -aEU +ogT +ogT oxe gaI aJX -uTr +ogT maa maa maa @@ -58660,22 +60801,22 @@ qJU qJU byt uTr -uTr +ogT rAx -dth -lJy -aEU -aEU -aEU -aEU -aEU -aEU -aEU +vHL +pWz +ogT +ogT +ogT +ogT +ogT +ogT +ogT vBg koX fcc vsG -uTr +ogT maa kZn kfn @@ -58854,7 +60995,7 @@ mIj qJU byt maa -uTr +ogT aHu jHq fbD @@ -58866,10 +61007,10 @@ qyL qyL tuO uJk -ikY +oWx tvd xpv -uTr +ogT uTr uTr uTr @@ -58976,7 +61117,7 @@ jNg jNg jNg jNg -iwD +jNg xRj xRj xRj @@ -59048,11 +61189,11 @@ xPF qJU byt maa -uTr -uTr +ogT +ogT aUL jTR -pQg +pKV vzW lUh qyL @@ -59062,8 +61203,8 @@ qyL bdP lJv qJY -uTr -uTr +ogT +ogT maa bFR maa @@ -59243,7 +61384,7 @@ qJU aCy kfn maa -uTr +ogT nMe bwE rVd @@ -59437,10 +61578,10 @@ qJU byt maa pQQ -uTr +ogT mJc nxf -pQg +sDJ pyy lUh qyL @@ -59448,7 +61589,7 @@ vgA vgA kWJ twL -bAu +oWx giF vOo uTr @@ -59631,9 +61772,9 @@ qJU byt rDe maa -uTr -vEN -fnJ +ogT +lUE +cDX pQg xfa lUh @@ -59643,8 +61784,8 @@ vgA qyL rwP mHc -cVc -uTr +wVF +ogT pQQ maa maa @@ -59825,9 +61966,9 @@ qJU byt uTr uTr -uTr -ojQ -fnJ +ogT +xGj +cDX pQg lUh lUh @@ -59836,9 +61977,9 @@ qyL qyL tuO uJk -bAu -vsG -uTr +oWx +kta +ogT maa kfn maa @@ -60019,8 +62160,8 @@ blR byt maa kfn -uTr -ojQ +ogT +mER xwO pQg lUh @@ -60030,9 +62171,9 @@ lUh lUh lUh etr -bAu +oWx prV -uTr +ogT maa byt byt @@ -60213,9 +62354,9 @@ blR byt maa sIg -uTr -ojQ -fnJ +ogT +aiX +jfK hlO hgT hOF @@ -60224,9 +62365,9 @@ cvT mNK nlF xem -bAu -vsG -uTr +fqL +kta +ogT maa byt maa @@ -60407,7 +62548,7 @@ blR izR uTr uTr -uTr +ogT nuG khU vvR @@ -60418,9 +62559,9 @@ bLW kiK tGh bwp -qek -xpv -uTr +mZA +mpa +ogT byt byt kfn @@ -60601,8 +62742,8 @@ blR byt xFb qZT -uTr -uTr +ogT +ogT wWq wWq wWq @@ -60614,7 +62755,7 @@ wWq wWq wWq wWq -uTr +ogT izR uTr uTr @@ -62161,13 +64302,13 @@ ieh xhP ttX mik -ttX +epQ sbG -ieh -ieh +gGU +gGU oqO -ieh -ieh +gGU +gGU qKj ilM qLk @@ -62351,13 +64492,13 @@ iif iif iif iif -iif +wyH fpW qhn jFO qhn iif -cYi +pcl heD heD heD @@ -62753,7 +64894,7 @@ vrC tNT ubJ umn -hai +gLF hai hai hai @@ -62947,7 +65088,7 @@ hIR xxd ubJ oxf -hai +gLF hai hai hai diff --git a/maps/endeavour/levels/deck2.dmm b/maps/endeavour/levels/deck2.dmm index 87efbac84b64..ffcc3a9988ef 100644 --- a/maps/endeavour/levels/deck2.dmm +++ b/maps/endeavour/levels/deck2.dmm @@ -47,12 +47,6 @@ /area/rnd/xenobiology) "abW" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "acc" = ( @@ -297,6 +291,10 @@ /obj/structure/cable/orange{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "ajj" = ( @@ -388,6 +386,9 @@ /obj/effect/floor_decal/corner/navgold/bordercorner{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "anx" = ( @@ -407,26 +408,23 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/station/docks) "anF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/machinery/holopad, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "aoi" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/orange{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/tiled, @@ -484,8 +482,8 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) @@ -525,6 +523,9 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "arw" = ( @@ -553,6 +554,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "arY" = ( @@ -600,42 +604,55 @@ /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "aua" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "auq" = ( /obj/machinery/door/firedoor/glass{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/medical{ autoclose = 0; - frequency = 1378; + frequency = 1379; icon_state = "door_locked"; - id_tag = "virology_airlock_east_exterior"; + id_tag = "virology_airlock_fore_exterior"; locked = 1; - name = "Virology Exterior Airlock"; + name = "Virology Fore Exterior Airlock"; req_one_access = null }, -/obj/map_helper/access_helper/airlock/station/medical/virology, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/access_button{ + command = "cycle_ext"; + frequency = 1379; + master_tag = "virology_airlock_fore"; + name = "Virology Access Button"; + req_access = list(39); + pixel_x = 32; + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/map_helper/access_helper/airlock/station/medical/virology, /turf/simulated/floor/tiled/white, /area/medical/virology_fore_access) "avn" = ( /obj/structure/bed/chair/office/light{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/xenobiology) "avB" = ( @@ -711,6 +728,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/medical/virology_fore_access) "axP" = ( @@ -754,6 +772,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/medical/reception) "azK" = ( @@ -972,15 +991,19 @@ /turf/simulated/floor/wood, /area/rnd/breakroom) "aGC" = ( -/obj/structure/cable/green{ +/obj/machinery/light, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/orange{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d2portamidhall) "aHb" = ( /obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/borderfloorwhite{ @@ -1076,6 +1099,9 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "aJg" = ( @@ -1155,6 +1181,9 @@ /obj/effect/floor_decal/corner/navblue/bordercorner{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2fwdhall) "aNu" = ( @@ -1216,18 +1245,14 @@ /obj/machinery/door/firedoor/glass{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 4 - }, /obj/machinery/door/airlock/medical{ - name = "Virology Labs"; + name = "Medical Response Shuttle Dock"; req_one_access = null }, /obj/map_helper/access_helper/airlock/station/medical/department, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled/white, /area/hallway/station/docks) "aPL" = ( @@ -1323,8 +1348,6 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) "aUs" = ( -/obj/effect/paint/purplegray, -/obj/machinery/door/firedoor, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/map_helper/electrochromatic_linker{ id = "research-outer" @@ -1343,6 +1366,9 @@ "aVd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "aVr" = ( @@ -1386,6 +1412,9 @@ /obj/machinery/door/firedoor, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "aYX" = ( @@ -1540,16 +1569,21 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) -"bfx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +"bfw" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, +/turf/simulated/floor/plating, +/area/maintenance/substation/medical_science) +"bfx" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "bfE" = ( @@ -1703,6 +1737,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/xenobiology) "bjg" = ( @@ -1798,6 +1833,9 @@ req_one_access = null }, /obj/map_helper/access_helper/airlock/station/science/xenoarcheology, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) "bkX" = ( @@ -1846,6 +1884,14 @@ "bmg" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/cafeteria) +"bmQ" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/maintenance/research) "bnr" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 5 @@ -1892,6 +1938,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "bqS" = ( @@ -2018,16 +2067,8 @@ /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) "byX" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d2portforhall) "bzj" = ( /obj/structure/shuttle/engine/heater{ dir = 8 @@ -2047,6 +2088,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/rnd/research/researchdivision) "bzR" = ( @@ -2131,17 +2173,17 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/medical_restroom) "bBg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/structure/disposalpipe/segment{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardafthall) +/area/endeavour/hallway/d2afthall) "bBu" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -2282,6 +2324,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology) "bEz" = ( @@ -2342,17 +2387,20 @@ /turf/simulated/floor/carpet/tealcarpet, /area/medical/patient_c) "bFI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 + dir = 4 }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portafthall) +/area/endeavour/hallway/d1starboardamidhall) "bFP" = ( /obj/machinery/light{ dir = 4 @@ -2419,6 +2467,12 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "bHs" = ( @@ -2561,12 +2615,6 @@ /turf/simulated/floor/tiled, /area/medical/virology_fore_access) "bJO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -2616,6 +2664,7 @@ req_access = list(29,47); req_one_access = list(47) }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "bMe" = ( @@ -2685,8 +2734,22 @@ "bOa" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) +"bOb" = ( +/obj/effect/floor_decal/industrial/warning/full, +/obj/structure/lattice, +/obj/structure/disposalpipe/down{ + dir = 2 + }, +/turf/simulated/open, +/area/maintenance/substation/medical_science) "bOw" = ( /obj/structure/toilet{ dir = 1 @@ -2712,6 +2775,12 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "bPH" = ( @@ -2733,6 +2802,16 @@ /obj/machinery/transhuman/resleever, /turf/simulated/floor/tiled/techfloor, /area/assembly/robotics) +"bPJ" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "bPO" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -2808,12 +2887,6 @@ /turf/simulated/floor/tiled/dark, /area/rnd/research/researchdivision) "bSI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/structure/cable/green{ icon_state = "4-8" @@ -2965,9 +3038,6 @@ icon_state = "4-8" }, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, @@ -3070,20 +3140,25 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "bZX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass, /obj/structure/cable/green{ icon_state = "4-10" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "cac" = ( @@ -3216,12 +3291,14 @@ /turf/simulated/wall/prepainted/medical, /area/medical/exam_room/exam_1) "ceq" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "ces" = ( @@ -3318,11 +3395,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/navgold/bordercorner, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "cgs" = ( @@ -3352,14 +3428,13 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "ciZ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/effect/floor_decal/steeldecal/steel_decals_central7, /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "cja" = ( @@ -3405,14 +3480,24 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "ckH" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "ckP" = ( @@ -3497,12 +3582,6 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "cmT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "1-8" }, @@ -3541,6 +3620,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/breakroom) "coH" = ( @@ -3684,17 +3764,12 @@ /turf/simulated/floor/airless/ceiling, /area/tether/station/public_meeting_room) "cse" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portafthall) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "csf" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -3702,8 +3777,11 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 4 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) @@ -3758,6 +3836,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "cuE" = ( @@ -3791,17 +3872,11 @@ /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2portafthall) "cvh" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portforhall) +/area/rnd/hallway) "cvB" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 5 @@ -3871,6 +3946,12 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "cxJ" = ( @@ -4015,20 +4096,18 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2fwdhall) "cCK" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 + dir = 8 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portamidhall) +/area/rnd/hallway) "cDA" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -4145,6 +4224,9 @@ /obj/item/newspaper{ pixel_y = 3 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/medical/virology_fore_access) "cFH" = ( @@ -4231,6 +4313,7 @@ /obj/effect/floor_decal/corner/navblue/bordercorner{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "cIp" = ( @@ -4276,14 +4359,18 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "cLg" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "cLl" = ( @@ -4323,6 +4410,12 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "cNf" = ( @@ -4522,14 +4615,11 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay3) "cTm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) @@ -4592,7 +4682,6 @@ pixel_y = -2 }, /obj/structure/disposalpipe/trunk, -/obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/reception) "cVs" = ( @@ -4643,6 +4732,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/map_helper/access_helper/airlock/station/science/department, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/hallway) "cYX" = ( @@ -4856,6 +4946,12 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "dic" = ( @@ -4922,11 +5018,8 @@ /obj/structure/cable/green{ 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 = 8 }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) @@ -4947,15 +5040,14 @@ /turf/simulated/floor/wood, /area/endeavour/hallway/d2afthall) "dly" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1starboardamidhall) "dlB" = ( @@ -5007,15 +5099,15 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "dnZ" = ( /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2portamidhall) "doi" = ( @@ -5066,9 +5158,6 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/machinery/air_alarm{ pixel_y = 22 }, @@ -5304,6 +5393,15 @@ }, /turf/simulated/floor/tiled/white, /area/medical/reception) +"dxN" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "dyp" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -5323,15 +5421,13 @@ /turf/simulated/floor/plating, /area/maintenance/medbay/aft) "dyM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "dyQ" = ( @@ -5373,11 +5469,11 @@ /turf/simulated/floor/tiled, /area/teleporter/departing) "dzq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) @@ -5448,6 +5544,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/rnd/chemistry_lab) "dAV" = ( @@ -5464,6 +5561,14 @@ }, /turf/simulated/floor/wood/sif/indoors, /area/medical/reception) +"dBE" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/babyblue, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/medical/reception) "dCW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 8 @@ -5487,15 +5592,10 @@ /turf/simulated/floor/tiled/white, /area/medical/virology) "dEb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "dEc" = ( @@ -5541,6 +5641,13 @@ /obj/structure/table/standard, /turf/simulated/floor/tiled/white, /area/medical/virologyisolation) +"dFs" = ( +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d1starboardafthall) "dGi" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -5647,12 +5754,6 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "dIV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -5678,9 +5779,10 @@ /turf/simulated/floor/carpet/bcarpet, /area/endeavour/hallway/d2afthall) "dJW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/xenobiology) "dKK" = ( @@ -5764,11 +5866,14 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) @@ -5963,7 +6068,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/structure/bed/chair{ +/obj/structure/bed/chair/bay/shuttle{ dir = 4 }, /obj/machinery/light{ @@ -6013,6 +6118,9 @@ /obj/structure/cable/green, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "dUW" = ( @@ -6089,12 +6197,12 @@ /turf/simulated/floor/grass/indoors, /area/tether/station/public_meeting_room) "dXL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "dXU" = ( @@ -6262,14 +6370,18 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/medical/reception) "eaK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "ebF" = ( @@ -6325,6 +6437,7 @@ /obj/structure/cable/orange{ icon_state = "6-9" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d2fwdmaint) "ecY" = ( @@ -6381,6 +6494,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "eew" = ( @@ -6412,15 +6528,23 @@ /turf/simulated/floor/tiled/dark, /area/rnd/research/researchdivision) "efc" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portamidhall) +/area/endeavour/hallway/d1starboardamidhall) "eff" = ( /obj/structure/table/steel_reinforced, /obj/item/storage/box/traumainjectors, @@ -6454,6 +6578,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "efL" = ( @@ -6576,6 +6703,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/substation/medical_science) "eiO" = ( @@ -6633,6 +6761,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "ejy" = ( @@ -6790,6 +6919,10 @@ /turf/simulated/floor/tiled/white, /area/medical/virology_aft_access) "eoT" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1starboardafthall) "epc" = ( @@ -6827,6 +6960,7 @@ "eqt" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/item/paper_bin, +/obj/effect/paint/babyblue, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "eqA" = ( @@ -6884,6 +7018,9 @@ /area/endeavour/hallway/d2portafthall) "etB" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) "etN" = ( @@ -6940,9 +7077,17 @@ }, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1starboardamidhall) +"exm" = ( +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d1starboardafthall) "exs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/substation/medical_science) "eyb" = ( @@ -6963,8 +7108,8 @@ "eyM" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, /turf/simulated/floor/tiled, /area/rnd/hallway) @@ -7051,8 +7196,12 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "eBA" = ( @@ -7083,8 +7232,8 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/junction/yjunction{ - dir = 1 +/obj/structure/disposalpipe/junction{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) @@ -7104,12 +7253,18 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) "eDF" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/green/border, /obj/machinery/holoplant, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/medical/virology_fore_access) "eDX" = ( @@ -7196,11 +7351,13 @@ /turf/simulated/floor/tiled, /area/medical/resleeving) "eHd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "eHm" = ( @@ -7211,6 +7368,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/navgold/bordercorner, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "eHS" = ( @@ -7287,6 +7447,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "eKi" = ( @@ -7375,8 +7538,7 @@ "eMZ" = ( /obj/structure/disposalpipe/up, /obj/effect/floor_decal/industrial/warning/full, -/obj/structure/lattice, -/turf/simulated/open, +/turf/simulated/floor/plating, /area/maintenance/substation/medical_science) "eNH" = ( /obj/structure/cable/green{ @@ -7406,16 +7568,18 @@ /area/assembly/robotics) "eOX" = ( /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "ePI" = ( /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d2aftmaint) "ePT" = ( @@ -7434,6 +7598,9 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/wood, /area/endeavour/hallway/d2afthall) "eQr" = ( @@ -7502,15 +7669,12 @@ /area/medical/psych/psych_1) "eSw" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "eSQ" = ( @@ -7548,10 +7712,7 @@ /turf/simulated/floor/tiled, /area/rnd/research_foyer) "eUd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/tiled/dark, @@ -7679,11 +7840,8 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "eXR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) @@ -7705,7 +7863,6 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled/white, /area/medical/exam_room/exam_1) "eYj" = ( @@ -7737,6 +7894,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/rdoffice) +"eYA" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portforhall) "eYK" = ( /turf/simulated/wall/prepainted, /area/maintenance/fpmaint2) @@ -7759,9 +7928,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/structure/disposalpipe/junction{ - dir = 4 - }, +/obj/structure/disposalpipe/junction/yjunction, /turf/simulated/floor/tiled/white, /area/medical/reception) "eZl" = ( @@ -7830,6 +7997,14 @@ }, /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/xenobiology) +"fae" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/rnd/hallway) "fby" = ( /obj/machinery/holopad, /obj/structure/disposalpipe/segment{ @@ -7837,6 +8012,14 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"fbF" = ( +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/maintenance/research) "fbI" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ @@ -7951,6 +8134,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "ffI" = ( @@ -8101,6 +8287,7 @@ /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/research) "fmm" = ( @@ -8157,8 +8344,6 @@ /turf/simulated/wall/prepainted/medical, /area/medical/psych/psych_1) "foz" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/holopad, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) @@ -8176,6 +8361,12 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "fpV" = ( @@ -8349,8 +8540,11 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 4 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) @@ -8487,11 +8681,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardafthall) +/area/rnd/anomaly_lab) "fBP" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -8529,6 +8724,9 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2fwdhall) "fCE" = ( @@ -8559,6 +8757,9 @@ /obj/machinery/fire_alarm/south_mount, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "fDP" = ( @@ -8645,6 +8846,13 @@ /obj/structure/cable/orange{ icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "fHl" = ( @@ -8835,6 +9043,9 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "fLZ" = ( @@ -8879,6 +9090,10 @@ "fMC" = ( /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/navblue/bordercorner, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2fwdhall) "fNb" = ( @@ -9065,6 +9280,18 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/virology_aft_access) +"fRh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/chemistry_lab) "fRk" = ( /obj/machinery/camera/network/medbay{ dir = 8 @@ -9080,14 +9307,14 @@ /turf/simulated/floor/tiled, /area/medical/virology_aft_access) "fRp" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, /turf/simulated/floor/tiled, -/area/rnd/hallway) +/area/endeavour/hallway/d1starboardforhall) "fRq" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -9138,6 +9365,12 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "fTn" = ( @@ -9232,20 +9465,16 @@ /turf/simulated/floor/tiled/white, /area/rnd/chemistry_lab) "fVs" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/mauve/bordercorner, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 8 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portforhall) +/area/rnd/hallway) "fVX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -9258,6 +9487,21 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) +"fVY" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "fWa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -9306,6 +9550,9 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/wood, /area/tether/station/public_meeting_room) "fXo" = ( @@ -9315,15 +9562,11 @@ /turf/simulated/floor/tiled, /area/medical/virology_fore_access) "fYZ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "fZo" = ( @@ -9384,10 +9627,20 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virology_aft_access) +"gaG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardforhall) "gaO" = ( /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "gbN" = ( @@ -9401,15 +9654,12 @@ /area/endeavour/hallway/d1starboardamidhall) "gbY" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "gck" = ( @@ -9523,9 +9773,6 @@ pixel_x = -5; pixel_y = -1 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/rnd/xenobiology) "ggO" = ( @@ -9554,9 +9801,9 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/tiled, @@ -9571,6 +9818,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/research) "giU" = ( @@ -9620,15 +9868,13 @@ /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "gkX" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardafthall) +/area/rnd/hallway) "glw" = ( /obj/machinery/camera/network/medbay{ dir = 1 @@ -9729,6 +9975,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/xenobiology) "goI" = ( @@ -9791,6 +10038,7 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2fwdhall) "gqW" = ( @@ -9835,7 +10083,6 @@ /turf/simulated/floor/tiled/white, /area/medical/exam_room/exam_2) "gsh" = ( -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -9843,8 +10090,8 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) @@ -9969,6 +10216,12 @@ /obj/machinery/computer/timeclock/premade/south, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "gwr" = ( @@ -10006,17 +10259,15 @@ /turf/simulated/floor/tiled/white, /area/medical/chemistry) "gxR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 +/obj/structure/cable/orange{ + icon_state = "1-2" }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 1 +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardafthall) +/area/endeavour/hallway/d2afthall) "gyu" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass, @@ -10069,17 +10320,18 @@ /turf/simulated/floor/wood, /area/endeavour/hallway/d2afthall) "gAn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) +"gAp" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d2fwdmaint) "gAs" = ( /obj/machinery/door/window/westleft{ req_one_access = list(5) @@ -10098,21 +10350,19 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 4 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "gAW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 - }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "gBj" = ( @@ -10155,6 +10405,10 @@ req_access = list(29,47); req_one_access = list(47) }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/techfloor, /area/assembly/robotics) "gCd" = ( @@ -10250,6 +10504,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/substation/medical_science) "gGo" = ( @@ -10317,12 +10572,7 @@ /turf/simulated/wall/prepainted/medical, /area/medical/virology_aft_access) "gHJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "gIr" = ( @@ -10442,11 +10692,6 @@ /obj/machinery/door/firedoor/glass{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/door/airlock/research{ id_tag = "researchdoor"; name = "R&D Distribution Area" @@ -10532,6 +10777,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "gOT" = ( @@ -10575,11 +10821,10 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) @@ -10700,14 +10945,21 @@ /area/assembly/robotics/surgery) "gSJ" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "gSR" = ( @@ -10751,6 +11003,7 @@ id = "mechbay"; name = "Mech Bay" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/old_cargo/gray, /area/assembly/robotics) "gVZ" = ( @@ -10796,6 +11049,7 @@ /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "gXq" = ( @@ -10905,12 +11159,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "hbZ" = ( @@ -10949,10 +11198,10 @@ /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "hdr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/machinery/holopad, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "hdR" = ( @@ -10988,6 +11237,12 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "hff" = ( @@ -11015,9 +11270,6 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/effect/floor_decal/borderfloorblack/corner{ dir = 8 }, @@ -11054,6 +11306,12 @@ /obj/effect/paint/babyblue, /turf/simulated/floor/tiled, /area/medical/resleeving) +"hhK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) "hhW" = ( /obj/machinery/papershredder, /obj/machinery/air_alarm{ @@ -11206,11 +11464,14 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "hln" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + dir = 4 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) @@ -11442,11 +11703,15 @@ /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1starboardafthall) "hpi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "5-10" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "hpo" = ( @@ -11497,6 +11762,21 @@ /obj/machinery/fitness/punching_bag/clown, /turf/simulated/floor/plating, /area/maintenance/medbay/aft) +"hqn" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "hqs" = ( /obj/machinery/camera/network/medbay, /obj/machinery/light{ @@ -11596,6 +11876,7 @@ name = "Infectious Diseases" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/medical/virology_fore_access) "huG" = ( @@ -11604,6 +11885,19 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) +"huH" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardamidhall) "huR" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -11717,6 +12011,12 @@ /obj/effect/floor_decal/corner/mauve/bordercorner{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "hyR" = ( @@ -11802,6 +12102,15 @@ }, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2afthall) +"hBL" = ( +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "hBM" = ( /obj/machinery/door/firedoor/glass, /obj/map_helper/access_helper/airlock/station/medical/department, @@ -12004,6 +12313,23 @@ }, /turf/simulated/floor/wood, /area/tether/station/public_meeting_room) +"hGm" = ( +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/navblue/bordercorner, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/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/endeavour/hallway/d2portamidhall) "hGF" = ( /obj/effect/floor_decal/borderfloorblack/corner{ dir = 4 @@ -12011,12 +12337,19 @@ /obj/effect/floor_decal/corner/navgold/bordercorner{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2fwdhall) "hGK" = ( /obj/machinery/door/firedoor, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "hHa" = ( @@ -12027,6 +12360,10 @@ /obj/map_helper/access_helper/airlock/station/science/department, /turf/simulated/floor/plating, /area/assembly/chargebay) +"hHg" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/maintenance/substation/medical_science) "hHI" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -12091,9 +12428,6 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "hLb" = ( @@ -12227,6 +12561,13 @@ /obj/map_helper/access_helper/airlock/station/medical/psychiatry, /turf/simulated/floor/plating, /area/medical/psych/psych_1) +"hPV" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/maintenance/medbay/aft) "hQw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 @@ -12308,6 +12649,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "hTw" = ( @@ -12409,17 +12753,13 @@ /turf/simulated/floor/tiled/white, /area/medical/resleeving) "hYp" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/mauve/border{ +/obj/machinery/light, +/obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/disposalpipe/segment{ dir = 8 }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "hZk" = ( /obj/structure/bed/chair/sofa/black/right{ dir = 1 @@ -12485,14 +12825,14 @@ /turf/simulated/floor/wood/sif/indoors, /area/medical/reception) "icI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/light{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 8 }, -/obj/machinery/light{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1starboardamidhall) @@ -12576,14 +12916,15 @@ /turf/simulated/floor/wood, /area/tether/station/public_meeting_room) "iez" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardforhall) +/area/rnd/research/researchdivision) "ieG" = ( /obj/structure/window/reinforced{ dir = 1 @@ -12613,15 +12954,15 @@ /turf/simulated/wall/prepainted, /area/endeavour/hallway/d1starboardforhall) "ifz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "ifA" = ( @@ -12880,12 +13221,6 @@ /area/medical/virologymaint) "ioD" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "ioE" = ( @@ -13076,7 +13411,6 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 8 }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/rnd/chemistry_lab) "ivz" = ( @@ -13093,6 +13427,12 @@ }, /obj/machinery/holopad, /obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "ivK" = ( @@ -13101,6 +13441,18 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) +"iwJ" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "ixo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -13120,6 +13472,9 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology) "ixI" = ( @@ -13134,8 +13489,14 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "ixQ" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -13144,7 +13505,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardafthall) +/area/endeavour/hallway/d1starboardamidhall) "iym" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/beige/border, @@ -13192,6 +13553,12 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "iyW" = ( @@ -13339,6 +13706,21 @@ }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) +"iBK" = ( +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "iBU" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -13382,6 +13764,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/medical/virology_fore_access) "iFi" = ( @@ -13440,9 +13823,6 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, @@ -13491,11 +13871,14 @@ /turf/simulated/floor/tiled/dark, /area/assembly/robotics/surgery) "iIQ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "iIR" = ( @@ -13570,7 +13953,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/white, /area/shuttle/emt/general) "iMe" = ( /obj/machinery/portable_atmospherics/hydroponics, @@ -13587,6 +13970,7 @@ /obj/structure/cable/orange{ icon_state = "2-9" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d2fwdmaint) "iNo" = ( @@ -13632,17 +14016,20 @@ /turf/simulated/floor/carpet/tealcarpet, /area/medical/patient_c) "iPf" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/rnd/hallway) +/area/endeavour/hallway/d1starboardamidhall) "iPr" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -13751,6 +14138,12 @@ /obj/effect/floor_decal/borderfloorblack{ 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/endeavour/hallway/d1starboardamidhall) "iTl" = ( @@ -13956,6 +14349,9 @@ /area/rnd/workshop) "jaG" = ( /obj/machinery/holopad, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1starboardafthall) "jbC" = ( @@ -14124,6 +14520,17 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) +"jhM" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/babyblue, +/obj/machinery/atmospherics/pipe/simple/hidden/red{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/medical/virology) "jin" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -14208,11 +14615,16 @@ /area/medical/medbay_primary_storage) "jlX" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/hallway) "jlY" = ( @@ -14277,17 +14689,12 @@ /turf/simulated/floor/tiled, /area/medical/surgery) "jor" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/mauve/border{ +/obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "joM" = ( /obj/structure/table/steel, /obj/fiftyspawner/steel, @@ -14365,6 +14772,9 @@ dir = 9 }, /obj/effect/floor_decal/corner/mauve/bordercorner, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/assembly/robotics) "jsq" = ( @@ -14406,15 +14816,18 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/rdoffice) "jsQ" = ( -/obj/machinery/light, -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "jsT" = ( @@ -14446,12 +14859,6 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "jtH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/effect/floor_decal/borderfloorblack/corner{ dir = 1 }, @@ -14461,6 +14868,11 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "jue" = ( @@ -14526,15 +14938,15 @@ /turf/simulated/floor/tiled/white, /area/holodeck_control) "jvO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorblack{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "jwd" = ( @@ -14666,6 +15078,12 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "jAz" = ( @@ -14852,6 +15270,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "jGK" = ( @@ -14925,6 +15346,7 @@ "jKh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2portamidhall) "jKw" = ( @@ -14980,12 +15402,6 @@ /obj/machinery/door/firedoor{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "4-10" }, @@ -15073,6 +15489,9 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/robotics/morgue) "jPR" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "jPU" = ( @@ -15183,15 +15602,18 @@ /turf/simulated/floor/wood, /area/medical/psych/psych_1) "jTr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "jTt" = ( @@ -15231,11 +15653,8 @@ /obj/structure/cable/green{ 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 = 8 }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) @@ -15287,6 +15706,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "jWy" = ( @@ -15302,25 +15724,24 @@ /obj/effect/floor_decal/corner/navgold/bordercorner2{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "jXi" = ( -/obj/machinery/door/firedoor/glass{ +/obj/machinery/door/firedoor/glass, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/machinery/door/airlock/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/research{ - id_tag = "researchdoor"; - name = "R&D Distribution Area" - }, -/obj/map_helper/access_helper/airlock/station/science/robotics, -/turf/simulated/floor/tiled/dark, -/area/rnd/research/researchdivision) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/medical/reception) "jYo" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -15467,6 +15888,9 @@ /obj/effect/floor_decal/corner/navgold/border, /obj/effect/floor_decal/borderfloorblack/corner2, /obj/effect/floor_decal/corner/navgold/bordercorner2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "keo" = ( @@ -15503,17 +15927,15 @@ /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) "kff" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/structure/disposalpipe/segment{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portafthall) +/area/rnd/hallway) "kfr" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -15584,7 +16006,6 @@ /area/medical/patient_d) "kgB" = ( /obj/machinery/fire_alarm/north_mount, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -15614,6 +16035,9 @@ /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/green/border, /obj/structure/reagent_dispensers/water_cooler/full, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/medical/virology_fore_access) "khL" = ( @@ -15681,14 +16105,18 @@ /turf/simulated/floor/tiled/white, /area/medical/resleeving) "kjZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "kkr" = ( @@ -15792,14 +16220,19 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/hallway) "koa" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/tiled/white, /area/medical/medbay4) "koj" = ( @@ -15816,6 +16249,16 @@ /obj/effect/floor_decal/corner/green/border, /turf/simulated/floor/tiled/white, /area/medical/virology_aft_access) +"kop" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/medical/surgeryprep) "kow" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -15847,15 +16290,18 @@ /area/medical/psych_ward) "kpO" = ( /obj/machinery/camera/network/civilian, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "kqx" = ( @@ -15893,20 +16339,17 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "ksR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/disposalpipe/segment{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portforhall) +/area/rnd/anomaly_lab) "ktj" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/portables_connector{ @@ -15960,6 +16403,12 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "kuF" = ( @@ -16024,8 +16473,8 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay3) "kwz" = ( -/obj/structure/bed/chair{ - dir = 1 +/obj/structure/bed/chair/bay/shuttle{ + dir = 4 }, /obj/machinery/light, /obj/machinery/power/apc/south_mount, @@ -16064,22 +16513,19 @@ /obj/structure/cable/green{ 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 = 8 }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "kyy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/tiled, @@ -16109,19 +16555,16 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "kzS" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -16147,10 +16590,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) @@ -16159,6 +16599,9 @@ /obj/structure/cable/orange{ icon_state = "6-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "kCt" = ( @@ -16191,8 +16634,8 @@ /turf/simulated/floor/carpet/bcarpet, /area/endeavour/hallway/d2afthall) "kDA" = ( -/obj/structure/bed/chair{ - dir = 1 +/obj/structure/bed/chair/bay/shuttle{ + dir = 4 }, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -16234,8 +16677,11 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 4 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) @@ -16289,22 +16735,21 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) "kJo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "kJt" = ( -/obj/structure/bed/chair, +/obj/structure/bed/chair/bay/shuttle{ + dir = 4 + }, /obj/machinery/light{ dir = 1 }, @@ -16317,25 +16762,18 @@ /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) "kJE" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" + dir = 8 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardamidhall) +/area/rnd/hallway) "kJL" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -16463,6 +16901,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/medical/reception) "kOr" = ( @@ -16578,6 +17017,14 @@ }, /turf/simulated/floor/wood, /area/endeavour/hallway/d2afthall) +"kTn" = ( +/obj/machinery/door/airlock/glass, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/station/public_meeting_room) "kTq" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -16622,6 +17069,12 @@ /obj/effect/floor_decal/corner/navgold/bordercorner{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "kUk" = ( @@ -16634,6 +17087,12 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "kUn" = ( @@ -16739,6 +17198,9 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "kVK" = ( @@ -16791,12 +17253,15 @@ "kXE" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "kYs" = ( @@ -16904,6 +17369,10 @@ "las" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) "lay" = ( @@ -16925,6 +17394,10 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "laM" = ( @@ -17030,6 +17503,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/hallway) "leM" = ( @@ -17156,12 +17630,10 @@ /turf/simulated/floor/reinforced, /area/rnd/testingroom) "lkA" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portforhall) +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/maintenance/research) "lkB" = ( /obj/machinery/photocopier, /turf/simulated/floor/wood, @@ -17229,6 +17701,9 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "log" = ( @@ -17241,6 +17716,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/xenobiology) "loA" = ( @@ -17365,16 +17841,10 @@ }, /obj/map_helper/airlock/door/ext_door, /obj/map_helper/access_helper/airlock/station/medical/department, -/obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) "lrS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/rnd/hallway) "lst" = ( @@ -17422,15 +17892,13 @@ /turf/simulated/floor, /area/shuttle/emt/general) "ltx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "ltM" = ( @@ -17458,11 +17926,15 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/mauve/bordercorner{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "luz" = ( @@ -17498,7 +17970,8 @@ /area/medical/medbay3) "luF" = ( /obj/structure/disposalpipe/segment{ - dir = 1 + dir = 8; + icon_state = "pipe-c" }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) @@ -17539,18 +18012,15 @@ /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) "lyl" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/corner/mauve/border{ + dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portafthall) +/area/rnd/research/researchdivision) "lyv" = ( /obj/machinery/atmospherics/component/binary/pump{ name = "main fuel pump" @@ -17580,14 +18050,6 @@ /obj/effect/floor_decal/corner/green/bordercorner2{ dir = 6 }, -/obj/machinery/access_button{ - command = "cycle_ext"; - frequency = 1379; - master_tag = "virology_airlock_control"; - name = "Virology Access Button"; - req_access = list(39); - pixel_x = 25 - }, /turf/simulated/floor/tiled/white, /area/medical/virology) "lza" = ( @@ -17778,6 +18240,9 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "lEi" = ( @@ -17811,6 +18276,12 @@ /obj/machinery/door/airlock/glass, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "lFS" = ( @@ -17841,6 +18312,7 @@ /obj/map_helper/access_helper/airlock/station/science/department, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/hallway) "lGE" = ( @@ -17975,7 +18447,9 @@ dir = 10 }, /obj/machinery/disposal, -/obj/item/barrier_tape_segment/engineering, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/virology_fore_access) "lLM" = ( @@ -18076,14 +18550,14 @@ /area/medical/virology) "lSb" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 6 }, -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) @@ -18117,7 +18591,6 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/wood, /area/medical/oncall_room) "lSq" = ( @@ -18139,17 +18612,16 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay3) "lTi" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 + dir = 8 }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardafthall) +/area/rnd/hallway) "lTq" = ( /obj/machinery/door/firedoor, /obj/structure/cable/green{ @@ -18169,6 +18641,12 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "lTx" = ( @@ -18409,6 +18887,7 @@ /obj/structure/cable/orange{ icon_state = "2-8" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d2aftmaint) "mft" = ( @@ -18453,7 +18932,6 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled/steel_grid, /area/rnd/reception_desk) "mhn" = ( @@ -18476,10 +18954,11 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "miA" = ( @@ -18577,12 +19056,6 @@ /turf/simulated/floor/carpet/bcarpet, /area/endeavour/hallway/d2afthall) "mnP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -18714,6 +19187,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/wood, /area/rnd/breakroom) "mqU" = ( @@ -18801,16 +19278,28 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/medical/chemistry) +"mtT" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/white, +/area/medical/surgeryprep) "mut" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portforhall) +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2fwdhall) "muS" = ( /obj/machinery/computer/shuttle_control/explore/emt{ dir = 8 @@ -18860,6 +19349,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2portamidhall) "mxu" = ( @@ -18943,7 +19435,6 @@ frequency = 1380 }, /obj/map_helper/access_helper/airlock/station/medical/department, -/obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) "mzF" = ( @@ -19007,8 +19498,6 @@ /turf/simulated/floor/tiled, /area/rnd/research_foyer) "mAv" = ( -/obj/effect/paint/purplegray, -/obj/machinery/door/firedoor, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/map_helper/electrochromatic_linker{ id = "robotics-outer" @@ -19029,9 +19518,10 @@ /turf/simulated/floor/tiled/white, /area/medical/virology) "mBm" = ( -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/structure/disposalpipe/up{ + dir = 8 }, +/obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/plating, /area/maintenance/substation/medical_science) "mCN" = ( @@ -19070,6 +19560,12 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "mEE" = ( @@ -19148,15 +19644,9 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "mFT" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "mGl" = ( @@ -19183,6 +19673,9 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2afthall) "mHV" = ( @@ -19413,10 +19906,13 @@ "mOb" = ( /obj/machinery/door/firedoor, /obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 + dir = 4 }, -/obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "mOd" = ( @@ -19454,12 +19950,6 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/cafeteria) "mPv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, @@ -19515,8 +20005,8 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) @@ -19525,7 +20015,9 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, -/obj/item/barrier_tape_segment/engineering, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/wood, /area/rnd/breakroom) "mRH" = ( @@ -19550,19 +20042,26 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "mSK" = ( /obj/machinery/computer/timeclock/premade/south, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "mTi" = ( @@ -19581,8 +20080,11 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) @@ -19660,6 +20162,9 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "mWk" = ( @@ -19692,17 +20197,14 @@ /turf/space, /area/space) "mXu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/effect/floor_decal/borderfloorblack{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/effect/floor_decal/corner/navblue/border{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portamidhall) +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d1starboardamidhall) "mXR" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -19795,6 +20297,12 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "nbH" = ( @@ -20013,18 +20521,15 @@ /turf/simulated/floor/wood/sif/indoors, /area/medical/reception) "ngB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "1-8" }, /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "ngD" = ( @@ -20113,6 +20618,7 @@ /obj/effect/floor_decal/corner/mauve/border, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/hallway) "nlb" = ( @@ -20183,15 +20689,13 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/station/docks) "nnv" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "nnJ" = ( @@ -20203,6 +20707,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "nok" = ( @@ -20274,16 +20779,11 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d2fwdhall) "nrZ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardafthall) +/area/rnd/hallway) "nsd" = ( /obj/machinery/portable_atmospherics/canister/phoron, /obj/machinery/camera/network/research{ @@ -20370,6 +20870,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "nvB" = ( @@ -20436,12 +20939,9 @@ /obj/machinery/door/firedoor{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "nxI" = ( @@ -20487,16 +20987,15 @@ /turf/simulated/floor/tiled/monotile, /area/medical/surgery2) "nyF" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardafthall) +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "nyR" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -20507,6 +21006,12 @@ /obj/effect/floor_decal/corner/navgold/bordercorner{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "nzx" = ( @@ -20551,9 +21056,9 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/effect/floor_decal/steeldecal/steel_decals_central7, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "nAQ" = ( @@ -20582,15 +21087,12 @@ /area/medical/medbay4) "nBm" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "nBn" = ( @@ -20633,17 +21135,13 @@ /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/xenobiology) "nBU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/structure/flora/pottedplant/stoutbush, +/obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardamidhall) +/turf/simulated/floor/wood, +/area/rnd/breakroom) "nBV" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -20661,6 +21159,10 @@ /obj/effect/floor_decal/corner/navblue/bordercorner{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "nCp" = ( @@ -20733,15 +21235,18 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "nEU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/effect/floor_decal/borderfloorblack/corner{ dir = 4 }, /obj/effect/floor_decal/corner/navgold/bordercorner{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "nFY" = ( @@ -20772,15 +21277,13 @@ /turf/simulated/floor/plating, /area/hallway/station/docks) "nGv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 - }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "nHj" = ( @@ -20820,18 +21323,15 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "nIP" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "nJj" = ( @@ -20889,6 +21389,9 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "nKq" = ( @@ -21034,6 +21537,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d2fwdmaint) "nMP" = ( @@ -21082,6 +21586,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "nOJ" = ( @@ -21179,6 +21686,9 @@ /obj/effect/floor_decal/corner/navgold/bordercorner{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "nRx" = ( @@ -21194,6 +21704,9 @@ name = "Treatment Centre"; id_tag = "MedbayFoyerR" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/medical/reception) "nSz" = ( @@ -21313,6 +21826,7 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/medical/sleeper) "nXk" = ( @@ -21368,9 +21882,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/structure/disposalpipe/segment{ + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) @@ -21393,6 +21907,12 @@ "oaU" = ( /turf/simulated/wall/prepainted, /area/endeavour/hallway/d2afthall) +"oaZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/medbay/aft) "obi" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -21447,6 +21967,9 @@ /area/assembly/chargebay) "odm" = ( /obj/machinery/door/airlock/maintenance/common, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/medbay/aft) "oey" = ( @@ -21512,6 +22035,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "ogl" = ( @@ -21728,6 +22254,7 @@ }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/hallway) "omH" = ( @@ -21748,6 +22275,17 @@ }, /turf/simulated/floor/tiled/white, /area/medical/reception) +"onv" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) "onD" = ( /obj/structure/cable{ icon_state = "2-4" @@ -21778,6 +22316,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "ooU" = ( @@ -21955,8 +22496,6 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/robotics/morgue) "owo" = ( -/obj/effect/paint/purplegray, -/obj/machinery/door/firedoor, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/map_helper/electrochromatic_linker{ id = "research-inner" @@ -21972,6 +22511,9 @@ }, /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/navgold/bordercorner, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "owP" = ( @@ -22019,6 +22561,9 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "ozS" = ( @@ -22028,6 +22573,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/hallway) "oAr" = ( @@ -22081,6 +22627,9 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "oBL" = ( @@ -22104,6 +22653,10 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology) "oCg" = ( @@ -22157,6 +22710,10 @@ "oEp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "oEw" = ( @@ -22220,6 +22777,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "oGx" = ( @@ -22260,12 +22820,6 @@ /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "oGY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "1-4" }, @@ -22325,15 +22879,11 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay3) "oIp" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled, -/area/rnd/hallway) +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2fwdhall) "oIt" = ( /obj/structure/sink{ dir = 4; @@ -22375,10 +22925,7 @@ /area/rnd/anomaly_lab/containment_one) "oJk" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) @@ -22439,6 +22986,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/hallway) "oKz" = ( @@ -22461,6 +23009,9 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "oLc" = ( @@ -22528,11 +23079,12 @@ /turf/simulated/floor/tiled/white, /area/medical/virology) "oOa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "oOE" = ( @@ -22563,6 +23115,18 @@ /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/wood, /area/rnd/breakroom) +"oPc" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) "oQx" = ( /obj/structure/closet/hydrant{ pixel_x = -32 @@ -22602,10 +23166,10 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/tiled, @@ -22733,6 +23297,7 @@ "oVx" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/structure/bed/chair/office/dark, +/obj/effect/paint/babyblue, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "oWl" = ( @@ -22745,6 +23310,12 @@ /obj/effect/floor_decal/corner/navgold/bordercorner{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "oWr" = ( @@ -22846,6 +23417,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/assembly/robotics) +"oYe" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portforhall) "oYo" = ( /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 @@ -22853,6 +23436,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/medical/reception) "oYq" = ( @@ -22872,6 +23456,9 @@ "oYE" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "oZp" = ( @@ -23006,6 +23593,12 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "pbk" = ( @@ -23096,13 +23689,10 @@ /turf/simulated/floor/carpet/tealcarpet, /area/medical/patient_d) "peI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/holopad, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/holopad, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1starboardamidhall) "peR" = ( @@ -23126,15 +23716,12 @@ /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) "peU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1starboardamidhall) "pfe" = ( @@ -23171,6 +23758,14 @@ }, /turf/simulated/floor/wood, /area/endeavour/hallway/d2afthall) +"pfs" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/lattice, +/obj/structure/disposalpipe/down{ + dir = 4 + }, +/turf/simulated/open, +/area/maintenance/substation/medical_science) "pfz" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -23205,10 +23800,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "pgh" = ( @@ -23224,9 +23816,6 @@ /obj/machinery/computer/timeclock/premade/south, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "pgD" = ( @@ -23284,12 +23873,9 @@ /turf/simulated/floor/tiled/techfloor, /area/assembly/robotics) "phe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "phf" = ( @@ -23300,6 +23886,15 @@ /obj/item/clothing/glasses/welding, /turf/simulated/floor/tiled, /area/rnd/xenobiology) +"phm" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) "pho" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -23422,6 +24017,7 @@ icon_state = "0-4" }, /obj/machinery/power/terminal, +/obj/structure/catwalk, /turf/simulated/floor, /area/shuttle/emt/general) "plG" = ( @@ -23435,6 +24031,9 @@ /obj/machinery/door/firedoor, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2fwdhall) "pmG" = ( @@ -23503,6 +24102,7 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 10 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "poV" = ( @@ -23547,6 +24147,21 @@ }, /turf/simulated/floor/tiled, /area/rnd/hallway) +"ppu" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portforhall) "ppx" = ( /obj/structure/table/woodentable, /obj/effect/floor_decal/spline/fancy/wood{ @@ -23584,7 +24199,6 @@ /obj/effect/floor_decal/borderfloor/corner{ dir = 1 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/effect/floor_decal/corner/mauve/bordercorner{ dir = 1 }, @@ -23684,11 +24298,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) @@ -23699,8 +24310,20 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/hallway) +"ptB" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "ptZ" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -23782,14 +24405,15 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/medical_restroom) "pwN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/light{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardafthall) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "pwV" = ( /obj/item/radio/intercom/department/medbay{ dir = 1; @@ -23892,6 +24516,21 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologyisolation) +"pBC" = ( +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/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/endeavour/hallway/d2portamidhall) "pBG" = ( /obj/structure/closet/crate, /obj/item/grenade/chem_grenade, @@ -23985,6 +24624,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "pDh" = ( @@ -24007,16 +24647,16 @@ /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) "pDv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "pDw" = ( @@ -24078,18 +24718,20 @@ /area/medical/medbay4) "pFp" = ( /obj/machinery/holopad, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portafthall) -"pFq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 5 }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) +"pFq" = ( /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "pFA" = ( @@ -24244,6 +24886,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/research) "pJM" = ( @@ -24397,6 +25040,13 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/airless/ceiling, /area/tether/station/public_meeting_room) +"pPE" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) "pPO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -24504,7 +25154,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "pRS" = ( @@ -24534,6 +25186,7 @@ /area/tether/station/public_meeting_room) "pTw" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/babyblue, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "pTU" = ( @@ -24593,6 +25246,9 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "pUI" = ( @@ -24628,16 +25284,13 @@ /area/medical/medbay4) "pVB" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/cable/orange{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/door/airlock/glass, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "pVI" = ( @@ -24648,6 +25301,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/medbreak) +"pVT" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "pVZ" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -24895,7 +25557,6 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 6 }, -/obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled/white, /area/shuttle/emt/cockpit) "pZS" = ( @@ -24916,6 +25577,15 @@ "qak" = ( /turf/simulated/wall/r_wall/prepainted, /area/maintenance/medbay/aft) +"qam" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) "qan" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -24952,6 +25622,9 @@ /obj/machinery/light, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2fwdhall) "qbE" = ( @@ -24981,6 +25654,7 @@ /obj/machinery/camera/network/medbay{ dir = 5 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "qgi" = ( @@ -25050,6 +25724,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2fwdhall) "qhW" = ( @@ -25072,14 +25747,21 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) "qiy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "qiH" = ( @@ -25231,12 +25913,6 @@ /turf/simulated/floor/carpet/sblucarpet, /area/medical/psych/psych_2) "qmF" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "qmJ" = ( @@ -25323,6 +25999,18 @@ "qpQ" = ( /turf/simulated/wall/prepainted/science, /area/rnd/research_foyer_auxiliary) +"qqc" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/sortjunction/flipped{ + dir = 4; + name = "Robotics"; + sortType = "Robotics" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) "qqe" = ( /obj/structure/table/glass, /obj/machinery/button/remote/airlock{ @@ -25348,6 +26036,12 @@ /obj/machinery/vending/cigarette, /turf/simulated/floor/tiled, /area/holodeck_control) +"qqQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/substation/medical_science) "qrz" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/green/border, @@ -25387,6 +26081,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "qsP" = ( @@ -25399,6 +26094,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "qtF" = ( @@ -25468,7 +26164,9 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, /obj/machinery/disposal, -/obj/item/barrier_tape_segment/engineering, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/assembly/robotics) "qwk" = ( @@ -25537,15 +26235,12 @@ /turf/simulated/floor/plating, /area/medical/surgeryprep) "qxs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "qxt" = ( @@ -25557,6 +26252,9 @@ /obj/machinery/door/firedoor{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "qyg" = ( @@ -25565,6 +26263,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/xenobiology) "qyo" = ( @@ -25611,6 +26310,9 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "qyX" = ( @@ -25734,40 +26436,24 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "qCZ" = ( -/obj/structure/cable/green{ - 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/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 1 - }, -/obj/machinery/air_alarm{ - pixel_y = 23 + dir = 6 }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay4) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) "qDJ" = ( /obj/machinery/embedded_controller/radio/airlock/access_controller{ - id_tag = "virology_airlock_east"; - name = "Virology Access Console"; - tag_exterior_door = "virology_airlock_east_exterior"; - tag_interior_door = "virology_airlock_east_interior"; - pixel_y = -24; - frequency = 1378 + id_tag = "virology_airlock_fore"; + name = "Virology Fore Access Console"; + tag_exterior_door = "virology_airlock_fore_exterior"; + tag_interior_door = "virology_airlock_fore_interior"; + pixel_y = -24 }, /turf/simulated/floor/tiled, /area/medical/virology_fore_access) @@ -25810,6 +26496,9 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2fwdhall) "qEp" = ( @@ -25842,18 +26531,18 @@ /turf/simulated/floor/tiled/white, /area/medical/morgue) "qER" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) +"qEW" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) "qFa" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/purplegray, @@ -25885,6 +26574,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "qGj" = ( @@ -25910,6 +26600,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d2aftmaint) "qHA" = ( @@ -25940,13 +26631,13 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "qIn" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "qIo" = ( @@ -26041,7 +26732,7 @@ /turf/simulated/floor/tiled/dark, /area/assembly/robotics/surgery) "qKR" = ( -/obj/structure/bed/chair{ +/obj/structure/bed/chair/bay/shuttle{ dir = 4 }, /obj/machinery/button/remote/blast_door{ @@ -26067,20 +26758,19 @@ /turf/simulated/floor/tiled/white, /area/medical/virology_fore_access) "qLp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "qLs" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -26236,15 +26926,12 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/medical_restroom) "qRh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "qSj" = ( @@ -26459,11 +27146,13 @@ /turf/simulated/floor/wood, /area/medical/psych/psych_2) "qYt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "2-5" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/rnd/hallway) "qYx" = ( @@ -26659,6 +27348,9 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "rdw" = ( @@ -26701,6 +27393,9 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "reb" = ( @@ -26755,13 +27450,12 @@ dir = 4 }, /obj/machinery/door/airlock/medical{ - name = "Virology Labs"; + name = "Medical Response Shuttle Dock"; req_one_access = null }, /obj/map_helper/access_helper/airlock/station/medical/department, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled/white, /area/hallway/station/docks) "rfd" = ( @@ -26941,6 +27635,18 @@ "rnw" = ( /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) +"rom" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portforhall) "roU" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -26964,18 +27670,15 @@ /turf/simulated/wall/prepainted, /area/maintenance/substation/research) "rpD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/orange{ icon_state = "4-8" }, /obj/structure/cable/orange{ icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "rpN" = ( @@ -26991,7 +27694,6 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled/white, /area/medical/exam_room/exam_2) "rrz" = ( @@ -27051,13 +27753,16 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virology_aft_access) -"rsT" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, +"rsL" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardforhall) +/area/endeavour/hallway/d2portforhall) +"rsT" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/purplegray, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/rnd/xenobiology/xenoflora) "rsU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -27109,12 +27814,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "rup" = ( @@ -27140,6 +27841,12 @@ /obj/structure/cable/orange{ icon_state = "6-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "ruz" = ( @@ -27176,6 +27883,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "rvw" = ( @@ -27221,17 +27932,14 @@ /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "rxN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portafthall) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/chemistry_lab) "rxP" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/effect/floor_decal/corner/green{ @@ -27355,6 +28063,12 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "rDO" = ( @@ -27477,20 +28191,12 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay3) "rIw" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 - }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portafthall) +/area/rnd/hallway) "rJd" = ( /turf/simulated/floor/tiled/white, /area/medical/medbay3) @@ -27628,9 +28334,9 @@ autoclose = 0; frequency = 1379; icon_state = "door_locked"; - id_tag = "virology_airlock_west_exterior"; + id_tag = "virology_airlock_aft_exterior"; locked = 1; - name = "Virology Exterior Airlock"; + name = "Virology Aft Exterior Airlock"; req_one_access = null }, /obj/map_helper/access_helper/airlock/station/medical/virology, @@ -27640,7 +28346,7 @@ /obj/machinery/access_button{ command = "cycle_ext"; frequency = 1379; - master_tag = "virology_airlock_control"; + master_tag = "virology_airlock_aft"; name = "Virology Access Button"; pixel_y = 23; req_access = list(39) @@ -27762,6 +28468,7 @@ dir = 8; pixel_x = -10 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "rRe" = ( @@ -27833,8 +28540,6 @@ /obj/machinery/door/firedoor/glass{ dir = 4 }, -/obj/effect/paint/purplegray, -/obj/machinery/door/firedoor, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/map_helper/electrochromatic_linker{ id = "robotics-inner" @@ -27922,6 +28627,17 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay4) +"rVF" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "rWa" = ( /obj/machinery/door/firedoor/glass{ dir = 4 @@ -27958,6 +28674,9 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "rXr" = ( @@ -27969,6 +28688,12 @@ /obj/machinery/door/firedoor{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "rXQ" = ( @@ -28034,6 +28759,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/hallway) "sav" = ( @@ -28051,6 +28777,12 @@ /obj/effect/floor_decal/corner/green/border, /turf/simulated/floor/tiled/white, /area/medical/virology) +"saQ" = ( +/obj/machinery/door/airlock/maintenance, +/obj/map_helper/access_helper/airlock/station/engineering/department, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/maintenance/substation/medical_science) "scE" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -28090,8 +28822,6 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d2fwdhall) "scT" = ( -/obj/effect/paint/purplegray, -/obj/machinery/door/firedoor, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/map_helper/electrochromatic_linker{ id = "robotics-inner" @@ -28151,6 +28881,12 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "sgy" = ( @@ -28167,7 +28903,8 @@ /area/hallway/station/docks) "sgF" = ( /obj/structure/disposalpipe/junction{ - dir = 1 + dir = 8; + icon_state = "pipe-j2" }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) @@ -28181,6 +28918,12 @@ }, /turf/simulated/floor/tiled/dark, /area/maintenance/medbay/aft) +"sha" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/medical/sleeper) "she" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/lightorange/border, @@ -28262,15 +29005,10 @@ /turf/simulated/floor/tiled, /area/rnd/storage) "slw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 - }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "sly" = ( @@ -28283,6 +29021,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "slz" = ( @@ -28435,6 +29174,13 @@ "spp" = ( /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/navblue/bordercorner, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "sps" = ( @@ -28480,6 +29226,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/medical/virology_fore_access) "sqk" = ( @@ -28502,15 +29252,15 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardforhall) +"srL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardforhall) -"srL" = ( /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1starboardamidhall) "srS" = ( @@ -28616,14 +29366,14 @@ /turf/simulated/floor/carpet/purcarpet, /area/rnd/breakroom) "sxt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/borderfloorblack/corner{ dir = 1 }, /obj/effect/floor_decal/corner/navgold/bordercorner{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "syi" = ( @@ -28734,10 +29484,10 @@ dir = 5 }, /obj/machinery/embedded_controller/radio/airlock/access_controller{ - id_tag = "virology_airlock_west"; - name = "Virology Access Console"; - tag_exterior_door = "virology_airlock_west_exterior"; - tag_interior_door = "virology_airlock_west_interior"; + id_tag = "virology_airlock_aft"; + name = "Virology Aft Access Console"; + tag_exterior_door = "virology_airlock_aft_exterior"; + tag_interior_door = "virology_airlock_aft_interior"; pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -28781,15 +29531,15 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) "sEs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "sFf" = ( @@ -28800,6 +29550,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/tether/station/public_meeting_room) "sFi" = ( @@ -28846,9 +29597,6 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora/lab_atmos) "sFQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/effect/floor_decal/borderfloorblack/corner{ dir = 8 @@ -28856,6 +29604,9 @@ /obj/effect/floor_decal/corner/navblue/bordercorner{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "sFY" = ( @@ -28946,18 +29697,11 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/cafeteria) "sIr" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portafthall) +/turf/simulated/floor/plating, +/area/maintenance/research) "sIX" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -28982,6 +29726,9 @@ /obj/machinery/door/firedoor, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "sKw" = ( @@ -29000,6 +29747,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "sLb" = ( @@ -29038,12 +29788,6 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d2aftmaint) "sNd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "2-4" }, @@ -29164,6 +29908,7 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2fwdhall) "sQI" = ( @@ -29221,15 +29966,12 @@ /turf/simulated/floor/plating, /area/maintenance/substation/medical) "sTt" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled, -/area/rnd/research/researchdivision) +/turf/simulated/floor/tiled/white, +/area/medical/sleeper) "sTI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 10 @@ -29582,6 +30324,12 @@ /obj/effect/floor_decal/corner/navgold/bordercorner{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "teE" = ( @@ -29594,6 +30342,7 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2fwdhall) "teN" = ( @@ -29611,9 +30360,6 @@ /obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) -"tfb" = ( -/turf/simulated/floor/airless/ceiling, -/area/medical/medbay_emt_bay) "tfh" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -29714,6 +30460,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/hallway) "thZ" = ( @@ -29748,12 +30495,7 @@ /turf/simulated/floor/carpet/sblucarpet, /area/medical/psych/psych_1) "tjU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/rnd/hallway) "tkE" = ( @@ -29766,6 +30508,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "tkO" = ( @@ -29780,8 +30523,11 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) @@ -29808,8 +30554,7 @@ /turf/simulated/floor/tiled/dark, /area/station/stairs_two) "tnk" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, /turf/simulated/floor/tiled, @@ -29887,6 +30632,12 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "tpX" = ( @@ -29963,6 +30714,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/hallway) "trs" = ( @@ -30113,6 +30865,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/substation/medical_science) "twz" = ( @@ -30145,6 +30898,12 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "twY" = ( @@ -30496,6 +31255,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 6 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/rnd/research/researchdivision) "tJE" = ( @@ -30506,9 +31266,6 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "tJU" = ( @@ -30570,6 +31327,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/rnd/research_foyer) "tMu" = ( @@ -30683,6 +31441,9 @@ /area/endeavour/hallway/d1starboardforhall) "tPK" = ( /obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology) "tPV" = ( @@ -30785,6 +31546,9 @@ /obj/machinery/door/firedoor, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2fwdhall) "tRy" = ( @@ -30841,6 +31605,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2portamidhall) "tUb" = ( @@ -30868,6 +31635,12 @@ /obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) +"tVm" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/purplegray, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/rnd/breakroom) "tVG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -30903,18 +31676,14 @@ /turf/simulated/floor/tiled/techfloor, /area/teleporter/departing) "tWJ" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 - }, -/obj/machinery/light{ - dir = 1 +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, -/area/rnd/hallway) +/area/endeavour/hallway/d2portafthall) "tWO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -31054,12 +31823,6 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/station/docks) "ueR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -31090,7 +31853,9 @@ pixel_x = 32 }, /obj/machinery/disposal, -/obj/item/barrier_tape_segment/engineering, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "ufn" = ( @@ -31152,15 +31917,13 @@ /turf/simulated/floor/tiled/white, /area/medical/surgery) "ugT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "uhe" = ( @@ -31177,6 +31940,12 @@ }, /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/mauve/bordercorner, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "uhO" = ( @@ -31188,12 +31957,6 @@ /area/maintenance/medbay/aft) "uhS" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -31351,6 +32114,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "unU" = ( @@ -31408,6 +32174,9 @@ /obj/machinery/computer/timeclock/premade/south, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "urd" = ( @@ -31582,15 +32351,13 @@ /obj/effect/floor_decal/corner/navgold/bordercorner{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "uwG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -31605,6 +32372,12 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "uwU" = ( @@ -31756,6 +32529,7 @@ req_access = list() }, /obj/map_helper/access_helper/airlock/station/science/xenobiology, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/xenobiology) "uDo" = ( @@ -31788,12 +32562,13 @@ /obj/machinery/light, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "uEl" = ( @@ -31898,14 +32673,18 @@ /turf/simulated/floor/tiled/steel, /area/rnd/chemistry_lab) "uIW" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/structure/cable/green{ icon_state = "1-8" }, +/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/rnd/hallway) "uJh" = ( @@ -31925,6 +32704,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2portafthall) "uKo" = ( @@ -31954,8 +32736,22 @@ /obj/machinery/light, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) +"uLc" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/light, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled, +/area/rnd/hallway) "uLi" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -31999,6 +32795,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "uMG" = ( @@ -32050,12 +32849,6 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "uOw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -32138,9 +32931,12 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "uPS" = ( @@ -32280,8 +33076,9 @@ "uUl" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) @@ -32316,14 +33113,18 @@ /turf/simulated/floor/tiled/dark, /area/medical/psych_ward) "uVE" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/sortjunction/flipped{ + dir = 4; + name = "Research & Development"; + sortType = "Research & Development" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "uVS" = ( @@ -32358,6 +33159,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "uWQ" = ( @@ -32377,16 +33181,19 @@ /turf/simulated/floor/tiled, /area/rnd/research_foyer) "uXO" = ( -/obj/structure/cable/green{ +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/orange{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardforhall) +/area/endeavour/hallway/d2portforhall) "uXW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -32453,6 +33260,12 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "vbt" = ( @@ -32494,9 +33307,6 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/station/docks) "vct" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/machinery/processor, /turf/simulated/floor/tiled, /area/rnd/xenobiology) @@ -32753,6 +33563,9 @@ "vnb" = ( /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/navgold/bordercorner, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "vnZ" = ( @@ -32828,15 +33641,18 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "vqS" = ( @@ -32845,6 +33661,9 @@ }, /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/navgold/bordercorner, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "vqV" = ( @@ -32968,14 +33787,6 @@ /obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/borderfloorwhite/corner2, /obj/effect/floor_decal/corner/green/bordercorner2, -/obj/machinery/access_button{ - command = "cycle_int"; - frequency = 1379; - master_tag = "virology_airlock_control"; - name = "Virology Access Button"; - pixel_y = -23; - req_access = list(39) - }, /turf/simulated/floor/tiled/white, /area/medical/virology_fore_access) "vws" = ( @@ -32989,18 +33800,14 @@ /turf/simulated/floor/tiled, /area/medical/medbay4) "vwx" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/effect/floor_decal/steeldecal/steel_decals_central6{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/rnd/hallway) "vwz" = ( @@ -33055,6 +33862,9 @@ /obj/effect/floor_decal/corner/navblue/bordercorner{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "vAJ" = ( @@ -33126,21 +33936,40 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, /obj/machinery/light, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "vEl" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "4-8" }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardamidhall) +"vEU" = ( /obj/structure/cable/green{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardamidhall) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 1 + }, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay4) "vFg" = ( /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/medical/emt, @@ -33191,8 +34020,10 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "vGe" = ( @@ -33218,8 +34049,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" + dir = 8 }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) @@ -33268,6 +34098,12 @@ dir = 1 }, /obj/machinery/fire_alarm/north_mount, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "vIV" = ( @@ -33289,15 +34125,15 @@ /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "vKw" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portafthall) +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "vKZ" = ( /obj/machinery/light{ dir = 4 @@ -33307,6 +34143,9 @@ "vLb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "vLg" = ( @@ -33318,6 +34157,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "vLj" = ( @@ -33336,20 +34178,14 @@ /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "vLl" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portamidhall) +/turf/simulated/floor/wood, +/area/endeavour/hallway/d2afthall) "vLs" = ( /obj/structure/table/woodentable, /obj/item/flashlight/lamp/green, @@ -33441,17 +34277,17 @@ /turf/simulated/floor/tiled, /area/medical/surgery2) "vPR" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 1 +/obj/machinery/door/firedoor/glass{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/door/airlock/research{ + id_tag = "researchdoor"; + name = "R&D Distribution Area" }, +/obj/map_helper/access_helper/airlock/station/science/robotics, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardafthall) +/area/rnd/research/researchdivision) "vQu" = ( /obj/machinery/camera/network/research{ dir = 8; @@ -33493,12 +34329,6 @@ /area/endeavour/hallway/d2portamidhall) "vRD" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "1-8" }, @@ -33601,6 +34431,12 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "vWh" = ( @@ -33642,6 +34478,10 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2portamidhall) "vXm" = ( @@ -33853,6 +34693,9 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1starboardafthall) "wbK" = ( @@ -33920,6 +34763,12 @@ /obj/machinery/camera/network/research{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "wdh" = ( @@ -33999,19 +34848,14 @@ /area/teleporter/departing) "weW" = ( /obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portafthall) +/area/rnd/hallway) "wfk" = ( /obj/structure/cable/orange{ icon_state = "2-8" @@ -34021,6 +34865,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/substation/medical_science) "wfo" = ( @@ -34071,10 +34916,13 @@ /area/rnd/xenobiology) "wgp" = ( /obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + dir = 4 }, -/obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "wgC" = ( @@ -34119,7 +34967,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/disposalpipe/segment, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -34128,6 +34975,16 @@ "whu" = ( /turf/simulated/wall/prepainted/science, /area/rnd/reception_desk) +"whF" = ( +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "whM" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -34166,15 +35023,9 @@ /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) "wil" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "wiC" = ( @@ -34214,6 +35065,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"wkU" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d1starboardafthall) "wlg" = ( /obj/machinery/shower{ dir = 4 @@ -34392,6 +35249,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/rnd/research/researchdivision) "wpj" = ( @@ -34500,18 +35358,18 @@ /obj/effect/floor_decal/corner/green/border, /obj/structure/table/glass, /obj/item/storage/box/cups, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/medical/virology_fore_access) "wsg" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/hallway) "wsh" = ( @@ -34526,15 +35384,15 @@ /turf/simulated/floor/tiled/white, /area/medical/virology_fore_access) "wtw" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/rnd/research_foyer_auxiliary) "wtL" = ( @@ -34543,17 +35401,22 @@ /turf/simulated/floor/plating, /area/medical/psych_ward) "wtZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardafthall) +/area/endeavour/hallway/d2portamidhall) "wub" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -34650,6 +35513,21 @@ /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"wxc" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardamidhall) "wxB" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -34712,6 +35590,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "wzP" = ( @@ -34839,6 +35720,19 @@ /obj/structure/table/woodentable, /turf/simulated/floor/wood/sif/indoors, /area/medical/reception) +"wDK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2fwdhall) "wDR" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -34853,6 +35747,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/research) "wDV" = ( @@ -34937,6 +35832,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2portafthall) "wIc" = ( @@ -35090,6 +35988,7 @@ /obj/structure/cable/orange{ icon_state = "1-4" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d2aftmaint) "wMp" = ( @@ -35142,6 +36041,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d2aftmaint) "wNW" = ( @@ -35342,6 +36242,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2portafthall) "wSM" = ( @@ -35459,14 +36362,12 @@ /turf/simulated/floor/tiled, /area/holodeck_control) "wWS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardforhall) +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "wYa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 8 @@ -35486,6 +36387,10 @@ /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "wZJ" = ( @@ -35512,6 +36417,9 @@ pixel_x = 25 }, /obj/item/clothing/glasses/science, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology) "xaD" = ( @@ -35536,8 +36444,12 @@ /turf/simulated/floor/wood, /area/rnd/breakroom) "xbp" = ( -/turf/simulated/floor/plating, -/area/shuttle/emt/general) +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/rnd/anomaly_lab) "xbs" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -35619,6 +36531,9 @@ /obj/machinery/light, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "xda" = ( @@ -35809,6 +36724,18 @@ /obj/machinery/light/small, /turf/simulated/floor/tiled, /area/rnd/storage) +"xjv" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portforhall) "xjV" = ( /obj/structure/noticeboard{ pixel_y = 32 @@ -35840,6 +36767,12 @@ }, /turf/simulated/floor/wood, /area/tether/station/public_meeting_room) +"xkU" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) "xkX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -35967,6 +36900,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black, /turf/simulated/floor/tiled/white, /area/medical/virology) +"xoP" = ( +/obj/structure/disposalpipe/sortjunction{ + dir = 8; + name = "Medical Reception"; + sortType = "Medical Reception" + }, +/turf/simulated/floor/tiled/white, +/area/medical/sleeper) "xpf" = ( /obj/machinery/vending/blood, /obj/effect/floor_decal/industrial/outline/blue, @@ -35977,10 +36918,6 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) -"xpX" = ( -/obj/machinery/camera/network/outside, -/turf/simulated/floor/airless/ceiling, -/area/medical/medbay_emt_bay) "xqb" = ( /obj/machinery/camera/network/civilian{ dir = 1 @@ -35990,6 +36927,12 @@ /obj/structure/cable/orange{ 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, /area/endeavour/hallway/d2portforhall) "xqg" = ( @@ -36006,9 +36949,9 @@ autoclose = 0; frequency = 1379; icon_state = "door_locked"; - id_tag = "virology_airlock_west_interior"; + id_tag = "virology_airlock_aft_interior"; locked = 1; - name = "Virology Interior Airlock"; + name = "Virology Aft Interior Airlock"; req_one_access = null }, /obj/map_helper/access_helper/airlock/station/medical/virology, @@ -36018,7 +36961,7 @@ /obj/machinery/access_button{ command = "cycle_int"; frequency = 1379; - master_tag = "virology_airlock_control"; + master_tag = "virology_airlock_aft"; name = "Virology Access Button"; pixel_y = 24; req_access = list(39) @@ -36089,6 +37032,19 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/chemistry_lab) +"xsQ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "xtv" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/structure/cable/green{ @@ -36217,10 +37173,16 @@ /turf/simulated/floor/carpet/sblucarpet, /area/rnd/hallway) "xyH" = ( -/obj/machinery/disposal, -/obj/item/barrier_tape_segment/engineering, -/turf/simulated/floor/tiled/white, -/area/rnd/chemistry_lab) +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) "xzf" = ( /obj/machinery/station_map{ pixel_y = 32 @@ -36231,6 +37193,12 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "xzW" = ( @@ -36328,17 +37296,22 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "xDm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/navblue/bordercorner, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) @@ -36415,6 +37388,12 @@ /obj/machinery/door/firedoor{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "xFs" = ( @@ -36429,10 +37408,10 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "xFX" = ( @@ -36479,17 +37458,19 @@ /turf/simulated/floor/tiled, /area/rnd/rdoffice) "xHi" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 8 +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 4 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +/obj/effect/floor_decal/spline/plain{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/medical/reception) "xHr" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -36500,19 +37481,27 @@ /obj/machinery/door/firedoor/glass{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 4 + }, /obj/machinery/door/airlock/medical{ autoclose = 0; - frequency = 1378; + frequency = 1379; icon_state = "door_locked"; - id_tag = "virology_airlock_east_interior"; + id_tag = "virology_airlock_fore_interior"; locked = 1; - name = "Virology Interior Airlock"; + name = "Virology Fore Interior Airlock"; req_one_access = null }, -/obj/map_helper/access_helper/airlock/station/medical/virology, -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 4 +/obj/machinery/access_button{ + command = "cycle_int"; + frequency = 1379; + master_tag = "virology_airlock_fore"; + name = "Virology Access Button"; + pixel_y = 24; + req_access = list(39) }, +/obj/map_helper/access_helper/airlock/station/medical/virology, /turf/simulated/floor/tiled/white, /area/medical/virology_fore_access) "xHy" = ( @@ -36702,6 +37691,9 @@ /obj/machinery/disposal{ pixel_y = -2 }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/wood, /area/tether/station/public_meeting_room) "xMp" = ( @@ -36821,13 +37813,14 @@ /turf/simulated/floor/tiled/white, /area/medical/exam_room/exam_2) "xQA" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portafthall) +/area/rnd/research/researchdivision) "xQM" = ( /obj/structure/bed/chair, /obj/effect/floor_decal/corner/paleblue{ @@ -36898,15 +37891,11 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/cafeteria) "xUp" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "xUq" = ( @@ -36925,7 +37914,10 @@ }, /obj/structure/table/reinforced, /obj/item/hand_labeler, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/rnd/chemistry_lab) "xVe" = ( @@ -36976,7 +37968,9 @@ /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) "xYz" = ( -/obj/structure/bed/chair, +/obj/structure/bed/chair/bay/shuttle{ + dir = 4 + }, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -37030,6 +38024,12 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "ybi" = ( @@ -37054,11 +38054,11 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "ybL" = ( @@ -37099,6 +38099,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2portamidhall) "ydL" = ( @@ -37161,6 +38164,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "ygh" = ( @@ -37265,6 +38270,9 @@ /obj/effect/floor_decal/corner/green/bordercorner2{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/medical/virology_fore_access) "yic" = ( @@ -44624,7 +45632,7 @@ buM ybk fiT gJS -gOV +vEU kBS qFw hgb @@ -44818,7 +45826,7 @@ buM pdM kxI epJ -qCZ +gOV kBS pff iXI @@ -46164,7 +47172,7 @@ iec iec erm fqP -kSk +vLl kSk wdQ mTi @@ -46552,7 +47560,7 @@ vgB vgB vgB vgB -vgB +bBg vgB kZg eBA @@ -46720,12 +47728,12 @@ cEy jWf koS vct -jMj +pPE avn avn dJW -aww -aww +qCZ +hhK log qyg biX @@ -46746,7 +47754,7 @@ pDc pDc pDc pDc -pDc +gxR qtE qsB qFO @@ -46755,7 +47763,7 @@ pDc pDc pDc pDc -pDc +whF vQx mmI pwV @@ -46949,7 +47957,7 @@ jcO jcO jcO neX -neX +dxN jjo mmI goI @@ -47143,7 +48151,7 @@ xGm xGm qIz aKq -aKq +exm nCR mmI nJM @@ -47492,8 +48500,8 @@ bVy tut hxQ hwO -mkl -eSQ +fBJ +xbp bxz kgX nwm @@ -47506,7 +48514,7 @@ bxz jZz ilh cje -sTt +oCO nZC uUl kCt @@ -47531,7 +48539,7 @@ iCr hBs wKp bHz -eoT +wkU tJU mmI bAe @@ -47701,8 +48709,8 @@ jZz jZz cje oCO -jVn -bOa +xFT +pVT kCt pTU iec @@ -47880,7 +48888,7 @@ tuz njB bUY apg -hwO +ksR rJB bxz qvg @@ -47920,17 +48928,17 @@ nzx wKp bHz eoT -tJU +dFs poq gaO rRb -dbq -dbq -dbq -dbq +kop +kop +kop +kop qfF sly -dbq +mtT uPM xKC eVZ @@ -48074,7 +49082,7 @@ dyp prx hxQ oTA -hwO +ksR nCS bxz bSe @@ -48289,7 +49297,7 @@ kCt kCt kCt kCt -jXi +gMk gMk kCt cja @@ -48462,7 +49470,7 @@ koS koS koS koS -xIf +sIr ppB xIf dgT @@ -48476,9 +49484,9 @@ uPt cNs jZz cje -sTt +oCO xFT -uUl +pVT oQC cPx gBH @@ -48509,10 +49517,10 @@ hKr seE seE cxJ -eMZ +bOb gmM igd -qpq +oaZ mZc qpq mmI @@ -48656,10 +49664,10 @@ koS koS koS neh -neh -neh -neh -tCF +fbF +lkA +lkA +bmQ wDR gir fmk @@ -48670,9 +49678,9 @@ pJr wpi bzH tJk -oCO -jVn -bOa +iez +ptB +xQA lzj ilh ilh @@ -48688,7 +49696,7 @@ oaU cFb gLH uLi -qLp +hJq kxI cvB qyo @@ -48702,11 +49710,11 @@ wfk twx exs eiI -cxJ -cxJ +hHg +gKt aja -igd -qpq +saQ +hPV qpq iqj mmI @@ -48897,8 +49905,8 @@ pQN rYh fIn cxJ -cxJ -mBm +qqQ +pfs igd mmI mmI @@ -49091,8 +50099,8 @@ qlw frq pOf eMZ -gKt -seE +bfw +mBm igd vKe fRq @@ -49253,18 +50261,18 @@ jxJ cqO cqO dqG -cqO +xsQ gNr -cqO -cqO -cqO -cqO -cqO +lyl +lyl +lyl +lyl +lyl tkE -dOv +vPR cIi dyM -keB +xDm wLf eub ggw @@ -49277,7 +50285,7 @@ jcO szG sSl nEU -pwN +phe elT oMl oMl @@ -49651,7 +50659,7 @@ rbQ sdA whu xui -dyM +qRh iyN wJw fEp @@ -49845,8 +50853,8 @@ irM xAI aUs pyT -lyl -ckH +ciZ +wgp iKN xUb wzv @@ -49858,7 +50866,7 @@ wzv wzv xUb bhT -cMY +hqn dzq hfW nKL @@ -50040,7 +51048,7 @@ iUs xcd xdW ltx -xQA +eOX hlu xUb uam @@ -50052,17 +51060,17 @@ uam uam xUb szz -cMY +imb ceq cgo azx -aiM +xHi kOo oYo oYo oYo eaI -dxA +jXi nXe las uJJ @@ -50232,8 +51240,8 @@ lKg eEO kMH aUs -rIw -vKw +pyT +qRh eaK wJw xUb @@ -50258,7 +51266,7 @@ iGC fsX juF tok -kgh +sha ooU kgh cfl @@ -50426,9 +51434,9 @@ irM irM fTE aUs -weW +pyT nGv -gUZ +phm iKN xUb dUk @@ -50440,7 +51448,7 @@ dUk dUk xUb bhT -lTi +cMY qmF mdU jkz @@ -50621,8 +51629,8 @@ czU vXA whu dnV -bFI -gUZ +qRh +eaK hlu hDs xUb @@ -50634,8 +51642,8 @@ dQe xUb cUN szz -gxR -fBJ +cMY +qmF mdU cOC lcu @@ -50646,7 +51654,7 @@ aMt hyR juF dIx -kgh +sha ggO kgh nKH @@ -50839,8 +51847,8 @@ bAI rut bMn sME -kgh -kgh +sTt +xoP pYY wkf wkf @@ -51001,7 +52009,7 @@ hla sCm sCm sCm -hYp +sCm hve rQf jGo @@ -51010,7 +52018,7 @@ lCA rQf czJ gbY -vFz +ckH jxf eRK eRK @@ -51192,9 +52200,9 @@ ffI bqS nQX qYt -sag -sag -sag +weW +gkX +fae vwx oZp eTX @@ -51385,11 +52393,11 @@ ffI ffI bqS aEn -mIF -mIF +xkU +cvh xnC rmq -jor +gzA rzi rQf cTS @@ -51397,8 +52405,8 @@ uWQ mAp rQf hiw -dyM -keB +qRh +xDm hsu qKx mPY @@ -51591,7 +52599,7 @@ scT aDx bIW bNH -sIr +nBm mOb oDd oDd @@ -51769,7 +52777,7 @@ lLM mRv gKn bqS -nQX +mIF hpi qSn jvv @@ -51960,8 +52968,8 @@ sxo aTQ gZg xaR -aVO -gKn +nBU +tVm lAr jMc uhx @@ -51978,7 +52986,7 @@ vZg rmN dwr mAv -cse +qjz ciZ wgp oDd @@ -51992,7 +53000,7 @@ cHC cHC cHC bHC -cMY +fVY rul qnz rLu @@ -52158,7 +53166,7 @@ mqI coh thW uIW -vDl +uLc hCA hCA hCA @@ -52172,9 +53180,9 @@ pqF vZg dSG mAv -kff +qjz nGv -gUZ +tWJ oDd wnU cHC @@ -52187,9 +53195,9 @@ cHC cHC oDd nbC -cTm +bPJ hKM -cOC +dBE qYk kcR sQI @@ -52367,7 +53375,7 @@ vZg pHp nBn tJE -bFI +qRh gvw oDd cHC @@ -52380,9 +53388,9 @@ cHC cHC cHC oDd -cMY +jsQ kyy -nrZ +mdU jkz ebW ehP @@ -52544,9 +53552,9 @@ acf ybY rug svR -oIp +bqS qIn -eyM +qam hCA kQH ije @@ -52574,8 +53582,8 @@ cHC cHC cHC oDd -vPR -gkX +csf +cTm pgo chv chv @@ -52739,8 +53747,8 @@ ruz afc svR ndE -qxs -iRy +kff +cCK hCA jPQ cbF @@ -52769,7 +53777,7 @@ cHC cHC oDd mTD -wtZ +gij mdU efa eUu @@ -52934,7 +53942,7 @@ xvV svR wMd qxs -iRy +kJE hCA pGO hXW @@ -52949,7 +53957,7 @@ vZg qvv aDx qjz -dyM +qRh uKJ oDd ePI @@ -52963,7 +53971,7 @@ eEE cHC oDd csf -bBg +cTm aao jqy mKe @@ -53128,7 +54136,7 @@ hnd gKn bqS qxs -vDl +oPc hCA kQH hnl @@ -53144,7 +54152,7 @@ jsc aDx eXh qRh -ckH +wgp oDd ePI eEE @@ -53322,7 +54330,7 @@ oOS gKn bqS eSw -iRy +lTi uJh uJh tbn @@ -53337,8 +54345,8 @@ hfZ gBW gVf bLe -ltx -xQA +qqc +eOX oDd ePI eEE @@ -53351,7 +54359,7 @@ eEE cHC oDd xzf -gAn +cTm mdU jqy oRe @@ -53516,7 +54524,7 @@ wMQ gKn bqS qxs -iRy +kJE uJh mzm vaL @@ -53530,7 +54538,7 @@ qtF sCN pCH klq -xDm +qjz ciZ eaK oDd @@ -53545,7 +54553,7 @@ eEE cHC oDd tpN -ixQ +cTm mdU chv pWZ @@ -53709,8 +54717,8 @@ gKn bds gKn bqS -qxs -iRy +kff +cCK uJh cRF vBU @@ -53724,9 +54732,9 @@ fhj oOO pCH jkG -rxN +qjz nGv -gUZ +tWJ oDd ePI eEE @@ -53740,7 +54748,7 @@ cHC oDd ivz cTm -nyF +mdU wOP jZY jZY @@ -53898,13 +54906,13 @@ gHf sCm sCm sCm -xHi +sCm sCm sCm bBJ pqy -qIn -eyM +qxs +kJE uJh pMA fiD @@ -53919,8 +54927,8 @@ hNv xAO aDx dpH -bFI -gUZ +qRh +onv oDd mfl qGR @@ -53932,9 +54940,9 @@ gtR aBx qQK tqR -cMY -kyy jsQ +kyy +aao jZY nYo egX @@ -54089,16 +55097,16 @@ xIf xnR dKQ bqS -mIF -mIF +qEW +nrZ nQX -fRp +qSn pXr pXr cyX pXr iIQ -iRy +rIw uJh ogl geD @@ -54286,12 +55294,12 @@ aFv vFO pRM nKq -iPf +gzA gzA eiO iHA suD -qxs +qIn vDl uJh aZo @@ -54306,9 +55314,9 @@ gKZ qog aPb dbo -mXu -efc -ftU +uza +hBL +rVF oDd oDd mAe @@ -54500,7 +55508,7 @@ qog qog xec dbo -vLl +mYS bfx oOa jne @@ -54680,7 +55688,7 @@ fUW oLT ndE qxs -iRy +kJE uJh hSv fiD @@ -54869,12 +55877,12 @@ wvb xCJ oXH kVZ -kVZ -kVZ +fRh +rxN dAG oKv cLg -iRy +rIw uJh eJc xkd @@ -55254,7 +56262,7 @@ tLi oLT oLT oLT -xyH +wap wap veP dQC @@ -55262,7 +56270,7 @@ xsC oLT bqS eSw -iRy +kJE uJh tUr gmB @@ -55456,7 +56464,7 @@ oLT oLT wMd qxs -iRy +kJE uJh uJh uJh @@ -55656,7 +56664,7 @@ sCm sCm sCm hkV -xHi +sCm sCm rYW dKQ @@ -56037,14 +57045,14 @@ neh xIf hgr bqS -lrS -xnC +mIF +fVs iHA gzA eiO gzA gzA -iPf +gzA gzA pUU dKQ @@ -56066,7 +57074,7 @@ xGm nzx nzx fvj -srL +mXu dly bIN geo @@ -56232,7 +57240,7 @@ xIf hgr bqS lrS -iRy +xyH uPt uPt uPt @@ -56424,7 +57432,7 @@ uPt neh xIf hgr -tWJ +ndE tjU eyM uPt @@ -56472,9 +57480,9 @@ dvL hjX uhe vUs -tfb -tfb -tfb +fik +fik +fik pRW pRW pRW @@ -56634,8 +57642,8 @@ osH wNE vez uza -jGK -eJz +fLZ +pBC ftU ijz oDd @@ -56666,8 +57674,8 @@ dvL hjX uhe vUs -xpX -tfb +brS +fik pRW pRW pRW @@ -56828,8 +57836,8 @@ hmb blH tij uza -jGK -bBw +fLZ +hGm nvK oDd oDd @@ -56842,7 +57850,7 @@ cHC cHC oDd yeL -uOw +oQM rdl vYN nuw @@ -56860,7 +57868,7 @@ dvL hjX uhe vUs -tfb +fik fik pRW pRW @@ -57023,7 +58031,7 @@ mxS fxa lEm nAr -ksB +aGC oDd oDd fOF @@ -57217,7 +58225,7 @@ thh tij uza uwG -edP +wtZ oDd cHC cHC @@ -57409,9 +58417,9 @@ eQu liR jBH vez -mXu +uza wil -edP +wtZ oDd cHC cHC @@ -57603,7 +58611,7 @@ eQu mFL cYX tij -cCK +uza slw fHk tfp @@ -57796,7 +58804,7 @@ hia eQu bFz rvs -tij +rsT ugT pfV qiy @@ -57812,7 +58820,7 @@ ioN bwt oDd kDU -aGC +uOw mRr vYN kzb @@ -58005,9 +59013,9 @@ wNP hqy gtR oDd -ygE +wxc kBU -byX +rdl vYN aia vYN @@ -58199,8 +59207,8 @@ cHC sAZ qQK oDd -yeL -nBU +efc +uOw aqd vYN aia @@ -58210,7 +59218,7 @@ uvd uvd rNS ibj -rNS +jhM rNS wlz dAF @@ -58975,7 +59983,7 @@ cHC sAZ qQK oDd -yeL +ixQ uOw lnT vYN @@ -59363,7 +60371,7 @@ oDd oDd oDd oDd -ygE +bFI uOw jWy vYN @@ -59557,7 +60565,7 @@ cHC fOF nqw oDd -ygE +iPf xUp eJO oMP @@ -59751,8 +60759,8 @@ uCq uCq xgg oDd -ygE -kJE +bFI +uOw kdT vCs qRe @@ -59945,8 +60953,8 @@ uCq cHC mqw oDd -ygE -kJE +bFI +uOw rdl vCs vCs @@ -60139,8 +61147,8 @@ cHC cHC nMC oDd -ygE -kJE +bFI +uOw rdl vCs pwh @@ -60333,8 +61341,8 @@ cHC cHC qBi oDd -ygE -kJE +bFI +uOw rdl vCs vCs @@ -60527,8 +61535,8 @@ oDd oDd uSX oDd -ygE -kJE +bFI +uOw lnT vCs emy @@ -60918,7 +61926,7 @@ bjV nyR pFq uvP -lNE +huH eIV guJ uNt @@ -61292,7 +62300,7 @@ fwV wMp wMp wMp -nFY +iBK xnN kiA nAQ @@ -62068,7 +63076,7 @@ eUS jvz den wMp -uza +iwJ jGK bBw rgo @@ -62456,7 +63464,7 @@ ako fbI twz wMp -eah +ppu gJm rtj tUb @@ -62663,7 +63671,7 @@ pkD pkD tUb yah -ttn +gaG oBJ mbs oFh @@ -62857,8 +63865,8 @@ pkD pkD tUb sgw -iez -uXO +vWh +oBJ mbs oFh oku @@ -63232,7 +64240,7 @@ jRK jRK mzX wMp -tXO +eYA dEb uDV tUb @@ -63245,8 +64253,8 @@ rpj rpj tUb vqH -rsT -mih +vWh +oBJ mbs gzk mzy @@ -63254,7 +64262,7 @@ kZh tOc mQm ktt -xbp +rnw dKK kkL qKR @@ -63426,7 +64434,7 @@ jRK jRK jRK wMp -cvh +eYA mFT kXE tUb @@ -63448,7 +64456,7 @@ oku oku oku kJt -xbp +rnw kwz kkL muS @@ -63620,9 +64628,9 @@ jRK jRK jRK mai -aoi +eYA gAW -rtj +aoi tUb lwk tEk @@ -63633,7 +64641,7 @@ pUI pUI tUb aua -wWS +vWh oBJ mbs hog @@ -63814,9 +64822,9 @@ jRK jRK jRK wMp -fVs -mut -rtj +ppu +mFT +kXE tUb wdp hMz @@ -63826,7 +64834,7 @@ lnk pUI cFB tUb -vVV +aua ioD mWa mbs @@ -63836,7 +64844,7 @@ egt bFy oku nOY -xbp +rnw acD oku bYo @@ -64008,9 +65016,9 @@ jRK jRK jRK mai -tXO -ksR -rtj +eYA +mFT +uXO tUb rpj rpj @@ -64020,7 +65028,7 @@ fIK rpj pUI tUb -vVV +aua sNd nRt aPI @@ -64030,7 +65038,7 @@ vcl bYo btU fIs -xbp +rnw gzO btU bYo @@ -64397,8 +65405,8 @@ jRK jRK mai oGt -ksR -rtj +mFT +uXO tUb pkD pkD @@ -64409,7 +65417,7 @@ rpj rpj tUb fTa -bgF +sqA arr mbs bYo @@ -64591,7 +65599,7 @@ jRK jRK wMp uWv -ksR +mFT ruu tUb fNy @@ -64602,8 +65610,8 @@ jGa pkD hlS tUb -tcX -bgF +vqH +sqA oYE mbs sRh @@ -64784,7 +65792,7 @@ jRK jRK jRK mai -tXO +eYA lSb rCE aee @@ -64796,7 +65804,7 @@ ejr pkD pkD tUb -vVV +aua sqA oYE mbs @@ -65176,7 +66184,7 @@ aVd qzR nDt tUb -iDd +gAp iNn nMK tVO @@ -65572,8 +66580,8 @@ pkD pkD tUb tcX -vWh -bgF +fRp +mih bZw iro pkD @@ -65754,7 +66762,7 @@ gfA teE eYK eYK -tXO +eYA gJm tUN tUb @@ -65948,7 +66956,7 @@ gfA eYK eYK uOj -vMB +rom gJm nDt tUb @@ -66142,7 +67150,7 @@ sHP qcN uOj vMB -pjb +oYe jch sYu tUb @@ -66335,7 +67343,7 @@ gfA gfA mNh aLB -pjb +byX hln nDt tUb @@ -66723,8 +67731,8 @@ gfA gfA mNh tXO -gHJ -nDt +rsL +xjv tUb tUb pkD @@ -66917,7 +67925,7 @@ gfA gfA mNh kgB -lkA +pjb mSK tUb tUb @@ -67513,7 +68521,7 @@ teL teL cCF hGF -lbX +wDK qaO iro pkD @@ -67902,7 +68910,7 @@ hBs dfx pic oCg -pic +oIp iro pkD qUP @@ -68096,7 +69104,7 @@ hBs yiM pic oCg -pic +oIp iro pkD iro @@ -68290,7 +69298,7 @@ xGm sBd pic oCg -pic +oIp iro iro iro @@ -68484,7 +69492,7 @@ nzx wKp pic oCg -pic +oIp iTE lmG qBd @@ -68678,7 +69686,7 @@ nzx wKp jMN ryl -bIw +mut iTE qBd qBd @@ -68872,7 +69880,7 @@ ckP ngD dVQ vmn -dVQ +kTn agO jRE jRE @@ -69260,7 +70268,7 @@ iNI baj xAr ncC -eXe +hYp agO lmG qBd @@ -69454,7 +70462,7 @@ ieG baj xAr cfw -xWm +wWS agO qBd jRE @@ -69643,12 +70651,12 @@ loC njb lqJ sZj -xWm +jor nKm xzW rym cfw -xWm +wWS rtP pRW pRW @@ -69837,12 +70845,12 @@ hxy xtv sNS phu -nlb +qLp ofU ofU vkq lgy -xWm +wWS rtP mDp pRW @@ -70031,12 +71039,12 @@ dkv eUx gck iAs -kHM +nyF sFf -mwF -kHM -kHM -dsY +pwN +cse +cse +vKw agO lIp pRW diff --git a/maps/endeavour/levels/deck3.dmm b/maps/endeavour/levels/deck3.dmm index b9ce5d1db424..f87652faeee9 100644 --- a/maps/endeavour/levels/deck3.dmm +++ b/maps/endeavour/levels/deck3.dmm @@ -1,13 +1,8 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aam" = ( -/obj/structure/closet/crate/bin{ - anchored = 1 - }, -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_y = -37 - }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_7) +/area/crew_quarters/recreation_area) "aap" = ( /obj/machinery/power/terminal, /obj/structure/cable{ @@ -83,15 +78,24 @@ /turf/simulated/wall/r_wall/prepainted/security, /area/security/hallwayaux) "adB" = ( -/obj/machinery/air_alarm/east_mount, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_hallway) +/area/crew_quarters/sleep/Dorm_13) "adH" = ( /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "adX" = ( @@ -130,7 +134,7 @@ dir = 4 }, /turf/simulated/floor/carpet/sblucarpet, -/area/crew_quarters/sleep/Dorm_6) +/area/crew_quarters/sleep/Dorm_12) "agT" = ( /obj/effect/floor_decal/industrial/warning{ dir = 5 @@ -200,7 +204,6 @@ /turf/simulated/floor/tiled, /area/endeavour/station/stairs_three) "aiW" = ( -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/hallway) @@ -319,6 +322,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "aqx" = ( @@ -338,7 +344,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area) "aqY" = ( /obj/structure/table/woodentable, @@ -349,6 +356,7 @@ /obj/structure/cable/orange{ icon_state = "1-8" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "arz" = ( @@ -409,15 +417,15 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d3starboardamidhall) -"auM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3starboardamidhall) +"auM" = ( /obj/structure/disposalpipe/segment{ dir = 8 }, @@ -428,15 +436,16 @@ /area/endeavour/hallway/d3fwdhall) "auQ" = ( /obj/machinery/recharge_station, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor/grid, /area/security/lobby) "avI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/machinery/light_switch{ + pixel_x = 26; + pixel_y = -4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/sleep/Dorm_3) +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_5) "avK" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -449,6 +458,9 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "avW" = ( @@ -482,7 +494,7 @@ icon_state = "4-8" }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_4) +/area/crew_quarters/sleep/Dorm_3) "awA" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -502,8 +514,7 @@ /area/security/evidence_storage) "axk" = ( /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -521,9 +532,12 @@ /turf/simulated/floor/tiled/techfloor, /area/endeavour/station/stairs_three) "aya" = ( -/obj/machinery/vending/fitness, -/turf/simulated/floor/wood, -/area/crew_quarters/fitness) +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/machinery/vending/cola, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/recreation_area) "ayc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -536,6 +550,16 @@ }, /turf/simulated/floor/tiled/monotile, /area/endeavour/hallway/d3afthall) +"ayd" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "ayg" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -645,19 +669,11 @@ /turf/simulated/floor/tiled/dark, /area/janitor) "aBl" = ( -/obj/structure/bed/chair/comfy/teal, -/obj/machinery/newscaster{ - pixel_y = 32 - }, +/obj/structure/closet/wardrobe, +/obj/item/toy/plushie/black_cat, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_9) "aCi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor{ dir = 8 }, @@ -710,6 +726,7 @@ dir = 1; icon_state = "pipe-c" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) "aFg" = ( @@ -764,8 +781,7 @@ pixel_x = -32 }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 @@ -844,21 +860,16 @@ /area/security/armoury) "aIB" = ( /obj/machinery/vending/cola, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/security/lobby) "aII" = ( /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, /turf/simulated/floor/tiled, @@ -923,22 +934,16 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "aMk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/navblue/bordercorner, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "aMs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/holopad, /obj/structure/cable/green{ icon_state = "4-8" @@ -956,9 +961,8 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "aNk" = ( @@ -969,6 +973,7 @@ name = "Hydroponics" }, /obj/map_helper/access_helper/airlock/station/service/botany, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/hydroponics) "aND" = ( @@ -981,29 +986,19 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/bedrooms) "aNV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/sleep/Dorm_5) +/turf/simulated/floor/carpet/oracarpet, +/area/crew_quarters/sleep/Dorm_6) "aNZ" = ( -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/door/firedoor/glass{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/effect/paint/darkred, -/obj/spawner/window/low_wall/borosillicate/reinforced/full, -/turf/simulated/floor, -/area/security/hanger) +/turf/simulated/floor/plating, +/area/security/forensics) "aOg" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -1020,16 +1015,17 @@ dir = 1 }, /obj/machinery/fire_alarm/north_mount, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/security/lobby) "aOy" = ( -/obj/effect/floor_decal/spline/plain, +/obj/structure/bed/chair/wood{ + dir = 4 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, /turf/simulated/floor/carpet/bcarpet, -/area/vacant/vacant_shop) +/area/crew_quarters/game_room) "aOG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -1047,23 +1043,31 @@ /area/endeavour/hallway/d3starboardamidhall) "aPN" = ( /turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/sleep/Dorm_2) +/area/crew_quarters/sleep/Dorm_1) "aPW" = ( -/obj/machinery/vending/mre, +/obj/effect/floor_decal/industrial/halfstair{ + dir = 4 + }, /turf/simulated/floor/wood, -/area/crew_quarters/bar) +/area/tether/surfacebase/entertainment) "aQa" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/machinery/light/small{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_5) +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "aQy" = ( /obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "aQM" = ( /obj/structure/disposalpipe/segment{ @@ -1076,6 +1080,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/catwalk, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/starboardsolar) "aTm" = ( @@ -1124,23 +1129,18 @@ /turf/simulated/floor/tiled/techfloor, /area/endeavour/station/stairs_three) "aVb" = ( -/obj/structure/cable/green{ +/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{ - name = "Fitness Room" - }, -/obj/machinery/door/firedoor{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/wood, -/area/crew_quarters/fitness) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardafthall) "aVe" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -1204,6 +1204,13 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"aWK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/game_room) "aWP" = ( /obj/machinery/door/firedoor/glass{ dir = 8 @@ -1245,8 +1252,11 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/fitness/punching_bag, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 + }, +/obj/structure/reagent_dispensers/water_cooler/full, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "aXT" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -1271,8 +1281,22 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/maintenance/starboardsolar) +"aZy" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/red/border, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/security/hallway) "aZH" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -1340,6 +1364,12 @@ }, /turf/simulated/floor/tiled/dark, /area/security/tactical) +"bcw" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entertainment) "bcE" = ( /obj/structure/table/rack/shelf/steel, /obj/effect/floor_decal/industrial/outline/red, @@ -1411,7 +1441,6 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/borosillicate/reinforced/full, /turf/simulated/floor, /area/security/hallway) @@ -1442,10 +1471,16 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/bedrooms) -"bfj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +"bfd" = ( +/obj/item/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 26 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/wood, +/area/crew_quarters/game_room) +"bfj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -1467,6 +1502,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "bfD" = ( @@ -1486,7 +1524,6 @@ /turf/simulated/floor/wood, /area/maintenance/dormitory) "bfY" = ( -/obj/effect/paint/darkred, /obj/machinery/light{ dir = 1 }, @@ -1502,8 +1539,11 @@ dir = 4 }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) @@ -1542,12 +1582,6 @@ /turf/simulated/floor/airless, /area/shuttle/mining_ship/general) "bhf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor{ dir = 8 }, @@ -1605,16 +1639,18 @@ }, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/refinery) -"bil" = ( -/obj/structure/cable/green{ - icon_state = "1-8" +"bhQ" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/obj/item/radio/intercom{ - pixel_y = -24 +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 }, -/obj/structure/closet/wardrobe, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_7) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3afthall) "bip" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -1640,6 +1676,18 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) +"bjQ" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3fwdhall) "bjW" = ( /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, @@ -1667,6 +1715,9 @@ /obj/effect/floor_decal/corner/navblue/border, /obj/effect/floor_decal/borderfloorblack/corner2, /obj/effect/floor_decal/corner/navblue/bordercorner2, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "blB" = ( @@ -1709,32 +1760,23 @@ /turf/simulated/floor/tiled/dark, /area/security/interrogation) "bmr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_11) +/turf/simulated/floor/carpet, +/area/crew_quarters/sleep/Dorm_10) "bmY" = ( /turf/simulated/wall/r_wall/prepainted, /area/maintenance/starboardsolar) "bno" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 + dir = 5 }, -/turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/sleep/Dorm_8) -"bnt" = ( /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_11) +/area/crew_quarters/sleep/Dorm_13) "bnZ" = ( /turf/simulated/floor/lino, /area/security/detectives_office) @@ -1838,8 +1880,7 @@ }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/disposal, -/obj/item/barrier_tape_segment/engineering, -/obj/structure/disposalpipe/up{ +/obj/structure/disposalpipe/trunk{ dir = 8 }, /turf/simulated/floor/tiled, @@ -1865,8 +1906,14 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/prison/cell_block) "bsF" = ( -/obj/structure/fitness/punchingbag, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, +/obj/machinery/fitness/punching_bag/clown, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 + }, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "bsL" = ( /obj/machinery/atm{ @@ -1932,6 +1979,18 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) +"buq" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardamidhall) "buy" = ( /obj/effect/floor_decal/corner/blue{ dir = 6 @@ -1973,6 +2032,7 @@ dir = 2; icon_state = "pipe-c" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/bar/lower) "bvs" = ( @@ -1992,14 +2052,11 @@ /turf/simulated/floor/tiled, /area/quartermaster/qm) "bvI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/machinery/light/small{ + dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_5) +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "bwA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -2010,8 +2067,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/crew_quarters/bar) +/turf/simulated/floor/wood, +/area/crew_quarters/bar/lounge) "bxI" = ( /obj/machinery/computer/timeclock/premade/south, /obj/structure/cable/orange{ @@ -2019,6 +2076,9 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "bxW" = ( @@ -2052,6 +2112,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "byU" = ( @@ -2082,21 +2145,23 @@ /obj/machinery/status_display/supply_display{ pixel_y = 32 }, -/obj/machinery/door/firedoor{ - dir = 8 - }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "bzE" = ( /turf/simulated/wall/r_wall/prepainted/cargo, -/area/crew_quarters/bar) +/area/crew_quarters/bar/lounge) "bzQ" = ( -/obj/machinery/holopad, /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 4 }, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) "bAI" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -2105,15 +2170,12 @@ /obj/effect/floor_decal/corner/navblue/border, /obj/effect/floor_decal/borderfloorblack/corner2, /obj/effect/floor_decal/corner/navblue/bordercorner2, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3portforhall) -"bBc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) +"bBc" = ( /obj/structure/disposalpipe/segment{ dir = 8 }, @@ -2129,6 +2191,15 @@ }, /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) +"bCs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entertainment) "bCt" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass/security{ @@ -2155,14 +2226,23 @@ /obj/machinery/shower{ pixel_y = 8 }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "bDg" = ( /obj/structure/sign/deck/third, /turf/simulated/wall/prepainted, /area/endeavour/hallway/d3fwdmaint) +"bDh" = ( +/obj/fiftyspawner/steel, +/turf/simulated/floor/plating, +/area/maintenance/dormitory) "bDw" = ( -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/brig) @@ -2183,10 +2263,10 @@ /turf/simulated/floor/tiled/monotile, /area/security/forensics) "bEx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/entertainment) "bER" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -2199,7 +2279,10 @@ /area/crew_quarters/kitchen) "bFo" = ( /obj/machinery/scale, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "bFp" = ( /obj/machinery/computer/secure_data{ @@ -2299,12 +2382,6 @@ /obj/structure/cable/green{ 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{ dir = 8 }, @@ -2329,6 +2406,7 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "bMj" = ( @@ -2350,12 +2428,11 @@ /turf/simulated/floor/plating, /area/quartermaster/warehouse) "bNb" = ( -/obj/machinery/air_alarm{ - frequency = 1441; - pixel_y = 22 - }, /obj/machinery/vending/fitness, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 + }, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "bOB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -2376,12 +2453,14 @@ /obj/machinery/light{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "bOW" = ( /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) @@ -2395,13 +2474,9 @@ /turf/simulated/wall/r_wall/prepainted/security, /area/security/security_lockerroom) "bPs" = ( -/obj/structure/bed/chair/wood{ - dir = 4 - }, /obj/effect/floor_decal/spline/fancy/wood, -/obj/landmark/spawnpoint/job/entertainer, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) "bQp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2414,6 +2489,9 @@ dir = 9 }, /obj/effect/floor_decal/corner/red/border, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "bQZ" = ( @@ -2438,30 +2516,25 @@ /turf/simulated/floor/tiled/monotile, /area/security/forensics) "bRI" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 +/obj/machinery/air_alarm/east_mount, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 6 }, -/turf/simulated/floor/carpet/blucarpet, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "bSf" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/structure/bed/chair/comfy/teal, -/obj/machinery/computer/security/telescreen{ - pixel_y = 32 +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/multi_tile/glass{ + name = "Crew Quarters" }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_7) +/area/crew_quarters/recreation_area) "bSi" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/carpet/blucarpet, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "bSQ" = ( /turf/simulated/floor/wood, @@ -2512,7 +2585,6 @@ /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "bUz" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -2520,13 +2592,20 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "bUI" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/structure/closet/wardrobe, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_3) +/obj/structure/bed/chair/wood{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/game_room) "bUP" = ( /obj/machinery/light/small{ dir = 1 @@ -2573,9 +2652,10 @@ /area/endeavour/hallway/d3aftmaint) "bVV" = ( /obj/effect/floor_decal/spline/fancy/wood, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/sortjunction/flipped{ + dir = 8; + name = "Bar"; + sortType = "Bar" }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) @@ -2590,6 +2670,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "bWd" = ( @@ -2627,6 +2710,9 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, /obj/machinery/portable_atmospherics/hydroponics, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hydroponics) "bYm" = ( @@ -2665,6 +2751,7 @@ /obj/structure/cable/orange{ icon_state = "4-9" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "bZQ" = ( @@ -2674,12 +2761,6 @@ /obj/machinery/status_display{ pixel_y = -32 }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, /turf/simulated/floor/tiled, /area/security/lobby) "caA" = ( @@ -2687,6 +2768,9 @@ dir = 4 }, /obj/machinery/light, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d3fwdhall) "cce" = ( @@ -2828,15 +2912,23 @@ /obj/machinery/newscaster{ pixel_y = 32 }, -/obj/machinery/light{ - dir = 1 - }, /obj/random/bedsheet, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_6) +/turf/simulated/floor/carpet/sblucarpet, +/area/crew_quarters/sleep/Dorm_12) +"cjH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "ckQ" = ( -/obj/structure/bed/chair/comfy/teal{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_9) @@ -2849,6 +2941,7 @@ dir = 4; icon_state = "pipe-c" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/cargo/mining) "cmw" = ( @@ -2876,11 +2969,29 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/mining_ship/general) +"cnc" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/bar/lounge) +"cnt" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3portforhall) "cnB" = ( /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/carpet/blucarpet, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "coi" = ( /obj/machinery/door/firedoor{ @@ -2916,20 +3027,19 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "coF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/sleep/Dorm_5) +/obj/structure/flora/pottedplant/subterranean, +/turf/simulated/floor/carpet/oracarpet, +/area/crew_quarters/sleep/Dorm_6) "coW" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/structure/closet/wardrobe, -/obj/machinery/light{ - dir = 1 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock{ + id_tag = "dorm10"; + name = "Dorm 10" }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_11) +/area/crew_quarters/sleep/Dorm_10) "cpz" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -2948,14 +3058,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_8) -"crM" = ( -/obj/machinery/light_switch{ - pixel_x = -30 +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_4) +/area/crew_quarters/sleep/Dorm_13) +"crM" = ( +/obj/machinery/air_alarm/north_mount, +/turf/simulated/floor/carpet/blue, +/area/crew_quarters/sleep/Dorm_11) "csb" = ( /turf/simulated/floor/airless/ceiling, /area/space) @@ -2982,6 +3094,12 @@ /obj/machinery/camera/network/security{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/tiled/old_cargo/white, /area/security/forensics) "ctz" = ( @@ -3000,6 +3118,9 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "ctE" = ( @@ -3045,6 +3166,7 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "cwn" = ( @@ -3057,10 +3179,6 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/security/lobby) "cxF" = ( @@ -3073,6 +3191,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "cxW" = ( @@ -3095,9 +3214,6 @@ dir = 4; pixel_x = -22 }, -/obj/structure/closet/crate/bin{ - anchored = 1 - }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "czr" = ( @@ -3119,11 +3235,11 @@ /turf/simulated/floor/tiled/white, /area/endeavour/hallway/d3fwdhall) "cBe" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/spline/plain{ + dir = 6 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardforhall) +/turf/simulated/floor/carpet/turcarpet, +/area/crew_quarters/recreation_area) "cBD" = ( /obj/machinery/vending/loadout/loadout_misc, /turf/simulated/floor/tiled/dark, @@ -3169,7 +3285,7 @@ specialfunctions = 4 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_9) +/area/crew_quarters/sleep/Dorm_4) "cCJ" = ( /obj/machinery/fire_alarm/south_mount{ pixel_y = -24 @@ -3179,6 +3295,10 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "cCM" = ( @@ -3192,6 +3312,20 @@ /obj/item/gunbox, /turf/simulated/floor/tiled/dark, /area/security/armoury) +"cCX" = ( +/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/navgold/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardafthall) "cDs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -3217,8 +3351,15 @@ /obj/effect/floor_decal/corner/red/bordercorner{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"cEH" = ( +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "cFR" = ( /obj/structure/bed/chair/sofa/right, /turf/simulated/floor/wood, @@ -3276,39 +3417,24 @@ /turf/simulated/floor/airless, /area/space) "cGF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardafthall) -"cGU" = ( -/obj/effect/floor_decal/steeldecal/steel_decals5{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 10 - }, -/obj/machinery/shower{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/window/northleft{ - name = "Shower"; - req_access = list() - }, -/obj/structure/curtain/open/shower/engineering, /turf/simulated/floor/tiled, -/area/crew_quarters/sleep/Dorm_5) +/area/endeavour/hallway/d3starboardafthall) +"cGU" = ( +/obj/structure/flora/pottedplant/minitree, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "cGV" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/sleep/cryo) @@ -3324,17 +3450,8 @@ /turf/simulated/floor/plating, /area/maintenance/substation/civilian) "cHy" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/crew_quarters/bar) +/turf/simulated/wall/prepainted/cargo, +/area/crew_quarters/game_room) "cHK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -3352,6 +3469,9 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "cHX" = ( @@ -3440,14 +3560,14 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/prison/cell_block) "cLH" = ( +/obj/machinery/status_display{ + pixel_y = 32 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/status_display{ - pixel_y = 32 + dir = 6 }, /turf/simulated/floor/tiled/old_cargo/white, /area/security/forensics) @@ -3483,12 +3603,11 @@ /turf/simulated/floor/carpet, /area/security/detectives_office) "cMX" = ( -/obj/structure/table/woodentable, /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 1 }, -/turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/turf/simulated/floor/carpet/bcarpet, +/area/tether/surfacebase/entertainment) "cNj" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -3514,9 +3633,15 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "cPE" = ( -/obj/machinery/disposal, -/turf/simulated/floor/tiled, -/area/security/hanger) +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/security/hallway) "cPI" = ( /turf/simulated/wall/r_wall/prepainted, /area/security/nuke_storage) @@ -3550,6 +3675,9 @@ }, /obj/effect/floor_decal/borderfloor, /obj/machinery/portable_atmospherics/hydroponics, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hydroponics) "cQn" = ( @@ -3573,6 +3701,9 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "cRj" = ( @@ -3597,7 +3728,7 @@ icon_state = "4-8" }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_2) +/area/crew_quarters/sleep/Dorm_1) "cSt" = ( /obj/machinery/holopad, /obj/machinery/camera/network/security{ @@ -3613,36 +3744,39 @@ /turf/simulated/floor/water/deep/indoors, /area/crew_quarters/sleep/bedrooms) "cTe" = ( -/obj/machinery/power/apc/west_mount{ - cell_type = /obj/item/cell/super +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/obj/structure/cable/green{ - icon_state = "0-2" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, -/obj/structure/table/woodentable, -/obj/machinery/computer/security/telescreen{ - pixel_y = 32 +/obj/structure/cable/green{ + icon_state = "1-4" }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_3) +/area/crew_quarters/game_room) "cTU" = ( -/obj/structure/closet/crate/bin{ - anchored = 1 +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 9 }, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "cUe" = ( -/obj/machinery/light{ - dir = 1; - pixel_y = 20 +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-4" }, -/turf/simulated/floor/tiled, -/area/crew_quarters/bar) +/turf/simulated/floor/wood, +/area/crew_quarters/bar/lounge) "cUi" = ( /obj/structure/closet/secure_closet/freezer/kitchen, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/kitchen) @@ -3652,8 +3786,7 @@ }, /obj/machinery/appliance/cooker/fryer, /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /obj/effect/floor_decal/corner_oldtile/white/diagonal, /turf/simulated/floor/tiled/dark, @@ -3669,7 +3802,7 @@ icon_state = "4-8" }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_2) +/area/crew_quarters/sleep/Dorm_1) "cUO" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -3681,7 +3814,6 @@ /turf/simulated/floor/tiled/dark, /area/security/warden) "cVu" = ( -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/structure/cable/green{ icon_state = "1-4" @@ -3746,7 +3878,16 @@ icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/crew_quarters/bar) +/area/crew_quarters/bar/lounge) +"cXW" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "cYs" = ( /obj/structure/closet/gmcloset{ name = "formal wardrobe" @@ -3770,14 +3911,23 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "cYG" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 9 +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 }, -/turf/simulated/floor/carpet/blucarpet, +/obj/structure/table/woodentable, +/obj/item/storage/box/cups, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) +"cZa" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "cZb" = ( /obj/structure/closet/secure_closet/brig, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -3819,6 +3969,12 @@ }, /turf/simulated/floor/tiled/dark, /area/prison/cell_block) +"daE" = ( +/obj/machinery/camera/network/cargo{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/office) "daG" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -3870,12 +4026,6 @@ /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "dbR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -3918,12 +4068,12 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/security/nuke_storage) +/area/endeavour/hallway/d3portamidhall) "dcz" = ( -/obj/structure/curtain/open/shower/engineering, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/curtain/open/shower, /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "ddk" = ( @@ -3938,6 +4088,10 @@ }, /turf/simulated/floor/carpet, /area/security/brig) +"ddU" = ( +/obj/machinery/vending/cigarette, +/turf/simulated/floor/wood, +/area/crew_quarters/bar/lounge) "deg" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -3977,6 +4131,12 @@ /obj/effect/floor_decal/corner/navgold/bordercorner2{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardamidhall) "deG" = ( @@ -3987,13 +4147,10 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/prison/cell_block) "deJ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "deT" = ( @@ -4026,6 +4183,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portamidhall) "dfG" = ( @@ -4038,6 +4198,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "dfI" = ( @@ -4070,27 +4233,23 @@ "dgB" = ( /obj/machinery/holopad, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/kitchen) "dgX" = ( -/obj/structure/bed/chair/comfy/teal{ - dir = 8 - }, -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_y = -37 +/obj/structure/bed/chair/comfy/red{ + dir = 4 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_11) +/area/crew_quarters/sleep/Dorm_10) "dhd" = ( /obj/machinery/chem_master/condimaster, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/kitchen) "dhp" = ( -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/security_lockerroom) "dhq" = ( @@ -4101,8 +4260,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) @@ -4138,7 +4296,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/disposalpipe/junction/yjunction, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "dia" = ( @@ -4150,6 +4310,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "diH" = ( @@ -4171,6 +4332,9 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "diV" = ( @@ -4199,6 +4363,9 @@ dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals_central6, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "dkE" = ( @@ -4214,34 +4381,26 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "dlG" = ( -/obj/machinery/light{ - dir = 8; - light_range = 12 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/wood/sif, -/area/maintenance/dormitory) +/obj/machinery/holoposter{ + pixel_x = 32 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "dlI" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_8) "dlR" = ( -/obj/structure/cable/green{ - 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{ - id_tag = "dorm10"; - name = "Dorm 1" - }, -/obj/machinery/door/firedoor{ - dir = 8 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_5) +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/bar) "dmh" = ( /obj/structure/cable{ icon_state = "4-8" @@ -4260,6 +4419,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/bar/catwalk) "dmR" = ( @@ -4289,8 +4449,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloorblack/corner{ dir = 4 @@ -4298,6 +4456,10 @@ /obj/effect/floor_decal/corner/navblue/bordercorner{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "dnz" = ( @@ -4318,6 +4480,22 @@ }, /turf/simulated/floor/tiled/dark, /area/security/warden) +"dnR" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/game_room) +"dpk" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "dpX" = ( /obj/machinery/fire_alarm/south_mount{ pixel_y = -25 @@ -4329,8 +4507,7 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" + dir = 8 }, /turf/simulated/floor/wood, /area/crew_quarters/bar) @@ -4338,16 +4515,12 @@ /turf/simulated/floor/tiled/dark, /area/security/range) "dqu" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/lattice, +/obj/structure/disposalpipe/down{ + dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/open, /area/endeavour/hallway/d3aftmaint) "dqN" = ( /obj/machinery/recharger/wallcharger{ @@ -4367,12 +4540,16 @@ /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "drQ" = ( /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/substation/cargo) "drT" = ( @@ -4405,20 +4582,29 @@ /obj/machinery/camera/network/outside, /turf/space/basic, /area/space) -"dti" = ( -/obj/machinery/computer/secure_data{ +"dtc" = ( +/obj/machinery/camera/network/civilian{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3fwdhall) +"dti" = ( /obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, +/obj/machinery/vending/fitness, /turf/simulated/floor/wood, /area/security/breakroom) "duv" = ( /obj/structure/bed/double, /obj/item/bedsheet/reddouble, /turf/simulated/floor/carpet/gaycarpet, -/area/crew_quarters/sleep/Dorm_9) +/area/crew_quarters/sleep/Dorm_4) "dwE" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -4472,8 +4658,7 @@ /area/endeavour/hallway/d3fwdhall) "dyX" = ( /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /obj/effect/floor_decal/borderfloorblack{ dir = 5 @@ -4495,8 +4680,7 @@ icon_state = "1-2" }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -4530,8 +4714,7 @@ /area/security/evidence_storage) "dzx" = ( /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /obj/structure/window/basic{ dir = 1 @@ -4539,7 +4722,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "dzM" = ( -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_7) "dAT" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -4592,6 +4775,13 @@ "dBy" = ( /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) +"dBF" = ( +/obj/machinery/door/airlock/civilian{ + name = "Reading Room 1" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/wood, +/area/crew_quarters/bar/lounge) "dBL" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -4604,6 +4794,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "dER" = ( @@ -4663,24 +4856,17 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) "dGA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/sleep/Dorm_11) +/obj/structure/flora/pottedplant/bamboo, +/turf/simulated/floor/carpet, +/area/crew_quarters/sleep/Dorm_10) "dGV" = ( /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/bar/catwalk) "dHD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "2-4" }, @@ -4690,11 +4876,11 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "dHJ" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 1 }, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) "dHM" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -4706,15 +4892,9 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/refinery) "dHX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 8 }, @@ -4738,12 +4918,6 @@ /turf/simulated/floor/plating, /area/maintenance/substation/cargo) "dII" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, @@ -4797,13 +4971,13 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/security/breakroom) "dKV" = ( -/obj/machinery/fire_alarm/east_mount, /obj/structure/closet/wardrobe, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_6) +/turf/simulated/floor/carpet/sblucarpet, +/area/crew_quarters/sleep/Dorm_12) "dLj" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -4820,19 +4994,22 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "dME" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "dMY" = ( @@ -4977,7 +5154,13 @@ /obj/structure/table/woodentable, /obj/item/instrument/glockenspiel, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_4) +/area/crew_quarters/sleep/Dorm_11) +"dPj" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/old_cargo/gray, +/area/security/security_processing) "dPs" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -4996,6 +5179,11 @@ }, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"dRK" = ( +/obj/structure/table/woodentable, +/obj/machinery/microwave, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_6) "dRP" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -5020,6 +5208,11 @@ }, /turf/simulated/floor/tiled/dark, /area/prison/cell_block) +"dSc" = ( +/obj/structure/catwalk, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "dSg" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -5030,6 +5223,9 @@ /obj/effect/floor_decal/corner/navblue/bordercorner{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "dSm" = ( @@ -5056,6 +5252,18 @@ /obj/effect/floor_decal/corner_oldtile/white/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) +"dTf" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardforhall) "dTh" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -5096,22 +5304,22 @@ }, /turf/simulated/floor/plating, /area/endeavour/hallway/d3fwdmaint) -"dUF" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, +"dUA" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 9 }, -/obj/machinery/door/airlock{ - id_tag = "dorm5"; - name = "Dorm 5" +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3afthall) +"dUF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, -/obj/machinery/door/firedoor{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_7) @@ -5123,6 +5331,9 @@ dir = 4 }, /obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/starboardsolar) "dVs" = ( @@ -5135,6 +5346,9 @@ /obj/effect/floor_decal/corner/red/border{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "dVv" = ( @@ -5154,8 +5368,9 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "dVD" = ( -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/sleep/Dorm_3) +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_5) "dVI" = ( /obj/structure/window/reinforced{ dir = 4 @@ -5289,7 +5504,7 @@ specialfunctions = 4 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) +/area/crew_quarters/sleep/Dorm_2) "dZb" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -5306,6 +5521,9 @@ dir = 6 }, /obj/effect/floor_decal/corner/red/border, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "eaJ" = ( @@ -5313,11 +5531,12 @@ /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) "ebz" = ( -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_y = -37 +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green{ + icon_state = "0-8" }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_4) +/area/crew_quarters/sleep/Dorm_11) "ebL" = ( /obj/structure/sink{ dir = 8; @@ -5365,6 +5584,12 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armoury) +"ecM" = ( +/obj/structure/table/gamblingtable, +/obj/effect/floor_decal/spline/fancy/wood, +/obj/item/dice, +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/game_room) "ecO" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -5373,14 +5598,14 @@ /turf/simulated/floor/plating, /area/maintenance/substation/cargo) "edb" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/light{ - dir = 4 +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" }, +/obj/structure/table/woodentable, +/obj/item/instrument/saxophone, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) +/area/crew_quarters/sleep/Dorm_13) "edk" = ( /obj/machinery/mech_recharger, /turf/simulated/floor/tiled, @@ -5389,8 +5614,20 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -5; + pixel_y = -28 + }, +/obj/machinery/button/remote/airlock{ + id = "dorm13"; + name = "Room 13 Lock"; + pixel_x = 5; + pixel_y = -27; + specialfunctions = 4 + }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_6) +/area/crew_quarters/sleep/Dorm_12) "eek" = ( /turf/simulated/floor/wood, /area/vacant/vacant_shop) @@ -5418,8 +5655,7 @@ /area/security/warden) "efw" = ( /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 @@ -5428,6 +5664,9 @@ dir = 4 }, /obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) "efy" = ( @@ -5448,7 +5687,7 @@ icon_state = "4-8" }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_9) +/area/crew_quarters/sleep/Dorm_4) "efY" = ( /obj/machinery/light_construct{ dir = 1 @@ -5466,6 +5705,9 @@ /obj/map_helper/access_helper/airlock/station/supply/mining, /turf/simulated/floor/tiled, /area/quartermaster/miningdock) +"egw" = ( +/turf/simulated/floor/carpet/blue, +/area/crew_quarters/sleep/Dorm_3) "egL" = ( /obj/landmark/spawnpoint/job/janitor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -5487,12 +5729,8 @@ /turf/simulated/floor/reinforced, /area/quartermaster/miningdock) "eia" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/dark, /area/security/hallway) "eip" = ( @@ -5518,6 +5756,12 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) +"eiP" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "eiY" = ( @@ -5525,7 +5769,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_1) "eja" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, @@ -5548,38 +5792,38 @@ /turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) "ekc" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/machinery/light{ - dir = 8; - light_range = 12 - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "ekH" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_9) "ekX" = ( -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_5) -"elQ" = ( -/obj/structure/undies_wardrobe, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_4) -"emK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) +"elQ" = ( +/obj/structure/undies_wardrobe, +/turf/simulated/floor/carpet/blue, +/area/crew_quarters/sleep/Dorm_11) +"emK" = ( /obj/structure/cable/green{ icon_state = "1-8" }, @@ -5646,7 +5890,6 @@ /turf/simulated/floor/tiled/monotile, /area/endeavour/hallway/d3afthall) "enu" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) "enJ" = ( @@ -5697,8 +5940,8 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/lobby) "epe" = ( @@ -5715,13 +5958,6 @@ /obj/spawner/window/low_wall/full/firelocks, /turf/simulated/floor/plating, /area/endeavour/hallway/d3portforhall) -"eqm" = ( -/obj/machinery/light_switch{ - pixel_x = -9; - pixel_y = 30 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_6) "eqo" = ( /obj/machinery/airlock_sensor{ id_tag = "sec_shuttle_sensor"; @@ -5785,12 +6021,6 @@ /turf/simulated/floor/tiled, /area/security/brig) "esx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -5801,12 +6031,6 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "esA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 8 }, @@ -5814,6 +6038,12 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "esB" = ( @@ -5842,7 +6072,15 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, @@ -5868,8 +6106,7 @@ "etV" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled, @@ -5911,7 +6148,7 @@ /obj/structure/bed/double, /obj/item/bedsheet/browndouble, /turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/sleep/Dorm_2) +/area/crew_quarters/sleep/Dorm_1) "evn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -5976,7 +6213,6 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "exc" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/machinery/light{ dir = 1 }, @@ -5986,6 +6222,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portamidhall) "exf" = ( @@ -6047,6 +6286,9 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "eyV" = ( @@ -6054,16 +6296,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/security/hallway) -"ezf" = ( -/obj/machinery/button/remote/airlock{ - id = "dorm10"; - name = "Room 10 Lock"; - pixel_x = -26; - pixel_y = -4; - specialfunctions = 4 +"ezM" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_11) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3fwdhall) "eAj" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central6, /turf/simulated/floor/tiled, @@ -6079,24 +6322,12 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d3fwdmaint) "eBc" = ( -/obj/machinery/button/windowtint{ - id = "draama"; - name = "Mystery Window Tint Control"; - pixel_x = -24; - range = 10 - }, -/obj/effect/floor_decal/spline/plain{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, -/turf/simulated/floor/carpet/bcarpet, -/area/vacant/vacant_shop) +/turf/simulated/floor/wood, +/area/tether/surfacebase/entertainment) "eBf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/floor_decal/steeldecal/steel_decals_central6{ dir = 4 }, @@ -6106,24 +6337,21 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "eBh" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -23 - }, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -23 }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) @@ -6142,11 +6370,13 @@ /turf/simulated/floor/tiled/steel_grid, /area/endeavour/surfacebase/mining_main/refinery) "eBO" = ( -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled/monotile, /area/security/lobby) "eCc" = ( /obj/effect/floor_decal/industrial/outline/blue, @@ -6232,8 +6462,7 @@ pixel_y = 8 }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/security/armoury) @@ -6277,11 +6506,13 @@ /turf/simulated/floor/tiled/dark, /area/security/interrogation) "eDt" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/red/border, +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/turf/simulated/floor/tiled/dark, +/area/security/hallway) "eDJ" = ( /obj/structure/window/reinforced/tinted{ dir = 4 @@ -6343,6 +6574,12 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/tiled/monotile, /area/security/lobby) "eGj" = ( @@ -6385,47 +6622,23 @@ dir = 8 }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/storage) "eHQ" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - id_tag = "dorm4"; - name = "Dorm 4" - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_x = -32 }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_9) +/turf/simulated/floor/carpet/turcarpet, +/area/crew_quarters/recreation_area) "eHT" = ( -/obj/structure/cable/green{ - 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{ - id_tag = "dorm10"; - name = "Dorm 10" - }, -/obj/machinery/door/firedoor{ +/obj/effect/floor_decal/spline/plain{ dir = 8 }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_11) +/obj/machinery/vending/mre, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/recreation_area) "eIe" = ( /obj/structure/bed/chair/shuttle{ dir = 1 @@ -6449,18 +6662,10 @@ icon_state = "1-2" }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/tiled, -/area/security/nuke_storage) -"eIF" = ( -/obj/machinery/light_switch{ - pixel_x = 25; - pixel_y = 7 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_5) +/area/endeavour/hallway/d3portamidhall) "eJd" = ( /obj/machinery/requests_console/preset/janitor{ pixel_x = -33 @@ -6540,7 +6745,7 @@ /area/crew_quarters/barrestroom) "eLN" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "eLP" = ( /obj/effect/floor_decal/spline/fancy/wood, @@ -6569,12 +6774,6 @@ /turf/simulated/floor/tiled/monotile, /area/security/hallway) "eMM" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -6598,6 +6797,9 @@ }, /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/navblue/bordercorner, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "eNA" = ( @@ -6606,7 +6808,7 @@ dir = 1 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) +/area/crew_quarters/sleep/Dorm_2) "eNB" = ( /obj/spawner/window/low_wall/full/nogrille/firelocks, /obj/effect/paint/beastybrown, @@ -6637,8 +6839,7 @@ icon_state = "1-2" }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) @@ -6647,8 +6848,7 @@ dir = 9 }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /obj/structure/cable/green{ icon_state = "1-2" @@ -6657,16 +6857,12 @@ /turf/simulated/floor/tiled/dark, /area/security/brig) "eQM" = ( -/obj/item/stool/padded, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 9 - }, -/turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/obj/structure/musician/piano, +/turf/simulated/floor/carpet/bcarpet, +/area/tether/surfacebase/entertainment) "eRz" = ( /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /obj/effect/floor_decal/borderfloorblack{ dir = 6 @@ -6684,12 +6880,9 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "eSt" = ( -/obj/structure/closet/crate/bin{ - anchored = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 }, /turf/simulated/floor/tiled, /area/security/lobby) @@ -6700,16 +6893,19 @@ /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, /obj/machinery/light, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "eTr" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "eTs" = ( @@ -6724,6 +6920,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "eTx" = ( @@ -6736,10 +6935,12 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardamidhall) "eTJ" = ( -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_3) +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/security/lobby) "eUA" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -6752,6 +6953,9 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portamidhall) "eVd" = ( @@ -6778,17 +6982,11 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/turf/simulated/floor/carpet/blucarpet, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "eVN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_3) +/turf/simulated/wall/prepainted, +/area/crew_quarters/recreation_area) "eVP" = ( /obj/machinery/air_alarm{ pixel_y = 22 @@ -6824,13 +7022,20 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/uxstorage) "eWz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled, -/area/crew_quarters/bar) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar/lounge) "eWW" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -6841,6 +7046,9 @@ }, /obj/machinery/door/airlock/maintenance, /obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/starboardsolar) "eXr" = ( @@ -6914,6 +7122,7 @@ /obj/structure/cable/orange{ icon_state = "2-8" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/substation/cargo) "eZz" = ( @@ -6952,15 +7161,21 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "fbD" = ( -/obj/structure/musician/piano, -/obj/effect/floor_decal/spline/plain{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 9 }, -/turf/simulated/floor/carpet/bcarpet, -/area/vacant/vacant_shop) +/obj/structure/bed/chair/wood{ + dir = 4 + }, +/obj/landmark/spawnpoint/job/entertainer, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entertainment) "fbH" = ( /obj/machinery/air_alarm{ pixel_y = 22 @@ -7004,18 +7219,34 @@ req_one_access = null }, /obj/map_helper/access_helper/airlock/station/security/general, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"fdp" = ( +/obj/machinery/door/blast/regular/open{ + dir = 2; + id = "DRAMATIC"; + name = "Dramatic Blast Door" + }, +/obj/machinery/door/blast/shutters{ + dir = 4; + id = "Druma"; + name = "Entertainment Shutters" + }, +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/tether/surfacebase/entertainment) "fdy" = ( /obj/structure/cable/green, -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/interrogation) "fek" = ( /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -7037,22 +7268,29 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) +"feQ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardafthall) "ffn" = ( -/obj/item/stool/padded, -/obj/effect/floor_decal/spline/plain{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/obj/landmark/spawnpoint/job/entertainer, -/turf/simulated/floor/carpet/bcarpet, -/area/vacant/vacant_shop) +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entertainment) "ffu" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "ffP" = ( @@ -7063,11 +7301,19 @@ /turf/simulated/wall/prepainted/cargo, /area/quartermaster/office) "fgj" = ( -/obj/effect/floor_decal/industrial/warning{ +/obj/machinery/camera/network/civilian{ dir = 1 }, -/turf/simulated/floor/tiled, -/area/quartermaster/office) +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3portforhall) "fgJ" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -7080,9 +7326,6 @@ "fgL" = ( /obj/item/stool/padded, /obj/effect/floor_decal/spline/fancy/wood, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -7092,6 +7335,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "fgW" = ( @@ -7166,6 +7412,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "fiP" = ( @@ -7184,23 +7433,18 @@ icon_state = "0-4" }, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) "fjc" = ( /turf/simulated/floor/tiled, /area/security/range) "fjn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "fjp" = ( @@ -7229,7 +7473,6 @@ "fjB" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/bar) "fjY" = ( @@ -7249,11 +7492,17 @@ /turf/simulated/floor/reinforced, /area/quartermaster/miningdock) "fkv" = ( -/obj/machinery/newscaster{ - pixel_x = -28 - }, /obj/machinery/fitness/heavy/lifter, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "fkV" = ( /obj/machinery/camera/network/outside{ @@ -7267,6 +7516,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) "flg" = ( @@ -7283,9 +7536,6 @@ "flh" = ( /obj/machinery/door/airlock/maintenance, /obj/map_helper/access_helper/airlock/station/engineering/department, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor{ dir = 8 }, @@ -7329,11 +7579,11 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "fnh" = ( -/obj/structure/bed/chair/comfy/teal{ - dir = 4 +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_5) +/area/crew_quarters/sleep/Dorm_6) "fnv" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 9 @@ -7344,8 +7594,6 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "fnF" = ( -/obj/effect/paint/darkred, -/obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /turf/simulated/floor/plating, /area/prison/cell_block) @@ -7365,13 +7613,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/light/small{ dir = 4 }, /turf/simulated/floor/wood, @@ -7386,6 +7628,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "fpx" = ( @@ -7400,6 +7645,7 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "fpB" = ( @@ -7413,13 +7659,15 @@ /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) "fqc" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portamidhall) "fqM" = ( @@ -7441,8 +7689,37 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/hydroponics) +"frY" = ( +/obj/structure/table/woodentable, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entertainment) +"fsu" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3afthall) "fta" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/crystal, @@ -7487,8 +7764,20 @@ dir = 4; icon_state = "pipe-c" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) +"fxn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar/lounge) "fxG" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -7497,8 +7786,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/tiled, /area/hydroponics) @@ -7517,12 +7805,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/interrogation) -"fzx" = ( -/obj/machinery/newscaster{ - pixel_y = 32 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_11) "fzD" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -7562,6 +7844,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/security/hallway) "fBG" = ( @@ -7573,14 +7856,23 @@ dir = 1 }, /obj/random/bedsheet, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_4) +/turf/simulated/floor/carpet/blue, +/area/crew_quarters/sleep/Dorm_11) "fBZ" = ( -/obj/structure/toilet{ - pixel_y = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_5) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "fCO" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -7590,6 +7882,10 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/brig) +"fCQ" = ( +/obj/structure/undies_wardrobe, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_10) "fCZ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -7644,18 +7940,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) -"fEB" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_5) "fET" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -7667,8 +7951,7 @@ pixel_x = -32 }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/tiled, /area/hydroponics) @@ -7676,8 +7959,8 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "fFD" = ( @@ -7702,6 +7985,9 @@ /obj/structure/cable/orange{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "fIm" = ( @@ -7884,6 +8170,14 @@ "fLU" = ( /turf/simulated/wall/prepainted/cargo, /area/endeavour/surfacebase/mining_main/refinery) +"fMA" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "fMJ" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -8020,7 +8314,6 @@ /turf/simulated/floor/tiled/dark, /area/security/riot_control) "fNN" = ( -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/structure/cable/green{ icon_state = "2-8" @@ -8053,6 +8346,9 @@ /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) "fPA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "fPF" = ( @@ -8162,6 +8458,12 @@ /obj/map_helper/access_helper/airlock/station/security/general, /turf/simulated/floor/tiled/old_cargo/gray, /area/security/interrogation) +"fRk" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3afthall) "fRx" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -8182,7 +8484,7 @@ icon_state = "4-8" }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) +/area/crew_quarters/sleep/Dorm_2) "fSr" = ( /obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ @@ -8206,7 +8508,6 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "fSG" = ( -/obj/effect/paint/darkred, /obj/machinery/camera/network/security, /turf/simulated/floor/plating, /area/security/hanger) @@ -8232,15 +8533,9 @@ /turf/simulated/floor/tiled/steel, /area/shuttle/belter) "fTU" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d3starboardafthall) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "fUc" = ( /obj/structure/bed/chair/sofa, /obj/machinery/light{ @@ -8300,19 +8595,31 @@ }, /turf/simulated/floor/carpet, /area/security/detectives_office) +"fVW" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/wall/prepainted/security, +/area/security/hallway) "fWt" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/dormitory) -"fWD" = ( -/obj/structure/dogbed, /turf/simulated/floor/tiled, -/area/crew_quarters/bar) +/area/endeavour/hallway/d3starboardamidhall) +"fWD" = ( +/obj/machinery/camera/network/outside{ + dir = 8 + }, +/obj/structure/lattice, +/turf/space/basic, +/area/space) "fWO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -8335,15 +8642,10 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/prison/cell_block) "fYb" = ( -/obj/machinery/button/remote/airlock{ - id = "dorm5"; - name = "Room 5 Lock"; - pixel_x = 26; - pixel_y = -4; - specialfunctions = 4 - }, +/obj/structure/table/woodentable, +/obj/machinery/microwave, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_7) +/area/crew_quarters/sleep/Dorm_3) "fYk" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 6 @@ -8352,7 +8654,9 @@ dir = 6 }, /obj/machinery/disposal, -/obj/item/barrier_tape_segment/engineering, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "fYn" = ( @@ -8391,8 +8695,8 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/interrogation) "fYy" = ( @@ -8426,7 +8730,6 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "gbe" = ( -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/armoury) @@ -8558,7 +8861,7 @@ /area/crew_quarters/bar) "ghh" = ( /obj/machinery/door/airlock{ - id_tag = "dorm10"; + id_tag = "dorm1"; name = "Dorm 1" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -8571,14 +8874,14 @@ icon_state = "4-8" }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_2) +/area/crew_quarters/sleep/Dorm_1) "ghO" = ( /obj/structure/flora/ausbushes/stalkybush, /turf/simulated/floor/water/deep/indoors, /area/crew_quarters/sleep/bedrooms) "ghV" = ( /obj/machinery/disposal, -/obj/structure/disposalpipe/up{ +/obj/structure/disposalpipe/trunk{ dir = 8 }, /turf/simulated/floor/tiled/dark, @@ -8592,12 +8895,6 @@ /turf/simulated/floor/carpet/bcarpet, /area/vacant/vacant_shop) "gig" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "1-8" }, @@ -8635,6 +8932,10 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "gjE" = ( @@ -8650,18 +8951,8 @@ /turf/simulated/wall/prepainted/civilian, /area/hydroponics) "glK" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/button/remote/airlock{ - id = "dorm11"; - name = "Room 11 Lock"; - pixel_x = -26; - pixel_y = -4; - specialfunctions = 4 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_3) +/turf/simulated/floor/carpet/purcarpet, +/area/crew_quarters/sleep/Dorm_5) "glV" = ( /obj/machinery/air_alarm{ pixel_y = 22 @@ -8702,6 +8993,27 @@ }, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"gmN" = ( +/obj/machinery/status_display/supply_display{ + pixel_y = 32 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "gmZ" = ( /obj/machinery/light{ dir = 1; @@ -8712,6 +9024,10 @@ "gnm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/disposalpipe/up{ + dir = 4 + }, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "gnO" = ( @@ -8730,12 +9046,16 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "gos" = ( -/turf/simulated/floor/wood, -/area/crew_quarters/fitness) -"gox" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/scale, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, +/obj/effect/floor_decal/corner_steel_grid{ dir = 4 }, +/turf/simulated/floor/tiled, +/area/crew_quarters/fitness) +"gox" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -8752,6 +9072,9 @@ /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, /obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "goX" = ( @@ -8799,8 +9122,7 @@ }, /obj/machinery/air_alarm/north_mount, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /obj/structure/cable/green{ icon_state = "0-4" @@ -8848,15 +9170,15 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/security/evidence_storage) "grz" = ( -/obj/structure/table/woodentable, /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, /obj/machinery/light{ dir = 4 }, +/obj/structure/coatrack, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) "grA" = ( /obj/effect/floor_decal/borderfloorblack/corner2{ alpha = 255; @@ -8903,7 +9225,6 @@ dir = 8 }, /obj/spawner/window/low_wall/borosillicate/reinforced/full, -/obj/effect/paint/darkred, /turf/simulated/floor, /area/security/hanger) "gtM" = ( @@ -8947,6 +9268,7 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "guN" = ( @@ -8963,10 +9285,10 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/security/interrogation) "gvA" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/simulated/floor/carpet/blucarpet, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "gwQ" = ( /obj/machinery/fire_alarm/west_mount{ @@ -8993,18 +9315,17 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "gxZ" = ( -/obj/machinery/light_switch{ - pixel_x = -25 - }, +/obj/structure/closet/wardrobe, +/obj/item/toy/plushie/crab, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_7) +/area/crew_quarters/sleep/Dorm_8) "gyJ" = ( /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d3afthall) "gAa" = ( /obj/structure/cable/green, -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/prison/cell_block) "gBm" = ( @@ -9014,6 +9335,13 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "gBU" = ( @@ -9038,12 +9366,12 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "gCh" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/railing{ + dir = 1 }, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/bar) +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "gCO" = ( /obj/machinery/camera/network/command{ dir = 9 @@ -9055,7 +9383,7 @@ /obj/item/storage/box/donkpockets, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) +/area/crew_quarters/sleep/Dorm_2) "gCW" = ( /obj/machinery/shipsensors, /turf/simulated/floor/airless, @@ -9076,13 +9404,11 @@ "gDD" = ( /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) +"gDZ" = ( +/obj/structure/dogbed, +/turf/simulated/floor/plating, +/area/maintenance/bar/catwalk) "gEz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -9117,19 +9443,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/turf/simulated/floor/tiled, -/area/crew_quarters/bar) -"gFP" = ( /obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + icon_state = "1-2" }, /turf/simulated/floor/wood, +/area/crew_quarters/bar/lounge) +"gFP" = ( +/obj/structure/flora/pottedplant/orientaltree, +/turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_7) "gFU" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -9148,7 +9469,8 @@ /area/hydroponics) "gHX" = ( /obj/machinery/fitness/heavy/lifter, -/turf/simulated/floor/carpet/bcarpet, +/obj/effect/floor_decal/corner_steel_grid/diagonal, +/turf/simulated/floor/tiled, /area/security/breakroom) "gII" = ( /obj/structure/table/rack, @@ -9159,12 +9481,6 @@ /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "gJc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "2-8" }, @@ -9189,14 +9505,27 @@ /turf/simulated/floor/plating, /area/maintenance/substation/security) "gKi" = ( -/obj/structure/closet/crate/bin{ - anchored = 1 - }, /obj/item/radio/intercom{ pixel_y = -24 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_4) +/area/crew_quarters/sleep/Dorm_11) +"gKQ" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3fwdmaint) +"gLo" = ( +/obj/machinery/air_alarm/east_mount, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/game_room) "gLw" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/plating, @@ -9211,8 +9540,7 @@ /obj/item/storage/toolbox/mechanical, /obj/structure/table/reinforced, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/refinery) @@ -9253,7 +9581,7 @@ name = "curtain" }, /turf/simulated/floor/plating, -/area/crew_quarters/bar) +/area/crew_quarters/bar/lounge) "gMk" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, @@ -9263,6 +9591,9 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "gMF" = ( @@ -9306,9 +9637,26 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) +"gNZ" = ( +/obj/machinery/door/airlock/civilian{ + name = "Game Room" + }, +/obj/structure/curtain/black, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/game_room) "gOa" = ( /turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/sleep/Dorm_1) +/area/crew_quarters/sleep/Dorm_2) "gOb" = ( /obj/machinery/recharge_station, /turf/simulated/floor/tiled/steel, @@ -9325,7 +9673,6 @@ /turf/simulated/floor/tiled/dark, /area/security/armoury) "gQq" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -9353,19 +9700,35 @@ /turf/simulated/floor/plating, /area/maintenance/cargo/mining) "gRa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/light{ - dir = 8; - light_range = 12 +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/button/remote/airlock{ + id = "dorm9"; + name = "Room 9 Lock"; + pixel_x = -7; + pixel_y = -24; + specialfunctions = 4 }, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_hallway) +/area/crew_quarters/sleep/Dorm_9) "gRf" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/endeavour/hallway/d3fwdmaint) +"gRi" = ( +/obj/structure/table/gamblingtable, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/item/dice, +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/game_room) "gRy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -9426,6 +9789,9 @@ /obj/effect/floor_decal/corner/navblue/border, /obj/effect/floor_decal/borderfloorblack/corner2, /obj/effect/floor_decal/corner/navblue/bordercorner2, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "gSN" = ( @@ -9441,15 +9807,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/airlock{ - id_tag = "dorm7"; - name = "Dorm 7" - }, /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/door/airlock{ + id_tag = "dorm11"; + name = "Dorm 11" + }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_8) +/area/crew_quarters/sleep/Dorm_13) "gTr" = ( /obj/effect/floor_decal/borderfloorblack/corner{ dir = 4 @@ -9459,8 +9828,24 @@ }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) +"gUM" = ( +/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/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "gVa" = ( /obj/machinery/holopad/ship, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "gVq" = ( @@ -9477,10 +9862,6 @@ /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "gVA" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -9527,6 +9908,8 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "gYb" = ( @@ -9555,6 +9938,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/security/hallway) "gZQ" = ( @@ -9588,6 +9972,9 @@ /obj/machinery/computer/timeclock/premade/south, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "hbK" = ( @@ -9643,16 +10030,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) -"hcE" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/air_alarm/east_mount, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) "hcH" = ( /obj/machinery/requests_console/preset/cargo{ pixel_x = 30 @@ -9670,8 +10047,7 @@ icon_state = "1-2" }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -9685,6 +10061,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/cargo/mining) "hdY" = ( @@ -9694,6 +10071,12 @@ /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, /obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "heb" = ( @@ -9711,6 +10094,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "heJ" = ( @@ -9719,12 +10103,22 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) +"heO" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/maintenance/cargo/mining) "hgm" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/item/radio/intercom{ pixel_y = -24 }, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "hhE" = ( @@ -9735,23 +10129,20 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/red/border, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "hhJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/endeavour/hallway/d3fwdhall) -"hij" = ( -/obj/machinery/light{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d3fwdhall) "hiy" = ( /obj/machinery/light{ dir = 4 @@ -9766,10 +10157,13 @@ /turf/simulated/floor/tiled/techfloor, /area/security/lobby) "hjz" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 5 +/obj/effect/floor_decal/corner_steel_grid{ + dir = 6 + }, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 1 }, -/turf/simulated/floor/carpet/blucarpet, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "hjP" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -9788,9 +10182,9 @@ dir = 4 }, /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/security/hallway) "hkm" = ( @@ -9810,7 +10204,7 @@ /turf/simulated/floor/water/deep/indoors, /area/crew_quarters/sleep/bedrooms) "hkE" = ( -/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/vacant/vacant_shop) "hkI" = ( @@ -9824,8 +10218,11 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/turf/simulated/floor/tiled, -/area/crew_quarters/bar) +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar/lounge) "hkY" = ( /obj/structure/sign/directions/evac{ dir = 4 @@ -9839,15 +10236,22 @@ /turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/qm) "hlx" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /obj/machinery/button/remote/airlock{ - id = "dorm1"; - name = "Room 1 Lock"; - pixel_x = -26; - pixel_y = -4; + id = "dorm6"; + name = "Room 6 Lock"; + pixel_x = 7; + pixel_y = 24; specialfunctions = 4 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_5) +/area/crew_quarters/sleep/Dorm_6) "hmd" = ( /obj/machinery/light_switch{ dir = 4; @@ -9859,26 +10263,20 @@ /turf/simulated/floor/tiled, /area/security/lobby) "hmk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/quartermaster/office) +"hmF" = ( /obj/structure/disposalpipe/segment{ - dir = 8 + dir = 8; + icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardamidhall) -"hmF" = ( -/obj/effect/floor_decal/corner/green{ - dir = 10 + dir = 9 }, -/turf/simulated/floor/tiled, -/area/hydroponics) +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_10) "hmO" = ( /obj/machinery/door/airlock/engineering{ name = "Solars"; @@ -9903,6 +10301,15 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) +"hnK" = ( +/obj/structure/bed/chair/wood{ + dir = 4 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/game_room) "hoi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -9919,18 +10326,21 @@ /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) "hoH" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/sleep/Dorm_9) +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area_hallway) "hpc" = ( /obj/structure/table/woodentable, /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) "hpk" = ( /obj/machinery/shield_diffuser, /obj/machinery/door/airlock/glass_external{ @@ -9975,6 +10385,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/cargo/mining) "hrV" = ( @@ -10018,21 +10429,24 @@ req_one_access = null }, /obj/map_helper/access_helper/airlock/station/security/general, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "hte" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/structure/cable/orange{ +/obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 1 - }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardforhall) +/area/endeavour/hallway/d3starboardafthall) "htn" = ( /obj/machinery/door/firedoor, /obj/structure/cable/green{ @@ -10040,12 +10454,13 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock{ - id_tag = "dorm3"; - name = "Dorm 3" + id_tag = "dorm13"; + name = "Dorm 13" }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_4) +/area/crew_quarters/sleep/Dorm_11) "hup" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Deck 3 Aft Grid" @@ -10100,8 +10515,7 @@ /area/maintenance/substation/security) "hvh" = ( /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /obj/structure/sign/warning/caution{ pixel_x = -32 @@ -10203,6 +10617,18 @@ "hyv" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_5) +"hyQ" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3fwdhall) "hzi" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -10218,14 +10644,16 @@ /turf/simulated/floor/tiled/old_cargo/red, /area/security/security_processing) "hBC" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/sleep/Dorm_11) +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_8) "hBU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -10244,12 +10672,21 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "hCy" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/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/wood, /area/crew_quarters/recreation_area) "hCM" = ( @@ -10259,16 +10696,9 @@ /turf/simulated/floor/tiled/dark, /area/security/riot_control) "hCU" = ( -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/wood, +/obj/structure/bed/double, +/obj/item/bedsheet/yellowdouble, +/turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_9) "hDl" = ( /obj/machinery/camera/network/cargo, @@ -10292,11 +10722,12 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/bar/lower) "hEc" = ( -/turf/simulated/floor/carpet/bcarpet, -/area/vacant/vacant_shop) +/turf/simulated/floor/wood, +/area/tether/surfacebase/entertainment) "hEe" = ( /obj/machinery/camera/network/civilian{ dir = 1 @@ -10307,6 +10738,22 @@ /obj/effect/floor_decal/corner_oldtile/white/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) +"hEO" = ( +/obj/machinery/light{ + dir = 1; + pixel_y = 20 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3portforhall) "hFn" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor, @@ -10318,6 +10765,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "hGe" = ( @@ -10327,6 +10775,17 @@ }, /turf/simulated/floor/crystal, /area/endeavour/hallway/d3fwdhall) +"hGm" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3fwdhall) "hGu" = ( /obj/structure/sink{ pixel_y = 22 @@ -10367,8 +10826,9 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_6) +/obj/machinery/fire_alarm/east_mount, +/turf/simulated/floor/carpet/sblucarpet, +/area/crew_quarters/sleep/Dorm_12) "hIB" = ( /obj/machinery/camera/network/civilian, /obj/effect/floor_decal/borderfloorblack{ @@ -10386,7 +10846,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "hJm" = ( /obj/machinery/door/firedoor, @@ -10408,16 +10868,27 @@ /obj/machinery/holopad, /turf/simulated/floor/tiled/old_cargo/gray, /area/security/interrogation) +"hKd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/fire_alarm/west_mount, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar/lounge) "hKI" = ( /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, -/obj/effect/floor_decal/steeldecal/steel_decals_central6, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "hLd" = ( @@ -10469,7 +10940,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) "hLN" = ( /obj/machinery/camera/network/civilian{ dir = 1 @@ -10479,6 +10950,9 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "hMc" = ( @@ -10509,11 +10983,15 @@ /turf/simulated/floor/carpet/bcarpet, /area/vacant/vacant_shop) "hNb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_11) +/obj/machinery/light_switch{ + pixel_x = -26; + pixel_y = -4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_10) "hNe" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -10551,6 +11029,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "hOJ" = ( @@ -10587,12 +11069,8 @@ /turf/simulated/floor/tiled/dark, /area/security/armoury) "hPt" = ( -/obj/item/stool/padded, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/turf/simulated/floor/carpet/bcarpet, +/area/tether/surfacebase/entertainment) "hQd" = ( /obj/structure/cable{ icon_state = "1-2" @@ -10635,11 +11113,16 @@ /turf/simulated/wall/r_wall/prepainted, /area/crew_quarters/sleep/Dorm_6) "hTJ" = ( -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -24 - }, +/obj/structure/closet/wardrobe, +/obj/item/toy/plushie/rat, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_9) +/area/crew_quarters/sleep/Dorm_6) +"hUg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) "hUF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -10698,11 +11181,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/kitchen) -"hWN" = ( -/obj/structure/bed/double/padded, -/obj/random/bedsheet/double, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_5) "hXA" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -10735,15 +11213,15 @@ /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) "hYA" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 }, -/obj/structure/closet/crate/bin{ - anchored = 1 +/obj/machinery/light_switch{ + pixel_x = -26; + pixel_y = -4 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_5) +/area/crew_quarters/sleep/Dorm_6) "hYD" = ( /obj/machinery/door/airlock{ name = "Kitchen"; @@ -10831,12 +11309,6 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, -/obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/navgold/bordercorner2{ - dir = 9 - }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "iaP" = ( @@ -10855,20 +11327,30 @@ alpha = 255 }, /obj/effect/floor_decal/corner/navgold/bordercorner2, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) "ibp" = ( -/obj/machinery/camera/network/civilian{ - dir = 8 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock{ + id_tag = "dorm9"; + name = "Dorm 9" }, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_hallway) +/area/crew_quarters/sleep/Dorm_9) "ibA" = ( /turf/simulated/wall/r_wall/prepainted, -/area/crew_quarters/sleep/Dorm_4) +/area/tether/surfacebase/entertainment) "ibL" = ( -/obj/machinery/vending/weeb, -/turf/simulated/floor/wood, +/obj/structure/closet/wardrobe/mixed, +/turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area) "ibT" = ( /obj/structure/undies_wardrobe, @@ -10887,8 +11369,26 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/security/hallway) -"icM" = ( +"icz" = ( +/obj/structure/bed/chair/wood{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, /turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/game_room) +"icM" = ( +/obj/effect/floor_decal/corner_steel_grid{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/obj/effect/floor_decal/corner/red{ + dir = 8 + }, +/turf/simulated/floor/tiled, /area/security/breakroom) "ieG" = ( /obj/machinery/ai_status_display{ @@ -10899,18 +11399,14 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d3starboardamidhall) -"ifc" = ( -/obj/machinery/power/apc/west_mount{ - cell_type = /obj/item/cell/super +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/structure/undies_wardrobe, -/obj/structure/cable/green{ - icon_state = "0-4" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_7) +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3starboardamidhall) "ifE" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -11020,7 +11516,6 @@ /turf/simulated/open, /area/endeavour/hallway/d3starboardforhall) "ikx" = ( -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/structure/cable/green{ icon_state = "2-4" @@ -11048,7 +11543,10 @@ /area/space) "ili" = ( /obj/machinery/disposal, -/obj/structure/disposalpipe/up, +/obj/structure/disposalpipe/trunk, +/obj/machinery/camera/network/civilian{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "ilD" = ( @@ -11058,19 +11556,8 @@ /turf/simulated/floor/plating, /area/crew_quarters/sleep/cryo) "imb" = ( -/obj/machinery/door/blast/regular/open{ - dir = 2; - id = "DRAMATIC"; - name = "Dramatic Blast Door" - }, -/obj/machinery/door/blast/shutters{ - dir = 4; - id = "Druma"; - name = "Entertainment Shutters" - }, -/obj/spawner/window/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/vacant/vacant_shop) +/turf/simulated/wall/r_wall/prepainted/civilian, +/area/tether/surfacebase/entertainment) "imx" = ( /obj/machinery/access_button{ command = "cycle_int"; @@ -11087,31 +11574,15 @@ /turf/simulated/floor/plating, /area/security/hallway) "imX" = ( -/turf/simulated/floor/carpet/purcarpet, +/turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_9) "inp" = ( -/obj/effect/floor_decal/steeldecal/steel_decals5{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 10 - }, -/obj/machinery/shower{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/window/northleft{ - name = "Shower"; - req_access = list() - }, -/obj/structure/curtain/open/shower/engineering, -/turf/simulated/floor/tiled, -/area/crew_quarters/sleep/Dorm_11) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals_central6, +/turf/simulated/floor/tiled/monotile, +/area/security/lobby) "inw" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/camera/network/cargo{ @@ -11218,17 +11689,25 @@ }, /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) -"irP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +"irx" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_5) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) +"irP" = ( +/obj/structure/bed/double, +/obj/item/bedsheet/cosmosdouble, +/turf/simulated/floor/carpet/tealcarpet, +/area/crew_quarters/sleep/Dorm_8) "irT" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 4 + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 8 }, -/obj/effect/floor_decal/steeldecal/steel_decals10, /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "irY" = ( @@ -11278,10 +11757,12 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "itv" = ( -/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/techmaint, -/area/vacant/vacant_shop) +/obj/machinery/door/airlock/multi_tile/glass{ + name = "Entertainment Auditorium" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/entertainment) "iuv" = ( /obj/machinery/air_alarm/east_mount, /turf/simulated/floor/tiled/dark, @@ -11330,7 +11811,6 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "ixU" = ( -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/structure/cable/green{ icon_state = "2-8" @@ -11338,13 +11818,15 @@ /turf/simulated/floor/plating, /area/security/warden) "iyq" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "iyz" = ( @@ -11383,17 +11865,14 @@ /turf/simulated/floor/tiled, /area/security/hanger) "iAO" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/bed/chair/wood{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light{ - dir = 8; - light_range = 12 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_hallway) +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/game_room) "iAR" = ( /obj/machinery/door/airlock/highsecurity{ name = "High Security Lockup"; @@ -11415,12 +11894,21 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) +"iCe" = ( +/obj/structure/bed/chair/wood{ + dir = 4 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/game_room) "iCt" = ( -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/security_processing) "iCL" = ( @@ -11465,8 +11953,7 @@ dir = 9 }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) @@ -11491,20 +11978,10 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/security/security_processing) "iFu" = ( -/obj/structure/cable/green{ - 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-2" - }, +/obj/structure/table/woodentable, +/obj/item/storage/box/donkpockets, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) +/area/crew_quarters/sleep/Dorm_5) "iFN" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -11522,28 +11999,23 @@ /turf/simulated/floor/plating, /area/maintenance/substation/civilian) "iFW" = ( -/obj/machinery/light_switch{ - pixel_x = 25; - pixel_y = 7 - }, -/obj/machinery/newscaster{ - pixel_y = 32 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_3) -"iHD" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardforhall) +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/red/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/security/hallway) +"iHD" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/crew_quarters/recreation_area) "iHU" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -11559,12 +12031,14 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "iIq" = ( /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /obj/machinery/computer/supplycomp/control{ dir = 4 @@ -11584,18 +12058,31 @@ /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "iIC" = ( /obj/machinery/door/firedoor, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) +"iID" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/crew_quarters/sleep/Dorm_13) "iIN" = ( /obj/structure/disposalpipe/segment{ dir = 1 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/bar/lower) "iIU" = ( @@ -11614,11 +12101,14 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "iJh" = ( +/obj/structure/closet/crate/trashcart, +/obj/item/instrument/banjo, /obj/machinery/light/small{ dir = 1 }, /obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled, +/obj/random/drinkbottle, +/turf/simulated/floor/tiled/dark, /area/maintenance/starboardsolar) "iJx" = ( /obj/machinery/door/firedoor{ @@ -11657,19 +12147,9 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "iKe" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/navblue/bordercorner2{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "iKB" = ( @@ -11691,9 +12171,10 @@ /turf/simulated/floor/tiled/monotile, /area/crew_quarters/bar) "iLr" = ( -/obj/structure/closet/wardrobe, +/obj/structure/table/woodentable, +/obj/item/storage/box/donkpockets, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_9) +/area/crew_quarters/sleep/Dorm_6) "iNn" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/plain{ @@ -11717,12 +12198,22 @@ /turf/simulated/floor/plating, /area/security/hallway) "iNR" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/machinery/light/small{ +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_11) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/button/remote/airlock{ + id = "dorm8"; + name = "Room 8 Lock"; + pixel_x = 7; + pixel_y = 24; + specialfunctions = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_8) "iNY" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -11754,9 +12245,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor{ +/obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/light/small, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "iQf" = ( @@ -11807,6 +12299,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/structure/disposalpipe/segment, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "iSP" = ( @@ -11820,12 +12314,10 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/cargo/mining) "iTp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -11934,8 +12426,7 @@ dir = 10 }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /obj/machinery/mech_recharger, /obj/vehicle/sealed/mecha/combat/fighter/baron/sec/loaded, @@ -11979,35 +12470,14 @@ /obj/machinery/door/firedoor, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardforhall) -"jbw" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/borderfloorblack, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/machinery/door/airlock/glass/security{ - layer = 2.8; - name = "Security"; - req_one_access = null + dir = 5 }, -/obj/map_helper/access_helper/airlock/station/security/general, -/turf/simulated/floor/tiled/dark, -/area/security/hallway) +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardforhall) "jbI" = ( /obj/machinery/light, /obj/structure/cable/orange{ @@ -12017,6 +12487,9 @@ /obj/effect/floor_decal/corner/navblue/border, /obj/effect/floor_decal/borderfloorblack/corner2, /obj/effect/floor_decal/corner/navblue/bordercorner2, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "jbL" = ( @@ -12037,7 +12510,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/security/nuke_storage) +/area/endeavour/hallway/d3portamidhall) "jeb" = ( /obj/structure/table/marble, /obj/machinery/door/blast/shutters{ @@ -12114,12 +12587,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, /turf/simulated/floor/tiled, /area/security/lobby) "jhH" = ( @@ -12136,12 +12603,12 @@ /turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/foyer) "jhI" = ( -/obj/structure/coatrack, /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, +/obj/structure/table/woodentable, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) "jhS" = ( /obj/machinery/button/remote/airlock{ id = "dorm8"; @@ -12172,8 +12639,17 @@ dir = 1 }, /obj/landmark/spawnpoint/job/mime, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) +"jid" = ( +/turf/simulated/wall/prepainted, +/area/endeavour/hallway/d3portamidhall) "jip" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 5 @@ -12197,6 +12673,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "jjl" = ( @@ -12213,7 +12692,7 @@ pixel_y = 26 }, /obj/machinery/disposal, -/obj/item/barrier_tape_segment/engineering, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/tiled/old_tile/gray, /area/security/range) "jkq" = ( @@ -12321,20 +12800,22 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "jmJ" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "jmL" = ( /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "jmQ" = ( @@ -12362,8 +12843,7 @@ /obj/effect/floor_decal/industrial/outline/red, /obj/item/storage/box/flashbangs, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) @@ -12378,7 +12858,15 @@ icon_state = "4-8" }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_4) +/area/crew_quarters/sleep/Dorm_3) +"jnU" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/machinery/light_switch{ + pixel_x = 26; + pixel_y = -4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_9) "jon" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint_stripe/beastybrown, @@ -12411,11 +12899,11 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "jqq" = ( -/obj/item/radio/intercom{ - pixel_y = -24 +/obj/structure/disposalpipe/junction{ + dir = 4 }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_9) +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardafthall) "jqz" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -12452,6 +12940,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/security/hallway) "jtk" = ( @@ -12505,15 +12994,18 @@ /turf/simulated/floor/airless, /area/space) "jvb" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "jvj" = ( @@ -12528,6 +13020,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "jwr" = ( @@ -12569,11 +13064,14 @@ /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "jyd" = ( -/obj/structure/toilet{ - pixel_y = 10 +/obj/effect/floor_decal/corner_steel_grid{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_11) +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/security/breakroom) "jzf" = ( /obj/structure/table/woodentable, /obj/machinery/photocopier/faxmachine{ @@ -12646,7 +13144,7 @@ /area/endeavour/surfacebase/mining_main/storage) "jAH" = ( /turf/simulated/wall/prepainted/cargo, -/area/crew_quarters/bar) +/area/crew_quarters/bar/lounge) "jBe" = ( /obj/machinery/suit_cycler/mining, /obj/effect/floor_decal/borderfloor{ @@ -12734,12 +13232,6 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "jEn" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lime/bordercorner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -12769,6 +13261,9 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "jGe" = ( @@ -12797,8 +13292,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /obj/structure/cable/green{ icon_state = "1-2" @@ -12811,16 +13305,28 @@ }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) +"jGP" = ( +/obj/structure/table/gamblingtable, +/obj/item/deck/cards, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/game_room) "jGZ" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"jHe" = ( +/obj/structure/disposalpipe/junction, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "jHk" = ( /obj/machinery/door/firedoor/glass{ dir = 8 }, /obj/spawner/window/low_wall/borosillicate/reinforced/full, -/obj/effect/paint/darkred, /turf/simulated/floor, /area/security/hanger) "jHr" = ( @@ -12848,7 +13354,7 @@ specialfunctions = 4 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_2) +/area/crew_quarters/sleep/Dorm_1) "jJA" = ( /obj/machinery/camera/network/command{ dir = 4 @@ -12865,12 +13371,6 @@ /turf/simulated/floor/tiled/old_cargo/white, /area/security/forensics) "jKE" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 - }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, @@ -12902,10 +13402,10 @@ icon_state = "4-8" }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_9) +/area/crew_quarters/sleep/Dorm_4) "jLr" = ( /turf/simulated/wall/r_wall, -/area/crew_quarters/bar) +/area/crew_quarters/bar/lounge) "jLH" = ( /obj/structure/table/bench/padded, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -12947,14 +13447,12 @@ icon_state = "4-8" }, /obj/machinery/camera/network/security, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "jMI" = ( -/obj/machinery/door/airlock/multi_tile/glass/polarized{ - id_tint = "library_foyer"; - name = "Library" - }, -/obj/machinery/door/firedoor/multi_tile, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -12962,8 +13460,12 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/multi_tile/glass{ + name = "Entertainment Auditorium" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/entertainment) "jMM" = ( /obj/machinery/air_alarm{ pixel_y = 22 @@ -12974,19 +13476,18 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "jNw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /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/endeavour/hallway/d3fwdhall) "jNA" = ( @@ -13034,7 +13535,6 @@ /turf/simulated/floor/tiled/dark, /area/security/interrogation) "jRg" = ( -/obj/effect/paint/darkred, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -13057,13 +13557,16 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "jSG" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/structure/closet/wardrobe, -/obj/machinery/light{ - dir = 1 +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_5) +/area/crew_quarters/recreation_area) "jSX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -13080,17 +13583,16 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/forensics) "jUf" = ( -/obj/structure/closet/crate/bin{ - anchored = 1 - }, +/obj/structure/table/woodentable, +/obj/item/storage/box/donkpockets, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_9) "jUs" = ( @@ -13104,13 +13606,14 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "jVc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/corner_steel_grid{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 24 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "jVe" = ( /obj/structure/bed/chair/comfy/teal{ @@ -13164,13 +13667,23 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "jWI" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_11) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/security/hallway) +"jXj" = ( +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_3) "jXM" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -13217,9 +13730,8 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "jZR" = ( -/obj/structure/bed/chair/sofa/black/left, -/turf/simulated/floor/tiled, -/area/crew_quarters/bar) +/turf/simulated/wall/prepainted/civilian, +/area/crew_quarters/game_room) "kad" = ( /obj/effect/floor_decal/industrial/warning{ dir = 5 @@ -13231,7 +13743,6 @@ /turf/simulated/floor/tiled/white, /area/endeavour/hallway/d3fwdhall) "kaW" = ( -/obj/machinery/light, /obj/structure/bed/chair/comfy/teal{ dir = 4 }, @@ -13239,7 +13750,7 @@ pixel_y = -24 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_8) +/area/crew_quarters/sleep/Dorm_13) "kbm" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -13256,8 +13767,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "kbt" = ( -/turf/simulated/floor/tiled, -/area/crew_quarters/bar) +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar/lounge) "kbw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -13271,6 +13785,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "kcl" = ( @@ -13283,14 +13801,18 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/bedrooms) "kcI" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 +/obj/structure/disposalpipe/junction{ + dir = 4 }, -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_y = -37 +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_3) +/area/crew_quarters/recreation_area) "kcO" = ( /turf/simulated/wall/r_wall/prepainted/civilian, /area/crew_quarters/bar) @@ -13306,8 +13828,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "kde" = ( -/obj/structure/table/woodentable, -/obj/item/flashlight/lamp/green, +/obj/machinery/media/jukebox, /turf/simulated/floor/wood, /area/security/breakroom) "kdS" = ( @@ -13324,6 +13845,9 @@ icon_state = "1-2" }, /obj/map_helper/access_helper/airlock/station/head_office/head_of_security, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hos) "kdV" = ( @@ -13342,9 +13866,8 @@ /area/hydroponics) "kdZ" = ( /turf/simulated/floor/carpet/blue, -/area/crew_quarters/sleep/Dorm_4) +/area/crew_quarters/sleep/Dorm_11) "keU" = ( -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/map_helper/electrochromatic_linker{ id = "vicDetOffice" @@ -13365,7 +13888,7 @@ /obj/effect/floor_decal/spline/fancy/wood, /obj/landmark/spawnpoint/job/clown, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) "kfw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -13410,14 +13933,22 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "kfS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/sleep/Dorm_11) +/obj/machinery/button/remote/airlock{ + id = "dorm10"; + name = "Room 10 Lock"; + pixel_x = 7; + pixel_y = 24; + specialfunctions = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_10) "kgM" = ( /turf/simulated/wall/prepainted/cargo, /area/maintenance/bar/lower) @@ -13428,8 +13959,7 @@ icon_state = "1-2" }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -13449,18 +13979,25 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/carpet/purcarpet, +/turf/simulated/floor/carpet/turcarpet, /area/maintenance/dormitory) "kio" = ( -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 24 - }, -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/corner_steel_grid{ dir = 6 }, -/turf/simulated/floor/carpet/blucarpet, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) +"kir" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3afthall) "kiu" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/security/breakroom) @@ -13468,9 +14005,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/monotile, /area/security/lobby) "kiY" = ( @@ -13485,11 +14022,10 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "kke" = ( -/obj/structure/closet/crate/bin{ - anchored = 1 - }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_8) +/area/crew_quarters/sleep/Dorm_13) "kkt" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -13498,21 +14034,18 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor, /area/security/brig) "kkw" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/structure/curtain/open/bed{ - name = "curtain" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/effect/paint_stripe/palebottlegreen, -/turf/simulated/floor/plating, -/area/crew_quarters/bar) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/carpet, +/area/security/detectives_office) "klc" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -13523,6 +14056,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/security/hallway) "klp" = ( @@ -13543,6 +14077,13 @@ }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) +"klU" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/machinery/vending/weeb, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/recreation_area) "knk" = ( /obj/structure/bed/chair{ dir = 1 @@ -13566,7 +14107,9 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "koi" = ( -/turf/simulated/floor/carpet/blucarpet, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "koL" = ( /obj/structure/cable/green{ @@ -13620,7 +14163,31 @@ dir = 4 }, /turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/sleep/Dorm_2) +/area/crew_quarters/sleep/Dorm_1) +"ksu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/security/hallway) "ksT" = ( /obj/machinery/disposal, /obj/effect/floor_decal/industrial/warning/full, @@ -13676,13 +14243,15 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "kvG" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10, /obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "kwl" = ( @@ -13745,6 +14314,9 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "kyF" = ( @@ -13754,28 +14326,22 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/kitchen) "kyI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ - icon_state = "0-4" + icon_state = "1-2" }, -/obj/machinery/power/apc/west_mount{ - cell_type = /obj/item/cell/super +/obj/machinery/door/airlock/multi_tile/glass/civilian{ + name = "Annex Airlock" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_9) +/area/crew_quarters/bar/lounge) "kyL" = ( /obj/structure/table/reinforced, /obj/item/forensics/sample_kit/powder, /turf/simulated/floor/tiled/old_cargo/white, /area/security/forensics) -"kzA" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/sleep/Dorm_8) "kAe" = ( /obj/item/radio/intercom{ pixel_y = -24 @@ -13785,16 +14351,11 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "kBD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "kBH" = ( @@ -13817,6 +14378,14 @@ /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/dark, /area/security/riot_control) +"kBT" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/security/warden) "kCb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -13896,23 +14465,24 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "kDu" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 8 }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "kDv" = ( /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/carpet/blucarpet, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "kDM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -14024,22 +14594,19 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) -"kKh" = ( -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -24 - }, -/obj/structure/table/woodentable, -/obj/structure/flora/pottedplant/largebush, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_7) "kKF" = ( -/obj/structure/bed/chair/comfy/beige{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/obj/structure/table/woodentable, +/obj/item/flashlight/lamp/green, +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/bar/lounge) "kKL" = ( /obj/structure/sink/kitchen{ dir = 8; @@ -14132,6 +14699,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "kNj" = ( @@ -14170,13 +14740,17 @@ /turf/simulated/floor/plating, /area/security/hanger) "kPR" = ( -/obj/effect/paint/darkred, -/obj/structure/cable/green{ - icon_state = "0-2" +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, -/area/security/brig) +/area/endeavour/hallway/d3aftmaint) "kPT" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -14209,12 +14783,6 @@ /turf/simulated/floor/tiled/monotile, /area/hydroponics) "kRc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -14259,9 +14827,11 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) "kSg" = ( /obj/structure/cable/green, /obj/machinery/door/blast/regular{ @@ -14271,8 +14841,8 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/prison/cell_block) "kSm" = ( @@ -14284,8 +14854,7 @@ }, /obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /turf/simulated/floor/tiled, /area/hydroponics) @@ -14293,18 +14862,15 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "kSN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "kTd" = ( @@ -14313,12 +14879,6 @@ /turf/simulated/floor/tiled/old_cargo/red, /area/security/security_processing) "kTk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor{ dir = 8 }, @@ -14339,19 +14899,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) -"kUb" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_9) "kUz" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ @@ -14367,6 +14914,12 @@ req_one_access = null }, /obj/map_helper/access_helper/airlock/station/security/general, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "kUM" = ( @@ -14385,6 +14938,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "kWu" = ( @@ -14398,8 +14954,8 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/storage) "kWJ" = ( -/obj/structure/bed/padded, -/obj/random/bedsheet, +/obj/structure/table/woodentable, +/obj/item/storage/box/donkpockets, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_7) "kXm" = ( @@ -14422,6 +14978,21 @@ /obj/machinery/holopad, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"kXD" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo) +"kXK" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "kXT" = ( /obj/machinery/light/small{ dir = 1 @@ -14442,6 +15013,21 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/quartermaster/foyer) +"kYx" = ( +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "kZj" = ( /obj/machinery/power/apc/west_mount{ cell_type = /obj/item/cell/super @@ -14451,6 +15037,9 @@ }, /turf/simulated/floor/wood, /area/maintenance/dormitory) +"kZp" = ( +/turf/simulated/floor/wood, +/area/crew_quarters/game_room) "kZu" = ( /obj/machinery/vending/coffee, /turf/simulated/floor/wood, @@ -14465,6 +15054,7 @@ /obj/structure/disposalpipe/sortjunction/wildcard/flipped{ dir = 8 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "lag" = ( @@ -14472,17 +15062,19 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "laD" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/closet/hydrant{ - pixel_x = -32 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_hallway) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/navgold/bordercorner, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardamidhall) "laQ" = ( /obj/structure/sign/department/cargo_dock, /turf/simulated/wall/prepainted/cargo, @@ -14499,7 +15091,7 @@ icon_state = "4-8" }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_4) +/area/crew_quarters/sleep/Dorm_3) "lca" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -14542,11 +15134,11 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "len" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "leF" = ( @@ -14557,6 +15149,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/bar/lower) "lfc" = ( @@ -14566,14 +15159,11 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/security/security_processing) "lfy" = ( -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ +/obj/effect/floor_decal/spline/plain{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/security/lobby) +/turf/simulated/floor/carpet/turcarpet, +/area/crew_quarters/recreation_area) "lfB" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/spray/luminol, @@ -14626,6 +15216,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/bar/lower) "lgT" = ( @@ -14649,6 +15240,9 @@ /obj/effect/floor_decal/corner/navblue/border, /obj/effect/floor_decal/borderfloorblack/corner2, /obj/effect/floor_decal/corner/navblue/bordercorner2, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "lhi" = ( @@ -14658,6 +15252,9 @@ dir = 1; pixel_y = -22 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "lhR" = ( @@ -14682,6 +15279,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, +/obj/machinery/computer/timeclock/premade/east, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "liu" = ( @@ -14701,8 +15299,7 @@ /area/security/hallway) "ljb" = ( /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /obj/machinery/computer/security/telescreen{ pixel_x = 32 @@ -14714,8 +15311,7 @@ /area/crew_quarters/bar) "ljl" = ( /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -14780,15 +15376,31 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "lnD" = ( -/obj/effect/floor_decal/techfloor/corner, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "4-8" }, -/turf/simulated/floor/tiled/monotile, -/area/security/lobby) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/security/hallway) "lot" = ( /obj/machinery/light{ dir = 1 @@ -14796,8 +15408,13 @@ /obj/machinery/status_display{ pixel_y = 32 }, -/obj/structure/fitness/weightlifter, -/turf/simulated/floor/carpet/bcarpet, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/turf/simulated/floor/tiled, /area/security/breakroom) "lou" = ( /obj/structure/table/woodentable, @@ -14815,7 +15432,7 @@ icon_state = "0-4" }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_6) +/area/crew_quarters/sleep/Dorm_12) "lpr" = ( /obj/structure/cable/green{ icon_state = "0-2" @@ -14823,8 +15440,8 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/crew_quarters/heads/hos) "lqj" = ( @@ -14856,6 +15473,16 @@ /obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) +"lro" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3fwdhall) "lrZ" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -14874,11 +15501,8 @@ "lsx" = ( /obj/structure/table/woodentable, /obj/effect/floor_decal/spline/fancy/wood, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) "lsC" = ( /obj/machinery/camera/network/security, /obj/effect/floor_decal/corner/red{ @@ -14907,12 +15531,6 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "lub" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 5 - }, /obj/structure/sink/kitchen{ dir = 8; name = "sink"; @@ -14940,6 +15558,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "luP" = ( @@ -14967,11 +15588,11 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, -/obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/floor_decal/corner/navgold/bordercorner2{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) @@ -14985,18 +15606,12 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "lwm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "lwA" = ( @@ -15062,16 +15677,17 @@ /obj/structure/closet/hydrant{ pixel_x = -32 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "lxI" = ( -/obj/structure/table/woodentable, /obj/effect/floor_decal/spline/fancy/wood, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 +/obj/structure/bed/chair/wood{ + dir = 4 }, +/obj/landmark/spawnpoint/job/entertainer, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) "lye" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, @@ -15111,7 +15727,10 @@ /obj/machinery/camera/network/civilian{ dir = 1 }, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "lAm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -15129,6 +15748,9 @@ /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/red/border, /obj/machinery/light, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "lCj" = ( @@ -15165,6 +15787,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "lCU" = ( @@ -15206,6 +15831,9 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portamidhall) "lDC" = ( @@ -15268,9 +15896,8 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "lEK" = ( -/obj/structure/undies_wardrobe, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_5) +/turf/simulated/wall/prepainted/civilian, +/area/crew_quarters/bar/lounge) "lEM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -15290,13 +15917,10 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "lIl" = ( @@ -15313,7 +15937,6 @@ /turf/space, /area/space) "lIO" = ( -/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/hanger) "lIQ" = ( @@ -15349,6 +15972,12 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "lJp" = ( @@ -15415,8 +16044,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/security/hallway) @@ -15440,12 +16068,9 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "lNv" = ( -/obj/structure/bed/chair/wood, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/obj/landmark/spawnpoint/job/entertainer, +/turf/simulated/floor/carpet/bcarpet, +/area/tether/surfacebase/entertainment) "lNT" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -15463,16 +16088,21 @@ /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, /area/maintenance/bar/catwalk) +"lNU" = ( +/obj/structure/table/gamblingtable, +/obj/item/deck/cards, +/obj/machinery/light/small, +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/game_room) "lOf" = ( /obj/structure/railing/grey{ dir = 4 }, -/obj/structure/railing/grey, -/obj/effect/floor_decal/spline/plain{ - dir = 6 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 }, -/turf/simulated/floor/carpet/bcarpet, -/area/vacant/vacant_shop) +/turf/simulated/floor/wood, +/area/tether/surfacebase/entertainment) "lOh" = ( /obj/structure/closet/secure_closet/security, /obj/structure/window/basic{ @@ -15529,6 +16159,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "lRx" = ( @@ -15548,12 +16179,18 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) +"lSH" = ( +/obj/structure/undies_wardrobe, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_6) "lSK" = ( /obj/machinery/power/breakerbox{ RCon_tag = "MAIN - DECK 3 AMIDSHIPS" @@ -15561,19 +16198,11 @@ /turf/simulated/floor/plating, /area/maintenance/substation/security) "lTj" = ( -/turf/simulated/wall/r_wall/prepainted, -/area/crew_quarters/sleep/Dorm_5) +/turf/simulated/wall/r_wall/prepainted/civilian, +/area/endeavour/hallway/d3fwdmaint) "lTw" = ( /turf/simulated/floor/plating, /area/endeavour/hallway/d3fwdmaint) -"lTI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_hallway) "lTT" = ( /obj/machinery/air_alarm{ pixel_y = 22 @@ -15644,6 +16273,11 @@ /obj/effect/floor_decal/corner/red/bordercorner{ dir = 8 }, +/obj/structure/disposalpipe/sortjunction{ + dir = 4; + name = "HoS Office"; + sortType = "HoS Office" + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "lUH" = ( @@ -15707,11 +16341,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/security/brig) -"lWX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_hallway) "lXa" = ( /obj/structure/table/rack{ dir = 8; @@ -15767,8 +16396,8 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/lobby) "lXM" = ( @@ -15781,21 +16410,16 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/storage) -"lYk" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/sleep/Dorm_9) "lYm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock{ + id_tag = "dorm6"; + name = "Dorm 6" }, -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/sleep/Dorm_5) +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_6) "lYO" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/tiled/steel/airless, @@ -15834,12 +16458,10 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "mbt" = ( -/obj/structure/undies_wardrobe, -/obj/machinery/light{ - dir = 1 - }, +/obj/structure/closet/wardrobe, +/obj/item/toy/plushie/carp/nebula, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_3) +/area/crew_quarters/sleep/Dorm_5) "mbv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -15848,15 +16470,21 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "mbJ" = ( -/obj/structure/sink{ - pixel_y = 22 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, -/obj/structure/mirror{ - dir = 4; - pixel_y = 33 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_5) +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "mch" = ( /obj/structure/table/woodentable, /obj/item/handcuffs/fuzzy, @@ -15866,15 +16494,6 @@ /obj/machinery/light, /turf/simulated/floor/reinforced, /area/quartermaster/miningdock) -"mcv" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/sleep/Dorm_7) "mdL" = ( /obj/machinery/computer/security{ dir = 8 @@ -15891,10 +16510,6 @@ }, /turf/simulated/floor/tiled, /area/security/lobby) -"meW" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/endeavour/hallway/d3fwdmaint) "mff" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -15918,12 +16533,11 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "mfy" = ( -/obj/machinery/door/firedoor, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_hallway) +/turf/simulated/wall/r_wall/prepainted, +/area/crew_quarters/sleep/Dorm_12) "mgD" = ( /obj/effect/floor_decal/corner/black{ dir = 9 @@ -15955,8 +16569,7 @@ /turf/simulated/floor/tiled/monotile, /area/security/lobby) "mhH" = ( -/obj/effect/floor_decal/spline/fancy/wood, -/turf/simulated/floor/carpet/blucarpet, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "mhK" = ( /obj/machinery/atmospherics/portables_connector, @@ -15994,23 +16607,27 @@ /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) "miB" = ( -/obj/machinery/newscaster{ - pixel_y = 32 +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_5) +/area/crew_quarters/recreation_area) "miE" = ( /obj/structure/table/woodentable, -/obj/structure/flora/pottedplant/decorative, -/obj/machinery/button/remote/airlock{ - id = "dorm2"; - name = "Room 2 Lock"; - pixel_x = -26; - pixel_y = -4; - specialfunctions = 4 +/obj/structure/flora/pottedplant/decorative{ + pixel_y = 12 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_6) +/area/crew_quarters/sleep/Dorm_12) "miG" = ( /obj/effect/floor_decal/corner/green{ dir = 5 @@ -16021,14 +16638,27 @@ /turf/simulated/floor/tiled/dark, /area/security/brig) "miH" = ( -/obj/machinery/power/apc/west_mount{ - cell_type = /obj/item/cell/super +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -5; + pixel_y = -28 }, -/obj/structure/cable/green{ - icon_state = "0-4" +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/button/remote/airlock{ + id = "dorm12"; + name = "Room 12 Lock"; + pixel_x = 5; + pixel_y = -27; + specialfunctions = 4 + }, +/obj/machinery/light/small{ + dir = 8 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_4) +/area/crew_quarters/sleep/Dorm_11) "mjB" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -16039,6 +16669,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "mkK" = ( @@ -16071,10 +16704,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/security/armoury) -"mle" = ( -/obj/structure/undies_wardrobe, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_9) "mlg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -16088,6 +16717,9 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "mlk" = ( @@ -16155,6 +16787,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/old_tile/gray, /area/security/range) "mmZ" = ( @@ -16173,6 +16809,12 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/mining_ship/general) +"mnn" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "mnr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -16195,6 +16837,17 @@ }, /turf/simulated/floor/tiled, /area/security/range) +"moo" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/red/border, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/security/hallway) "moz" = ( /obj/machinery/conveyor{ dir = 4; @@ -16233,12 +16886,23 @@ /obj/effect/floor_decal/corner/red/border{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"mpz" = ( +/obj/effect/floor_decal/corner_steel_grid{ + dir = 9 + }, +/obj/machinery/newscaster{ + pixel_x = -28 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/fitness) "mpA" = ( /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "mqp" = ( @@ -16257,6 +16921,12 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "mqK" = ( @@ -16386,7 +17056,10 @@ "mwA" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" + }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "mwM" = ( @@ -16422,8 +17095,7 @@ icon_state = "1-2" }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -16469,6 +17141,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/security/hallway) "mAB" = ( @@ -16484,14 +17157,15 @@ /turf/simulated/floor/plating, /area/maintenance/substation/civilian) "mBA" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "mBQ" = ( @@ -16503,6 +17177,12 @@ /obj/machinery/shower{ dir = 1 }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 6 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "mCY" = ( @@ -16520,6 +17200,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/security/hallway) "mEb" = ( @@ -16536,6 +17217,10 @@ "mGq" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "mGv" = ( @@ -16600,18 +17285,9 @@ /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d3afthall) "mIk" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3portforhall) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "mIP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet/sblucarpet, @@ -16638,6 +17314,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/security/hallway) "mKP" = ( @@ -16664,7 +17341,7 @@ /obj/item/storage/box/donkpockets, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_9) +/area/crew_quarters/sleep/Dorm_4) "mLk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -16694,6 +17371,12 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "mMk" = ( @@ -16714,20 +17397,11 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/vacant/vacant_shop) -"mNO" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/obj/structure/table/woodentable, -/obj/item/radio/intercom{ - pixel_y = -24 - }, -/obj/item/instrument/trombone, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_5) +/area/tether/surfacebase/entertainment) "mPu" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -16746,42 +17420,21 @@ }, /turf/simulated/floor/plating, /area/maintenance/dormitory) -"mQs" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_11) -"mRg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/light, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_hallway) "mRw" = ( -/obj/machinery/power/apc/west_mount{ - cell_type = /obj/item/cell/super - }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/structure/flora/pottedplant/smalltree, -/obj/machinery/fire_alarm/north_mount, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_11) +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/tiled/dark, +/area/maintenance/dormitory) "mSw" = ( /turf/simulated/wall/r_wall/prepainted/cargo, /area/quartermaster/warehouse) +"mSO" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3fwdmaint) "mSQ" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -16795,19 +17448,15 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/crew_quarters/bar) "mTI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/multi_tile/glass/civilian{ - name = "Annex Airlock" - }, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/crew_quarters/bar) "mVg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -16849,14 +17498,17 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -31 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardamidhall) "mWw" = ( @@ -16867,7 +17519,7 @@ dir = 10 }, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) "mWx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -16878,16 +17530,21 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "mWD" = ( -/obj/machinery/power/apc/west_mount{ - cell_type = /obj/item/cell/super +/obj/structure/disposalpipe/segment{ + dir = 4 }, /obj/structure/cable/green{ - icon_state = "0-2" + icon_state = "4-8" }, -/obj/structure/flora/pottedplant/smalltree, -/obj/machinery/fire_alarm/north_mount, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/light/small, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_5) +/area/crew_quarters/recreation_area) "mWG" = ( /obj/machinery/atm{ pixel_y = 30 @@ -16904,10 +17561,12 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "mWO" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/effect/floor_decal/corner/black/full{ dir = 8 }, @@ -16936,7 +17595,6 @@ /turf/simulated/floor/tiled/dark, /area/security/tactical) "mXi" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -16944,6 +17602,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "mXn" = ( @@ -16962,7 +17623,6 @@ /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) "mXV" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -16976,6 +17636,10 @@ /obj/machinery/shower{ dir = 8 }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10, /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "mYQ" = ( @@ -17049,11 +17713,9 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) -"nab" = ( -/turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/sleep/Dorm_7) "naA" = ( /obj/effect/floor_decal/industrial/danger{ dir = 9 @@ -17126,14 +17788,13 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "nds" = ( @@ -17233,40 +17894,22 @@ /turf/simulated/floor/plating, /area/space) "nhQ" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hydroponics) +/turf/simulated/wall/prepainted, +/area/crew_quarters/sleep/Dorm_10) "nif" = ( /obj/structure/undies_wardrobe, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_9) +/area/crew_quarters/sleep/Dorm_4) "niA" = ( /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/prison/cell_block) -"niR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_hallway) "njC" = ( /obj/structure/closet/firecloset, /obj/machinery/light{ @@ -17301,17 +17944,14 @@ /turf/simulated/floor/tiled/old_cargo/red, /area/security/security_processing) "nkn" = ( -/obj/structure/bed/padded, -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_y = -37 - }, -/obj/random/bedsheet, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_9) +/area/crew_quarters/recreation_area) "nkr" = ( /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/tiled/dark, @@ -17336,11 +17976,21 @@ dir = 4 }, /obj/machinery/disposal, -/obj/structure/disposalpipe/up{ +/obj/structure/disposalpipe/trunk{ dir = 8 }, /turf/simulated/floor/wood, /area/quartermaster/foyer) +"nkY" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) "nmv" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -17356,8 +18006,11 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/turf/simulated/floor/wood, +/obj/machinery/door/airlock/multi_tile/glass/civilian{ + name = "Fitness Room" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "nnV" = ( /obj/machinery/cryopod/robot, @@ -17391,8 +18044,7 @@ /area/security/security_lockerroom) "noQ" = ( /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /obj/structure/table/bench/steel, /obj/effect/floor_decal/borderfloorblack{ @@ -17407,9 +18059,7 @@ /turf/simulated/floor/tiled/techmaint, /area/quartermaster/office) "noY" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/closet/crate/trashcart, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/maintenance/starboardsolar) "npe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -17421,12 +18071,11 @@ /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) "npi" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - name = "Restroom" +/obj/structure/bed/chair/comfy/brown{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/maintenance/dormitory) +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_6) "npL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -17512,27 +18161,29 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"ntj" = ( -/obj/structure/undies_wardrobe, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_11) "ntP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/red/border, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "nue" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "nuP" = ( @@ -17547,13 +18198,19 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/junction, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "nvw" = ( /obj/machinery/light, -/obj/machinery/fitness/punching_bag/clown, -/turf/simulated/floor/wood, +/obj/structure/fitness/punchingbag, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 + }, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "nws" = ( /obj/structure/table/rack{ @@ -17579,11 +18236,9 @@ /turf/simulated/floor/tiled, /area/security/hanger) "nwy" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/wood, -/area/security/breakroom) +/area/crew_quarters/recreation_area) "nxo" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -17591,6 +18246,12 @@ /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, /area/endeavour/hallway/d3starboardafthall) "nxz" = ( @@ -17619,6 +18280,9 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "nyW" = ( @@ -17649,8 +18313,7 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate/large, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/tiled, /area/quartermaster/storage) @@ -17668,18 +18331,15 @@ /turf/simulated/floor/tiled/steel, /area/vacant/vacant_shop) "nBf" = ( -/obj/structure/cable/green{ - icon_state = "2-8" - }, /obj/structure/closet/wardrobe, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_8) +/area/crew_quarters/sleep/Dorm_13) "nBi" = ( /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/lobby) "nBM" = ( @@ -17690,8 +18350,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /turf/simulated/floor/tiled, /area/hydroponics) @@ -17700,7 +18359,7 @@ dir = 4 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_11) +/area/crew_quarters/sleep/Dorm_8) "nCe" = ( /obj/machinery/air_alarm{ dir = 8; @@ -17717,7 +18376,7 @@ dir = 4 }, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) "nCY" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -17744,8 +18403,7 @@ /area/crew_quarters/kitchen) "nDp" = ( /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /obj/structure/table/bench/steel, /obj/effect/floor_decal/borderfloorblack{ @@ -17785,6 +18443,21 @@ /obj/machinery/light/small, /turf/simulated/floor/plating, /area/endeavour/hallway/d3fwdmaint) +"nEQ" = ( +/obj/machinery/atm{ + pixel_y = 30 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3portforhall) "nFa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -17821,6 +18494,9 @@ dir = 1 }, /obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/security/security_lockerroom) "nIf" = ( @@ -17828,28 +18504,46 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "nIl" = ( -/obj/effect/paint_stripe/palebottlegreen, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/structure/curtain/open/bed{ - name = "curtain" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/turf/simulated/floor/plating, -/area/crew_quarters/bar) -"nJb" = ( -/obj/structure/table/rack/steel, -/obj/item/instrument/violin, -/obj/structure/railing/grey, -/obj/effect/floor_decal/spline/plain{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/carpet, +/area/security/detectives_office) +"nIT" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, +/turf/simulated/floor/tiled/dark, +/area/security/hallway) +"nJb" = ( /obj/item/radio/intercom{ dir = 8; frequency = 1532; name = "Stagehand Mic"; pixel_x = -24 }, -/turf/simulated/floor/carpet/bcarpet, -/area/vacant/vacant_shop) +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/structure/bed/chair/wood, +/obj/landmark/spawnpoint/job/entertainer, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entertainment) "nJd" = ( /obj/structure/table/steel, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ @@ -17864,12 +18558,33 @@ }, /turf/simulated/floor/tiled, /area/security/hanger) +"nJu" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3portforhall) "nJE" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/door/firedoor{ + dir = 8 }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) @@ -17891,6 +18606,9 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "nKC" = ( @@ -17911,11 +18629,20 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "nKM" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 4 }, -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/sleep/Dorm_5) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardamidhall) "nKS" = ( /obj/structure/window/reinforced/tinted{ dir = 1 @@ -17924,16 +18651,14 @@ /turf/simulated/floor/tiled/dark, /area/security/brig) "nLm" = ( -/obj/structure/sink{ - pixel_y = 22 - }, -/obj/structure/mirror{ - dir = 4; - pixel_y = 33 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_3) +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "nLT" = ( /obj/machinery/atm{ pixel_y = 30 @@ -17951,7 +18676,7 @@ /area/endeavour/hallway/d3starboardforhall) "nMx" = ( /obj/structure/reagent_dispensers/fueltank, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor/grid, /area/security/lobby) "nME" = ( /obj/structure/table/steel, @@ -17973,8 +18698,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/lobby) "nMU" = ( @@ -17987,22 +18712,16 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "nNj" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable/green, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/effect/paint/darkred, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/prison/cell_block) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/carpet, +/area/security/detectives_office) "nNn" = ( /turf/simulated/floor/wood, /area/quartermaster/qm) @@ -18048,28 +18767,16 @@ /turf/simulated/floor/tiled/dark, /area/security/warden) "nPn" = ( -/obj/effect/floor_decal/steeldecal/steel_decals5{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 10 - }, -/obj/machinery/shower{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/door/window/northleft{ - name = "Shower"; - req_access = list() +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/structure/curtain/open/shower/engineering, -/turf/simulated/floor/tiled, -/area/crew_quarters/sleep/Dorm_3) +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "nPo" = ( /obj/structure/cable/orange{ icon_state = "1-2" @@ -18108,6 +18815,15 @@ }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) +"nQv" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3fwdhall) "nQE" = ( /obj/machinery/vending/boozeomat, /obj/structure/table/marble, @@ -18122,6 +18838,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "nRo" = ( @@ -18136,27 +18855,16 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "nRt" = ( -/obj/machinery/fitness/punching_bag/clown, -/turf/simulated/floor/carpet/bcarpet, +/obj/effect/floor_decal/corner_steel_grid/diagonal, +/turf/simulated/floor/tiled, /area/security/breakroom) "nRx" = ( /obj/structure/adherent_bath, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/crystal, /area/endeavour/hallway/d3fwdhall) -"nRV" = ( -/obj/structure/sink{ - pixel_y = 22 - }, -/obj/structure/mirror{ - dir = 4; - pixel_y = 33 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_11) "nSL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -18210,6 +18918,9 @@ /obj/effect/floor_decal/corner/red{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/security/security_lockerroom) "nTi" = ( @@ -18233,23 +18944,16 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 8 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "nTY" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "nUf" = ( @@ -18280,19 +18984,22 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "nUi" = ( -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 }, -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/button/remote/airlock{ + id = "dorm7"; + name = "Room 7 Lock"; + pixel_x = -7; + pixel_y = -24; + specialfunctions = 4 }, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_hallway) +/area/crew_quarters/sleep/Dorm_7) "nUU" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -18331,20 +19038,12 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "nVP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/airlock{ - name = "Bathroom" - }, -/obj/machinery/door/firedoor{ +/obj/effect/floor_decal/spline/plain{ dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_11) +/obj/machinery/vending/cigarette, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/recreation_area) "nWj" = ( /obj/machinery/computer/security/mining{ dir = 4 @@ -18379,24 +19078,15 @@ /turf/simulated/floor/airless, /area/space) "nXt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_3) +/obj/structure/flora/pottedplant/stoutbush, +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/sleep/Dorm_9) "nYH" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 1 +/obj/machinery/light/small{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3fwdhall) +/turf/simulated/floor/plating, +/area/maintenance/cargo/mining) "nYR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -18413,8 +19103,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/prison/cell_block) "oaN" = ( @@ -18506,8 +19196,9 @@ /turf/simulated/floor/tiled, /area/security/lobby) "ocx" = ( -/obj/structure/flora/pottedplant/smalltree, -/turf/simulated/floor/carpet/bcarpet, +/obj/effect/floor_decal/corner_steel_grid/diagonal, +/obj/structure/fitness/weightlifter, +/turf/simulated/floor/tiled, /area/security/breakroom) "ocN" = ( /obj/structure/cable/green{ @@ -18587,14 +19278,10 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "oez" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_5) +/obj/structure/bed/double, +/obj/item/bedsheet/browndouble, +/turf/simulated/floor/carpet/oracarpet, +/area/crew_quarters/sleep/Dorm_6) "oeN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -18620,12 +19307,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "ofO" = ( @@ -18652,6 +19334,9 @@ req_one_access = null }, /obj/map_helper/access_helper/airlock/station/security/department, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/old_tile/gray, /area/security/range) "ogR" = ( @@ -18701,6 +19386,15 @@ /obj/structure/table/rack, /turf/simulated/floor/tiled/dark, /area/maintenance/starboardsolar) +"ojx" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entertainment) "ojU" = ( /obj/machinery/light{ dir = 1 @@ -18720,16 +19414,13 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "okL" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 8 }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "okS" = ( @@ -18743,6 +19434,7 @@ "okZ" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "olx" = ( @@ -18756,9 +19448,6 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "olB" = ( -/obj/effect/floor_decal/corner/green{ - dir = 10 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -18776,6 +19465,13 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/kitchen) +"olW" = ( +/obj/structure/cable/orange{ + icon_state = "1-8" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "oms" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -18843,6 +19539,21 @@ /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) +"ooS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardforhall) "opq" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -18857,8 +19568,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/security/hallway) @@ -18902,8 +19612,19 @@ /area/crew_quarters/sleep/cryo) "oqA" = ( /obj/machinery/photocopier, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) +"oqU" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/red/border, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/security/hallway) "orm" = ( /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -18917,15 +19638,19 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, /obj/machinery/light, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hydroponics) "orP" = ( /turf/simulated/wall/prepainted, /area/maintenance/dormitory) "orX" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/sleep/Dorm_7) +/obj/structure/table/woodentable, +/obj/machinery/microwave, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_10) "osg" = ( /turf/simulated/wall/prepainted/security, /area/security/brig) @@ -18961,14 +19686,16 @@ /turf/simulated/floor/grass, /area/security/brig) "otS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/sleep/Dorm_11) +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_5) "otU" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -19026,7 +19753,7 @@ "ovN" = ( /obj/structure/undies_wardrobe, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_11) +/area/crew_quarters/sleep/Dorm_13) "own" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -19050,9 +19777,11 @@ dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 4 + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 8 }, -/obj/effect/floor_decal/steeldecal/steel_decals10, /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "owS" = ( @@ -19064,20 +19793,18 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, -/obj/effect/floor_decal/borderfloorblack/corner2{ - alpha = 255 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/floor_decal/corner/navgold/bordercorner2, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) "oxm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/maintenance/dormitory) "oxp" = ( /turf/simulated/floor/holofloor/tiled/dark, @@ -19087,19 +19814,16 @@ pixel_y = -32 }, /obj/machinery/disposal, -/obj/item/barrier_tape_segment/engineering, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled/old_cargo/gray, /area/security/security_processing) "oxG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "oxI" = ( @@ -19117,12 +19841,6 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "oxV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -19148,9 +19866,8 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d3fwdmaint) "oyF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area) "oyR" = ( /obj/structure/cable/green{ @@ -19215,7 +19932,6 @@ /area/security/tactical) "oBe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -19223,19 +19939,12 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portamidhall) "oBE" = ( -/obj/machinery/power/apc/west_mount{ - cell_type = /obj/item/cell/super - }, -/obj/machinery/newscaster{ - pixel_y = 32 - }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/turf/simulated/floor/wood, +/obj/structure/flora/pottedplant/aquatic, +/turf/simulated/floor/carpet/tealcarpet, /area/crew_quarters/sleep/Dorm_8) "oCm" = ( /obj/machinery/washing_machine, @@ -19279,9 +19988,9 @@ dir = 4 }, /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/security/hallway) "oDw" = ( @@ -19370,6 +20079,7 @@ /obj/structure/cable/orange{ icon_state = "1-10" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "oFD" = ( @@ -19482,6 +20192,7 @@ /obj/structure/cable/orange{ icon_state = "6-9" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "oJb" = ( @@ -19491,7 +20202,8 @@ /turf/simulated/floor/tiled/dark, /area/security/warden) "oKo" = ( -/turf/simulated/floor/wood/sif, +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/plating, /area/maintenance/dormitory) "oKt" = ( /obj/structure/bed/chair{ @@ -19507,14 +20219,10 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "oMi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_3) +/obj/structure/bed/double, +/obj/item/bedsheet/reddouble, +/turf/simulated/floor/carpet, +/area/crew_quarters/sleep/Dorm_10) "oMq" = ( /obj/structure/bed/chair{ dir = 4 @@ -19537,6 +20245,9 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "oNw" = ( @@ -19552,14 +20263,14 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "oNx" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/effect/floor_decal/corner_steel_grid{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/corner/red{ + dir = 10 }, -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/sleep/Dorm_5) +/turf/simulated/floor/tiled, +/area/security/breakroom) "oNA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -19576,6 +20287,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "oNN" = ( @@ -19621,6 +20335,13 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/bar/lower) +"oOG" = ( +/obj/machinery/power/apc/west_mount, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/game_room) "oOI" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass/mining{ @@ -19661,8 +20382,6 @@ /turf/simulated/floor/plating, /area/maintenance/dormitory) "oRw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) @@ -19685,9 +20404,7 @@ /turf/simulated/floor/plating, /area/security/hallway) "oSF" = ( -/obj/machinery/door/firedoor, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/effect/paint/darkred, /obj/map_helper/electrochromatic_linker{ id = "vicDetOffice" }, @@ -19909,7 +20626,6 @@ /turf/simulated/floor/wood, /area/security/breakroom) "pcN" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 @@ -19925,6 +20641,13 @@ pixel_x = -28; pixel_y = -24 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark, /area/maintenance/starboardsolar) "pdl" = ( @@ -19970,8 +20693,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/tiled/steel, /area/quartermaster/delivery) @@ -20041,8 +20763,7 @@ /obj/structure/table/steel_reinforced, /obj/machinery/cell_charger, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /obj/machinery/recharger/wallcharger{ pixel_x = 32; @@ -20055,7 +20776,7 @@ pixel_y = 22 }, /obj/machinery/camera/network/civilian, -/obj/structure/flora/pottedplant/smalltree, +/obj/machinery/vending/fitness, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "phb" = ( @@ -20121,6 +20842,9 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/red/border, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "phI" = ( @@ -20144,6 +20868,23 @@ "pir" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/kitchen) +"piz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) +"piG" = ( +/obj/machinery/vending/coffee, +/turf/simulated/floor/wood, +/area/crew_quarters/bar/lounge) "piH" = ( /obj/machinery/light{ dir = 1 @@ -20182,7 +20923,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, @@ -20196,6 +20939,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "pkc" = ( @@ -20232,6 +20978,9 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "pkQ" = ( @@ -20254,6 +21003,9 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "plt" = ( @@ -20294,16 +21046,9 @@ /turf/simulated/wall/prepainted, /area/crew_quarters/kitchen) "pmM" = ( -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/carpet/purcarpet, +/obj/structure/bed/double, +/obj/item/bedsheet/bluedouble, +/turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_7) "pmO" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -20391,6 +21136,10 @@ /obj/machinery/light, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + alpha = 255 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "pqk" = ( @@ -20413,8 +21162,11 @@ /area/security/brig) "pqO" = ( /obj/structure/bed/chair/comfy/teal, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_4) +/area/crew_quarters/sleep/Dorm_11) "pqT" = ( /obj/effect/floor_decal/corner/red{ dir = 6 @@ -20480,6 +21232,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "psK" = ( @@ -20512,14 +21267,8 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "puL" = ( -/obj/machinery/fire_alarm/south_mount{ - pixel_y = -24 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_hallway) +/turf/simulated/floor/carpet/tealcarpet, +/area/crew_quarters/sleep/Dorm_8) "puP" = ( /obj/structure/plasticflaps/mining, /obj/machinery/conveyor{ @@ -20537,14 +21286,9 @@ /turf/simulated/floor/tiled, /area/security/hallway) "pvm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/sleep/Dorm_3) +/obj/structure/flora/pottedplant/mysterious, +/turf/simulated/floor/carpet/purcarpet, +/area/crew_quarters/sleep/Dorm_5) "pvA" = ( /obj/structure/table/steel, /obj/item/reagent_containers/food/drinks/drinkingglass/soda, @@ -20566,7 +21310,7 @@ /area/quartermaster/delivery) "pwo" = ( /turf/simulated/wall/r_wall/prepainted/civilian, -/area/maintenance/bar/catwalk) +/area/crew_quarters/game_room) "pwq" = ( /obj/structure/sign/deck/third, /turf/simulated/wall/prepainted, @@ -20574,6 +21318,10 @@ "pwu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/monotile, /area/security/lobby) "pwE" = ( @@ -20592,12 +21340,10 @@ /turf/simulated/floor/lino, /area/prison/cell_block) "pxt" = ( -/obj/structure/bed/chair/wood, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 5 - }, -/turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/obj/structure/table/rack/steel, +/obj/item/instrument/violin, +/turf/simulated/floor/carpet/bcarpet, +/area/tether/surfacebase/entertainment) "pxK" = ( /obj/machinery/power/solar_control, /obj/structure/cable/yellow{ @@ -20638,7 +21384,6 @@ /turf/simulated/floor/plating, /area/maintenance/substation/civilian) "pzo" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -20646,7 +21391,6 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/map_helper/electrochromatic_linker{ id = "vicDetOffice" @@ -20668,18 +21412,15 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "pAU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "pBw" = ( @@ -20746,18 +21487,14 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "pEk" = ( -/obj/machinery/button/remote/airlock{ - id = "dorm4"; - name = "Room 4 Lock"; - pixel_x = -26; - pixel_y = -4; - specialfunctions = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/machinery/light_switch{ - pixel_y = 25 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_9) +/turf/simulated/floor/tiled, +/area/crew_quarters/fitness) "pEt" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -20771,6 +21508,13 @@ alpha = 255 }, /obj/effect/floor_decal/corner/navgold/bordercorner2, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) "pFD" = ( @@ -20817,19 +21561,17 @@ /obj/machinery/holopad, /turf/simulated/floor/tiled/monotile, /area/security/hallway) -"pGt" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 +"pGM" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, -/obj/structure/closet/crate/bin{ - anchored = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_11) -"pGM" = ( -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/sleep/Dorm_5) +/area/crew_quarters/sleep/Dorm_6) "pHf" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -20861,9 +21603,6 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "pIT" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -20875,12 +21614,17 @@ /obj/effect/floor_decal/corner/navgold/bordercorner2{ dir = 9 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardamidhall) "pJa" = ( /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/substation/cargo) "pJd" = ( @@ -20890,6 +21634,7 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/substation/cargo) "pJe" = ( @@ -20897,6 +21642,19 @@ /obj/landmark/spawnpoint/job/shaft_miner, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/storage) +"pJi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardamidhall) "pJR" = ( /obj/machinery/computer/supplycomp/control{ dir = 4 @@ -20905,22 +21663,22 @@ /obj/effect/floor_decal/corner/blue/border, /turf/simulated/floor/tiled, /area/quartermaster/office) -"pKc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/steeldecal/steel_decals9{ +"pKe" = ( +/obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/tiled, -/area/security/lobby) +/area/endeavour/hallway/d3starboardforhall) "pMS" = ( -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -24 - }, /obj/structure/closet/wardrobe, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_4) +/turf/simulated/floor/carpet/blue, +/area/crew_quarters/sleep/Dorm_11) "pNn" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/light/small{ @@ -20936,6 +21694,9 @@ /obj/effect/floor_decal/corner/navblue/border, /obj/effect/floor_decal/borderfloorblack/corner2, /obj/effect/floor_decal/corner/navblue/bordercorner2, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "pNN" = ( @@ -20978,6 +21739,7 @@ pixel_x = 4 }, /obj/structure/table/rack/shelf/steel, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, /area/security/tactical) "pOf" = ( @@ -21008,6 +21770,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "pPl" = ( @@ -21026,30 +21791,27 @@ /obj/machinery/camera/network/security, /turf/simulated/floor/tiled/dark, /area/security/hallway) -"pQa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardforhall) "pQh" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate/plastic, /turf/simulated/floor/tiled, /area/quartermaster/storage) +"pQv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/wood, +/area/security/breakroom) "pQC" = ( /obj/structure/cable/green, -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/security_processing) "pQK" = ( @@ -21065,11 +21827,15 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "pQP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/endeavour/hallway/d3aftmaint) +/area/security/brig) "pRW" = ( /turf/space/basic, /area/space) @@ -21165,7 +21931,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment{ - dir = 2; + dir = 1; icon_state = "pipe-c" }, /turf/simulated/floor/wood, @@ -21201,6 +21967,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "pXn" = ( @@ -21212,6 +21981,14 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) +"pXt" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/catwalk, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "pXE" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -21261,8 +22038,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloorblack{ @@ -21274,34 +22050,30 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "qaT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "qaZ" = ( -/obj/structure/closet/crate/bin{ - anchored = 1 +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 4 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_6) +/area/crew_quarters/sleep/Dorm_12) "qbm" = ( /turf/simulated/floor/tiled, /area/security/brig) "qbv" = ( /obj/machinery/vending/cigarette, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, /turf/simulated/floor/tiled, /area/security/lobby) "qbQ" = ( @@ -21323,13 +22095,8 @@ /turf/simulated/floor/tiled/dark, /area/security/riot_control) "qbT" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_hallway) +/turf/simulated/wall/prepainted, +/area/crew_quarters/sleep/Dorm_12) "qca" = ( /obj/machinery/power/apc/west_mount{ cell_type = /obj/item/cell/super @@ -21362,9 +22129,6 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, /obj/structure/cable{ icon_state = "1-8" }, @@ -21421,7 +22185,7 @@ icon_state = "4-8" }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) +/area/crew_quarters/sleep/Dorm_2) "qcL" = ( /obj/structure/table/glass, /obj/machinery/fire_alarm/west_mount{ @@ -21451,20 +22215,19 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/carpet/purcarpet, +/turf/simulated/floor/carpet/turcarpet, /area/maintenance/dormitory) "qdy" = ( /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/brig) "qdR" = ( /obj/structure/cable/green, -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/range) "qdW" = ( @@ -21490,8 +22253,7 @@ }, /obj/machinery/air_alarm/north_mount, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /obj/structure/cable/green{ icon_state = "0-4" @@ -21521,20 +22283,14 @@ /turf/simulated/floor/wood, /area/maintenance/dormitory) "qhs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/structure/disposalpipe/junction{ + dir = 4 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) @@ -21589,6 +22345,9 @@ }, /obj/machinery/disposal, /obj/machinery/camera/network/security, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/simulated/floor/wood, /area/security/breakroom) "qkV" = ( @@ -21602,7 +22361,13 @@ /area/quartermaster/foyer) "qlP" = ( /obj/machinery/fitness/heavy/lifter, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 + }, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "qmc" = ( /obj/structure/extinguisher_cabinet{ @@ -21610,6 +22375,12 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/belter) +"qmi" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/bar/lounge) "qmA" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -21647,17 +22418,10 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/storage) "qmZ" = ( -/obj/machinery/power/apc/west_mount{ - cell_type = /obj/item/cell/super - }, -/obj/structure/closet/wardrobe, -/obj/machinery/light{ - dir = 8; - light_range = 12 - }, -/obj/structure/cable/green, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_9) +/obj/item/stool/padded, +/obj/landmark/spawnpoint/job/entertainer, +/turf/simulated/floor/carpet/bcarpet, +/area/tether/surfacebase/entertainment) "qna" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -21675,13 +22439,16 @@ /turf/simulated/floor/tiled/old_tile/gray, /area/security/range) "qnx" = ( -/obj/machinery/holoplant, /obj/effect/floor_decal/spline/fancy/wood, /obj/machinery/camera/network/civilian{ dir = 1 }, +/obj/structure/bed/chair/wood{ + dir = 8 + }, +/obj/landmark/spawnpoint/job/mime, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) "qnE" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -21715,15 +22482,22 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "qnW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/red/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/dark, +/area/security/hallway) +"qoo" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock{ + id_tag = "dorm7"; + name = "Dorm 7" }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/dormitory) +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_7) "qoA" = ( /obj/machinery/light/small{ dir = 4 @@ -21756,9 +22530,8 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "qoW" = ( -/obj/machinery/newscaster{ - pixel_y = 32 - }, +/obj/structure/table/woodentable, +/obj/machinery/microwave, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_7) "qoY" = ( @@ -21788,15 +22561,16 @@ /obj/machinery/newscaster{ pixel_x = 30 }, +/obj/structure/flora/pottedplant/fern, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "qpi" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, /obj/structure/bed/chair/comfy/beige{ dir = 4 }, +/obj/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area) "qpE" = ( @@ -21817,6 +22591,12 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) "qqC" = ( @@ -21853,31 +22633,32 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "qrV" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, /obj/machinery/camera/network/civilian{ dir = 1 }, /obj/machinery/computer/timeclock/premade/south, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "qsL" = ( +/obj/machinery/light_switch{ + pixel_x = 25; + pixel_y = 7 + }, +/obj/structure/disposalpipe/segment, /obj/machinery/button/remote/airlock{ - id = "dorm7"; - name = "Room 7 Lock"; + id = "dorm11"; + name = "Room 11 Lock"; pixel_x = 26; pixel_y = -4; specialfunctions = 4 }, -/obj/machinery/light_switch{ - pixel_x = 25; - pixel_y = 7 - }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_8) +/area/crew_quarters/sleep/Dorm_13) "qtB" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/landmark/spawnpoint/job/bartender, @@ -21888,7 +22669,7 @@ dir = 6 }, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) "qup" = ( /obj/machinery/door/airlock/maintenance, /obj/item/barrier_tape_segment/engineering, @@ -21923,9 +22704,6 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, @@ -21935,6 +22713,10 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "qvC" = ( @@ -21951,6 +22733,9 @@ /obj/machinery/light, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "qwg" = ( @@ -21983,10 +22768,14 @@ /area/quartermaster/foyer) "qwY" = ( /obj/structure/table/woodentable, -/obj/structure/flora/pottedplant/shoot, -/obj/item/instrument/saxophone, +/obj/structure/flora/pottedplant/shoot{ + pixel_y = 12 + }, +/obj/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_8) +/area/crew_quarters/sleep/Dorm_13) "qxb" = ( /obj/structure/cable/green{ icon_state = "0-8" @@ -22001,6 +22790,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "qxA" = ( @@ -22008,7 +22800,7 @@ icon_state = "4-8" }, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) "qxI" = ( /obj/effect/floor_decal/spline/plain{ dir = 5 @@ -22038,7 +22830,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) "qzI" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -22070,6 +22862,11 @@ /obj/item/gun/energy/kinetic_accelerator, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/storage) +"qzO" = ( +/obj/structure/table/woodentable, +/obj/machinery/microwave, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_5) "qAh" = ( /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, @@ -22110,6 +22907,16 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/mining_ship/general) +"qBG" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "qBI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -22117,14 +22924,13 @@ /turf/simulated/floor/carpet/bcarpet, /area/vacant/vacant_shop) "qBQ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/green{ icon_state = "1-4" }, /obj/structure/disposalpipe/junction{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "qCe" = ( @@ -22155,7 +22961,7 @@ }, /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) "qCM" = ( /obj/structure/table/rack/shelf/steel, /obj/machinery/camera/network/security, @@ -22194,6 +23000,7 @@ dir = 2; icon_state = "pipe-c" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) "qEf" = ( @@ -22214,16 +23021,28 @@ /obj/structure/table/steel, /turf/simulated/floor/tiled/monotile, /area/security/hallway) -"qHe" = ( -/turf/simulated/wall/prepainted/security, -/area/security/hallway) -"qHk" = ( +"qFk" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardafthall) +"qGy" = ( +/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, +/area/endeavour/hallway/d3starboardafthall) +"qHe" = ( +/turf/simulated/wall/prepainted/security, +/area/security/hallway) +"qHk" = ( /obj/structure/cable/green{ icon_state = "4-8" }, @@ -22252,7 +23071,7 @@ /area/security/security_processing) "qHz" = ( /turf/simulated/floor/carpet/gaycarpet, -/area/crew_quarters/sleep/Dorm_9) +/area/crew_quarters/sleep/Dorm_4) "qHG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -22319,8 +23138,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -22364,7 +23182,6 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "qLB" = ( -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/warden) @@ -22380,24 +23197,12 @@ "qLS" = ( /turf/simulated/floor/plating, /area/maintenance/bar/catwalk) -"qMp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardforhall) +"qMf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "qMq" = ( /obj/structure/cable{ icon_state = "1-4" @@ -22464,6 +23269,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "qOp" = ( @@ -22484,6 +23292,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/maintenance, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/crew_quarters/recreation_area) "qPi" = ( @@ -22509,7 +23318,8 @@ /area/maintenance/bar/catwalk) "qQb" = ( /obj/structure/closet/firecloset, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/dark, /area/maintenance/starboardsolar) "qQq" = ( /obj/structure/cable/green{ @@ -22555,6 +23365,12 @@ }, /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) +"qRW" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/crew_quarters/fitness) "qSk" = ( /obj/machinery/fire_alarm/west_mount{ pixel_x = -26 @@ -22576,6 +23392,10 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden, /turf/simulated/wall/r_wall/prepainted/cargo, /area/shuttle/mining_ship/general) +"qSN" = ( +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/entertainment) "qVm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -22586,8 +23406,14 @@ /turf/simulated/floor/wood, /area/vacant/vacant_shop) "qVv" = ( -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_8) +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/carpet/purcarpet, +/area/crew_quarters/sleep/Dorm_13) "qVJ" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1379; @@ -22609,6 +23435,13 @@ }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/delivery) +"qXh" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "qYn" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 @@ -22663,9 +23496,14 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "qZZ" = ( -/obj/structure/undies_wardrobe, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_3) +/obj/machinery/holoposter{ + pixel_x = -32 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "ral" = ( /obj/effect/floor_decal/borderfloorblack/corner{ dir = 4 @@ -22684,6 +23522,9 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "raR" = ( @@ -22691,7 +23532,6 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/kitchen) "rbn" = ( -/obj/effect/paint/darkred, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -22719,16 +23559,11 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) -"rcD" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/monotile, -/area/security/lobby) "rcG" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/security/brig) @@ -22757,7 +23592,6 @@ /turf/space/basic, /area/space) "reV" = ( -/obj/machinery/door/firedoor, /obj/structure/cable/green, /obj/structure/cable/green{ icon_state = "1-8" @@ -22769,7 +23603,6 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/map_helper/electrochromatic_linker{ id = "vicDetOffice" @@ -22865,21 +23698,11 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/prison/cell_block) "rhG" = ( -/obj/structure/closet/wardrobe/white, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_7) -"rjJ" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/bed/chair/comfy/blue{ + dir = 8 }, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_hallway) +/area/crew_quarters/sleep/Dorm_7) "rjY" = ( /obj/machinery/status_display/supply_display{ mode = 99; @@ -22920,6 +23743,12 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) +"rlf" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar/lounge) "rlr" = ( /obj/machinery/power/solar, /obj/structure/cable/yellow{ @@ -22954,9 +23783,6 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/storage) "rme" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 - }, /obj/structure/table/woodentable, /obj/machinery/recharger, /turf/simulated/floor/carpet/turcarpet, @@ -22973,11 +23799,18 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/crew_quarters/bar) +/obj/machinery/light/small, +/turf/simulated/floor/wood, +/area/crew_quarters/bar/lounge) "rnS" = ( /obj/structure/fitness/weightlifter, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 + }, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "roM" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -23059,11 +23892,17 @@ pixel_y = -31 }, /obj/machinery/disposal, -/obj/structure/disposalpipe/up{ +/obj/structure/disposalpipe/trunk{ dir = 8 }, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) +"rsb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3afthall) "rsv" = ( /obj/structure/table/rack/shelf/steel, /obj/structure/window/reinforced{ @@ -23143,25 +23982,20 @@ /turf/simulated/floor/tiled/dark, /area/security/riot_control) "rsR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "rtp" = ( /obj/structure/undies_wardrobe, /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_2) +/area/crew_quarters/sleep/Dorm_1) "rtF" = ( /obj/machinery/fire_alarm/south_mount{ pixel_y = -24 @@ -23188,6 +24022,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "ruf" = ( @@ -23203,7 +24040,6 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardamidhall) "ruB" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/machinery/light{ dir = 1 }, @@ -23279,7 +24115,7 @@ /area/space) "rxf" = ( /obj/machinery/mech_recharger, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor/grid, /area/security/lobby) "rxl" = ( /obj/machinery/newscaster{ @@ -23347,6 +24183,12 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardamidhall) "rzc" = ( @@ -23389,8 +24231,14 @@ /turf/simulated/floor/tiled/dark, /area/security/armoury) "rzR" = ( +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, /obj/machinery/fitness/punching_bag, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 + }, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "rAq" = ( /obj/machinery/atmospherics/component/unary/engine{ @@ -23399,14 +24247,18 @@ /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/mining_ship/general) "rAG" = ( -/obj/machinery/door/firedoor{ - dir = 8 +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/structure/curtain/open/bed{ + name = "curtain" }, -/turf/simulated/floor/tiled, -/area/crew_quarters/bar) +/turf/simulated/floor/plating, +/area/crew_quarters/bar/lounge) "rBG" = ( /turf/simulated/wall/prepainted, /area/maintenance/cargo) +"rBZ" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/crew_quarters/sleep/Dorm_11) "rCI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -23435,6 +24287,9 @@ /obj/effect/floor_decal/corner/navblue/bordercorner{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "rDj" = ( @@ -23443,6 +24298,9 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "rDl" = ( @@ -23455,16 +24313,20 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/carpet/sblucarpet, -/area/crew_quarters/sleep/Dorm_4) +/turf/simulated/floor/carpet/blue, +/area/crew_quarters/sleep/Dorm_11) "rEa" = ( /obj/structure/cable/green{ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_6) +/area/crew_quarters/sleep/Dorm_12) "rEd" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -23472,11 +24334,10 @@ /turf/simulated/floor/tiled, /area/security/brig) "rEi" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "rEk" = ( @@ -23499,6 +24360,12 @@ alpha = 255 }, /obj/effect/floor_decal/corner/navgold/bordercorner2, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "rER" = ( @@ -23532,11 +24399,9 @@ /obj/structure/table/marble, /obj/item/material/knife/butch, /obj/item/material/kitchen/rollingpin, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner_oldtile/white/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "rHk" = ( @@ -23569,7 +24434,6 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/bedrooms) "rJC" = ( -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/structure/cable/green{ icon_state = "0-4" @@ -23595,8 +24459,8 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/crew_quarters/heads/hos) "rLL" = ( @@ -23614,10 +24478,31 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) +"rLT" = ( +/obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entertainment) "rMh" = ( /obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) +"rMi" = ( +/turf/simulated/wall/prepainted, +/area/crew_quarters/sleep/Dorm_13) +"rMk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/holopad, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entertainment) "rNH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -23634,7 +24519,6 @@ dir = 1 }, /obj/machinery/power/apc/south_mount, -/obj/structure/cable/green, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, @@ -23666,14 +24550,13 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/green{ icon_state = "1-8" }, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "rOR" = ( @@ -23692,6 +24575,14 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d3fwdmaint) +"rPa" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3fwdhall) "rPz" = ( /obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/old_cargo/gray, @@ -23700,9 +24591,6 @@ /turf/simulated/wall/r_wall/prepainted/cargo, /area/maintenance/bar/catwalk) "rPF" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, /obj/structure/cable/orange{ icon_state = "4-8" }, @@ -23714,17 +24602,21 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "rPU" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 9 - }, /obj/machinery/light/spot/no_nightshift{ dir = 8 }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/structure/table/woodentable, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) "rQs" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -23771,8 +24663,22 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"rSp" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardamidhall) "rSu" = ( /obj/structure/bed/chair/comfy/brown{ dir = 8 @@ -23789,7 +24695,7 @@ specialfunctions = 4 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_4) +/area/crew_quarters/sleep/Dorm_3) "rTm" = ( /obj/structure/cable/green{ icon_state = "0-2" @@ -23817,8 +24723,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/turf/simulated/floor/carpet/sblucarpet, -/area/crew_quarters/sleep/Dorm_4) +/turf/simulated/floor/carpet/blue, +/area/crew_quarters/sleep/Dorm_11) "rTM" = ( /obj/machinery/light/small, /turf/simulated/floor/tiled/white, @@ -23835,12 +24741,10 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 9 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "rUz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -23871,8 +24775,8 @@ /turf/simulated/floor/tiled/dark, /area/security/warden) "rWm" = ( -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/sleep/Dorm_11) +/turf/simulated/wall/r_wall/prepainted, +/area/endeavour/hallway/d3portamidhall) "rWA" = ( /obj/machinery/light{ dir = 1 @@ -23881,7 +24785,7 @@ pixel_y = 22 }, /turf/simulated/floor/tiled, -/area/security/nuke_storage) +/area/endeavour/hallway/d3portamidhall) "rXa" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -23929,15 +24833,11 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/security/hanger) "rZg" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, -/obj/structure/cable/orange{ +/obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navblue/border, -/turf/simulated/floor/tiled/steel, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "rZv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -23950,6 +24850,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/security/hallway) "rZY" = ( @@ -23963,7 +24864,6 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/storage) "sak" = ( -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/structure/cable/green{ icon_state = "4-8" @@ -23997,6 +24897,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portamidhall) "saK" = ( @@ -24060,7 +24963,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/bar) "scV" = ( @@ -24068,6 +24970,9 @@ /obj/effect/floor_decal/corner/navblue/border, /obj/effect/floor_decal/borderfloorblack/corner2, /obj/effect/floor_decal/corner/navblue/bordercorner2, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "scZ" = ( @@ -24084,20 +24989,18 @@ alpha = 255 }, /obj/effect/floor_decal/corner/navgold/bordercorner2, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d3starboardamidhall) -"seB" = ( -/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3starboardamidhall) +"seB" = ( +/obj/structure/bed/chair/comfy/beige{ + dir = 8 }, -/obj/machinery/door/airlock/maintenance, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/bar/catwalk) +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/bar/lounge) "seM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -24105,17 +25008,17 @@ /turf/simulated/floor/tiled/monotile, /area/security/lobby) "seV" = ( -/obj/structure/curtain/open/shower/engineering, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/curtain/open/shower, /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "sfw" = ( /obj/structure/bed/chair{ dir = 4 }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled, /area/security/lobby) "shr" = ( /obj/structure/cable/yellow{ @@ -24140,7 +25043,7 @@ /obj/item/clothing/gloves/black, /obj/item/clothing/glasses/welding, /obj/machinery/air_alarm/east_mount, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor/grid, /area/security/lobby) "shF" = ( /obj/effect/floor_decal/borderfloor{ @@ -24170,7 +25073,7 @@ /area/crew_quarters/heads/hos) "shN" = ( /turf/simulated/floor/carpet/sblucarpet, -/area/crew_quarters/sleep/Dorm_6) +/area/crew_quarters/sleep/Dorm_12) "shT" = ( /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/storage) @@ -24181,14 +25084,14 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "sid" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, /obj/structure/cable/orange{ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "sih" = ( @@ -24203,6 +25106,16 @@ }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) +"sil" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/machinery/light_switch{ + pixel_x = -26; + pixel_y = -4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_8) "siu" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -24225,6 +25138,9 @@ /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/red/border, /obj/machinery/light, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "sjD" = ( @@ -24312,6 +25228,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/sortjunction{ + dir = 2; + name = "Warden"; + sortType = "Warden" + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "smo" = ( @@ -24326,7 +25247,7 @@ /area/security/hanger) "sms" = ( /obj/structure/closet/wardrobe/black, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area) "smC" = ( /obj/structure/cable/green{ @@ -24348,14 +25269,23 @@ }, /obj/effect/floor_decal/corner/navgold/bordercorner2, /obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "snw" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/carpet/blucarpet, -/area/crew_quarters/fitness) +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "sny" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 10 @@ -24373,8 +25303,17 @@ /turf/simulated/floor/plating, /area/maintenance/substation/security) "soz" = ( -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_3) +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "soV" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -24399,6 +25338,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portamidhall) "sqf" = ( @@ -24437,6 +25379,9 @@ "src" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "srx" = ( @@ -24451,12 +25396,14 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/security/hallway) "srB" = ( /obj/structure/cable/orange{ icon_state = "5-10" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "srX" = ( @@ -24484,12 +25431,13 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock{ - id_tag = "dorm2"; - name = "Dorm 2" + id_tag = "dorm12"; + name = "Dorm 12" }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_6) +/area/crew_quarters/sleep/Dorm_12) "stl" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -24521,7 +25469,7 @@ icon_state = "4-8" }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_9) +/area/crew_quarters/sleep/Dorm_4) "suB" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/multi_tile/glass{ @@ -24532,6 +25480,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/monotile, /area/security/lobby) "svs" = ( @@ -24673,15 +25622,14 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d3fwdmaint) "swv" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 1 +/obj/structure/cable/orange{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d3starboardamidhall) +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "swy" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -24701,6 +25649,8 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "sxc" = ( @@ -24711,24 +25661,10 @@ /turf/simulated/floor/tiled/steel_grid, /area/endeavour/surfacebase/mining_main/refinery) "sxA" = ( -/obj/structure/cable/green{ - 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{ - id_tag = "dorm11"; - name = "Dorm 11" - }, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_3) +/obj/structure/bed/double, +/obj/item/bedsheet/purpledouble, +/turf/simulated/floor/carpet/purcarpet, +/area/crew_quarters/sleep/Dorm_5) "sxT" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -24746,11 +25682,11 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "syD" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "syH" = ( @@ -24765,12 +25701,17 @@ "szn" = ( /obj/structure/table/steel, /obj/item/phone, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/security/lobby) +"szv" = ( +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) "szw" = ( /obj/machinery/light{ dir = 4 @@ -24785,6 +25726,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/bar/catwalk) "sAz" = ( @@ -24820,6 +25762,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "sBr" = ( @@ -24915,15 +25860,11 @@ /turf/simulated/floor/tiled/old_tile/gray, /area/security/range) "sFM" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_3) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/monotile, +/area/security/lobby) "sFQ" = ( /obj/machinery/light/small{ dir = 1 @@ -25014,16 +25955,6 @@ /obj/structure/lattice, /turf/space, /area/security/breakroom) -"sJz" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10, -/obj/machinery/shower{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/showers) "sJA" = ( /turf/simulated/floor/wood, /area/crew_quarters/sleep/bedrooms) @@ -25052,11 +25983,18 @@ }, /turf/simulated/floor/tiled/dark, /area/janitor) +"sKW" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardafthall) "sLk" = ( -/obj/structure/bed/double/padded, -/obj/random/bedsheet/double, +/obj/structure/table/woodentable, +/obj/item/storage/box/donkpockets, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_11) +/area/crew_quarters/sleep/Dorm_10) "sLN" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/structure/cable/yellow{ @@ -25087,17 +26025,23 @@ /turf/simulated/floor/tiled/monotile, /area/quartermaster/delivery) "sNh" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock{ + id_tag = "dorm8"; + name = "Dorm 8" }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_3) +/area/crew_quarters/sleep/Dorm_8) +"sNp" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "sNC" = ( /obj/machinery/computer/security/telescreen{ pixel_x = 32 @@ -25145,6 +26089,10 @@ /obj/effect/floor_decal/corner/red{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/security/security_lockerroom) "sRJ" = ( @@ -25173,9 +26121,6 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "sSx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -25194,6 +26139,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "sTn" = ( @@ -25220,6 +26168,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "sUU" = ( @@ -25238,12 +26189,6 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "sWa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -25292,11 +26237,6 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) -"sWi" = ( -/obj/structure/bed/double/padded, -/obj/random/bedsheet/double, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_8) "sWj" = ( /obj/machinery/door/firedoor/glass{ dir = 8 @@ -25344,6 +26284,9 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "sYp" = ( @@ -25386,7 +26329,9 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, /obj/machinery/disposal, -/obj/item/barrier_tape_segment/engineering, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hydroponics) "sZO" = ( @@ -25413,6 +26358,9 @@ /obj/effect/floor_decal/corner/navblue/bordercorner{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "taa" = ( @@ -25436,14 +26384,16 @@ }, /turf/simulated/floor/tiled/old_cargo/gray, /area/prison/cell_block) +"tab" = ( +/obj/machinery/air_alarm/east_mount, +/turf/simulated/floor/wood, +/area/crew_quarters/bar/lounge) "taR" = ( /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "taZ" = ( @@ -25462,7 +26412,7 @@ icon_state = "1-4" }, /obj/machinery/disposal, -/obj/structure/disposalpipe/up{ +/obj/structure/disposalpipe/trunk{ dir = 4 }, /turf/simulated/floor/tiled, @@ -25490,16 +26440,10 @@ /turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/qm) "tcl" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, -/obj/structure/table/woodentable, -/obj/item/radio/intercom{ - pixel_y = -24 - }, -/obj/item/instrument/trombone, +/obj/structure/closet/wardrobe, +/obj/item/toy/plushie/borgplushie/pupdozer, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_11) +/area/crew_quarters/sleep/Dorm_10) "tdf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -25540,21 +26484,27 @@ /turf/simulated/wall/prepainted, /area/endeavour/hallway/d3fwdhall) "tft" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10, /obj/machinery/shower{ dir = 4 }, /obj/machinery/light/small{ dir = 4 }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10, /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "tgl" = ( /turf/simulated/wall/prepainted/civilian, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) "tgJ" = ( /obj/machinery/holopad, /turf/simulated/floor/tiled, @@ -25564,23 +26514,35 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/uxstorage) "thy" = ( -/obj/effect/floor_decal/techfloor/corner{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/tiled/monotile, -/area/security/lobby) -"thA" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +/obj/effect/floor_decal/borderfloorblack{ dir = 1 }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/security/hallway) +"thA" = ( /obj/structure/cable/orange{ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "tib" = ( @@ -25615,11 +26577,18 @@ dir = 6 }, /obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/security/warden) "tiW" = ( /turf/simulated/floor/grass, /area/security/brig) +"tjB" = ( +/obj/fiftyspawner/glass, +/turf/simulated/floor/plating, +/area/maintenance/dormitory) "tjK" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 9 @@ -25629,6 +26598,19 @@ }, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"tjN" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, +/turf/simulated/floor/tiled/dark, +/area/security/hallway) "tkh" = ( /obj/structure/sink{ pixel_y = 22 @@ -25646,6 +26628,9 @@ /obj/structure/bed/chair/comfy/beige{ dir = 8 }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area) "tkT" = ( @@ -25659,13 +26644,10 @@ /turf/simulated/floor/wood, /area/quartermaster/qm) "tle" = ( -/obj/structure/bed/chair/wood{ - dir = 8 - }, /obj/effect/floor_decal/spline/fancy/wood, -/obj/landmark/spawnpoint/job/mime, +/obj/structure/table/woodentable, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) "tlK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -25675,6 +26657,17 @@ }, /turf/simulated/floor/tiled/old_cargo/gray, /area/security/security_processing) +"tlS" = ( +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "tne" = ( /obj/machinery/door/firedoor{ dir = 1 @@ -25701,6 +26694,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/bar/lower) "tos" = ( @@ -25712,6 +26706,10 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) "tox" = ( @@ -25738,7 +26736,6 @@ pixel_x = -24 }, /obj/structure/table/steel, -/obj/effect/floor_decal/steeldecal/steel_decals9, /turf/simulated/floor/tiled, /area/security/lobby) "tpm" = ( @@ -25759,6 +26756,21 @@ /obj/machinery/holopad/ship, /turf/simulated/floor/tiled/steel, /area/shuttle/mining_ship/general) +"tpu" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardforhall) "tpP" = ( /obj/structure/cable/green{ icon_state = "0-4" @@ -25800,6 +26812,9 @@ }, /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/navblue/bordercorner, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "trE" = ( @@ -25844,14 +26859,17 @@ /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) "tuT" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, /obj/structure/railing/grey{ dir = 4 }, -/obj/effect/floor_decal/spline/plain{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, -/turf/simulated/floor/carpet/bcarpet, -/area/vacant/vacant_shop) +/turf/simulated/floor/wood, +/area/tether/surfacebase/entertainment) "tvF" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -25898,8 +26916,7 @@ icon_state = "0-4" }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/tiled/steel, /area/quartermaster/delivery) @@ -25924,13 +26941,15 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/refinery) "txu" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "txv" = ( @@ -25945,6 +26964,9 @@ req_one_access = null }, /obj/map_helper/access_helper/airlock/station/security/general, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/old_cargo/gray, /area/security/security_processing) "txL" = ( @@ -25980,15 +27002,12 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "tAU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -26003,6 +27022,11 @@ "tBn" = ( /turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/foyer) +"tBs" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/structure/curtain/black, +/turf/simulated/floor/plating, +/area/crew_quarters/game_room) "tBN" = ( /obj/item/radio/beacon, /obj/structure/cable/green{ @@ -26036,6 +27060,9 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "tCj" = ( @@ -26067,16 +27094,13 @@ /turf/simulated/floor/tiled/dark, /area/security/riot_control) "tDn" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light/small{ dir = 8 }, /turf/simulated/floor/wood, @@ -26171,26 +27195,21 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "tHI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/machinery/door/airlock{ - name = "Bathroom" - }, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_3) +/obj/machinery/vending/fitness, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/recreation_area) "tHM" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/red/bordercorner, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "tHN" = ( @@ -26223,21 +27242,9 @@ }, /turf/simulated/floor/plating, /area/maintenance/bar/lower) -"tIo" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 9 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 9 - }, -/obj/machinery/disposal, -/obj/item/barrier_tape_segment/engineering, -/turf/simulated/floor/tiled/dark, -/area/security/hallway) "tIr" = ( /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ @@ -26338,6 +27345,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "tMP" = ( @@ -26402,7 +27412,6 @@ /turf/simulated/floor/plating, /area/maintenance/dormitory) "tPf" = ( -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/structure/cable/green{ icon_state = "0-8" @@ -26429,6 +27438,13 @@ /obj/effect/floor_decal/corner_oldtile/white/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) +"tRv" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "tTs" = ( /obj/machinery/shower{ pixel_y = 17 @@ -26517,12 +27533,23 @@ }, /turf/space/basic, /area/space) +"tUQ" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/red/border, +/obj/machinery/fire_alarm/south_mount{ + pixel_y = -24 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/security/hallway) "tUR" = ( /obj/machinery/light/small{ dir = 8 }, /turf/simulated/floor/carpet/gaycarpet, -/area/crew_quarters/sleep/Dorm_9) +/area/crew_quarters/sleep/Dorm_4) "tVi" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -26584,13 +27611,24 @@ /turf/simulated/floor/tiled/dark, /area/security/armoury) "tWr" = ( -/obj/structure/sign/deck/third, -/turf/simulated/wall/prepainted, -/area/crew_quarters/fitness) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "tXh" = ( /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/bar/catwalk) "tXo" = ( @@ -26734,7 +27772,7 @@ dir = 8 }, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) "udg" = ( /obj/structure/closet{ name = "Evidence Closet" @@ -26742,15 +27780,31 @@ /turf/simulated/floor/tiled/monotile, /area/security/forensics) "udI" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 5 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/effect/floor_decal/corner/red/border{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, -/obj/machinery/disposal, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"udJ" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "udU" = ( /obj/machinery/camera/network/security{ dir = 1 @@ -26780,11 +27834,9 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "ufC" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "ufL" = ( @@ -26801,12 +27853,6 @@ /turf/simulated/floor/plating, /area/maintenance/substation/security) "ugo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 8 }, @@ -26816,12 +27862,9 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "ugs" = ( -/obj/machinery/light{ - dir = 1; - pixel_y = 20 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/obj/machinery/light/small, +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/bar/lounge) "ugt" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -26857,6 +27900,9 @@ /obj/machinery/light{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "ugT" = ( @@ -26914,7 +27960,13 @@ /obj/structure/bed/double, /obj/item/bedsheet/purpledouble, /turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/sleep/Dorm_1) +/area/crew_quarters/sleep/Dorm_2) +"uhZ" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/red/border, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/security/hallway) "uih" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -26976,14 +28028,10 @@ /turf/simulated/floor/plating, /area/maintenance/substation/security) "ujb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/maintenance/dormitory) "ujj" = ( /obj/machinery/power/port_gen/pacman/mrs{ @@ -26991,8 +28039,7 @@ }, /obj/machinery/air_alarm/north_mount, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /obj/structure/cable/green{ icon_state = "0-4" @@ -27021,6 +28068,9 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "ukb" = ( @@ -27033,6 +28083,9 @@ /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "ukT" = ( @@ -27042,7 +28095,7 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled, -/area/security/nuke_storage) +/area/endeavour/hallway/d3portamidhall) "ulo" = ( /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) @@ -27056,13 +28109,15 @@ /turf/simulated/floor/crystal, /area/endeavour/hallway/d3fwdhall) "ulH" = ( -/obj/item/radio/intercom{ - pixel_y = -24 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock{ + id_tag = "dorm5"; + name = "Dorm 5" }, -/obj/structure/bed/double/padded, -/obj/random/bedsheet/double, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_3) +/area/crew_quarters/sleep/Dorm_5) "ulY" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/table/rack, @@ -27123,12 +28178,6 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "unJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -27141,21 +28190,17 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "uod" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 8 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "uoi" = ( -/obj/structure/bed/chair/sofa/black/right, -/turf/simulated/floor/tiled, -/area/crew_quarters/bar) +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar/lounge) "uoG" = ( /obj/structure/table/steel, /obj/item/storage/box/evidence{ @@ -27171,21 +28216,24 @@ pixel_x = 27 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/machinery/camera/network/civilian{ - dir = 8 - }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "upw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/dormitory) +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardafthall) "upG" = ( -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/breakroom) "upV" = ( @@ -27196,7 +28244,7 @@ icon_state = "4-8" }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) +/area/crew_quarters/sleep/Dorm_2) "uqf" = ( /obj/structure/table/woodentable, /obj/item/book/manual/standard_operating_procedure, @@ -27218,6 +28266,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "urn" = ( @@ -27255,12 +28306,22 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "usd" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 }, -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/sleep/Dorm_3) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/button/remote/airlock{ + id = "dorm5"; + name = "Room 5 Lock"; + pixel_x = -7; + pixel_y = -24; + specialfunctions = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_5) "usp" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -27298,11 +28359,11 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "utz" = ( @@ -27313,6 +28374,11 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/hallway) +"uvh" = ( +/obj/machinery/fire_alarm/east_mount, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/wood, +/area/crew_quarters/game_room) "uvj" = ( /obj/machinery/door/airlock/maintenance{ name = "Kitchen Maintenance Access" @@ -27323,6 +28389,10 @@ "uvl" = ( /turf/simulated/floor/tiled/monotile, /area/security/hallway) +"uvw" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, +/area/maintenance/dormitory) "uvI" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -27353,9 +28423,6 @@ /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) "uwo" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -27367,18 +28434,23 @@ /obj/effect/floor_decal/corner/navgold/bordercorner2{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "uwI" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_4) +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 + }, +/turf/simulated/floor/carpet/blue, +/area/crew_quarters/sleep/Dorm_11) "uwR" = ( /obj/structure/cable/orange{ icon_state = "1-2" @@ -27389,20 +28461,10 @@ /turf/simulated/wall/r_wall/prepainted/security, /area/security/lobby) "uxk" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/regular/open{ - dir = 2; - id = "DRAMATIC"; - name = "Dramatic Blast Door" - }, -/obj/machinery/door/blast/shutters{ - dir = 4; - id = "Druma"; - name = "Entertainment Shutters" - }, -/obj/spawner/window/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, -/area/vacant/vacant_shop) +/area/security/hallway) "uxX" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/structure/sign/directions/roomnum{ @@ -27436,22 +28498,12 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "uzl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, /area/maintenance/dormitory) "uzm" = ( -/obj/machinery/light{ - dir = 4; - use_power = 0 - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/bar) +/turf/simulated/floor/wood, +/area/crew_quarters/bar/lounge) "uzP" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -27473,7 +28525,7 @@ dir = 6 }, /turf/simulated/floor/carpet/sblucarpet, -/area/crew_quarters/sleep/Dorm_6) +/area/crew_quarters/sleep/Dorm_12) "uAq" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -27508,6 +28560,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/bar/lower) "uBK" = ( @@ -27517,11 +28570,10 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "uBN" = ( @@ -27537,9 +28589,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/security/hallway) "uEI" = ( @@ -27583,6 +28635,9 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "uGI" = ( @@ -27599,13 +28654,12 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/lobby) "uGN" = ( /obj/machinery/door/firedoor, -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/brig) @@ -27628,24 +28682,22 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "uIh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/structure/table/woodentable, /obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area) "uIA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, /turf/simulated/floor/tiled/monotile, @@ -27662,6 +28714,13 @@ }, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d3fwdhall) +"uIP" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardforhall) "uJk" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -27687,11 +28746,8 @@ /turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/qm) "uJv" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 10 - }, /obj/machinery/holopad, -/turf/simulated/floor/carpet/blucarpet, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "uJM" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -27708,6 +28764,19 @@ }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) +"uJP" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardforhall) "uKk" = ( /obj/structure/table/reinforced, /obj/item/pen{ @@ -27741,6 +28810,12 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) "uKW" = ( @@ -27770,7 +28845,7 @@ req_one_access = list(53) }, /turf/simulated/floor/tiled, -/area/security/nuke_storage) +/area/endeavour/hallway/d3portamidhall) "uMe" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -27784,6 +28859,9 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "uMi" = ( @@ -27838,23 +28916,24 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "uMR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "uOI" = ( -/turf/simulated/floor/tiled, -/area/security/nuke_storage) +/obj/machinery/door/airlock/civilian{ + name = "Reading Room 2" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/wood, +/area/crew_quarters/bar/lounge) "uOQ" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -27862,6 +28941,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portamidhall) "uOU" = ( @@ -27899,12 +28981,6 @@ /obj/machinery/camera/network/security{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, /obj/structure/table/steel, /obj/item/toy/figure/secofficer, /turf/simulated/floor/tiled, @@ -27925,12 +29001,11 @@ /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d3aftmaint) "uSv" = ( -/turf/simulated/wall/r_wall/prepainted, -/area/crew_quarters/recreation_area_hallway) +/obj/structure/table/woodentable, +/obj/machinery/microwave, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_8) "uSz" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, /obj/structure/cable/orange{ icon_state = "4-8" }, @@ -27938,15 +29013,12 @@ /obj/effect/floor_decal/corner/navblue/border, /obj/effect/floor_decal/borderfloorblack/corner2, /obj/effect/floor_decal/corner/navblue/bordercorner2, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d3portforhall) -"uSC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3portforhall) +"uSC" = ( /obj/random/trash_pile, /turf/simulated/floor/plating, /area/maintenance/dormitory) @@ -27998,7 +29070,7 @@ /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor/grid, /area/security/lobby) "uVc" = ( /obj/structure/fitness/punchingbag, @@ -28030,7 +29102,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "uWh" = ( /obj/structure/closet{ @@ -28067,7 +29139,7 @@ dir = 4 }, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) "uXL" = ( /obj/structure/table/rack{ dir = 8; @@ -28162,6 +29234,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "uZE" = ( @@ -28179,6 +29254,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "vaf" = ( @@ -28259,13 +29335,14 @@ /area/quartermaster/foyer) "vfa" = ( /turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/sleep/Dorm_8) +/area/crew_quarters/sleep/Dorm_13) "vfd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/maintenance/starboardsolar) "vfr" = ( @@ -28274,8 +29351,20 @@ }, /obj/structure/cable/green, /obj/machinery/power/apc/south_mount, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d3fwdhall) +"vfK" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/red/border, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/dark, +/area/security/hallway) "vfO" = ( /obj/structure/closet/crate/bin{ anchored = 1 @@ -28323,6 +29412,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "vhK" = ( @@ -28348,13 +29438,11 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "vig" = ( /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /obj/machinery/requests_console{ announcementConsole = 1; @@ -28366,12 +29454,6 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "viu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/holopad, /obj/structure/disposalpipe/segment{ dir = 8 @@ -28384,8 +29466,11 @@ pixel_x = -22 }, /obj/structure/bed/chair/comfy/teal, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_6) +/area/crew_quarters/sleep/Dorm_12) "viU" = ( /obj/item/radio/intercom{ dir = 4; @@ -28425,13 +29510,7 @@ /turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/qm) "vjD" = ( -/obj/structure/bed/chair/comfy/teal{ - dir = 1 - }, -/obj/machinery/light{ - dir = 8; - light_range = 12 - }, +/obj/structure/undies_wardrobe, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_7) "vkh" = ( @@ -28459,10 +29538,12 @@ /turf/simulated/wall/r_wall/prepainted/cargo, /area/endeavour/surfacebase/mining_main/break_room) "vkR" = ( -/obj/effect/paint/darkred, -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/security/lobby) +/area/maintenance/dormitory) "vkT" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -28476,6 +29557,9 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "vkZ" = ( @@ -28494,7 +29578,6 @@ /turf/simulated/floor/water/deep/indoors, /area/crew_quarters/sleep/bedrooms) "vlK" = ( -/obj/effect/paint/darkred, /obj/structure/cable/green{ icon_state = "1-4" }, @@ -28586,6 +29669,13 @@ }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) +"vog" = ( +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "vom" = ( /obj/effect/floor_decal/corner/red{ dir = 6 @@ -28643,12 +29733,10 @@ /turf/simulated/floor/lino, /area/security/detectives_office) "voV" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/tiled, -/area/crew_quarters/recreation_area_hallway) +/obj/structure/table/woodentable, +/obj/item/storage/box/donkpockets, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_8) "vpi" = ( /obj/machinery/computer/secure_data, /turf/simulated/floor/tiled/monotile, @@ -28664,6 +29752,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/security/armoury) +"vpv" = ( +/obj/effect/floor_decal/corner_steel_grid{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/fitness) "vpW" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -28738,37 +29832,31 @@ /turf/simulated/floor/tiled/dark, /area/security/armoury) "vqi" = ( -/obj/structure/table/woodentable, -/obj/item/radio/off{ - pixel_x = -7; - pixel_y = 2 - }, -/obj/item/megaphone{ - pixel_x = 5 - }, /obj/item/radio/intercom/department/security{ pixel_y = -24 }, /obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) "vqE" = ( /obj/structure/disposalpipe/up, /obj/effect/floor_decal/industrial/warning/full, -/obj/structure/lattice, -/turf/simulated/open, +/turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "vrD" = ( -/obj/structure/bed/chair/comfy/teal{ - dir = 8 - }, -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_y = -37 +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/machinery/light_switch{ + pixel_x = 26; + pixel_y = -4 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_5) +/area/crew_quarters/sleep/Dorm_7) "vsu" = ( /obj/effect/floor_decal/industrial/warning/full, /obj/structure/cable/orange{ @@ -28785,13 +29873,9 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/refinery) "vtP" = ( -/obj/item/stool/padded, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/obj/landmark/spawnpoint/job/entertainer, +/obj/structure/undies_wardrobe, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/crew_quarters/sleep/Dorm_9) "vut" = ( /obj/structure/fitness/weightlifter, /obj/structure/cable/green{ @@ -28809,6 +29893,11 @@ "vvH" = ( /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) +"vvP" = ( +/obj/structure/railing, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "vvV" = ( /obj/structure/table/reinforced, /obj/item/mecha_parts/mecha_equipment/weapon/energy/microtaser, @@ -28858,15 +29947,9 @@ /turf/simulated/floor/tiled, /area/security/range) "vxh" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/structure/closet/crate/bin{ - anchored = 1 - }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_3) +/area/crew_quarters/sleep/Dorm_7) "vxy" = ( /obj/machinery/air_alarm{ pixel_y = 22 @@ -28926,6 +30009,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "vyW" = ( @@ -28938,6 +30024,9 @@ /obj/effect/floor_decal/corner/navblue/bordercorner{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "vzm" = ( @@ -28947,6 +30036,9 @@ /obj/structure/cable/orange{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "vzs" = ( @@ -28964,8 +30056,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/security/hallway) @@ -28985,6 +30076,10 @@ /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "vzX" = ( @@ -29085,6 +30180,12 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/security/detectives_office) "vBk" = ( @@ -29093,6 +30194,9 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "vBq" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_9) "vCx" = ( @@ -29122,14 +30226,16 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "vDg" = ( /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "vDo" = ( @@ -29189,26 +30295,21 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portamidhall) "vEy" = ( /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/structure/cable/green{ icon_state = "4-8" }, /turf/simulated/floor/plating, /area/security/armoury) -"vEL" = ( -/obj/machinery/light_switch{ - pixel_x = 25; - pixel_y = 7 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_11) "vEV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -29285,20 +30386,12 @@ /turf/simulated/floor/tiled/white, /area/endeavour/hallway/d3fwdmaint) "vGJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/machinery/door/airlock{ - name = "Bathroom" - }, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_5) +/obj/machinery/vending/giftvendor, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/recreation_area) "vGY" = ( /obj/structure/table/reinforced, /obj/machinery/microscope, @@ -29314,7 +30407,6 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "vIs" = ( -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/prison/cell_block) @@ -29324,13 +30416,11 @@ /turf/simulated/floor/wood, /area/vacant/vacant_shop) "vIV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/light/small{ + dir = 1 }, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_hallway) +/area/crew_quarters/recreation_area) "vJO" = ( /obj/item/radio/intercom{ dir = 8; @@ -29406,6 +30496,7 @@ dir = 4 }, /obj/machinery/air_alarm/east_mount, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/security/hallway) "vLD" = ( @@ -29425,6 +30516,12 @@ /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 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardamidhall) "vMk" = ( @@ -29454,9 +30551,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/structure/cable/green{ icon_state = "4-10" }, @@ -29517,21 +30611,27 @@ /obj/structure/sign/department/armory{ pixel_y = -32 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "vNv" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 +/obj/item/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 26 }, -/turf/simulated/floor/tiled, -/area/crew_quarters/bar) +/turf/simulated/floor/wood, +/area/crew_quarters/bar/lounge) "vNz" = ( /obj/structure/cable/green, /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/breakroom) "vNN" = ( @@ -29550,9 +30650,6 @@ icon_state = "superjuke-nopower"; state_base = "superjuke" }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 - }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "vOS" = ( @@ -29573,6 +30670,7 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "vPs" = ( @@ -29629,8 +30727,7 @@ /area/endeavour/surfacebase/mining_main/refinery) "vRH" = ( /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /obj/spawner/window/low_wall/full/firelocks, /turf/simulated/floor/plating, @@ -29641,6 +30738,7 @@ sortType = "Trash"; dir = 8 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/bar/lower) "vSl" = ( @@ -29671,7 +30769,7 @@ pixel_x = 4; pixel_y = 4 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor/grid, /area/security/lobby) "vSO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -29685,6 +30783,10 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"vTg" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "vTs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -29697,12 +30799,36 @@ "vUu" = ( /turf/simulated/floor/carpet, /area/security/warden) +"vUA" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardafthall) "vUM" = ( +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + dir = 4 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_3) +/area/crew_quarters/recreation_area) "vVt" = ( /obj/structure/bed/chair{ dir = 4 @@ -29710,9 +30836,6 @@ /obj/machinery/atm{ pixel_x = -33 }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/security/lobby) "vVx" = ( @@ -29745,6 +30868,10 @@ /obj/structure/cable/orange{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "vWL" = ( @@ -29808,8 +30935,8 @@ /area/security/tactical) "vXB" = ( /obj/structure/undies_wardrobe, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_6) +/turf/simulated/floor/carpet/sblucarpet, +/area/crew_quarters/sleep/Dorm_12) "vYG" = ( /obj/structure/table/woodentable, /obj/item/storage/box/donkpockets, @@ -29817,7 +30944,7 @@ dir = 1 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_2) +/area/crew_quarters/sleep/Dorm_1) "vYO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -29825,14 +30952,17 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) "vYX" = ( -/obj/structure/toilet{ - pixel_y = 10 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_3) +/obj/structure/closet/wardrobe, +/obj/item/toy/plushie/blue_fox, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_7) "vZR" = ( /turf/simulated/wall/r_wall/prepainted/cargo, /area/quartermaster/storage) @@ -29845,8 +30975,7 @@ dir = 9 }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) @@ -29890,13 +31019,10 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "wbu" = ( @@ -29909,6 +31035,7 @@ /obj/machinery/camera/network/security{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/security/hallway) "wbv" = ( @@ -29930,15 +31057,6 @@ }, /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) -"wcX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_11) "wdk" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -29965,8 +31083,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) @@ -29981,6 +31098,7 @@ /obj/structure/disposalpipe/junction{ dir = 8 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/cargo/mining) "wgN" = ( @@ -30024,6 +31142,16 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "wjT" = ( @@ -30162,8 +31290,6 @@ /turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/foyer) "woj" = ( -/obj/effect/paint/darkred, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /turf/simulated/floor/plating, /area/security/detectives_office) @@ -30171,12 +31297,15 @@ /obj/structure/undies_wardrobe, /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_4) +/area/crew_quarters/sleep/Dorm_3) "woK" = ( /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portamidhall) "wpe" = ( @@ -30204,15 +31333,17 @@ "wqF" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/disposalpipe/junction{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/structure/disposalpipe/sortjunction/flipped{ + dir = 2; + name = "Kitchen"; + sortType = "Kitchen" + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "wqJ" = ( @@ -30221,6 +31352,12 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardamidhall) "wri" = ( @@ -30250,6 +31387,13 @@ }, /turf/simulated/floor/carpet/purcarpet, /area/maintenance/dormitory) +"wrN" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/old_cargo/gray, +/area/security/security_processing) "wrS" = ( /obj/machinery/fire_alarm/north_mount, /obj/machinery/camera/network/civilian, @@ -30264,10 +31408,9 @@ dir = 4 }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled, /area/security/lobby) "wsI" = ( /obj/structure/cryofeed{ @@ -30285,13 +31428,30 @@ }, /turf/simulated/floor/grass, /area/security/brig) +"wtj" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3portforhall) "wtm" = ( -/obj/structure/table/rack/shelf/steel, /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) "wtA" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -30299,12 +31459,11 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "wtC" = ( @@ -30348,12 +31507,11 @@ /turf/simulated/floor/wood, /area/maintenance/dormitory) "wwf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/sleep/Dorm_11) +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_10) "wwk" = ( /obj/structure/bed/chair{ dir = 1 @@ -30376,19 +31534,22 @@ /turf/simulated/floor/tiled, /area/security/hanger) "wwX" = ( -/obj/machinery/media/jukebox, /obj/machinery/air_alarm{ dir = 1; pixel_y = -22 }, +/obj/structure/flora/pottedplant/bamboo, /turf/simulated/floor/wood, /area/security/breakroom) "wwY" = ( /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "wxp" = ( @@ -30396,14 +31557,20 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "wxK" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/camera/network/cargo{ - dir = 1 +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, /turf/simulated/floor/tiled, -/area/quartermaster/office) +/area/endeavour/hallway/d3starboardafthall) "wym" = ( /obj/structure/table/rack/shelf/steel, /turf/simulated/floor/tiled/dark, @@ -30441,15 +31608,19 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "wAQ" = ( -/obj/machinery/computer/timeclock/premade/south, +/obj/machinery/camera/network/civilian{ + dir = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "wAR" = ( /obj/item/radio/intercom{ pixel_y = -24 }, -/obj/machinery/scale, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "wBG" = ( /obj/structure/cable{ @@ -30605,7 +31776,7 @@ /area/security/hallway) "wHz" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "wHF" = ( /obj/machinery/light{ @@ -30649,15 +31820,19 @@ /obj/structure/bed/double, /obj/item/bedsheet/bluedouble, /turf/simulated/floor/carpet/blue, -/area/crew_quarters/sleep/Dorm_4) +/area/crew_quarters/sleep/Dorm_3) "wIT" = ( -/obj/structure/cable/green{ - icon_state = "2-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_4) +/area/crew_quarters/sleep/Dorm_11) "wJO" = ( /obj/structure/table/woodentable, /obj/item/storage/box/donkpockets, @@ -30665,7 +31840,7 @@ dir = 1 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_4) +/area/crew_quarters/sleep/Dorm_3) "wKM" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -30708,15 +31883,16 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "wNi" = ( -/obj/structure/closet/crate/bin{ - anchored = 1 +/obj/effect/floor_decal/spline/plain{ + dir = 4 }, -/turf/simulated/floor/wood, +/obj/structure/flora/pottedplant/smalltree, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area) "wNo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -30741,7 +31917,7 @@ pixel_x = -30 }, /turf/simulated/floor/tiled, -/area/security/nuke_storage) +/area/endeavour/hallway/d3portamidhall) "wOA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -30749,6 +31925,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/light/small, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "wQt" = ( @@ -30772,6 +31949,13 @@ owner = 1; pixel_y = 10 }, +/obj/item/megaphone{ + pixel_x = 5 + }, +/obj/item/radio/off{ + pixel_x = -7; + pixel_y = 2 + }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) "wQu" = ( @@ -30829,8 +32013,14 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "wRM" = ( +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 1 + }, /obj/machinery/media/jukebox, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "wRS" = ( /obj/machinery/holopad, @@ -30878,7 +32068,6 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "wVa" = ( -/obj/item/instrument/banjo, /obj/structure/cable{ icon_state = "1-8" }, @@ -30899,13 +32088,19 @@ /obj/machinery/camera/network/security{ dir = 1 }, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/security/lobby) "wWK" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/palebottlegreen, /turf/simulated/floor/plating, /area/hydroponics) +"wWQ" = ( +/obj/structure/closet/wardrobe, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_3) "wWT" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -30914,8 +32109,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/interrogation) "wXu" = ( @@ -30931,6 +32126,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/security/hallway) "wXO" = ( @@ -30959,6 +32155,10 @@ dir = 9 }, /obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/starboardsolar) "wYH" = ( @@ -30979,6 +32179,15 @@ "wYU" = ( /turf/simulated/floor/tiled/steel_grid, /area/endeavour/surfacebase/mining_main/refinery) +"wYW" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entertainment) "wZh" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/conveyor{ @@ -31008,6 +32217,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/security/hallway) "wZw" = ( @@ -31024,7 +32234,7 @@ pixel_y = -24 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_6) +/area/crew_quarters/sleep/Dorm_12) "xad" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -31087,6 +32297,7 @@ name = "Security Blast Doors"; opacity = 0 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/security/hallway) "xdM" = ( @@ -31099,12 +32310,16 @@ pixel_y = 7 }, /obj/item/clothing/gloves/boxing/blue, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 + }, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "xdT" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/security/brig) "xeo" = ( @@ -31149,6 +32364,7 @@ icon_state = "5-6" }, /obj/machinery/door/airlock/maintenance, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "xfl" = ( @@ -31169,9 +32385,6 @@ }, /turf/simulated/floor/crystal, /area/endeavour/hallway/d3fwdhall) -"xfB" = ( -/turf/simulated/floor/carpet/sblucarpet, -/area/crew_quarters/sleep/Dorm_4) "xgl" = ( /obj/machinery/camera/network/outside{ dir = 5 @@ -31185,6 +32398,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "xgH" = ( @@ -31213,29 +32427,16 @@ /obj/structure/bed/chair/comfy/teal{ dir = 1 }, -/obj/machinery/button/remote/airlock{ - id = "dorm3"; - name = "Room 3 Lock"; - pixel_x = 26; - pixel_y = -4; - specialfunctions = 4 - }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_4) +/area/crew_quarters/sleep/Dorm_11) "xhD" = ( /obj/machinery/air_alarm{ dir = 4; pixel_x = -22 }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_8) +/turf/simulated/floor/carpet/purcarpet, +/area/crew_quarters/sleep/Dorm_13) "xiG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -31287,18 +32488,18 @@ /turf/simulated/floor/tiled, /area/security/lobby) "xlf" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "xlg" = ( /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/office) @@ -31323,8 +32524,7 @@ pixel_y = -10 }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /obj/effect/floor_decal/corner_oldtile/white/diagonal, /turf/simulated/floor/tiled/dark, @@ -31347,8 +32547,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "xmN" = ( -/obj/structure/table/woodentable, -/obj/structure/flora/pottedplant/fern, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_9) "xnb" = ( @@ -31362,7 +32561,7 @@ pixel_y = 10 }, /turf/simulated/wall/prepainted/civilian, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) "xnF" = ( /obj/structure/window/reinforced{ dir = 8 @@ -31423,8 +32622,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) @@ -31433,10 +32631,12 @@ dir = 8 }, /obj/machinery/air_alarm/west_mount, +/obj/structure/bed/chair/wood{ + dir = 1 + }, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) "xtI" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/machinery/light{ dir = 1 }, @@ -31446,6 +32646,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "xus" = ( @@ -31453,7 +32656,7 @@ dir = 8 }, /turf/simulated/floor/carpet/blue, -/area/crew_quarters/sleep/Dorm_4) +/area/crew_quarters/sleep/Dorm_3) "xut" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -31463,30 +32666,44 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) +"xuC" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3starboardafthall) "xuO" = ( -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/range) "xvZ" = ( -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -24 - }, /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = -37 }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_8) +/obj/structure/bed/double/padded, +/obj/random/bedsheet/double, +/obj/machinery/newscaster{ + pixel_x = -30 + }, +/turf/simulated/floor/carpet/purcarpet, +/area/crew_quarters/sleep/Dorm_13) "xwh" = ( /obj/machinery/photocopier, /obj/machinery/requests_console/preset/security{ pixel_y = 30 }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /obj/item/radio/intercom/department/security{ dir = 8; @@ -31509,15 +32726,17 @@ /turf/simulated/wall/prepainted, /area/maintenance/substation/civilian) "xwz" = ( -/obj/structure/table/woodentable, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/crew_quarters/sleep/Dorm_8) "xwZ" = ( /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/crew_quarters/heads/hos) "xxb" = ( @@ -31539,20 +32758,18 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3portamidhall) -"xxy" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/sleep/Dorm_7) +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) +"xxF" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "xyc" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -31579,13 +32796,13 @@ /area/security/warden) "xyn" = ( /obj/machinery/power/apc/east_mount, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "0-8" }, -/turf/simulated/floor/carpet/blucarpet, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 6 + }, +/turf/simulated/floor/tiled, /area/crew_quarters/fitness) "xys" = ( /obj/machinery/computer/guestpass{ @@ -31597,6 +32814,12 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) "xyD" = ( @@ -31679,6 +32902,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/multi_tile/glass{ + name = "Crew Quarters" + }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "xBx" = ( @@ -31714,9 +32941,6 @@ /obj/machinery/disposal/deliveryChute{ dir = 8 }, -/obj/structure/disposalpipe/up{ - dir = 4 - }, /obj/structure/plasticflaps, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) @@ -31774,11 +32998,20 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) +"xDS" = ( +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/game_room) "xEe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/crew_quarters/bar) +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar/lounge) "xEJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -31852,13 +33085,14 @@ dir = 4 }, /turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/sleep/Dorm_1) +/area/crew_quarters/sleep/Dorm_2) "xIv" = ( /obj/structure/cable/orange{ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "xID" = ( @@ -31924,6 +33158,20 @@ /obj/item/clothing/under/oricon/utility/marine/security, /turf/simulated/floor/tiled, /area/security/security_lockerroom) +"xLm" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/cargo/mining) +"xLD" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/trash_pit) +"xLN" = ( +/obj/machinery/door/firedoor, +/turf/simulated/floor/wood, +/area/crew_quarters/bar/lounge) "xMb" = ( /obj/machinery/camera/network/cargo{ dir = 8 @@ -32033,8 +33281,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, /obj/machinery/light_switch{ dir = 4; @@ -32065,6 +33312,9 @@ dir = 10 }, /obj/structure/disposalpipe/segment, +/obj/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "xQu" = ( @@ -32086,6 +33336,7 @@ /obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "xQU" = ( @@ -32119,13 +33370,14 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "xSu" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/Dorm_5) +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area_hallway) "xSF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -32166,11 +33418,11 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "xVp" = ( -/obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/security_lockerroom) "xVA" = ( @@ -32180,9 +33432,19 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, -/obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "xWe" = ( @@ -32224,9 +33486,21 @@ }, /turf/simulated/floor/tiled/old_cargo/red, /area/security/security_processing) +"xXa" = ( +/obj/machinery/camera/network/civilian{ + dir = 1 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) "xXg" = ( -/turf/simulated/wall/r_wall/prepainted/civilian, -/area/vacant/vacant_shop) +/turf/simulated/wall/r_wall/prepainted/cargo, +/area/crew_quarters/game_room) "xXk" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -32293,11 +33567,12 @@ /turf/simulated/floor/tiled, /area/security/security_lockerroom) "xYu" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "xYM" = ( @@ -32310,14 +33585,22 @@ /obj/effect/floor_decal/spline/fancy/wood, /obj/landmark/spawnpoint/job/clown, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/tether/surfacebase/entertainment) "xZs" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/sleep/Dorm_8) +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/security/hallway) "xZC" = ( /obj/structure/table/marble, /obj/structure/flora/pottedplant/small, @@ -32348,15 +33631,9 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/tiled, -/area/crew_quarters/bar) +/turf/simulated/floor/wood, +/area/crew_quarters/bar/lounge) "ybd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -32378,6 +33655,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "yck" = ( @@ -32393,11 +33673,14 @@ /obj/structure/railing/grey{ dir = 4 }, -/obj/effect/floor_decal/spline/plain{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, -/turf/simulated/floor/carpet/bcarpet, -/area/vacant/vacant_shop) +/obj/structure/bed/chair/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entertainment) "ydZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -32411,25 +33694,33 @@ /obj/machinery/computer/security/telescreen{ pixel_x = 32 }, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, +/turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "yeY" = ( /turf/simulated/wall/prepainted/security, /area/crew_quarters/heads/hos) "yfy" = ( -/obj/structure/bed/chair/comfy/teal{ +/obj/structure/bed/chair/comfy/purp{ dir = 8 }, -/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_3) +/area/crew_quarters/sleep/Dorm_5) "yfT" = ( /obj/structure/fitness/weightlifter, /turf/simulated/floor/tiled/dark, /area/security/brig) "ygd" = ( -/obj/machinery/vending/fitness, -/turf/simulated/floor/carpet/bcarpet, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red{ + dir = 10 + }, +/obj/machinery/fitness/punching_bag/clown, +/turf/simulated/floor/tiled, /area/security/breakroom) "ygj" = ( /obj/machinery/station_map{ @@ -32441,6 +33732,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "ygO" = ( @@ -32533,14 +33827,13 @@ pixel_x = -26 }, /obj/machinery/light{ - dir = 8; - light_range = 12 + dir = 8 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor/grid, /area/security/lobby) "ykp" = ( /obj/structure/closet/wardrobe/green, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area) "ykx" = ( /obj/structure/table/rack/shelf/steel, @@ -32626,6 +33919,7 @@ req_one_access = null }, /obj/map_helper/access_helper/airlock/station/security/brig, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) "ymc" = ( @@ -36219,10 +37513,10 @@ mDp mDp mDp mDp +pRW jGe jYr jGe -pRW mDp mDp mDp @@ -36409,14 +37703,14 @@ pRW jYr aKn jYr -cwn mDp mDp +cwn mDp +pRW jYr aKn jYr -pRW mDp mDp mDp @@ -36603,14 +37897,14 @@ mDp bzE bzE bzE -bzE -ggB -ggB -bzE -bzE +rAG +rAG +jAH +rAG +rAG bzE bzE -xJG +fWD pRW mDp mDp @@ -36797,11 +38091,11 @@ mDp bzE bzE bzE -bzE +cnc kKF +jAH kKF -szl -szl +cnc bzE bzE bzE @@ -36991,11 +38285,11 @@ mDp bzE bzE bzE -bzE +seB ugs -szl -szl -szl +jAH +qmi +seB jAH jAH bzE @@ -37010,19 +38304,19 @@ pRW mDp mDp kcO -nIl -kkw -kkw +ggB +ggB +ggB kcO kcO -kkw -nIl -kkw +ggB +ggB +ggB kcO kcO -kkw -kkw -kkw +ggB +ggB +ggB kcO rcG oCP @@ -37185,11 +38479,11 @@ mDp nNX bzE bzE -bzE -szl -szl -szl -szl +uzm +uzm +jAH +uzm +uzm jAH jAH bzE @@ -37380,16 +38674,16 @@ mDp bzE bzE bzE -szl -szl -uGk -seB -mVn -mVn -rPE -rPE -rPE -rPE +dBF +jAH +uOI +cHy +cHy +cHy +xXg +tBs +xXg +xXg pRW pRW xJG @@ -37574,15 +38868,15 @@ mDp mDp bzE bzE -szl -szl -uGk -qLS -qLS -qLS -qLS -qLS -qLS +uzm +uzm +uzm +cHy +xDS +kZp +oOG +kZp +kZp pwo bXD bXD @@ -37769,15 +39063,15 @@ jYr bzE bzE kbt -kbt -uGk -qLS -qLS -qLS -qLS -qLS -qLS -iaP +uzm +uzm +cHy +aOy +hnK +dnR +iCe +aOy +jZR gLU gLU xWx @@ -37786,15 +39080,15 @@ juB dcn wrS bgi -szl -szl -szl -szl -szl -szl -szl +jGZ +jGZ +jGZ +jGZ +jGZ +jGZ +jGZ nta -szl +xxF szl szl szl @@ -37962,16 +39256,16 @@ jYr aKn bzE bzE -kbt -kbt -uGk -qLS -qLS -qLS -qLS -qLS -qLS -iaP +uzm +uzm +jAH +cHy +jGP +ecM +dnR +gRi +lNU +jZR myN gLU gLU @@ -37988,7 +39282,7 @@ wYQ wYQ wYQ xPq -szl +xBR szl szl szl @@ -38004,7 +39298,7 @@ mPN qbm qbm pmY -rbn +pQP dAT dMY oth @@ -38157,15 +39451,15 @@ jYr bzE bzE cUe -fWD -uGk -qLS -qLS -qLS -qLS -qLS -qLS -iaP +uzm +jAH +cHy +icz +iAO +dnR +bUI +icz +jZR gLU gLU gLU @@ -38182,7 +39476,7 @@ iYC dJX iYC hMc -szl +xBR szl sAz ner @@ -38350,16 +39644,16 @@ pRW pRW bzE bzE -rAG -rAG -uGk -qLS -qLS -qLS -qLS -qLS -qLS -iaP +bwN +uzm +jAH +cHy +bfd +uvh +aWK +cTe +gLo +jZR lXo cCh cYs @@ -38376,7 +39670,7 @@ ayZ ach rwx vzX -szl +xBR szl vAp qCl @@ -38544,16 +39838,16 @@ pRW pRW tUu bzE -kbt +bwN rnj -uGk -uGk -uGk +jAH cHy -uGk -uGk -uGk -uGk +cHy +cHy +cHy +gNZ +cHy +jZR dcn dcn dcn @@ -38584,13 +39878,13 @@ rcG gdH rJC rcG -kPR +qdy jRg vlK dAT -bgj -vBk -sak +udI +uhZ +kBT tiR vFk tZY @@ -38741,17 +40035,17 @@ gMc uoi gFi xEe -xEe +hKd xEe xEe hkN eWz -eWz -eWz -eWz -eWz -eWz -eWz +xEe +fxn +xEe +xEe +kyI +cop mSQ mTI cop @@ -38778,7 +40072,7 @@ osg qQz wwk rcG -tIo +tjK uGl ovb dPF @@ -38932,22 +40226,22 @@ pRW pRW pRW gMc -jZR +uzm yaO -kbt uzm -kbt -kbt +tab +uzm +rlf bwN -kbt -kbt uzm -kbt -kbt -kbt -kbt uzm -gCh +uzm +uzm +uzm +xLN +szl +szl +szl szl dhY ffu @@ -39127,13 +40421,13 @@ pRW pRW bzE vNv -kbt -uGk -uGk -uGk -uGk +uzm +lEK +lEK +lEK +lEK cXR -uGk +lEK aMQ aMQ aMQ @@ -39144,7 +40438,7 @@ aMQ uGk kwl kEf -xBR +szl vAZ dJX dJX @@ -39152,7 +40446,7 @@ vSO iYC jfm vzX -eDt +dqc szl szl szl @@ -39321,13 +40615,13 @@ tUu rxD bzE kbt -kbt +uzm iaP qLS qLS qLS tXh -qLS +gDZ aMQ aMQ aMQ @@ -39338,7 +40632,7 @@ aMQ uGk uPC fgL -xBR +szl oki lMS sOD @@ -39346,7 +40640,7 @@ sOD sOD sOD rqM -eDt +dqc szl sGz xHf @@ -39365,7 +40659,7 @@ jkY jkY bUU wwY -vBk +qnW vxQ hZK xyl @@ -39514,14 +40808,14 @@ pRW pRW rxD rxD -kbt -kbt +ddU +piG iaP sAp dmA dmA dGV -qLS +gDZ aMQ nUf kjU @@ -39542,8 +40836,8 @@ sci fjB dqc szl -oki -lMS +dlR +mKS vOz uGk rcG @@ -39726,7 +41020,7 @@ eoc oUv pDX wqF -bax +dpk pTj pTj pTj @@ -39737,7 +41031,7 @@ usp aWJ szl yeI -aPW +lMS uGk fIm fIm @@ -39934,19 +41228,19 @@ uGk uGk uGk bUP +vFB kSn kSn kSn kSn -kSn -kSn +lDc fIm pTu iXZ wbv xjK pTu -rCI +lnD vBk tPf vAQ @@ -40128,10 +41422,10 @@ hkY kSn kSn kSn -kSn -kSn -kSn -kSn +cZa +cZa +cZa +cZa kSn kSn fIm @@ -40299,7 +41593,7 @@ qup qLS qLS mVn -lif +xLD lif lif kgM @@ -40322,11 +41616,11 @@ fIm kSn kSn kSn -kSn -kSn -kSn -kSn -kSn +cZa +udJ +sNp +dSc +vFB kSn fIm pTu @@ -40334,7 +41628,7 @@ lPF tgJ nws pTu -nfT +ksu wLx fJN dNF @@ -40513,14 +41807,14 @@ piX tJl eCh oRw -pQP -pQP -pQP -pQP -pQP -pQP -pQP -kSn +cZa +dSc +cZa +cZa +mnn +vvP +cZa +cZa kSn pTu pTu @@ -40528,7 +41822,7 @@ oWL dwU lyz pTu -rCI +lnD vBk fJN umw @@ -40707,22 +42001,22 @@ iSj gWa jZc fIm +vFB +vFB kSn kSn +gCh +cEH kSn kSn -kSn -kSn -kSn -kSn -kSn +vFB pTu ihQ xJC cDs ofO pTu -rCI +lnD vBk fJN mYQ @@ -40881,7 +42175,7 @@ rEk qLS qLS mVn -lif +xLD lif lif kgM @@ -40916,7 +42210,7 @@ nPU iAq ayW pTu -rCI +lnD gcQ fJN aGh @@ -41285,9 +42579,9 @@ wMW mup hCa lgT -iSj +bhQ qaT -kGS +fRk wWK vwK gHM @@ -41481,7 +42775,7 @@ bER xDp fbB eBf -kGS +kir okS prq jQE @@ -41498,7 +42792,7 @@ pTu pTu pTu pTu -rCI +lnD vBk pDe pDe @@ -41673,9 +42967,9 @@ xyD cUA nCe noi -eCh -qaT -kGS +rsb +fsu +dUA mqs prq mnr @@ -41876,9 +43170,9 @@ mnr gHM olB qeX -hmF gHM -hmF +gHM +gHM gHM bUa glG @@ -42049,7 +43343,7 @@ xZH xZH uAU kgM -xZH +fSt leL pir cUi @@ -42077,7 +43371,7 @@ vbj fqT aNk iSy -kSn +aQM kSn evH oNA @@ -42271,10 +43565,10 @@ gHM bYk glG heG -kSn +uMp kSn evH -rCI +lnD vBk pDe cGi @@ -42456,7 +43750,7 @@ glG nOt gHM gHM -nhQ +jEn xBX nmQ gHM @@ -42465,7 +43759,7 @@ gHM cQg glG heG -kSn +uMp kSn evH bOB @@ -42659,10 +43953,10 @@ gHM orr glG heG -kSn +uMp kSn evH -rCI +lnD vBk wCM wCM @@ -42853,10 +44147,10 @@ etV sZD glG heG -kSn +uMp kSn evH -nfT +ksu wLx wCM wCM @@ -43023,7 +44317,7 @@ xbH buX oOy oOy -oOy +qXh xJv kLR kLR @@ -43047,7 +44341,7 @@ glG glG glG heG -kSn +uMp kSn evH cHK @@ -43214,10 +44508,10 @@ qoU kgM kgM xbH -xZH -xZH -xZH -xZH +pXt +fTU +fTU +fTU buX lIR hXA @@ -43238,14 +44532,14 @@ dMA dMA dMA dMA -dqu -msG +dMA +dMA lnp -kSn -kSn +jHe +eiP xcs sma -vBk +vfK wCM wCM mWO @@ -43403,7 +44697,7 @@ gQF hwP mLm mLm -mLm +nYH mLm mLm xbH @@ -43432,14 +44726,14 @@ bUP kSn kSn kSn -uMp +kSn kSn cxF kSn kSn daG -sma -vBk +nIT +eDt wCM wCM wCM @@ -43633,7 +44927,7 @@ lEY lEY qVZ erg -vBk +eDt wCM wCM wCM @@ -44011,13 +45305,13 @@ xPB hLo uQr vWK -mpA +vog vhc -ars -kSn -kSn -boj -kSn +olW +aMa +aMa +gUM +aQM eLo oSr klc @@ -44178,7 +45472,7 @@ mLm mLm mLm hwP -mLm +hWB mLm lMH hMP @@ -44211,7 +45505,7 @@ vjc tOs msG lqj -gnm +kPR gnm lcL eia @@ -44224,9 +45518,9 @@ vnn vnn vnn vnn -udI +jip kUM -wLx +tUQ evH pTu sWj @@ -44405,22 +45699,22 @@ qjv iil pNn lWb -aQM -gLw +piz +dqu qVZ -onm +mWx xXJ vnn shI mwV tGi dGs -pxU +vvH uKW vnn vnn ugI -vBk +eDt evH pTu hQp @@ -44602,7 +45896,7 @@ pkT vBg pkT lKA -jTc +aNZ jTc vnn vnn @@ -44614,7 +45908,7 @@ pxU wEW vnn diH -vBk +eDt evH pTu isE @@ -44791,9 +46085,9 @@ keU ajk oux pdl -btN -uBN -uBN +kkw +nNj +nIl tfn cLH cti @@ -45001,14 +46295,14 @@ ulo gSd vqi vnn -rCI -vBk +thy +eDt evH pTu teq tVk tVk -aNZ +gtH lIO diV rFS @@ -45195,14 +46489,14 @@ btn lEF oqA xwZ -rCI -vBk +thy +eDt evH pTu smo jmv nJd -aNZ +gtH lIO nPX iIs @@ -45341,7 +46635,7 @@ mLm mLm mLm mLm -mLm +nYH hwP mLm lMH @@ -45390,13 +46684,13 @@ sGi fla kdS gji -vBk +eDt evH pTu rEv wwH -cPE -aNZ +tVk +gtH bfY diV rFS @@ -45584,13 +46878,13 @@ muC nJT lpr rCI -vBk +eDt evH pTu pTu pTu pTu -aNZ +gtH lIO nPX iIs @@ -45778,7 +47072,7 @@ vvH wQt rLJ qHG -wLx +tUQ evH pTu pTu @@ -45938,8 +47232,8 @@ gxU gum fDf uiz -aMa -aMa +eiP +eiP aMa aQM syH @@ -45972,7 +47266,7 @@ vvH eDa vnn rCI -vBk +eDt qHe ncH ihU @@ -46119,7 +47413,7 @@ mLm mLm mLm mLm -mLm +hwP lMH nqP wcT @@ -46133,7 +47427,7 @@ gLQ aAA syH kSn -kSn +cZa kSn nTi fiy @@ -46312,8 +47606,8 @@ gNj hWB mLm mLm -mLm -mLm +xLm +hwP lMH cBD ghV @@ -46322,9 +47616,9 @@ urn kff fUR hkE -txu +cnt lRP -sid +tlS syH kSn fvQ @@ -46337,14 +47631,14 @@ kSn kSn syH awA -wuH -hdY +upw +wxK vIs fWX rFP rFP rFP -vkR +vjb qqF uxf vjb @@ -46506,8 +47800,8 @@ gNj atw nfA clL -mLm -mLm +xLm +hwP lMH lMH lMH @@ -46516,9 +47810,9 @@ lMH lMH lMH lMH -eww -xiG -cpz +hEO +rZg +swv syH kSn kZH @@ -46531,14 +47825,14 @@ kSn kSn syH tpm -wuH -qmV +sKW +feQ vIs rFP sWJ rFP rFP -vkR +vjb toV wsC sfw @@ -46554,7 +47848,7 @@ hmd dfi qqF rCI -vBk +eDt qHe hoi vom @@ -46700,7 +47994,7 @@ ffW ffW ffW ffW -ffW +hmk cmi nCY che @@ -46724,7 +48018,7 @@ syH kSn kSn syH -fTU +awA deJ mBA vIs @@ -46732,11 +48026,11 @@ rFP rFP rFP rFP -vkR +vjb szn azW nKC -lfy +oSq tTN tZq oSq @@ -46748,7 +48042,7 @@ xGU nME qqF nfT -vBk +eDt dBi pDN dhp @@ -46893,9 +48187,9 @@ eFf noW xlg noW -fgj ffW -hdh +hmk +heO pwn pwn lRx @@ -46905,11 +48199,11 @@ aaY pwn pwn rcz -rqN +kXK avK syH kSn -uMp +irx kSn kSn kSn @@ -46919,18 +48213,18 @@ kSn kSn syH jRB -wuH -qmV +qFk +vUA vIs rFP rFP rFP rFP -vkR +vjb aIB seM nKC -lfy +oSq uGI mdL gMW @@ -46942,7 +48236,7 @@ mxY nGI qqF oCI -rKm +aZy xVp rqI hvX @@ -47087,8 +48381,8 @@ xlC noW pzs noW -fgj ffW +hmk hdh pwn twA @@ -47100,10 +48394,10 @@ pdF pwn uZv esx -fDf +qBG uiz -aMa -jpX +eiP +fMA kSn kSn kSn @@ -47113,18 +48407,18 @@ kSn kSn syH wQS -wuH -dmh +qFk +uwo hHh vIs sZO mZI -vkR -vkR +vjb +vjb eSt seM nKC -lfy +oSq epb qqF qqF @@ -47136,7 +48430,7 @@ qqF qqF qqF rCI -vBk +eDt dBi xYm xCL @@ -47280,8 +48574,8 @@ ffW sDX noW noW -noW -wxK +daE +ffW ffW hdh eNB @@ -47297,7 +48591,7 @@ xiG jbI syH kSn -kSn +cZa kSn kSn kSn @@ -47307,18 +48601,18 @@ kSn kSn syH ojU -wuH -pAC +jqq +aVb suB -rNH -rNH -rNH +sFM +sFM +sFM kiR -rNH +inp pwu kps quZ -rcD +rNH rNH arz cZB @@ -47488,10 +48782,10 @@ gLZ jLP eja vCG -cpz +swv syH kSn -kSn +cZa kSn kSn kSn @@ -47509,10 +48803,10 @@ gpu gpu gpu gpu -thy +gpu fRe fgJ -lnD +gpu gpu oDw iVS @@ -47524,7 +48818,7 @@ hbK fMJ gZQ wUZ -vBk +oqU ylw sQY wez @@ -47685,7 +48979,7 @@ xiG hLN syH kSn -kSn +cZa cvA diG diG @@ -47718,7 +49012,7 @@ niA taa hHh wUZ -vBk +eDt dBi nST tCj @@ -47889,8 +49183,8 @@ oIW kSn syH uJM -rsR -dmh +kRc +uwo qqF auQ yjg @@ -47912,7 +49206,7 @@ rFP bWd hHh jGk -vBk +eDt dhp nHr lOh @@ -48077,25 +49371,25 @@ mpA xgn mpA oFw -kSn +cZa syH -kSn +cZa bZv syH kfH -rsR -pAC +kRc +qGy wkY chh eem wpe wpe eYt -pKc +rNH qyf qQq uPY -nNj +kSg iqw vyR oaj @@ -48106,7 +49400,7 @@ mrb cLp gAa wUZ -voq +moo kiu kiu kiu @@ -48277,14 +49571,14 @@ kSn guu syH xyI -rsR +kRc ibm qqF rxf hjt chh -chh -vkR +eTJ +vjb eBO uIA eFC @@ -48300,7 +49594,7 @@ deG kHr hHh mVg -vBk +eDt upG ocx nRt @@ -48458,7 +49752,7 @@ pZg pZg dns xlf -cpz +swv syH kSn syH @@ -48480,7 +49774,7 @@ chh wWx qHe kUz -jbw +qHe hsu qqU qqU @@ -48494,12 +49788,12 @@ wsz wsz wsz eyh -vBk +eDt upG gHX -icM -icM -nwy +nRt +oNx +pcx pcx pcx agU @@ -48652,7 +49946,7 @@ rBG rBG pWF aCi -hYY +wtj syH kSn syH @@ -48673,9 +49967,9 @@ chh chh chh jet -dAT -ksW -cXt +xZs +jWI +iFW qqU bkP eXr @@ -48691,7 +49985,7 @@ wFj lhi iyK lot -icM +jyd icM plV wZj @@ -48838,15 +50132,15 @@ wnA jtk rBG fju +kXD fju -fju -fju +mIk fju fju rBG kMk -bBc -avK +oxG +kYx syH kSn syH @@ -48866,7 +50160,7 @@ nMx shz vSG vSG -aiW +uxk dAT ksW hvt @@ -48884,7 +50178,7 @@ cNj aik hhE dKB -uEI +pQv uEI uEI evI @@ -49034,7 +50328,7 @@ rBG vKr fju fju -fju +mIk fju fju rBG @@ -49076,7 +50370,7 @@ eDo bml wsz ihZ -vBk +eDt iyK qkL pTx @@ -49228,12 +50522,12 @@ rBG fju fju fju -fju +mIk fju fju rBG xtI -eTr +bBc uSz syH vPk @@ -49270,7 +50564,7 @@ fYx fdy wsz npL -wLx +tUQ iyK iyK iyK @@ -49418,11 +50712,11 @@ oyU nyi fju fju -fju -fju -fju -fju -fju +mIk +mIk +mIk +mIk +mIk fju fju rBG @@ -49441,7 +50735,7 @@ cGV cGV cGV sJL -rsR +kRc qqr qHe eMa @@ -49464,7 +50758,7 @@ deg hJR jQU wFj -vBk +eDt uYb sjJ ayi @@ -49612,7 +50906,7 @@ nKd nyi vKr fju -fju +mIk fju rBG rBG @@ -49622,7 +50916,7 @@ rBG rBG sTd bBc -ipH +fgj cGV wsI xtt @@ -49650,7 +50944,7 @@ pQC wws kTd txv -txv +wrN oxA wsz pPl @@ -49806,7 +51100,7 @@ osx nyi fju fju -fju +mIk rBG rBG fju @@ -49829,8 +51123,8 @@ goa nnV cGV jmQ -rsR -qmV +kRc +vUA qHe alB uvl @@ -49844,7 +51138,7 @@ qqU rza oKt rPz -txv +dPj oNN wsz yls @@ -49852,7 +51146,7 @@ oGR dyn wsz wFj -vBk +eDt uYb aqx hBU @@ -50000,17 +51294,17 @@ pQh nyi fju fju -fju +mIk rBG -dlI -dlI -dlI -dlI -dlI -dlI +rMi +rMi +rMi +rMi +rMi +rMi txu eTr -rZg +ras cGV wGC oqi @@ -50023,7 +51317,7 @@ goa nnV cGV mXV -wbn +kRc uwo qHe qHe @@ -50194,16 +51488,16 @@ oyU nyi fju fju -fju +mIk rBG -dlI -oBE +rMi +ovN qVv xhD xvZ -dlI +rMi jMM -bBc +oxG fpx cGV mKP @@ -50388,17 +51682,17 @@ nyi nyi fju fju -fju +mIk rBG -dlI +rMi nBf -xZs -kzA -sWi -dlI -uvI +vfa +vfa +vfa +rMi +nJu aCi -hYY +wtj cGV cGV cGV @@ -50411,29 +51705,29 @@ cGV cGV cGV qZx -kTk +xuC pEt -qHe -uny -uny +fVW +cPE +cPE vLn -uny -uny -uny +cPE +cPE +cPE mDz mDz mpy -uny +cPE oDh -uny -uny +cPE +tjN wbu gZq -uny +cPE vLn hjV mpy -uny +cPE vNs dzr sjJ @@ -50577,20 +51871,20 @@ csb csb wzB fju -fju -fju -fju -fju -fju -fju +mIk +mIk +mIk +mIk +mIk +mIk rBG -dlI -ibT -vfa +rMi +edb +adB bno kaW -dlI -wQJ +rMi +nEQ bBc vyW huq @@ -50606,7 +51900,7 @@ oxI oxI gdI ute -qmV +hte qHe qHe qHe @@ -50622,7 +51916,7 @@ evH evH evH evH -qHe +evH evH evH evH @@ -50778,12 +52072,12 @@ fju fju fju rBG -dlI +rMi kke qsL crj qwY -dlI +rMi sTd bBc trg @@ -50802,11 +52096,11 @@ wBG dbR lwh orP -oKo -dlG -oKo -dlG -oKo +tOV +tOV +tOV +tOV +tOV oKo orP tOV @@ -50972,15 +52266,15 @@ yab yab yab yab -bbr -bbr -dlI +iID +iID +rMi gTq -dlI -dlI +rMi +rMi sTd bBc -cpz +sid eZW xPB xPB @@ -50993,16 +52287,16 @@ xPB xPB inx aOg -rsR -pAC -npi -oKo -oKo -oKo -oKo -oKo -oKo -eqK +kRc +cCX +orP +tOV +tOV +tOV +tOV +tOV +tOV +orP tOV tOV tOV @@ -51166,7 +52460,7 @@ csb lyJ ewu ykp -fUB +eHQ qpi aqN pkW @@ -51187,20 +52481,20 @@ qHq kwF qCe pXE -rsR -pAC -npi -oKo -oKo -oKo -oKo -oKo -oKo -eqK -tOV -tOV -tOV -tOV +kRc +cCX +uvw +hLd +hLd +hLd +vkR +hLd +hLd +uvw +hLd +hLd +hLd +hLd tOV pCQ pCQ @@ -51368,7 +52662,7 @@ rks vaf sTd oxG -cpz +swv eqa bDG qHq @@ -51381,20 +52675,20 @@ qHq kwF qCe pXE -rsR +wbn owS phK phK phK phK phK -aVb -wHz +phK +phK orP svs tOV tOV -tOV +hLd tOV pCQ pCQ @@ -51556,13 +52850,13 @@ ewu ibL fUB rme -syZ +oyF mkn jHr vaf -sTd -bBc -cpz +txu +eTr +sid eZW xPB xPB @@ -51576,19 +52870,19 @@ xPB inx ojU rsR -qmV +feQ wHz cTU aQy fkv -gos -gos +mpz +vpv wRM orP pCQ tOV tOV -tOV +hLd tOV pCQ pCQ @@ -51748,14 +53042,14 @@ csb csb ewu wNi -fUB +lfy tkJ -syZ +cBe mkn jHr vaf -txu -eTr +sTd +bBc sid eqa mmq @@ -51769,11 +53063,11 @@ mmq mmq qCe pXE -rsR -qmV +kRc +vUA wHz -aya -gos +bNb +gvA qlP eLN uVT @@ -51782,7 +53076,7 @@ orP pCQ pCQ tOV -tOV +hLd tOV pCQ pCQ @@ -51950,7 +53244,7 @@ jHr pwq sXK bBc -cpz +sid eqa mmq mmq @@ -51964,19 +53258,19 @@ mmq qCe pXE aMs -qmV -phK +vUA +wHz bNb -gos -gos -gos +gvA +mhH +mhH hIR bsF orP tOV pCQ pCQ -tOV +hLd tOV tOV pCQ @@ -52144,7 +53438,7 @@ cLn qQD oBe qBQ -iIc +xXa mMr bWK bWK @@ -52157,11 +53451,11 @@ bWK bWK mhY odY -fjn +gVA mLw wHz xdO -gos +gvA rnS eLN mfr @@ -52337,10 +53631,10 @@ nvp mwA sQO woK -pAU -xIv +nTO +thA mMr -lTw +gKQ lTw mhY hOJ @@ -52351,20 +53645,20 @@ mhY ufX mhY tVr -fjn -mLw -tWr +gVA +nKM +phK aXy -gos +gvA rnS -gos +mhH hIR nvw orP +bDh tOV tOV -tOV -tOV +hLd pCQ tOV pCQ @@ -52522,16 +53816,16 @@ csb csb csb csb -hTz -rVy -rVy -rVy -rVy -mti -pPi +mfy +qbT +qbT +qbT +qbT +xSu +nJE jiy eUA -nTO +pAU rPF mMr lTw @@ -52545,20 +53839,20 @@ ufX ufX mhY fiG -fjn +gVA mLw wHz cYG gvA -gvA +mhH uJv hIR rzR orP +tjB tOV tOV -tOV -tOV +hLd pCQ pCQ pCQ @@ -52716,16 +54010,16 @@ csb csb csb csb -hTz +mfy viP miE lpl -rVy +qbT bzu iPO jiy fpw -pAU +nkY jmL hFn lTw @@ -52752,7 +54046,7 @@ orP tOV tOV tOV -tOV +hLd pCQ tOV pCQ @@ -52910,16 +54204,16 @@ csb csb csb csb -hTz -eqm +mfy +shN shN wZP -rVy +qbT mti pPi jiy tMK -pAU +nTO pNH mMr lTw @@ -52933,22 +54227,22 @@ nuP swT mhY wQI -hmk -mLw -wHz -snw +gVA +laD +koi +koi koi cnB -mhH -hIR +koi +pEk bFo orP svs -tOV -tOV -tOV +hLd +hLd +hLd eqK -tOV +hLd wkh lIp lIp @@ -53104,16 +54398,16 @@ csb csb csb csb -hTz +mfy cjp agG edp -rVy +qbT jUs -mRg +pPi jiy xxb -pAU +nTO iIc mMr lTw @@ -53127,9 +54421,9 @@ stW mhY mhY osL -hmk -mLw -wHz +gVA +fWt +qRW hjz bRI xyn @@ -53138,11 +54432,11 @@ jVc gos orP tOV -tOV +hLd tOV tOV pCQ -tOV +hLd pCQ pRW pRW @@ -53298,7 +54592,7 @@ csb csb csb csb -hTz +mfy vXB uAl rEa @@ -53307,7 +54601,7 @@ xut hgm jiy tMK -pAU +nTO oNu mMr lTw @@ -53321,7 +54615,7 @@ dXR gNi lOF fYq -fjn +gVA mLw hqP hqP @@ -53336,7 +54630,7 @@ eqK pCQ pCQ pCQ -tOV +hLd pCQ pRW pRW @@ -53492,17 +54786,17 @@ csb csb csb csb -hTz +mfy dKV hHX qaZ -rVy -mti -pPi +qbT +hoH +iPO jiy luz -pAU -xIv +nTO +thA mMr mMr mMr @@ -53515,22 +54809,22 @@ mhY mhY mhY qrB -fjn +gVA mLw hqP irT owH tft -sJz +owH kvG hqP tOV tOV -tOV +hLd pCQ svs tOV -tOV +hLd wkh pRW pRW @@ -53686,11 +54980,11 @@ csb csb csb csb -ibA -daO -daO -daO -daO +rBZ +fOe +fOe +fOe +fOe vAk dky jiy @@ -53720,11 +55014,11 @@ wTp hqP tOV tOV -tOV +hLd pCQ tOV tOV -tOV +hLd pCQ dsX pRW @@ -53878,18 +55172,18 @@ pRW pRW jGe jYr -pRW +csb cPI -daO +fOe pMS uwI miH -daO -nJE +fOe +mti qNM jiy tMK -pAU +nTO nRf ddk ddk @@ -53903,7 +55197,7 @@ bzp bzp bzp aPr -fjn +rSp eSJ hqP puw @@ -53912,13 +55206,13 @@ wjt mYK xIc hqP -qnW tOV tOV +hLd pCQ tOV tOV -tOV +hLd pCQ pRW pRW @@ -54074,7 +55368,7 @@ jYr aKn cPI jDP -daO +fOe elQ rTD wIT @@ -54083,7 +55377,7 @@ hFO mGq jiy spd -pAU +nTO eNl eWb eWb @@ -54098,7 +55392,7 @@ tTS tTS gTr fjn -mLw +buq hqP seV ohV @@ -54106,13 +55400,13 @@ ohV ohV dcz hqP -qnW -hLd tOV +hLd +hLd pCQ tOV tOV -tOV +hLd pCQ pRW pRW @@ -54268,11 +55562,11 @@ pRW cPI cPI jDP -daO +fOe fBG rDV gKi -daO +fOe uxX wOA jiy @@ -54302,11 +55596,11 @@ txL vnQ uSC hLd -tOV +hLd eqK -tOV -tOV -tOV +hLd +hLd +hLd pCQ pRW pRW @@ -54462,16 +55756,16 @@ cPI cPI jDP jDP -daO +fOe crM -xfB +kdZ ebz -daO +fOe vIe dld jiy dfD -pAU +nkY xIv orP tOV @@ -54485,7 +55779,7 @@ tOV tOV orP ruf -fjn +gVA wqJ vnQ nzc @@ -54494,14 +55788,14 @@ xSF nVo nzc vnQ -fWt +tOV hLd tOV pCQ -tOV -tOV -tOV -wkh +pCQ +pCQ +mRw +pCQ pRW pRW pRW @@ -54656,15 +55950,15 @@ cPI jDP jDP jDP -daO +fOe pqO dPi xgT -daO +fOe vIe qpd jiy -uOQ +fqc pAU iIc orP @@ -54679,7 +55973,7 @@ tOV tOV orP nDt -fjn +gVA aup vnQ vnQ @@ -54689,10 +55983,10 @@ vnQ vnQ vnQ uzl -upw -upw -pCQ +hLd +tOV tOV +pCQ oxm ujb pCQ @@ -54850,17 +56144,17 @@ vRl vRl vRl vRl -vRl -vRl -vRl -vRl +cPI +cPI +cPI +cPI rBG qdW rBG rBG uOQ -pAU -xIv +nTO +thA orP tOV tOV @@ -54873,7 +56167,7 @@ tOV tOV orP lDC -fjn +gVA ieG vnQ aVI @@ -54883,10 +56177,10 @@ sPv flr vnQ tOV +hLd tOV tOV pCQ -pCQ gBU bfj haF @@ -55049,7 +56343,7 @@ vRl vRl vRl vRl -fju +mIk fju rBG exc @@ -55077,7 +56371,7 @@ vnQ vnQ vnQ svs -tOV +hLd tOV tOV pCQ @@ -55243,25 +56537,25 @@ qSk pWD vRl vRl -fju +mIk fju rBG uOQ -pAU -xIv +nTO +thA +xdM +xdM +xdM +xdM +xdM +xdM daO daO daO daO daO -ekH -ekH -ekH -ekH -ekH -ekH eTx -fjn +gVA deC vnQ tkh @@ -55271,7 +56565,7 @@ dVM ebL vnQ tOV -tOV +hLd tOV tOV pCQ @@ -55437,25 +56731,25 @@ dBy gII vRl ncY -fju +mIk fju rBG uOQ -pAU -xIv -daO +nTO +thA +xdM wIA xus -tpP +jXj +fYb +xdM hbS -ekH -aqY -kyI +tpP tUR duv -ekH +daO xyc -fjn +gVA vMf vLD dkE @@ -55465,7 +56759,7 @@ rLL ahq vnQ tOV -tOV +hLd tOV tOV pCQ @@ -55631,25 +56925,25 @@ dBy wLe vRl vRl -fju +mIk fju rBG lDx -pAU +nTO goK -daO -kdZ -kdZ +xdM +egw +egw lbT wJO -ekH +xdM mLa jLq qHz qHz -ekH +daO nDt -fjn +rSp see vnQ oCm @@ -55659,7 +56953,7 @@ aTm adX vnQ tOV -tOV +hLd tOV tOV pCQ @@ -55825,24 +57119,24 @@ wMc gYF vRl vRl -fju +mIk fju rBG fqc -nTO +pAU thA -daO -oTx +xdM +wWQ woH jng rSu -ekH +xdM cCr efB nif -iLr -ekH -swv +oTx +daO +eTx okL pIT vnQ @@ -55853,7 +57147,7 @@ fzD vnQ vnQ pCQ -pCQ +uvw pCQ pCQ pCQ @@ -56019,23 +57313,23 @@ dnk jxV vRl vRl -fju -fju +mIk +mIk rBG fpw -pAU +nkY rUc +xdM +xdM +xdM +awm +xdM +xdM daO +suh daO daO -awm daO -ekH -ekH -suh -ekH -ekH -ekH osL lwm gBm @@ -56049,7 +57343,7 @@ eth hKI tDn ekc -oyF +qMf qOs vfd pcN @@ -56214,7 +57508,7 @@ ulY vRl vRl fju -fju +mIk rBG cYu ybd @@ -56235,14 +57529,14 @@ fFB gXN rxl hRv -hij +iBG foG +snw iBG -hcE hCy +dlG +iBG iBG -iFu -edb iBG vFE wVa @@ -56408,11 +57702,11 @@ ulY vRl ncY fju -fju +mIk rBG xxb -pAU -jmL +nTO +szv sJA sJA sJA @@ -56430,17 +57724,17 @@ rEE ekH ekH ekH -eHQ -ekH ekH ekH -fOe +nwy +vUM +nhQ eHT -fOe -fOe -fOe +klU +nVP +nhQ noY -dUN +aYo haF ssY dVI @@ -56602,10 +57896,10 @@ vRl vRl vRl fju -fju +mIk rBG tMK -pAU +nTO lhb xID hky @@ -56622,19 +57916,19 @@ wbj uod mLw ekH -pEk -hTJ +aqY +imX hCU -kUb -qmZ ekH -mRw -mQs -ezf -pGt -fOe +syZ +ekX +nhQ +nhQ +nhQ +nhQ +nhQ iJh -dUN +aYo hwy cuJ pUW @@ -56799,7 +58093,7 @@ rBG qdW rBG nyw -pAU +nTO goK xID faa @@ -56818,17 +58112,17 @@ mLw ekH jUf imX -hoH -lYk -mle +imX ekH -fzx +syZ +mWD +nhQ kfS -rWm -nBX -fOe +hNb +fCQ +nhQ qQb -dUN +aYo haF cuJ oVK @@ -56979,11 +58273,11 @@ pRW pRW pRW pRW -cPI -cPI -jDP -jDP -jDP +rWm +rWm +jid +jid +jid uLy wOl eIC @@ -57012,15 +58306,15 @@ mLw ekH vBq imX -imX -imX -jqq +nXt ekH +syZ +miB coW -hBC +hmF wwf tcl -fOe +nhQ wFK eWW haF @@ -57174,20 +58468,20 @@ pRW pRW pRW pRW -cPI -cPI -jDP -jDP +rWm +rWm +jid +jid rWA -uOI -uOI -uOI +gDD +gDD +gDD jdI -uOI -uOI -jDP +gDD +gDD +jid uMe -pAU +nTO fHS bVc oXu @@ -57207,14 +58501,14 @@ ekH aBl xmN ckQ -vBq +ibp nkn -ekH -ovN +jSG +nhQ dGA -otS +bmr dgX -fOe +nhQ sZz dUN haF @@ -57369,16 +58663,16 @@ pRW pRW jYr bHq -cPI -cPI +ibA +ibA xnb tgl tgl -xXg -xXg -xXg -xXg -xXg +tgl +tgl +tgl +tgl +tgl tgl ctz ybd @@ -57397,18 +58691,18 @@ ode rUS fFB swZ -gSN -gSN -gSN -gSN -gSN -gSN -gSN -bnt -vEL +ekH +vtP +jnU +gRa +ekH +vIV +ekX +nhQ +bmr bmr sLk -fOe +nhQ kXT dUN haF @@ -57564,8 +58858,8 @@ pRW jGe jYr pRW -cPI -tgl +ibA +imb fbD eBc nJb @@ -57574,35 +58868,35 @@ xtw fiR ubN itv -gDD -pAU +hUg +nTO blu -qEf -qEf -qEf -ghh -qEf -qEf cJC -fSo cJC cJC +ghh +cJC cJC +qEf +fSo +qEf +qEf +qEf qrB -uod +pJi cCJ -gSN -bSf -kKh -vjD -gxZ -ifc -gSN -fOe -fOe -nVP -fOe -fOe +ekH +ekH +ekH +ekH +ekH +syZ +ekX +nhQ +oMi +bmr +orX +nhQ cuJ dUN wWT @@ -57758,45 +59052,45 @@ pRW pRW pRW pRW -cPI -tgl +ibA +imb ffn hEc -aOy -dHJ -eek +hEc +hEc +hEc qxA bPs -tgl +qSN iKe aII syD -qEf -ahk +cJC +eiY rtp cUM jIr -qEf +cJC dYL qcJ eNA -eiY -cJC -hte +ahk +qEf +sih nTY jmJ gSN qoW -orX +dzM pmM -mcv -bil gSN -jyd -jWI -wcX -ntj -fOe +syZ +ekX +nhQ +nhQ +nhQ +nhQ +nhQ cuJ dUN bmY @@ -57953,7 +59247,7 @@ pRW pRW pRW tUu -tgl +imb ydO tuT lOf @@ -57962,35 +59256,35 @@ qud mNL lxI tgl -rcz +gmN ofc okZ -qEf +cJC aPN aPN cSd vYG -qEf +cJC gCV upV gOa gOa -cJC +qEf sih -adZ +dTf adH gSN kWJ -nab -xxy -nab +dzM dzM gSN -nRV +vTg +tWr +dlI iNR -hNb -inp -fOe +sil +ibT +dlI bjW dUN wWT @@ -58150,26 +59444,26 @@ pRW qCs eQM hPt -vtP +hPt bzQ uXI qxA tle tgl fiO -rqN -okZ -qEf +kXK +syD +cJC evi krn -qxb -lou -qEf -gfx xTl +gfx +cJC +lou +qxb xIo uhW -cJC +qEf sih adZ vWW @@ -58177,14 +59471,14 @@ gSN rhG dzM gFP -fYb -aam gSN -fOe -fOe -fOe -fOe -fOe +aam +kcI +sNh +hBC +xwz +gxZ +dlI cuJ dUN bmY @@ -58342,16 +59636,16 @@ pRW pRW pRW qCs -dHJ -eek -eek -eek -uXI +qmZ +hPt +hPt +wYW +rMk qxA qnx tgl qxm -rqN +kXK nKw mMr mMr @@ -58368,17 +59662,17 @@ voc nQm iaj gSN -gSN -gSN +vYX +vxh dUF -gSN -gSN -gSN -fOe -fOe -fOe -fOe -cuJ +qoo +nkn +jSG +dlI +oBE +puL +nBX +dlI cuJ dUN wWT @@ -58536,9 +59830,9 @@ pRW pRW pRW qCs -lNv -xwz -xwz +hPt +hPt +hPt jic uXI qxA @@ -58560,19 +59854,19 @@ hQd llM tqq qck -cBe -laD -iAO -qbT +tGB +gSN +vjD +vrD nUi -niR -vIV +gSN vIV -lTI -gRa -lWX +ekX +dlI +puL +puL voV -aRG +dlI aRG wYu bmY @@ -58731,16 +60025,16 @@ pRW pRW qCs lNv -xwz -xwz -eek +hPt +hPt +wYW nCv kSc lsx tgl rub -rqN -okZ +kXK +syD mMr lTw lTw @@ -58753,20 +60047,20 @@ xwr mMr mMr uam -eoB -wGd -mfy -vIe -ibp -rjJ -vIe -adB -vIe -mti -vIe +adZ +tGB +gSN +gSN +gSN +gSN +gSN +syZ +ekX +dlI +irP puL uSv -bmY +dlI bmY bmY bmY @@ -58923,18 +60217,18 @@ pRW pRW pRW pRW -imb +fdp pxt cMX -xwz -eek -vOS +hPt +wYW +bCs qxA xZp tgl mWG -rqN -okZ +kXK +syD vVx lTw lTw @@ -58947,20 +60241,20 @@ xwr mMr mMr nLT -pQa -gxY -xdM -xdM -xdM -sxA -xdM -xdM -hyv -dlR +adZ +tGB hyv +qzO +glK +sxA hyv -lTj -pRW +syZ +ekX +dlI +dlI +dlI +dlI +bbr jYr aKn jYr @@ -59119,9 +60413,9 @@ pRW pRW imb imb -dHJ -eek -eek +aPW +aPW +ojx mWw qyF hLt @@ -59141,20 +60435,20 @@ pUh hvr mMr sih -pQa +adZ kAe -xdM -cTe +hyv +iFu glK -sNh -vxh -xdM +glK +hyv +syZ mWD -fEB +rVy hlx hYA -lTj -pRW +lSH +hTz jGe jYr jGe @@ -59312,16 +60606,16 @@ pRW pRW pRW pRW -uxk -dHJ -eek -eek -eek -eek +imb +bcw +hEc +hEc +hEc +hEc rMh bEx -fPA -rqN +tRv +cXW hbD mMr lTw @@ -59335,20 +60629,20 @@ lDD ctE mMr eVP -pQa +adZ tNY -xdM +hyv yfy -dVD +glK pvm -eTJ -xdM +hyv +syZ miB lYm pGM fnh -lTj -pRW +hTJ +hTz aDe aDe aDe @@ -59507,15 +60801,15 @@ pRW pRW pRW imb -dHJ -eek -eek -eek -eek -rMh +bcw +hEc +hEc +hEc +hEc +rLT tgl kyv -rqN +kXK jFV mMr mMr @@ -59529,20 +60823,20 @@ aZU xwr mMr kCn -pQa +adZ fSB -xdM +hyv mbt dVD -pvm +otS ulH -xdM +nkn jSG -oNx +rVy coF -mNO -lTj -pRW +aNV +npi +hTz mDp mDp fkV @@ -59703,7 +60997,7 @@ jYr imb jhI hpc -grz +frY hpc grz wtm @@ -59723,22 +61017,22 @@ dUd oyu aCO lJE -qMp +adZ rOs -xdM -bUI +hyv +fOS avI usd -kcI -xdM -fOS -nKM +hyv +vIV +ekX +rVy aNV -vrD -lTj -mDp -pRW -pRW +aNV +iLr +hTz +jYr +jGe pRW pRW pRW @@ -59894,7 +61188,7 @@ pRW pRW jYr aKn -alQ +lTj gSf gSf gSf @@ -59903,7 +61197,7 @@ gSf gSf mMr ygj -rqN +kXK gSH orP orP @@ -59917,22 +61211,22 @@ orP orP orP klp -pQa +pKe mqC -xdM -iFW -nXt -vUM -eTJ -xdM +hyv +hyv +hyv +hyv +hyv +syZ ekX -eIF +rVy oez -hWN -lTj +aNV +dRK +hTz +aKn jYr -jGe -pRW pRW pRW pRW @@ -60111,22 +61405,22 @@ tOV kZj orP hIB -eoB -tGB -xdM -xdM -tHI -xdM -xdM -xdM -hyv +uIP +tpu hyv +aya +tHI vGJ hyv -lTj -aKn +nwy +vUM +rVy +rVy +rVy +hTz +hTz jYr -pRW +jGe pRW pRW pRW @@ -60291,7 +61585,7 @@ lTw lTw mMr bUz -mIk +aII syD orP tOV @@ -60305,21 +61599,21 @@ qdl kOc orP gQq -iHD +nTY rEi -xdM -vYX -eVN -sFM +bSf +syZ +syZ +syZ qZZ -xdM +syZ fBZ -xSu +eGx bvI -lEK -lTj -jYr -jGe +syZ +iHD +fDw +pRW pRW pRW pRW @@ -60485,7 +61779,7 @@ gRf mMr mMr qxm -rqN +ofc okZ orP efY @@ -60499,20 +61793,20 @@ tOV jVe orP gFU -eoB -tGB -xdM +ooS +uJP +ayd +nLm nLm -oMi soz nPn -xdM +nLm mbJ aQa -irP +syZ cGU -lTj -mDp +iHD +lIp pRW pRW pRW @@ -60675,11 +61969,11 @@ tUu alQ lTw lTw -lTw +fSP lTw mMr qxm -rqN +kXK qvY orP jhS @@ -60695,18 +61989,18 @@ orP gFU eoB poW -xdM -xdM -xdM -xdM -xdM -xdM -hyv -hyv -hyv -lTj -lTj -mDp +eVN +eVN +eVN +eVN +eVN +eVN +eVN +eVN +eVN +ewu +ewu +lIp pRW pRW pRW @@ -60869,11 +62163,11 @@ pRW alQ alQ lTw -lTw +fSP lTw mMr qxm -rqN +kXK gMk orP orP @@ -61062,206 +62356,206 @@ pRW pRW pRW alQ -alQ -lTw -lTw -mMr -qxm -tAU -uIa -qcn -ecv -ecv -ecv -ecv -ecv -gYb -mMr -mMr -mMr -mMr -paM -avW -qvK -mMr -lTw -rOW -eAp -lTw -lTw -lTw -alQ -meW -alQ -mDp -mDp -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -mDp -mDp -mDp -mDp -mDp -mDp -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -"} -(148,1,1) = {" -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -alQ +alQ +fSP +lTw +mMr +qxm +tAU +uIa +qcn +ecv +ecv +ecv +ecv +ecv +gYb +mMr +mMr +mMr +mMr +paM +avW +qvK +mMr +fSP +rOW +eAp +lTw lTw +nEe +alQ +alQ +alQ +mDp +mDp +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +mDp +mDp +mDp +mDp +mDp +mDp +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +"} +(148,1,1) = {" +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +alQ +fSP lTw mMr vkT -rqN +kXK eyy mMr mMr @@ -61278,7 +62572,7 @@ acN eoB tGB mMr -lTw +fSP enJ wbb lTw @@ -61451,14 +62745,14 @@ pRW jGe jYr alQ -lTw -lTw +fSP +fSP gRf -fPA -rqN +cjH +kXK fPA pku -lTw +fSP lTw wtC dNB @@ -61472,7 +62766,7 @@ wGd eoB tGB bDg -lTw +fSP alQ alQ alQ @@ -61649,10 +62943,10 @@ lTw lTw mMr ujU -rqN +kXK scV mMr -lTw +fSP lTw wtC dNB @@ -61666,8 +62960,8 @@ wGd eoB tGB mMr -lTw -lTw +fSP +gKQ lTw alQ alQ @@ -61843,11 +63137,11 @@ lUd lTw mMr qxm -rqN -okZ +kXK +syD mMr -lTw -lTw +fSP +fSP wtC dNB ikk @@ -61860,7 +63154,7 @@ wGd com iIU mMr -lTw +fSP lTw alQ alQ @@ -62037,11 +63331,11 @@ alQ lTw mMr rub -rqN -okZ +kXK +syD mMr lTw -lTw +fSP wtC dNB ikk @@ -62054,7 +63348,7 @@ wGd com wGd pku -lTw +fSP lTw alQ alQ @@ -62231,11 +63525,11 @@ alQ lTw mMr nMU -rqN -okZ +kXK +syD mMr mMr -pku +mSO wtC oQU dNB @@ -62429,7 +63723,7 @@ sWa iIC mMr lTw -lTw +fSP lTw lTw lTw @@ -62618,26 +63912,26 @@ pRW alQ alQ mMr -ova +nue gEz -jKI +dtc mMr mqp +fSP lTw lTw lTw lTw -lTw -lTw +gKQ lTw lTw mMr -nYH +stl kDu xYu alQ lTw -lTw +nEe alQ jYr jGe @@ -62812,23 +64106,23 @@ jGe jYr alQ mMr -ova +hyQ uMR -lqZ +rPa mMr lTw -lTw -lTw -lTw -lTw +fSP +fSP +fSP +fSP lTw lTw lTw lTw mMr piH -ugo -fiP +lro +nQv alQ lTw lTw @@ -63022,7 +64316,7 @@ mMr mMr wiJ ugo -fiP +ezM alQ lTw lTw @@ -63200,7 +64494,7 @@ jGe jYr alQ mMr -ova +nue dHX dSg fop @@ -63216,7 +64510,7 @@ vQB vQB mVA auM -fiP +ezM alQ lTw lTw @@ -63394,7 +64688,7 @@ pRW nhl lTw alQ -ova +bjQ kBD aMk bUW @@ -63410,7 +64704,7 @@ hsr hsr qZS jNw -fiP +hGm alQ lTw lTw @@ -63607,7 +64901,7 @@ kuM fiP alQ lTw -lTw +enJ alQ alQ mDp diff --git a/maps/endeavour/levels/deck4.dmm b/maps/endeavour/levels/deck4.dmm index b4ad0e8c8be1..352bcab8b6d9 100644 --- a/maps/endeavour/levels/deck4.dmm +++ b/maps/endeavour/levels/deck4.dmm @@ -35,6 +35,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4portamidhall) "acg" = ( @@ -93,7 +94,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/structure/disposalpipe/junction/yjunction, /obj/structure/cable/green{ icon_state = "2-4" }, @@ -231,14 +231,18 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/starboardnacelle) "anp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, /obj/machinery/door/firedoor{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4portamidhall) "anJ" = ( @@ -267,6 +271,7 @@ /obj/effect/floor_decal/corner/lightorange/border{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4starboardhall) "apH" = ( @@ -283,6 +288,9 @@ /obj/effect/floor_decal/corner/lightorange/border{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4starboardamidhall) "arQ" = ( @@ -381,9 +389,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4porthall) "auo" = ( @@ -451,6 +456,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4fwdhall) "axj" = ( @@ -479,6 +487,7 @@ "ayo" = ( /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/lightorange/bordercorner, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4porthall) "ayA" = ( @@ -522,6 +531,7 @@ /obj/machinery/computer/security/telescreen{ pixel_x = 32 }, +/obj/structure/table/woodentable, /turf/simulated/floor/wood, /area/engineering/break_room) "azJ" = ( @@ -621,6 +631,9 @@ /obj/structure/sign/department/eng{ pixel_y = 32 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4starboardamidhall) "aFz" = ( @@ -805,9 +818,6 @@ /obj/effect/floor_decal/corner/lightorange/border{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -960,9 +970,10 @@ /obj/effect/floor_decal/corner/lightorange/border{ dir = 8 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4starboardamidhall) "bdx" = ( @@ -1037,6 +1048,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4starboardamidhall) "bhF" = ( @@ -1125,6 +1139,9 @@ "bne" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/lightorange/border, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4portamidhall) "bny" = ( @@ -1147,7 +1164,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/paint_stripe/sun, /obj/structure/window/phoronreinforced/full{ icon_state = "phoronwindow0" }, @@ -1163,9 +1179,6 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/ai) "boz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -1187,15 +1200,12 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardhall) "bpV" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4portamidhall) "bqC" = ( @@ -1208,6 +1218,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4porthall) "brS" = ( @@ -1611,6 +1624,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techmaint, /area/rnd/robotics/smallcraft) "bRD" = ( @@ -1741,6 +1755,7 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4portamidhall) "bYZ" = ( @@ -1888,6 +1903,7 @@ dir = 8 }, /obj/map_helper/access_helper/airlock/station/hangar, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/robotics/smallcraft) "ckx" = ( @@ -2063,7 +2079,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/corner/white/diagonal, +/turf/simulated/floor/tiled, /area/engineering/break_room) "cvQ" = ( /obj/effect/floor_decal/corner/lightorange/border{ @@ -2125,6 +2142,9 @@ /obj/structure/sign/department/eng{ pixel_y = 32 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4starboardamidhall) "cxT" = ( @@ -2166,6 +2186,7 @@ name = "Hangar Lockdown Blast Doors"; opacity = 0 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/robotics/smallcraft) "cAe" = ( @@ -2334,6 +2355,21 @@ "cJz" = ( /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4porthall) +"cLe" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/endeavour/hallway/d4starboardamidhall) "cLC" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -2354,9 +2390,13 @@ /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4portafthall) "cLO" = ( -/obj/machinery/vending/snack{ +/obj/machinery/light{ dir = 8 }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/machinery/recharge_station, /turf/simulated/floor/tiled, /area/engineering/break_room) "cMz" = ( @@ -2396,7 +2436,6 @@ /area/engineering/engineering_monitoring) "cPu" = ( /obj/spawner/window/low_wall/borosillicate/full/firelocks, -/obj/effect/paint_stripe/sun, /obj/effect/paint/sun, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) @@ -2650,11 +2689,11 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/catwalk, /obj/structure/disposalpipe/segment{ - dir = 1; + dir = 4; icon_state = "pipe-c" }, -/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/substation) "dkU" = ( @@ -2669,6 +2708,9 @@ /obj/structure/sign/department/eng{ pixel_y = -32 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4portamidhall) "dlD" = ( @@ -2799,10 +2841,8 @@ /turf/simulated/floor/wood, /area/engineering/hallway/lower) "dtD" = ( -/obj/structure/bed/chair/comfy/beige{ - dir = 4 - }, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/corner/white/diagonal, +/turf/simulated/floor/tiled, /area/engineering/break_room) "dvP" = ( /obj/machinery/atmospherics/pipe/simple/visible/fuel{ @@ -2902,16 +2942,17 @@ /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4portafthall) "dCG" = ( -/obj/machinery/light{ - dir = 4; - pixel_x = 10 - }, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/recharge_station, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/bed/chair/sofa/brown/left{ + dir = 8 + }, /turf/simulated/floor/wood, /area/engineering/break_room) "dDz" = ( @@ -3064,6 +3105,9 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4portamidhall) "dRg" = ( @@ -3112,7 +3156,12 @@ dir = 1 }, /obj/machinery/camera/network/engineering, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4porthall) "dSP" = ( @@ -3123,6 +3172,14 @@ }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d4fwdhall) +"dTA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/lightorange/border, +/turf/simulated/floor/tiled/steel_grid, +/area/endeavour/hallway/d4fwdhall) "dUf" = ( /obj/item/modular_computer/console/preset/engineering, /obj/effect/floor_decal/borderfloorblack{ @@ -3283,6 +3340,11 @@ }, /turf/simulated/floor/bluegrid, /area/ai_upload) +"egF" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d4fwdhall) "ehr" = ( /turf/simulated/floor/tiled, /area/endeavour/hallway/d4fwdhall) @@ -3342,6 +3404,9 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4starboardforhall) "elg" = ( @@ -3564,6 +3629,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/warning, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techmaint, /area/rnd/robotics/smallcraft) "eyl" = ( @@ -3692,6 +3758,7 @@ /obj/effect/floor_decal/corner/lightorange/border{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4starboardhall) "eHS" = ( @@ -3710,7 +3777,6 @@ dir = 4 }, /obj/spawner/window/low_wall/borosillicate/full/firelocks, -/obj/effect/paint_stripe/sun, /obj/effect/paint/sun, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) @@ -3783,6 +3849,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4porthall) "eLR" = ( @@ -3820,6 +3887,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4starboardhall) "eMg" = ( @@ -3919,6 +3987,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/catwalk, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/rnd/robotics/smallcraft) "eSf" = ( @@ -4016,6 +4085,9 @@ /obj/structure/cable/green{ icon_state = "0-2" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4starboardforhall) "eYL" = ( @@ -4170,6 +4242,12 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4portamidhall) +"fic" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d4porthall) "fih" = ( /obj/effect/floor_decal/corner/navgold{ dir = 9 @@ -4271,6 +4349,9 @@ dir = 1 }, /obj/machinery/air_alarm/north_mount, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4starboardforhall) "fnf" = ( @@ -4291,9 +4372,6 @@ /turf/simulated/floor/plating, /area/maintenance/substation) "fod" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -4314,6 +4392,9 @@ /area/endeavour/hallway/d4portafthall) "fow" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4fwdhall) "fqb" = ( @@ -4383,6 +4464,7 @@ req_one_access = null }, /obj/map_helper/access_helper/airlock/station/hangar, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/robotics/smallcraft) "fxi" = ( @@ -4428,6 +4510,19 @@ "fzb" = ( /turf/simulated/floor/tiled/white, /area/engineering/shield_gen) +"fzk" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d4porthall) "fzP" = ( /obj/structure/cable{ icon_state = "0-8" @@ -4569,6 +4664,9 @@ "fIT" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/lightorange/border, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4portforhall) "fJl" = ( @@ -4610,6 +4708,9 @@ dir = 1 }, /obj/machinery/air_alarm/north_mount, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4starboardamidhall) "fLx" = ( @@ -4734,15 +4835,13 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/portnacelle) "fVD" = ( -/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/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4porthall) "fVN" = ( @@ -4752,6 +4851,9 @@ /turf/simulated/floor/plating, /area/engineering/atmos) "fWg" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4fwdhall) "fWh" = ( @@ -4950,17 +5052,11 @@ /turf/simulated/floor/tiled/dark, /area/engineering/engine_gas) "goM" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightorange/border{ - dir = 4 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/steel_grid, -/area/endeavour/hallway/d4starboardamidhall) +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d4portamidhall) "gpF" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/techmaint, @@ -5031,6 +5127,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/endeavour/command/turrets) +"gtb" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/wood, +/area/endeavour/station/stairs_four) "gtA" = ( /turf/space, /area/endeavour/command/turrets) @@ -5171,6 +5271,11 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/lightorange/border, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4fwdhall) "gAz" = ( @@ -5273,6 +5378,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/bed/chair/sofa/brown/right{ + dir = 8 + }, /turf/simulated/floor/wood, /area/engineering/break_room) "gFL" = ( @@ -5542,12 +5650,9 @@ /area/engineering/hallway/lower) "gTq" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/tiled/steel, @@ -5576,12 +5681,19 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/portnacelle) -"gXz" = ( -/obj/machinery/vending/coffee{ - dir = 8 +"gWV" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/obj/effect/floor_decal/corner/white/diagonal, +/obj/effect/floor_decal/spline/plain{ + dir = 4 }, -/obj/machinery/light{ - dir = 8 +/turf/simulated/floor/tiled, +/area/engineering/break_room) +"gXz" = ( +/obj/machinery/vending/cola, +/obj/effect/floor_decal/spline/plain{ + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/break_room) @@ -5593,6 +5705,9 @@ /obj/effect/floor_decal/corner/lightorange/bordercorner{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardamidhall) "gXG" = ( @@ -5653,6 +5768,14 @@ }, /turf/simulated/floor/tiled/white, /area/engineering/engine_monitoring) +"hbD" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/lightorange/border, +/turf/simulated/floor/tiled/steel_ridged, +/area/endeavour/hallway/d4fwdhall) "hcr" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/lightorange/border, @@ -5663,6 +5786,9 @@ name = "Engineering Hallway"; req_one_access = null }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4portforhall) "hcL" = ( @@ -5734,6 +5860,9 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4portamidhall) "hjF" = ( @@ -5942,8 +6071,10 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4portforhall) "hvj" = ( -/obj/structure/disposalpipe/up, /obj/effect/floor_decal/industrial/warning/full, +/obj/structure/disposalpipe/up{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/substation) "hvH" = ( @@ -6027,6 +6158,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4porthall) "hBH" = ( @@ -6039,7 +6173,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -6101,15 +6234,11 @@ dir = 1 }, /obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" + dir = 4 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4portafthall) "hER" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -6159,6 +6288,12 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/wood, /area/storage/tech) "hHV" = ( @@ -6383,6 +6518,12 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4portamidhall) "hPX" = ( @@ -6571,6 +6712,19 @@ }, /turf/simulated/floor/plating, /area/engineering/engine_smes) +"ifZ" = ( +/obj/effect/floor_decal/corner/white/diagonal, +/obj/structure/table/reinforced, +/obj/item/storage/firstaid/regular, +/obj/random/medical/lite, +/obj/item/bodybag/cryobag{ + pixel_x = 6 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/break_room) "igs" = ( /obj/map_helper/airlock/door/int_door, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -6598,10 +6752,11 @@ /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4portafthall) "ijh" = ( +/obj/effect/floor_decal/corner/white/diagonal, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "1-4" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled, /area/engineering/break_room) "ijz" = ( /obj/effect/floor_decal/borderfloorblack, @@ -6737,6 +6892,9 @@ dir = 1 }, /obj/machinery/fire_alarm/north_mount, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4starboardforhall) "iqQ" = ( @@ -6753,6 +6911,12 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardhall) +"iqX" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d4fwdhall) "irh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -6794,17 +6958,9 @@ /area/engineering/portnacelle) "iuW" = ( /obj/structure/table/reinforced, -/obj/item/storage/firstaid/regular, -/obj/random/medical/lite, -/obj/item/bodybag/cryobag{ - pixel_x = 6 - }, /obj/effect/floor_decal/corner/white/diagonal, -/obj/machinery/power/apc/west_mount{ - cell_type = /obj/item/cell/super - }, -/obj/structure/cable/green{ - icon_state = "0-4" +/obj/machinery/chemical_dispenser/catering/bar_soft{ + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/break_room) @@ -6930,6 +7086,10 @@ /obj/structure/cable/orange{ icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4porthall) "iGw" = ( @@ -7058,6 +7218,9 @@ name = "Engineering Hallway"; req_one_access = null }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4starboardforhall) "iRg" = ( @@ -7071,9 +7234,6 @@ alpha = 255 }, /obj/effect/floor_decal/corner/lightorange/bordercorner2, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4porthall) "iSx" = ( @@ -7361,6 +7521,7 @@ req_one_access = null }, /obj/map_helper/access_helper/airlock/station/external_airlock, +/obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_eva) "jkF" = ( @@ -7425,6 +7586,7 @@ "jnR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardamidhall) "jnW" = ( @@ -7440,7 +7602,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -7460,6 +7621,11 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "jpt" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/lightorange/bordercorner, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4portamidhall) "jpQ" = ( @@ -7547,6 +7713,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardamidhall) "jsX" = ( @@ -7790,10 +7957,6 @@ }, /area/tcommsat/chamber) "jGO" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/light/small, /turf/simulated/floor/plating, @@ -8049,6 +8212,7 @@ /area/endeavour/hallway/d4fwdmaint) "jUK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/bed/chair/comfy/beige, /turf/simulated/floor/wood, /area/engineering/break_room) "jVb" = ( @@ -8258,6 +8422,9 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4fwdhall) "klt" = ( @@ -8277,6 +8444,9 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4portforhall) "knf" = ( @@ -8364,6 +8534,13 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/rnd/robotics/smallcraft) +"kva" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d4fwdhall) "kwb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -8400,11 +8577,11 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4portforhall) -"kyk" = ( -/turf/simulated/floor/tiled/techmaint, -/area/endeavour/hallway/d4fwdmaint) "kzb" = ( /obj/machinery/light/small{ dir = 1 @@ -8460,6 +8637,18 @@ /obj/item/flashlight/lamp/green/on, /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/heads/chief) +"kAi" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d4starboardamidhall) "kAj" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 6 @@ -8543,6 +8732,7 @@ req_one_access = null }, /obj/map_helper/access_helper/airlock/station/external_airlock, +/obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_eva) "kDR" = ( @@ -8557,6 +8747,18 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rnd/robotics/smallcraft) +"kEz" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/substation) "kEJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 8 @@ -8629,6 +8831,9 @@ dir = 1 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4starboardforhall) "kMU" = ( @@ -8639,15 +8844,12 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "kNH" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardamidhall) "kOd" = ( @@ -8661,6 +8863,9 @@ icon_state = "4-8" }, /obj/machinery/fire_alarm/north_mount, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4porthall) "kOp" = ( @@ -8692,6 +8897,14 @@ }, /turf/simulated/floor/tiled/techfloor, /area/endeavour/command/turrets) +"kRo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/bed/chair/comfy/beige{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/engineering/break_room) "kRL" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 10 @@ -8780,8 +8993,7 @@ "kWg" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/amber, -/obj/effect/paint/amber, -/turf/simulated/floor/plating, +/turf/simulated/wall/prepainted/civilian, /area/engineering/engineering_monitoring) "kXh" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -8829,6 +9041,9 @@ dir = 1 }, /obj/machinery/fire_alarm/north_mount, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4starboardforhall) "laD" = ( @@ -8897,14 +9112,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/catwalk, -/obj/structure/cable/orange{ - icon_state = "1-4" - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/substation) "lfw" = ( @@ -8914,6 +9122,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) +"lfB" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/endeavour/hallway/d4fwdhall) "lgy" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/lightorange/border, @@ -8966,6 +9180,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4porthall) "liM" = ( @@ -9040,6 +9257,16 @@ /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4portforhall) "lqz" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack/corner{ + alpha = 255; + dir = 4 + }, +/obj/effect/floor_decal/corner/lightorange/bordercorner{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4starboardamidhall) "lqY" = ( @@ -9136,7 +9363,6 @@ dir = 4 }, /obj/spawner/window/low_wall/borosillicate/full/firelocks, -/obj/effect/paint_stripe/sun, /obj/effect/paint/sun, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) @@ -9168,6 +9394,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/bed/chair/sofa/brown{ + dir = 8 + }, /turf/simulated/floor/wood, /area/engineering/break_room) "lzV" = ( @@ -9242,13 +9471,14 @@ /turf/simulated/floor/tiled/monotile, /area/endeavour/hallway/d4starboardhall) "lEl" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/donkpockets{ - pixel_x = 3; - pixel_y = 2 - }, -/obj/item/storage/box/glasses/square, /obj/effect/floor_decal/corner/white/diagonal, +/obj/structure/sink/kitchen{ + dir = 4; + pixel_x = -12 + }, +/obj/effect/floor_decal/spline/plain/corner{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/engineering/break_room) "lEE" = ( @@ -9298,6 +9528,15 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/plating, /area/engineering/portnacelle) +"lIe" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d4starboardamidhall) "lJh" = ( /obj/structure/table/reinforced, /obj/item/floor_painter, @@ -9317,6 +9556,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4portamidhall) "lMn" = ( @@ -9448,9 +9688,6 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) "lTq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -9539,6 +9776,12 @@ }, /turf/simulated/floor/reinforced/phoron, /area/engineering/atmos) +"lWO" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/wood, +/area/engineering/break_room) "lXi" = ( /obj/machinery/atmospherics/pipe/simple/visible/fuel{ dir = 10 @@ -9611,6 +9854,9 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4portafthall) "maG" = ( @@ -9748,6 +9994,28 @@ }, /turf/space, /area/space) +"mhT" = ( +/obj/structure/cable/green{ + 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/corner/white/diagonal, +/obj/structure/table/reinforced, +/obj/item/storage/box/glasses/square, +/obj/item/storage/box/donkpockets{ + pixel_x = 3; + pixel_y = 2 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/break_room) "miv" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -9881,14 +10149,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/blue{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/machinery/door/airlock/glass/atmos, /obj/map_helper/access_helper/airlock/station/engineering/department, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "mtj" = ( @@ -10008,6 +10276,25 @@ "mAB" = ( /turf/simulated/floor/tiled/techfloor, /area/ai_upload_foyer) +"mBf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d4portamidhall) +"mBD" = ( +/obj/effect/floor_decal/industrial/warning/full, +/obj/structure/disposalpipe/up{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/substation) "mBG" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -10023,9 +10310,12 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "mCo" = ( -/obj/structure/table/reinforced, -/obj/machinery/microwave, -/obj/effect/floor_decal/corner/white/diagonal, +/obj/machinery/vending/snack{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/engineering/break_room) "mCr" = ( @@ -10107,7 +10397,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -10154,7 +10443,6 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ dir = 4 }, -/obj/effect/paint_stripe/sun, /obj/structure/window/phoronreinforced/full{ icon_state = "phoronwindow0" }, @@ -10212,17 +10500,14 @@ /turf/simulated/floor/plating, /area/maintenance/substation/engineering) "mLz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/door/firedoor{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor{ - dir = 8 + dir = 5 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4porthall) @@ -10497,6 +10782,10 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardafthall) "neB" = ( @@ -10553,7 +10842,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/blue{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, /turf/simulated/floor/tiled/techmaint, @@ -10586,10 +10875,6 @@ "nmh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/catwalk, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /turf/simulated/floor/plating, /area/maintenance/substation) "nmp" = ( @@ -10747,6 +11032,9 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, +/obj/machinery/disposal{ + pixel_y = -2 + }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "nsF" = ( @@ -10927,6 +11215,9 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4portforhall) "nAS" = ( @@ -10983,6 +11274,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4porthall) "nEe" = ( @@ -11049,6 +11343,21 @@ }, /turf/simulated/floor/carpet/oracarpet, /area/engineering/engineering_monitoring) +"nGj" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/lightorange/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightorange/bordercorner2{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/endeavour/hallway/d4portafthall) "nHk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 5 @@ -11118,6 +11427,7 @@ req_one_access = null }, /obj/map_helper/access_helper/airlock/station/external_airlock, +/obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_eva) "nKU" = ( @@ -11245,8 +11555,16 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardamidhall) +"nRW" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d4fwdhall) "nRY" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 10 @@ -11256,6 +11574,9 @@ "nSo" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/lightorange/border, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4portforhall) "nTJ" = ( @@ -11277,7 +11598,6 @@ req_one_access = null }, /obj/map_helper/access_helper/airlock/station/engineering/department, -/obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/eva) "nTU" = ( @@ -11415,6 +11735,9 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4starboardamidhall) "obt" = ( @@ -11424,6 +11747,9 @@ /obj/effect/floor_decal/corner/lightorange/border{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4starboardforhall) "obX" = ( @@ -11445,6 +11771,18 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/eva) +"odE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d4starboardamidhall) "oep" = ( /obj/structure/table/steel, /obj/item/integrated_electronics/debugger{ @@ -11475,6 +11813,9 @@ dir = 1 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4starboardamidhall) "ogm" = ( @@ -11608,6 +11949,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/table/woodentable, /turf/simulated/floor/wood, /area/engineering/break_room) "oqU" = ( @@ -11615,6 +11957,24 @@ /obj/landmark/spawnpoint/job/atmospheric_technician, /turf/simulated/floor/tiled/steel_dirty, /area/engineering/atmos/workshop) +"orH" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/endeavour/hallway/d4porthall) "orN" = ( /obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/white, @@ -11660,6 +12020,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4portamidhall) "oxm" = ( @@ -11698,6 +12062,7 @@ name = "Hangar Lockdown Blast Doors"; opacity = 0 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/robotics/smallcraft) "ozM" = ( @@ -11858,6 +12223,7 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4portamidhall) "oPx" = ( @@ -11952,6 +12318,12 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/substation) +"oTw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/corner/white/diagonal, +/turf/simulated/floor/tiled, +/area/engineering/break_room) "oTS" = ( /obj/effect/floor_decal/spline/fancy, /turf/simulated/floor/carpet/oracarpet, @@ -11960,7 +12332,6 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled/steel_dirty, /area/engineering/atmos/workshop) "oVb" = ( @@ -11991,6 +12362,9 @@ dir = 1 }, /obj/machinery/fire_alarm/north_mount, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4starboardamidhall) "oWx" = ( @@ -12036,6 +12410,9 @@ name = "Engineering Hallway"; req_one_access = null }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4starboardforhall) "oZV" = ( @@ -12052,15 +12429,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4porthall) "pbx" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4fwdhall) "pcf" = ( @@ -12203,7 +12580,11 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/corner/white/diagonal, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/engineering/break_room) "pmN" = ( /obj/machinery/atmospherics/component/unary/outlet_injector{ @@ -12246,6 +12627,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai_upload_foyer) +"psX" = ( +/obj/effect/floor_decal/corner/white/diagonal, +/obj/effect/floor_decal/spline/plain{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/engineering/break_room) "ptr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -12257,7 +12645,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/junction{ - dir = 1 + dir = 2; + icon_state = "pipe-j2" }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) @@ -12267,6 +12656,7 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardamidhall) "pvC" = ( @@ -12281,8 +12671,17 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardafthall) +"pvL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d4portamidhall) "pwL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/blue, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "pxF" = ( @@ -12310,6 +12709,12 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4porthall) "pyF" = ( @@ -12446,6 +12851,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4starboardamidhall) "pGV" = ( @@ -12534,6 +12942,9 @@ "pPp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4fwdhall) "pQQ" = ( @@ -12541,6 +12952,17 @@ /obj/machinery/meter, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/starboardnacelle) +"pQT" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/steel_ridged, +/area/endeavour/hallway/d4starboardamidhall) "pSm" = ( /obj/machinery/computer/atmos_alert{ dir = 1 @@ -12559,6 +12981,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4portamidhall) "pSM" = ( @@ -12588,6 +13011,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4portamidhall) "pTV" = ( @@ -12636,6 +13062,9 @@ /area/engineering/atmos/eva) "pVc" = ( /obj/machinery/air_alarm/north_mount, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d4fwdhall) "pVu" = ( @@ -12844,8 +13273,20 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4porthall) +"qps" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/steel_ridged, +/area/endeavour/hallway/d4portamidhall) "qpI" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -12861,6 +13302,12 @@ }, /turf/simulated/floor/plating, /area/engineering/atmos) +"qqL" = ( +/obj/structure/bed/chair/comfy/beige{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/engineering/break_room) "qrS" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -12928,6 +13375,7 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardhall) "qwn" = ( @@ -12953,6 +13401,7 @@ /obj/effect/floor_decal/corner/lightorange/border{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4porthall) "qxC" = ( @@ -13012,9 +13461,6 @@ }, /area/tcommsat/chamber) "qzJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 10 }, @@ -13174,10 +13620,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable/green{ icon_state = "1-4" }, @@ -13351,6 +13793,9 @@ dir = 1 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4starboardforhall) "qYn" = ( @@ -13527,6 +13972,14 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4portamidhall) +"roq" = ( +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/maintenance/substation) "rpC" = ( /obj/structure/cable{ icon_state = "4-8" @@ -13542,6 +13995,9 @@ "rqK" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/lightorange/border, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4portamidhall) "rqN" = ( @@ -13565,7 +14021,11 @@ /obj/machinery/requests_console/preset/engineering{ pixel_x = -31 }, -/turf/simulated/floor/wood, +/obj/machinery/vending/coffee, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/engineering/break_room) "rsD" = ( /obj/machinery/shieldgen, @@ -13693,6 +14153,10 @@ /obj/structure/cable/orange{ icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4portafthall) "rAC" = ( @@ -13840,6 +14304,17 @@ "rNG" = ( /turf/simulated/floor/tiled/techfloor, /area/ai_upload) +"rOh" = ( +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/maintenance/substation) "rOi" = ( /obj/effect/floor_decal/corner/navgold{ dir = 5 @@ -14033,6 +14508,19 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4fwdhall) +"saT" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/steel_grid, +/area/endeavour/hallway/d4starboardamidhall) "sdP" = ( /obj/machinery/atmospherics/portables_connector, /obj/effect/floor_decal/industrial/outline/red, @@ -14053,6 +14541,9 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, +/obj/structure/bed/chair/comfy/beige{ + dir = 4 + }, /turf/simulated/floor/wood, /area/engineering/break_room) "sgk" = ( @@ -14101,6 +14592,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4porthall) "sjY" = ( @@ -14239,6 +14733,9 @@ /obj/effect/floor_decal/corner/lightorange/border{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4starboardamidhall) "suN" = ( @@ -14272,11 +14769,14 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "sya" = ( -/obj/structure/table/woodentable, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/corner/white/diagonal, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/engineering/break_room) "szc" = ( /obj/machinery/power/smes/buildable{ @@ -14535,6 +15035,16 @@ /obj/machinery/light/small, /turf/simulated/floor, /area/storage/tech) +"sOh" = ( +/obj/effect/floor_decal/corner/white/diagonal, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/engineering/break_room) "sOD" = ( /obj/machinery/air_sensor{ frequency = 1441; @@ -14556,7 +15066,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -14640,11 +15149,8 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) "sXt" = ( -/obj/structure/bed/chair/comfy/beige{ - dir = 8 - }, -/obj/machinery/computer/security/telescreen{ - pixel_x = 32 +/obj/machinery/light{ + dir = 4 }, /turf/simulated/floor/wood, /area/engineering/break_room) @@ -15013,7 +15519,6 @@ id = "portnacelle_blastdoor"; opacity = 0 }, -/obj/effect/paint_stripe/sun, /obj/structure/window/phoronreinforced/full{ icon_state = "phoronwindow0" }, @@ -15038,6 +15543,9 @@ "tFW" = ( /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/lightorange/bordercorner, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4portamidhall) "tGH" = ( @@ -15091,7 +15599,6 @@ req_one_access = null }, /obj/map_helper/access_helper/airlock/station/engineering/department, -/obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/workshop) "tKA" = ( @@ -15126,6 +15633,7 @@ /obj/effect/floor_decal/corner/lightorange/border{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4porthall) "tNt" = ( @@ -15149,6 +15657,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4porthall) "tNZ" = ( @@ -15213,10 +15722,10 @@ /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4portamidhall) "tRp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/blue, /obj/machinery/atmospherics/pipe/simple/visible/aux{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "tRQ" = ( @@ -15314,6 +15823,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4fwdhall) "tUN" = ( @@ -15419,6 +15931,13 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/workshop) +"ufA" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d4fwdhall) "ufH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -15519,6 +16038,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) +"uoz" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/endeavour/hallway/d4fwdhall) "uoU" = ( /obj/machinery/atmospherics/component/unary/vent_pump{ external_pressure_bound = 0; @@ -15600,13 +16125,6 @@ initial_gas_mix = "n2=100;TEMP=80" }, /area/tcommsat/chamber) -"uus" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/structure/cable/orange{ - icon_state = "0-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/substation) "uvQ" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -15798,6 +16316,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4starboardhall) "uFs" = ( @@ -15833,11 +16352,15 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "uJl" = ( -/obj/structure/table/reinforced, -/obj/machinery/chemical_dispenser/catering/bar_soft{ +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, /area/engineering/break_room) "uJI" = ( @@ -16045,11 +16568,12 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "vbk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4portamidhall) "vch" = ( @@ -16074,6 +16598,9 @@ /area/engineering/atmos) "vdH" = ( /obj/machinery/light, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d4fwdhall) "vdK" = ( @@ -16200,7 +16727,8 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/junction{ - dir = 8 + dir = 4; + icon_state = "pipe-j2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -16218,7 +16746,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/multi_tile/glass, /obj/structure/cable/green{ icon_state = "1-2" @@ -16391,6 +16918,9 @@ name = "Engineering Hallway"; req_one_access = null }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4portforhall) "vss" = ( @@ -16484,6 +17014,17 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4porthall) +"vvj" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/steel_grid, +/area/endeavour/hallway/d4portamidhall) "vvE" = ( /obj/effect/floor_decal/techfloor/orange, /obj/structure/table/reinforced, @@ -16855,6 +17396,9 @@ /obj/structure/cable/orange{ icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4porthall) "vUP" = ( @@ -16865,13 +17409,16 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/blue{ +/obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 4 }, /obj/machinery/door/airlock/glass/atmos, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "vVa" = ( @@ -17171,6 +17718,19 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai) +"whm" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/steel_grid, +/area/endeavour/hallway/d4portamidhall) "whq" = ( /obj/item/radio/intercom{ dir = 1; @@ -17240,11 +17800,11 @@ /area/engineering/engineering_monitoring) "wlo" = ( /obj/structure/table/reinforced, -/obj/machinery/recharger, /obj/effect/floor_decal/corner/white/diagonal, /obj/machinery/light{ dir = 8 }, +/obj/machinery/microwave, /turf/simulated/floor/tiled, /area/engineering/break_room) "wlw" = ( @@ -17257,6 +17817,12 @@ /obj/machinery/air_alarm/north_mount, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4portforhall) +"wnt" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d4starboardamidhall) "wom" = ( /obj/machinery/light/small{ dir = 1 @@ -17332,15 +17898,25 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d4fwdmaint) "wrb" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack/corner{ + alpha = 255; + dir = 1 + }, +/obj/effect/floor_decal/corner/lightorange/bordercorner{ + dir = 1 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4starboardamidhall) "wrG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/blue{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/simple/visible/aux{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "wsk" = ( @@ -17408,6 +17984,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4porthall) "wyf" = ( @@ -17492,12 +18069,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/blue{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "wDL" = ( @@ -17555,13 +18132,7 @@ /turf/simulated/floor/tiled/monowhite, /area/engineering/shield_gen) "wHN" = ( -/obj/machinery/computer/station_alert{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4; - pixel_x = 10 - }, +/obj/structure/flora/pottedplant/overgrown, /turf/simulated/floor/wood, /area/engineering/break_room) "wHS" = ( @@ -17626,6 +18197,9 @@ dir = 1 }, /obj/machinery/air_alarm/north_mount, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4starboardforhall) "wNX" = ( @@ -17656,6 +18230,7 @@ req_one_access = null }, /obj/map_helper/access_helper/airlock/station/external_airlock, +/obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_eva) "wPm" = ( @@ -17681,9 +18256,10 @@ /obj/effect/floor_decal/corner/lightorange/border{ dir = 8 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4portamidhall) "wRu" = ( @@ -17728,6 +18304,9 @@ /obj/structure/sign/department/eng{ pixel_y = -32 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4portamidhall) "wVA" = ( @@ -17798,6 +18377,15 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightorange/bordercorner{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4portamidhall) "xbe" = ( @@ -17960,6 +18548,7 @@ "xkf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardafthall) "xkk" = ( @@ -18114,6 +18703,13 @@ /obj/turbolift_map_holder/endeavour, /turf/simulated/floor/holofloor/tiled/dark, /area/engineering/hallway/lower) +"xsQ" = ( +/obj/effect/floor_decal/corner/white/diagonal, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/engineering/break_room) "xsV" = ( /turf/simulated/wall/prepainted/engineering, /area/endeavour/hallway/d4fwdmaint) @@ -18314,6 +18910,9 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4portamidhall) "xCw" = ( @@ -18522,6 +19121,20 @@ /obj/machinery/camera/network/engineering, /turf/simulated/floor/wood, /area/crew_quarters/heads/chief) +"xLW" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d4fwdhall) +"xMa" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightorange/bordercorner{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d4starboardhall) "xNn" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -18529,8 +19142,17 @@ /obj/effect/floor_decal/corner/lightorange/border{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4starboardforhall) +"xOB" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d4porthall) "xPL" = ( /obj/structure/cable{ icon_state = "0-2" @@ -18540,6 +19162,21 @@ }, /turf/simulated/floor/tiled/monowhite, /area/engineering/shield_gen) +"xQN" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/endeavour/hallway/d4porthall) "xRj" = ( /turf/space/basic, /area/space) @@ -18593,14 +19230,14 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d4fwdmaint) "xXS" = ( -/obj/structure/table/woodentable, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/corner/white/diagonal, +/turf/simulated/floor/tiled, /area/engineering/break_room) "yaf" = ( /turf/simulated/floor/reinforced/oxygen, @@ -18660,18 +19297,22 @@ /obj/effect/floor_decal/borderfloorblack/corner{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/floor_decal/corner/lightorange/bordercorner{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4portafthall) "yfO" = ( /obj/machinery/light{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d4fwdhall) "yfR" = ( @@ -18713,6 +19354,9 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4starboardamidhall) "yhV" = ( @@ -29972,7 +30616,7 @@ kbM kbM spY wDL -hvj +kbM jGO gDP ftt @@ -30165,8 +30809,8 @@ lAZ oSZ oSZ ipZ -oSZ -oSZ +rOh +roq leS fns aHM @@ -30359,7 +31003,7 @@ ttC lhL noj maS -noj +kEz qUF nmh dzx @@ -30524,7 +31168,7 @@ jmD ikp bXW yeG -ecY +nGj ppa lTp hcL @@ -30555,7 +31199,7 @@ spY fdU hvj dkO -uus +mBD gDP rtK jBO @@ -31889,7 +32533,7 @@ jZF jZF wHS dpZ -ogm +fzk fVD ayo qxt @@ -31903,7 +32547,7 @@ eMc eHf apc eHf -pjV +xMa qwj iqQ ahu @@ -32084,7 +32728,7 @@ jZF fSM dpZ azJ -fVD +atZ pgh wpR wpR @@ -32096,7 +32740,7 @@ wpR wpR wpR wpR -kWg +wpR jDI xAC mPA @@ -32278,7 +32922,7 @@ jZF uMu dpZ wPO -fVD +atZ wNX wpR dJj @@ -32290,7 +32934,7 @@ pSm cNE tBv jtO -wpR +kWg elg elF vXQ @@ -32860,7 +33504,7 @@ kuh nqw fJm azJ -fVD +atZ pgh wpR fGq @@ -33054,7 +33698,7 @@ ryp npV fJm pEq -fVD +atZ wNX wpR rHY @@ -33248,7 +33892,7 @@ ryp npV fJm azJ -fVD +atZ pgh wpR lRa @@ -33442,7 +34086,7 @@ mbr hPd fJm vVK -fVD +atZ wNX wpR oFU @@ -33636,7 +34280,7 @@ bRM axa fJm nzY -fVD +atZ pgh bAs bAs @@ -33830,7 +34474,7 @@ rhE bLm fJm vHi -fVD +atZ wNX bAs lYA @@ -34024,7 +34668,7 @@ lJh vvE fJm azJ -fVD +atZ pgh bAs oSf @@ -34218,7 +34862,7 @@ aws vvE fJm vVK -fVD +atZ wNX bAs whq @@ -34412,7 +35056,7 @@ ryp npV fJm azJ -fVD +atZ dlT bAs vmH @@ -34605,7 +35249,7 @@ kuh ryp dxT fJm -vVK +xQN gTq tjN mKQ @@ -34800,7 +35444,7 @@ kuh nqw fJm dSs -boz +xOB iSd bAs lkR @@ -34993,8 +35637,8 @@ wMu tDo iFc fJm -pEq -fVD +orH +fic wNX bAs tGL @@ -35386,13 +36030,13 @@ ehD iJa hPS wRq -gcn -qrS -gcn -uXs -whe +whm +qps +vvj +pQT +saT bbF -whe +cLe uXs bZM fxM @@ -35569,27 +36213,27 @@ qDt dJX ovL pSo -vbk +pvL aca -vbk -vbk -vbk +pvL +pvL +pvL oPs lKf bYQ -lKf +mBf anp bpV vbk -vbk -vbk -hsw -hsw +goM +goM +wnt +lIe kNH -hsw +kAi hsw vzj -hsw +odE puY jnR jsW @@ -35773,13 +36417,13 @@ sew gDf tFW hOe -dkm +rAC bSY rAC oLT gPH xbS -goM +gPH xbS hSO qRG @@ -36359,11 +37003,11 @@ kjX kjX kjX kjX -kjX -kjX -kjX +lWO +sOh +xsQ ijh -kjX +dtD dtj aqU kGS @@ -36553,11 +37197,11 @@ eSj kjX seM kjX -ryY +kjX sya -ryY +dtD xXS -kjX +dtD dtj suA kGS @@ -36746,12 +37390,12 @@ ixU vwc jUK oqA -qxM +kRo qxM pmA -qxM +oTw ctk -kjX +dtD dtj aqU kGS @@ -36938,14 +37582,14 @@ xyw hiG ixU kjX +xgR +ryY +qqL kjX -kjX -kjX -kjX -kjX -kjX -qSG -kjX +psX +gWV +mhT +ifZ dtj suA kGS @@ -37130,11 +37774,11 @@ xsV nrg gDf rqK -pnG +ixU kjX kjX -dtD -dtD +ggr +kjX kjX kjX kjX @@ -37324,11 +37968,11 @@ xsV vqm gDf bne -ixU +pnG +kjX +kjX +kjX kjX -xgR -ryY -ryY kjX kjX kjX @@ -37520,9 +38164,9 @@ gDf rqK ixU wHN -gbN +kjX sXt -ggr +gbN lSy azA gFB @@ -37713,8 +38357,8 @@ vqm gDf dlu rSr -rSr -rSr +gtb +gtb hHC hHC hHU @@ -46048,7 +46692,7 @@ jNg gPd usY qBz -kyk +dvY dvY qBz lnb @@ -47411,7 +48055,7 @@ dvY dvY gGG fmu -pbx +hbD qBz dvY qBz @@ -47605,7 +48249,7 @@ ciZ dvY eDQ fmu -fWg +dTA qBz dvY qBz @@ -47799,7 +48443,7 @@ ciZ dvY gid fmu -pbx +hbD jqL dvY qBz @@ -47811,7 +48455,7 @@ ghc djL ehr ehr -fWg +lfB pXA bhF dvY @@ -47993,7 +48637,7 @@ ciZ dvY eDQ fmu -fWg +dTA qBz dvY qBz @@ -48187,7 +48831,7 @@ ciZ dvY gGG agP -pbx +hbD qBz dvY qBz @@ -48199,7 +48843,7 @@ aYc djL ehr ehr -fWg +lfB pXA lbF dvY @@ -48781,7 +49425,7 @@ vCs fMI pVN ehr -fWg +lfB pXA gGG vFm @@ -48963,7 +49607,7 @@ ciZ dvY gGG nTJ -pbx +uoz swz spe fMI @@ -49157,7 +49801,7 @@ ciZ kcE gGG vgl -pbx +uoz eTy ehr rXh @@ -49169,7 +49813,7 @@ jqM rXh nQw mpg -fWg +lfB hfS gGG hNp @@ -49545,7 +50189,7 @@ ciZ dvY cyR lSQ -pbx +uoz fZX gXG cGG @@ -49945,7 +50589,7 @@ pMX fWr ehr ehr -ehr +iqX qBz dvY dvY @@ -50127,9 +50771,9 @@ qBz bFi bFi qBz -ehr -ehr -dbo +nRW +xLW +egF fwT oyr exJ @@ -50137,9 +50781,9 @@ eRL bQX cAc ckl -spe -ehr -ehr +ufA +xLW +kva qBz bFi bFi