diff --git a/maps/endeavour/levels/deck1.dmm b/maps/endeavour/levels/deck1.dmm index e08e51229e09..77198e76b44a 100644 --- a/maps/endeavour/levels/deck1.dmm +++ b/maps/endeavour/levels/deck1.dmm @@ -41,13 +41,17 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d1fwdmaint) "abZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, /obj/structure/bed/chair/comfy/brown, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, /turf/simulated/floor/wood, /area/library) "acr" = ( @@ -85,6 +89,7 @@ /area/rnd/test_area) "aeg" = ( /obj/structure/table/bench/wooden, +/obj/machinery/air_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/chapel/main) "aej" = ( @@ -358,11 +363,16 @@ /turf/simulated/wall/prepainted, /area/endeavour/hallway/d1fwdmaint) "aqI" = ( -/obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/corner/red/border, -/obj/landmark/spawnpoint/latejoin/station/arrivals_shuttle, -/turf/simulated/floor/tiled/techfloor/grid, -/area/endeavour/hallway/d1afthall) +/obj/structure/window/basic{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/structure/closet/secure_closet/personal, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/crew_quarters/pool/changing_room) "aqP" = ( /obj/structure/table/reinforced, /obj/fiftyspawner/glass, @@ -376,6 +386,13 @@ }, /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) +"arx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "arI" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 10 @@ -603,7 +620,7 @@ name = "Chapel" }, /obj/structure/curtain/black, -/turf/simulated/floor/carpet/sblucarpet, +/turf/simulated/floor/carpet/bcarpet, /area/chapel/main) "aBr" = ( /obj/structure/cable/orange{ @@ -612,24 +629,11 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "aBC" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/navblue/bordercorner2{ - dir = 8 - }, -/obj/structure/sign/warning/evac{ - pixel_x = -32 +/obj/machinery/light{ + dir = 4 }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1afthall) +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "aCq" = ( /obj/structure/sign/warning/bomb_range{ name = "\improper LIVE ORDINANCE"; @@ -807,7 +811,7 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardhall) "aGH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -820,29 +824,13 @@ /turf/simulated/wall/r_wall/prepainted/exploration, /area/exploration/courser_dock) "aGL" = ( -/obj/machinery/camera/network/exploration{ - dir = 4 - }, /obj/effect/floor_decal/borderfloor{ - dir = 9 + dir = 1 }, /obj/effect/floor_decal/corner/blue/border{ - dir = 9 - }, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/closet/secure_closet/sar{ - req_access = list(5); - req_one_access = list(5) - }, -/obj/item/storage/box/pillbottles, -/obj/item/storage/box/syringes, -/obj/item/tank/jetpack/oxygen, -/obj/item/storage/backpack/parachute, -/obj/item/clothing/accessory/permit/gun/planetside, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled/white, /area/exploration/medical) "aHc" = ( /obj/structure/bed/chair, @@ -895,12 +883,17 @@ pixel_x = -1 }, /obj/structure/curtain/open/shower, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/exploration/showers) "aIl" = ( /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/secondary/docking_hallway) @@ -1181,6 +1174,9 @@ name = "light switch "; pixel_y = 26 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/chapel/main) "aSm" = ( @@ -1207,6 +1203,12 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) +"aSH" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool/changing_room) "aUt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1250,13 +1252,36 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) +"aVc" = ( +/obj/machinery/camera/network/exploration{ + dir = 4 + }, +/obj/structure/closet/secure_closet/sar{ + req_access = list(5); + req_one_access = list(5) + }, +/obj/item/storage/box/pillbottles, +/obj/item/storage/box/syringes, +/obj/item/tank/jetpack/oxygen, +/obj/item/storage/backpack/parachute, +/obj/item/clothing/accessory/permit/gun/planetside, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/monotile, +/area/exploration/medical) "aVu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/bookcase{ name = "bookcase (Non-Fiction)" }, /obj/item/book/custom_library/nonfiction, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, /turf/simulated/floor/wood, /area/library) "aVF" = ( @@ -1297,11 +1322,12 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "aWP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, -/turf/simulated/floor/tiled/freezer, -/area/crew_quarters/pool) +/obj/structure/flora/pottedplant/orientaltree, +/turf/simulated/floor/carpet/bcarpet, +/area/tether/station/burial) "aWX" = ( /obj/effect/floor_decal/chapel{ dir = 4 @@ -1315,6 +1341,9 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled/dark, /area/chapel/main) "aXa" = ( @@ -1364,8 +1393,7 @@ "aYh" = ( /obj/machinery/shipsensors, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/plating, /area/shuttle/courser/general) @@ -1588,6 +1616,11 @@ /obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_fore) +"bha" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardhall) "bhz" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -1677,9 +1710,6 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 1 - }, /obj/machinery/suit_cycler/medical, /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 9 @@ -1705,15 +1735,8 @@ /turf/simulated/wall/r_wall/prepainted/exploration, /area/shuttle/excursion/cockpit) "bnw" = ( -/obj/machinery/camera/network/civilian{ - dir = 1 - }, -/obj/structure/bed/chair/comfy/brown{ - dir = 1 - }, -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_y = -37 - }, +/obj/structure/table/woodentable, +/obj/item/flashlight/lamp/green/on, /turf/simulated/floor/carpet/bcarpet, /area/library) "bnJ" = ( @@ -1835,6 +1858,11 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) +"bwa" = ( +/obj/structure/table/woodentable, +/obj/item/flame/candle/candelabra/everburn, +/turf/simulated/floor/tiled/dark, +/area/tether/station/burial) "bwl" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -2008,6 +2036,14 @@ /obj/machinery/light, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) +"bCN" = ( +/obj/structure/table/standard, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool/changing_room) "bEg" = ( /obj/structure/table/woodentable, /obj/item/flashlight/lamp/green, @@ -2059,7 +2095,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/captain) "bHg" = ( -/obj/machinery/vending/fitness, +/obj/machinery/gear_painter, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) "bHC" = ( @@ -2111,7 +2147,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/turf/simulated/floor/carpet/bcarpet, +/turf/simulated/floor/wood, /area/library) "bIp" = ( /obj/structure/bed/chair/comfy/black{ @@ -2141,7 +2177,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardhall) "bIF" = ( /obj/machinery/air_alarm{ dir = 4; @@ -2155,22 +2191,11 @@ }, /area/hallway/secondary/docking_hallway2) "bJN" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = 26 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled/freezer, -/area/crew_quarters/pool) +/turf/simulated/floor/wood, +/area/library) "bKU" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -2221,12 +2246,13 @@ /turf/simulated/wall/prepainted/exploration, /area/exploration) "bMt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/bookcase{ name = "bookcase (Religious)" }, /obj/item/book/custom_library/religious, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, /turf/simulated/floor/wood, /area/library) "bNm" = ( @@ -2290,6 +2316,12 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/lounge) +"bPE" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d1aftmaint) "bPG" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -2307,12 +2339,13 @@ /turf/simulated/floor/wood, /area/endeavour/surfacebase/sauna) "bPV" = ( -/obj/machinery/light/small{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/plating, -/area/maintenance/chapel) +/obj/structure/table/woodentable, +/obj/item/flame/candle/candelabra/everburn, +/turf/simulated/floor/carpet/bcarpet, +/area/tether/station/burial) "bQx" = ( /obj/machinery/door/firedoor, /turf/simulated/floor/tiled, @@ -2345,19 +2378,16 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "bSd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/machinery/light/small{ dir = 1 }, /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/carpet/bcarpet, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, /area/library) "bSl" = ( /obj/machinery/recharger/wallcharger{ @@ -2535,22 +2565,9 @@ /turf/simulated/floor/carpet/arcadecarpet, /area/endeavour/hallway/d1aftmaint) "cdv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/airlock/glass, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/computer/timeclock/premade/south, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "cdx" = ( @@ -2573,8 +2590,7 @@ }, /obj/machinery/door/firedoor, /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1afthall) @@ -2668,6 +2684,15 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) +"chY" = ( +/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/d1starboardhall) "cib" = ( /obj/machinery/door/airlock{ name = "Public Heated Pool" @@ -2727,13 +2752,9 @@ /turf/simulated/floor/plating, /area/maintenance/chapel) "ckz" = ( -/obj/machinery/power/apc/north_mount, -/obj/structure/cable/green{ - icon_state = "0-2" - }, /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/endeavour/hallway/d1aftmaint) +/area/maintenance/asmaint) "clz" = ( /obj/machinery/light/small{ dir = 1 @@ -2799,6 +2820,16 @@ }, /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/coffee_shop) +"cnZ" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/maintenance/common, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/tether/station/burial) "coH" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 5 @@ -2881,6 +2912,20 @@ }, /turf/simulated/wall/r_wall/prepainted/civilian, /area/shuttle/civvie/general) +"csD" = ( +/obj/machinery/door/window{ + dir = 8; + name = "Mass Driver"; + req_access = list(22) + }, +/obj/machinery/mass_driver{ + id = "chapelgun" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/tether/station/burial) "ctl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -2940,11 +2985,11 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "cvv" = ( -/obj/machinery/door/firedoor, /obj/map_helper/access_helper/airlock/station/maintenance, /obj/machinery/door/airlock/maintenance/engi{ req_one_access = null }, +/obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/maintenance/substation/command) "cvx" = ( @@ -3048,6 +3093,13 @@ }, /turf/simulated/floor/tiled, /area/exploration) +"cyC" = ( +/obj/machinery/camera/network/civilian{ + dir = 4 + }, +/obj/structure/bed/padded, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "czv" = ( /obj/machinery/camera/network/exploration{ dir = 1 @@ -3095,6 +3147,25 @@ }, /turf/simulated/floor/wood, /area/bridge/meeting_room) +"cAG" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/sign/warning/evac{ + pixel_x = -32 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1afthall) "cBe" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -3375,9 +3446,16 @@ /turf/simulated/floor/carpet/tealcarpet, /area/shuttle/civvie/general) "cLM" = ( -/obj/structure/bed/chair/sofa/black/left, -/turf/simulated/floor/wood, -/area/maintenance/chapel) +/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/d1starboardamidhall) "cLR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -3444,9 +3522,9 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "cOc" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/maintenance/chapel) +/obj/structure/bed/chair, +/turf/simulated/floor/carpet/bcarpet, +/area/tether/station/burial) "cOe" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, @@ -3500,9 +3578,6 @@ /turf/simulated/floor/wood, /area/crew_quarters/coffee_shop) "cPS" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, /obj/structure/disposalpipe/segment, /obj/structure/cable/green{ icon_state = "1-2" @@ -3549,23 +3624,14 @@ /turf/simulated/floor/carpet/purcarpet, /area/exploration/meeting) "cRj" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/pool/changing_room) +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "cRT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -3594,23 +3660,15 @@ "cSU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/pool/changing_room) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d1fwdmaint) "cSZ" = ( -/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ - icon_state = "0-2" + icon_state = "4-8" }, -/obj/structure/table/standard, -/obj/item/inflatable_duck, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/pool/changing_room) +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardamidhall) "cTj" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -3618,6 +3676,16 @@ }, /turf/simulated/floor/plating, /area/maintenance/chapel) +"cTq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d1fwdmaint) "cTV" = ( /obj/effect/floor_decal/grass_edge, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -3696,6 +3764,17 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) +"cVz" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/chapel) "cVD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -3735,7 +3814,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/carpet/bcarpet, /area/library) "cXD" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -3819,6 +3898,13 @@ /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/grass, /area/endeavour/exploration/hallway_aft) +"cZw" = ( +/obj/machinery/portable_atmospherics/powered/scrubber, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/library) "cZC" = ( /obj/structure/table/reinforced, /turf/simulated/floor/carpet/purcarpet, @@ -3850,7 +3936,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 + dir = 4 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) @@ -4016,6 +4102,10 @@ }, /turf/simulated/wall/prepainted, /area/endeavour/hallway/d1fwdmaint) +"dkl" = ( +/obj/machinery/air_alarm/north_mount, +/turf/simulated/floor/tiled/dark, +/area/tether/station/burial) "dkm" = ( /obj/structure/table/rack/shelf/steel, /obj/item/stack/flag/red, @@ -4063,11 +4153,15 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hop) "dmy" = ( -/obj/machinery/camera/network/civilian{ - dir = 4 +/obj/structure/table/woodentable, +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 8 }, -/turf/simulated/floor/tiled/freezer, -/area/crew_quarters/pool) +/obj/item/flame/candle/candelabra/everburn{ + pixel_y = 8 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/tether/station/burial) "dmO" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/grass_edge, @@ -4096,6 +4190,9 @@ /obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/steel, /area/station/stairs_one) +"dor" = ( +/turf/simulated/wall/prepainted/civilian, +/area/maintenance/substation/exploration) "dos" = ( /obj/machinery/chem_master/condimaster, /obj/effect/floor_decal/corner/black{ @@ -4329,6 +4426,7 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "dyH" = ( @@ -4365,6 +4463,10 @@ /turf/simulated/floor/tiled, /area/exploration/pilot_prep) "dAK" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/sign/warning/evac{ + pixel_x = -32 + }, /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, @@ -4377,7 +4479,6 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 10 }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "dAR" = ( @@ -4421,8 +4522,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -4503,6 +4603,18 @@ /obj/effect/floor_decal/industrial/halfstair, /turf/simulated/floor/tiled/dark, /area/gateway) +"dFa" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "dFj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -4510,6 +4622,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/chapel/main) "dFF" = ( @@ -4566,13 +4681,13 @@ /turf/simulated/floor/wood, /area/vacant/vacant_bar) "dIc" = ( -/obj/machinery/disposal, -/turf/simulated/floor/tiled, -/area/endeavour/surfacebase/tram) +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor/grid, +/area/endeavour/hallway/d1afthall) "dIm" = ( /obj/structure/loot_pile/maint/trash, /turf/simulated/floor/plating, -/area/maintenance/chapel) +/area/maintenance/asmaint) "dIw" = ( /turf/simulated/floor/water/deep/pool, /area/crew_quarters/pool) @@ -4630,7 +4745,7 @@ dir = 5 }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardhall) "dJV" = ( /obj/effect/floor_decal/corner/yellow{ dir = 5 @@ -4641,6 +4756,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/chapel/main) "dKn" = ( @@ -4700,8 +4816,9 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardhall) "dMB" = ( /obj/structure/toilet{ dir = 4 @@ -4718,6 +4835,12 @@ /obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) +"dNy" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/chapel/main) "dNZ" = ( /obj/machinery/light/small, /turf/simulated/floor/plating, @@ -4777,6 +4900,15 @@ /obj/structure/ship_munition/disperser_charge/emp, /turf/simulated/floor/tiled/dark, /area/exploration/courser_dock) +"dOJ" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, +/area/tether/station/burial) "dOW" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -4999,10 +5131,6 @@ /obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) -"dYN" = ( -/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{ @@ -5236,12 +5364,10 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/secondary/docking_hallway) "ehl" = ( -/obj/structure/catwalk, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/turf/simulated/floor/plating, -/area/endeavour/hallway/d1aftmaint) +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardhall) "ehq" = ( /turf/simulated/floor/plating, /area/maintenance/station/exploration) @@ -5473,7 +5599,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/carpet/bcarpet, /area/library) "ert" = ( /turf/simulated/wall/r_wall/prepainted/civilian, @@ -5498,6 +5624,14 @@ }, /turf/simulated/floor/tiled, /area/chapel/main) +"erZ" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/library) "esl" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -5515,12 +5649,13 @@ /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) "esr" = ( -/obj/item/radio/intercom{ - pixel_y = -24 +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor/glass{ + dir = 8 }, -/obj/effect/mist, -/turf/simulated/floor/water/deep/pool, -/area/endeavour/surfacebase/sauna) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/library) "est" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -5533,8 +5668,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /obj/structure/cable/green{ icon_state = "1-2" @@ -5743,6 +5877,7 @@ icon_state = "4-8" }, /obj/spawner/window/reinforced/full, +/obj/effect/paint/palebottlegreen, /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "eAX" = ( @@ -5830,6 +5965,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/chapel/main) "eDR" = ( @@ -5975,11 +6111,14 @@ /turf/simulated/wall/r_wall/prepainted/civilian, /area/shuttle/civvie/general) "eJs" = ( -/obj/machinery/status_display{ - pixel_x = 32 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /turf/simulated/floor/tiled/dark, -/area/chapel/main) +/area/tether/station/burial) "eJW" = ( /obj/machinery/bomb_tester, /obj/machinery/light, @@ -6031,8 +6170,11 @@ /area/endeavour/hallway/d1fwdmaint) "eNz" = ( /obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/corner/red/border, -/obj/landmark/spawnpoint/overflow/station, +/obj/landmark/spawnpoint/latejoin/station/arrivals_shuttle, +/obj/machinery/computer/cryopod{ + name = "asset retention console"; + pixel_x = -32 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/endeavour/hallway/d1afthall) "eNB" = ( @@ -6061,8 +6203,8 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "eNY" = ( -/turf/simulated/floor/wood, -/area/maintenance/chapel) +/turf/simulated/wall/prepainted/civilian, +/area/tether/station/burial) "eNZ" = ( /obj/effect/floor_decal/borderfloorblack/corner{ dir = 1 @@ -6179,7 +6321,7 @@ "eRi" = ( /obj/random/cutout, /turf/simulated/floor/plating, -/area/maintenance/chapel) +/area/endeavour/hallway/d1fwdmaint) "eRC" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -6204,6 +6346,10 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) +"eSM" = ( +/obj/machinery/floodlight, +/turf/simulated/floor/plating, +/area/maintenance/chapel) "eSO" = ( /obj/machinery/computer/secure_data{ dir = 4 @@ -6224,15 +6370,16 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/holoposter{ - pixel_y = 32 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/door/firedoor{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, +/obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "eTc" = ( @@ -6264,6 +6411,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/chapel/main) "eTR" = ( @@ -6272,11 +6420,15 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/excursion_dock) "eUo" = ( -/obj/structure/fireplace{ - pixel_y = 23 +/obj/structure/table/woodentable, +/obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/sign/goldenplaque{ + desc = "This plaque is thankfully empty, but is dedicated to those that were killed in the line of duty protecting the NSV Endeavour, and Nanotrasen as a whole."; + name = "Memorial Plaque"; + pixel_y = 32 }, -/turf/simulated/floor/plating, -/area/maintenance/chapel) +/turf/simulated/floor/carpet/bcarpet, +/area/tether/station/burial) "eUz" = ( /obj/structure/catwalk, /obj/structure/cable/orange{ @@ -6392,7 +6544,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardhall) "eWE" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/fuel_port{ @@ -6482,6 +6634,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/maintenance/station/exploration) +"faq" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/machinery/holopad, +/turf/simulated/floor/wood, +/area/library) "fbe" = ( /obj/structure/catwalk, /obj/machinery/light{ @@ -6567,7 +6726,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/carpet/sblucarpet, +/turf/simulated/floor/carpet/bcarpet, /area/chapel/main) "fcG" = ( /obj/effect/floor_decal/borderfloorblack, @@ -6585,10 +6744,16 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "fdP" = ( -/obj/effect/floor_decal/rust, -/obj/machinery/portable_atmospherics/powered/scrubber, -/turf/simulated/floor/plating, -/area/maintenance/chapel) +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardhall) "fef" = ( /obj/effect/floor_decal/borderfloorblack/corner{ dir = 8 @@ -6614,18 +6779,18 @@ /turf/simulated/floor/tiled, /area/exploration/showers) "feB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/bed/chair/comfy/brown{ dir = 4 }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/wood, /area/library) "ffi" = ( @@ -6657,11 +6822,11 @@ /turf/simulated/floor/plating, /area/exploration/pathfinder_office) "fge" = ( -/obj/structure/bed/chair/sofa/black/right{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/wood, -/area/maintenance/chapel) +/turf/simulated/floor/tiled/dark, +/area/tether/station/burial) "fgr" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/structure/bed/chair/bay/comfy/black{ @@ -6757,8 +6922,8 @@ /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ id = "chapel" }, -/obj/structure/curtain/black, /obj/effect/paint/palebottlegreen, +/obj/structure/curtain/black, /turf/simulated/floor/plating, /area/chapel/main) "fkF" = ( @@ -6795,7 +6960,7 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardhall) "flf" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -6846,14 +7011,11 @@ /turf/simulated/floor/lino, /area/crew_quarters/coffee_shop) "fmb" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/hallway/secondary/docking_hallway) +/turf/simulated/floor/tiled/dark, +/area/chapel/main) "fmh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -7064,16 +7226,25 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "fsN" = ( -/obj/machinery/vending/coffee, /obj/machinery/light/small, -/turf/simulated/floor/carpet/bcarpet, +/turf/simulated/floor/wood, /area/library) "fsR" = ( /obj/structure/disposalpipe/segment{ dir = 8 }, -/turf/simulated/floor/tiled, -/area/hallway/secondary/docking_hallway) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d1aftmaint) "fsX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -7164,6 +7335,13 @@ }, /turf/simulated/open, /area/maintenance/substation/dock) +"fuj" = ( +/obj/machinery/door/firedoor{ + dir = 1 + }, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/maintenance/asmaint) "fuz" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -7297,8 +7475,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/cable/green{ icon_state = "1-2" @@ -7387,20 +7564,19 @@ /turf/simulated/floor/tiled, /area/shuttle/excursion/general) "fDI" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + name = "Pool Room"; + dir = 8 + }, +/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/bed/chair/comfy/brown{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/library) +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "fDJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -7580,13 +7756,11 @@ /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/coffee_shop) "fLD" = ( -/obj/structure/closet/crate, -/obj/fiftyspawner/steel, -/obj/fiftyspawner/steel, -/obj/fiftyspawner/glass, -/obj/fiftyspawner/glass, +/obj/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plating, -/area/maintenance/chapel) +/area/maintenance/library) "fLR" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -7724,19 +7898,12 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "fOe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/bed/chair/comfy/brown{ dir = 1 }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, /turf/simulated/floor/wood, /area/library) "fOo" = ( @@ -7892,8 +8059,7 @@ dir = 10 }, /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) @@ -7996,6 +8162,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/carpet/bcarpet, /area/library) "fZu" = ( @@ -8007,6 +8176,11 @@ "fZy" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/lounge/kitchen_freezer) +"fZE" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/babyblue, +/turf/simulated/floor/plating, +/area/hallway/secondary/docking_hallway2) "fZY" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -8092,7 +8266,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/maintenance/asmaint) +/area/maintenance/library) "gcb" = ( /obj/machinery/recharger/wallcharger{ pixel_x = -22 @@ -8112,6 +8286,15 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/courser_dock) +"gco" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/dark, +/area/tether/station/burial) "gdd" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -8177,6 +8360,13 @@ }, /turf/simulated/floor/tiled, /area/exploration/explorer_prep) +"ggi" = ( +/obj/structure/table/woodentable, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/station/burial) "ggp" = ( /obj/structure/cable{ icon_state = "1-2" @@ -8268,7 +8458,7 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardhall) "gja" = ( /obj/structure/table/reinforced, /obj/item/stamp/denied, @@ -8624,7 +8814,7 @@ "gvJ" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, -/area/maintenance/asmaint) +/area/maintenance/library) "gvL" = ( /obj/structure/railing{ dir = 8 @@ -8718,8 +8908,6 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "gBF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/steeldecal/steel_decals2{ dir = 8 }, @@ -8727,8 +8915,18 @@ dir = 8; icon_state = "pipe-c" }, -/turf/simulated/floor/tiled, -/area/hallway/secondary/docking_hallway) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d1aftmaint) "gBG" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/violet, @@ -8828,6 +9026,12 @@ }, /turf/simulated/floor/lino, /area/chapel/office) +"gEy" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/maintenance/common, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/tether/station/burial) "gED" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/glass{ @@ -8845,11 +9049,12 @@ /turf/simulated/floor/tiled, /area/hallway/secondary/docking_hallway2) "gEQ" = ( +/obj/structure/catwalk, /obj/structure/cable/green{ - icon_state = "1-4" + icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/endeavour/hallway/d1aftmaint) +/area/maintenance/library) "gGl" = ( /obj/machinery/power/terminal{ dir = 8 @@ -8896,6 +9101,15 @@ }, /turf/simulated/floor/tiled/dark, /area/station/stairs_one) +"gIz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool/changing_room) "gIT" = ( /obj/structure/window/reinforced, /turf/simulated/open, @@ -9033,9 +9247,6 @@ /turf/simulated/floor/reinforced/airless, /area/rnd/test_area) "gNs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -9048,12 +9259,16 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "gNY" = ( /obj/machinery/sleeper{ dir = 8 }, +/obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/white, /area/exploration/medical) "gOL" = ( @@ -9076,12 +9291,8 @@ /turf/simulated/floor/tiled, /area/exploration/explorer_prep) "gOX" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/hallway/secondary/docking_hallway) +/turf/simulated/wall/prepainted, +/area/maintenance/asmaint) "gPm" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/corner/black/full, @@ -9237,19 +9448,17 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/coffee_shop) "gWh" = ( -/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/bed/chair, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, -/turf/simulated/floor/tiled, -/area/hallway/secondary/docking_hallway) +/turf/simulated/floor/carpet/bcarpet, +/area/tether/station/burial) +"gWl" = ( +/obj/effect/floor_decal/techfloor, +/obj/landmark/spawnpoint/overflow/station, +/turf/simulated/floor/tiled/techfloor/grid, +/area/endeavour/hallway/d1afthall) "gWI" = ( /obj/machinery/atmospherics/component/unary/heater{ dir = 1 @@ -9291,14 +9500,12 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "gZb" = ( -/obj/structure/curtain/open/privacy, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = -24; - pixel_y = 6 +/obj/machinery/door/firedoor{ + dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/pool/changing_room) +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardhall) "gZf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/vending/hydronutrients, @@ -9445,7 +9652,7 @@ dir = 8; id = "cap_office"; layer = 3.1; - name = "Colony Directo's Shutters" + name = "Colony Director's Shutters" }, /obj/machinery/door/blast/regular{ density = 0; @@ -9510,12 +9717,8 @@ /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "hfR" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/endeavour/hallway/d1aftmaint) +/area/maintenance/library) "hfY" = ( /turf/simulated/floor/airless/ceiling, /area/space) @@ -9593,8 +9796,12 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "hik" = ( -/turf/simulated/floor/tiled/white, -/area/crew_quarters/pool/changing_room) +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/substation/dock) "hja" = ( /obj/structure/closet/secure_closet/explorer, /obj/effect/floor_decal/industrial/outline/yellow, @@ -9628,7 +9835,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardhall) "hjz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, @@ -9719,11 +9926,6 @@ /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) "hpw" = ( -/obj/machinery/air_alarm{ - frequency = 1441; - pixel_y = 22; - target_temperature = 275.15 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, @@ -9792,15 +9994,12 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hop) "hrr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/machinery/light/small{ + dir = 4 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/pool/changing_room) +/obj/structure/table/rack, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d1aftmaint) "hrs" = ( /obj/machinery/shower{ pixel_y = 8 @@ -9820,12 +10019,13 @@ /turf/simulated/floor/carpet/tealcarpet, /area/shuttle/civvie/general) "hrC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/structure/closet/firecloset/full, +/obj/effect/floor_decal/spline/plain{ + dir = 1 }, -/obj/machinery/light, -/turf/simulated/floor/tiled/freezer, -/area/crew_quarters/pool) +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/holofloor/tiled/dark, +/area/endeavour/hallway/d1starboardhall) "hrH" = ( /obj/structure/bed/chair/sofa/right{ dir = 4 @@ -9870,7 +10070,8 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/carpet/bcarpet, +/obj/effect/floor_decal/spline/fancy/wood, +/turf/simulated/floor/wood, /area/library) "hub" = ( /turf/simulated/wall/r_wall/prepainted/science, @@ -9938,7 +10139,6 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/excursion_dock) "hxi" = ( -/obj/effect/floor_decal/corner/red/border, /obj/landmark/spawnpoint/overflow/station, /turf/simulated/floor/tiled/techfloor/grid, /area/endeavour/hallway/d1afthall) @@ -9949,6 +10149,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/dock) +"hyg" = ( +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardhall) "hyL" = ( /obj/structure/closet/crate, /obj/fiftyspawner/steel, @@ -10116,6 +10322,13 @@ /obj/structure/undies_wardrobe, /turf/simulated/floor/carpet/gaycarpet, /area/crew_quarters/clownoffice) +"hIQ" = ( +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/asmaint) "hIR" = ( /turf/simulated/floor/tiled/monodark, /area/bridge) @@ -10197,7 +10410,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/maintenance/asmaint) +/area/maintenance/library) "hMQ" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -10284,8 +10497,12 @@ /turf/simulated/floor, /area/shuttle/civvie/general) "hPn" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/wood, /area/library) "hPu" = ( @@ -10692,6 +10909,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "ibx" = ( @@ -10702,20 +10920,20 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d1aftmaint) "ibD" = ( -/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 = 1 }, -/obj/machinery/door/airlock/glass/civilian{ - name = "Pool Access" +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d1fwdmaint) +"ibS" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass{ + name = "Chapel" }, -/turf/simulated/floor/tiled/white, -/area/hallway/secondary/docking_hallway) +/turf/simulated/floor/tiled/dark, +/area/chapel/main) "ibU" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -11118,17 +11336,13 @@ /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 +/obj/structure/table/standard, +/obj/item/inflatable_duck, +/obj/machinery/light{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/hallway/secondary/docking_hallway) +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool/changing_room) "iqI" = ( /obj/effect/floor_decal/corner/blue{ dir = 1 @@ -11136,11 +11350,15 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "irX" = ( +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 8 + }, /obj/structure/cable/green{ - icon_state = "2-8" + icon_state = "1-4" }, /turf/simulated/floor/plating, -/area/endeavour/hallway/d1aftmaint) +/area/maintenance/asmaint) "isf" = ( /obj/effect/floor_decal/chapel{ dir = 8 @@ -11219,20 +11437,9 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "ivm" = ( -/obj/structure/table/glass, -/obj/item/inflatable_duck, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/freezer, -/area/crew_quarters/pool) +/obj/random/trash_pile, +/turf/simulated/floor/plating, +/area/maintenance/library) "ivC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, @@ -11282,27 +11489,14 @@ /turf/simulated/floor/tiled, /area/hallway/secondary/docking_hallway) "iwR" = ( -/obj/machinery/light{ - dir = 8 - }, /obj/effect/floor_decal/borderfloor{ - dir = 8 + dir = 10 }, /obj/effect/floor_decal/corner/blue/border{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/structure/window/reinforced, -/obj/structure/closet/secure_closet/sar{ - req_access = list(5); - req_one_access = list(5) + dir = 10 }, -/obj/item/storage/box/pillbottles, -/obj/item/storage/box/syringes, -/obj/item/tank/jetpack/oxygen, -/obj/item/storage/backpack/parachute, -/obj/item/clothing/accessory/permit/gun/planetside, -/turf/simulated/floor/tiled/monotile, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/simulated/floor/tiled/white, /area/exploration/medical) "ixp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -11523,15 +11717,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/coffee_shop) "iEX" = ( -/obj/machinery/door/firedoor{ - dir = 1 - }, -/obj/machinery/door/airlock/maintenance/common, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/library) +/turf/simulated/floor/tiled/dark, +/area/tether/station/burial) "iFe" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 8 @@ -11541,8 +11731,11 @@ /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) "iFj" = ( -/turf/simulated/wall/r_wall/prepainted/engineering, -/area/hallway/secondary/docking_hallway) +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/tether/station/burial) "iFq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -11621,10 +11814,17 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "iKm" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +/obj/structure/table/woodentable, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 }, -/turf/simulated/floor/carpet/bcarpet, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/wood, /area/library) "iKu" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -11636,6 +11836,7 @@ name = "bookcase (Fiction)" }, /obj/item/book/manual/the_humanized_mice, +/obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/wood, /area/library) "iLv" = ( @@ -11791,14 +11992,15 @@ /turf/simulated/floor/plating, /area/chapel/office) "iRR" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/power/apc/north_mount, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /obj/structure/cable/green{ - icon_state = "1-8" + icon_state = "0-4" }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/pool/changing_room) +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "iSA" = ( /turf/simulated/floor/carpet/arcadecarpet, /area/endeavour/hallway/d1aftmaint) @@ -11844,7 +12046,7 @@ "iUW" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central6, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardhall) "iVd" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, @@ -12000,9 +12202,6 @@ /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" = ( @@ -12012,15 +12211,7 @@ /turf/simulated/floor/tiled, /area/exploration/pilot_prep) "jag" = ( -/obj/structure/table/rack/shelf, -/obj/item/tank/oxygen, -/obj/item/suit_cooling_unit, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 8 - }, +/obj/landmark/spawnpoint/job/field_medic, /turf/simulated/floor/tiled/white, /area/exploration/medical) "jbd" = ( @@ -12197,8 +12388,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) @@ -12233,9 +12424,12 @@ /turf/simulated/floor/tiled, /area/shuttle/excursion/general) "jkS" = ( -/obj/structure/bed/chair/sofa/black, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/wood, -/area/maintenance/chapel) +/area/library) "jlr" = ( /obj/structure/flora/pottedplant/minitree, /turf/simulated/floor/wood, @@ -12310,6 +12504,12 @@ /obj/machinery/holopad, /turf/simulated/floor/tiled, /area/exploration) +"jmI" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool/changing_room) "jmM" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 1 @@ -12396,11 +12596,14 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "jpl" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/item/barrier_tape_segment/engineering, -/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/catwalk, +/obj/machinery/air_alarm/east_mount, /turf/simulated/floor/plating, -/area/maintenance/chapel) +/area/endeavour/hallway/d1fwdmaint) "jpO" = ( /obj/structure/fireaxecabinet, /turf/simulated/wall/r_wall/prepainted/command, @@ -12512,9 +12715,10 @@ /turf/simulated/floor/tiled, /area/exploration/explorer_prep) "jsH" = ( -/obj/item/radio/intercom/north_mount, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/pool/changing_room) +/obj/machinery/portable_atmospherics/powered/pump/filled, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/maintenance/library) "jtj" = ( /obj/machinery/door/airlock/multi_tile/glass{ dir = 1; @@ -12671,9 +12875,9 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 1 }, -/obj/structure/table/standard, -/obj/item/duct_tape_roll, -/obj/item/hand_labeler, +/obj/structure/table/rack/shelf, +/obj/item/tank/oxygen, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/white, /area/exploration/medical) "jxc" = ( @@ -12694,6 +12898,13 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) +"jxO" = ( +/obj/structure/bed/chair/comfy/brown, +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/library) "jyC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -12748,7 +12959,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/turf/simulated/floor/carpet/bcarpet, +/turf/simulated/floor/wood, /area/library) "jAG" = ( /obj/structure/cable/green{ @@ -12783,12 +12994,20 @@ /turf/simulated/floor/wood, /area/library) "jCV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/carpet/bcarpet, -/area/library) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d1fwdmaint) "jDn" = ( -/obj/machinery/light/small{ +/obj/machinery/camera/network/civilian{ + dir = 1 + }, +/obj/structure/bed/chair/sofa/brown/left{ dir = 1 }, /turf/simulated/floor/carpet/bcarpet, @@ -12815,7 +13034,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, -/area/maintenance/chapel) +/area/endeavour/hallway/d1fwdmaint) "jEM" = ( /obj/structure/cable{ icon_state = "1-8" @@ -12831,6 +13050,10 @@ /obj/machinery/vending/phoronresearch, /turf/simulated/floor/tiled, /area/rnd/test_area) +"jFd" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardhall) "jFy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -12903,22 +13126,28 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/excursion_dock) "jGC" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 6 }, -/obj/effect/floor_decal/borderfloorblack/corner, -/obj/effect/floor_decal/corner/navgold/bordercorner, /turf/simulated/floor/tiled, /area/hallway/secondary/docking_hallway) "jGM" = ( /obj/machinery/light_switch{ - pixel_x = 25 + pixel_y = -23 + }, +/obj/machinery/light_switch{ + pixel_x = 27 }, /turf/simulated/floor/carpet/bcarpet, /area/chapel/main) @@ -12976,7 +13205,7 @@ dir = 9 }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardhall) "jJL" = ( /obj/machinery/power/apc/west_mount{ cell_type = /obj/item/cell/super @@ -13074,12 +13303,17 @@ /turf/space, /area/space) "jNp" = ( -/obj/machinery/fire_alarm/south_mount{ - pixel_y = -24 +/obj/machinery/light_switch{ + pixel_y = 32 }, -/obj/machinery/light/small, -/turf/simulated/floor/carpet/bcarpet, -/area/library) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/station/burial) "jNC" = ( /obj/machinery/computer/ship/navigation/telescreen{ pixel_x = 32 @@ -13137,8 +13371,7 @@ /area/hallway/secondary/docking_hallway2) "jPj" = ( /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/courser_dock) @@ -13181,6 +13414,15 @@ /obj/structure/table/bench/wooden, /turf/simulated/floor/tiled/dark, /area/chapel/main) +"jQp" = ( +/obj/machinery/door/firedoor{ + dir = 1 + }, +/obj/machinery/door/airlock/multi_tile/glass{ + name = "Library" + }, +/turf/simulated/floor/carpet/bcarpet, +/area/library) "jQF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -13246,10 +13488,11 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "jTs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/carpet/bcarpet, +/obj/structure/bookcase{ + name = "bookcase (Fiction)" + }, +/obj/effect/floor_decal/spline/fancy/wood, +/turf/simulated/floor/wood, /area/library) "jTI" = ( /obj/machinery/atmospherics/portables_connector{ @@ -13273,7 +13516,9 @@ dir = 5 }, /obj/machinery/fire_alarm/north_mount, -/obj/machinery/suit_storage_unit/search_and_rescue, +/obj/structure/table/standard, +/obj/item/duct_tape_roll, +/obj/item/hand_labeler, /turf/simulated/floor/tiled/white, /area/exploration/medical) "jTR" = ( @@ -13312,10 +13557,9 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/door/firedoor{ - dir = 1 +/obj/machinery/holoposter{ + pixel_y = 32 }, -/obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "jUy" = ( @@ -13362,6 +13606,9 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "jWo" = ( @@ -13446,7 +13693,7 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardhall) "jXL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -13476,6 +13723,15 @@ "jYs" = ( /turf/simulated/wall/prepainted/command, /area/crew_quarters/heads/blueshield) +"jYC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool/changing_room) "jYV" = ( /obj/structure/catwalk, /obj/machinery/door/airlock/maintenance, @@ -13590,6 +13846,12 @@ }, /turf/simulated/floor/tiled, /area/rnd/test_area) +"kcG" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d1aftmaint) "kcJ" = ( /obj/machinery/light, /obj/machinery/recharger/wallcharger{ @@ -13694,6 +13956,12 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/lawoffice) +"khr" = ( +/obj/machinery/camera/network/civilian{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/library) "khu" = ( /obj/structure/table/bench/padded, /turf/simulated/floor/wood, @@ -13710,6 +13978,10 @@ }, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_fore) +"khE" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/wood, +/area/library) "khS" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -13768,11 +14040,10 @@ /turf/simulated/floor/water/deep/pool, /area/endeavour/surfacebase/sauna) "kiD" = ( -/obj/structure/bed/chair/sofa/black{ - dir = 1 - }, +/obj/structure/table/woodentable, +/obj/structure/table/woodentable, /turf/simulated/floor/wood, -/area/maintenance/chapel) +/area/library) "kiK" = ( /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/navgold/bordercorner, @@ -13799,13 +14070,20 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d1portforhall) "kjq" = ( -/obj/structure/bed/chair/sofa/black/right, -/turf/simulated/floor/wood, -/area/maintenance/chapel) +/turf/simulated/floor/tiled/dark, +/area/tether/station/burial) "kjF" = ( -/obj/structure/bed/chair/comfy/brown, -/turf/simulated/floor/carpet/bcarpet, -/area/library) +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "kkN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -13841,6 +14119,11 @@ /obj/item/storage/fancy/heartbox, /turf/simulated/floor/carpet, /area/endeavour/hallway/d1fwdmaint) +"kmD" = ( +/obj/structure/table/rack, +/obj/item/tool/wrench, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d1aftmaint) "kno" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -13857,12 +14140,15 @@ /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) +"kom" = ( +/obj/machinery/fire_alarm/north_mount, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool/changing_room) "kos" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central7, /obj/structure/cable/green{ @@ -13895,6 +14181,13 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) +"kpq" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1afthall) "kpN" = ( /obj/machinery/air_alarm{ dir = 1; @@ -13942,8 +14235,10 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "krO" = ( -/turf/simulated/wall/prepainted, -/area/maintenance/arrivals) +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/palebottlegreen, +/turf/simulated/floor/plating, +/area/maintenance/chapel) "ksB" = ( /obj/item/radio/intercom{ dir = 4; @@ -13995,6 +14290,11 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/courser_dock) +"kvn" = ( +/obj/random/trash_pile, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/maintenance/chapel) "kvI" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -14049,9 +14349,15 @@ /turf/simulated/floor/plating, /area/vacant/vacant_bar) "kxk" = ( -/obj/structure/sign/deck/fourth, -/turf/simulated/wall/prepainted, -/area/crew_quarters/clownoffice) +/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/carpet/bcarpet, +/area/library) "kxn" = ( /obj/machinery/atmospherics/pipe/tank/air{ dir = 1 @@ -14097,11 +14403,11 @@ /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, /obj/structure/table/woodentable, /obj/item/paper_bin, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, /turf/simulated/floor/wood, /area/library) "kAg" = ( @@ -14158,6 +14464,9 @@ /area/chapel/office) "kCA" = ( /obj/machinery/camera/network/civilian, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, /turf/simulated/floor/wood, /area/library) "kCB" = ( @@ -14252,6 +14561,13 @@ }, /turf/simulated/floor/wood, /area/lawoffice) +"kEM" = ( +/obj/machinery/light/small, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/library) "kFe" = ( /obj/structure/undies_wardrobe, /turf/simulated/floor/wood, @@ -14359,17 +14675,12 @@ /turf/simulated/floor/reinforced/airless, /area/rnd/test_area) "kJh" = ( -/obj/structure/window/basic{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/structure/closet/athletic_mixed, -/obj/machinery/camera/network/civilian{ +/obj/structure/bed/chair/sofa/brown/right, +/obj/machinery/light/small{ dir = 1 }, -/turf/simulated/floor/holofloor/tiled/dark, -/area/crew_quarters/pool/changing_room) +/turf/simulated/floor/carpet/bcarpet, +/area/library) "kJp" = ( /obj/machinery/light/small{ dir = 4 @@ -14519,7 +14830,7 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardhall) "kNs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 6 @@ -14546,13 +14857,16 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "kNK" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/carpet/bcarpet, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/wood, /area/library) "kNR" = ( /obj/machinery/light/small, @@ -14577,13 +14891,13 @@ /turf/simulated/floor/tiled/dark, /area/chapel/main) "kOz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/turf/simulated/floor/carpet/bcarpet, +/turf/simulated/floor/wood, /area/library) "kOG" = ( /obj/effect/floor_decal/chapel{ @@ -14952,12 +15266,8 @@ /turf/simulated/floor/tiled, /area/rnd/research/testingrange) "leq" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/maintenance/chapel) +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardhall) "leE" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -14984,7 +15294,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/chapel) +/area/maintenance/library) "lhS" = ( /turf/simulated/wall/prepainted, /area/hallway/secondary/docking_hallway2) @@ -15057,18 +15367,18 @@ /turf/simulated/floor/tiled/dark, /area/station/stairs_one) "llV" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardhall) "llY" = ( /obj/machinery/door/firedoor, /obj/map_helper/access_helper/airlock/station/exploration/department, @@ -15098,15 +15408,8 @@ /turf/simulated/floor/plating, /area/maintenance/substation/command) "lmG" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/chapel) +/turf/simulated/wall/prepainted, +/area/maintenance/library) "lno" = ( /obj/machinery/conveyor_switch/oneway{ id = "courser_magazine_2"; @@ -15269,6 +15572,7 @@ /obj/structure/sink{ pixel_y = 22 }, +/obj/landmark/spawnpoint/job/field_medic, /turf/simulated/floor/tiled/white, /area/exploration/medical) "lth" = ( @@ -15281,15 +15585,11 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/secondary/docking_hallway) "ltO" = ( -/obj/machinery/disposal, -/obj/machinery/camera/network/civilian{ - dir = 9 - }, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/simulated/floor/carpet/bcarpet, -/area/library) +/obj/structure/table/bench/wooden, +/obj/effect/mist, +/obj/item/radio/intercom/north_mount, +/turf/simulated/floor/wood, +/area/endeavour/surfacebase/sauna) "lul" = ( /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/window/reinforced, @@ -15314,6 +15614,11 @@ /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/wood, /area/lawoffice) +"lvV" = ( +/obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/flora/pottedplant/orientaltree, +/turf/simulated/floor/carpet/bcarpet, +/area/tether/station/burial) "lwn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -15334,6 +15639,15 @@ }, /turf/simulated/floor/tiled/dark, /area/exploration/courser_dock) +"lwV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/library) "lxO" = ( /obj/machinery/door/airlock/maintenance/engi{ req_one_access = null @@ -15352,14 +15666,14 @@ /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" }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "lyH" = ( @@ -15383,7 +15697,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardhall) "lyX" = ( /obj/map_helper/access_helper/airlock/station/exploration/department, /obj/structure/cable/green{ @@ -15511,15 +15825,12 @@ /turf/simulated/floor/carpet/gaycarpet, /area/crew_quarters/clownoffice) "lCx" = ( -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_x = 32 - }, -/obj/machinery/light/small{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/carpet/bcarpet, /area/library) "lDc" = ( @@ -15622,7 +15933,7 @@ dir = 8; pixel_y = -7 }, -/turf/simulated/wall/r_wall/prepainted/civilian, +/turf/simulated/wall/r_wall/prepainted, /area/station/stairs_one) "lKq" = ( /obj/machinery/camera/network/command{ @@ -15630,6 +15941,12 @@ }, /turf/simulated/floor/wood, /area/bridge/meeting_room) +"lKv" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d1fwdmaint) "lKJ" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -15946,10 +16263,11 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/mimeoffice) "lVu" = ( -/obj/structure/sign/goldenplaque{ - desc = "This plaque is thankfully empty, but is dedicated to those that were killed in the line of duty protecting the NSV Endeavour, and Nanotrasen as a whole."; - name = "Memorial Plaque"; - pixel_y = 32 +/obj/structure/extinguisher_cabinet{ + pixel_y = 31 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/chapel/main) @@ -16018,9 +16336,12 @@ /turf/simulated/floor/reinforced/airless, /area/rnd/test_area) "lZv" = ( -/obj/structure/sign/department/biblio, -/turf/simulated/wall/prepainted, -/area/maintenance/chapel) +/obj/machinery/door/blast/regular{ + id = "chapelgun"; + name = "Chapel Launcher Door" + }, +/turf/simulated/floor/plating, +/area/tether/station/burial) "maa" = ( /turf/simulated/floor/plating, /area/endeavour/hallway/d1fwdmaint) @@ -16061,6 +16382,14 @@ }, /turf/simulated/floor/tiled/dark, /area/chapel/main) +"maY" = ( +/obj/structure/table/woodentable, +/obj/structure/flora/pottedplant/flower, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/library) "maZ" = ( /obj/structure/flora/pottedplant/stoutbush, /obj/structure/window/reinforced{ @@ -16234,7 +16563,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/landmark/spawnpoint/job/field_medic, /turf/simulated/floor/tiled/white, /area/exploration/medical) "mgg" = ( @@ -16296,8 +16624,11 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/sign/department/biblio{ + pixel_x = -32 + }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardhall) "mic" = ( /obj/effect/floor_decal/chapel, /obj/effect/floor_decal/spline/fancy/wood{ @@ -16513,11 +16844,8 @@ /turf/simulated/floor/wood, /area/endeavour/surfacebase/sauna) "mqa" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/endeavour/hallway/d1aftmaint) +/turf/simulated/wall/r_wall/prepainted, +/area/maintenance/asmaint) "mrv" = ( /obj/structure/sign/directions/science{ pixel_y = 3 @@ -16525,7 +16853,7 @@ /obj/structure/sign/directions/cargo{ pixel_y = -4 }, -/turf/simulated/wall/r_wall/prepainted/civilian, +/turf/simulated/wall/r_wall/prepainted, /area/station/stairs_one) "mrA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -16689,16 +17017,28 @@ icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/maintenance/asmaint) +/area/maintenance/library) "mxK" = ( -/obj/machinery/suit_storage_unit/search_and_rescue, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/closet/secure_closet/sar{ + req_access = list(5); + req_one_access = list(5) + }, +/obj/item/storage/box/pillbottles, +/obj/item/storage/box/syringes, +/obj/item/tank/jetpack/oxygen, +/obj/item/storage/backpack/parachute, +/obj/item/clothing/accessory/permit/gun/planetside, /obj/effect/floor_decal/borderfloor{ - dir = 1 + dir = 8 }, /obj/effect/floor_decal/corner/blue/border{ - dir = 1 + dir = 8 }, -/turf/simulated/floor/tiled/white, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/monotile, /area/exploration/medical) "myg" = ( /obj/effect/floor_decal/spline/plain, @@ -16986,6 +17326,12 @@ }, /turf/simulated/floor/wood, /area/lawoffice) +"mGW" = ( +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/plating, +/area/maintenance/asmaint) "mHb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -17276,6 +17622,14 @@ /obj/machinery/portable_atmospherics/powered/pump, /turf/simulated/floor/tiled, /area/rnd/misc_lab) +"mSo" = ( +/obj/structure/table/woodentable, +/obj/item/flashlight/lamp/green/on, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/library) "mSv" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/glass{ @@ -17293,6 +17647,23 @@ /obj/map_helper/access_helper/airlock/station/external_airlock, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) +"mTv" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardhall) "mTU" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -17366,6 +17737,15 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/courser/general) +"mWh" = ( +/obj/structure/table/bench/wooden, +/obj/effect/mist, +/obj/machinery/air_alarm{ + frequency = 1441; + pixel_y = 22 + }, +/turf/simulated/floor/wood, +/area/endeavour/surfacebase/sauna) "mWz" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -17472,7 +17852,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{ @@ -17482,7 +17862,7 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardhall) "mYH" = ( /obj/spawner/window/low_wall/full/firelocks/nogrille, /obj/structure/curtain/black, @@ -17520,9 +17900,8 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "mZV" = ( -/obj/machinery/air_alarm/north_mount, /obj/machinery/light{ - dir = 4 + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/chapel/main) @@ -17561,6 +17940,21 @@ "nct" = ( /turf/simulated/floor/plating, /area/hallway/secondary/docking_hallway) +"ncC" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardhall) "ncX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -17571,17 +17965,8 @@ /turf/simulated/floor/wood, /area/library) "ndh" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/freezer, -/area/crew_quarters/pool) +/turf/simulated/wall/r_wall/prepainted/civilian, +/area/tether/station/burial) "nei" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -17834,7 +18219,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/endeavour/hallway/d1aftmaint) +/area/maintenance/asmaint) "noZ" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -17930,6 +18315,22 @@ }, /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) +"nry" = ( +/obj/structure/window/basic{ + dir = 1 + }, +/obj/structure/curtain/open/privacy, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 6 + }, +/obj/machinery/shower{ + dir = 4 + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/crew_quarters/pool/changing_room) "nrF" = ( /obj/structure/cable{ icon_state = "1-8" @@ -18139,21 +18540,23 @@ /obj/effect/paint/palebottlegreen, /turf/simulated/floor/plating, /area/hydroponics/garden) +"nAj" = ( +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "nAm" = ( /obj/structure/closet/lasertag/red, /turf/simulated/floor/tiled/old_tile/red, /area/endeavour/hallway/d1aftmaint) "nAn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Pool Room" +/obj/structure/window/basic{ + dir = 1 }, -/turf/simulated/floor/tiled/white, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/structure/closet/secure_closet/personal, +/turf/simulated/floor/holofloor/tiled/dark, /area/crew_quarters/pool/changing_room) "nAT" = ( /obj/structure/table/marble, @@ -18183,15 +18586,12 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/coffee_shop) "nBz" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/maintenance/chapel) +/obj/structure/flora/pottedplant/orientaltree, +/turf/simulated/floor/carpet/bcarpet, +/area/tether/station/burial) "nBS" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -18235,6 +18635,10 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) +"nCV" = ( +/obj/effect/floor_decal/spline/fancy/wood, +/turf/simulated/floor/wood, +/area/library) "nEa" = ( /obj/machinery/light{ dir = 8 @@ -18271,6 +18675,9 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "nFx" = ( @@ -18333,8 +18740,9 @@ /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) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d1aftmaint) "nHC" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 6 @@ -18386,21 +18794,9 @@ /turf/simulated/floor/plating, /area/shuttle/courser/cockpit) "nJA" = ( -/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/structure/bed/chair/comfy/brown{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/library) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/library) "nJD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -18615,9 +19011,9 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/sauna) "nSy" = ( -/obj/machinery/portable_atmospherics/powered/pump/filled, +/obj/machinery/shield_diffuser, /turf/simulated/floor/plating, -/area/maintenance/chapel) +/area/tether/station/burial) "nSH" = ( /obj/structure/bed/chair/sofa/black{ dir = 4 @@ -18678,11 +19074,16 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d1fwdmaint) "nUG" = ( +/obj/item/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 26 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/light{ + dir = 1 }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) @@ -18751,13 +19152,14 @@ "nXJ" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, -/obj/machinery/camera/network/civilian{ - dir = 1 - }, /obj/effect/floor_decal/borderfloorblack/corner2{ alpha = 255 }, /obj/effect/floor_decal/corner/navgold/bordercorner2, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "nXR" = ( @@ -18997,7 +19399,7 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 9 }, -/obj/machinery/vending/fitness, +/obj/machinery/vending/snack, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d1afthall) "oiv" = ( @@ -19321,6 +19723,7 @@ /area/exploration/explorer_prep) "ovE" = ( /obj/machinery/door/airlock/maintenance/common, +/obj/map_helper/access_helper/airlock/station/exploration/department, /turf/simulated/floor/plating, /area/endeavour/exploration/hallway_fore) "owg" = ( @@ -19408,6 +19811,15 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) +"oxL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool/changing_room) "oxV" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, @@ -19448,6 +19860,21 @@ }, /turf/simulated/floor/tiled/monodark, /area/crew_quarters/lounge) +"oAj" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardhall) "oAD" = ( /obj/machinery/light, /obj/structure/table/rack, @@ -19582,11 +20009,10 @@ /turf/simulated/floor/grass, /area/hydroponics/garden) "oGx" = ( -/obj/structure/table/woodentable, -/obj/item/flashlight/lamp/green, -/obj/machinery/light/small{ - dir = 4 +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_y = 29 }, +/obj/structure/bed/chair/sofa/brown/left, /turf/simulated/floor/carpet/bcarpet, /area/library) "oHo" = ( @@ -19667,13 +20093,13 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/sauna) "oKZ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/structure/table/woodentable, +/obj/effect/floor_decal/spline/fancy/wood, +/obj/item/flame/candle/candelabra/everburn{ + pixel_y = 8 }, -/turf/simulated/floor/tiled/freezer, -/area/crew_quarters/pool) +/turf/simulated/floor/carpet/bcarpet, +/area/tether/station/burial) "oLF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -19837,6 +20263,14 @@ }, /turf/simulated/floor/wood, /area/endeavour/hallway/d1fwdmaint) +"oTa" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/crew_quarters/pool/changing_room) "oTA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -19931,8 +20365,7 @@ /turf/simulated/wall/r_wall/prepainted/exploration, /area/shuttle/excursion/cargo) "oWY" = ( -/obj/machinery/holopad, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool/changing_room) "oXb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -20121,14 +20554,23 @@ /area/maintenance/chapel) "pdw" = ( /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, /turf/simulated/floor/tiled, /area/hallway/secondary/docking_hallway2) +"pdz" = ( +/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/manifold/hidden/supply, +/obj/machinery/light, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardhall) "pdK" = ( /turf/simulated/floor/tiled, /area/gateway/prep_room) @@ -20161,6 +20603,9 @@ /obj/effect/floor_decal/corner/black/full{ dir = 1 }, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/lounge/kitchen_freezer) "pfk" = ( @@ -20268,6 +20713,10 @@ /turf/simulated/floor/grass, /area/hydroponics/garden) "pgL" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/landmark/spawnpoint/overflow/station, /turf/simulated/floor/tiled/techfloor/grid, /area/endeavour/hallway/d1afthall) "phb" = ( @@ -20336,10 +20785,6 @@ "pjL" = ( /obj/machinery/door/firedoor, /obj/machinery/cryopod/robot/door/shuttle, -/obj/machinery/computer/cryopod{ - name = "asset retention console"; - pixel_y = -30 - }, /turf/simulated/floor/tiled/techfloor/grid, /area/endeavour/hallway/d1afthall) "pkq" = ( @@ -20356,7 +20801,7 @@ dir = 8; name = "Library" }, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/carpet/bcarpet, /area/library) "plx" = ( /obj/structure/bookcase/legal/combo, @@ -20454,8 +20899,7 @@ /area/shuttle/civvie/cockpit) "pnA" = ( /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) @@ -20511,9 +20955,16 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/endeavour/surfacebase/tram) "ppR" = ( -/obj/effect/floor_decal/rust, -/turf/simulated/floor/plating, -/area/hallway/secondary/docking_hallway) +/obj/effect/floor_decal/borderfloorblack{ + dir = 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/d1starboardhall) "pqe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -20528,7 +20979,7 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardhall) "pqr" = ( /obj/structure/cable/green{ icon_state = "0-4" @@ -20624,6 +21075,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/maintenance/chapel) "pvb" = ( @@ -20648,6 +21100,10 @@ }, /turf/simulated/floor/wood, /area/endeavour/hallway/d1fwdmaint) +"pvq" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardhall) "pvA" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -20738,6 +21194,7 @@ /area/endeavour/surfacebase/sauna) "pAX" = ( /obj/machinery/sleep_console, +/obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/white, /area/exploration/medical) "pBk" = ( @@ -20912,8 +21369,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -20939,6 +21395,17 @@ /obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) +"pKP" = ( +/obj/machinery/light/small, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/turf/simulated/floor/wood, +/area/library) "pKV" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, @@ -21016,9 +21483,11 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "pOh" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/endeavour/hallway/d1fwdmaint) +/obj/machinery/camera/network/civilian{ + dir = 9 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "pOB" = ( /obj/machinery/door/firedoor/glass{ dir = 8 @@ -21039,6 +21508,17 @@ }, /turf/simulated/floor/tiled/white, /area/endeavour/surfacebase/sauna) +"pOJ" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 + }, +/obj/structure/bed/padded, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "pPL" = ( /turf/simulated/floor/plating, /area/maintenance/substation/civilian) @@ -21129,6 +21609,13 @@ }, /turf/simulated/floor/tiled, /area/shuttle/excursion/general) +"pTh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "pUQ" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, @@ -21159,6 +21646,19 @@ }, /turf/simulated/floor/tiled/white, /area/exploration/medical) +"pVF" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardhall) "pVQ" = ( /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/navblue/bordercorner, @@ -21253,6 +21753,13 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1fwdhall) +"qcD" = ( +/obj/structure/bed/chair, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/tether/station/burial) "qcV" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, @@ -21280,7 +21787,7 @@ /obj/structure/sign/directions/engineering{ pixel_y = 11 }, -/turf/simulated/wall/r_wall/prepainted/civilian, +/turf/simulated/wall/r_wall/prepainted, /area/station/stairs_one) "qdM" = ( /obj/machinery/door/firedoor, @@ -21368,6 +21875,12 @@ }, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_fore) +"qfR" = ( +/obj/structure/table/rack, +/obj/item/tank/air, +/obj/item/tank/air, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d1aftmaint) "qfY" = ( /obj/machinery/air_alarm{ frequency = 1441; @@ -21475,7 +21988,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardhall) "qku" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -21604,13 +22117,28 @@ }, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/sauna) -"qqr" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 8 +"qqo" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/endeavour/hallway/d1aftmaint) +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 4 + }, +/obj/structure/sign/department/biblio{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardhall) +"qqr" = ( +/obj/structure/lattice, +/turf/space/basic, +/area/space) "qrz" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -21791,7 +22319,7 @@ /area/endeavour/hallway/d1fwdhall) "qzb" = ( /obj/structure/disposalpipe/segment{ - dir = 2; + dir = 4; icon_state = "pipe-c" }, /turf/simulated/floor/tiled/steel, @@ -22029,6 +22557,9 @@ name = "Security Checkpoint"; sortType = "Security Checkpoint" }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) "qJE" = ( @@ -22105,17 +22636,12 @@ /obj/effect/floor_decal/corner/navgold/border, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, -/obj/machinery/computer/timeclock/premade/south, -/obj/machinery/door/firedoor{ - dir = 1 - }, /obj/effect/floor_decal/borderfloorblack/corner2{ dir = 9 }, /obj/effect/floor_decal/corner/navgold/bordercorner2{ dir = 9 }, -/obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "qLL" = ( @@ -22172,29 +22698,28 @@ "qMR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/borderfloorblack/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/navgold/bordercorner{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/secondary/docking_hallway) -"qNt" = ( /obj/effect/floor_decal/borderfloorblack{ - dir = 1 + dir = 4 }, /obj/effect/floor_decal/corner/navgold/border{ - dir = 1 + dir = 4 }, /obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 1 + dir = 5 }, /obj/effect/floor_decal/corner/navgold/bordercorner2{ - dir = 1 + dir = 5 }, /turf/simulated/floor/tiled, /area/hallway/secondary/docking_hallway) +"qNt" = ( +/obj/machinery/button/remote/driver{ + id = "chapelgun"; + name = "Chapel Mass Driver"; + pixel_x = 25 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/station/burial) "qNJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -22311,9 +22836,10 @@ /turf/simulated/floor/tiled, /area/hallway/secondary/docking_hallway2) "qQJ" = ( -/obj/machinery/light/small, +/obj/structure/catwalk, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/hallway/secondary/docking_hallway) +/area/maintenance/chapel) "qQK" = ( /obj/effect/floor_decal/chapel{ dir = 8 @@ -22394,13 +22920,10 @@ "qUT" = ( /obj/structure/catwalk, /obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/endeavour/hallway/d1aftmaint) +/area/maintenance/asmaint) "qVN" = ( /obj/structure/flora/pottedplant/subterranean, /turf/simulated/floor/carpet/bcarpet, @@ -22417,6 +22940,10 @@ /obj/machinery/meter, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) +"qWa" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/plating, +/area/maintenance/chapel) "qWg" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -22446,12 +22973,14 @@ /turf/simulated/floor/carpet/purcarpet, /area/bridge) "qWP" = ( -/obj/machinery/light/small{ - dir = 8 +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/obj/machinery/floodlight, -/turf/simulated/floor/plating, -/area/maintenance/chapel) +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardhall) "qWS" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -22543,6 +23072,13 @@ }, /turf/simulated/floor/plating, /area/endeavour/hallway/d1fwdmaint) +"qZX" = ( +/obj/machinery/vending/cola, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/library) "raV" = ( /obj/structure/dogbed{ name = "pet bed" @@ -22628,6 +23164,7 @@ }, /obj/item/book/custom_library/fiction, /obj/item/book/custom_library/fiction, +/obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/wood, /area/library) "rdn" = ( @@ -22846,14 +23383,11 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "rln" = ( -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -22; - target_temperature = 312.15 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/effect/mist, -/turf/simulated/floor/water/pool, -/area/endeavour/surfacebase/sauna) +/turf/simulated/floor/plating, +/area/maintenance/chapel) "rlA" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -22864,7 +23398,7 @@ req_access = list(25) }, /obj/machinery/door/blast/shutters{ - dir = 2; + dir = 8; id = "cafe"; layer = 3.1; name = "Cafe Shutters" @@ -22990,9 +23524,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +/obj/machinery/door/firedoor{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "rqv" = ( @@ -23441,8 +23979,13 @@ /turf/simulated/floor/carpet/tealcarpet, /area/shuttle/civvie/general) "rKP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/landmark/spawnpoint/job/field_medic, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 8 + }, +/obj/machinery/suit_storage_unit/search_and_rescue, /turf/simulated/floor/tiled/white, /area/exploration/medical) "rLb" = ( @@ -23523,6 +24066,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, /turf/simulated/floor/wood, /area/library) "rRP" = ( @@ -23619,11 +24165,6 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 }, -/obj/machinery/button/windowtint{ - dir = 4; - id = "sauna_tint"; - pixel_x = -25 - }, /obj/structure/table/bench/wooden, /obj/effect/mist, /turf/simulated/floor/wood, @@ -23645,16 +24186,12 @@ /turf/simulated/wall/r_wall/prepainted/exploration, /area/gateway) "rVX" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/fire_alarm/north_mount, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/holopad, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/carpet/bcarpet, -/area/library) +/turf/simulated/floor/tiled/dark, +/area/tether/station/burial) "rWf" = ( /obj/structure/flora/pottedplant/stoutbush{ pixel_y = 12 @@ -23669,8 +24206,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/carpet/bcarpet, +/turf/simulated/floor/wood, /area/library) +"rXt" = ( +/obj/structure/lattice, +/turf/space/basic, +/area/endeavour/command/turrets) "rXv" = ( /obj/machinery/door/airlock{ name = "Internal Affairs" @@ -23732,13 +24273,9 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "saq" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/blue/border, /obj/machinery/iv_drip, -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 10 - }, /turf/simulated/floor/tiled/white, /area/exploration/medical) "saB" = ( @@ -23855,6 +24392,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/chapel/main) "sfl" = ( @@ -23982,15 +24520,12 @@ /turf/simulated/floor/tiled/dark, /area/chapel/main) "skF" = ( -/obj/machinery/camera/network/civilian, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 1 +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/hallway/secondary/docking_hallway) +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "skI" = ( /obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /obj/effect/paint/commandblue, @@ -24034,26 +24569,21 @@ }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1afthall) "smS" = ( -/obj/structure/catwalk, /obj/structure/cable/green{ icon_state = "2-4" }, -/turf/simulated/floor/plating, -/area/maintenance/chapel) +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardhall) "snc" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/carpet/bcarpet, +/turf/simulated/floor/wood, /area/library) "sne" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -24078,6 +24608,15 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/excursion_dock) +"spU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/wood, +/area/library) "sqa" = ( /obj/structure/bed/chair{ dir = 4 @@ -24120,6 +24659,10 @@ /obj/machinery/recharge_station, /turf/simulated/floor/tiled/white, /area/endeavour/hallway/d1fwdmaint) +"ssh" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/maintenance/asmaint) "ssN" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -24273,7 +24816,7 @@ /turf/simulated/floor/plating, /area/hallway/secondary/docking_hallway) "syY" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/closet/athletic_mixed, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "szl" = ( @@ -24327,7 +24870,7 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardhall) "sBk" = ( /obj/structure/flora/pottedplant/orientaltree, /obj/machinery/atmospherics/component/unary/vent_pump/on, @@ -24456,7 +24999,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/chapel) +/area/endeavour/hallway/d1fwdmaint) "sFu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/flora/ausbushes/ppflowers, @@ -24472,8 +25015,8 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/excursion_dock) "sFF" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) @@ -24490,7 +25033,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, -/area/maintenance/chapel) +/area/endeavour/hallway/d1fwdmaint) "sGN" = ( /obj/structure/table/woodentable, /obj/item/flashlight/lamp/green, @@ -24535,6 +25078,15 @@ }, /turf/simulated/floor/tiled/white, /area/endeavour/hallway/d1fwdmaint) +"sIU" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardhall) "sJl" = ( /obj/effect/floor_decal/spline/plain{ dir = 9 @@ -24542,9 +25094,15 @@ /turf/simulated/floor/carpet/purcarpet, /area/exploration/meeting) "sJt" = ( -/obj/machinery/holopad, -/turf/simulated/floor/wood, -/area/crew_quarters/coffee_shop) +/obj/effect/floor_decal/borderfloorblack{ + dir = 6 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 6 + }, +/obj/item/radio/intercom/south_mount, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardforhall) "sJw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -24630,7 +25188,7 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "sPy" = ( -/obj/machinery/vending/snack, +/obj/machinery/vending/fitness, /turf/simulated/floor/wood, /area/hydroponics/garden) "sPS" = ( @@ -24777,11 +25335,12 @@ /turf/simulated/floor/plating, /area/hydroponics/garden) "sSQ" = ( +/obj/structure/catwalk, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "2-4" }, /turf/simulated/floor/plating, -/area/endeavour/hallway/d1aftmaint) +/area/maintenance/asmaint) "sTF" = ( /obj/structure/cable{ icon_state = "4-8" @@ -24826,11 +25385,9 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "sUx" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/freezer, -/area/crew_quarters/pool) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/asmaint) "sUA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -25036,6 +25593,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) +"tdE" = ( +/obj/structure/closet/firecloset, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/maintenance/library) "tdX" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -25144,9 +25706,12 @@ /turf/simulated/floor/tiled, /area/hallway/secondary/docking_hallway2) "thM" = ( -/obj/structure/girder, -/turf/simulated/floor/plating, -/area/maintenance/chapel) +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/structure/flora/pottedplant/minitree, +/turf/simulated/floor/carpet/bcarpet, +/area/tether/station/burial) "thT" = ( /obj/structure/cable{ icon_state = "4-8" @@ -25177,6 +25742,9 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, /turf/simulated/floor/wood, /area/library) "tjQ" = ( @@ -25393,12 +25961,10 @@ /turf/simulated/floor/plating, /area/endeavour/exploration/hallway_fore) "tsT" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -31 - }, -/obj/machinery/light/small, -/turf/simulated/floor/carpet/bcarpet, -/area/library) +/obj/structure/table/glass, +/obj/item/inflatable_duck, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "tsU" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -25418,15 +25984,20 @@ /turf/simulated/floor/wood, /area/lawoffice) "ttt" = ( -/obj/machinery/power/apc/north_mount, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) +"ttV" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/asmaint) "ttX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -25445,6 +26016,12 @@ }, /turf/simulated/floor/wood, /area/lawoffice) +"tuq" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool/changing_room) "tuw" = ( /obj/item/barrier_tape_roll/engineering, /obj/structure/table/reinforced, @@ -25525,6 +26102,21 @@ }, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_fore) +"tvv" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardhall) "tvy" = ( /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 4; @@ -25552,17 +26144,22 @@ icon_state = "1-2" }, /obj/structure/table/wooden_reinforced, +/obj/item/material/ashtray/glass, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "tvS" = ( -/obj/machinery/cryopod/robot/door/shuttle, -/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/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardhall) +"twe" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/green{ icon_state = "4-8" @@ -25637,13 +26234,26 @@ /turf/simulated/floor/plating, /area/maintenance/substation/command) "txV" = ( -/obj/structure/window/basic{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/structure/closet/athletic_mixed, -/turf/simulated/floor/holofloor/tiled/dark, -/area/crew_quarters/pool/changing_room) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 10 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardhall) "tyc" = ( /obj/item/paper_bin, /obj/structure/table/reinforced, @@ -25705,11 +26315,27 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) +"tBM" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/asmaint) "tBO" = ( /obj/structure/table/marble, /obj/item/flashlight/lamp/green, /turf/simulated/floor/wood, /area/bridge/office) +"tBZ" = ( +/obj/machinery/door/firedoor{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/carpet/bcarpet, +/area/library) "tCb" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -25718,8 +26344,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) @@ -25971,15 +26596,17 @@ /turf/simulated/floor/plating, /area/maintenance/substation/civilian) "tLA" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/air_alarm{ + pixel_y = 22 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, -/turf/simulated/floor/tiled, -/area/hallway/secondary/docking_hallway) +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardhall) "tLX" = ( /obj/vehicle_old/train/engine{ dir = 8 @@ -26000,11 +26627,16 @@ /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/civvie/general) "tMO" = ( -/obj/machinery/camera/network/civilian{ - dir = 9 +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor{ + dir = 1 }, -/turf/simulated/floor/tiled/freezer, -/area/crew_quarters/pool) +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d1aftmaint) "tNi" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -26124,13 +26756,14 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardhall) "tQt" = ( /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, /turf/simulated/floor/tiled, /area/chapel/main) "tQu" = ( @@ -26170,6 +26803,9 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /turf/simulated/floor/plating, /area/maintenance/chapel) "tTD" = ( @@ -26184,7 +26820,7 @@ /obj/random/maintenance/security, /obj/structure/closet/crate, /turf/simulated/floor/plating, -/area/maintenance/chapel) +/area/endeavour/hallway/d1fwdmaint) "tUS" = ( /obj/machinery/computer/communications, /obj/machinery/keycard_auth{ @@ -26249,7 +26885,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardhall) "tWE" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -26270,9 +26906,15 @@ /turf/simulated/floor/tiled, /area/maintenance/tool_storage) "tXS" = ( -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/pool/changing_room) +/obj/item/radio/intercom{ + pixel_y = -24 + }, +/obj/machinery/vending/coffee, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/library) "tYZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -26385,7 +27027,7 @@ dir = 2; id = "cap_office"; layer = 3.1; - name = "Colony Directo's Shutters" + name = "Colony Director's Shutters" }, /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/commandblue, @@ -26456,16 +27098,12 @@ /turf/simulated/wall/r_wall/prepainted, /area/maintenance/chapel) "uda" = ( -/obj/structure/window/basic{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/structure/closet/athletic_mixed, -/obj/machinery/light{ - dir = 4 +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green{ + icon_state = "0-8" }, -/turf/simulated/floor/holofloor/tiled/dark, -/area/crew_quarters/pool/changing_room) +/turf/simulated/floor/plating, +/area/endeavour/hallway/d1aftmaint) "udj" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -26564,14 +27202,11 @@ /turf/simulated/wall/r_wall/prepainted/command, /area/endeavour/hallway/d1fwdmaint) "ugs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/machinery/light/small, -/turf/simulated/floor/carpet/bcarpet, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, /area/library) "ugI" = ( /obj/machinery/atmospherics/component/unary/heat_exchanger{ @@ -26688,6 +27323,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/chapel/main) "ulm" = ( @@ -26754,26 +27393,16 @@ /turf/simulated/floor/wood, /area/exploration/meeting) "umU" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 5 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/navgold/bordercorner2{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 5 +/obj/structure/table/woodentable, +/obj/effect/floor_decal/spline/fancy/wood, +/obj/item/flame/candle/candelabra/everburn{ + pixel_y = 8 }, -/obj/effect/floor_decal/corner/navgold/bordercorner2{ - dir = 5 +/obj/machinery/light{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/hallway/secondary/docking_hallway) +/turf/simulated/floor/carpet/bcarpet, +/area/tether/station/burial) "uni" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -26811,6 +27440,13 @@ }, /turf/simulated/floor/tiled, /area/gateway/prep_room) +"uoW" = ( +/obj/structure/bed/chair, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/tether/station/burial) "upy" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -27008,6 +27644,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/chapel/main) "uvD" = ( @@ -27025,14 +27662,14 @@ /area/vacant/vacant_bar) "uvU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 5 }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/carpet/bcarpet, -/area/library) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d1fwdmaint) "uvX" = ( /obj/effect/floor_decal/borderfloorblack/corner{ dir = 1 @@ -27048,6 +27685,12 @@ pixel_y = 16 }, /obj/structure/curtain/open/shower, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/exploration/showers) "uwu" = ( @@ -27110,6 +27753,9 @@ dir = 8 }, /obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/chapel/main) "uxM" = ( @@ -27146,11 +27792,15 @@ /turf/simulated/floor/plating, /area/maintenance/chapel) "uzz" = ( -/obj/structure/bed/chair/sofa/black/left{ +/obj/structure/bed/chair, +/obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/turf/simulated/floor/wood, -/area/maintenance/chapel) +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/tether/station/burial) "uzH" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -27223,22 +27873,19 @@ /turf/simulated/floor/tiled/dark, /area/station/stairs_one) "uBN" = ( -/obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, /turf/simulated/floor/plating, -/area/endeavour/hallway/d1aftmaint) +/area/maintenance/asmaint) "uBR" = ( /obj/structure/catwalk, /obj/structure/cable/green{ - icon_state = "1-4" + icon_state = "4-8" }, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/endeavour/hallway/d1aftmaint) +/area/maintenance/chapel) "uCu" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 9 @@ -27306,6 +27953,13 @@ /obj/structure/railing, /turf/simulated/floor/plating, /area/shuttle/courser/general) +"uGX" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d1aftmaint) "uHb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -27415,10 +28069,8 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "uMJ" = ( -/obj/effect/floor_decal/rust, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/plating, -/area/hallway/secondary/docking_hallway) +/turf/simulated/wall/prepainted, +/area/crew_quarters/pool) "uMM" = ( /obj/machinery/light/small{ dir = 8 @@ -27478,6 +28130,16 @@ }, /turf/simulated/floor/tiled, /area/exploration/pilot_prep) +"uOZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d1fwdmaint) "uPj" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -27544,17 +28206,11 @@ /turf/simulated/wall/r_wall/prepainted/civilian, /area/shuttle/civvie/general) "uRN" = ( -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/hallway/secondary/docking_hallway) +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "uSH" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/wood, @@ -27570,7 +28226,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/endeavour/hallway/d1aftmaint) +/area/maintenance/asmaint) "uTr" = ( /turf/simulated/wall/prepainted, /area/endeavour/hallway/d1fwdmaint) @@ -27602,10 +28258,10 @@ /turf/simulated/floor/wood, /area/exploration/meeting) "uUz" = ( -/obj/item/radio/intercom{ - pixel_y = -24 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 }, -/turf/simulated/floor/carpet/bcarpet, +/turf/simulated/floor/wood, /area/library) "uUK" = ( /turf/simulated/floor/tiled/techfloor/grid, @@ -27637,8 +28293,10 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "uVf" = ( -/obj/machinery/vending/cola, -/turf/simulated/floor/carpet/bcarpet, +/obj/item/radio/intercom{ + pixel_y = -24 + }, +/turf/simulated/floor/wood, /area/library) "uVx" = ( /obj/machinery/camera/network/civilian{ @@ -27790,11 +28448,10 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "vaR" = ( -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_y = -37 - }, -/turf/simulated/floor/carpet/bcarpet, -/area/library) +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/effect/paint/palebottlegreen, +/turf/simulated/floor/plating, +/area/tether/station/burial) "vaT" = ( /obj/machinery/washing_machine, /obj/machinery/air_alarm{ @@ -27817,7 +28474,7 @@ "vca" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, -/area/maintenance/chapel) +/area/maintenance/asmaint) "vce" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -27902,7 +28559,7 @@ /turf/simulated/floor/plating, /area/shuttle/courser/general) "vdF" = ( -/turf/simulated/wall/r_wall/prepainted/civilian, +/turf/simulated/wall/r_wall/prepainted, /area/station/stairs_one) "vdU" = ( /obj/structure/cable{ @@ -28010,6 +28667,13 @@ "vgA" = ( /turf/simulated/open, /area/endeavour/hallway/d1fwdhall) +"vhq" = ( +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/dark, +/area/tether/station/burial) "vhJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -28073,7 +28737,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardhall) "vkr" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -28162,13 +28826,14 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "vnQ" = ( -/obj/machinery/vending/snack, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d1afthall) "voy" = ( @@ -28184,14 +28849,13 @@ /turf/simulated/floor/tiled/dark, /area/teleporter) "voN" = ( -/obj/structure/bed/chair/comfy/brown{ +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/item/radio/intercom{ - pixel_y = -24 - }, -/turf/simulated/floor/carpet/bcarpet, -/area/library) +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/holofloor/tiled/dark, +/area/endeavour/hallway/d1starboardhall) "voU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -28210,6 +28874,10 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) +"vpD" = ( +/obj/machinery/light/small, +/turf/simulated/floor/carpet/bcarpet, +/area/library) "vpK" = ( /obj/machinery/light/small{ dir = 8 @@ -28433,8 +29101,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -28481,6 +29148,21 @@ /obj/item/bedsheet/mimedouble, /turf/simulated/floor/wood, /area/crew_quarters/mimeoffice) +"vxW" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardamidhall) "vyI" = ( /obj/machinery/turnstile{ dir = 1 @@ -28518,21 +29200,14 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 9 }, -/obj/machinery/power/apc/west_mount{ - cell_type = /obj/item/cell/super - }, /obj/structure/cable/green{ icon_state = "0-4" }, /obj/machinery/light{ dir = 8 }, -/obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = 26 - }, /obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "vBt" = ( @@ -28583,9 +29258,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/cable/green{ icon_state = "1-8" }, @@ -28737,6 +29409,13 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/captain) +"vGt" = ( +/obj/structure/table/woodentable, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/library) "vGC" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable/green{ @@ -28826,24 +29505,16 @@ /turf/simulated/floor/plating, /area/shuttle/courser/cockpit) "vJi" = ( -/obj/effect/floor_decal/borderfloorblack{ +/obj/effect/floor_decal/borderfloorblack/corner{ dir = 8 }, -/obj/effect/floor_decal/corner/navgold/border{ +/obj/effect/floor_decal/corner/navgold/bordercorner{ dir = 8 }, -/obj/item/radio/intercom{ - dir = 8; - pixel_x = -24 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardhall) "vJp" = ( /obj/structure/table/reinforced, /obj/fiftyspawner/rods, @@ -28911,6 +29582,10 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/excursion_dock) +"vLi" = ( +/obj/machinery/fire_alarm/south_mount, +/turf/simulated/floor/carpet/bcarpet, +/area/chapel/main) "vLn" = ( /obj/effect/floor_decal/spline/fancy{ dir = 9 @@ -29265,8 +29940,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /obj/structure/cable/green{ icon_state = "1-2" @@ -29334,11 +30008,15 @@ /turf/simulated/floor/tiled, /area/maintenance/tool_storage) "wha" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 27 +/obj/item/radio/intercom/east_mount, +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_y = -37 }, -/turf/simulated/floor/tiled/dark, -/area/chapel/main) +/obj/structure/bed/chair/sofa/brown/right{ + dir = 1 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/library) "whp" = ( /obj/structure/cable{ icon_state = "1-2" @@ -29383,6 +30061,17 @@ }, /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/blueshield) +"wjE" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/maintenance/chapel) "wjN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -29597,6 +30286,9 @@ /obj/machinery/photocopier/faxmachine{ department = "Library Conference Room" }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, /turf/simulated/floor/wood, /area/library) "wrE" = ( @@ -29639,6 +30331,12 @@ }, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_fore) +"wtu" = ( +/obj/machinery/fire_alarm/south_mount{ + pixel_y = -24 + }, +/turf/simulated/floor/wood, +/area/library) "wtI" = ( /obj/machinery/light{ dir = 4 @@ -29776,7 +30474,7 @@ "wxw" = ( /obj/structure/sign/deck/first, /turf/simulated/wall/prepainted, -/area/maintenance/asmaint) +/area/maintenance/library) "wxJ" = ( /obj/structure/table/borosilicate, /obj/structure/dancepole, @@ -29918,14 +30616,20 @@ /turf/simulated/floor/plating, /area/maintenance/substation/civilian) "wAB" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, -/turf/simulated/floor/carpet/bcarpet, -/area/library) +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardhall) "wAI" = ( /obj/item/radio/intercom{ pixel_y = -24 @@ -30085,9 +30789,9 @@ /turf/simulated/floor/tiled, /area/shuttle/excursion/general) "wGj" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor/glass{ - dir = 8 +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass{ + name = "Chapel" }, /obj/structure/cable/green{ icon_state = "4-8" @@ -30259,6 +30963,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/gateway/prep_room) +"wQj" = ( +/obj/structure/bed/chair, +/turf/simulated/floor/plating, +/area/maintenance/chapel) "wQI" = ( /obj/machinery/atmospherics/pipe/vent/high_volume, /turf/simulated/floor/airless/ceiling, @@ -30360,7 +31068,7 @@ /area/endeavour/hallway/d1fwdhall) "wUJ" = ( /turf/simulated/wall/prepainted/civilian, -/area/maintenance/chapel) +/area/maintenance/library) "wVs" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/cyan, /obj/spawner/window/low_wall/borosillicate/full, @@ -30391,7 +31099,6 @@ /area/station/stairs_one) "wWR" = ( /obj/machinery/fire_alarm/north_mount, -/obj/machinery/disposal, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/tram) "wWT" = ( @@ -30458,6 +31165,12 @@ }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) +"wZm" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardhall) "wZQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -30649,11 +31362,18 @@ /turf/simulated/floor/tiled/dark, /area/bridge/hallway) "xiw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/hallway/secondary/docking_hallway) "xjh" = ( @@ -30827,6 +31547,7 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/structure/catwalk, /turf/simulated/floor/tiled, /area/maintenance/substation/dock) "xri" = ( @@ -30835,6 +31556,18 @@ }, /turf/simulated/floor/lino, /area/chapel/office) +"xrp" = ( +/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/carpet/bcarpet, +/area/library) "xrv" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -30871,6 +31604,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) +"xsP" = ( +/obj/machinery/floodlight, +/turf/simulated/floor/plating, +/area/maintenance/library) "xtc" = ( /obj/structure/closet, /obj/item/clothing/under/suit_jacket/red, @@ -30911,7 +31648,7 @@ dir = 1 }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/carpet/bcarpet, /area/library) "xtP" = ( /obj/machinery/computer/communications, @@ -31100,34 +31837,24 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/secondary/docking_hallway) +"xyy" = ( +/obj/structure/bed/chair, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/maintenance/chapel) "xyA" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 6 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 6 - }, -/obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/navgold/bordercorner2{ - dir = 6 - }, +/obj/structure/catwalk, /obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + icon_state = "2-4" }, -/turf/simulated/floor/tiled, -/area/hallway/secondary/docking_hallway) +/turf/simulated/floor/plating, +/area/maintenance/chapel) "xyG" = ( -/obj/machinery/door/firedoor/glass, -/turf/simulated/wall/prepainted, -/area/hallway/secondary/docking_hallway) +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/dark, +/area/tether/station/burial) "xzk" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -31425,17 +32152,20 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d1fwdmaint) "xKW" = ( -/obj/machinery/light{ - dir = 1 +/obj/machinery/door/airlock/civilian{ + name = "Pool Access" }, -/obj/effect/floor_decal/borderfloorblack{ +/obj/machinery/door/firedoor{ dir = 1 }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/hallway/secondary/docking_hallway) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/crew_quarters/pool/changing_room) "xLn" = ( /obj/machinery/door/airlock/command{ name = "Head of Personnel"; @@ -31464,6 +32194,22 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/excursion_dock) +"xMR" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + alpha = 255; + dir = 10 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardhall) "xNu" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/pool/changing_room) @@ -31495,6 +32241,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/chapel/main) "xPf" = ( @@ -31686,7 +32435,7 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardhall) "xVw" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -31722,18 +32471,25 @@ pixel_x = 32 }, /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /turf/simulated/floor/glass/reinforced, /area/endeavour/hallway/d1fwdhall) "xZn" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/space) +"xZq" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "xZx" = ( /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -31900,11 +32656,11 @@ /turf/simulated/floor/plating, /area/shuttle/courser/general) "ydA" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/blue/border, /obj/structure/table/standard, /obj/item/defib_kit/loaded, /obj/item/storage/firstaid/surgery, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/blue/border, /turf/simulated/floor/tiled/white, /area/exploration/medical) "ydG" = ( @@ -32046,8 +32802,15 @@ dir = 1 }, /obj/machinery/door/airlock/maintenance/common, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, -/area/maintenance/chapel) +/area/maintenance/asmaint) +"ykh" = ( +/obj/machinery/air_alarm/south_mount, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool/changing_room) "ykT" = ( /obj/machinery/holopad, /turf/simulated/floor/wood, @@ -36640,13 +37403,13 @@ xRj xRj dkX aHh -aHh -aHh -aHh -aHh -aHh -aHh -euS +aVc +mxK +rKP +rKP +quA +iwR +bkR euS euS euS @@ -36835,10 +37598,10 @@ xRj ePJ aHh aGL -iwR -jag +mEg jag -quA +mEg +lNd saq bkR aIj @@ -37027,7 +37790,7 @@ xRj xRj xRj xRj -aHh +dXL lta mEg mEg @@ -37610,10 +38373,10 @@ xRj usG usY aHh -mxK +jwy mfS azC -rKP +azC sDP glY bkR @@ -40551,15 +41314,15 @@ sti sti sti sti -tvS -eFW +sti eFW pjL +pjL +pjL eFW cMJ rTZ rTZ -rTZ ozV cMJ tAk @@ -40744,16 +41507,16 @@ aNK sWz efK wim +wim sti apf agD -pgL agD -aqI +agD +eNz cMJ rTZ rTZ -rTZ ozV cMJ tAk @@ -40938,14 +41701,14 @@ jLe jLe jLe jLe +jLe fVV -apf -pgL pgL -pgL -eNz +agD +agD +agD +gWl cMJ -dIc ito ito foK @@ -41133,12 +41896,12 @@ sti sti sti sti +sti amu -pgL -pgL -pgL hxi -cMJ +hxi +hxi +dIc cMJ cMJ cMJ @@ -41326,14 +42089,14 @@ xvH clV sJO vsP +vsP dAK kKK kKK kKK -kKK xgP -aBC -vsP +kKK +cAG jGP jPz vsP @@ -41923,21 +42686,21 @@ dZr dZr dZr dZr -fmb -fsR -gWh +aNK +tMO +aNK fhK fhK loX fhK fhK fhK -wBM -wBM -wBM -wBM -wBM -ijU +sti +sti +sti +sti +sti +sti apc eGS ijU @@ -42117,21 +42880,21 @@ bzz dKp xNI dZr -iqr +wim fsR -gWh +wim fhK tAw iAm skd oAD fhK -nct -nct -nct -cMf -nct -ijU +wim +wim +aLP +ejN +wim +sti wIX iGx gja @@ -42311,21 +43074,21 @@ xNI xNI oiL dZr -fmb +wim fsR -gWh +wim fhK tAw kPw wge fhC fhK -nct -nct -nct -nct -syO -ijU +aLP +wim +wim +wim +qfR +sti qQG gEI tyc @@ -42505,21 +43268,21 @@ xNI xNI dKp dZr -fmb +aLP fsR -gWh +wLB fhK sBI ebA tfD fhC fhK -nct -nct -nct -nct -ddG -ijU +wim +wim +aLP +wim +kmD +sti bfO gEI nMh @@ -42699,21 +43462,21 @@ xNI xNI dnc dZr -xKW +aLP fsR -gWh +wim fhK ejb xGU tfD ber fhK -nct -nct -nct -nct -nct -ijU +wim +wim +wim +aLP +wim +sti wyc gEI cUt @@ -42893,21 +43656,21 @@ mUN xNI vHP dZr -fmb +wim fsR -gWh +wim fhK eYG jvK tfD bVS fhK -nct -nct -nct -nct -nct -ijU +wim +wim +wim +aLP +aLP +sti wyc ePs kpN @@ -43062,7 +43825,7 @@ cCy jWs cqc vnQ -kHh +kpq mEO rkY lEq @@ -43087,21 +43850,21 @@ hvu cWc cWc cWc -skF +wim fsR -gWh +wim fhK awW mfn qBg dqb fhK -ppR -ppR -ppR -ppR -qQJ -ijU +aLP +aLP +aLP +aLP +wim +sti wyc hSU kvI @@ -43281,21 +44044,21 @@ sNR xuM rRP cWc -fmb +wim fsR -gWh +wim fhK jUN wHY hbF gxC fhK -ppR -uMJ -ppR -ppR -ppR -ijU +wim +aLP +aLP +aLP +aLP +sti scr aVF joU @@ -43475,21 +44238,21 @@ saT xNI xNI cWc -qNt +wim fsR -gWh -fhK -fhK -fhK -fhK +wim fhK fhK fhK fhK fhK fhK -gOX -lhS +aLP +aLP +aNK +aNK +aNK +aNK qfY vYM bnJ @@ -43671,19 +44434,19 @@ fre xrg nHB gBF -tLA -fhK -rGy -bci -bci -dmy -qXt -qXt -ivm -qXt -nFx -diR -lhS +wim +uGX +wim +wim +wim +wim +aLP +wim +wim +wim +aLP +wim +aNK gEI vYM tVX @@ -43863,21 +44626,21 @@ dfU shj ftZ cWc -umU -uRN -xyA -fhK -pBk -vhJ -dPQ -dPQ -dPQ -dPQ -dPQ -dPQ -dPQ -lze -lhS +wim +bPE +wim +aNK +aLP +aLP +aLP +wim +wim +wim +wim +wim +kcG +aLP +aNK kHM vYM kcJ @@ -44057,21 +44820,21 @@ cWc cjq cWc cWc -iFj -ibD -xyG -fhK -cfS -oyz -qTM -qTM -qTM -qTM -qTM -qTM -bci -rvc -lhS +wim +bPE +aLP +aNK +aNK +aNK +aNK +aNK +aNK +aNK +aNK +aNK +aNK +uGX +aNK etm wUf etm @@ -44249,22 +45012,22 @@ kdt dJa dJa jEM -xNu -gZb +xNI +dZr hrr -cRj -cSU -nAn -oKZ +uda +wim +aNK +rGy syY -qTM -qTM -qTM -qTM -qTM -qTM -bci -bci +syY +cyC +qXt +tsT +pOJ +qXt +nFx +diR lhS nui apg @@ -44443,22 +45206,22 @@ xNI xNI dnc xNI -xNu -cSZ -iRR -oWY +xNI +dZr +dZr +dZr hik -tXS -nUG -oyz -qTM -qTM -qTM -qTM -qTM -qTM -bci -bci +dZr +pBk +vhJ +dPQ +dPQ +dPQ +dPQ +dPQ +dPQ +dPQ +lze lhS iLv kHn @@ -44637,13 +45400,13 @@ dnc xNI xNI xNI -xNu -jsH -hik -hik -hik -krO -nUG +xNI +xNI +xNI +xNI +xNI +dZr +cfS oyz qTM qTM @@ -44652,12 +45415,12 @@ qTM qTM qTM bci -wAI +rvc lhS suU jyC fnT -xSt +fZE wuD eQc fYz @@ -44831,18 +45594,18 @@ xNI xNI xNI xNI -xNu -uda -kJh -txV -kJh -krO -nUG +xNI +xNI +xNI +xNI +xNI +dZr +sFF oyz qTM qTM -fbG -qUr +qTM +qTM qTM qTM bci @@ -45030,17 +45793,17 @@ dJe dJe dJe dJe -krO -bJN +dJe +sFF oyz qTM qTM -cvH -sfl +qTM +qTM qTM qTM bci -mve +bci lhS iEj iEj @@ -45217,6 +45980,7 @@ vpK oAT eYV eYV +eYV rFT uvS hyL @@ -45224,22 +45988,21 @@ eYV ojm ilO dJe -krO -nUG +sFF oyz -dIw -dIw -xEQ -ciJ -dIw -dIw -bci +qTM +qTM +qTM +qTM +qTM +qTM bci -aNK -aLP +wAI +gOX +mqa +mqa +mqa mqa -wim -sti noW wBM wBM @@ -45414,26 +46177,26 @@ eYV eYV eYV eYV +eYV kxa kQS xaQ dJe -krO -ndh +sFF oyz -dIw -dIw -dIw -dIw -dIw -dIw +qTM +qTM +fbG +qUr +qTM +qTM bci bci -aNK -aLP -wim -wim -wim +gOX +ckz +ttV +otM +otM uTl cMf nct @@ -45606,28 +46369,28 @@ bxv geL geL geL +geL pxb khu wJJ xaQ wJJ dJe -krO nUG oyz -dIw -dIw -dIw -dIw -dIw -dIw -bci +qTM +qTM +cvH +sfl +qTM +qTM bci -aNK -aLP -wim -wim -wim +mve +gOX +ckz +otM +otM +otM uTl nct syO @@ -45801,27 +46564,27 @@ pbT pxb esY geL +geL kxa xaQ wxJ xaQ dJe -krO -nUG +sFF oyz dIw dIw -dIw -dIw +xEQ +ciJ dIw dIw bci bci -dDB -jLe -jLe -jLe -jLe +gOX +otM +otM +otM +otM uTl nct ddG @@ -45995,27 +46758,27 @@ geL geL geL geL +geL pbT wJJ xaQ xaQ dJe -krO ttt oyz +dIw +dIw +dIw +dIw +dIw +dIw bci bci -bci -bci -bci -bci -bci -bci -aNK +gOX ckz -sSQ -gEQ -jLe +otM +otM +otM uTl ovp kxn @@ -46190,27 +46953,27 @@ pxb eYV eYV eYV +eYV kxa kxa dHt dJe -krO -pBk -aWP -dPQ -dPQ -dPQ -dPQ -dPQ -dPQ -dPQ -hrC -aNK -aLP -aLP -irX -uBR -qqr +sFF +oyz +dIw +dIw +dIw +dIw +dIw +dIw +bci +bci +gOX +ckz +ckz +otM +otM +uTl fHh xYB wBM @@ -46381,6 +47144,7 @@ xdJ xdJ fMv jNC +eYV jzT ufQ fnF @@ -46388,22 +47152,21 @@ eYV kJp kxa dJe -krO sFF +oyz +dIw +dIw +dIw +dIw +dIw +dIw bci bci -bci -tMO -bci -bci -bci -bci -sUx -aNK -aLP -aLP -wim -ehl +fuj +ckz +ckz +otM +otM uBN nuU oeU @@ -46582,27 +47345,27 @@ dJe dJe dJe dJe -aNK -fVV -aNK -aNK -aNK -aNK -aNK -aNK -aNK -aNK -aNK -aNK -aNK -aNK -aNK -sti -wHj -aNK -sti -sti -sti +dJe +iRR +oyz +bci +bci +bci +bci +bci +bci +bci +bci +gOX +gOX +gOX +gOX +mqa +fuj +gOX +mqa +mqa +mqa xRj xRj xRj @@ -46764,39 +47527,39 @@ cVp uUX wxw gvJ -cZJ -vDU -otM +ivm +fLD +hfR mwP -otM -cZJ -otM +hfR +ivm +hfR +hfR +hfR +fLD +ivm +hfR +lmG +kjF +arx +xZq +dPQ +dPQ +dPQ +dPQ +dPQ +dPQ +pTh +gOX otM otM -vDU -cZJ otM -aLP -jLe -aLP -aLP -aLP -hfR -ibx -kov -kov -kov -kov -kov -kov -kov sSQ -kov -sjt -jLe -jLe -ciZ -sti +piW +piW +piW +irX +mqa xRj xRj xRj @@ -46957,40 +47720,40 @@ eNZ uNx lSg gbt -piW -piW -piW -piW +gEQ +gEQ +gEQ +gEQ hMP -piW -piW -piW -piW -piW -piW -piW -piW +gEQ +gEQ +gEQ +gEQ +gEQ +gEQ +gEQ +gEQ +gbt +dFa +nAj +cRj +bci +pOh +aBC +bci +bci +bci +uRN +gOX +otM +otM +sSQ +tBM +otM +otM +otM qUT -kov -kov -kov -kov -kov -sjt -wim -wim -wim -wim -wim -wim -jLe -jLe -jLe -wim -wim -wim -jLe -sti +mqa xRj xRj xRj @@ -47164,27 +47927,27 @@ dsD dsD iHc dsD -dsD -dsD -oxc -oxc -oxc -oxc -oxc -oxc -oxc -oxc -oxc -oxc -oxc -oxc +uMJ +uMJ +skF +fDI +uMJ +uMJ +uMJ +uMJ +uMJ +uMJ +uMJ +gOX +gOX +gOX yjC -oxc -oxc -oxc -uze -pdu -ucD +gOX +gOX +gOX +otM +qUT +mqa xRj xRj xRj @@ -47360,25 +48123,25 @@ eOl jBQ jBQ dsD -uze -uze -uze -lps -pdu -pdu -pdu -uze -oxc -uze -lps -uze -pdu -uze -uze -oxc -uze -pdu -ucD +jmI +jYC +nry +nry +nry +nry +nry +xNu +otM +otM +vDU +otM +qUT +otM +otM +gOX +otM +qUT +mqa nof xRj xRj @@ -47552,27 +48315,27 @@ eOl eOl eOl eOl -eOl -iHc -pdu -pdu -pdu -pdu -pdu -uze -pdu -uze -oxc -uze -uze -pdu -pdu -uze -fAe -oxc -nZR -pdu -ucD +wtu +dsD +kom +oxL +aSH +oWY +oWY +oWY +ykh +xNu +otM +otM +otM +sSQ +tBM +otM +ssh +gOX +cZJ +qUT +mqa xRj xRj xRj @@ -47732,7 +48495,7 @@ jod axR rgW arM -baf +saW pul xtc mew @@ -47748,25 +48511,25 @@ gVv lEF cHX dsD -uze -uze -uze -uze -uze -uze -pdu -pdu -yjC -pdu -pdu -pdu -uze -uze -uze -oxc -uze -pdu -ucD +bCN +jYC +oWY +oWY +oWY +oWY +oWY +oTa +sSQ +piW +piW +tBM +otM +otM +otM +gOX +otM +qUT +mqa usG fOo xRj @@ -47926,7 +48689,7 @@ pEr cHu vEK iuy -saW +baf pul pul pul @@ -47939,28 +48702,28 @@ lEF cHX eOl gVv -sfX +kiD sLI dsD -oxc -oxc -oxc -oxc -oxc -oxc -yjC -oxc -oxc -oxc +iqr +gIz +tuq +nAn +nAn +aqI +nAn +xNu +qUT +gOX vca dIm -uze -nZR -nZR -oxc -uze -pdu -ucD +otM +cZJ +cZJ +gOX +hIQ +tBM +mqa usY usG xRj @@ -48120,7 +48883,7 @@ lxO hnl aej iuy -saW +cdv dsD ikV jZL @@ -48128,33 +48891,33 @@ uMM ixM eeY iao -mJP -mJP +eOl +eOl eOl uSH ncX bIn fsN dsD -uze -uze -bPV -uze -uze -uze -pdu -uze -lps +xNu +xKW +xNu +xNu +xNu +xNu +xNu +xNu +cVz wqi wqi wqi uVB wqi wqi -oxc -ckq -pdu -ucD +gOX +mGW +sUx +mqa usG fOo xRj @@ -48318,37 +49081,37 @@ saW vLq eOl eOl -eOl +spU feB tCG rLV -jCV -jCV +fDJ +fDJ fDJ fDJ hPn -mJP +eOl uVf dsD -uze +xMR +chY +txV +oxc uze syE -uze -uze -uze -pdu -uze -uze -kxk +xyA +cTj +tMg +wqi hHd xZS fFJ eaB wqi -oxc -uze -pdu -ucD +ckz +otM +sUx +mqa xRj xRj xRj @@ -48507,30 +49270,30 @@ pEr pEr pEr jTT -cdv +iuy qLH -dsD +oRd kCA -lEF -sfX +mSo +iKm rRJ -sfX +vGt wrh -mJP -mJP -gVv +uUz +faq +jxO apK -nJA -cfh -ltO -dsD -uze -uze +cHX +eOl +eOl +vLq +qWP +leq +fdP +oxc uze syE -uze -uze -pdu +hAO uze uze wqi @@ -48539,10 +49302,10 @@ hHb fFJ qZu wqi -oxc -uze -pdu -ucD +otM +otM +sUx +mqa xRj xRj xRj @@ -48706,37 +49469,37 @@ mKR cWg rAs esl -esl +xrp vIH esl esl esl -wAB +esl tjy lEF -fDI -tsT -dsD +cHX +eOl +khr dsD -ckq +tLA +jFd +pdz +oxc uze uze +hAO syE uze -uze -pdu -uze -uze wqi lCw dUh iYx thX wqi -oxc -nZR -pdu -ucD +cZJ +otM +sUx +mqa xRj xRj xRj @@ -48900,25 +49663,25 @@ sxq xtJ twe cfh +kxk +cfh +cfh +cfh cfh cfh -uvU -jTs -jTs -rVX abZ kzG fOe uUz +kEM dsD +wAB +pvq +sIU +oxc uze uze -uze -uze -uze -uze -uze -pdu +hAO fAe kMv kMv @@ -48927,10 +49690,10 @@ kMv kMv qbM wqi -oxc -uze -pdu -ucD +ckz +otM +sUx +mqa nof xRj xRj @@ -49091,7 +49854,7 @@ pEr eTb rqe nXJ -oRd +dsD bSd bMt kNK @@ -49099,17 +49862,17 @@ aVu ugs dsD mJP -iKm +mJP fYP mJP mJP -jNp -dsD -uze +mJP +mJP +jQp smS -cTj -cTj -cTj +wZm +mTv +wjE cTj cTj tSE @@ -49121,10 +49884,10 @@ wne kMv xHd wqi -oxc -syE -pdu -ucD +otM +ckz +sUx +mqa xRj xRj xRj @@ -49290,7 +50053,7 @@ snc lLD rXg rxS -mJP +eOl rdf mJP mJP @@ -49298,12 +50061,12 @@ lCx esl esl esl -iEX -cTj -tMg -uze -uze -uze +esl +tBZ +hyg +leq +ncC +oxc uze uze hAO @@ -49315,10 +50078,10 @@ fzZ kMv kMv kMv -oxc -uze -pdu -ucD +otM +otM +sUx +mqa xRj xRj xRj @@ -49484,21 +50247,21 @@ jAq gIW rXg qFN -mJP +bJN iKG mJP -jNp +mJP +pKP dsD vvP tbS vvP dsD -uze -uze -uze -uze -syE -syE +qqo +leq +fdP +oxc +oxc uze hAO uze @@ -49509,10 +50272,10 @@ uPB kvR lgr kMv -oxc -nZR -pdu -ucD +cZJ +otM +sUx +mqa xRj xRj xRj @@ -49674,25 +50437,25 @@ ojo voU lVS dsD -jDn -mJP +wCb +eOl kOz -jCV -bVE +fDJ +jkS +nCV mJP mJP -vaR +maY dsD mJP uau -mJP +vpD dsD -uze -uze -uze -uze -uze -syE +tvS +leq +fdP +hrC +oxc uze hAO uze @@ -49703,10 +50466,10 @@ bul kMv vxs kMv -oxc -uze -pdu -ucD +ckz +otM +sUx +mqa xRj xRj xRj @@ -49855,7 +50618,7 @@ mYH veS kAE wNy -dYN +lDc wXu mrv ngd @@ -49871,21 +50634,21 @@ dsD ucg vEj bsZ -mJP +eOl wvw -scN +jTs mJP -uUz +mJP +tXS dsD -kjF -jnZ +kJh bnw +jDn dsD -oxc -oxc -oxc -oxc -oxc +qWP +leq +fdP +voN oxc oxc lmy @@ -49897,10 +50660,10 @@ kMv kMv kMv kMv -oxc -uze -pdu -ucD +otM +otM +sUx +mqa xRj xRj xRj @@ -50041,7 +50804,7 @@ ahR xwz eaK eaK -sJt +eaK lDo eaK rzS @@ -50062,39 +50825,39 @@ tsU iuy saW vLq -mJP -mJP -mJP -mJP -kOz +eOl +eOl +eOl +khE +lwV htT bVE mJP +qZX dsD -kjF oGx -voN +jnZ +wha dsD -uze qWP -nSy +leq fdP -vca -ucD -lps -hAO oxc -uze -nZR -syE -uze -nZR -uze +oxc lps -uze -uze -pdu -ucD +uBR +oxc +otM +cZJ +ckz +otM +cZJ +otM +vDU +otM +ckz +sUx +mqa usG fOo xRj @@ -50269,26 +51032,26 @@ dsD dsD dsD dsD -uze -uze -uze -uze -uze -ucD +dsD +pVF +gZb +tvv +oxc +qWa uze hAO jYV -pdu -pdu -pdu -pdu -pdu -pdu -pdu -pdu -pdu -pdu -ucD +sUx +sUx +sUx +sUx +sUx +sUx +sUx +sUx +sUx +sUx +mqa usY usG xRj @@ -50445,44 +51208,44 @@ wPz qOo qdt wXu -dYN +lDc xgB iuy baf wUJ -oxc -uze -uze -uze -uze +lmG +hfR +hfR +hfR +hfR dsD vqK mJP dsD -wUJ -wUJ -uze -uze -uze -syE -uze -uze -uze -ucD +xsP +jsH +cZw +tdE +lmG +qWP +leq +fdP +oxc puK +rln tMg ucD -uze -syE -uze -ucD -ucD -ucD -ucD -ucD -ucD -ucD -ucD +otM +ckz +otM +mqa +mqa +mqa +mqa +mqa +mqa +mqa +mqa usG fOo xRj @@ -50644,31 +51407,31 @@ iNb iuy saW wUJ -uze -uze -uze +hfR +hfR +hfR lhd -uze +hfR dsD eaJ mJP -iHc -pdu -pdu -pdu -pdu -pdu -pdu -pdu -uze -uze -ucD -uze +esr +nJA +nJA +nJA +nJA +erZ +qWP +leq +fdP +oxc +eSM +syE pdu ucD -syE -uze -uze +ckz +otM +otM sQl sQl sQl @@ -50847,22 +51610,22 @@ dsD erf pkW dsD -oxc -lZv -oxc -oxc -oxc -oxc +lmG +lmG +lmG +lmG +lmG +qWP leq -oxc +fdP oxc oxc nZR pdu ucD -syE -syE -ucD +ckz +ckz +mqa sQl sQl xRj @@ -51032,30 +51795,30 @@ uaP lLu hdn mWz -hjh -mWz +oAj +ppR vkl bIB -mWz +ppR mhW fkZ tQg lyH hjh -mWz +ppR eWl bIB qks llV -mWz +bha vJi kNi oxc uze pdu ucD -ucD -ucD +mqa +mqa sQl sQl sQl @@ -51226,24 +51989,24 @@ hYA uZh rCE qke -jXs -qke -qke -qke -qke -qke -qke +gZb +leq +leq +leq +leq +leq +leq aGG pql jXs -qke -qke -qke +leq +leq +leq pql aGG iUW sAT -lSz +ehl oxc ckq pdu @@ -51632,12 +52395,12 @@ fkm eKd fcu aBi -eKd +sDi uze pdu ucD xRj -xRj +qqr xRj xRj xRj @@ -51827,11 +52590,11 @@ xGd uni hWW sDi -uze -pdu -ucD -xRj +syE +qQJ +krO xRj +qqr xRj xRj xRj @@ -52009,7 +52772,7 @@ mVc qzo qJO iRz -gRB +fmb kOk qQK dOW @@ -52019,13 +52782,13 @@ nfJ kOk kOG uni -hWW +vLi sDi nZR -pdu +qQJ ucD xRj -xRj +qqr xRj xRj xRj @@ -52216,10 +52979,10 @@ ueu oHy sDi uze -pdu +qQJ ucD -xRj -xRj +qqr +qqr xRj xRj xRj @@ -52413,7 +53176,7 @@ uze pdu ucD xRj -xRj +qqr xRj xRj xRj @@ -52571,16 +53334,16 @@ enD tOv atm mYb -bjg -bjg -bjg -bjg +dor +dor +dor +dor hfQ eAL -bjg -bjg -bjg -bjg +dor +dor +dor +dor yaO oPk nqO @@ -52591,7 +53354,7 @@ vpO xri kBD iRz -gRB +fmb jcv bYy esm @@ -52603,11 +53366,11 @@ hWW hWW hWW sDi -uze +wQj pdu -ucD -xRj +krO xRj +qqr xRj xRj xRj @@ -52797,11 +53560,11 @@ dpE hWW bNN sDi -uze +xyy pdu ucD xRj -xRj +qqr xRj xRj xRj @@ -52991,11 +53754,11 @@ bHQ hWW hWW sDi -nZR +kvn pdu ucD -xRj -xRj +qqr +qqr xRj xRj xRj @@ -53163,7 +53926,7 @@ bLa sBk dmO nAf -jLq +vxW dwQ ibq eDy @@ -53189,7 +53952,7 @@ uze pdu ucD nof -xRj +qqr xRj xRj xRj @@ -53368,22 +54131,22 @@ erV aPj sDi mZV -gRB -wha +dNy iwC +gRB wtI -eJs +gRB aeg -iwC +gRB tDC jGM quB sDi uze pdu -ucD -xRj +krO xRj +qqr xRj xRj xRj @@ -53561,23 +54324,23 @@ sDi sDi sDi sDi -sDi +ibS wGj sDi +fkm sDi +fkm sDi +fkm sDi sDi sDi sDi -sDi -sDi -sDi -uze -pdu +syE +qQJ ucD xRj -xRj +qqr xRj xRj xRj @@ -53748,30 +54511,30 @@ nAf jLq jwq lSz -oxc -uze -uze -uze -uze -uze -uze -uze -uze -uze -lps -uze -uze -uze -uze -uze -nZR -uze -lps -nZR +uTr +maa +maa +maa +maa +eNY +umU +kjq +xyG +iEX +iEX +dOJ +iEX +iEX +iEX +gco +gEy pdu +lps +kvn +qQJ ucD usG -fOo +rXt xRj xRj xRj @@ -53942,24 +54705,24 @@ nAf jLq sCh uXz -oxc -uze -nZR -uze -uze -uze -uze -uze -uze -pdu -pdu -pdu -pdu -pdu -pdu -pdu -pdu -pdu +uTr +maa +bFR +maa +maa +eNY +lvV +kjq +kjq +kjq +kjq +kjq +kjq +kjq +kjq +iFj +eNY +qQJ pdu pdu pdu @@ -54140,21 +54903,21 @@ jEB sGq sGq sGq -sGq -sGq -sGq -sGq -sGq +uvU +eNY +dmy +thM +bPV nBz -oxc +bPV thM -oxc -oxc -oxc -oxc -oxc -ucD -ucD +bPV +aWP +kjq +vhq +eNY +syE +uze ucD ucD ucD @@ -54330,25 +55093,25 @@ nAf gJc sCh cSo -oxc -oxc -oxc -oxc -oxc -oxc -yjC -oxc -oxc -lmG -oxc -uze -uze -uze +uTr +uTr +uTr +maa +uOZ eNY eNY eNY -ucD -ucD +eNY +eNY +eNY +eNY +eNY +eNY +rVX +kjq +eNY +eNY +ndh ucD ucD xRj @@ -54524,25 +55287,25 @@ gAA jFy fVc hYM -oxc -uze -uze -uze -uze -uze -uze -uze -uze -lmG -oxc -fLD -uze -uze -uzz -kjq +uTr +qZT +maa +maa +cTq +cSU +cSU +cSU +cSU +uvU +maa +tme eNY +oKZ +fge +kjq +uzz cOc -xRj +vaR xRj xRj jNg @@ -54718,25 +55481,25 @@ ixz uZh sCh ptG -rCH -rCH -rCH -rCH -rCH -rCH -rCH -rCH -uze -lmG -oxc -oxc -oxc -eUo -kiD -jkS +uTr +bFR +maa +maa +maa +maa +maa +maa +maa +oNa +maa +maa eNY +eUo +fge +kjq +gWh cOc -xRj +vaR xRj xRj jNg @@ -54913,24 +55676,24 @@ sEj kos nkw rCH -xch -dRe -aNE -mPJ -fkF -wwB rCH -eza -lmG -oxc -ckq -uze -uze -fge -cLM +rCH +rCH +rCH +rCH +rCH +rCH +lKv +oNa +maa +maa eNY +oKZ +fge +kjq +gWh cOc -xRj +vaR xRj xRj jNg @@ -55106,25 +55869,25 @@ nAf jLq mho hTf -oeW -mGw -tsX -aHc -ebJ -khl -myg rCH -uze -lmG -oxc -eza -uze -uze +xch +dRe +aNE +mPJ +fkF +wwB +rCH +maa +oNa +maa +maa eNY eNY -cOc -cOc -xRj +jNp +kjq +qcD +uoW +vaR xRj xRj jNg @@ -55301,24 +56064,24 @@ jLq owF mjz oeW -iVV +mGw tsX -rci -cYG -ftM -sQe +aHc +ebJ +khl +myg rCH -uze -lmG +maa +jCV jpl -pdu -pdu -pdu -eNY -cOc -cOc -jNg -xRj +ibD +ibD +cnZ +eJs +kjq +kjq +kjq +vaR xRj xRj jNg @@ -55492,30 +56255,30 @@ bNR cTV nAf jLq -ubW -cxt +cSZ +cLM oeW -noZ -tsX -tsX +iVV tsX -kEB -oIm +rci +cYG +ftM +sQe rCH -uze -lmG -oxc +maa +oNa +uTr eRi tUt -uze -ucD -pOh +eNY +dkl +kjq +qNt +kjq +vaR xRj jNg jNg -jNg -jNg -jNg xRj xRj xRj @@ -55686,28 +56449,28 @@ hEF ctY nAf jLq -fvo -qrz -rXv -iXB -wSw -wSw -rFk -lHa -ehT +ubW +cxt +oeW +noZ +tsX +tsX +tsX +kEB +oIm rCH -oxc +uTr sEV -oxc -oxc -oxc -oxc -ucD -ris -jNg -jNg -jNg -jNg +ogT +ogT +ogT +eNY +bwa +ggi +eNY +csD +lZv +nSy jNg jNg xRj @@ -55880,27 +56643,27 @@ pgF opC nAf jLq -rCE -ofq -oeW -vuK -tsX -tsX -tsX -kEB -msB +fvo +qrz +rXv +iXB +wSw +wSw +rFk +lHa +ehT rCH maa oNa maa qZT maa -maa -ris -ris -dYk -jNg -jNg +ndh +ndh +ndh +ndh +ndh +ndh jNg jNg jNg @@ -56075,14 +56838,14 @@ wZQ nAf jLq xHM -lSz +ofq oeW -tui +vuK tsX -maZ -lNo -xpQ -dHq +tsX +tsX +kEB +msB rCH maa gTk @@ -56092,10 +56855,10 @@ maa ris ris ris -xRj -xRj -xRj -xRj +jNg +jNg +jvg +jNg xRj xRj xRj @@ -56245,7 +57008,7 @@ maa maa maa dIE -pGO +mWh job job job @@ -56271,12 +57034,12 @@ jLq qkG lSz oeW -luN +tui tsX -aHc -emV -mRT -nbm +maZ +lNo +xpQ +dHq rCH teS abN @@ -56444,7 +57207,7 @@ job job iQS iQS -rln +iQS dIE cEb hYO @@ -56464,13 +57227,13 @@ nAf jLq xHM aEk -rCH -xxb -byr -hdt -qzG -tnA -mnd +oeW +luN +tsX +aHc +emV +mRT +nbm rCH maa abN @@ -56644,27 +57407,27 @@ cEb 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 aoR -huP -rCH -rCH -rCH -rCH -rCH rCH +xxb +byr +hdt +qzG +tnA +mnd rCH maa abN @@ -56827,12 +57590,12 @@ byt maa maa dIE -pGO +ltO job job iQS iQS -esr +kim vdw cEb hAP @@ -56852,14 +57615,14 @@ uTr gJc rCE ykX -uTr -maa -maa -maa -liT -maa -maa -maa +huP +rCH +rCH +rCH +rCH +rCH +rCH +rCH maa abN xAC @@ -57050,7 +57813,7 @@ uTr maa maa maa -maa +liT maa byt byt @@ -60729,7 +61492,7 @@ tuO uJk oWx tvd -xpv +sJt uTr uTr uTr diff --git a/maps/endeavour/levels/deck2.dmm b/maps/endeavour/levels/deck2.dmm index e718bceaa4d9..66ce3ffe8589 100644 --- a/maps/endeavour/levels/deck2.dmm +++ b/maps/endeavour/levels/deck2.dmm @@ -59,8 +59,7 @@ dir = 1 }, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/wood, /area/medical/medbay4) @@ -647,6 +646,7 @@ opacity = 0 }, /obj/spawner/window/low_wall/reinforced/full, +/obj/effect/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "avE" = ( @@ -811,8 +811,7 @@ /area/medical/psych_ward) "aBx" = ( /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /obj/structure/catwalk, /turf/simulated/floor/plating, @@ -858,6 +857,7 @@ opacity = 0 }, /obj/spawner/window/low_wall/reinforced/full, +/obj/effect/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "aDx" = ( @@ -884,6 +884,12 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) +"aEp" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2portafthall) "aEO" = ( /obj/machinery/door/window/brigdoor/northright{ name = "Containment Pen"; @@ -1102,8 +1108,7 @@ /area/endeavour/hallway/d1starboardafthall) "aKy" = ( /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/rnd/research/researchdivision) @@ -1244,8 +1249,7 @@ }, /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled/white, /area/medical/patient_d) @@ -1331,9 +1335,11 @@ /area/rnd/workshop) "aUs" = ( /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/map_helper/electrochromatic_linker{ - id = "research-outer" +/obj/machinery/door/blast/shutters{ + id = "rndshutters"; + name = "Research Shutters" }, +/obj/effect/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/reception_desk) "aUR" = ( @@ -1381,21 +1387,15 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "aXe" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 - }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/machinery/door/firedoor{ + dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/map_helper/access_helper/airlock/station/science/research_lab, +/obj/machinery/door/airlock/research{ + name = "Research Lab" }, -/obj/machinery/computer/timeclock/premade/north, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portafthall) +/area/rnd/reception_desk) "aXm" = ( /obj/fiftyspawner/glass, /turf/simulated/floor/plating, @@ -1436,8 +1436,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2afthall) @@ -1879,8 +1878,7 @@ /area/rnd/xenobiology/xenoflora) "bmb" = ( /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -2012,6 +2010,7 @@ "btU" = ( /obj/machinery/door/firedoor, /obj/spawner/window/low_wall/reinforced/full, +/obj/effect/paint/babyblue, /turf/simulated/floor/plating, /area/shuttle/emt/general) "buE" = ( @@ -2107,7 +2106,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, /turf/simulated/floor/tiled/dark, /area/rnd/research/researchdivision) "bzR" = ( @@ -2126,8 +2128,7 @@ /area/holodeck_control) "bzV" = ( /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/carpet/purcarpet, /area/rnd/breakroom) @@ -2152,7 +2153,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/dark, -/area/maintenance/medbay/aft) +/area/medical/surgeryobs) "bAI" = ( /obj/effect/floor_decal/corner/paleblue, /obj/effect/floor_decal/corner/paleblue/border{ @@ -2242,6 +2243,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/workshop) "bCK" = ( @@ -2442,6 +2446,9 @@ /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/wood, /area/medical/oncall_room) +"bGv" = ( +/turf/simulated/wall/prepainted/medical, +/area/medical/surgeryobs) "bGx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2727,6 +2734,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/structure/sign/department/robo{ + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "bNQ" = ( @@ -2774,7 +2784,7 @@ "bPx" = ( /obj/structure/bed/chair, /turf/simulated/floor/tiled/dark, -/area/maintenance/medbay/aft) +/area/medical/surgeryobs) "bPE" = ( /obj/structure/closet/hydrant{ pixel_y = 32 @@ -3456,9 +3466,9 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "cja" = ( -/obj/structure/sign/department/sci, -/turf/simulated/wall/prepainted/science, -/area/rnd/research/researchdivision) +/obj/machinery/computer/timeclock/premade/north, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2portafthall) "cje" = ( /obj/effect/floor_decal/borderfloorblack, /turf/simulated/floor/tiled/dark, @@ -3571,8 +3581,7 @@ /area/rnd/storage) "cmn" = ( /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /obj/machinery/computer/timeclock/premade/north, /obj/effect/floor_decal/borderfloorblack{ @@ -3817,8 +3826,7 @@ }, /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled/white, /area/medical/patient_b) @@ -3940,6 +3948,9 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 9 }, +/obj/structure/sign/department/morgue{ + pixel_y = -30 + }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) "cwT" = ( @@ -3981,8 +3992,7 @@ }, /obj/structure/bed/chair, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled/white, /area/medical/virology_fore_access) @@ -4260,8 +4270,7 @@ /area/medical/medbay4) "cGc" = ( /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) @@ -4325,12 +4334,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/floor_decal/borderfloorblack/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/navblue/bordercorner{ - dir = 4 - }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) @@ -4352,11 +4355,10 @@ dir = 5 }, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/maintenance/medbay/aft) +/area/medical/surgeryobs) "cKJ" = ( /obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -4443,10 +4445,10 @@ /turf/simulated/floor/tiled/white, /area/medical/exam_room/exam_1) "cNs" = ( -/obj/machinery/light{ - dir = 1 +/obj/structure/table/reinforced, +/obj/structure/flora/pottedplant/overgrown{ + pixel_y = 13 }, -/obj/machinery/disposal, /turf/simulated/floor/tiled/dark, /area/rnd/research/researchdivision) "cNK" = ( @@ -4459,6 +4461,7 @@ opacity = 0 }, /obj/spawner/window/low_wall/reinforced/full, +/obj/effect/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "cNW" = ( @@ -4522,10 +4525,11 @@ /area/medical/medbay4) "cPx" = ( /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 + }, +/obj/structure/bed/chair/sofa/purp/left{ + dir = 4 }, -/obj/structure/table/rack/shelf, /turf/simulated/floor/tiled/dark, /area/rnd/research/researchdivision) "cQu" = ( @@ -4973,8 +4977,7 @@ "dic" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /obj/structure/bed/padded, /obj/item/bedsheet/medical, @@ -5052,6 +5055,7 @@ name = "Containment Blast Doors"; opacity = 0 }, +/obj/effect/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "dlw" = ( @@ -5088,6 +5092,7 @@ dir = 8 }, /obj/spawner/window/low_wall/reinforced/full, +/obj/effect/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora/lab_atmos) "dni" = ( @@ -5208,6 +5213,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "dqJ" = ( @@ -5476,8 +5485,7 @@ "dzg" = ( /obj/structure/closet/crate/biohazard, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled, /area/medical/surgery) @@ -6191,7 +6199,7 @@ dir = 9 }, /turf/simulated/floor/tiled/dark, -/area/maintenance/medbay/aft) +/area/medical/surgeryobs) "dWP" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -6233,6 +6241,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "dXU" = ( @@ -6255,8 +6272,7 @@ dir = 4 }, /obj/machinery/door/window/westleft{ - name = "Chemistry Reception Desk"; - req_one_access = list(5) + name = "Chemistry Reception Desk" }, /obj/machinery/door/blast/shutters{ dir = 8; @@ -6285,8 +6301,7 @@ /area/rnd/anomaly_lab) "dYQ" = ( /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -6382,8 +6397,7 @@ /obj/item/reagent_containers/dropper, /obj/item/hand_labeler, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -6543,9 +6557,15 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora/lab_atmos) "efa" = ( -/obj/structure/sign/department/chem, -/turf/simulated/wall/prepainted/medical, -/area/medical/chemistry) +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/rnd/research/researchdivision) "efb" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -6647,8 +6667,7 @@ "egX" = ( /obj/structure/table/woodentable, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/wood, /area/crew_quarters/medbreak) @@ -6664,8 +6683,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) @@ -6788,6 +6806,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "ejy" = ( @@ -7041,18 +7061,11 @@ /turf/simulated/floor/plating, /area/maintenance/medbay/aft) "esy" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 9 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 9 - }, -/obj/machinery/light{ - dir = 8; - light_range = 12 +/obj/machinery/vending/nifsoft_shop{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portafthall) +/turf/simulated/floor/tiled/dark, +/area/rnd/research/researchdivision) "etB" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/structure/disposalpipe/segment{ @@ -7071,16 +7084,6 @@ /obj/structure/flora/pottedplant/stoutbush, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) -"eub" = ( -/obj/machinery/door/firedoor, -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) "ewY" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 6 @@ -7334,6 +7337,7 @@ opacity = 0 }, /obj/spawner/window/low_wall/reinforced/full, +/obj/effect/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "eEX" = ( @@ -7594,8 +7598,7 @@ "eOr" = ( /obj/machinery/media/jukebox, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -8205,8 +8208,7 @@ req_one_access = list(30,35,47,77) }, /obj/machinery/light{ - dir = 4; - pixel_x = 10 + dir = 4 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -8445,6 +8447,7 @@ opacity = 0 }, /obj/spawner/window/low_wall/reinforced/full, +/obj/effect/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "fqm" = ( @@ -8525,10 +8528,6 @@ }, /turf/simulated/floor/tiled/dark, /area/assembly/robotics/surgery) -"fsC" = ( -/obj/structure/sign/department/rnd, -/turf/simulated/wall/prepainted/science, -/area/rnd/reception_desk) "fsM" = ( /obj/machinery/door/firedoor{ dir = 1 @@ -8687,6 +8686,7 @@ name = "Containment Blast Doors"; opacity = 0 }, +/obj/effect/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "fAD" = ( @@ -8969,6 +8969,9 @@ /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, /obj/machinery/door/airlock/glass, +/obj/structure/sign/greencross{ + pixel_y = -30 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "fIE" = ( @@ -9260,6 +9263,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) "fOZ" = ( @@ -9359,8 +9365,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) @@ -10008,7 +10013,7 @@ /area/rnd/xenobiology) "goI" = ( /turf/simulated/floor/tiled/dark, -/area/maintenance/medbay/aft) +/area/medical/surgeryobs) "goZ" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -10028,24 +10033,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/medical/medbay4) -"gpS" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 8 - }, -/obj/machinery/button/remote/blast_door{ - id = "rndshutters"; - name = "Research Shutter control"; - pixel_y = -22; - pixel_x = -26 - }, -/turf/simulated/floor/tiled/steel_grid, -/area/rnd/research/researchdivision) "gqb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -10155,7 +10142,7 @@ name = "Research Shutters" }, /turf/simulated/floor/tiled, -/area/rnd/research/researchdivision) +/area/rnd/reception_desk) "gtd" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -10238,8 +10225,7 @@ /obj/item/storage/box/syringes, /obj/item/gun/launcher/syringe, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/wood, /area/medical/medbay4) @@ -10416,7 +10402,9 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay4) "gBH" = ( -/obj/structure/table/rack/shelf, +/obj/structure/bed/chair/sofa/purp{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/rnd/research/researchdivision) "gBJ" = ( @@ -10700,17 +10688,17 @@ /area/crew_quarters/medbreak) "gKZ" = ( /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/assembly/chargebay) "gLF" = ( -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_y = -37 +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/map_helper/electrochromatic_linker{ + id = "research-inner" }, -/obj/machinery/vending/coffee, -/turf/simulated/floor/tiled/dark, +/obj/effect/paint/purplegray, +/turf/simulated/floor/plating, /area/rnd/research/researchdivision) "gLH" = ( /obj/effect/floor_decal/corner_techfloor_grid{ @@ -10719,16 +10707,9 @@ /turf/simulated/floor/tiled/techfloor, /area/endeavour/hallway/d2afthall) "gMk" = ( -/obj/machinery/door/firedoor/glass{ - dir = 4 - }, -/obj/machinery/door/airlock/research{ - id_tag = "researchdoor"; - name = "R&D Distribution Area" - }, -/obj/map_helper/access_helper/airlock/station/exploration/auxillerysci, -/turf/simulated/floor/tiled/dark, -/area/rnd/research/researchdivision) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/workshop) "gMn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -10955,15 +10936,16 @@ }, /area/rnd/rdoffice) "gSa" = ( -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 }, -/obj/effect/floor_decal/borderfloorblack/corner{ - dir = 1 +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 }, -/obj/effect/floor_decal/corner/navgold/bordercorner{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "gSb" = ( @@ -11041,15 +11023,15 @@ /turf/simulated/wall/prepainted/medical, /area/maintenance/research) "gWJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/floor_decal/borderfloorwhite/corner{ dir = 4 }, /obj/effect/floor_decal/corner/paleblue/bordercorner{ dir = 4 }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) "gWK" = ( @@ -11212,6 +11194,7 @@ opacity = 0 }, /obj/spawner/window/low_wall/reinforced/full, +/obj/effect/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "hdr" = ( @@ -11226,6 +11209,7 @@ dir = 8 }, /obj/spawner/window/low_wall/reinforced/full, +/obj/effect/paint/babyblue, /turf/simulated/floor/plating, /area/shuttle/emt/cockpit) "heh" = ( @@ -11455,8 +11439,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /obj/machinery/camera/network/research{ dir = 4; @@ -11472,8 +11455,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/hallway) @@ -11801,8 +11783,7 @@ "hqs" = ( /obj/machinery/camera/network/medbay, /obj/machinery/light{ - dir = 1; - pixel_y = 20 + dir = 1 }, /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -11824,14 +11805,6 @@ }, /turf/simulated/floor/plating, /area/endeavour/hallway/d2aftmaint) -"hqT" = ( -/obj/machinery/door/firedoor{ - dir = 1 - }, -/obj/machinery/door/airlock/maintenance/common, -/obj/map_helper/access_helper/airlock/station/science/department, -/turf/simulated/floor/plating, -/area/maintenance/medbay/aft) "hrJ" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -11856,8 +11829,7 @@ /area/medical/psych_ward) "hsu" = ( /obj/machinery/light{ - dir = 4; - pixel_x = 10 + dir = 4 }, /obj/effect/floor_decal/corner_techfloor_grid{ dir = 9 @@ -11866,12 +11838,6 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/cafeteria) -"hsE" = ( -/obj/map_helper/electrochromatic_linker{ - id = "robotics-outer" - }, -/turf/space/basic, -/area/space) "hui" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 1 @@ -12459,14 +12425,6 @@ }, /turf/simulated/floor/tiled, /area/medical/virology) -"hLz" = ( -/obj/machinery/button/windowtint{ - id = "robotics-outer"; - pixel_x = -22; - pixel_y = 32 - }, -/turf/space/basic, -/area/space) "hLV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -13275,12 +13233,6 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "ioT" = ( @@ -13407,7 +13359,7 @@ pixel_y = 22 }, /turf/simulated/floor/tiled/dark, -/area/maintenance/medbay/aft) +/area/medical/surgeryobs) "iuJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -13998,6 +13950,7 @@ name = "Containment Blast Doors"; opacity = 0 }, +/obj/effect/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "iNI" = ( @@ -14189,14 +14142,8 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, /obj/structure/bed/chair/office/dark, -/obj/machinery/button/remote/blast_door{ - id = "rndhallshutters"; - name = "Research Hall Shutters control"; - pixel_y = -22; - pixel_x = -26 - }, /turf/simulated/floor/tiled/steel_grid, -/area/endeavour/hallway/d2portafthall) +/area/rnd/reception_desk) "iUD" = ( /obj/structure/closet/secure_closet/RD, /obj/item/aicard, @@ -14577,9 +14524,16 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "jkz" = ( -/obj/structure/sign/greencross, -/turf/simulated/wall/prepainted/medical, -/area/medical/reception) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/structure/sign/department/chem{ + pixel_y = -30 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "jkG" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -14875,12 +14829,6 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "jtH" = ( -/obj/effect/floor_decal/borderfloorblack/corner{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/bordercorner{ - dir = 1 - }, /obj/structure/cable/orange{ icon_state = "4-8" }, @@ -14889,6 +14837,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/holopad, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "jue" = ( @@ -15200,8 +15149,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /obj/structure/cable/green{ icon_state = "1-2" @@ -15281,12 +15229,6 @@ /turf/simulated/floor/tiled, /area/rnd/research_foyer) "jGq" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 - }, /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, @@ -15349,6 +15291,11 @@ dir = 9 }, /obj/item/reagent_containers/glass/beaker, +/obj/machinery/button/remote/blast_door{ + id = "rndshutters"; + name = "Research Shutter control"; + pixel_y = 27 + }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/reception_desk) "jHE" = ( @@ -15403,8 +15350,7 @@ }, /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled/white, /area/medical/patient_c) @@ -15469,12 +15415,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/borderfloorblack/corner{ +/obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/effect/floor_decal/corner/navgold/bordercorner{ +/obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-4" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "jOJ" = ( @@ -15673,10 +15623,6 @@ "jUZ" = ( /turf/simulated/floor/wood, /area/endeavour/hallway/d2afthall) -"jVj" = ( -/obj/machinery/computer/arcade, -/turf/simulated/floor/carpet/bcarpet, -/area/endeavour/hallway/d2afthall) "jVn" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -15792,7 +15738,7 @@ /turf/simulated/wall/r_wall/prepainted/medical, /area/shuttle/emt/general) "jZz" = ( -/obj/structure/table/reinforced, +/obj/machinery/mech_recharger, /turf/simulated/floor/tiled/dark, /area/rnd/research/researchdivision) "jZM" = ( @@ -15924,14 +15870,23 @@ /turf/simulated/floor/plating, /area/medical/virologymaint) "keB" = ( -/obj/effect/floor_decal/borderfloorblack/corner, -/obj/effect/floor_decal/corner/navblue/bordercorner, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portafthall) +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/sign/warning/nosmoking_1{ + pixel_x = 28 + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay4) "keI" = ( /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -16018,7 +15973,6 @@ "kgb" = ( /obj/machinery/door/airlock/maintenance/common, /obj/structure/catwalk, -/obj/map_helper/access_helper/airlock/station/science/department, /turf/simulated/floor/plating, /area/maintenance/medbay/aft) "kgh" = ( @@ -16106,6 +16060,7 @@ /area/endeavour/hallway/d2portamidhall) "kjj" = ( /obj/structure/table/standard, +/obj/item/material/ashtray/glass, /turf/simulated/floor/tiled, /area/holodeck_control) "kjr" = ( @@ -16215,8 +16170,7 @@ /area/rnd/anomaly_lab) "kmH" = ( /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /obj/machinery/light_switch{ dir = 4; @@ -16800,8 +16754,7 @@ /area/endeavour/hallway/d1starboardforhall) "kKI" = ( /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/medical/oncall_room) @@ -16811,8 +16764,7 @@ }, /obj/effect/floor_decal/industrial/outline/blue, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /obj/structure/sign/greencross{ pixel_x = -32 @@ -16927,19 +16879,13 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "kOr" = ( -/obj/machinery/power/apc/west_mount{ - pixel_x = 0; - pixel_y = 22; - dir = 2 - }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 9 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 9 +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/structure/sign/greencross{ + pixel_y = -30 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) @@ -16961,8 +16907,7 @@ "kOH" = ( /obj/effect/floor_decal/corner_techfloor_grid/full, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/endeavour/hallway/d2afthall) @@ -16974,8 +16919,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) @@ -17566,7 +17510,7 @@ "lfu" = ( /obj/structure/flora/pottedplant/stoutbush, /turf/simulated/floor/tiled/dark, -/area/maintenance/medbay/aft) +/area/medical/surgeryobs) "lfy" = ( /obj/structure/table/steel_reinforced, /obj/item/reagent_containers/spray/cleaner{ @@ -17676,8 +17620,7 @@ /area/medical/medbay4) "lkW" = ( /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/plating, /area/medical/surgery_storage) @@ -18236,10 +18179,6 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/light{ - dir = 8; - pixel_x = -10 - }, /turf/simulated/floor/tiled, /area/rnd/research_foyer) "lCS" = ( @@ -18830,8 +18769,7 @@ /area/hallway/station/docks) "mcL" = ( /obj/machinery/light{ - dir = 4; - pixel_x = 10 + dir = 4 }, /obj/effect/floor_decal/corner_techfloor_grid{ dir = 9 @@ -18947,6 +18885,12 @@ dir = 1 }, /obj/machinery/door/airlock/glass, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "mgH" = ( @@ -19208,8 +19152,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -19417,8 +19360,7 @@ "mxO" = ( /obj/machinery/recharge_station, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/medical_restroom) @@ -19455,8 +19397,7 @@ pixel_x = -22 }, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/dark, @@ -19535,6 +19476,7 @@ /obj/map_helper/electrochromatic_linker{ id = "robotics-outer" }, +/obj/effect/paint/purplegray, /turf/simulated/floor/plating, /area/assembly/robotics) "mBc" = ( @@ -19654,6 +19596,7 @@ opacity = 0 }, /obj/spawner/window/low_wall/reinforced/full, +/obj/effect/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "mFC" = ( @@ -19790,7 +19733,7 @@ }, /obj/map_helper/access_helper/airlock/station/medical/department, /turf/simulated/floor/tiled/dark, -/area/maintenance/medbay/aft) +/area/medical/surgeryobs) "mJO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light_switch{ @@ -19842,8 +19785,7 @@ /obj/effect/floor_decal/borderfloorwhite/corner2, /obj/effect/floor_decal/corner/lightorange/bordercorner2, /obj/machinery/light{ - dir = 4; - pixel_x = 10 + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/chemistry) @@ -19854,8 +19796,7 @@ /area/medical/patient_wing) "mLf" = ( /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /obj/structure/toilet{ dir = 4 @@ -19964,8 +19905,7 @@ icon_state = "1-2" }, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) @@ -20241,9 +20181,6 @@ }, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/green{ @@ -20277,8 +20214,7 @@ /area/medical/medbay4) "mZc" = ( /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/plating, /area/maintenance/medbay/aft) @@ -20447,8 +20383,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) @@ -20486,6 +20421,7 @@ opacity = 0 }, /obj/spawner/window/low_wall/reinforced/full, +/obj/effect/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "neQ" = ( @@ -20591,8 +20527,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/endeavour/hallway/d2afthall) @@ -20709,8 +20644,7 @@ /area/endeavour/hallway/d1starboardamidhall) "nok" = ( /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /obj/machinery/suit_cycler/medical, /obj/effect/floor_decal/corner/paleblue{ @@ -21029,8 +20963,7 @@ /area/medical/psych_ward) "nzY" = ( /obj/machinery/light{ - dir = 4; - pixel_x = 10 + dir = 4 }, /obj/structure/cable{ icon_state = "1-2" @@ -21108,6 +21041,7 @@ dir = 8 }, /obj/spawner/window/low_wall/reinforced/full, +/obj/effect/paint/babyblue, /turf/simulated/floor/plating, /area/shuttle/emt/general) "nBC" = ( @@ -21135,15 +21069,9 @@ /turf/simulated/floor/wood, /area/rnd/breakroom) "nBV" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorblack, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portafthall) +/obj/machinery/vending/coffee, +/turf/simulated/floor/tiled/dark, +/area/rnd/research/researchdivision) "nCo" = ( /obj/effect/floor_decal/borderfloorblack/corner{ dir = 4 @@ -21356,7 +21284,7 @@ icon_state = "0-4" }, /turf/simulated/floor/tiled/dark, -/area/maintenance/medbay/aft) +/area/medical/surgeryobs) "nKm" = ( /obj/structure/window/reinforced{ dir = 1 @@ -21626,7 +21554,7 @@ dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/maintenance/medbay/aft) +/area/medical/surgeryobs) "nPr" = ( /obj/machinery/door/firedoor/glass, /obj/map_helper/access_helper/airlock/station/medical/department, @@ -21966,8 +21894,7 @@ }, /obj/machinery/power/apc/north_mount, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/assembly/chargebay) @@ -22107,14 +22034,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology) -"ojU" = ( -/obj/machinery/button/windowtint{ - id = "robotics-inner"; - pixel_x = -22; - pixel_y = 24 - }, -/turf/space/basic, -/area/space) "ojY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -22248,6 +22167,7 @@ name = "Containment Blast Doors"; opacity = 0 }, +/obj/effect/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "omt" = ( @@ -22500,9 +22420,12 @@ /area/rnd/robotics/morgue) "owo" = ( /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, -/obj/map_helper/electrochromatic_linker{ - id = "research-inner" +/obj/machinery/door/blast/shutters{ + dir = 8; + id = "rndshutters"; + name = "Research Shutters" }, +/obj/effect/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/reception_desk) "owE" = ( @@ -22613,8 +22536,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /obj/machinery/door/firedoor{ dir = 8 @@ -22716,8 +22638,7 @@ /area/endeavour/hallway/d1starboardafthall) "oEw" = ( /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/medical_restroom) @@ -22745,16 +22666,15 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/station/docks) "oFP" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor, /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, /obj/effect/floor_decal/corner/navgold/border{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "oFZ" = ( @@ -22889,8 +22809,7 @@ }, /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled/white, /area/medical/patient_a) @@ -23272,8 +23191,7 @@ /area/medical/resleeving) "oUf" = ( /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /obj/structure/cable{ icon_state = "1-2" @@ -23351,6 +23269,11 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, +/obj/item/paper_bin{ + pixel_x = -1; + pixel_y = 4 + }, +/obj/item/pen, /turf/simulated/floor/tiled/steel_grid, /area/rnd/reception_desk) "oXk" = ( @@ -23452,8 +23375,7 @@ }, /obj/machinery/air_alarm/north_mount, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/plating, /area/maintenance/substation/medical_science) @@ -23496,6 +23418,7 @@ name = "Containment Blast Doors"; opacity = 0 }, +/obj/effect/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "oZA" = ( @@ -23773,8 +23696,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled/white, /area/medical/virology_fore_access) @@ -23999,7 +23921,7 @@ /obj/item/paper_bin, /obj/item/pen, /turf/simulated/floor/tiled/dark, -/area/maintenance/medbay/aft) +/area/medical/surgeryobs) "plL" = ( /obj/machinery/door/airlock/glass, /obj/machinery/door/firedoor, @@ -24116,8 +24038,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/hallway) @@ -24169,6 +24090,13 @@ }, /turf/space, /area/space) +"ppZ" = ( +/obj/structure/table/glass, +/obj/machinery/photocopier/faxmachine{ + department = "Research Break Room" + }, +/turf/simulated/floor/carpet/purcarpet, +/area/rnd/breakroom) "pqy" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -24394,7 +24322,7 @@ pixel_y = 28 }, /turf/simulated/floor/tiled/dark, -/area/maintenance/medbay/aft) +/area/medical/surgeryobs) "pxV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 8 @@ -24413,6 +24341,9 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, +/obj/structure/sign/greencross{ + pixel_y = -30 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "pyK" = ( @@ -24577,6 +24508,7 @@ /area/endeavour/hallway/d2portamidhall) "pCA" = ( /obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) "pCH" = ( @@ -24692,13 +24624,18 @@ /turf/simulated/floor/wood, /area/medical/medbay4) "pFp" = ( -/obj/machinery/holopad, /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 = 8 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "pFq" = ( @@ -24824,8 +24761,11 @@ /turf/simulated/floor/plating, /area/maintenance/substation/research) "pIz" = ( -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portafthall) +/obj/structure/bed/chair/sofa/purp/right{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/rnd/research/researchdivision) "pIE" = ( /obj/structure/sign/department/operational{ pixel_y = -30 @@ -24935,8 +24875,7 @@ network = list("Xenobiology") }, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -25073,8 +25012,7 @@ icon_state = "1-2" }, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) @@ -25367,8 +25305,7 @@ dir = 5 }, /obj/machinery/light{ - dir = 4; - pixel_x = 10 + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/chemistry) @@ -25512,8 +25449,7 @@ network = list("Xenobiology") }, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora/lab_atmos) @@ -25717,6 +25653,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) "qiy" = ( @@ -27220,6 +27159,7 @@ name = "Containment Blast Doors"; opacity = 0 }, +/obj/effect/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "rbh" = ( @@ -27278,16 +27218,6 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 8 }, -/obj/machinery/button/windowtint{ - id = "research-outer"; - pixel_x = -22; - pixel_y = -32 - }, -/obj/machinery/button/windowtint{ - id = "research-inner"; - pixel_x = -22; - pixel_y = -23 - }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/reception_desk) "rbX" = ( @@ -27901,8 +27831,7 @@ pixel_y = 22 }, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled, /area/holodeck_control) @@ -28320,8 +28249,7 @@ /area/medical/medbay4) "rMu" = ( /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) @@ -28470,8 +28398,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, @@ -28533,6 +28460,7 @@ /obj/map_helper/electrochromatic_linker{ id = "robotics-inner" }, +/obj/effect/paint/purplegray, /turf/simulated/floor/plating, /area/assembly/robotics) "rUa" = ( @@ -28812,6 +28740,7 @@ /obj/map_helper/electrochromatic_linker{ id = "robotics-inner" }, +/obj/effect/paint/purplegray, /turf/simulated/floor/plating, /area/assembly/robotics) "sdA" = ( @@ -28823,10 +28752,10 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 10 }, +/obj/machinery/light, /obj/machinery/newscaster{ - pixel_y = -31 + pixel_x = -29 }, -/obj/machinery/light, /turf/simulated/floor/tiled/steel_grid, /area/rnd/reception_desk) "seE" = ( @@ -28905,7 +28834,7 @@ dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/maintenance/medbay/aft) +/area/medical/surgeryobs) "sha" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -29040,23 +28969,13 @@ icon_state = "1-2" }, /obj/machinery/light{ - dir = 4; - pixel_x = 10 + dir = 4 }, /obj/effect/floor_decal/corner_techfloor_grid{ dir = 9 }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/cafeteria) -"sme" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 10 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portafthall) "smf" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -29103,8 +29022,7 @@ /obj/structure/table/standard, /obj/item/paicard, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled, /area/holodeck_control) @@ -29115,8 +29033,7 @@ dir = 9 }, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) @@ -29417,16 +29334,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) -"szG" = ( -/obj/machinery/door/firedoor, -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) "sAZ" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -29930,6 +29837,7 @@ opacity = 0 }, /obj/spawner/window/low_wall/reinforced/full, +/obj/effect/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "sRh" = ( @@ -29941,8 +29849,7 @@ "sRp" = ( /obj/machinery/camera/network/medbay, /obj/machinery/light{ - dir = 1; - pixel_y = 20 + dir = 1 }, /obj/structure/bed/chair/sofa/teal/left, /obj/effect/floor_decal/spline/fancy/wood{ @@ -29957,6 +29864,7 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 4 }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "sTi" = ( @@ -30016,6 +29924,7 @@ opacity = 0 }, /obj/spawner/window/low_wall/reinforced/full, +/obj/effect/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "sUJ" = ( @@ -30133,8 +30042,7 @@ "sXW" = ( /obj/structure/morgue, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) @@ -30562,13 +30470,13 @@ /turf/simulated/floor/tiled/white, /area/medical/sleeper) "tov" = ( -/obj/machinery/door/firedoor, /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, /obj/effect/floor_decal/corner/navblue/border{ dir = 8 }, +/obj/machinery/fire_alarm/west_mount, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "toD" = ( @@ -31170,6 +31078,7 @@ opacity = 0 }, /obj/spawner/window/low_wall/reinforced/full, +/obj/effect/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "tHr" = ( @@ -31301,11 +31210,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/door/airlock/research{ - id_tag = "researchdoor"; +/obj/machinery/door/airlock/glass/research{ name = "R&D Distribution Area" }, -/obj/map_helper/access_helper/airlock/station/exploration/auxillerysci, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "tLU" = ( @@ -31342,7 +31249,6 @@ /obj/structure/window/reinforced/tinted/frosted{ dir = 4 }, -/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techfloor, /area/endeavour/hallway/d2afthall) "tNe" = ( @@ -31413,6 +31319,7 @@ }, /obj/structure/disposalpipe/segment, /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/testingroom) "tOP" = ( @@ -31477,8 +31384,7 @@ pixel_x = -32 }, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled/white, /area/medical/virology_aft_access) @@ -31778,8 +31684,7 @@ /area/medical/surgery_storage) "uba" = ( /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/wall/prepainted/science, /area/maintenance/research) @@ -31973,7 +31878,7 @@ dir = 5 }, /turf/simulated/floor/tiled/dark, -/area/maintenance/medbay/aft) +/area/medical/surgeryobs) "uhS" = ( /obj/machinery/holopad, /obj/structure/cable/green{ @@ -32048,6 +31953,9 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/structure/sign/department/rnd{ + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "ukc" = ( @@ -32057,6 +31965,7 @@ name = "Testing Chamber Blast Door" }, /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/testingroom) "ukt" = ( @@ -32097,7 +32006,21 @@ /turf/simulated/floor/tiled, /area/medical/virology) "ulr" = ( -/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/structure/sign/department/sci{ + pixel_y = 32 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "umy" = ( @@ -32119,19 +32042,11 @@ /area/medical/medbay_primary_storage) "unJ" = ( /obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 - }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portafthall) +/obj/structure/table/reinforced, +/turf/simulated/floor/tiled/dark, +/area/rnd/research/researchdivision) "unU" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -32404,6 +32319,7 @@ opacity = 0 }, /obj/spawner/window/low_wall/reinforced/full, +/obj/effect/paint/purplegray, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "uxB" = ( @@ -33146,18 +33062,15 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "uVS" = ( -/obj/item/paper_bin{ - pixel_x = -1; - pixel_y = 4 - }, -/obj/structure/table/reinforced, -/obj/item/pen, /obj/effect/floor_decal/borderfloor{ dir = 8 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 8 }, +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/reception_desk) "uVY" = ( @@ -33287,15 +33200,12 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "vbt" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 8 +/obj/machinery/door/firedoor{ + dir = 1 }, -/obj/effect/floor_decal/borderfloorblack, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portafthall) +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/maintenance/medbay/aft) "vbA" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -33473,19 +33383,6 @@ /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/simulated/floor/tiled, /area/rnd/xenobiology) -"viQ" = ( -/obj/machinery/light{ - dir = 8; - pixel_x = -10 - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portamidhall) "vjT" = ( /obj/machinery/air_alarm{ dir = 1; @@ -33573,8 +33470,7 @@ volume_rate = 700 }, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) @@ -33825,11 +33721,20 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "vwz" = ( -/obj/map_helper/electrochromatic_linker{ - id = "robotics-inner" +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/space/basic, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/paleblue/border, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/medical/sleeper) "vwR" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ @@ -34006,12 +33911,13 @@ /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/research_foyer_auxiliary) "vFz" = ( -/obj/effect/floor_decal/borderfloorblack/corner{ +/obj/effect/floor_decal/borderfloorblack{ dir = 8 }, -/obj/effect/floor_decal/corner/navblue/bordercorner{ +/obj/effect/floor_decal/corner/navblue/border{ dir = 8 }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "vFG" = ( @@ -34299,12 +34205,10 @@ /obj/machinery/door/firedoor/glass{ dir = 4 }, -/obj/machinery/door/airlock/research{ - id_tag = "researchdoor"; +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/glass/research{ name = "R&D Distribution Area" }, -/obj/structure/disposalpipe/segment, -/obj/map_helper/access_helper/airlock/station/exploration/auxillerysci, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "vQu" = ( @@ -34400,8 +34304,7 @@ /area/medical/medbay_emt_bay) "vUI" = ( /obj/machinery/light{ - dir = 4; - pixel_x = 10 + dir = 4 }, /obj/structure/table/bench/steel, /obj/effect/floor_decal/borderfloorblack{ @@ -34663,8 +34566,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /obj/structure/cable/green{ icon_state = "1-2" @@ -35569,8 +35471,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/red, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /obj/effect/floor_decal/corner/green/border{ dir = 8 @@ -35674,7 +35575,7 @@ "wBY" = ( /obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, -/area/maintenance/medbay/aft) +/area/medical/surgeryobs) "wCh" = ( /obj/machinery/air_alarm{ dir = 8; @@ -35771,6 +35672,7 @@ /area/maintenance/research) "wDV" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/xenobiology) "wEl" = ( @@ -35959,6 +35861,7 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 4 }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "wLE" = ( @@ -36365,11 +36268,17 @@ /turf/simulated/floor/wood/sif/indoors, /area/medical/reception) "wWJ" = ( -/obj/structure/sign/warning/nosmoking_1{ - pixel_x = 8 +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/turf/simulated/wall/prepainted/medical, -/area/medical/psych/psych_2) +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) "wWO" = ( /obj/machinery/camera/network/civilian{ dir = 8 @@ -36442,6 +36351,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) "xaP" = ( @@ -36473,15 +36385,6 @@ /obj/landmark/spawnpoint/job/medical_doctor, /turf/simulated/floor/tiled/white, /area/medical/chemistry) -"xbt" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portafthall) "xbz" = ( /obj/structure/closet{ name = "spare clothes" @@ -36531,11 +36434,11 @@ req_one_access = list(47) }, /obj/machinery/door/blast/shutters{ - id = "rndhallshutters"; - name = "Research Hall Shutters" + id = "rndshutters"; + name = "Research Shutters" }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portafthall) +/area/rnd/reception_desk) "xcx" = ( /obj/structure/closet/secure_closet/medical2, /obj/effect/floor_decal/corner/paleblue{ @@ -36605,8 +36508,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) @@ -36631,8 +36533,7 @@ /area/maintenance/research) "xfy" = ( /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -36648,6 +36549,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) "xgg" = ( @@ -36811,6 +36715,10 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) "xlX" = ( @@ -37058,10 +36966,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, +/obj/structure/disposalpipe/junction, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "xtv" = ( @@ -37071,6 +36976,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/structure/table/woodentable, +/obj/item/material/ashtray/glass, /turf/simulated/floor/wood, /area/tether/station/public_meeting_room) "xtD" = ( @@ -37165,10 +37071,6 @@ /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/tiled/monotile, /area/rnd/breakroom) -"xwp" = ( -/obj/machinery/vending/fitness, -/turf/simulated/floor/tiled/dark, -/area/rnd/research/researchdivision) "xxn" = ( /obj/structure/window/reinforced/tinted{ dir = 1 @@ -37292,7 +37194,7 @@ dir = 1 }, /turf/simulated/floor/tiled/dark, -/area/maintenance/medbay/aft) +/area/medical/surgeryobs) "xCX" = ( /turf/simulated/floor/tiled, /area/rnd/rdoffice) @@ -37716,8 +37618,7 @@ "xMp" = ( /obj/machinery/vitals_monitor, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) @@ -37844,7 +37745,7 @@ dir = 6 }, /turf/simulated/floor/tiled/dark, -/area/maintenance/medbay/aft) +/area/medical/surgeryobs) "xQT" = ( /obj/structure/flora/pottedplant/large, /obj/effect/floor_decal/borderfloorblack{ @@ -44481,7 +44382,7 @@ pNX pNX pNX pNX -wWJ +pNX pNX gOV kBS @@ -45429,7 +45330,7 @@ qiH cNW cNW ymb -eZZ +uwU xIf xIf huY @@ -46026,7 +45927,7 @@ qpq qpq tvV oaU -jVj +sNK jbC xDZ jUZ @@ -46620,7 +46521,7 @@ aHb iRW kGz eRt -fUM +keB fUM mTV tQp @@ -47004,10 +46905,10 @@ gAf hTw bVW kxI -mmI -mmI -mmI -mmI +bGv +bGv +bGv +bGv nAR rUX tWY @@ -47198,7 +47099,7 @@ jER kfV xIj kxI -mmI +bGv iuo cJg bPx @@ -47392,7 +47293,7 @@ oaU tYf eHm kxI -mmI +bGv wBY uhO bPx @@ -47586,7 +47487,7 @@ eBA pkG eHm kxI -mmI +bGv goI xCP xQM @@ -47780,7 +47681,7 @@ pDc pDc whF vQx -mmI +bGv pwV goI lfu @@ -47974,7 +47875,7 @@ jcO neX dxN jjo -mmI +bGv goI sgW dWk @@ -48168,7 +48069,7 @@ qIz aKq exm nCR -mmI +bGv nJM uhO bPx @@ -48341,11 +48242,11 @@ twU kCt hjM pfe -iec -iec +qpq +qpq iec xHD -mSd +aEp uJM mSd nYN @@ -48362,7 +48263,7 @@ nYN efr wbG tJU -mmI +bGv bAe uhO bPx @@ -48533,11 +48434,11 @@ oCO nZC uUl kCt -iec +qpq itd -xHD -xHD -xHD +qpq +qpq +iec xHD mSd uJM @@ -48556,7 +48457,7 @@ fCb bHz wkU tJU -mmI +bGv bAe nPi plG @@ -48721,17 +48622,17 @@ aUW lUe bxz jZz -jZz +ilh cje oCO xFT pVT kCt +qpq +iec +iec iec iec -xHD -esy -xbt vbt mSd wSf @@ -48750,10 +48651,10 @@ sBd bHz jaG pIE -mmI +bGv mJc -mmI -mmI +bGv +bGv eEv eEv eEv @@ -48923,10 +48824,10 @@ bOa olh iec iec -hqT -qjz -pIz -ulr +qpq +vUa +qpq +xHD mSd uJM mSd @@ -49117,10 +49018,10 @@ bOa kCt qpq pJM +vUa +qpq +vUa xHD -qjz -keB -nBV mSd uJM mSd @@ -49312,8 +49213,8 @@ kCt kCt kCt kCt -gMk -gMk +kCt +kCt kCt cja uJM @@ -49497,7 +49398,7 @@ xIf xIf uPt cNs -jZz +efa cje oCO xFT @@ -49505,11 +49406,11 @@ pVT oQC cPx gBH -gBH -ilh -ilh +pIz +esy +nBV gLF -kCt +wWJ jGq hPe yly @@ -49702,9 +49603,9 @@ ilh ilh ilh ilh -xwp -kCt -unJ +gLF +qjz +qRh gUZ cva oaU @@ -49892,15 +49793,15 @@ jVn bOa bSu efb -efb -efb +unJ +unJ jZR jZR kCt -kCt -aXe -vFz -sme +ulr +qRh +gUZ +qIV oaU tMG kTB @@ -49910,7 +49811,7 @@ kxI xSl llq oaU -kOr +cBK jOk jPR elT @@ -50289,7 +50190,7 @@ cIi dyM xDm wLf -eub +ggw ggw ggw ljq @@ -50297,7 +50198,7 @@ hJq tkO jcO jcO -szG +jcO sSl nEU phe @@ -50473,9 +50374,9 @@ bBQ ijZ whu owo -owo gsB owo +aXe owo whu whu @@ -50496,7 +50397,7 @@ bmg kuE nwT fIx -jkz +juF ijd sNP fZx @@ -50668,7 +50569,7 @@ uQR whu jHB uVS -gpS +nOJ nOJ rbQ sdA @@ -51437,8 +51338,8 @@ ffI oWr nUG pCA -mmt -mmt +gMk +gMk xlI sQh whu @@ -51465,8 +51366,8 @@ xUb bhT cMY qmF -mdU -jkz +kOr +juF ngz iGC qHA @@ -51836,7 +51737,7 @@ whu owo owo whu -fsC +whu ujP nBm hGK @@ -52436,7 +52337,7 @@ jQR oWl bJO pyk -jkz +juF jUt iGC tmX @@ -52612,7 +52513,7 @@ aDx rTV scT aDx -bIW +aDx bNH nBm mOb @@ -52958,7 +52859,7 @@ mDp mDp mDp pRW -hsE +pRW pRW pRW pRW @@ -52978,9 +52879,9 @@ xIf xnR svR gZg -xJb +ppZ sxo -aTQ +xJb gZg xaR nBU @@ -53028,7 +52929,7 @@ whZ dxA uVY gWJ -ggO +vwz jAX gdj iJo @@ -53348,7 +53249,7 @@ mDp pRW pRW pRW -hLz +pRW pRW pRW pRW @@ -53405,8 +53306,8 @@ cHC oDd jsQ kyy -mdU -jkz +kOr +juF ebW ehP iGC @@ -53544,7 +53445,7 @@ pRW pRW pRW pRW -ojU +pRW pRW pRW pRW @@ -53739,7 +53640,7 @@ pRW pRW pRW pRW -vwz +pRW pRW pRW qBd @@ -53793,8 +53694,8 @@ cHC oDd mTD gij -mdU -efa +jkz +chv eUu jlY nDm @@ -55723,7 +55624,7 @@ sFQ dde bxp dde -viQ +eDX xRk wmA fmL diff --git a/maps/endeavour/levels/deck3.dmm b/maps/endeavour/levels/deck3.dmm index f073b80a0f73..ee560f0e0249 100644 --- a/maps/endeavour/levels/deck3.dmm +++ b/maps/endeavour/levels/deck3.dmm @@ -121,9 +121,17 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "aec" = ( -/obj/machinery/fire_alarm/east_mount, -/turf/simulated/floor/tiled/dark, -/area/endeavour/station/stairs_three) +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/endeavour/hallway/d3afthall) "agG" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -199,9 +207,17 @@ /turf/simulated/floor/tiled, /area/endeavour/station/stairs_three) "aiW" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/security/hallway) +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/machinery/button/remote/airlock{ + id = "DRAMATIC"; + name = "Blast Door Control"; + specialfunctions = 4; + pixel_y = 30 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entertainment) "ajk" = ( /obj/structure/closet/secure_closet/detective, /turf/simulated/floor/carpet, @@ -444,6 +460,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, +/obj/effect/paint/darkred, /turf/simulated/floor, /area/security/hallway) "auQ" = ( @@ -669,6 +686,9 @@ /area/crew_quarters/toilet) "aAV" = ( /obj/structure/closet/l3closet/janitor, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/janitor) "aBl" = ( @@ -968,7 +988,7 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "aMQ" = ( -/turf/simulated/wall/prepainted/civilian, +/turf/simulated/wall/prepainted, /area/crew_quarters/barrestroom) "aMW" = ( /obj/structure/cable/green{ @@ -1029,7 +1049,7 @@ dir = 1 }, /obj/machinery/fire_alarm/north_mount, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/security/lobby) "aOy" = ( /obj/structure/bed/chair/wood{ @@ -1446,6 +1466,7 @@ icon_state = "1-2" }, /obj/structure/cable/green, +/obj/effect/paint/darkred, /turf/simulated/floor, /area/security/hallway) "bee" = ( @@ -2162,7 +2183,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "bzE" = ( -/turf/simulated/wall/r_wall/prepainted/cargo, +/turf/simulated/wall/r_wall/prepainted, /area/crew_quarters/bar/lounge) "bzQ" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ @@ -2280,6 +2301,7 @@ /area/maintenance/dormitory) "bDw" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/brig) "bDG" = ( @@ -2732,7 +2754,8 @@ /area/endeavour/station/stairs_three) "bXD" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/structure/curtain/black, +/obj/effect/paint/palebottlegreen, +/obj/structure/curtain/open/black, /turf/simulated/floor/plating, /area/endeavour/surfacebase/bar_backroom) "bXV" = ( @@ -3248,10 +3271,7 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/security/lobby) "cxF" = ( /obj/structure/cable{ @@ -3404,6 +3424,13 @@ }, /turf/simulated/floor/tiled, /area/security/hanger) +"cDv" = ( +/obj/machinery/station_map{ + dir = 4; + pixel_x = -32 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/foyer) "cEz" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -3431,7 +3458,7 @@ /area/endeavour/hallway/d3aftmaint) "cFD" = ( /obj/machinery/holopad, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled/monodark, /area/prison/cell_block) "cFR" = ( /obj/structure/bed/chair/sofa/right, @@ -3520,7 +3547,7 @@ /turf/simulated/floor/plating, /area/maintenance/substation/civilian) "cHy" = ( -/turf/simulated/wall/prepainted/cargo, +/turf/simulated/wall/prepainted, /area/crew_quarters/game_room) "cHK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -3897,7 +3924,7 @@ /area/security/warden) "cVn" = ( /obj/structure/reagent_dispensers/water_cooler/full, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled/monodark, /area/prison/cell_block) "cVu" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, @@ -3907,6 +3934,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/warden) "cVy" = ( @@ -4882,10 +4910,10 @@ /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "dBF" = ( -/obj/machinery/door/airlock/civilian{ - name = "Reading Room 1" - }, /obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + name = "Bar Lounge 1" + }, /turf/simulated/floor/wood, /area/crew_quarters/bar/lounge) "dBL" = ( @@ -5041,8 +5069,7 @@ /area/crew_quarters/kitchen) "dJV" = ( /obj/machinery/light{ - dir = 1; - pixel_y = 20 + dir = 1 }, /obj/structure/cable/green{ icon_state = "4-8" @@ -5358,6 +5385,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/paint/darkred, /turf/simulated/floor, /area/security/hallway) "dSJ" = ( @@ -5703,6 +5731,7 @@ /obj/structure/table/gamblingtable, /obj/effect/floor_decal/spline/fancy/wood, /obj/item/dice, +/obj/item/material/ashtray/glass, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/game_room) "ecO" = ( @@ -6323,29 +6352,14 @@ /turf/simulated/floor/wood, /area/security/breakroom) "ewr" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = 21 +/obj/machinery/light{ + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d3afthall) "ewu" = ( /turf/simulated/wall/r_wall/prepainted, /area/crew_quarters/recreation_area) -"eww" = ( -/obj/machinery/light{ - dir = 1; - pixel_y = 20 - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d3portforhall) "ewB" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -6361,6 +6375,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, +/obj/effect/paint/darkred, /turf/simulated/floor, /area/security/hallway) "ewW" = ( @@ -6524,13 +6539,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/endeavour/surfacebase/mining_main/refinery) "eBO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/security/lobby) "eCc" = ( /obj/effect/floor_decal/industrial/outline/blue, @@ -6726,13 +6735,10 @@ "eFC" = ( /obj/effect/floor_decal/techfloor/corner, /obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 + icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 }, /turf/simulated/floor/wood, /area/security/lobby) @@ -6949,6 +6955,7 @@ icon_state = "1-8" }, /obj/structure/cable/green, +/obj/effect/paint/darkred, /turf/simulated/floor, /area/security/hallway) "eMX" = ( @@ -7129,14 +7136,14 @@ /area/endeavour/hallway/d3portamidhall) "eVd" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - name = "Kitchen" - }, /obj/map_helper/access_helper/airlock/station/service/kitchen, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/effect/floor_decal/corner_oldtile/white/diagonal, +/obj/machinery/door/airlock/civilian{ + name = "Kitchen" + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "eVt" = ( @@ -7396,11 +7403,8 @@ id = "DRAMATIC"; name = "Dramatic Blast Door" }, -/obj/machinery/door/blast/shutters{ - id = "Druma"; - name = "Entertainment Shutters" - }, /obj/spawner/window/reinforced/full/firelocks, +/obj/effect/paint/palebottlegreen, /turf/simulated/floor/plating, /area/tether/surfacebase/entertainment) "fdy" = ( @@ -7459,7 +7463,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "ffP" = ( -/obj/machinery/vending/fitness, +/obj/machinery/vending/cola, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "ffW" = ( @@ -7486,7 +7490,7 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled/dark, /area/security/lobby) "fgL" = ( /obj/item/stool/padded, @@ -7766,6 +7770,7 @@ /area/endeavour/hallway/d3afthall) "fnF" = ( /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/prison/cell_block) "fop" = ( @@ -8473,6 +8478,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/armoury) "fOe" = ( @@ -8599,7 +8605,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled/dark, /area/security/lobby) "fRi" = ( /obj/machinery/door/firedoor/glass, @@ -8795,7 +8801,7 @@ /obj/structure/bed/chair{ dir = 4 }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled/monodark, /area/prison/cell_block) "fXd" = ( /obj/machinery/door/firedoor, @@ -8874,6 +8880,7 @@ dir = 8 }, /obj/spawner/window/low_wall/reinforced/full, +/obj/effect/paint/beastybrown, /turf/simulated/floor/plating, /area/endeavour/surfacebase/mining_main/uxstorage) "fYR" = ( @@ -8899,6 +8906,7 @@ "gbe" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/structure/cable/green, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/armoury) "gbs" = ( @@ -9025,6 +9033,7 @@ /obj/structure/curtain/open/bed{ name = "curtain" }, +/obj/effect/paint/palebottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/bar) "ghh" = ( @@ -9184,8 +9193,7 @@ /area/endeavour/hallway/d3portforhall) "gmZ" = ( /obj/machinery/light{ - dir = 1; - pixel_y = 20 + dir = 1 }, /turf/simulated/floor/reinforced, /area/quartermaster/miningdock) @@ -9253,7 +9261,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled/dark, /area/security/lobby) "gpB" = ( /obj/structure/closet/bombclosetsecurity, @@ -9398,6 +9406,7 @@ dir = 8 }, /obj/spawner/window/low_wall/borosillicate/reinforced/full, +/obj/effect/paint/darkred, /turf/simulated/floor, /area/security/hanger) "gtM" = ( @@ -9408,6 +9417,7 @@ /area/space) "gtZ" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/office) "gug" = ( @@ -9776,9 +9786,7 @@ /area/quartermaster/delivery) "gMc" = ( /obj/spawner/window/reinforced/full/firelocks, -/obj/structure/curtain/open/bed{ - name = "curtain" - }, +/obj/structure/curtain/open/black, /turf/simulated/floor/plating, /area/crew_quarters/bar/lounge) "gMk" = ( @@ -9936,6 +9944,7 @@ dir = 1 }, /obj/item/dice, +/obj/item/material/ashtray/glass, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/game_room) "gRy" = ( @@ -10604,10 +10613,6 @@ /turf/simulated/wall/prepainted, /area/crew_quarters/showers) "hrc" = ( -/obj/machinery/station_map{ - dir = 4; - pixel_x = -32 - }, /obj/machinery/computer/supplycomp{ dir = 4 }, @@ -10646,31 +10651,10 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "hsu" = ( -/obj/machinery/door/firedoor/glass, -/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 - }, -/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, +/obj/structure/cable/green, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, +/turf/simulated/floor/plating, /area/security/hallway) "hte" = ( /obj/structure/cable{ @@ -10976,22 +10960,6 @@ /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, @@ -11184,6 +11152,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) +"hLw" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/corner_oldtile/white/diagonal, +/obj/machinery/light, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/kitchen) "hLN" = ( /obj/machinery/camera/network/civilian{ dir = 1 @@ -11496,10 +11472,6 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_6) "hYD" = ( -/obj/machinery/door/airlock{ - name = "Kitchen"; - req_one_access = list(28) - }, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -11512,6 +11484,9 @@ }, /obj/map_helper/access_helper/airlock/station/service/kitchen, /obj/effect/floor_decal/corner_oldtile/white/diagonal, +/obj/machinery/door/airlock/civilian{ + name = "Kitchen" + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "hYL" = ( @@ -11585,12 +11560,9 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "iaP" = ( -/turf/simulated/wall/prepainted/civilian, +/turf/simulated/wall/prepainted, /area/maintenance/bar/catwalk) "ibm" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -11797,6 +11769,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/warden) "ikN" = ( @@ -11857,8 +11830,7 @@ /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, +/turf/simulated/floor/tiled/dark, /area/security/lobby) "inw" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -12098,6 +12070,7 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/warden) "iyq" = ( @@ -12280,15 +12253,13 @@ /area/maintenance/substation/civilian) "iFW" = ( /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "1-4" }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/red/border, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/effect/floor_decal/borderfloorblack{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/effect/floor_decal/corner/red/border{ + dir = 10 }, /turf/simulated/floor/tiled/dark, /area/security/hallway) @@ -12960,27 +12931,14 @@ "jiy" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/recreation_area_hallway) -"jiN" = ( -/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, -/area/endeavour/hallway/d3portforhall) "jjl" = ( /obj/effect/floor_decal/corner/red{ dir = 10 }, /obj/structure/table/steel_reinforced, +/obj/machinery/camera/network/security{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/security/warden) "jkm" = ( @@ -13458,7 +13416,11 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/storage) "jAH" = ( -/turf/simulated/wall/prepainted/cargo, +/obj/structure/poster{ + pixel_x = 32 + }, +/obj/machinery/light/small, +/turf/simulated/floor/wood, /area/crew_quarters/bar/lounge) "jBe" = ( /obj/machinery/suit_cycler/mining, @@ -13600,23 +13562,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/hallway) -"jGq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3afthall) "jGP" = ( /obj/structure/bed/chair/wood{ dir = 4 @@ -13641,6 +13586,7 @@ dir = 8 }, /obj/spawner/window/low_wall/borosillicate/reinforced/full, +/obj/effect/paint/darkred, /turf/simulated/floor, /area/security/hanger) "jHr" = ( @@ -13879,6 +13825,7 @@ icon_state = "1-2" }, /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/brig) "jRB" = ( @@ -14009,11 +13956,14 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "jWI" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "2-8" }, /turf/simulated/floor/tiled/dark, /area/security/hallway) @@ -14059,9 +14009,6 @@ /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "jZc" = ( -/obj/machinery/fire_alarm/south_mount{ - pixel_y = -24 - }, /obj/machinery/light, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, @@ -14351,7 +14298,7 @@ "kiR" = ( /obj/structure/table/standard, /obj/item/storage/box/cups, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled/monodark, /area/prison/cell_block) "kiY" = ( /obj/structure/undies_wardrobe, @@ -14381,6 +14328,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/effect/paint/darkred, /turf/simulated/floor, /area/security/brig) "kkw" = ( @@ -14492,8 +14440,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/effect/floor_decal/steeldecal/steel_decals_central6, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled/dark, /area/security/lobby) "kqd" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -14536,13 +14483,8 @@ /area/security/hallway) "ksT" = ( /obj/machinery/disposal, -/obj/effect/floor_decal/industrial/warning/full, /obj/structure/disposalpipe/trunk, -/obj/machinery/light{ - dir = 1 - }, /obj/effect/floor_decal/corner_oldtile/white/diagonal, -/obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "ksW" = ( @@ -14726,6 +14668,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/warden) "kCb" = ( @@ -14931,8 +14874,7 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) "kKF" = ( -/obj/structure/table/woodentable, -/obj/item/flashlight/lamp/green, +/obj/structure/bed/chair/sofa/brown/right, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar/lounge) "kKL" = ( @@ -15233,18 +15175,6 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/machinery/door/airlock/glass/security{ - layer = 2.8; - name = "Security"; - 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" = ( @@ -15610,9 +15540,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/station_map{ - pixel_y = 32 - }, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -15850,7 +15777,6 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "lsC" = ( -/obj/machinery/camera/network/security, /obj/effect/floor_decal/corner/red{ dir = 5 }, @@ -15890,10 +15816,15 @@ /turf/simulated/floor/tiled, /area/hydroponics) "lul" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/table/marble, +/obj/machinery/door/blast/shutters{ + dir = 8; + id = "bar"; + name = "Bar Shutters" + }, +/obj/item/material/ashtray/glass, /turf/simulated/floor/wood, -/area/security/lobby) +/area/crew_quarters/bar) "luu" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -16244,7 +16175,7 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "lEK" = ( -/turf/simulated/wall/prepainted/civilian, +/turf/simulated/wall/prepainted, /area/crew_quarters/bar/lounge) "lEM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -16619,6 +16550,15 @@ }, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) +"lUK" = ( +/obj/structure/poster{ + pixel_x = 32 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar/lounge) "lVi" = ( /obj/machinery/holopad, /turf/simulated/floor/carpet, @@ -16755,6 +16695,7 @@ /area/crew_quarters/sleep/Dorm_6) "lYO" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/beastybrown, /turf/simulated/floor/tiled/steel/airless, /area/shuttle/belter) "lZO" = ( @@ -16918,10 +16859,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/security/lobby) "mhH" = ( /turf/simulated/floor/tiled, @@ -18074,7 +18012,7 @@ name = "Security"; req_one_access = null }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled/dark, /area/prison/cell_block) "mZL" = ( /obj/item/radio/intercom{ @@ -18399,14 +18337,11 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "noi" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ +/obj/map_helper/access_helper/airlock/station/service/kitchen, +/obj/machinery/door/airlock/civilian{ name = "Kitchen" }, -/obj/map_helper/access_helper/airlock/station/service/kitchen, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "noB" = ( @@ -19021,6 +18956,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/warden) "nLT" = ( @@ -19452,7 +19388,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 4 }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled/dark, /area/security/lobby) "nXq" = ( /obj/structure/cable/yellow{ @@ -19985,6 +19921,9 @@ /obj/item/packageWrap, /obj/machinery/camera/network/civilian, /obj/effect/floor_decal/corner_oldtile/white/diagonal, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "opZ" = ( @@ -20498,6 +20437,7 @@ name = "Bar Shutters" }, /obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint/palebottlegreen, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "oFO" = ( @@ -20817,6 +20757,7 @@ /obj/map_helper/electrochromatic_linker{ id = "vicDetOffice" }, +/obj/effect/paint/darkred, /turf/simulated/floor/lino, /area/security/detectives_office) "oSY" = ( @@ -21735,13 +21676,13 @@ dir = 8; icon_state = "pipe-c" }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled/dark, /area/security/lobby) "pwE" = ( /obj/structure/bed/chair{ dir = 4 }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled/monodark, /area/prison/cell_block) "pxt" = ( /obj/structure/table/rack/steel, @@ -21802,6 +21743,7 @@ /obj/map_helper/electrochromatic_linker{ id = "vicDetOffice" }, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/detectives_office) "pzs" = ( @@ -21969,6 +21911,9 @@ pixel_y = 16 }, /obj/effect/floor_decal/corner_oldtile/white/diagonal, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "pFW" = ( @@ -22208,7 +22153,6 @@ /obj/effect/floor_decal/corner/red/border{ dir = 1 }, -/obj/machinery/camera/network/security, /turf/simulated/floor/tiled/dark, /area/security/hallway) "pQh" = ( @@ -22257,6 +22201,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/brig) "pRW" = ( @@ -22636,6 +22581,7 @@ icon_state = "0-2" }, /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/brig) "qdR" = ( @@ -22742,7 +22688,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 + dir = 9 }, /turf/simulated/floor/wood, /area/security/lobby) @@ -22790,9 +22736,8 @@ /turf/simulated/floor/tiled/steel, /area/shuttle/belter) "qmi" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/structure/table/woodentable, +/obj/machinery/light/small, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar/lounge) "qmA" = ( @@ -23051,7 +22996,6 @@ /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{ @@ -23095,7 +23039,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/holopad, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled/dark, /area/security/lobby) "qvo" = ( /obj/machinery/door/firedoor/glass, @@ -23237,7 +23181,7 @@ "qyf" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/security/lobby) "qyF" = ( /obj/structure/cable/green{ @@ -23368,18 +23312,8 @@ /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) "qCs" = ( -/obj/machinery/door/blast/regular/open{ - dir = 4; - id = "DRAMATIC"; - name = "Dramatic Blast Door" - }, -/obj/machinery/door/blast/shutters{ - id = "Druma"; - name = "Entertainment Shutters" - }, -/obj/spawner/window/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/tether/surfacebase/entertainment) +/turf/simulated/wall/prepainted, +/area/maintenance/bar/lower) "qCM" = ( /obj/structure/table/rack/shelf/steel, /obj/machinery/camera/network/security, @@ -23509,7 +23443,7 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "qIo" = ( -/obj/machinery/vending/fitness, +/obj/machinery/vending/cola, /turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) "qIr" = ( @@ -23558,9 +23492,6 @@ "qJx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light{ - dir = 8 - }, /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, @@ -23611,6 +23542,7 @@ icon_state = "1-2" }, /obj/structure/cable/green, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/warden) "qLH" = ( @@ -23758,6 +23690,9 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, /turf/simulated/floor/wood, /area/security/lobby) "qQz" = ( @@ -23859,7 +23794,7 @@ name = "Security"; req_one_access = null }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled/dark, /area/security/lobby) "qVJ" = ( /obj/machinery/door/airlock/glass_external{ @@ -24000,6 +23935,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/brig) "rbG" = ( @@ -24065,6 +24001,7 @@ /obj/map_helper/electrochromatic_linker{ id = "vicDetOffice" }, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/detectives_office) "rfb" = ( @@ -24242,7 +24179,7 @@ /area/endeavour/surfacebase/mining_main/storage) "rme" = ( /obj/structure/table/woodentable, -/obj/machinery/recharger, +/obj/item/material/ashtray/glass, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area) "rmU" = ( @@ -24705,9 +24642,7 @@ /area/shuttle/mining_ship/general) "rAG" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/structure/curtain/open/bed{ - name = "curtain" - }, +/obj/structure/curtain/open/black, /turf/simulated/floor/plating, /area/crew_quarters/bar/lounge) "rBG" = ( @@ -24922,8 +24857,18 @@ /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/brig) +"rJH" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/structure/bed/chair/sofa/brown/left{ + dir = 8 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/bar/lounge) "rKm" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/red/border, @@ -24990,7 +24935,7 @@ "rNH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled/dark, /area/security/lobby) "rOn" = ( /obj/structure/cable/green{ @@ -25302,11 +25247,17 @@ /turf/simulated/floor/plating, /area/maintenance/substation/cargo) "rYo" = ( -/obj/structure/sign/directions/evac{ - dir = 8 +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/turf/simulated/wall/prepainted/civilian, -/area/crew_quarters/kitchen) +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/machinery/station_map{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3afthall) "rYq" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -25368,6 +25319,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/warden) "saz" = ( @@ -25385,6 +25337,9 @@ /obj/effect/floor_decal/corner/red/border{ dir = 8 }, +/obj/machinery/camera/network/security{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "saE" = ( @@ -25497,9 +25452,10 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardamidhall) "seB" = ( -/obj/structure/bed/chair/comfy/beige{ - dir = 8 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 }, +/obj/structure/bed/chair/sofa/brown/corner, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar/lounge) "seM" = ( @@ -25982,7 +25938,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled/dark, /area/security/lobby) "svs" = ( /obj/machinery/light/small{ @@ -26367,17 +26323,43 @@ /turf/simulated/floor/tiled/old_tile/gray, /area/security/range) "sFM" = ( -/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) +/obj/map_helper/access_helper/airlock/station/security/general, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0 + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/airlock/multi_tile/glass{ + id_tag = "BrigFoyer"; + name = "Security"; + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/security/hallway) "sFQ" = ( /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/water/deep/indoors, /area/crew_quarters/sleep/bedrooms) +"sFW" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/kitchen) "sFX" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -26482,6 +26464,7 @@ /area/endeavour/hallway/d3starboardafthall) "sKL" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/beastybrown, /turf/simulated/floor/tiled/steel/airless, /area/shuttle/mining_ship/general) "sKV" = ( @@ -26787,7 +26770,7 @@ /turf/simulated/floor/tiled, /area/security/range) "sWJ" = ( -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled/monodark, /area/prison/cell_block) "sXC" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -26832,6 +26815,7 @@ icon_state = "1-4" }, /obj/structure/cable/green, +/obj/effect/paint/darkred, /turf/simulated/floor, /area/security/hallway) "sYK" = ( @@ -26874,7 +26858,7 @@ /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled/dark, /area/security/lobby) "sZQ" = ( /obj/effect/floor_decal/borderfloorblack/corner{ @@ -27544,7 +27528,7 @@ /area/quartermaster/foyer) "tBs" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/structure/curtain/black, +/obj/structure/curtain/open/black, /turf/simulated/floor/plating, /area/crew_quarters/game_room) "tBN" = ( @@ -27874,11 +27858,11 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/freezer{ - name = "Kitchen Cold Room" - }, /obj/map_helper/access_helper/airlock/station/service/kitchen, /obj/effect/floor_decal/corner_oldtile/white/diagonal, +/obj/machinery/door/airlock/civilian{ + name = "Kitchen Cold Room" + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "tNF" = ( @@ -27936,6 +27920,7 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/warden) "tQn" = ( @@ -28378,7 +28363,10 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "ugs" = ( -/obj/machinery/light/small, +/obj/structure/bed/chair/sofa/brown/right, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar/lounge) "ugt" = ( @@ -29178,6 +29166,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/brig) "uHj" = ( @@ -29221,16 +29210,16 @@ /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area) "uIA" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/vending/cola{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "2-4" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/security/lobby) "uIG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -29296,6 +29285,7 @@ /obj/effect/floor_decal/corner/navgold/bordercorner2{ dir = 4 }, +/obj/effect/floor_decal/steeldecal/steel_decals4, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "uJP" = ( @@ -29407,9 +29397,17 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "uMs" = ( -/obj/machinery/light, -/turf/simulated/wall/prepainted, -/area/endeavour/station/stairs_three) +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/endeavour/hallway/d3afthall) "uMD" = ( /obj/structure/table/bench/steel, /obj/effect/floor_decal/borderfloorblack{ @@ -29456,10 +29454,10 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "uOI" = ( -/obj/machinery/door/airlock/civilian{ - name = "Reading Room 2" - }, /obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + name = "Bar Lounge 2" + }, /turf/simulated/floor/wood, /area/crew_quarters/bar/lounge) "uOQ" = ( @@ -29836,7 +29834,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/security/lobby) "vew" = ( /obj/structure/table/steel, @@ -29998,15 +29996,14 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_12) "viU" = ( -/obj/item/radio/intercom{ - dir = 4; - pixel_x = 24 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, /obj/effect/floor_decal/corner_oldtile/white/diagonal, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "vjb" = ( @@ -30114,6 +30111,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/brig) "vlO" = ( @@ -30837,6 +30835,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/armoury) "vEC" = ( @@ -30957,6 +30956,7 @@ /area/crew_quarters/recreation_area_hallway) "vIs" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/prison/cell_block) "vIC" = ( @@ -31030,6 +31030,14 @@ }, /turf/simulated/floor/plating, /area/maintenance/cargo) +"vKG" = ( +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/map_helper/electrochromatic_linker{ + id = "vicDetOffice" + }, +/obj/effect/paint/darkred, +/turf/simulated/floor/plating, +/area/security/detectives_office) "vKH" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -31800,6 +31808,7 @@ id = "bar"; name = "Bar Shutters" }, +/obj/effect/paint/palebottlegreen, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "wma" = ( @@ -32098,6 +32107,7 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/warden) "wws" = ( @@ -32693,6 +32703,7 @@ /area/security/lobby) "wWK" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/palebottlegreen, /turf/simulated/floor/plating, /area/hydroponics) "wWQ" = ( @@ -33113,9 +33124,6 @@ pixel_x = -24; pixel_y = -10 }, -/obj/machinery/light{ - dir = 8 - }, /obj/effect/floor_decal/corner_oldtile/white/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) @@ -33425,9 +33433,6 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 8 - }, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -33907,7 +33912,6 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/vending/fitness, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "xQu" = ( @@ -34095,7 +34099,7 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "xXg" = ( -/turf/simulated/wall/r_wall/prepainted/cargo, +/turf/simulated/wall/r_wall/prepainted, /area/crew_quarters/game_room) "xXk" = ( /obj/structure/cable/green{ @@ -34191,16 +34195,13 @@ /area/tether/surfacebase/entertainment) "xZs" = ( /obj/effect/floor_decal/borderfloorblack{ - dir = 1 + dir = 8 }, /obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/machinery/camera/network/security{ + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/security/hallway) @@ -34435,7 +34436,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/security/lobby) "ykp" = ( -/obj/structure/closet/wardrobe/green, +/obj/machinery/vending/fitness, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area) "ykx" = ( @@ -38505,7 +38506,7 @@ bzE bzE rAG rAG -jAH +bzE rAG rAG bzE @@ -38697,10 +38698,10 @@ mDp bzE bzE bzE -cnc -kKF -jAH kKF +qmi +lEK +ugs cnc bzE bzE @@ -38892,12 +38893,12 @@ bzE bzE bzE seB -ugs -jAH -qmi +rJH +lEK seB -jAH -jAH +rJH +lEK +lEK bzE pRW pRW @@ -39085,13 +39086,13 @@ mDp nNX bzE bzE +lUK uzm +lEK uzm jAH -uzm -uzm -jAH -jAH +lEK +lEK bzE pRW pRW @@ -39281,7 +39282,7 @@ bzE bzE bzE dBF -jAH +lEK uOI cHy cHy @@ -39668,9 +39669,9 @@ jGe jYr bzE bzE -kbt uzm uzm +rlf cHy aOy hnK @@ -39713,7 +39714,7 @@ udU rJC tjK knW -uGl +xZs vzu flS dPF @@ -39862,9 +39863,9 @@ jYr aKn bzE bzE +kbt uzm -uzm -jAH +lEK cHy lNU ecM @@ -40058,7 +40059,7 @@ bzE bzE cUe uzm -jAH +lEK cHy mCZ iAO @@ -40252,7 +40253,7 @@ bzE bzE bwN uzm -jAH +lEK cHy bfd uvh @@ -40446,7 +40447,7 @@ tUu bzE bwN rnj -jAH +lEK cHy cHy cHy @@ -40844,7 +40845,7 @@ uzm uzm uzm uzm -uzm +rlf uzm uzm xLN @@ -41047,7 +41048,7 @@ kEf szl vAZ dJX -dJX +lul vSO iYC jfm @@ -41218,7 +41219,7 @@ pRW pRW pRW tUu -rxD +eAp bzE kbt uzm @@ -41412,8 +41413,8 @@ pRW pRW pRW pRW -rxD -rxD +eAp +eAp ddU piG iaP @@ -42008,8 +42009,8 @@ aMQ aMQ aMQ aMQ -xbH -xbH +qCs +qCs tIj pir sNC @@ -42407,7 +42408,7 @@ mup mup mup mup -hCa +hLw pir piX tJl @@ -43959,7 +43960,7 @@ dgB hOP aVW aVW -aVW +sFW pir fbH uhA @@ -44538,9 +44539,9 @@ sRJ aHs kyF jfy +aVW aHs -aHs -aHs +aVW dhd pir lhR @@ -44736,8 +44737,8 @@ pir pir pir pir +pir rYo -iSj rfb kGS glG @@ -45900,11 +45901,11 @@ aUT bWK mmq mmq -aec +qHq tXo tXY hjP -aec +qHq mmq mmq bWK @@ -46091,7 +46092,7 @@ pYt pYt pYt kEi -uMs +bWK xPB xPB bWK @@ -46288,7 +46289,7 @@ boM mLk mLk mLk -jGq +mLk wTk prg cua @@ -46673,7 +46674,7 @@ vEC eIC fub hHQ -bYm +aec pSd bYm ecr @@ -46683,11 +46684,11 @@ bfD bfD srX mvQ -bfD +uMs uPx gFf kGS -keU +vKG ajk oux pdl @@ -47252,7 +47253,7 @@ oms ukb lUi lMH -eww +cVy rqN cpz syH @@ -47657,7 +47658,7 @@ syH awA wuH aWe -keU +vKG bnZ bnZ bnZ @@ -47851,7 +47852,7 @@ fiy kEF wuH qmV -keU +vKG dfI bnZ voJ @@ -48416,7 +48417,7 @@ lMH lMH lMH lMH -hEO +xtI rZg swv syH @@ -49210,10 +49211,10 @@ ojU jqq aVb suB -sFM -sFM -sFM -sFM +inp +inp +inp +inp inp pwu kps @@ -49774,7 +49775,7 @@ uiJ eNB eNB pwn -jiN +rub xiG avK syH @@ -49958,7 +49959,7 @@ izO gal gal dyR -gal +cDv tVX vaA gal @@ -49991,7 +49992,7 @@ eem wpe wpe eYt -lul +rNH qyf qQq uPY @@ -50380,7 +50381,7 @@ chh wWx qHe kUz -qHe +sFM hsu qqU qqU @@ -50573,7 +50574,7 @@ chh chh chh jet -xZs +dAT jWI iFW qqU @@ -51542,7 +51543,7 @@ alB pGi vpi xkB -aiW +uxk xyL rkC vBk @@ -51928,7 +51929,7 @@ uwo qHe qHe oit -aiW +uxk qHe qHe dAT @@ -60047,7 +60048,7 @@ pRW pRW pRW pRW -qCs +fdp eQM hPt hPt @@ -60241,7 +60242,7 @@ pRW pRW pRW pRW -qCs +fdp qmZ hPt hPt @@ -60435,7 +60436,7 @@ pRW pRW pRW pRW -qCs +fdp hPt hPt hPt @@ -60629,7 +60630,7 @@ pRW pRW pRW pRW -qCs +fdp lNv hPt hPt @@ -61213,7 +61214,7 @@ pRW pRW pRW imb -bcw +aiW hEc hEc hEc diff --git a/maps/endeavour/levels/deck4.dmm b/maps/endeavour/levels/deck4.dmm index 0e69f753e8d3..bbbddcc91b77 100644 --- a/maps/endeavour/levels/deck4.dmm +++ b/maps/endeavour/levels/deck4.dmm @@ -1945,8 +1945,7 @@ /area/endeavour/hallway/d4starboardamidhall) "ckl" = ( /obj/machinery/light{ - dir = 4; - pixel_x = 10 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/glass/research{ @@ -2318,8 +2317,7 @@ /area/rnd/robotics/smallcraft) "cGm" = ( /obj/machinery/light{ - dir = 4; - pixel_x = 10 + dir = 4 }, /obj/machinery/computer/atmos_alert{ dir = 8 @@ -2893,6 +2891,7 @@ /area/engineering/atmos) "dtj" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/sun, /turf/simulated/floor/wood, /area/engineering/hallway/lower) "dtD" = ( @@ -3348,8 +3347,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /obj/structure/cable{ icon_state = "1-2" @@ -3637,6 +3635,7 @@ /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/paint/sun, /turf/simulated/floor/wood, /area/engineering/hallway/lower) "euv" = ( @@ -4523,8 +4522,7 @@ /area/endeavour/hallway/d4fwdmaint) "fwT" = ( /obj/machinery/light{ - dir = 4; - pixel_x = 10 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/glass/research{ @@ -5197,6 +5195,7 @@ /area/endeavour/command/turrets) "gtb" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/sun, /turf/simulated/floor/wood, /area/endeavour/station/stairs_four) "gtA" = ( @@ -6519,8 +6518,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /obj/machinery/door/firedoor{ dir = 8 @@ -6654,8 +6652,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4starboardamidhall) @@ -6886,8 +6883,7 @@ /area/endeavour/hallway/d4aftmaint) "ikC" = ( /obj/machinery/light{ - dir = 1; - pixel_y = 20 + dir = 1 }, /turf/simulated/floor/plating, /area/endeavour/hallway/d4aftmaint) @@ -7061,6 +7057,7 @@ /area/ai_upload_foyer) "ixU" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/sun, /turf/simulated/floor/wood, /area/engineering/break_room) "iyC" = ( @@ -10081,8 +10078,7 @@ /area/endeavour/hallway/d4porthall) "mel" = ( /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d4fwdhall) @@ -10477,8 +10473,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 8; - pixel_x = -10 + dir = 8 }, /obj/machinery/camera/network/engineering{ dir = 4 @@ -12336,19 +12331,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) -"oLT" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightorange/border{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4; - use_power = 0 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d4portamidhall) "oNF" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 9 @@ -17726,8 +17708,7 @@ }, /obj/structure/catwalk, /obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 4 }, /turf/simulated/floor/plating, /area/engineering/engine_smes) @@ -18496,8 +18477,7 @@ /area/endeavour/command/turrets) "wSS" = ( /obj/machinery/light{ - dir = 4; - pixel_x = 10 + dir = 4 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d4fwdhall) @@ -18957,8 +18937,7 @@ /area/engineering/drone_fabrication) "xwH" = ( /obj/machinery/light{ - dir = 4; - pixel_x = 10 + dir = 4 }, /obj/machinery/computer/rcon{ dir = 8 @@ -36646,7 +36625,7 @@ hOe rAC bSY rAC -oLT +kSz gPH xbS gPH