diff --git a/html/changelogs/sec_disposals.yml b/html/changelogs/sec_disposals.yml new file mode 100644 index 00000000000..f229b123ad4 --- /dev/null +++ b/html/changelogs/sec_disposals.yml @@ -0,0 +1,12 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - maptweak: "Adds disposals units and coat racks to security." + - maptweak: "Adds O2 lockers around the ship on deck 2 and 3." + - maptweak: "Added a cigarette machine outside the deck 3 lounge." + - maptweak: "Made the deck 3 rafters more accessible and added a shortcut." + - maptweak: "Added emergency shutters and glass airlocks to the deck 3 port and starboard docks to lower chance of shipwide depressurization." + - maptweak: "Added a ATM outside the XO's office." + - maptweak: "Added a new bathroom under the living quarters lift room. Added a cyborg recharger to the medical bathroom and new bathroom." \ No newline at end of file diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm index 86b48a4b1a1..930845e046f 100644 --- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm +++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm @@ -11427,6 +11427,9 @@ /obj/effect/floor_decal/corner/black/full{ dir = 1 }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) "koi" = ( @@ -24943,6 +24946,9 @@ dir = 8 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/computer/guestpass{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/dark, /area/hangar/intrepid/interstitial) "wIM" = ( diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index 89a646bf0d7..b963eda3aaf 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -35,6 +35,15 @@ }, /turf/simulated/wall/r_wall, /area/security/prison) +"aal" = ( +/obj/machinery/alarm{ + pixel_y = 28 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/freezer, +/area/hallway/primary/central_two) "aaq" = ( /obj/machinery/light{ dir = 4 @@ -468,9 +477,15 @@ /turf/simulated/floor/tiled/dark, /area/engineering/lobby) "amF" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced, -/turf/simulated/floor/plating, -/area/engineering/lobby) +/obj/machinery/alarm{ + dir = 8; + pixel_x = 28 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/central_two) "amI" = ( /obj/effect/map_effect/wingrille_spawn/reinforced, /obj/machinery/door/firedoor, @@ -903,6 +918,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/item/device/radio/beacon, /turf/simulated/floor/tiled/dark, /area/crew_quarters/sleep/cryo/living_quarters_lift) "ayA" = ( @@ -1244,18 +1260,11 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_two) "aKv" = ( -/obj/structure/toilet, -/obj/machinery/light/small{ - dir = 8 +/obj/machinery/door/airlock/freezer{ + id_tag = "arrivals_unit_2"; + name = "Unit 2" }, -/obj/machinery/button/remote/airlock{ - dir = 8; - id = "arrivals_unit_2"; - name = "Door Bolt Control"; - pixel_x = 24; - specialfunctions = 4 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/freezer, /area/hallway/primary/central_two) "aKL" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -1835,6 +1844,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -32 }, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_two) "aXZ" = ( @@ -2321,6 +2331,15 @@ }, /turf/simulated/open, /area/maintenance/wing/starboard) +"bnQ" = ( +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, +/obj/machinery/computer/guestpass{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/central_two) "boE" = ( /obj/structure/window/reinforced{ dir = 8 @@ -2392,13 +2411,11 @@ /turf/simulated/floor/tiled/dark, /area/hallway/engineering) "bpC" = ( -/obj/machinery/alarm{ - pixel_y = 28 +/obj/machinery/door/airlock/freezer{ + id_tag = "central_unit_1"; + name = "Unit 1" }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/freezer, /area/hallway/primary/central_two) "bpF" = ( /obj/effect/floor_decal/corner/green/diagonal, @@ -3224,18 +3241,11 @@ /turf/simulated/wall, /area/hydroponics) "bQv" = ( -/obj/structure/toilet, -/obj/machinery/light/small{ - dir = 4 +/obj/machinery/door/airlock/freezer{ + id_tag = "arrivals_unit_1"; + name = "Unit 1" }, -/obj/machinery/button/remote/airlock{ - dir = 4; - id = "arrivals_unit_1"; - name = "Door Bolt Control"; - pixel_x = -24; - specialfunctions = 4 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/freezer, /area/hallway/primary/central_two) "bQx" = ( /obj/structure/railing/mapped{ @@ -4078,11 +4088,14 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, /obj/structure/cable/green{ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/security/brig) "cww" = ( @@ -5766,7 +5779,8 @@ pixel_y = -24 }, /obj/structure/cable/green, -/obj/item/device/radio/beacon, +/obj/structure/closet/emcloset, +/obj/item/crowbar/red, /turf/simulated/floor/tiled/dark, /area/crew_quarters/sleep/cryo/living_quarters_lift) "dCK" = ( @@ -6349,6 +6363,7 @@ c_tag = "Second Deck - Operations Entrance"; dir = 4 }, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_two) "dWA" = ( @@ -6456,9 +6471,7 @@ /turf/simulated/floor/tiled/freezer, /area/security/main) "dZG" = ( -/obj/structure/bed/stool/chair{ - dir = 4 - }, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/operations/lobby) "dZU" = ( @@ -7479,6 +7492,9 @@ /obj/effect/floor_decal/corner/blue{ dir = 5 }, +/obj/machinery/computer/guestpass{ + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/security/brig) "eIE" = ( @@ -7757,6 +7773,16 @@ /obj/machinery/light/small/emergency, /turf/simulated/floor/plating, /area/maintenance/wing/port) +"eUB" = ( +/obj/machinery/light, +/obj/effect/floor_decal/corner/blue{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/security/brig) "eUT" = ( /obj/structure/bed/stool/chair/padded/black{ dir = 4 @@ -8045,13 +8071,11 @@ /turf/simulated/floor/tiled/white, /area/medical/or2) "fak" = ( +/obj/structure/closet/emcloset, /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/disposal/small/north, +/obj/item/crowbar/red, /turf/simulated/floor/tiled/dark, /area/crew_quarters/sleep/cryo/living_quarters_lift) "fan" = ( @@ -8163,6 +8187,11 @@ "fdF" = ( /turf/simulated/wall, /area/maintenance/aux_atmospherics/deck_2/starboard) +"fdV" = ( +/obj/structure/railing/mapped, +/obj/structure/lattice, +/turf/simulated/open, +/area/hallway/primary/central_two) "fdZ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass{ @@ -8192,6 +8221,16 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) +"feo" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance{ + req_access = list(12) + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/maintenance/hangar/port) "fer" = ( /obj/structure/railing/mapped, /obj/effect/floor_decal/industrial/warning{ @@ -8819,6 +8858,8 @@ dir = 6 }, /obj/machinery/firealarm/east, +/obj/machinery/disposal/small/west, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/tiled, /area/security/security_office) "fAK" = ( @@ -8955,6 +8996,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/security/main) "fGD" = ( @@ -9160,6 +9204,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard/far) +"fKZ" = ( +/obj/structure/closet/emcloset, +/turf/simulated/floor/tiled/dark, +/area/engineering/lobby) "fLi" = ( /obj/item/trap/animal/medium, /obj/item/trap/animal/medium, @@ -9209,6 +9257,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/security/brig) "fLU" = ( @@ -10040,9 +10089,13 @@ /turf/simulated/floor/plating, /area/engineering/engine_room/tesla) "gkB" = ( -/obj/machinery/alarm{ - dir = 8; - pixel_x = 28 +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light{ + dir = 8 }, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) @@ -10125,6 +10178,13 @@ }, /turf/simulated/floor/plating, /area/medical/reception) +"gny" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/security/lobby) "gnA" = ( /obj/structure/railing/mapped{ dir = 1 @@ -10757,6 +10817,9 @@ /obj/effect/floor_decal/corner/blue{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/security/brig) "gEa" = ( @@ -11403,12 +11466,22 @@ /obj/effect/floor_decal/corner/blue{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/security/brig) "haK" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced, +/obj/structure/closet/medical_wall{ + pixel_y = 32 + }, +/obj/item/stack/medical/bruise_pack, +/obj/item/stack/medical/bruise_pack, +/obj/item/stack/medical/ointment, +/obj/item/stack/medical/ointment, /turf/simulated/floor/tiled, -/area/operations/lobby) +/area/hallway/primary/central_two) "hcF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -12282,10 +12355,19 @@ /turf/simulated/floor/plating, /area/horizonexterior) "hBQ" = ( -/obj/structure/railing/mapped, /obj/machinery/alarm{ pixel_y = 28 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/wing/port) "hCe" = ( @@ -12494,10 +12576,11 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_access = list(12) +/obj/machinery/door/airlock{ + name = "Central Washroom" }, -/turf/simulated/floor/plating, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/freezer, /area/hallway/primary/central_two) "hGK" = ( /obj/machinery/atmospherics/portables_connector{ @@ -13051,6 +13134,7 @@ /obj/effect/floor_decal/corner/brown{ dir = 5 }, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_two) "idF" = ( @@ -14052,6 +14136,7 @@ c_tag = "Engineering - Hallway 6"; dir = 8 }, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled/dark, /area/hallway/engineering/tesla) "iKg" = ( @@ -14625,9 +14710,6 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/alarm{ - pixel_y = 28 - }, /turf/simulated/floor/tiled/dark, /area/security/main) "jdB" = ( @@ -14819,10 +14901,10 @@ /turf/simulated/floor/tiled/white, /area/rnd/conference) "jjr" = ( -/obj/structure/closet/emcloset, /obj/effect/floor_decal/corner/green/full{ dir = 1 }, +/obj/structure/flora/pottedplant/random, /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_two) "jjF" = ( @@ -14980,6 +15062,16 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/lobby) +"jmH" = ( +/obj/effect/floor_decal/corner/blue{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "conpipe-c" + }, +/turf/simulated/floor/tiled, +/area/security/brig) "jmW" = ( /obj/structure/table/standard, /obj/machinery/door/firedoor, @@ -15471,10 +15563,6 @@ /obj/effect/landmark{ name = "JoinLateLift" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/sleep/cryo/living_quarters_lift) "jDa" = ( @@ -16715,14 +16803,16 @@ /turf/simulated/floor/wood, /area/hydroponics/garden) "kuS" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/door/window/southright, +/obj/structure/curtain/open/shower, +/obj/structure/window/reinforced{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, -/area/maintenance/wing/port) +/obj/machinery/shower{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled/freezer, +/area/security/main) "kvd" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, @@ -18174,6 +18264,16 @@ }, /turf/simulated/floor/plating, /area/engineering/engine_room/tesla) +"luo" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/alarm{ + pixel_y = 28 + }, +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/freezer, +/area/hallway/primary/central_two) "luT" = ( /obj/structure/railing/mapped{ dir = 4 @@ -19222,6 +19322,13 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/dark, /area/security/prison) +"lZP" = ( +/obj/effect/floor_decal/corner_wide/yellow/full{ + dir = 8 + }, +/obj/structure/closet/emcloset, +/turf/simulated/floor/tiled/dark, +/area/hallway/engineering/tesla) "lZQ" = ( /obj/structure/railing/mapped{ dir = 8 @@ -19733,10 +19840,19 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/engineering/engine_room) "mqN" = ( -/obj/structure/lattice/catwalk/indoor/grate, -/obj/structure/table/rack, -/turf/simulated/floor/plating, -/area/maintenance/hangar/port) +/obj/structure/toilet, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/button/remote/airlock{ + dir = 4; + id = "central_unit_1"; + name = "Door Bolt Control"; + pixel_x = -24; + specialfunctions = 4 + }, +/turf/simulated/floor/tiled/freezer, +/area/hallway/primary/central_two) "mrq" = ( /obj/effect/map_effect/wingrille_spawn/reinforced_phoron, /obj/structure/sign/pharmacy, @@ -19961,7 +20077,8 @@ /area/engineering/lobby) "mwH" = ( /obj/effect/map_effect/wingrille_spawn/reinforced, -/turf/simulated/floor/tiled, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, /area/hallway/primary/central_two) "mxh" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ @@ -21711,6 +21828,7 @@ req_access = list(63) }, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/security/lobby) "nxW" = ( @@ -22804,6 +22922,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) +"ojY" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_two) "okq" = ( /obj/effect/map_effect/wingrille_spawn/reinforced, /obj/machinery/door/blast/shutters{ @@ -23053,6 +23176,15 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/maintenance/aux_atmospherics/deck_2/starboard) +"otI" = ( +/obj/effect/floor_decal/corner/blue{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/security/brig) "ouk" = ( /obj/structure/bed/stool/chair/office/light{ dir = 8 @@ -23629,7 +23761,8 @@ icon_state = "2-4" }, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 1; + icon_state = "pipe-c" }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/sleep/cryo/living_quarters_lift) @@ -23686,6 +23819,12 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora_hazard) +"oLE" = ( +/obj/effect/floor_decal/industrial/loading/yellow{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_two) "oLT" = ( /obj/effect/floor_decal/corner/mauve/diagonal, /obj/machinery/door/firedoor, @@ -24265,6 +24404,16 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armory) +"pdz" = ( +/obj/effect/floor_decal/corner/blue{ + dir = 9 + }, +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" + }, +/turf/simulated/floor/tiled, +/area/security/brig) "pea" = ( /turf/simulated/floor/wood, /area/library) @@ -24278,6 +24427,7 @@ /obj/machinery/door/airlock/maintenance{ req_access = list(12) }, +/obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/hallway/primary/central_two) "pep" = ( @@ -24311,6 +24461,20 @@ /obj/machinery/light, /turf/simulated/floor/tiled, /area/engineering/storage_eva) +"pfB" = ( +/obj/structure/toilet, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/button/remote/airlock{ + dir = 4; + id = "arrivals_unit_1"; + name = "Door Bolt Control"; + pixel_x = -24; + specialfunctions = 4 + }, +/turf/simulated/floor/tiled/freezer, +/area/hallway/primary/central_two) "pgg" = ( /obj/machinery/door/airlock/highsecurity{ name = "Secure Tech Storage"; @@ -24400,9 +24564,20 @@ /obj/effect/floor_decal/corner/paleblue/full{ dir = 1 }, -/obj/machinery/megavendor/vendor, +/obj/machinery/megavendor/vendor{ + pixel_y = 16 + }, +/obj/machinery/disposal/small/west{ + pixel_y = -6 + }, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/tiled/dark, /area/crew_quarters/sleep/cryo/living_quarters_lift) +"piY" = ( +/obj/machinery/door/firedoor, +/obj/effect/map_effect/wingrille_spawn/reinforced, +/turf/simulated/floor/plating, +/area/hallway/primary/central_two) "pjK" = ( /obj/structure/flora/pottedplant/random, /obj/machinery/newscaster/security_unit{ @@ -24418,11 +24593,15 @@ /turf/simulated/open, /area/hallway/primary/central_two) "pjQ" = ( -/obj/machinery/door/airlock/freezer{ - id_tag = "arrivals_unit_2"; - name = "Unit 2" +/obj/structure/sink{ + dir = 4; + pixel_x = 12 }, -/turf/simulated/floor/tiled, +/obj/structure/mirror{ + pixel_x = 24; + pixel_y = 3 + }, +/turf/simulated/floor/tiled/freezer, /area/hallway/primary/central_two) "pkf" = ( /obj/machinery/atmospherics/pipe/simple/visible{ @@ -24432,13 +24611,10 @@ /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora) "pkH" = ( -/obj/machinery/alarm{ - pixel_y = 28 +/obj/machinery/door/airlock{ + name = "Fore Washroom" }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/freezer, /area/hallway/primary/central_two) "pkK" = ( /obj/machinery/light{ @@ -25435,7 +25611,6 @@ /area/engineering/atmos/storage) "pOl" = ( /obj/structure/stairs/west, -/obj/structure/railing/mapped, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "pOV" = ( @@ -25708,11 +25883,14 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/blue{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/security/brig) "pWx" = ( @@ -26151,8 +26329,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/security/security_office) +"qlX" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/freezer, +/area/hallway/primary/central_two) "qmy" = ( /obj/item/modular_computer/console/preset/engineering, /turf/simulated/floor/carpet/rubber, @@ -26400,11 +26585,15 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "qvd" = ( -/obj/machinery/door/airlock/freezer{ - id_tag = "arrivals_unit_1"; - name = "Unit 1" +/obj/structure/sink{ + pixel_x = -12; + dir = 8 }, -/turf/simulated/floor/tiled, +/obj/structure/mirror{ + pixel_x = -24; + pixel_y = 3 + }, +/turf/simulated/floor/tiled/freezer, /area/hallway/primary/central_two) "qvl" = ( /obj/effect/floor_decal/industrial/warning/full, @@ -26517,6 +26706,13 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/chemistry) +"qyA" = ( +/obj/machinery/door/airlock/freezer{ + id_tag = "central_unit_2"; + name = "Unit 2" + }, +/turf/simulated/floor/tiled/freezer, +/area/hallway/primary/central_two) "qzH" = ( /obj/structure/ladder/up{ pixel_y = 32 @@ -27417,6 +27613,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/aft) +"rbF" = ( +/obj/structure/bed/stool/chair{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/operations/lobby) "rbK" = ( /obj/effect/map_effect/wingrille_spawn/reinforced, /obj/structure/cable/green{ @@ -27438,11 +27640,19 @@ /turf/simulated/floor/plating, /area/engineering/storage/tech) "rca" = ( -/obj/structure/lattice/catwalk/indoor/grate, -/obj/structure/table/rack, -/obj/random/loot, -/turf/simulated/floor/plating, -/area/maintenance/hangar/port) +/obj/structure/toilet, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/button/remote/airlock{ + dir = 8; + id = "central_unit_2"; + name = "Door Bolt Control"; + pixel_x = 24; + specialfunctions = 4 + }, +/turf/simulated/floor/tiled/freezer, +/area/hallway/primary/central_two) "rck" = ( /obj/structure/cable{ icon_state = "4-8" @@ -28341,6 +28551,10 @@ /obj/effect/floor_decal/corner/blue{ dir = 10 }, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, /turf/simulated/floor/tiled, /area/security/brig) "rCd" = ( @@ -28555,7 +28769,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/structure/banner/scc, +/obj/structure/coatrack, /turf/simulated/floor/tiled, /area/security/lobby) "rIN" = ( @@ -29106,10 +29320,15 @@ /turf/simulated/floor/tiled, /area/security/brig) "rXh" = ( -/obj/machinery/light{ - dir = 1 +/obj/machinery/door/window/southleft, +/obj/machinery/shower{ + pixel_y = 24 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/curtain/open/shower, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/tiled/freezer, /area/security/main) "rXm" = ( /obj/effect/floor_decal/industrial/warning/full, @@ -29669,9 +29888,20 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "sqe" = ( -/obj/structure/barricade, -/turf/simulated/floor/tiled/dark, -/area/maintenance/hangar/port) +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/corner/blue{ + dir = 6 + }, +/obj/machinery/disposal/small/west, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/security/brig) "sqE" = ( /obj/structure/table/standard, /obj/item/device/flashlight/maglight, @@ -30130,7 +30360,10 @@ /area/storage/primary) "sIR" = ( /obj/effect/floor_decal/corner/blue/full, -/obj/structure/banner/scc, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/security/brig) "sJi" = ( @@ -30378,7 +30611,7 @@ /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/operations/lobby) +/area/storage/primary) "sRw" = ( /obj/effect/floor_decal/corner/blue{ dir = 6 @@ -31228,6 +31461,13 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) +"trC" = ( +/obj/machinery/door/airlock/glass{ + name = "Deck 2 Stairwell" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_two) "tsf" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -31315,6 +31555,10 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -28 + }, /turf/simulated/floor/tiled/dark, /area/security/main) "tvk" = ( @@ -31844,6 +32088,9 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -32 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/security/brig) "tKB" = ( @@ -32469,10 +32716,12 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/blue, +/obj/structure/disposalpipe/junction{ + dir = 2 + }, /turf/simulated/floor/tiled, /area/security/brig) "udR" = ( @@ -33871,6 +34120,9 @@ /obj/structure/cable{ icon_state = "0-2" }, +/obj/structure/railing/mapped{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/wing/port) "uPW" = ( @@ -35459,6 +35711,7 @@ /obj/effect/floor_decal/corner/blue/full{ dir = 8 }, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/security/armory) "vQd" = ( @@ -36470,6 +36723,24 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/plating, /area/operations/mail_room) +"wou" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve{ + dir = 5 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/computer/guestpass{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/dark, +/area/rnd/hallway) "wox" = ( /obj/structure/railing/mapped{ dir = 1 @@ -36963,11 +37234,11 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/security/brig) "wDa" = ( @@ -37754,6 +38025,10 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/machinery/disposal/small/north, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/security/lobby) "wYk" = ( @@ -38466,12 +38741,10 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "xtR" = ( -/obj/structure/bed/stool/chair{ - dir = 4 - }, /obj/effect/floor_decal/corner/blue{ dir = 9 }, +/obj/structure/coatrack, /turf/simulated/floor/tiled, /area/security/main) "xuj" = ( @@ -38544,6 +38817,7 @@ /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/security/armory) "xxc" = ( @@ -38794,6 +39068,20 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armory) +"xGc" = ( +/obj/structure/toilet, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/button/remote/airlock{ + dir = 8; + id = "arrivals_unit_2"; + name = "Door Bolt Control"; + pixel_x = 24; + specialfunctions = 4 + }, +/turf/simulated/floor/tiled/freezer, +/area/hallway/primary/central_two) "xGl" = ( /obj/machinery/light/small/emergency, /turf/simulated/floor/tiled/ramp{ @@ -51189,7 +51477,7 @@ nry rew ngg dZG -rCR +fzh myG myG jUU @@ -51390,8 +51678,8 @@ poJ oXw qCF uGL -vte -rCR +rbF +fzh pqE sIp rnO @@ -51593,7 +51881,7 @@ qqs rew wvK ggy -rCR +fzh myG vQQ hmK @@ -51795,7 +52083,7 @@ kmc kmc ohc uci -rCR +fzh liv vQQ pxh @@ -51997,7 +52285,7 @@ fjg rVg het vte -rCR +fzh psH vQQ pxh @@ -52401,7 +52689,7 @@ udv qra jVR iap -rCR +fzh bPh xqX qNy @@ -52603,14 +52891,14 @@ qzR rVg vua sjv -rCR jWV jWV jWV jWV jWV jWV -gOH +jWV +haK aFJ wFj wFj @@ -52805,7 +53093,7 @@ tBS tBZ uzU vte -rCR +jWV iXv xnv qlp @@ -53007,7 +53295,7 @@ iNS oOK uzU uci -rCR +jWV snB gHn dsj @@ -53209,7 +53497,7 @@ ksC ksC wRu cUh -rCR +jWV dVt chj ijD @@ -53411,7 +53699,7 @@ rZh rZh uzU vte -rCR +jWV jWV ldT jWV @@ -53614,7 +53902,7 @@ ubX qRE bXB xWz -tXJ +gkB wIA lMB tXJ @@ -54014,10 +54302,10 @@ dzc dBB kbc sDc -rCR -rCR -rCR -rCR +ayF +ayF +ayF +ayF ayF ayF ayF @@ -54216,14 +54504,14 @@ rCR rCR jUP fhD -haK -pOl -kAJ ayF +pOl +ayF +pfB bQv qvd -gOH -gOH +ayF +jLM cne hUe oGp @@ -54420,10 +54708,10 @@ hfI ffT mwH gOH -gOH ayF ayF ayF +aal pkH gOH eWm @@ -54620,13 +54908,13 @@ gOH gOH ohQ fqr -rfQ -gOH -gkB +trC +oLE ayF +xGc aKv pjQ -gOH +ayF mYx dmD wUU @@ -55425,8 +55713,8 @@ hzY hOU dKH xoj -pyc -nEx +bJp +fdV mfA gJj sCE @@ -58262,9 +58550,9 @@ lWg lWg lWg gOL -sqe gOL -vhu +gOL +feo sKJ agU hST @@ -58464,9 +58752,9 @@ ayv rYM lWg mqN -iRM -gOL -vhu +bpC +qvd +qlX sKJ bYY aas @@ -58665,10 +58953,10 @@ iKF ozz cJI lWg -gOL -iRM -gOL -vhu +ayF +ayF +luo +qlX sKJ uhw nxW @@ -58868,9 +59156,9 @@ jCL fak lWg rca -iRM -gOL -vhu +qyA +pjQ +qlX sKJ hCo ayT @@ -59468,7 +59756,7 @@ uyd nmG hNC fqr -ayF +piY gBE xSq qfC @@ -59627,7 +59915,7 @@ cFw mGY vbc inD -mMz +lZP dFC qtY nlT @@ -59862,7 +60150,7 @@ fHo ntN gDw wPF -cDV +bnQ cDV mFs mWs @@ -59872,8 +60160,8 @@ cDV eQs ghX fqr -ayF -bpC +ojY +gBE iWc eqv hIq @@ -60244,7 +60532,7 @@ bwU nvW fnn aql -uLw +fKZ uLw kRM uLw @@ -60276,8 +60564,8 @@ vyg vyg kta eZG -ayF -gBE +piY +amF jgb ncN gBE @@ -60454,7 +60742,7 @@ nge nge ajN ajN -amF +xEH sYl ayF hvu @@ -63103,7 +63391,7 @@ rgH pvt jYJ ozE -gjU +otI efA sHm hzC @@ -63305,7 +63593,7 @@ mrK wYe mcY gNq -dwK +eUB efA eCR sBr @@ -63504,7 +63792,7 @@ bDo ejO mrK mrK -mrK +gny nxz fLB rBL @@ -63915,8 +64203,8 @@ gDT fOn fPP vMF -fPP -fPP +jmH +pdz haI fPP oSe @@ -64118,7 +64406,7 @@ dJZ ing mXw pWj -ing +sqe cuQ ing vlr @@ -64699,7 +64987,7 @@ cNU uFM eUj cNU -dDS +wou rnA uTr uTr @@ -69361,9 +69649,9 @@ hjT gyC xsY xiu -kuS jqD ifU +rXh jcL yef tvc @@ -69563,10 +69851,10 @@ iwo iwo iwo iwo -jOv ryu ifU -rXh +kuS +kSM fGs kSM pDh @@ -69765,9 +70053,9 @@ iwo wbL egq iwo -pXp ryu ifU +ifU mVb ifU igT @@ -69968,7 +70256,7 @@ jpO vIz iwo hBQ -ryu +fDV ifU lZp ifU diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index 8e0c4394b47..8806cbce6e3 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -80,6 +80,7 @@ pictures_left = 30 }, /obj/item/storage/slide_projector, +/obj/item/material/ashtray/bronze, /turf/simulated/floor/carpet, /area/security/forensics_office{ name = "Security - Investigations Office" @@ -722,10 +723,7 @@ /area/lawoffice/representative) "bC" = ( /obj/structure/lattice, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/railing/mapped{ +/obj/machinery/light{ dir = 8 }, /turf/simulated/open, @@ -1195,6 +1193,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "cF" = ( @@ -1435,18 +1434,19 @@ /turf/simulated/floor/carpet, /area/lawoffice/consular) "dh" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced/firedoor, -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor, +/obj/machinery/atm{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "di" = ( /obj/structure/window/reinforced{ dir = 8 }, +/obj/structure/table/reinforced, /turf/simulated/floor/tiled/dark, /area/bridge) "dj" = ( @@ -1722,9 +1722,12 @@ /turf/simulated/floor/tiled/white, /area/medical/equipment) "dG" = ( -/obj/effect/floor_decal/corner/paleblue/full, -/turf/simulated/floor/tiled, -/area/hallway/crew_area) +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/structure/lattice, +/turf/simulated/open, +/area/hallway/primary/starboard) "dH" = ( /obj/machinery/alarm{ dir = 1; @@ -2051,9 +2054,6 @@ /area/lawoffice/representative) "ek" = ( /obj/item/modular_computer/console/preset/command/account, -/obj/machinery/atm{ - pixel_y = 32 - }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop/xo) "el" = ( @@ -2081,7 +2081,7 @@ id_tag = "main_unit_1"; name = "Unit 1" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/freezer, /area/crew_quarters/toilet) "er" = ( /obj/structure/bed/stool/chair/office/bridge{ @@ -2310,6 +2310,14 @@ }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) +"eT" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/lattice, +/turf/simulated/open, +/area/hallway/crew_area) "eV" = ( /obj/structure/table/wood, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -2397,13 +2405,8 @@ /turf/simulated/floor/carpet/rubber, /area/lawoffice/representative) "fk" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/mapped{ - dir = 4 - }, -/obj/structure/railing/mapped{ - dir = 8 - }, +/obj/structure/railing/mapped, +/obj/structure/lattice, /turf/simulated/open, /area/hallway/crew_area) "fl" = ( @@ -2548,6 +2551,13 @@ }, /turf/simulated/floor/tiled/white, /area/security/forensics_morgue) +"fG" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/starboard) "fH" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -2917,12 +2927,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/hallway/crew_area) "gF" = ( @@ -3641,6 +3649,19 @@ }, /turf/simulated/floor, /area/maintenance/security_starboard) +"ig" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/effect/floor_decal/corner/grey/diagonal{ + dir = 8 + }, +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/toilet) "ih" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3692,11 +3713,13 @@ /turf/simulated/floor/tiled/white, /area/medical/ward/isolation) "im" = ( -/obj/machinery/door/airlock/glass, /obj/effect/floor_decal/corner/paleblue{ dir = 5 }, /obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass{ + name = "Deck 3 Port Docks" + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "in" = ( @@ -3794,9 +3817,6 @@ icon_state = "pipe-c" }, /obj/structure/lattice/catwalk, -/obj/structure/railing/mapped{ - dir = 8 - }, /turf/simulated/open, /area/hallway/crew_area) "ix" = ( @@ -3810,6 +3830,15 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/bridge) +"iy" = ( +/obj/structure/railing/mapped{ + dir = 1 + }, +/obj/structure/railing/mapped{ + dir = 8 + }, +/turf/simulated/open, +/area/hallway/primary/starboard) "iz" = ( /obj/machinery/light{ dir = 4 @@ -4191,10 +4220,6 @@ dir = 4 }, /obj/structure/lattice/catwalk, -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/structure/railing/mapped, /turf/simulated/open, /area/hallway/crew_area) "jA" = ( @@ -4393,10 +4418,6 @@ dir = 4 }, /obj/structure/lattice/catwalk, -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/structure/railing/mapped, /turf/simulated/open, /area/hallway/crew_area) "jW" = ( @@ -4442,8 +4463,30 @@ dir = 5 }, /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) +"kc" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/emergency) "kd" = ( /obj/machinery/newscaster{ pixel_x = 32 @@ -4528,6 +4571,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/exam) +"ko" = ( +/obj/structure/railing/mapped{ + dir = 1 + }, +/turf/simulated/open, +/area/hallway/crew_area) "kp" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -4886,6 +4935,13 @@ /area/crew_quarters/fitness/pool) "lk" = ( /obj/structure/window/reinforced, +/obj/structure/lattice, +/obj/structure/railing/mapped{ + dir = 1 + }, +/obj/structure/railing/mapped{ + dir = 8 + }, /turf/simulated/open, /area/hallway/crew_area) "ll" = ( @@ -5097,12 +5153,7 @@ }, /obj/structure/disposalpipe/segment, /obj/structure/lattice/catwalk, -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/structure/railing/mapped{ - dir = 4 - }, +/obj/machinery/door/window, /turf/simulated/open, /area/hallway/crew_area) "lM" = ( @@ -5492,6 +5543,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "mH" = ( @@ -5507,6 +5559,16 @@ }, /turf/simulated/floor/tiled, /area/bridge) +"mJ" = ( +/obj/machinery/door/airlock/glass{ + name = "Deck 3 Port Docks" + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/hallway/primary/starboard) "mK" = ( /obj/machinery/case_button/shuttle{ pixel_y = 32 @@ -5626,7 +5688,7 @@ req_access = null; specialfunctions = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/freezer, /area/crew_quarters/toilet) "mY" = ( /obj/item/device/taperecorder{ @@ -5961,15 +6023,12 @@ /obj/machinery/status_display{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "nL" = ( @@ -6322,6 +6381,13 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/lounge) +"oB" = ( +/obj/structure/railing/mapped, +/obj/structure/railing/mapped{ + dir = 8 + }, +/turf/simulated/open, +/area/hallway/primary/starboard) "oC" = ( /obj/item/device/mass_spectrometer/adv{ pixel_y = 3 @@ -6344,6 +6410,7 @@ /obj/effect/floor_decal/corner/blue/full{ dir = 4 }, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/bridge/bridge_crew) "oE" = ( @@ -6567,13 +6634,13 @@ /area/maintenance/bridge) "pj" = ( /obj/effect/floor_decal/corner/paleblue/full, -/obj/machinery/vending/coffee, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "pk" = ( @@ -6972,6 +7039,10 @@ }, /turf/simulated/floor/plating, /area/hallway/secondary/entry/emergency) +"pV" = ( +/obj/structure/lattice, +/turf/simulated/open, +/area/hallway/crew_area) "pW" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -6993,9 +7064,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 6 }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/hallway/crew_area) "qa" = ( @@ -7570,9 +7639,7 @@ pixel_x = 28; req_one_access = list(24,11,55) }, -/obj/structure/bed/stool/chair/plastic{ - dir = 8 - }, +/obj/machinery/recharge_station, /turf/simulated/floor/tiled/white, /area/medical/washroom) "rp" = ( @@ -8043,8 +8110,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass{ + name = "Deck 3 Starboard Docks" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/tiled, /area/hallway/crew_area) @@ -8127,6 +8201,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) +"sD" = ( +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/structure/lattice, +/turf/simulated/open, +/area/hallway/primary/starboard) "sE" = ( /turf/simulated/floor, /area/tcommsat/entrance) @@ -8207,18 +8288,25 @@ req_access = null; specialfunctions = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/freezer, /area/crew_quarters/toilet) "sO" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "sQ" = ( @@ -8338,13 +8426,10 @@ /turf/simulated/floor/tiled, /area/security/investigations_storage) "tf" = ( -/obj/structure/lattice/catwalk, /obj/structure/railing/mapped{ - dir = 8 - }, -/obj/structure/railing/mapped{ - dir = 4 + dir = 1 }, +/obj/structure/lattice, /turf/simulated/open, /area/hallway/crew_area) "tg" = ( @@ -8459,9 +8544,6 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/fitness/pool) "tu" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/effect/floor_decal/corner/paleblue{ dir = 5 }, @@ -8735,9 +8817,6 @@ /turf/simulated/floor/tiled/dark, /area/bridge/aibunker) "ud" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -9101,6 +9180,14 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) +"vc" = ( +/obj/structure/window/reinforced, +/obj/structure/lattice, +/obj/structure/railing/mapped{ + dir = 4 + }, +/turf/simulated/open, +/area/hallway/crew_area) "vd" = ( /obj/structure/cable{ icon_state = "1-2" @@ -9193,6 +9280,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 5 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/hallway/crew_area) "vs" = ( @@ -9245,6 +9333,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, +/obj/structure/closet/walllocker/emerglocker/south, /turf/simulated/floor/tiled, /area/hallway/crew_area) "vA" = ( @@ -9454,6 +9543,13 @@ /obj/machinery/light{ dir = 1 }, +/obj/structure/closet/medical_wall{ + pixel_y = 32 + }, +/obj/item/stack/medical/bruise_pack, +/obj/item/stack/medical/bruise_pack, +/obj/item/stack/medical/ointment, +/obj/item/stack/medical/ointment, /turf/simulated/floor/tiled, /area/hallway/crew_area) "wl" = ( @@ -9793,9 +9889,6 @@ /turf/simulated/floor/tiled/white, /area/security/forensics_morgue) "xb" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/bed/stool/chair, /turf/simulated/floor/tiled, /area/hallway/crew_area) @@ -10319,6 +10412,16 @@ /obj/machinery/anti_bluespace, /turf/simulated/floor/carpet, /area/crew_quarters/captain) +"yv" = ( +/obj/machinery/vending/cigarette, +/obj/effect/floor_decal/corner/paleblue/full{ + dir = 8 + }, +/obj/structure/railing/mapped{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/crew_area) "yy" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 10 @@ -10587,6 +10690,15 @@ }, /turf/simulated/floor/tiled, /area/bridge/aibunker) +"zg" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/obj/structure/railing/mapped{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/crew_area) "zh" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -10810,8 +10922,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass{ + name = "Deck 3 Port Docks" }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) @@ -10895,6 +11008,7 @@ /obj/structure/window/reinforced{ dir = 4 }, +/obj/structure/table/reinforced, /turf/simulated/floor/tiled/dark, /area/bridge) "zY" = ( @@ -11157,12 +11271,12 @@ /obj/structure/railing/mapped{ dir = 1 }, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/railing/mapped{ dir = 8 }, +/obj/structure/railing/mapped{ + dir = 4 + }, /turf/simulated/open, /area/hallway/primary/starboard) "AH" = ( @@ -11262,21 +11376,12 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/cable{ - icon_state = "2-4" - }, /obj/machinery/light{ dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "AV" = ( @@ -11593,6 +11698,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/sign/nosmoking_1{ + pixel_y = -32 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo) "BI" = ( @@ -11794,6 +11902,12 @@ }, /turf/simulated/floor/tiled, /area/hallway/crew_area) +"Cm" = ( +/obj/machinery/door/firedoor, +/obj/structure/grille, +/obj/structure/window/shuttle/scc_space_ship, +/turf/simulated/floor/plating, +/area/hallway/crew_area) "Cn" = ( /obj/machinery/telecomms/hub/preset, /turf/simulated/floor/bluegrid{ @@ -12505,6 +12619,22 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) +"Ef" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/railing/mapped, +/turf/simulated/floor/tiled, +/area/hallway/crew_area) "Eg" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -12524,6 +12654,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "Ek" = ( @@ -12724,9 +12855,6 @@ /turf/simulated/floor/tiled/dark, /area/bridge/selfdestruct) "EN" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/table/standard, /obj/item/material/ashtray/glass, /turf/simulated/floor/tiled, @@ -13041,6 +13169,22 @@ /obj/item/modular_computer/console/preset/command, /turf/simulated/floor/tiled/dark, /area/bridge/aibunker) +"FD" = ( +/obj/structure/bed/stool/bar/padded/red, +/obj/effect/floor_decal/corner/red/full{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/starboard) "FE" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -13407,8 +13551,8 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 +/obj/effect/floor_decal/industrial/loading/yellow{ + dir = 8 }, /turf/simulated/floor/tiled, /area/hallway/crew_area) @@ -13526,6 +13670,16 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) +"GP" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass{ + name = "Deck 3 Starboard Docks" + }, +/turf/simulated/floor/tiled, +/area/hallway/crew_area) "GQ" = ( /obj/structure/grille, /obj/structure/window/shuttle/scc_space_ship, @@ -13686,6 +13840,7 @@ /area/crew_quarters/heads/hop/xo) "Hk" = ( /obj/effect/floor_decal/corner_wide/blue/full, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled/dark, /area/crew_quarters/fitness/pool) "Hl" = ( @@ -13761,7 +13916,6 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, @@ -13771,6 +13925,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/airlock/glass{ + name = "Deck 3 Port Docks" + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "Hu" = ( @@ -14105,7 +14262,7 @@ id_tag = "main_unit_2"; name = "Unit 2" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/freezer, /area/crew_quarters/toilet) "Ii" = ( /obj/structure/table/standard, @@ -14178,6 +14335,9 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 5 }, +/obj/machinery/door/airlock/glass{ + name = "Deck 3 Starboard Docks" + }, /turf/simulated/floor/tiled, /area/hallway/crew_area) "Iv" = ( @@ -14271,9 +14431,6 @@ /turf/simulated/floor/tiled/dark, /area/bridge/selfdestruct) "IF" = ( -/obj/structure/sign/nosmoking_1{ - pixel_y = -32 - }, /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ icon_state = "4-8" @@ -14288,6 +14445,9 @@ c_tag = "Third Deck - Cryostorage"; dir = 1 }, +/obj/machinery/computer/cryopod{ + pixel_y = -33 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo) "IG" = ( @@ -14537,6 +14697,13 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) +"Jd" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/lattice, +/turf/simulated/open, +/area/hallway/crew_area) "Je" = ( /obj/machinery/door/firedoor, /obj/effect/floor_decal/corner/blue{ @@ -14658,6 +14825,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/crew_area) "Js" = ( @@ -14775,6 +14948,7 @@ /obj/machinery/light/small/red{ dir = 8 }, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled/dark, /area/bridge/aibunker) "JG" = ( @@ -15133,6 +15307,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/closet/walllocker/emerglocker/south, /turf/simulated/floor/tiled, /area/hallway/crew_area) "Kv" = ( @@ -15218,6 +15396,9 @@ /obj/machinery/light{ dir = 8 }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/hallway/crew_area) "KD" = ( @@ -15828,26 +16009,17 @@ /area/hallway/primary/starboard) "Mb" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/computer/cryopod{ - pixel_x = 32 - }, -/obj/machinery/megavendor/vendor, +/obj/structure/closet/emcloset, +/obj/item/crowbar/red, +/obj/item/crowbar/red, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo) "Mc" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/railing/mapped{ + dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/turf/simulated/floor/tiled/dark, -/area/hallway/primary/starboard) +/turf/simulated/floor/tiled, +/area/hallway/crew_area) "Me" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -15890,13 +16062,19 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, -/obj/machinery/vending/snack, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/closet/medical_wall{ + pixel_y = -32 + }, +/obj/item/stack/medical/bruise_pack, +/obj/item/stack/medical/bruise_pack, +/obj/item/stack/medical/ointment, +/obj/item/stack/medical/ointment, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "Mi" = ( @@ -16057,6 +16235,15 @@ /obj/structure/table/wood, /turf/simulated/floor/carpet, /area/bridge/meeting_room) +"MG" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/obj/machinery/computer/guestpass{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/starboard) "MH" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -16224,12 +16411,9 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "Nc" = ( -/obj/structure/lattice, -/obj/structure/railing/mapped{ - dir = 1 - }, +/obj/structure/railing/mapped, /turf/simulated/open, -/area/hallway/primary/starboard) +/area/hallway/crew_area) "Nd" = ( /obj/structure/closet/secure_closet/guncabinet{ name = "Weaponry (Anti-Materiel)" @@ -16390,6 +16574,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/blue/full, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/bridge) "Nv" = ( @@ -16490,6 +16675,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/door/airlock/glass{ + name = "Deck 3 Starboard Docks" + }, /turf/simulated/floor/tiled, /area/hallway/crew_area) "NJ" = ( @@ -16897,6 +17085,13 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) +"OA" = ( +/obj/effect/floor_decal/corner/blue{ + dir = 6 + }, +/obj/structure/closet/walllocker/emerglocker/east, +/turf/simulated/floor/tiled, +/area/bridge) "OB" = ( /obj/effect/floor_decal/corner/grey/diagonal{ dir = 8 @@ -16982,6 +17177,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/crew_area) "OM" = ( @@ -17257,6 +17458,13 @@ }, /turf/simulated/floor/tiled, /area/bridge) +"Pr" = ( +/obj/structure/lattice, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/open, +/area/hallway/primary/starboard) "Ps" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille/diagonal, @@ -17555,6 +17763,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 6 }, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/hallway/crew_area) "PX" = ( @@ -17642,6 +17851,20 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/cafeteria) +"Qe" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/starboard) "Qg" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -17699,7 +17922,6 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/fitness/pool) "Qm" = ( -/obj/machinery/door/airlock/glass, /obj/machinery/door/firedoor, /obj/effect/floor_decal/corner/paleblue{ dir = 10 @@ -17716,6 +17938,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/door/airlock/glass{ + name = "Deck 3 Port Docks" + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "Qn" = ( @@ -17850,6 +18075,7 @@ layer = 4; pixel_y = 32 }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/hallway/crew_area) "QD" = ( @@ -17933,6 +18159,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/crew_quarters/cafeteria) +"QL" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor, +/area/hallway/primary/starboard) "QM" = ( /obj/structure/cable/cyan{ icon_state = "2-8" @@ -18062,6 +18297,7 @@ /area/template_noop) "Ri" = ( /obj/machinery/vending/cola, +/obj/effect/floor_decal/corner/paleblue/full, /turf/simulated/floor/tiled, /area/hallway/crew_area) "Rj" = ( @@ -18293,6 +18529,21 @@ }, /turf/simulated/floor/tiled/dark, /area/security/vacantoffice) +"RO" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/emergency) "RR" = ( /obj/machinery/cryopod, /obj/effect/floor_decal/corner/grey/diagonal, @@ -18626,13 +18877,13 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 5 }, -/obj/machinery/light{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass{ + name = "Deck 3 Port Docks" + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "SF" = ( @@ -18984,9 +19235,6 @@ /turf/simulated/floor/tiled/white, /area/medical/ward/isolation) "TF" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/bed/stool/chair{ dir = 1 }, @@ -19016,15 +19264,11 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/locker) "TJ" = ( -/obj/structure/railing/mapped, /obj/structure/window/reinforced, /obj/structure/lattice, /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/railing/mapped{ - dir = 8 - }, /turf/simulated/open, /area/hallway/primary/starboard) "TK" = ( @@ -19689,6 +19933,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/crew_area) "Vs" = ( @@ -19779,12 +20029,12 @@ /area/crew_quarters/captain) "VA" = ( /obj/structure/railing/mapped, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/railing/mapped{ dir = 8 }, +/obj/structure/railing/mapped{ + dir = 4 + }, /turf/simulated/open, /area/hallway/primary/starboard) "VB" = ( @@ -19923,13 +20173,6 @@ /area/maintenance/substation/command) "VV" = ( /obj/structure/bed/stool/bar/padded/red, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, /obj/effect/floor_decal/corner/red/full{ dir = 8 }, @@ -20029,7 +20272,6 @@ /obj/effect/floor_decal/corner/grey/diagonal{ dir = 8 }, -/obj/machinery/recharge_station, /obj/machinery/light, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) @@ -20339,6 +20581,15 @@ /obj/structure/table/wood, /turf/simulated/floor/carpet, /area/crew_quarters/lounge) +"Xi" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/obj/machinery/alarm{ + pixel_y = 28 + }, +/turf/simulated/floor/tiled, +/area/hallway/crew_area) "Xj" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -20409,6 +20660,7 @@ /area/lawoffice/consular) "Xu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/coatrack, /turf/simulated/floor/lino/grey, /area/security/forensics_office{ name = "Security - Investigations Office" @@ -20473,26 +20725,20 @@ /turf/simulated/floor/carpet/rubber, /area/lawoffice/representative) "XC" = ( -/obj/structure/railing/mapped, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/railing/mapped{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor, -/area/hallway/primary/starboard) +/turf/simulated/open, +/area/hallway/crew_area) "XD" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/hallway/crew_area) "XE" = ( @@ -20514,6 +20760,9 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, +/obj/machinery/door/airlock/glass{ + name = "Deck 3 Starboard Docks" + }, /turf/simulated/floor/tiled, /area/hallway/crew_area) "XI" = ( @@ -20553,6 +20802,7 @@ /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/structure/closet/walllocker/emerglocker/north, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "XN" = ( @@ -20601,12 +20851,16 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "XR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/floor_decal/corner/red{ dir = 5 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "XS" = ( @@ -20975,22 +21229,12 @@ /turf/simulated/floor, /area/maintenance/security_starboard) "YN" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/corner_wide/blue{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/lattice/catwalk, -/obj/structure/lattice/catwalk, -/turf/simulated/open, -/area/hallway/crew_area) +/obj/structure/closet/emcloset, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/starboard) "YO" = ( /obj/structure/cable{ icon_state = "4-8" @@ -21307,6 +21551,21 @@ }, /turf/simulated/floor/tiled, /area/security/investigations) +"Zt" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/crew_area) "Zv" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 10 @@ -21577,6 +21836,13 @@ }, /turf/simulated/floor/tiled/dark, /area/security/vacantoffice) +"ZY" = ( +/obj/structure/lattice, +/obj/structure/railing/mapped{ + dir = 1 + }, +/turf/simulated/open, +/area/hallway/crew_area) "ZZ" = ( /obj/structure/table/wood, /turf/simulated/floor/carpet, @@ -31796,8 +32062,8 @@ at at at at -GQ -WL +eb +sb OL eb at @@ -32200,9 +32466,9 @@ at at at at -eb -pm -Ku +Cm +WL +Zt GQ at at @@ -32402,9 +32668,9 @@ at at at at -eb +Cm WL -Ku +Zt GQ at at @@ -32604,9 +32870,9 @@ at at at at -eb -pm -Ku +Cm +WL +Zt GQ Qw at @@ -33008,8 +33274,8 @@ at at at at -GQ -sb +eb +GP st eb eb @@ -34221,7 +34487,7 @@ at at at eb -WL +Xi tL jH Rd @@ -35435,7 +35701,7 @@ pm pm pm Ix -pm +EP Nq KJ Nl @@ -35603,7 +35869,7 @@ xF zQ UI zQ -IO +ig mf mf dY @@ -35838,9 +36104,9 @@ xb EN TF pm -oJ +Ef pm -GB +yv KC Ri vS @@ -36035,16 +36301,16 @@ ul xO Hx Fm -js -js -js -lk +Jd +Jd +Jd +eT pm -oJ +Ef pm -GB +zg UO -pm +EP vS el sp @@ -36239,14 +36505,14 @@ iB Fm js js -js -lk +XC +vc pm oJ +Mc pm -nD ud -dG +EP vS YU fg @@ -36439,7 +36705,7 @@ ji ya Uy HD -tf +pV fk iw lL @@ -36642,7 +36908,7 @@ jZ xn Fm js -js +Nc jz lk pZ @@ -36844,10 +37110,10 @@ YR GX Fm js -js +Nc jz -js -js +ZY +Jd xA Bx Ti @@ -37046,9 +37312,9 @@ nr kn nr js -js +Nc jz -js +ko js os vJ @@ -37248,9 +37514,9 @@ sn dv ct js -js +Nc jz -js +ko js os Jw @@ -37449,11 +37715,11 @@ LJ Pl MP ct +pV +fk +jU tf -tf -YN -tf -tf +pV xA EB eW @@ -37652,9 +37918,9 @@ Vt Mr ct js -js +Nc jU -js +ko js os ay @@ -37854,9 +38120,9 @@ yb Xy ct js -js +Nc jU -js +ko js os RN @@ -41065,7 +41331,7 @@ Un Un JA Un -Un +YN xs Lg tb @@ -41473,11 +41739,11 @@ xs xs rY iY -co -bC -bC -bC +lu +UV +UV bC +Pr TJ HH lT @@ -41674,15 +41940,15 @@ lI lI xs AU -Mc -dh -VP -VP -VP -VP -XC +iY +LR +TN +TN +mu +TN +KO VV -ka +FD ka cn cm @@ -41876,13 +42142,13 @@ fp fp aV sO -iY -co -UV -UV -UV -WD -cV +Qe +QL +VP +VP +VP +VP +VP XR kb QW @@ -42079,12 +42345,12 @@ xs xs uV iY -co -UV -UV -UV -WD -cV +iy +vY +vY +JO +vY +oB Ls mh mh @@ -42284,8 +42550,8 @@ JJ lu UV UV -UV WD +UV cV Zi QU @@ -42486,8 +42752,8 @@ iY lu UV UV -UV WD +UV cV BK Am @@ -42685,7 +42951,7 @@ hY kF tR dM -Nc +PM WD WD WD @@ -42707,7 +42973,7 @@ uk yh uk uk -CN +fG US ZS US @@ -42890,13 +43156,13 @@ iY lu UV UV -UV WD UV UV +UV vY -JO vY +dG vY vY cV @@ -42932,8 +43198,8 @@ yn ZS yn GW -dB -dB +OA +OA Sc yA eL @@ -43092,14 +43358,14 @@ Yb lu UV UV -UV WD UV UV UV -WD UV UV +WD +UV UV cV Ou @@ -43293,15 +43559,15 @@ UH JB lu UV -UV -UV +WD sF +WD UV UV UV +WD sF -UV -UV +WD UV cV Ou @@ -43495,16 +43761,16 @@ gl dM PM WD -WD BU jY yJ WD +WD +WD BU jY yJ WD -WD GE Ou WN @@ -43697,15 +43963,15 @@ gl iY lu UV -UV -UV +WD Dt +WD UV UV UV +WD Dt -UV -UV +WD UV cV Ou @@ -43900,14 +44166,14 @@ iY lu UV UV -UV WD UV UV UV -WD UV UV +WD +UV UV cV Ou @@ -43915,7 +44181,7 @@ oY co Ou Uq -CN +dh vx ek tc @@ -44102,14 +44368,14 @@ iY LR TN TN -TN -mu +sD TN TN TN -mu TN TN +sD +TN TN KO Ou @@ -44319,7 +44585,7 @@ Ji co Ou Uq -CN +MG vx MA Rk @@ -45107,7 +45373,7 @@ po po po po -im +mJ Ht rl TG @@ -47336,8 +47602,8 @@ at at at yP -ZC -IL +uH +RO rl TT wq @@ -47538,7 +47804,7 @@ at at at Cu -uH +kc nK rl hp