From 789c457e3f1845a84932af4a1bbd171b7f2b78b4 Mon Sep 17 00:00:00 2001 From: AlphaM01 Date: Sat, 7 Dec 2024 15:05:29 -0300 Subject: [PATCH 1/4] test --- maps/endeavour/levels/deck1.dmm | 903 +++++++++++--------------------- maps/endeavour/levels/deck2.dmm | 603 +++++++++++---------- maps/endeavour/levels/deck3.dmm | 729 +++++++++++++++----------- maps/endeavour/levels/deck4.dmm | 11 +- 4 files changed, 1057 insertions(+), 1189 deletions(-) diff --git a/maps/endeavour/levels/deck1.dmm b/maps/endeavour/levels/deck1.dmm index 91ad886d604a..55cf4875114e 100644 --- a/maps/endeavour/levels/deck1.dmm +++ b/maps/endeavour/levels/deck1.dmm @@ -44,6 +44,7 @@ /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" }, @@ -101,13 +102,8 @@ /turf/simulated/floor/carpet, /area/bridge/meeting_room) "afX" = ( -/obj/machinery/air_alarm{ - frequency = 1441; - pixel_y = 22; - target_temperature = 275.15 - }, -/obj/structure/table/bench/wooden, -/turf/simulated/floor/tiled/freezer, +/obj/effect/floor_decal/rust, +/turf/simulated/wall/prepainted/civilian, /area/endeavour/surfacebase/sauna) "afY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -246,13 +242,6 @@ }, /turf/simulated/floor/tiled/dark, /area/gateway) -"amc" = ( -/obj/effect/mist, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/endeavour/surfacebase/sauna) "amf" = ( /obj/structure/catwalk, /obj/structure/railing{ @@ -357,18 +346,10 @@ /turf/simulated/floor/tiled, /area/hallway/secondary/docking_hallway2) "apK" = ( -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "pool_tint" - }, -/obj/structure/window/reinforced/polarized{ - id = "sauna_tint" - }, -/obj/structure/window/basic/full, -/turf/simulated/floor/plating, -/area/endeavour/surfacebase/sauna) +/obj/structure/table/woodentable, +/obj/item/paicard, +/turf/simulated/floor/wood, +/area/library) "apW" = ( /obj/structure/sign/directions/elevator{ dir = 4 @@ -737,12 +718,9 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "aEK" = ( -/obj/structure/bookcase{ - name = "bookcase (Fiction)" - }, -/obj/item/book/custom_library/fiction, -/turf/simulated/floor/wood, -/area/library) +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d1portamidhall) "aEU" = ( /turf/simulated/wall/prepainted/civilian, /area/vacant/vacant_bar) @@ -1110,14 +1088,10 @@ /turf/simulated/floor/wood, /area/hydroponics/garden) "aMy" = ( -/obj/machinery/light/small, /obj/machinery/status_display{ pixel_x = -32 }, -/obj/structure/table/woodentable, -/obj/effect/mist, -/obj/item/reagent_containers/food/drinks/bottle/patron, -/turf/simulated/floor/wood, +/turf/simulated/wall/wood/hardwood, /area/endeavour/surfacebase/sauna) "aMR" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, @@ -1237,9 +1211,6 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) -"aUs" = ( -/turf/simulated/floor/water/deep/pool, -/area/endeavour/surfacebase/sauna) "aUt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1457,13 +1428,8 @@ /turf/simulated/floor/carpet, /area/bridge/office) "bbP" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 5 - }, -/turf/simulated/floor/tiled, +/obj/structure/target_stake, +/turf/simulated/floor/plating, /area/endeavour/exploration/hallway_fore) "bcg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -1797,7 +1763,6 @@ /area/exploration) "brQ" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/item/radio/beacon, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -1899,12 +1864,6 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) -"bwJ" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/turf/simulated/floor/water/pool, -/area/endeavour/surfacebase/sauna) "bxc" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -2041,15 +2000,6 @@ /obj/machinery/light, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) -"bDI" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central7{ - dir = 4 - }, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1portamidhall) "bEg" = ( /obj/structure/table/woodentable, /obj/item/flashlight/lamp/green, @@ -2080,13 +2030,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/hallway) -"bFn" = ( -/obj/machinery/newscaster{ - pixel_y = 32 - }, -/obj/effect/mist, -/turf/simulated/floor/wood, -/area/endeavour/surfacebase/sauna) "bFR" = ( /obj/random/trash_pile, /turf/simulated/floor/plating, @@ -2464,12 +2407,6 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/library) -"bVK" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/turf/simulated/floor/water/deep/pool, -/area/endeavour/surfacebase/sauna) "bVS" = ( /obj/structure/dispenser/oxygen, /turf/simulated/floor/tiled/dark, @@ -3610,14 +3547,21 @@ /turf/simulated/floor/carpet/purcarpet, /area/exploration/meeting) "cRj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/light{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/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) "cRT" = ( @@ -3653,32 +3597,20 @@ /turf/simulated/floor/plating, /area/maintenance/substation/civilian) "cSU" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/pool/changing_room) "cSZ" = ( -/obj/structure/table/standard, -/obj/machinery/light{ - dir = 4; - use_power = 0 - }, -/obj/item/inflatable_duck, -/obj/item/inflatable_duck, /obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, +/obj/structure/table/standard, +/obj/item/inflatable_duck, /turf/simulated/floor/tiled/white, /area/crew_quarters/pool/changing_room) "cTj" = ( @@ -3813,19 +3745,6 @@ }, /turf/simulated/floor/wood, /area/endeavour/hallway/d1fwdmaint) -"cXG" = ( -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/polarized{ - id = "sauna_tint" - }, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "pool_tint" - }, -/obj/structure/window/basic/full, -/turf/simulated/floor/plating, -/area/endeavour/surfacebase/sauna) "cXS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -3868,11 +3787,6 @@ "cYi" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/crew_quarters/captain) -"cYp" = ( -/obj/machinery/fire_alarm/north_mount, -/obj/structure/table/bench/wooden, -/turf/simulated/floor/tiled/freezer, -/area/endeavour/surfacebase/sauna) "cYG" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/structure/table/reinforced, @@ -5566,11 +5480,11 @@ /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) "esr" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 6 +/obj/item/radio/intercom{ + pixel_y = -24 }, /obj/effect/mist, -/turf/simulated/floor/water/pool, +/turf/simulated/floor/water/deep/pool, /area/endeavour/surfacebase/sauna) "est" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -5597,15 +5511,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) -"esI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/tiled/freezer, -/area/endeavour/surfacebase/sauna) "esN" = ( /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) @@ -5935,13 +5840,8 @@ /turf/simulated/floor/tiled/white, /area/endeavour/hallway/d1fwdmaint) "eFG" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 9 - }, -/turf/simulated/floor/water/pool, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, /area/endeavour/surfacebase/sauna) "eFW" = ( /turf/simulated/wall/r_wall/prepainted/civilian, @@ -6960,13 +6860,6 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) -"fmJ" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 5 - }, -/obj/effect/mist, -/turf/simulated/floor/water/pool, -/area/endeavour/surfacebase/sauna) "fmO" = ( /obj/structure/flora/ausbushes/grassybush, /turf/simulated/floor/grass, @@ -7475,6 +7368,9 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/structure/bed/chair/comfy/brown{ + dir = 1 + }, /turf/simulated/floor/wood, /area/library) "fDJ" = ( @@ -7810,6 +7706,9 @@ dir = 8; icon_state = "pipe-c" }, +/obj/structure/bed/chair/comfy/brown{ + dir = 1 + }, /turf/simulated/floor/wood, /area/library) "fOo" = ( @@ -8069,7 +7968,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet/bcarpet, /area/library) "fZu" = ( /obj/machinery/camera/network/outside{ @@ -8651,14 +8550,8 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "gtI" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 8 - }, /obj/structure/railing, -/turf/simulated/floor/tiled, +/turf/simulated/wall/r_wall/prepainted/exploration, /area/endeavour/exploration/hallway_fore) "gud" = ( /obj/machinery/door/firedoor, @@ -8773,15 +8666,6 @@ /obj/machinery/door/airlock/voidcraft/vertical, /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) -"gAb" = ( -/obj/structure/extinguisher_cabinet{ - dir = 8; - pixel_x = 30 - }, -/obj/structure/table/bench/wooden, -/obj/effect/mist, -/turf/simulated/floor/wood, -/area/endeavour/surfacebase/sauna) "gAi" = ( /obj/effect/floor_decal/spline/fancy, /obj/structure/railing, @@ -9242,9 +9126,10 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "gQU" = ( -/obj/structure/bookcase{ - name = "bookcase (Reference)" +/obj/machinery/light/small{ + dir = 8 }, +/obj/machinery/libraryscanner, /turf/simulated/floor/wood, /area/library) "gRB" = ( @@ -9352,12 +9237,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -9622,20 +9501,6 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/wood, /area/hydroponics/garden) -"hgo" = ( -/obj/machinery/door/airlock{ - name = "Public Cold Pool" - }, -/obj/structure/curtain/open/shower, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/fans/tiny, -/turf/simulated/floor/tiled, -/area/endeavour/surfacebase/sauna) "hgE" = ( /turf/simulated/wall/r_wall/prepainted/civilian, /area/hallway/secondary/docking_hallway) @@ -9709,8 +9574,8 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "hik" = ( -/turf/simulated/wall/prepainted, -/area/maintenance/arrivals) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/pool/changing_room) "hja" = ( /obj/structure/closet/secure_closet/explorer, /obj/effect/floor_decal/industrial/outline/yellow, @@ -9911,10 +9776,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/machinery/holopad, /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/white, /area/crew_quarters/pool/changing_room) "hrs" = ( @@ -10212,12 +10077,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/misc_lab) -"hGB" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/turf/simulated/floor/water/pool, -/area/endeavour/surfacebase/sauna) "hGQ" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -10825,22 +10684,25 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d1aftmaint) "ibD" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/obj/machinery/light, -/turf/simulated/floor/water/deep/pool, -/area/endeavour/surfacebase/sauna) -"ibU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/airlock/glass/civilian{ + name = "Pool Access" + }, +/turf/simulated/floor/tiled/white, +/area/hallway/secondary/docking_hallway) +"ibU" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/sauna) "icb" = ( @@ -11485,11 +11347,17 @@ /turf/simulated/floor/tiled/dark, /area/exploration/courser_dock) "iyz" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 9 +/obj/structure/railing{ + dir = 8 }, -/turf/simulated/floor/water/pool, -/area/endeavour/surfacebase/sauna) +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/endeavour/exploration/hallway_fore) "izk" = ( /obj/effect/floor_decal/industrial/warning/full, /obj/structure/anomaly_container, @@ -11657,7 +11525,7 @@ /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) "iFj" = ( -/turf/simulated/wall/prepainted, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/hallway/secondary/docking_hallway) "iFq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -11890,10 +11758,7 @@ /area/endeavour/surfacebase/sauna) "iQS" = ( /obj/effect/mist, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/turf/simulated/floor/water/deep/pool, +/turf/simulated/floor/water/pool, /area/endeavour/surfacebase/sauna) "iRf" = ( /obj/machinery/air_alarm{ @@ -12240,12 +12105,6 @@ /obj/structure/table/rack/shelf/steel, /turf/simulated/floor/tiled/old_tile/blue, /area/endeavour/hallway/d1aftmaint) -"jfm" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 5 - }, -/turf/simulated/floor/water/pool, -/area/endeavour/surfacebase/sauna) "jfK" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -12643,12 +12502,9 @@ /turf/simulated/floor/tiled, /area/exploration/explorer_prep) "jsH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled/freezer, -/area/endeavour/surfacebase/sauna) +/obj/item/radio/intercom/north_mount, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/pool/changing_room) "jtj" = ( /obj/machinery/door/airlock/multi_tile/glass{ dir = 1; @@ -13899,12 +13755,8 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "kim" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/table/bench/wooden, /obj/effect/mist, -/turf/simulated/floor/wood, +/turf/simulated/floor/water/deep/pool, /area/endeavour/surfacebase/sauna) "kiC" = ( /obj/effect/floor_decal/borderfloorblack, @@ -14247,6 +14099,8 @@ /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, /turf/simulated/floor/wood, /area/library) "kAg" = ( @@ -14301,16 +14155,6 @@ }, /turf/simulated/floor/lino, /area/chapel/office) -"kBS" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/obj/effect/mist, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/water/deep/pool, -/area/endeavour/surfacebase/sauna) "kCA" = ( /obj/machinery/camera/network/civilian, /turf/simulated/floor/wood, @@ -14720,8 +14564,9 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/sauna) "kNV" = ( -/turf/simulated/floor/tiled/freezer, -/area/endeavour/surfacebase/sauna) +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d1portamidhall) "kOi" = ( /obj/structure/bed/chair/bay/shuttle{ dir = 4 @@ -15069,12 +14914,6 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/exploration/pathfinder_office) -"lcR" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/turf/simulated/floor/water/pool, -/area/endeavour/surfacebase/sauna) "ldi" = ( /obj/machinery/camera/network/exploration{ dir = 4 @@ -15714,7 +15553,7 @@ /area/crew_quarters/coffee_shop) "lEF" = ( /obj/structure/table/woodentable, -/obj/item/flashlight/lamp/green, +/obj/item/flashlight/lamp/green/on, /turf/simulated/floor/wood, /area/library) "lFq" = ( @@ -16668,8 +16507,12 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "mpL" = ( -/obj/structure/table/bench/wooden, -/turf/simulated/floor/tiled/freezer, +/obj/structure/table/woodentable, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/mist, +/turf/simulated/floor/wood, /area/endeavour/surfacebase/sauna) "mqa" = ( /obj/machinery/light{ @@ -17845,13 +17688,7 @@ /turf/simulated/wall/r_wall/prepainted/civilian, /area/shuttle/civvie/general) "nka" = ( -/obj/item/radio/intercom{ - dir = 1; - pixel_y = 24; - req_access = list() - }, -/obj/structure/table/bench/wooden, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/plating, /area/endeavour/surfacebase/sauna) "nkk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -18023,18 +17860,6 @@ /obj/structure/poster, /turf/simulated/wall/prepainted, /area/endeavour/hallway/d1aftmaint) -"npZ" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 8 - }, -/obj/machinery/camera/network/civilian{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1portamidhall) "nqu" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -18336,16 +18161,16 @@ /turf/simulated/floor/tiled/old_tile/red, /area/endeavour/hallway/d1aftmaint) "nAn" = ( -/obj/machinery/door/airlock{ - name = "Unisex Showers" - }, /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" }, -/turf/simulated/floor/tiled/steel, +/obj/machinery/door/airlock/multi_tile/glass{ + name = "Pool Room" + }, +/turf/simulated/floor/tiled/white, /area/crew_quarters/pool/changing_room) "nAF" = ( /obj/machinery/atmospherics/component/binary/passive_gate/on{ @@ -18594,6 +18419,9 @@ dir = 4; icon_state = "pipe-c" }, +/obj/structure/bed/chair/comfy/brown{ + dir = 1 + }, /turf/simulated/floor/wood, /area/library) "nJD" = ( @@ -19376,13 +19204,7 @@ /turf/simulated/floor/grass, /area/hydroponics/garden) "opm" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 8 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/endeavour/exploration/hallway_fore) "opn" = ( /obj/machinery/door/firedoor/glass, @@ -19514,17 +19336,9 @@ /turf/simulated/floor/tiled, /area/exploration/explorer_prep) "ovE" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 8 - }, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1portamidhall) +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/endeavour/exploration/hallway_fore) "owg" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -19866,12 +19680,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/sauna) "oKZ" = ( @@ -20139,16 +19947,8 @@ /turf/simulated/wall/r_wall/prepainted/exploration, /area/shuttle/excursion/cargo) "oWY" = ( -/obj/structure/window/basic{ - dir = 1 - }, -/obj/item/radio/intercom{ - dir = 4; - pixel_x = 22 - }, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/structure/closet/athletic_mixed, -/turf/simulated/floor/holofloor/tiled/dark, +/obj/machinery/holopad, +/turf/simulated/floor/tiled/white, /area/crew_quarters/pool/changing_room) "oXb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -20575,8 +20375,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/sauna) @@ -21484,18 +21284,6 @@ }, /turf/simulated/wall/r_wall/prepainted/civilian, /area/station/stairs_one) -"qdE" = ( -/obj/structure/table/woodentable, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/obj/machinery/button/windowtint{ - dir = 4; - id = "pool_tint"; - pixel_x = -25 - }, -/turf/simulated/floor/tiled/freezer, -/area/endeavour/surfacebase/sauna) "qdM" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -22983,6 +22771,9 @@ /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) "rhR" = ( +/obj/machinery/light/small{ + dir = 4 + }, /obj/structure/table/woodentable, /obj/effect/mist, /turf/simulated/floor/wood, @@ -23055,7 +22846,11 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "rln" = ( -/obj/effect/floor_decal/spline/plain, +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -22; + target_temperature = 312.15 + }, /obj/effect/mist, /turf/simulated/floor/water/pool, /area/endeavour/surfacebase/sauna) @@ -23361,11 +23156,11 @@ /turf/simulated/floor/tiled, /area/exploration) "rzL" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 9 +/obj/structure/extinguisher_cabinet{ + dir = 8; + pixel_x = 30 }, -/obj/effect/mist, -/turf/simulated/floor/water/pool, +/turf/simulated/wall/wood/hardwood, /area/endeavour/surfacebase/sauna) "rzM" = ( /obj/structure/railing, @@ -23424,6 +23219,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/item/radio/beacon, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "rBw" = ( @@ -23664,7 +23460,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/woodentable, -/obj/item/flashlight/lamp/green, +/obj/item/flashlight/lamp/green/on, /turf/simulated/floor/wood, /area/library) "rMy" = ( @@ -23822,13 +23618,6 @@ /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) "rVI" = ( -/obj/structure/table/woodentable, -/obj/effect/mist, -/obj/item/reagent_containers/food/drinks/bottle/limejuice, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 }, @@ -23837,6 +23626,8 @@ id = "sauna_tint"; pixel_x = -25 }, +/obj/structure/table/bench/wooden, +/obj/effect/mist, /turf/simulated/floor/wood, /area/endeavour/surfacebase/sauna) "rVM" = ( @@ -23917,11 +23708,15 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "rZl" = ( -/obj/effect/mist, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light/small, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/table/bench/wooden, +/obj/effect/mist, /turf/simulated/floor/wood, /area/endeavour/surfacebase/sauna) "sae" = ( @@ -24102,14 +23897,6 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) -"shJ" = ( -/obj/machinery/fire_alarm/south_mount{ - pixel_y = -24 - }, -/obj/machinery/light/small, -/obj/machinery/photocopier, -/turf/simulated/floor/wood, -/area/library) "shR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -24460,17 +24247,10 @@ /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) "sxX" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1portamidhall) +/obj/machinery/light/small, +/obj/effect/mist, +/turf/simulated/floor/water/deep/pool, +/area/endeavour/surfacebase/sauna) "sxY" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -25233,16 +25013,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/surfacebase/tram) -"tbQ" = ( -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -22; - target_temperature = 312.15 - }, -/obj/structure/table/bench/wooden, -/obj/effect/mist, -/turf/simulated/floor/wood, -/area/endeavour/surfacebase/sauna) "tbS" = ( /obj/structure/curtain/black, /turf/simulated/floor/wood, @@ -25402,6 +25172,7 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "tjy" = ( +/obj/structure/bed/chair/comfy/brown, /obj/structure/cable/green{ icon_state = "1-4" }, @@ -25434,10 +25205,6 @@ /obj/machinery/suit_storage_unit/exploration, /turf/simulated/floor/tiled, /area/exploration/pilot_prep) -"tjU" = ( -/obj/structure/table/woodentable, -/turf/simulated/floor/tiled/freezer, -/area/endeavour/surfacebase/sauna) "tkc" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden, @@ -25480,13 +25247,6 @@ }, /turf/simulated/floor/tiled/monodark, /area/bridge) -"tmc" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/table/woodentable, -/turf/simulated/floor/tiled/freezer, -/area/endeavour/surfacebase/sauna) "tme" = ( /obj/structure/closet/crate, /obj/fiftyspawner/steel, @@ -25628,23 +25388,15 @@ /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) "tsv" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 9 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 9 - }, -/turf/simulated/floor/tiled, +/obj/structure/ladder, +/turf/simulated/floor/plating, /area/endeavour/exploration/hallway_fore) "tsT" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -31 }, -/obj/structure/table/woodentable, -/obj/item/paper_bin, -/obj/item/paicard, /obj/machinery/light/small, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet/bcarpet, /area/library) "tsU" = ( /obj/structure/cable/green{ @@ -25887,15 +25639,13 @@ /turf/simulated/floor/plating, /area/maintenance/substation/command) "txV" = ( -/obj/machinery/light/small{ +/obj/structure/window/basic{ dir = 1 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/machinery/newscaster{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/freezer, -/area/endeavour/surfacebase/sauna) +/obj/effect/floor_decal/industrial/outline/blue, +/obj/structure/closet/athletic_mixed, +/turf/simulated/floor/holofloor/tiled/dark, +/area/crew_quarters/pool/changing_room) "tyc" = ( /obj/item/paper_bin, /obj/structure/table/reinforced, @@ -26527,7 +26277,8 @@ /turf/simulated/floor/tiled, /area/maintenance/tool_storage) "tXS" = ( -/turf/simulated/wall/prepainted/civilian, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/white, /area/crew_quarters/pool/changing_room) "tYZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -26629,9 +26380,12 @@ /turf/simulated/floor/airless/ceiling, /area/space) "ubG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/freezer, +/obj/structure/table/woodentable, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/effect/mist, +/turf/simulated/floor/wood, /area/endeavour/surfacebase/sauna) "ubJ" = ( /obj/machinery/door/blast/shutters{ @@ -26708,9 +26462,16 @@ /turf/simulated/wall/r_wall/prepainted, /area/maintenance/chapel) "uda" = ( -/obj/machinery/light/small, -/turf/simulated/floor/plating, -/area/maintenance/substation/dock) +/obj/structure/window/basic{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/structure/closet/athletic_mixed, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/crew_quarters/pool/changing_room) "udj" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -26815,6 +26576,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/machinery/light/small, /turf/simulated/floor/carpet/bcarpet, /area/library) "ugI" = ( @@ -27010,6 +26772,12 @@ /obj/effect/floor_decal/corner/navgold/bordercorner2{ dir = 4 }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/docking_hallway) "uni" = ( @@ -27775,17 +27543,14 @@ /turf/simulated/wall/r_wall/prepainted/civilian, /area/shuttle/civvie/general) "uRN" = ( -/obj/effect/floor_decal/borderfloorblack{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/corner/navgold/border{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/navgold/bordercorner2{ - dir = 5 +/obj/structure/cable/green{ + icon_state = "2-4" }, /turf/simulated/floor/tiled, /area/hallway/secondary/docking_hallway) @@ -28121,9 +27886,7 @@ /obj/item/radio/intercom{ pixel_y = -24 }, -/obj/structure/table/bench/wooden, -/obj/effect/mist, -/turf/simulated/floor/wood, +/turf/simulated/wall/wood/hardwood, /area/endeavour/surfacebase/sauna) "vdz" = ( /obj/structure/cable/green{ @@ -28722,14 +28485,6 @@ /obj/item/bedsheet/mimedouble, /turf/simulated/floor/wood, /area/crew_quarters/mimeoffice) -"vyg" = ( -/obj/structure/table/bench/wooden, -/obj/machinery/fire_alarm/south_mount{ - pixel_y = -25 - }, -/obj/effect/mist, -/turf/simulated/floor/wood, -/area/endeavour/surfacebase/sauna) "vyI" = ( /obj/machinery/turnstile{ dir = 1 @@ -30830,15 +30585,6 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) -"xft" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/freezer, -/area/endeavour/surfacebase/sauna) "xfQ" = ( /obj/structure/table/woodentable, /turf/simulated/floor/wood, @@ -30983,14 +30729,6 @@ }, /turf/simulated/floor/tiled/dark, /area/gateway) -"xoy" = ( -/obj/structure/table/woodentable, -/obj/item/paper_bin, -/obj/item/radio/intercom{ - pixel_y = -24 - }, -/turf/simulated/floor/wood, -/area/library) "xoB" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -31354,38 +31092,26 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/secondary/docking_hallway) "xyA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/borderfloorblack{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/corner/navgold/border{ + dir = 6 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 6 }, -/obj/effect/floor_decal/borderfloorblack/corner{ - dir = 8 +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 6 }, -/obj/effect/floor_decal/corner/navgold/bordercorner{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "1-8" }, /turf/simulated/floor/tiled, /area/hallway/secondary/docking_hallway) "xyG" = ( /obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock{ - name = "Unisex Showers" - }, -/turf/simulated/floor/tiled/steel, +/turf/simulated/wall/prepainted/civilian, /area/hallway/secondary/docking_hallway) "xzk" = ( /obj/structure/cable/green{ @@ -31559,8 +31285,7 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d1fwdmaint) "xGd" = ( -/obj/item/radio/beacon, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/plating, /area/endeavour/hallway/d1portamidhall) "xGj" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -31665,17 +31390,15 @@ /turf/space/basic, /area/space) "xJZ" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central7{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/endeavour/hallway/d1portamidhall) "xKz" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 10 +/obj/machinery/fire_alarm/south_mount{ + pixel_y = -25 }, /obj/effect/mist, -/turf/simulated/floor/water/pool, +/turf/simulated/floor/wood, /area/endeavour/surfacebase/sauna) "xKJ" = ( /obj/machinery/door/firedoor{ @@ -41818,8 +41541,8 @@ ijU iWI xVw fYz -ijU -nof +xSt +jBC xRj xRj xRj @@ -42012,7 +41735,7 @@ fiu aIY gJJ rTL -ijU +xSt xRj xRj xRj @@ -42206,7 +41929,7 @@ etm aCx jkD duk -ijU +xSt xRj xRj xRj @@ -42400,7 +42123,7 @@ etm jmM oFd foM -ijU +xSt xRj xRj xRj @@ -44319,7 +44042,7 @@ cjq cWc cWc iFj -iFj +ibD xyG fhK cfS @@ -44708,7 +44431,7 @@ xNu cSZ iRR oWY -kJh +hik tXS nUG oyz @@ -44899,8 +44622,8 @@ xNI xNI xNI xNu -xNu -xNu +jsH +hik hik hik krO @@ -45092,11 +44815,11 @@ xNI xNI xNI xNI -xNI -uda xNu -hik -hik +uda +kJh +txV +kJh krO nUG oyz @@ -45427,7 +45150,7 @@ sjU tsv opm opm -iJn +opm opm gtI bxh @@ -45619,12 +45342,12 @@ usY sjU sjU bbP -tfh -oBL -tfh -tfh -tfh -fDY +opm +opm +opm +opm +ovE +iyz fDY oBL mZn @@ -45815,8 +45538,8 @@ aGI aGI aGI aGI -lnF -lnF +aGI +aGI aGI lnF lnF @@ -48006,7 +47729,7 @@ sfX cHX eOl gVv -sfX +lEF cHX dsD uze @@ -48196,7 +47919,7 @@ dub jTS dsD qZR -sfX +lEF cHX eOl gVv @@ -48779,8 +48502,8 @@ sfX wrh mJP mJP -eOl -eOl +gVv +apK nJA cfh ltO @@ -48974,7 +48697,7 @@ esl esl wAB tjy -eOl +lEF fDI tsT dsD @@ -49170,7 +48893,7 @@ rVX abZ kzG fOe -xoy +uUz dsD uze uze @@ -49358,13 +49081,13 @@ bMt kNK aVu ugs -aEK +dsD mJP iKm fYP -eOl -eOl -shJ +mJP +mJP +jNp dsD uze smS @@ -55538,7 +55261,7 @@ maa cEb njM doC -qnH +qql doC nCE iQL @@ -55921,17 +55644,17 @@ oYa maa byt maa -dIE -dIE -dIE -dIE -hgo -dIE -dIE +nka +cEb +cEb +cEb +cEb +cEb +cEb cib -dIE -dIE -dIE +cEb +cEb +cEb mAC iOg czG @@ -56115,17 +55838,17 @@ oYa maa byt maa +eFG +cEb dIE -tjU -qdE -kNV -xft dIE -job +dIE +dIE +ubG bPU rVI aMy -dIE +cEb twz iOg czG @@ -56309,17 +56032,17 @@ oYa maa byt maa +nka +cEb dIE -txV -jsH ubG -esI -dIE -bFn +pGO +pGO +job erG rZl -amc dIE +cEb eVQ cdK pBW @@ -56503,17 +56226,17 @@ unB maa byt maa +nka +cEb dIE -cYp -eFG -bwJ -iyz -cXG -rzL -rzL +pGO +job +job +job +job xKz -vyg dIE +cEb hYO iOg czG @@ -56697,17 +56420,17 @@ unB maa byt kfn -dIE +nka afX -hGB -aUs -ibD -cXG -kBS +dIE +pGO +job +job +iQS iQS rln -tbQ dIE +cEb hYO iOg czG @@ -56891,17 +56614,17 @@ unB maa byt byt -dIE nka -hGB -aUs -bVK -cXG -iQS -iQS -rln +cEb +dIE pGO +job +job +iQS +kim +sxX dIE +cEb sQg gBE acA @@ -57085,17 +56808,17 @@ unB maa maa byt +nka +afX dIE -mpL -jfm -lcR -jfm -apK -fmJ -fmJ +pGO +job +job +iQS +iQS esr vdw -dIE +cEb hAP iOg rgx @@ -57279,17 +57002,17 @@ ris maa maa byt +eFG +cEb dIE mpL -mpL -mpL -tmc -dIE +pGO +pGO rhR +iQS kim -kim -gAb dIE +cEb hYO iOg xCy @@ -57473,17 +57196,17 @@ ris maa kfn byt +nka +cEb dIE dIE dIE dIE dIE dIE +rzL dIE -dIE -dIE -dIE -dIE +cEb hYO bHE aRA @@ -57668,16 +57391,16 @@ maa maa byt ogT -cPf -eRR -sxX -eRR -eRR -npZ -eRR -sxX -eRR -ovE +svt +svt +svt +svt +svt +svt +svt +svt +svt +svt uvX vEP cQC @@ -57862,16 +57585,16 @@ maa byt byt izR -sZv -sZv -sZv -sZv +xJZ +xJZ +kNV +xGd xGd xJZ -sZv -sZv -sZv -bDI +xJZ +xGd +kNV +svt sZv hZy vwv @@ -58056,16 +57779,16 @@ sIg byt maa ogT -xln -gnm -gnm -gnm -gnm -tCb -gnm -gnm -gnm -jsq +xGd +xJZ +xJZ +xJZ +xJZ +xJZ +xJZ +xJZ +xJZ +aEK gnm bve kah diff --git a/maps/endeavour/levels/deck2.dmm b/maps/endeavour/levels/deck2.dmm index d9485be80d62..61cd1dd696a6 100644 --- a/maps/endeavour/levels/deck2.dmm +++ b/maps/endeavour/levels/deck2.dmm @@ -316,7 +316,6 @@ /turf/simulated/floor/wood, /area/medical/medbay4) "amq" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/effect/floor_decal/spline/plain{ dir = 9 }, @@ -367,14 +366,16 @@ /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "ana" = ( -/obj/effect/floor_decal/borderfloorblack/corner{ +/obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/effect/floor_decal/corner/navgold/bordercorner{ - dir = 8 +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 }, -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 9 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) @@ -774,14 +775,20 @@ /turf/simulated/floor/tiled, /area/medical/virology) "aAu" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/cafeteria) +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardforhall) "aAw" = ( /turf/simulated/floor/carpet/sblucarpet, /area/medical/psych/psych_1) @@ -1583,9 +1590,14 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) "bfX" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central6, -/turf/simulated/floor/tiled/techfloor, -/area/assembly/robotics) +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/babyblue, +/obj/machinery/door/blast/shutters{ + id = "chemshutter"; + name = "Chemistry Shutters" + }, +/turf/simulated/floor/plating, +/area/medical/chemistry) "bfZ" = ( /obj/structure/closet/secure_closet/scientist, /obj/effect/floor_decal/spline/fancy/wood{ @@ -1664,7 +1676,7 @@ /area/crew_quarters/cafeteria) "biu" = ( /obj/structure/sign/deck/second, -/turf/simulated/wall/r_wall/prepainted/medical, +/turf/simulated/wall/r_wall/prepainted, /area/endeavour/hallway/d2fwdmaint) "bix" = ( /obj/effect/floor_decal/borderfloorwhite{ @@ -1729,9 +1741,6 @@ /turf/simulated/floor/wood, /area/rnd/xenobiology) "bjk" = ( -/obj/machinery/light{ - dir = 1 - }, /obj/structure/sign/deck/second{ pixel_y = 32 }, @@ -1741,6 +1750,12 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "bjp" = ( @@ -2582,7 +2597,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor/grid, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, /area/crew_quarters/cafeteria) "bKV" = ( /obj/structure/table/steel, @@ -3016,6 +3034,12 @@ /obj/machinery/photocopier/faxmachine{ department = "Public Meeting Room" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/wood, /area/tether/station/public_meeting_room) "bYo" = ( @@ -4934,8 +4958,10 @@ /turf/simulated/floor/tiled, /area/holodeck_control) "dkv" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/structure/bed/chair/comfy/beige, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/tether/station/public_meeting_room) "dkw" = ( @@ -5189,6 +5215,9 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/wood, /area/tether/station/public_meeting_room) "dtW" = ( @@ -5377,9 +5406,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/flora/grass/event/full_grass2, /turf/simulated/floor/grass/indoors, /area/tether/station/public_meeting_room) @@ -6007,6 +6033,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/tether/station/public_meeting_room) "dTF" = ( @@ -6049,10 +6076,11 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay3) "dUk" = ( -/obj/structure/bed/chair{ - dir = 8 +/obj/effect/floor_decal/corner_techfloor_gray{ + dir = 4 }, -/turf/simulated/floor/tiled/techfloor, +/obj/machinery/light, +/turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/cafeteria) "dUn" = ( /mob/living/simple_mob/slime/xenobio/rainbow/kendrick, @@ -7144,16 +7172,14 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "eBL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/holopad, /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/wood, /area/tether/station/public_meeting_room) "eCw" = ( @@ -7665,14 +7691,14 @@ /turf/simulated/floor/tiled/white, /area/medical/chemistry) "eUx" = ( +/obj/structure/table/woodentable, +/obj/item/flashlight/lamp/green, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 4 }, -/obj/structure/table/woodentable, -/obj/item/flashlight/lamp/green, /turf/simulated/floor/wood, /area/tether/station/public_meeting_room) "eUy" = ( @@ -8113,9 +8139,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/flora/grass/event/sunny_bush1, /turf/simulated/floor/grass/indoors, /area/tether/station/public_meeting_room) @@ -8848,20 +8871,16 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "fIE" = ( -/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/machinery/light{ + dir = 8; + light_range = 12 }, -/obj/effect/floor_decal/corner/navgold/bordercorner2{ - dir = 4 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "fIJ" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -8998,8 +9017,8 @@ /turf/simulated/floor/water/deep/indoors, /area/endeavour/hallway/d1starboardamidhall) "fMy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 5 }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/cafeteria) @@ -9579,14 +9598,12 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "gck" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, -/obj/structure/bed/chair/comfy/beige{ - dir = 1 +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 9 }, -/turf/simulated/floor/wood, -/area/tether/station/public_meeting_room) +/obj/effect/floor_decal/corner_techfloor_grid, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "gcM" = ( /obj/machinery/button/remote/blast_door{ id = "xenobio2"; @@ -10050,9 +10067,6 @@ dir = 8; light_range = 12 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2fwdhall) "gtH" = ( @@ -10988,9 +11002,7 @@ /turf/simulated/floor/plating, /area/medical/virologymaint) "gYH" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/cafeteria) "gYU" = ( @@ -12686,6 +12698,15 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "ice" = ( @@ -13965,16 +13986,13 @@ /turf/simulated/wall/prepainted/medical, /area/medical/morgue) "iRZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/structure/flora/grass/event/ferny_bush1, /obj/effect/floor_decal/spline/plain{ dir = 8 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/grass/indoors, /area/tether/station/public_meeting_room) "iST" = ( @@ -14340,7 +14358,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/blast/shutters{ - dir = 8; id = "chemshutter"; name = "Chemistry Shutters" }, @@ -14821,9 +14838,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/flora/grass/event/leafy_bush1, /turf/simulated/floor/grass/indoors, /area/tether/station/public_meeting_room) @@ -15669,10 +15683,12 @@ /turf/simulated/floor/tiled/dark, /area/rnd/research/researchdivision) "jZX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 5 }, -/obj/machinery/light, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/cafeteria) "jZY" = ( @@ -17081,9 +17097,6 @@ /turf/simulated/floor/tiled/monowhite, /area/rnd/chemistry_lab) "kWk" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, /obj/effect/floor_decal/spline/plain{ dir = 10 }, @@ -17297,9 +17310,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2fwdhall) "lcu" = ( @@ -17356,6 +17366,15 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) +"ldu" = ( +/obj/effect/floor_decal/corner_techfloor_gray{ + dir = 8 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/crew_quarters/cafeteria) "lev" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central6, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -17677,14 +17696,14 @@ /turf/simulated/floor/plating, /area/rnd/research/researchdivision) "lqJ" = ( -/obj/structure/bed/chair/comfy/beige{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/structure/bed/chair/comfy/beige{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "2-4" }, -/turf/simulated/floor/wood, -/area/tether/station/public_meeting_room) +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "lrJ" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/voidcraft/vertical{ @@ -18174,10 +18193,16 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "lGE" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/machinery/holopad, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/cafeteria) "lGG" = ( @@ -18344,14 +18369,9 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "lNY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/light{ - dir = 1 +/obj/machinery/light, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 10 }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/cafeteria) @@ -18706,6 +18726,9 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/wood, /area/tether/station/public_meeting_room) "mdc" = ( @@ -19043,14 +19066,12 @@ /turf/simulated/floor/wood, /area/rnd/breakroom) "mqU" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/cafeteria) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "mri" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -19122,6 +19143,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, +/obj/machinery/door/blast/shutters{ + id = "chemshutter"; + name = "Chemistry Shutters" + }, /turf/simulated/floor/plating, /area/medical/chemistry) "mtT" = ( @@ -19799,6 +19824,10 @@ /obj/effect/floor_decal/corner_techfloor_grid{ dir = 9 }, +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green{ + icon_state = "0-8" + }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/cafeteria) "mQh" = ( @@ -19873,9 +19902,6 @@ /obj/machinery/camera/network/civilian{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2fwdhall) "mSd" = ( @@ -20310,19 +20336,13 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "nfa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/cable/green{ - icon_state = "2-8" + icon_state = "4-8" }, -/obj/effect/floor_decal/corner_techfloor_grid{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/cafeteria) "nfD" = ( @@ -20403,11 +20423,8 @@ /turf/simulated/floor/carpet/blucarpet, /area/crew_quarters/medbreak) "nhq" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/cafeteria) +/turf/simulated/wall/r_wall/prepainted, +/area/endeavour/hallway/d2fwdmaint) "nhX" = ( /obj/effect/floor_decal/corner_techfloor_grid/full{ dir = 8 @@ -20595,9 +20612,6 @@ /obj/effect/floor_decal/corner/navgold/bordercorner{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2fwdhall) "nrZ" = ( @@ -21133,6 +21147,12 @@ /area/rnd/rdoffice) "nIk" = ( /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/endeavour/hallway/d2afthall) "nIP" = ( @@ -21893,6 +21913,7 @@ /obj/effect/floor_decal/corner_techfloor_grid{ dir = 9 }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/cafeteria) "ojL" = ( @@ -22424,10 +22445,10 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "oBJ" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 10 }, -/turf/simulated/floor/tiled/techfloor/grid, +/turf/simulated/floor/tiled/techfloor, /area/crew_quarters/cafeteria) "oBL" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -25108,13 +25129,11 @@ /turf/simulated/floor/carpet/sblucarpet, /area/medical/psych/psych_1) "pWE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner_techfloor_grid{ - dir = 6 + dir = 9 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/cafeteria) @@ -25200,6 +25219,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/wood, /area/tether/station/public_meeting_room) "pXL" = ( @@ -25418,12 +25438,7 @@ /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "qgi" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/cafeteria) "qgo" = ( @@ -25466,7 +25481,10 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/techfloor/grid, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, /area/crew_quarters/cafeteria) "qhH" = ( /obj/structure/cable/green{ @@ -25554,6 +25572,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/tether/station/public_meeting_room) "qjy" = ( @@ -27552,17 +27571,12 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "rtM" = ( +/obj/effect/floor_decal/corner_techfloor_gray, /obj/machinery/light{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 4 + dir = 1 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/turf/simulated/floor/tiled/techfloor/grid, +/area/crew_quarters/cafeteria) "rtP" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -28786,6 +28800,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /obj/effect/floor_decal/corner_techfloor_grid{ dir = 6 }, @@ -29446,11 +29463,13 @@ /turf/simulated/floor/tiled/white, /area/medical/sleeper) "sIh" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/table/woodentable, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/wood, /area/tether/station/public_meeting_room) "sIj" = ( @@ -31508,9 +31527,6 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2fwdhall) "tZm" = ( @@ -31533,7 +31549,15 @@ /turf/simulated/floor/wood, /area/rnd/breakroom) "uam" = ( -/obj/structure/table/standard, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/cafeteria) "uaG" = ( @@ -31747,17 +31771,17 @@ /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) "ujc" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/effect/floor_decal/corner_techfloor_grid{ dir = 9 }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/cafeteria) +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "uje" = ( /obj/structure/table/rack, /obj/item/suit_cooling_unit, @@ -32077,7 +32101,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals_central7, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2portamidhall) "uvO" = ( @@ -33318,8 +33341,6 @@ /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "vnb" = ( -/obj/effect/floor_decal/borderfloorblack/corner, -/obj/effect/floor_decal/corner/navgold/bordercorner, /obj/structure/disposalpipe/segment{ dir = 8 }, @@ -33469,14 +33490,17 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/medical/virology_aft_access) "vsM" = ( -/obj/effect/floor_decal/borderfloorblack/corner{ - dir = 4 +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/obj/effect/floor_decal/corner/navgold/bordercorner{ - dir = 4 +/obj/effect/floor_decal/borderfloorblack/corner2, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 2 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/area/endeavour/hallway/d1starboardforhall) "vtg" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -34335,14 +34359,11 @@ /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/virologymaint) "vYV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/cafeteria) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/navgold/bordercorner, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "vYW" = ( /obj/machinery/portable_atmospherics/canister/oxygen/prechilled{ start_pressure = 9000 @@ -35313,10 +35334,11 @@ /turf/simulated/floor/tiled, /area/medical/virology) "wzv" = ( -/obj/structure/bed/chair{ - dir = 4 +/obj/effect/floor_decal/corner_techfloor_gray{ + dir = 1 }, -/turf/simulated/floor/tiled/techfloor, +/obj/machinery/light, +/turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/cafeteria) "wzx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -35610,13 +35632,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/flora/grass/event/yellow_flowers1, /obj/effect/floor_decal/spline/plain{ dir = 4 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/grass/indoors, /area/tether/station/public_meeting_room) "wJr" = ( @@ -36515,6 +36537,12 @@ /obj/structure/flora/pottedplant/bamboo{ pixel_y = 12 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/wood, /area/tether/station/public_meeting_room) "xkU" = ( @@ -37948,17 +37976,14 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay4) "yhx" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 }, -/obj/machinery/light{ - dir = 1 +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/cafeteria) +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2fwdhall) "yhE" = ( /obj/effect/floor_decal/industrial/warning/dust, /turf/simulated/floor/tiled/dark, @@ -44788,7 +44813,7 @@ tSj agL wAx dSQ -nIk +vYV ibJ nIk kvq @@ -44982,9 +45007,9 @@ bsW vnZ pXL rup -fIE -rtM -vsM +oaU +oaU +buM ybk kxI gJS @@ -50215,9 +50240,9 @@ bmg mcN gIV heB -ufJ +pWE qhk -ufJ +gck aUb gIV rNf @@ -50409,7 +50434,7 @@ wJw fEp xUb laM -nhq +gYH nfa qgi dQe @@ -50602,12 +50627,12 @@ wgp iKN xUb wzv -wzv +bmg jZX +uam +lNY bmg -yhx -wzv -wzv +ldu xUb bhT hqn @@ -50795,13 +50820,13 @@ ltx eOX hlu xUb -uam -uam -fMy +ufJ eFl -vYV -uam +fMy uam +oBJ +eFl +ufJ xUb szz imb @@ -50989,13 +51014,13 @@ qRh eaK wJw xUb -uam -uam -fMy +ufJ eFl -vYV -uam +fMy uam +oBJ +eFl +ufJ xUb sIj jTr @@ -51184,12 +51209,12 @@ phm iKN xUb dUk -dUk -jZX bmg +jZX +uam lNY -dUk -dUk +bmg +rtM xUb bhT cMY @@ -51380,8 +51405,8 @@ hDs xUb laM gYH -ujc -aAu +nfa +qgi dQe xUb cUN @@ -51573,7 +51598,7 @@ bmg juM lJH vZs -ufJ +fMy bJZ oBJ vZs @@ -51769,7 +51794,7 @@ eRK eRK eRK slz -pWE +aPo aPo aPo aPo @@ -51959,11 +51984,11 @@ uVE yfS obi mOF -mOF +lqJ mOF mOF lGE -mqU +mOF mOF mOF mOF @@ -53309,7 +53334,7 @@ ejy vZg bTa vZg -bfX +vZg pDI mAv qjz @@ -53717,7 +53742,7 @@ oDd csf cTm aao -jqy +bfX mKe xbs unU @@ -53911,7 +53936,7 @@ oDd cxk anF mdU -jqy +bfX leM woF gMI @@ -54105,7 +54130,7 @@ oDd xzf cTm mdU -jqy +bfX oRe xbs pGL @@ -65932,7 +65957,7 @@ gAp nMP nMP jyg -nMP +ruN nMP tUb tUb @@ -66133,7 +66158,7 @@ aQB kUg cmT oYE -iro +nhq hlS pkD pkD @@ -66327,7 +66352,7 @@ tcX fRp mih bZw -iro +nhq pkD pkD pkD @@ -66521,7 +66546,7 @@ jpu vWh bgF oYE -iro +nhq pkD pkD pkD @@ -66715,14 +66740,14 @@ gfI vWh bgF fDK -iro +nhq pkD pkD pkD pkD pkD pkD -iro +nhq lmG qBd pRW @@ -66916,7 +66941,7 @@ pkD pkD pkD pkD -iro +nhq qBd jRE pRW @@ -67097,20 +67122,20 @@ mna tPG tPG nPa -gfI +vWh vWh vWh vWh fKA xcG -iro +nhq iDd pkD pkD pkD pkD vtx -iro +nhq pRW pRW pRW @@ -67291,20 +67316,20 @@ mna tPG tPG nPa -cwT +vWh vWh vWh vWh pXE ana -cTz +nhq pkD pkD pkD pkD pkD pkD -iro +nhq pRW pRW pRW @@ -67485,7 +67510,7 @@ mna tPG tPG mna -tcX +aAu vWh vWh fWJ @@ -67498,7 +67523,7 @@ pkD pkD pkD pkD -iro +nhq pRW pRW pRW @@ -67684,15 +67709,15 @@ vUI uFQ cwT bgF -oYE -iro +vsM +nhq pkD pkD pkD pkD pkD pkD -iro +nhq pRW pRW pRW @@ -67879,14 +67904,14 @@ xIg hkf bkX plL -iro +nhq pkD pkD pkD pkD pkD qUP -iro +nhq lIp pRW pRW @@ -68067,20 +68092,20 @@ dSt oZA cmb gtd -cmb +yhx mRH tYH nrD lbX fCt -iro +nhq pkD pkD pkD qUP -iro -iro -iro +nhq +nhq +nhq pRW pRW pRW @@ -68267,12 +68292,12 @@ cCF hGF wDK qaO -iro +nhq pkD pkD pkD -iro -iro +nhq +nhq pRW pRW pRW @@ -68461,12 +68486,12 @@ qIz fOr wqT qEo -iro +nhq pkD pkD pkD -iro -iro +nhq +nhq lIp pRW pRW @@ -68651,16 +68676,16 @@ kWk xGm iCr hBs -dfx +yiM pic oCg oIp -iro +nhq pkD qUP -iro -iro -iro +nhq +nhq +nhq pRW pRW pRW @@ -68849,10 +68874,10 @@ yiM pic oCg oIp -iro +nhq pkD -iro -iro +nhq +nhq pRW pRW pRW @@ -69043,9 +69068,9 @@ sBd pic oCg oIp -iro -iro -iro +nhq +nhq +nhq pRW pRW pRW @@ -69427,7 +69452,7 @@ dXk xGm nzx nzx -wKp +fvj jMN ryl mut @@ -69808,7 +69833,7 @@ bZu urd gCi pva -mcW +fIE dTv eBL qjv @@ -70003,9 +70028,9 @@ laO kWR weC sZj -dkv +loC sIh -gck +aZV sZj gCd iNI @@ -70199,7 +70224,7 @@ cMM sZj loC iiq -lqJ +aZV sZj xMa ieG @@ -70393,7 +70418,7 @@ xAr sZj loC njb -lqJ +aZV sZj jor nKm @@ -70779,9 +70804,9 @@ mwF cOM kHM wlM -dkv +loC eUx -gck +aZV iAs nyF sFf @@ -71173,10 +71198,10 @@ aZV xWm agO csb +aaK csb csb -csb -csb +aaK agO lmG qBd @@ -71361,16 +71386,16 @@ aaK csb agO pXJ -kHM -kHM -kHM +mqU +ujc +dkv dsY agO pQv +aaK csb csb -csb -csb +aaK mDp qBd jRE diff --git a/maps/endeavour/levels/deck3.dmm b/maps/endeavour/levels/deck3.dmm index 1cc6dd5868eb..b4c7836f2bde 100644 --- a/maps/endeavour/levels/deck3.dmm +++ b/maps/endeavour/levels/deck3.dmm @@ -37,16 +37,11 @@ /turf/simulated/floor/tiled/steel_grid, /area/quartermaster/delivery) "acd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/machinery/light_switch{ + pixel_y = 26 }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/dark, -/area/janitor) +/turf/simulated/floor/carpet/oracarpet, +/area/crew_quarters/sleep/Dorm_6) "ach" = ( /obj/effect/floor_decal/corner_oldtile/white/diagonal, /turf/simulated/floor/tiled/dark, @@ -457,9 +452,8 @@ /area/security/lobby) "avI" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/machinery/light_switch{ - pixel_x = 26; - pixel_y = -4 +/obj/machinery/light/small{ + dir = 4 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_5) @@ -527,9 +521,6 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/security/evidence_storage) "axk" = ( -/obj/machinery/light{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, @@ -543,7 +534,8 @@ /obj/structure/cable{ icon_state = "2-4" }, -/turf/simulated/floor/tiled/techfloor, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/endeavour/station/stairs_three) "aya" = ( /obj/effect/floor_decal/spline/plain{ @@ -732,7 +724,7 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/turf/simulated/floor/carpet/sblucarpet, +/turf/simulated/floor/tiled, /area/quartermaster/foyer) "aDw" = ( /obj/machinery/mineral/output, @@ -1154,19 +1146,11 @@ /turf/simulated/floor/tiled/monotile, /area/security/brig) "aUT" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/structure/disposalpipe/junction{ +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/plating, /area/endeavour/station/stairs_three) "aVb" = ( /obj/structure/cable{ @@ -1792,7 +1776,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/turf/simulated/floor/wood, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "bml" = ( /obj/structure/bed/chair{ @@ -2256,6 +2243,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/map_helper/access_helper/airlock/station/security/general, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/prison/cell_block) "bCC" = ( @@ -2411,7 +2404,7 @@ dir = 8; pixel_x = 25 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/foyer) "bKx" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -2584,8 +2577,11 @@ /turf/simulated/floor/tiled, /area/crew_quarters/fitness) "bSQ" = ( -/turf/simulated/floor/wood, -/area/quartermaster/foyer) +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/carpet/oracarpet, +/area/crew_quarters/sleep/Dorm_6) "bTj" = ( /obj/machinery/computer/security/wooden_tv, /turf/simulated/floor/carpet, @@ -2600,7 +2596,7 @@ /obj/structure/disposalpipe/junction/yjunction{ dir = 8 }, -/turf/simulated/floor/carpet/sblucarpet, +/turf/simulated/floor/tiled, /area/quartermaster/foyer) "bUa" = ( /obj/effect/floor_decal/borderfloor, @@ -2897,7 +2893,7 @@ /area/security/detectives_office) "cgt" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "cgP" = ( /obj/structure/filingcabinet/chestdrawer, @@ -3102,18 +3098,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 }, -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/effect/floor_decal/corner/red/bordercorner{ + dir = 4 }, /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "crj" = ( @@ -4131,14 +4130,19 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/refinery) "dcx" = ( -/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "dcz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -4497,14 +4501,11 @@ /turf/simulated/floor/plating, /area/maintenance/bar/catwalk) "dmR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/light_switch{ + pixel_y = -23 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel, -/area/vacant/vacant_shop) +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/sleep/Dorm_9) "dnk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -4571,6 +4572,18 @@ /obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark, /area/janitor) "dqc" = ( @@ -4672,8 +4685,8 @@ /turf/simulated/floor/wood, /area/security/breakroom) "duv" = ( -/obj/structure/bed/double, /obj/item/bedsheet/reddouble, +/obj/structure/bed/double/padded, /turf/simulated/floor/carpet/gaycarpet, /area/crew_quarters/sleep/Dorm_4) "dwE" = ( @@ -4724,7 +4737,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled, /area/quartermaster/foyer) "dyV" = ( /turf/simulated/floor/tiled/white, @@ -5055,7 +5068,7 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/turf/simulated/floor/carpet/sblucarpet, +/turf/simulated/floor/tiled, /area/quartermaster/foyer) "dMA" = ( /obj/structure/cable{ @@ -5722,8 +5735,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_12) "eek" = ( -/turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/obj/machinery/light_switch{ + pixel_y = -23 + }, +/turf/simulated/floor/carpet/purcarpet, +/area/crew_quarters/sleep/Dorm_5) "eem" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -5802,11 +5818,19 @@ /turf/simulated/floor/carpet/blue, /area/crew_quarters/sleep/Dorm_3) "egL" = ( -/obj/landmark/spawnpoint/job/janitor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark, /area/janitor) "ehd" = ( @@ -5894,6 +5918,21 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) +"ekD" = ( +/obj/machinery/door/firedoor, +/obj/structure/table/reinforced, +/obj/machinery/door/window{ + dir = 8; + req_one_access = list(31) + }, +/obj/item/paper_bin{ + pixel_x = -1; + pixel_y = 4 + }, +/obj/item/folder/white, +/obj/item/pen, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/delivery) "ekH" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_9) @@ -6186,9 +6225,11 @@ /turf/simulated/floor/plating, /area/quartermaster/qm) "etU" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled, -/area/quartermaster/foyer) +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/carpet/tealcarpet, +/area/crew_quarters/sleep/Dorm_8) "etV" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/light{ @@ -6231,8 +6272,8 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/storage) "evi" = ( -/obj/structure/bed/double, /obj/item/bedsheet/browndouble, +/obj/structure/bed/double/padded, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_1) "evn" = ( @@ -6431,6 +6472,9 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, +/obj/machinery/light/spot/no_nightshift{ + dir = 8 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "eBf" = ( @@ -6759,19 +6803,23 @@ pixel_x = 32 }, /obj/machinery/vending/snack, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled, /area/quartermaster/foyer) "eIC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/light{ - dir = 8 - }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d3portamidhall) +/area/endeavour/hallway/d3afthall) "eJd" = ( /obj/machinery/requests_console/preset/janitor{ pixel_x = -33 @@ -6826,7 +6874,7 @@ /obj/map_helper/access_helper/airlock/station/security/department, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/security/hallway) "eLo" = ( /obj/structure/disposalpipe/segment{ @@ -7245,7 +7293,7 @@ dir = 9 }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled, /area/quartermaster/foyer) "eZW" = ( /turf/simulated/wall/prepainted, @@ -7340,7 +7388,6 @@ name = "Dramatic Blast Door" }, /obj/machinery/door/blast/shutters{ - dir = 4; id = "Druma"; name = "Entertainment Shutters" }, @@ -7811,15 +7858,11 @@ /turf/simulated/floor/tiled, /area/hydroponics) "frY" = ( -/obj/structure/table/woodentable, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4 +/obj/machinery/light/small{ + dir = 8 }, -/turf/simulated/floor/wood, -/area/tether/surfacebase/entertainment) +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/sleep/Dorm_9) "fsu" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -7840,19 +7883,17 @@ /turf/simulated/floor/crystal, /area/endeavour/hallway/d3fwdhall) "fub" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/junction{ + dir = 1 }, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "fva" = ( @@ -8002,7 +8043,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "fDf" = ( /obj/structure/disposalpipe/segment, @@ -9274,9 +9315,6 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, -/obj/machinery/light{ - dir = 4 - }, /obj/structure/coatrack, /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) @@ -9516,6 +9554,15 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/security/hallway) "gDD" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "gDZ" = ( @@ -9717,9 +9764,18 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "gMF" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ +/obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark, /area/janitor) "gMQ" = ( @@ -10066,13 +10122,19 @@ /area/security/hallway) "gZQ" = ( /obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /obj/machinery/door/airlock/glass/security{ name = "Cell Block"; req_one_access = null }, /obj/map_helper/access_helper/airlock/station/security/general, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/prison/cell_block) @@ -10825,8 +10887,8 @@ /turf/simulated/floor/tiled/dark, /area/security/riot_control) "hCU" = ( -/obj/structure/bed/double, /obj/item/bedsheet/yellowdouble, +/obj/structure/bed/double/padded, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_9) "hDl" = ( @@ -11062,7 +11124,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/techfloor, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/endeavour/station/stairs_three) "hLt" = ( /obj/effect/floor_decal/spline/fancy/wood, @@ -11101,9 +11164,22 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "hMG" = ( -/obj/structure/sign/deck/third, -/turf/simulated/wall/prepainted/civilian, -/area/janitor) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) "hMP" = ( /obj/structure/coatrack, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, @@ -11120,9 +11196,8 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/light_switch{ - pixel_x = -26; - pixel_y = -4 +/obj/machinery/light/small{ + dir = 8 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_10) @@ -11272,12 +11347,25 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled, /area/quartermaster/foyer) "hVe" = ( /obj/machinery/camera/network/civilian{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, /turf/simulated/floor/tiled/dark, /area/janitor) "hVo" = ( @@ -11321,11 +11409,12 @@ /turf/simulated/floor/tiled/monotile, /area/crew_quarters/kitchen) "hXA" = ( +/obj/structure/catwalk, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/plating, /area/endeavour/station/stairs_three) "hXO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -11355,9 +11444,8 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/light_switch{ - pixel_x = -26; - pixel_y = -4 +/obj/machinery/light/small{ + dir = 8 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_6) @@ -11836,8 +11924,8 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "irP" = ( -/obj/structure/bed/double, /obj/item/bedsheet/cosmosdouble, +/obj/structure/bed/double/padded, /turf/simulated/floor/carpet/tealcarpet, /area/crew_quarters/sleep/Dorm_8) "irT" = ( @@ -11988,7 +12076,7 @@ /obj/machinery/camera/network/cargo{ dir = 4 }, -/obj/effect/floor_decal/industrial/outline/blue, +/obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "iAo" = ( @@ -12660,6 +12748,12 @@ /obj/machinery/camera/network/civilian{ dir = 8 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "jeb" = ( @@ -12751,13 +12845,16 @@ dir = 4; icon_state = "pipe-c" }, -/turf/simulated/floor/carpet/sblucarpet, +/turf/simulated/floor/tiled, /area/quartermaster/foyer) "jhI" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, /obj/structure/table/woodentable, +/obj/machinery/light/spot/no_nightshift{ + dir = 4 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "jhS" = ( @@ -13012,9 +13109,8 @@ /area/crew_quarters/sleep/Dorm_3) "jnU" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/machinery/light_switch{ - pixel_x = 26; - pixel_y = -4 +/obj/machinery/light/small{ + dir = 4 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_9) @@ -13212,7 +13308,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled, /area/quartermaster/foyer) "jxH" = ( /turf/simulated/floor/tiled/dark, @@ -14050,6 +14146,7 @@ }, /obj/effect/floor_decal/spline/fancy/wood, /obj/landmark/spawnpoint/job/clown, +/obj/machinery/light/spot/no_nightshift, /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "kfw" = ( @@ -14431,9 +14528,8 @@ "kwo" = ( /obj/machinery/door/firedoor, /obj/structure/table/reinforced, -/obj/machinery/door/window{ - dir = 8; - req_one_access = list(31) +/obj/structure/window/reinforced{ + dir = 8 }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/delivery) @@ -14679,19 +14775,11 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "kEi" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/plating, /area/endeavour/station/stairs_three) "kEF" = ( /obj/machinery/light{ @@ -14847,8 +14935,11 @@ /turf/simulated/floor/tiled/old_cargo/white, /area/security/forensics) "kLR" = ( -/turf/simulated/wall/prepainted, -/area/maintenance/bar/lower) +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/carpet/sblucarpet, +/area/crew_quarters/sleep/Dorm_7) "kMk" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -15291,6 +15382,12 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "leF" = ( @@ -16081,20 +16178,7 @@ /turf/simulated/floor/tiled/dark, /area/security/brig) "lIR" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/catwalk, -/obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/bar/lower) @@ -16725,7 +16809,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled, /area/quartermaster/foyer) "mhY" = ( /turf/simulated/wall/prepainted, @@ -18132,7 +18216,7 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/foyer) "nkY" = ( /obj/structure/cable/green{ @@ -18421,23 +18505,11 @@ /turf/simulated/wall/prepainted/cargo, /area/quartermaster/storage) "nyw" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/bordercorner2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/light_switch{ + pixel_y = -23 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3portamidhall) +/turf/simulated/floor/carpet/sblucarpet, +/area/crew_quarters/sleep/Dorm_7) "nyW" = ( /obj/effect/floor_decal/corner/red{ dir = 6 @@ -18477,11 +18549,9 @@ /turf/simulated/floor/water/deep/indoors, /area/crew_quarters/sleep/bedrooms) "nAS" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Vacant Shop" - }, /obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel, +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, /area/vacant/vacant_shop) "nBf" = ( /obj/structure/closet/wardrobe, @@ -19423,7 +19493,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/techfloor, +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, /area/endeavour/station/stairs_three) "odS" = ( /obj/effect/floor_decal/spline/plain{ @@ -19441,8 +19512,8 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "oez" = ( -/obj/structure/bed/double, /obj/item/bedsheet/browndouble, +/obj/structure/bed/double/padded, /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/sleep/Dorm_6) "oeN" = ( @@ -20374,6 +20445,12 @@ }, /turf/simulated/floor/tiled/old_cargo/red, /area/security/security_processing) +"oKw" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/carpet, +/area/crew_quarters/sleep/Dorm_10) "oLu" = ( /obj/structure/table/marble, /obj/item/material/kitchen/rollingpin, @@ -20382,8 +20459,8 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "oMi" = ( -/obj/structure/bed/double, /obj/item/bedsheet/reddouble, +/obj/structure/bed/double/padded, /turf/simulated/floor/carpet, /area/crew_quarters/sleep/Dorm_10) "oMq" = ( @@ -21206,8 +21283,8 @@ /turf/simulated/wall/prepainted, /area/crew_quarters/kitchen) "pmM" = ( -/obj/structure/bed/double, /obj/item/bedsheet/bluedouble, +/obj/structure/bed/double/padded, /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_7) "pmO" = ( @@ -21514,6 +21591,9 @@ "pxt" = ( /obj/structure/table/rack/steel, /obj/item/instrument/violin, +/obj/machinery/light/spot/no_nightshift{ + dir = 4 + }, /turf/simulated/floor/carpet/bcarpet, /area/tether/surfacebase/entertainment) "pxK" = ( @@ -22062,6 +22142,9 @@ /area/endeavour/hallway/d3fwdhall) "pSY" = ( /obj/landmark/spawnpoint/job/janitor, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/janitor) "pTj" = ( @@ -22127,14 +22210,14 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/turf/simulated/floor/carpet/sblucarpet, +/turf/simulated/floor/tiled, /area/quartermaster/foyer) "pWD" = ( /obj/structure/table/rack, @@ -22942,7 +23025,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/carpet/sblucarpet, +/turf/simulated/floor/tiled, /area/quartermaster/foyer) "qwY" = ( /obj/structure/table/woodentable, @@ -23588,7 +23671,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "qVv" = ( /obj/machinery/fire_alarm/west_mount{ @@ -23667,11 +23750,7 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "qZW" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, /obj/structure/catwalk, -/obj/machinery/door/airlock/maintenance, /obj/structure/cable{ icon_state = "1-2" }, @@ -23836,14 +23915,14 @@ "rfW" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/effect/floor_decal/corner/red/border{ +/obj/effect/floor_decal/borderfloorblack/corner{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/corner/red/bordercorner{ + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/security/hallway) @@ -24013,13 +24092,11 @@ /turf/simulated/floor/tiled/old_cargo/white, /area/security/forensics) "rpc" = ( +/obj/structure/janitorialcart, +/obj/item/reagent_containers/glass/bucket, /obj/machinery/camera/network/civilian{ dir = 1 }, -/obj/machinery/power/apc/south_mount, -/obj/structure/cable/green{ - icon_state = "0-4" - }, /turf/simulated/floor/tiled/dark, /area/janitor) "rpK" = ( @@ -24283,7 +24360,7 @@ /obj/structure/bed/chair{ dir = 8 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/foyer) "rwx" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -24829,9 +24906,6 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "rPU" = ( -/obj/machinery/light/spot/no_nightshift{ - dir = 8 - }, /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, @@ -25005,6 +25079,18 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 5 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "rXa" = ( @@ -25334,9 +25420,8 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/light_switch{ - pixel_x = -26; - pixel_y = -4 +/obj/machinery/light/small{ + dir = 8 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_8) @@ -25885,8 +25970,8 @@ /turf/simulated/floor/tiled/steel_grid, /area/endeavour/surfacebase/mining_main/refinery) "sxA" = ( -/obj/structure/bed/double, /obj/item/bedsheet/purpledouble, +/obj/structure/bed/double/padded, /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/sleep/Dorm_5) "sxT" = ( @@ -25943,7 +26028,7 @@ /obj/structure/bed/chair{ dir = 8 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/foyer) "sAp" = ( /obj/machinery/power/apc/north_mount, @@ -26830,6 +26915,12 @@ }, /turf/simulated/floor/tiled/dark, /area/security/warden) +"tiV" = ( +/obj/machinery/light_switch{ + pixel_y = 26 + }, +/turf/simulated/floor/carpet/tealcarpet, +/area/crew_quarters/sleep/Dorm_8) "tiW" = ( /turf/simulated/floor/grass, /area/security/brig) @@ -27236,22 +27327,11 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "tzN" = ( -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock{ - name = "Custodial Closet" - }, -/obj/map_helper/access_helper/airlock/station/service/janitor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/light_switch{ + pixel_y = 26 }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/dark, -/area/janitor) +/turf/simulated/floor/carpet, +/area/crew_quarters/sleep/Dorm_10) "tAt" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -27849,7 +27929,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled, /area/quartermaster/foyer) "tWm" = ( /obj/structure/closet/l3closet/security, @@ -28211,8 +28291,8 @@ /turf/simulated/floor/tiled/steel, /area/quartermaster/delivery) "uhW" = ( -/obj/structure/bed/double, /obj/item/bedsheet/purpledouble, +/obj/structure/bed/double/padded, /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/sleep/Dorm_2) "uhZ" = ( @@ -28345,6 +28425,12 @@ /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/d3portamidhall) "ulo" = ( @@ -28598,7 +28684,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/techfloor, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/endeavour/station/stairs_three) "ute" = ( /obj/structure/disposalpipe/segment{ @@ -28926,6 +29013,16 @@ /obj/map_helper/access_helper/airlock/station/security/armory, /turf/simulated/floor/tiled/dark, /area/security/armoury) +"uHC" = ( +/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/d3portamidhall) "uIa" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -29098,19 +29195,13 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "uMe" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloorblack/corner2{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/corner/navblue/bordercorner2{ +/obj/effect/floor_decal/borderfloorblack/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/corner/navblue/bordercorner{ dir = 4 }, /turf/simulated/floor/tiled, @@ -29517,7 +29608,7 @@ /obj/machinery/door/airlock/glass{ name = "Cargo Lobby" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled, /area/quartermaster/foyer) "vaR" = ( /obj/structure/sign/securearea{ @@ -29864,7 +29955,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "vmU" = ( /obj/effect/floor_decal/corner/black{ @@ -30105,9 +30196,8 @@ /area/endeavour/hallway/d3aftmaint) "vrD" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/machinery/light_switch{ - pixel_x = 26; - pixel_y = -4 +/obj/machinery/light/small{ + dir = 4 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_7) @@ -30570,6 +30660,29 @@ }, /turf/simulated/floor/plating, /area/security/armoury) +"vEC" = ( +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock{ + name = "Custodial Closet" + }, +/obj/map_helper/access_helper/airlock/station/service/janitor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) "vEV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -30670,7 +30783,7 @@ "vIC" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/machinery/camera/network/civilian, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "vIV" = ( /obj/machinery/light/small{ @@ -30916,7 +31029,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "vOT" = ( /obj/structure/table/steel_reinforced, @@ -30986,12 +31099,12 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/refinery) "vRH" = ( -/obj/machinery/light{ - dir = 8 +/obj/machinery/door/airlock{ + name = "Custodial Closet" }, -/obj/spawner/window/low_wall/full/firelocks, -/turf/simulated/floor/plating, -/area/endeavour/station/stairs_three) +/obj/map_helper/access_helper/airlock/station/service/janitor, +/turf/simulated/floor/tiled/dark, +/area/janitor) "vRK" = ( /obj/structure/disposalpipe/sortjunction{ name = "Trash"; @@ -31419,14 +31532,11 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "wjT" = ( -/obj/landmark/spawnpoint/job/janitor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 9 }, -/obj/structure/disposalpipe/segment, +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green, /turf/simulated/floor/tiled/dark, /area/janitor) "wkh" = ( @@ -31440,7 +31550,7 @@ dir = 4; icon_state = "pipe-c" }, -/turf/simulated/floor/carpet/sblucarpet, +/turf/simulated/floor/tiled, /area/quartermaster/foyer) "wku" = ( /obj/machinery/light/small{ @@ -31714,6 +31824,9 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, +/obj/machinery/light/spot/no_nightshift{ + dir = 4 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "wtA" = ( @@ -32083,8 +32196,8 @@ /turf/simulated/floor/plating, /area/quartermaster/warehouse) "wIA" = ( -/obj/structure/bed/double, /obj/item/bedsheet/bluedouble, +/obj/structure/bed/double/padded, /turf/simulated/floor/carpet/blue, /area/crew_quarters/sleep/Dorm_3) "wIT" = ( @@ -32182,6 +32295,18 @@ specialfunctions = 4; pixel_x = -30 }, +/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 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "wOA" = ( @@ -33261,7 +33386,7 @@ /obj/structure/disposalpipe/junction{ dir = 1 }, -/turf/simulated/floor/carpet/sblucarpet, +/turf/simulated/floor/tiled, /area/quartermaster/foyer) "xDs" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, @@ -33717,11 +33842,11 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "xWe" = ( -/obj/structure/disposalpipe/segment{ +/obj/machinery/light/small{ dir = 8 }, -/turf/simulated/floor/tiled/techfloor, -/area/endeavour/station/stairs_three) +/turf/simulated/floor/carpet/purcarpet, +/area/crew_quarters/sleep/Dorm_5) "xWx" = ( /obj/machinery/fire_alarm/west_mount{ pixel_x = -24 @@ -44598,8 +44723,8 @@ oOy oOy qXh xJv -kLR -kLR +xZH +xZH pmy pmy pmy @@ -44794,7 +44919,7 @@ fTU buX lIR hXA -vRH +bWK bDG qHq pkQ @@ -44804,7 +44929,7 @@ hjP pkQ qHq kwF -xPB +bWK axk qZW dMA @@ -44983,12 +45108,12 @@ xbH xbH pYt pYt +vRH pYt pYt pYt -pYt -xWe -xPB +aUT +bWK bDG qHq qHq @@ -44998,7 +45123,7 @@ gyJ qHq qHq kwF -xPB +bWK hLo syH bUP @@ -45177,11 +45302,11 @@ mLm mLm pYt wHF -vFW -vFW +muK +muK eJd -hMG -xWe +pYt +aUT bWK xPB xPB @@ -45375,8 +45500,8 @@ pSY tON rpc pYt -xWe -xPB +aUT +bWK mmq mmq qHq @@ -45386,7 +45511,7 @@ gyJ qHq mmq mmq -xPB +bWK hLo lEY kSn @@ -45567,10 +45692,10 @@ pYt iEv egL wjT -acd -tzN +vFW +pYt aUT -xPB +bWK mmq mmq aec @@ -45580,7 +45705,7 @@ hjP aec mmq mmq -xPB +bWK hLo uQr vWK @@ -45953,7 +46078,7 @@ lCU lMH pYt oIv -muK +gMF pYt fnv tMx @@ -46342,8 +46467,8 @@ qVm pYt aAV hVe -pYt -iSj +vEC +eIC fub hHQ bYm @@ -46529,9 +46654,9 @@ mLm hwP mLm mLm -dmR -eek -eek +lMH +ukb +ukb vOS pYt pYt @@ -49439,13 +49564,13 @@ gtZ ffW ffW iSP +pwn eNB -kwo -kwo +ekD kwo uiJ -uiJ -kwo +eNB +eNB pwn jiN xiG @@ -49628,10 +49753,10 @@ pJR cmw hrc izO -bSQ -bSQ +gal +gal dyR -bSQ +gal tVX vaA gal @@ -49820,9 +49945,9 @@ nVC qPi uqr pDb -etU qAh -bSQ +qAh +gal dLj aDs jhH @@ -50404,7 +50529,7 @@ orm jEN jYU lfJ -bSQ +gal tBn wnA wnA @@ -58196,7 +58321,7 @@ uod mLw ekH aqY -imX +frY hCU ekH syZ @@ -58371,7 +58496,7 @@ vRl rBG qdW rBG -nyw +tMK nTO goK xID @@ -58391,7 +58516,7 @@ mLw ekH jUf imX -imX +dmR ekH syZ mWD @@ -58559,10 +58684,10 @@ jid jid uLy wOl -eIC ukT ukT -eIC +hMG +ukT ukT dcx len @@ -58752,13 +58877,13 @@ rWm jid jid rWA +eWb gDD -gDD -gDD +eWb jdI -gDD -gDD -jid +eWb +eWb +uHC uMe nTO fHS @@ -58978,7 +59103,7 @@ ekH vIV ekX nhQ -bmr +tzN bmr sLk nhQ @@ -59173,7 +59298,7 @@ syZ ekX nhQ oMi -bmr +oKw orX nhQ cuJ @@ -59360,7 +59485,7 @@ nTY jmJ gSN qoW -dzM +kLR pmM gSN syZ @@ -59555,7 +59680,7 @@ adH gSN kWJ dzM -dzM +nyw gSN vTg tWr @@ -60142,7 +60267,7 @@ gSN vIV ekX dlI -puL +tiV puL voV dlI @@ -60337,7 +60462,7 @@ syZ ekX dlI irP -puL +etU uSv dlI bmY @@ -60524,7 +60649,7 @@ adZ tGB hyv qzO -glK +xWe sxA hyv syZ @@ -60719,7 +60844,7 @@ kAe hyv iFu glK -glK +eek hyv syZ mWD @@ -61276,7 +61401,7 @@ jYr imb jhI hpc -frY +hpc hpc grz wtm @@ -61306,7 +61431,7 @@ hyv vIV lwh rVy -aNV +acd aNV iLr hTz @@ -61501,7 +61626,7 @@ syZ lwh rVy oez -aNV +bSQ dRK hTz aKn diff --git a/maps/endeavour/levels/deck4.dmm b/maps/endeavour/levels/deck4.dmm index 544a8d44f0ea..19e041fbe702 100644 --- a/maps/endeavour/levels/deck4.dmm +++ b/maps/endeavour/levels/deck4.dmm @@ -4825,7 +4825,7 @@ /area/endeavour/hallway/d4porthall) "fSk" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/amber, +/obj/effect/paint/sun, /turf/simulated/floor/tiled/monotile, /area/engineering/engineering_monitoring) "fSI" = ( @@ -9057,11 +9057,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/engineering/engineering_monitoring) -"kWg" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/amber, -/turf/simulated/wall/prepainted/civilian, -/area/engineering/engineering_monitoring) "kXh" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -17958,7 +17953,7 @@ /area/endeavour/command/turrets) "wpR" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/amber, +/obj/effect/paint/sun, /turf/simulated/floor/plating, /area/engineering/engineering_monitoring) "wqa" = ( @@ -33062,7 +33057,7 @@ pSm cNE tBv jtO -kWg +wpR elg elF vXQ From bb6764ab4dcd009493a95d2c791629158186725c Mon Sep 17 00:00:00 2001 From: AlphaM01 Date: Sat, 7 Dec 2024 15:22:23 -0300 Subject: [PATCH 2/4] morefixes --- maps/endeavour/levels/deck2.dmm | 4 +-- maps/endeavour/levels/deck3.dmm | 53 ++++++++++++++++++++++----------- 2 files changed, 37 insertions(+), 20 deletions(-) diff --git a/maps/endeavour/levels/deck2.dmm b/maps/endeavour/levels/deck2.dmm index 61cd1dd696a6..8bd0f9624b4d 100644 --- a/maps/endeavour/levels/deck2.dmm +++ b/maps/endeavour/levels/deck2.dmm @@ -319,6 +319,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 9 }, +/obj/structure/flora/grass/event/ferny_bush1, /turf/simulated/floor/grass/indoors, /area/tether/station/public_meeting_room) "amG" = ( @@ -13986,7 +13987,6 @@ /turf/simulated/wall/prepainted/medical, /area/medical/morgue) "iRZ" = ( -/obj/structure/flora/grass/event/ferny_bush1, /obj/effect/floor_decal/spline/plain{ dir = 8 }, @@ -17100,6 +17100,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 10 }, +/obj/structure/flora/grass/event/yellow_flowers1, /turf/simulated/floor/grass/indoors, /area/tether/station/public_meeting_room) "kWR" = ( @@ -35632,7 +35633,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/flora/grass/event/yellow_flowers1, /obj/effect/floor_decal/spline/plain{ dir = 4 }, diff --git a/maps/endeavour/levels/deck3.dmm b/maps/endeavour/levels/deck3.dmm index b4c7836f2bde..a0d3ade50690 100644 --- a/maps/endeavour/levels/deck3.dmm +++ b/maps/endeavour/levels/deck3.dmm @@ -1056,6 +1056,9 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/game_room) "aOG" = ( @@ -2053,11 +2056,10 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /obj/effect/floor_decal/borderfloorblack{ - dir = 6 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 6 + dir = 4 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) @@ -11603,6 +11605,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, +/obj/machinery/light/small, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/game_room) "icM" = ( @@ -13559,11 +13562,13 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "jGP" = ( -/obj/structure/table/gamblingtable, -/obj/item/deck/cards, -/obj/machinery/light/small{ - dir = 1 +/obj/structure/bed/chair/wood{ + dir = 4 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 }, +/obj/machinery/light/small, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/game_room) "jGZ" = ( @@ -16309,7 +16314,6 @@ "lNU" = ( /obj/structure/table/gamblingtable, /obj/item/deck/cards, -/obj/machinery/light/small, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/game_room) "lOf" = ( @@ -17420,6 +17424,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/crystal, /area/endeavour/hallway/d3fwdhall) +"mCZ" = ( +/obj/structure/bed/chair/wood{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/game_room) "mDp" = ( /turf/space, /area/space) @@ -19748,10 +19764,13 @@ dir = 8 }, /obj/effect/floor_decal/borderfloorblack{ - dir = 5 + dir = 1 }, /obj/effect/floor_decal/corner/navblue/border{ - dir = 5 + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) @@ -22270,7 +22289,7 @@ dir = 9 }, /obj/effect/floor_decal/corner/navblue/border{ - dir = 9 + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) @@ -29630,9 +29649,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 10 }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 10 - }, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "vcO" = ( @@ -39474,7 +39491,7 @@ aOy hnK dnR iCe -aOy +jGP jZR gLU gLU @@ -39664,7 +39681,7 @@ uzm uzm jAH cHy -jGP +lNU ecM dnR gRi @@ -39858,7 +39875,7 @@ cUe uzm jAH cHy -icz +mCZ iAO dnR bUI From 979fdfa7817564e19aa85f5fddf7652a4321ce8a Mon Sep 17 00:00:00 2001 From: AlphaM01 Date: Sat, 7 Dec 2024 15:38:04 -0300 Subject: [PATCH 3/4] wall & ladder --- maps/endeavour/levels/deck2.dmm | 6 +++++- maps/endeavour/levels/deck3.dmm | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/maps/endeavour/levels/deck2.dmm b/maps/endeavour/levels/deck2.dmm index 8bd0f9624b4d..47802fa2adb3 100644 --- a/maps/endeavour/levels/deck2.dmm +++ b/maps/endeavour/levels/deck2.dmm @@ -19102,6 +19102,10 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) +"mrz" = ( +/obj/structure/ladder/up, +/turf/simulated/floor/plating, +/area/maintenance/research) "mrL" = ( /obj/structure/closet/secure_closet/medical_wall/pills{ pixel_x = -32 @@ -51171,7 +51175,7 @@ pRW jRE qBd uPt -xIf +mrz xIf xIf xIf diff --git a/maps/endeavour/levels/deck3.dmm b/maps/endeavour/levels/deck3.dmm index a0d3ade50690..85d682402049 100644 --- a/maps/endeavour/levels/deck3.dmm +++ b/maps/endeavour/levels/deck3.dmm @@ -64720,7 +64720,7 @@ pRW jYr aKn alQ -alQ +mMr nue lHF ufC From be5405fa76fb0853d639fd126690c5689a7d8e2a Mon Sep 17 00:00:00 2001 From: AlphaM01 Date: Sat, 7 Dec 2024 15:58:56 -0300 Subject: [PATCH 4/4] pipe fix --- maps/endeavour/levels/deck1.dmm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/maps/endeavour/levels/deck1.dmm b/maps/endeavour/levels/deck1.dmm index 55cf4875114e..dc94504c3bc1 100644 --- a/maps/endeavour/levels/deck1.dmm +++ b/maps/endeavour/levels/deck1.dmm @@ -27543,14 +27543,14 @@ /turf/simulated/wall/r_wall/prepainted/civilian, /area/shuttle/civvie/general) "uRN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 6 }, -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, /turf/simulated/floor/tiled, /area/hallway/secondary/docking_hallway) @@ -31107,6 +31107,12 @@ /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 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/docking_hallway) "xyG" = (