From 1909f866812e3706adef25e8bebb05795d8fbced Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 11 Feb 2024 09:08:29 +0100 Subject: [PATCH 1/9] regroup living area together. --- code/game/area/almayer.dm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/code/game/area/almayer.dm b/code/game/area/almayer.dm index 8acad9821cdd..0ed77fd274bd 100644 --- a/code/game/area/almayer.dm +++ b/code/game/area/almayer.dm @@ -328,19 +328,6 @@ icon_state = "exoarmor" fake_zlevel = 2 -/area/almayer/living - minimap_color = MINIMAP_AREA_COLONY - -/area/almayer/living/tankerbunks - name = "\improper Lower Deck Vehicle Crew Bunks" - icon_state = "livingspace" - fake_zlevel = 2 - -/area/almayer/living/auxiliary_officer_office - name = "\improper Lower Deck Auxiliary Support Officer office" - icon_state = "livingspace" - fake_zlevel = 2 - /area/almayer/squads/tankdeliveries name = "\improper Lower Deck Vehicle ASRS" icon_state = "req" @@ -531,6 +518,19 @@ /area/almayer/maint/hull/upper/u_a_p name = "\improper Upper Deck Port-Aft Hull" +/area/almayer/living + minimap_color = MINIMAP_AREA_COLONY + +/area/almayer/living/tankerbunks + name = "\improper Lower Deck Vehicle Crew Bunks" + icon_state = "livingspace" + fake_zlevel = 2 + +/area/almayer/living/auxiliary_officer_office + name = "\improper Lower Deck Auxiliary Support Officer office" + icon_state = "livingspace" + fake_zlevel = 2 + /area/almayer/living/cryo_cells name = "\improper Lower Deck Cryo Cells" icon_state = "cryo" From 71bb67d657457a412cf8bd65687bec53f1fbf887 Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 11 Feb 2024 09:15:18 +0100 Subject: [PATCH 2/9] changing vehiclehangar area. --- code/game/area/almayer.dm | 6 +- code/modules/shuttle/dropship_hijack.dm | 2 +- maps/map_files/USS_Almayer/USS_Almayer.dmm | 140 ++++++++++----------- 3 files changed, 75 insertions(+), 73 deletions(-) diff --git a/code/game/area/almayer.dm b/code/game/area/almayer.dm index 0ed77fd274bd..044c9105074c 100644 --- a/code/game/area/almayer.dm +++ b/code/game/area/almayer.dm @@ -323,10 +323,12 @@ soundscape_playlist = SCAPE_PL_HANGAR soundscape_interval = 50 -/area/almayer/hallways/vehiclehangar +/area/almayer/hallways/lower + fake_zlevel = 2 // lowerdeck + +/area/almayer/hallways/lower/vehiclehangar name = "\improper Lower Deck Vehicle Storage" icon_state = "exoarmor" - fake_zlevel = 2 /area/almayer/squads/tankdeliveries name = "\improper Lower Deck Vehicle ASRS" diff --git a/code/modules/shuttle/dropship_hijack.dm b/code/modules/shuttle/dropship_hijack.dm index c01445be5b5b..cfe6db84ec87 100644 --- a/code/modules/shuttle/dropship_hijack.dm +++ b/code/modules/shuttle/dropship_hijack.dm @@ -198,7 +198,7 @@ turfs += get_area_turfs(/area/almayer/engineering/laundry) if("Lower deck Foreship") turfs += get_area_turfs(/area/almayer/hallways/hangar) - turfs += get_area_turfs(/area/almayer/hallways/vehiclehangar) + turfs += get_area_turfs(/area/almayer/hallways/lower/vehiclehangar) if("Lower deck Midship") turfs += get_area_turfs(/area/almayer/medical/chemistry) turfs += get_area_turfs(/area/almayer/medical/lower_medical_lobby) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 3cd01dcd50f2..8f7471264a68 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -1322,7 +1322,7 @@ /area/almayer/living/offices/flight) "afz" = ( /turf/open/floor/almayer/empty, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "afB" = ( /obj/structure/machinery/light{ dir = 1 @@ -1335,7 +1335,7 @@ "afC" = ( /obj/docking_port/stationary/vehicle_elevator/almayer, /turf/open/floor/almayer/empty, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "afD" = ( /turf/open/floor/almayer{ dir = 5; @@ -1867,7 +1867,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "aic" = ( /turf/open/floor/almayer{ dir = 1; @@ -13561,7 +13561,7 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "bkE" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -15743,7 +15743,7 @@ /area/almayer/medical/operating_room_four) "bzy" = ( /turf/closed/wall/almayer, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "bzz" = ( /obj/structure/disposalpipe/trunk{ dir = 4 @@ -15755,7 +15755,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "bzD" = ( /obj/structure/machinery/door/poddoor/almayer{ id = "tcomms" @@ -15770,7 +15770,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "bzI" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -15854,7 +15854,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "bAh" = ( /obj/structure/disposalpipe/segment, /obj/structure/cargo_container/wy/mid, @@ -15869,7 +15869,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "bAs" = ( /turf/closed/wall/almayer/outer, /area/almayer/shipboard/weapon_room) @@ -16107,7 +16107,7 @@ /area/almayer/shipboard/weapon_room) "bBB" = ( /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "bBC" = ( /obj/structure/bed/chair{ dir = 4 @@ -16681,7 +16681,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "bEA" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -17764,7 +17764,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "bKb" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -17814,7 +17814,7 @@ /area/almayer/shipboard/navigation) "bKh" = ( /turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "bKj" = ( /obj/structure/machinery/gear{ id = "vehicle_elevator_gears" @@ -17825,7 +17825,7 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "bKm" = ( /obj/structure/closet/crate/freezer{ desc = "A freezer crate. There is a note attached, it reads: Do not open, property of Pvt. Mendoza." @@ -18089,7 +18089,7 @@ dir = 4 }, /turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "bLu" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -18098,7 +18098,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "bLv" = ( /obj/structure/machinery/door_control{ id = "ARES StairsLower"; @@ -18491,7 +18491,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "bNq" = ( /obj/structure/surface/table/almayer, /obj/item/tool/wirecutters, @@ -18635,7 +18635,7 @@ /turf/open/floor/almayer{ icon_state = "cargo" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "bOe" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -18651,7 +18651,7 @@ dir = 5; icon_state = "plating" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "bOq" = ( /obj/structure/prop/almayer/cannon_cables, /turf/open/floor/almayer{ @@ -18856,7 +18856,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "bPk" = ( /obj/item/roller, /obj/item/roller, @@ -19202,7 +19202,7 @@ }, /obj/structure/machinery/light, /turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "bRz" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -19232,7 +19232,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "bRP" = ( /obj/structure/machinery/body_scanconsole, /obj/structure/disposalpipe/segment{ @@ -19278,7 +19278,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "bRV" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -20131,7 +20131,7 @@ dir = 1 }, /turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "bXw" = ( /obj/structure/machinery/bioprinter{ stored_metal = 125 @@ -20158,7 +20158,7 @@ dir = 8 }, /turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "bXY" = ( /obj/structure/ladder{ height = 1; @@ -20175,7 +20175,7 @@ "bXZ" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "bYa" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/cargo/blend, /turf/open/floor/almayer{ @@ -20382,7 +20382,7 @@ name = "\improper Hangar Lockdown Blast Door" }, /turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "bZO" = ( /obj/structure/machinery/light{ dir = 8 @@ -20522,7 +20522,7 @@ name = "\improper Hangar Lockdown Blast Door" }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "cau" = ( /obj/structure/disposalpipe/segment, /obj/structure/machinery/door/airlock/almayer/security/glass{ @@ -20576,7 +20576,7 @@ dir = 4 }, /turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "caD" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; @@ -20586,7 +20586,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "caM" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/almayer{ @@ -23628,7 +23628,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "cBm" = ( /obj/effect/projector{ name = "Almayer_AresUp"; @@ -27161,7 +27161,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "dRD" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/airlock/almayer/security{ @@ -27772,7 +27772,7 @@ dir = 5; icon_state = "plating" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "ecS" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -27979,7 +27979,7 @@ pixel_x = -16 }, /turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "egt" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Chapel" @@ -29445,7 +29445,7 @@ id = "vehicle_elevator_railing_aux" }, /turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "eGh" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/tool/surgery/scalpel{ @@ -31199,7 +31199,7 @@ dir = 5; icon_state = "plating" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "fsp" = ( /obj/structure/barricade/handrail{ dir = 1; @@ -31252,7 +31252,7 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "ftx" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -31276,7 +31276,7 @@ dir = 5; icon_state = "plating" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "fuz" = ( /obj/structure/machinery/cm_vending/clothing/pilot_officer, /turf/open/floor/almayer{ @@ -31594,7 +31594,7 @@ dir = 5; icon_state = "plating" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "fBL" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment{ @@ -34145,7 +34145,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "gCu" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice12"; @@ -35441,7 +35441,7 @@ dir = 1 }, /turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "hcw" = ( /obj/structure/surface/table/reinforced/black, /obj/item/explosive/grenade/high_explosive/training, @@ -35479,7 +35479,7 @@ dir = 5; icon_state = "plating" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "hds" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -37106,7 +37106,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "hHR" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -39421,7 +39421,7 @@ id = "vehicle_elevator_railing_aux" }, /turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "iDk" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ @@ -40382,7 +40382,7 @@ dir = 5; icon_state = "plating" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "iWN" = ( /turf/open/floor/almayer{ dir = 1; @@ -40656,7 +40656,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "jaM" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -41216,7 +41216,7 @@ id = "vehicle_elevator_railing_aux" }, /turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "jjS" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -41250,7 +41250,7 @@ dir = 10; icon_state = "cargo" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "jkd" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = 32 @@ -41896,7 +41896,7 @@ pixel_x = -1 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "jyb" = ( /turf/open/floor/almayer{ dir = 6; @@ -41962,7 +41962,7 @@ /area/almayer/command/corporateliaison) "jAi" = ( /turf/closed/wall/almayer/reinforced, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "jAz" = ( /obj/structure/platform, /obj/structure/platform{ @@ -43183,7 +43183,7 @@ dir = 5; icon_state = "plating" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "jYc" = ( /obj/item/bedsheet/blue{ layer = 3.2 @@ -43233,7 +43233,7 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "jYm" = ( /obj/item/reagent_container/food/snacks/wrapped/chunk, /obj/structure/surface/rack, @@ -44007,7 +44007,7 @@ /turf/open/floor/almayer{ icon_state = "cargo" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "kmp" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -44888,7 +44888,7 @@ "kCS" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "kDd" = ( /obj/structure/sign/safety/water{ pixel_x = 8; @@ -50458,7 +50458,7 @@ pixel_y = 2 }, /turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "mIP" = ( /obj/structure/pipes/vents/pump, /obj/effect/decal/warning_stripes{ @@ -51416,7 +51416,7 @@ dir = 5; icon_state = "plating" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "mZb" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -52140,7 +52140,7 @@ dir = 1; icon_state = "cargo_arrow" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "nkj" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -52547,7 +52547,7 @@ dir = 5; icon_state = "plating" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "nrw" = ( /obj/structure/bed/chair{ dir = 4 @@ -52643,7 +52643,7 @@ dir = 5; icon_state = "plating" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "ntx" = ( /obj/structure/machinery/door/airlock/almayer/generic{ id = "Alpha_2"; @@ -57873,7 +57873,7 @@ dir = 5; icon_state = "plating" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "pqX" = ( /obj/structure/bed/chair{ dir = 4 @@ -60994,7 +60994,7 @@ dir = 5; icon_state = "plating" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "qyG" = ( /obj/structure/sign/safety/hazard{ desc = "A sign that warns of a hazardous environment nearby"; @@ -61579,7 +61579,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "qJS" = ( /obj/structure/reagent_dispensers/water_cooler/stacks{ density = 0; @@ -64203,7 +64203,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "rEv" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -69691,7 +69691,7 @@ dir = 5; icon_state = "plating" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "tBF" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -72281,7 +72281,7 @@ /turf/open/floor/almayer{ icon_state = "cargo_arrow" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "uBw" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -72826,7 +72826,7 @@ dir = 5; icon_state = "plating" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "uOi" = ( /turf/closed/wall/almayer/outer, /area/almayer/lifeboat_pumps/south2) @@ -78581,7 +78581,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "wJB" = ( /obj/structure/machinery/cryopod/right, /turf/open/floor/almayer{ @@ -79777,7 +79777,7 @@ dir = 5; icon_state = "plating" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "xgI" = ( /obj/structure/closet/secure_closet/personal/cabinet{ req_access = null @@ -80444,7 +80444,7 @@ /turf/open/floor/almayer{ icon_state = "cargo" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "xtM" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -81625,7 +81625,7 @@ pixel_y = 2 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/vehiclehangar) "xOs" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; From 2560bc7721e6f51a31464a85d28f4df04d23b06d Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 11 Feb 2024 09:27:15 +0100 Subject: [PATCH 3/9] removed a bunch on non used area in almayer.dm --- code/game/area/almayer.dm | 49 ------------------------- code/modules/shuttle/dropship_hijack.dm | 1 - 2 files changed, 50 deletions(-) diff --git a/code/game/area/almayer.dm b/code/game/area/almayer.dm index 044c9105074c..14b6be445640 100644 --- a/code/game/area/almayer.dm +++ b/code/game/area/almayer.dm @@ -29,26 +29,6 @@ if(hijack_evacuation_area) SShijack.progress_areas[src] = power_equip -/area/shuttle/almayer/elevator_maintenance/upperdeck - name = "\improper Upper Deck Maintenance Elevator" - icon_state = "shuttle" - fake_zlevel = 1 - -/area/shuttle/almayer/elevator_maintenance/lowerdeck - name = "\improper Lower Deck Maintenance Elevator" - icon_state = "shuttle" - fake_zlevel = 2 - -/area/shuttle/almayer/elevator_hangar/lowerdeck - name = "\improper Hangar Elevator" - icon_state = "shuttle" - fake_zlevel = 2 // lowerdeck - -/area/shuttle/almayer/elevator_hangar/underdeck - name = "\improper Hangar Elevator" - icon_state = "shuttle" - fake_zlevel = 3 - /obj/structure/machinery/computer/shuttle_control/almayer/hangar name = "Elevator Console" icon = 'icons/obj/structures/machinery/computer.dmi' @@ -312,10 +292,6 @@ icon_state = "firingrange" fake_zlevel = 2 // lowerdeck -/area/almayer/shipboard/sensors - name = "\improper Sensor Room" - icon_state = "sensor" - /area/almayer/hallways/hangar name = "\improper Hangar" icon_state = "hangar" @@ -330,26 +306,11 @@ name = "\improper Lower Deck Vehicle Storage" icon_state = "exoarmor" -/area/almayer/squads/tankdeliveries - name = "\improper Lower Deck Vehicle ASRS" - icon_state = "req" - fake_zlevel = 2 - -/area/almayer/hallways/exoarmor - name = "\improper Lower Deck Vehicle Armor Storage" - icon_state = "exoarmor" - fake_zlevel = 2 // lowerdeck - /area/almayer/hallways/repair_bay name = "\improper Lower Deck Deployment Workshop" icon_state = "dropshiprepair" fake_zlevel = 2 // lowerdeck -/area/almayer/hallways/mission_planner - name = "\improper Lower Deck Dropship Central Computer Room" - icon_state = "missionplanner" - fake_zlevel = 2 // lowerdeck - /area/almayer/hallways/starboard_umbilical name = "\improper Lower Deck Starboard Umbilical Hallway" icon_state = "starboardumbilical" @@ -706,11 +667,6 @@ icon_state = "science" fake_zlevel = 1 // upperdeck -/area/almayer/medical/testlab - name = "\improper Medical Research workshop" - icon_state = "science" - fake_zlevel = 1 // upperdeck - /area/almayer/medical/containment name = "\improper Medical Research containment" icon_state = "science" @@ -826,11 +782,6 @@ icon_state = "selfdestruct" fake_zlevel = 1 // upperdeck -/area/almayer/ert_port - name = "\improper ERT Docking Port" - icon_state = "lifeboat" - flags_area = AREA_NOTUNNEL - /area/space/almayer/lifeboat_dock name = "\improper Port Lifeboat Docking" icon_state = "lifeboat" diff --git a/code/modules/shuttle/dropship_hijack.dm b/code/modules/shuttle/dropship_hijack.dm index cfe6db84ec87..2190683974e0 100644 --- a/code/modules/shuttle/dropship_hijack.dm +++ b/code/modules/shuttle/dropship_hijack.dm @@ -191,7 +191,6 @@ turfs += get_area_turfs(/area/almayer/medical/containment) turfs += get_area_turfs(/area/almayer/medical/containment/cell) turfs += get_area_turfs(/area/almayer/medical/medical_science) - turfs += get_area_turfs(/area/almayer/medical/testlab) turfs += get_area_turfs(/area/almayer/medical/hydroponics) if("Upper deck Aftship") turfs += get_area_turfs(/area/almayer/engineering/upper_engineering) From 6efbe2d184d17aaf5fe15e3c76842a7b0dd4472d Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 11 Feb 2024 09:38:10 +0100 Subject: [PATCH 4/9] add new halways for lower deck and reorganize stuff. --- code/game/area/almayer.dm | 54 ++-- code/modules/shuttle/shuttles/ert.dm | 4 +- maps/map_files/USS_Almayer/USS_Almayer.dmm | 280 ++++++++++----------- 3 files changed, 182 insertions(+), 156 deletions(-) diff --git a/code/game/area/almayer.dm b/code/game/area/almayer.dm index 14b6be445640..c0fb0a15746e 100644 --- a/code/game/area/almayer.dm +++ b/code/game/area/almayer.dm @@ -306,31 +306,46 @@ name = "\improper Lower Deck Vehicle Storage" icon_state = "exoarmor" -/area/almayer/hallways/repair_bay +/area/almayer/hallways/lower/repair_bay name = "\improper Lower Deck Deployment Workshop" icon_state = "dropshiprepair" - fake_zlevel = 2 // lowerdeck -/area/almayer/hallways/starboard_umbilical +/area/almayer/hallways/lower/starboard_umbilical name = "\improper Lower Deck Starboard Umbilical Hallway" icon_state = "starboardumbilical" - fake_zlevel = 2 // lowerdeck -/area/almayer/hallways/port_umbilical +/area/almayer/hallways/lower/port_umbilical name = "\improper Lower Deck Port Umbilical Hallway" icon_state = "portumbilical" - fake_zlevel = 2 // lowerdeck -/area/almayer/hallways/aft_hallway - name = "\improper Upper Deck Aft Hallway" - icon_state = "aft" - fake_zlevel = 1 // upperdeck +//new halways area. +//port +/area/almayer/hallways/lower/port_fore_hallway + name = "\improper Lower Deck Port Fore Hallway" + icon_state = "port" -/area/almayer/hallways/stern_hallway - name = "\improper Upper Deck Stern Hallway" - icon_state = "stern" - fake_zlevel = 1 // upperdeck +/area/almayer/hallways/lower/port_midship_hallway + name = "\improper Lower Deck Port Midship Hallway" + icon_state = "port" + +/area/almayer/hallways/lower/port_aft_hallway + name = "\improper Lower Deck Port Aft Hallway" + icon_state = "port" + +//starboard +/area/almayer/hallways/lower/starboard_fore_hallway + name = "\improper Lower Deck Starboard Fore Hallway" + icon_state = "starboard" + +/area/almayer/hallways/lower/starboard_midship_hallway + name = "\improper Lower Deck Starboard Midship Hallway" + icon_state = "starboard" + +/area/almayer/hallways/lower/starboard_aft_hallway + name = "\improper Lower Deck Starboard Aft Hallway" + icon_state = "starboard" +// to delete when replaced. /area/almayer/hallways/port_hallway name = "\improper Lower Deck Port Hallway" icon_state = "port" @@ -341,6 +356,17 @@ icon_state = "starboard" fake_zlevel = 2 // lowerdeck +/area/almayer/hallways/aft_hallway + name = "\improper Upper Deck Aft Hallway" + icon_state = "aft" + fake_zlevel = 1 // upperdeck + +/area/almayer/hallways/stern_hallway + name = "\improper Upper Deck Stern Hallway" + icon_state = "stern" + fake_zlevel = 1 // upperdeck + + //new hallways areas /area/almayer/hallways/upper diff --git a/code/modules/shuttle/shuttles/ert.dm b/code/modules/shuttle/shuttles/ert.dm index b619645c501c..4c078f3fe6d3 100644 --- a/code/modules/shuttle/shuttles/ert.dm +++ b/code/modules/shuttle/shuttles/ert.dm @@ -254,7 +254,7 @@ width = 17 height = 29 airlock_id = "s_umbilical" - airlock_area = /area/almayer/hallways/port_umbilical + airlock_area = /area/almayer/hallways/lower/port_umbilical /obj/docking_port/stationary/emergency_response/external/hangar_starboard name = "Almayer hanger starboard external airlock" @@ -263,7 +263,7 @@ width = 17 height = 29 airlock_id = "n_umbilical" - airlock_area = /area/almayer/hallways/starboard_umbilical + airlock_area = /area/almayer/hallways/lower/starboard_umbilical // These are docking ports not on the almayer /obj/docking_port/stationary/emergency_response/idle_port1 diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 8f7471264a68..89050733ec85 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -132,7 +132,7 @@ /turf/open/floor/almayer{ icon_state = "cargo" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "aau" = ( /turf/closed/wall/almayer/reinforced/temphull, /area/almayer/living/pilotbunks) @@ -147,7 +147,7 @@ /turf/open/floor/almayer{ icon_state = "cargo" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "aax" = ( /obj/effect/projector{ name = "Almayer_Down2"; @@ -163,7 +163,7 @@ pixel_y = 25 }, /turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "aaC" = ( /obj/structure/lattice, /turf/open/space/basic, @@ -179,7 +179,7 @@ dir = 1; icon_state = "silver" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "aaE" = ( /obj/structure/machinery/light{ dir = 4 @@ -236,7 +236,7 @@ dir = 1; icon_state = "silver" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "aaL" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -289,7 +289,7 @@ dir = 5; icon_state = "silver" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "abf" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -800,7 +800,7 @@ /area/almayer/lifeboat_pumps/north1) "adg" = ( /turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "adj" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Down1"; @@ -823,7 +823,7 @@ dir = 4; icon_state = "silver" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "ado" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -1239,7 +1239,7 @@ dir = 8 }, /turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "aff" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -1250,7 +1250,7 @@ icon_state = "p_stair_full" }, /turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "afj" = ( /obj/structure/machinery/portable_atmospherics/canister/empty, /turf/open/floor/engine, @@ -1295,7 +1295,7 @@ dir = 4; icon_state = "silver" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "afv" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -1313,7 +1313,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "afy" = ( /obj/structure/machinery/light{ dir = 8 @@ -1484,7 +1484,7 @@ pixel_y = 30 }, /turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "agb" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/reagent_container/food/snacks/bloodsoup{ @@ -1515,7 +1515,7 @@ dir = 6 }, /turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "ago" = ( /turf/open/floor/almayer{ dir = 9; @@ -1579,11 +1579,11 @@ icon_state = "p_stair_full" }, /turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "agy" = ( /obj/structure/pipes/vents/pump/on, /turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "agA" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -1605,7 +1605,7 @@ dir = 4 }, /turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "agH" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/disposalpipe/segment{ @@ -1690,7 +1690,7 @@ dir = 5; icon_state = "silver" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "agY" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -1792,7 +1792,7 @@ dir = 8 }, /turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "ahG" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ dir = 2; @@ -2118,7 +2118,7 @@ dir = 8; icon_state = "silver" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "ajr" = ( /turf/open/floor/almayer{ dir = 1; @@ -2161,7 +2161,7 @@ /turf/open/floor/almayer{ icon_state = "silver" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "ajy" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -2170,12 +2170,12 @@ dir = 4; icon_state = "silver" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "ajz" = ( /turf/open/floor/almayer{ icon_state = "silver" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "ajA" = ( /obj/structure/bed/chair/office/dark, /turf/open/floor/almayer{ @@ -2195,7 +2195,7 @@ /turf/open/floor/almayer{ icon_state = "silver" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "ajC" = ( /turf/open/floor/almayer{ icon_state = "green" @@ -2265,7 +2265,7 @@ dir = 6; icon_state = "silver" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "ajM" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -2436,7 +2436,7 @@ dir = 10; icon_state = "silver" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "akz" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/emails{ @@ -2756,7 +2756,7 @@ /turf/open/floor/almayer{ icon_state = "cargo_arrow" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "alJ" = ( /obj/structure/machinery/light{ dir = 1 @@ -2793,7 +2793,7 @@ /obj/effect/decal/cleanable/blood/oil, /obj/structure/prop/mech/hydralic_clamp, /turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "alR" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -2859,7 +2859,7 @@ /turf/open/floor/almayer{ icon_state = "cargo_arrow" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "amk" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -2889,7 +2889,7 @@ dir = 8 }, /turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "ams" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/atmos_alert{ @@ -2990,7 +2990,7 @@ }, /obj/item/storage/belt/utility, /turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "amS" = ( /obj/structure/stairs{ dir = 1 @@ -3021,7 +3021,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "amX" = ( /turf/open/floor/almayer{ dir = 1; @@ -3198,7 +3198,7 @@ dir = 8; icon_state = "silver" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "anC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -3213,7 +3213,7 @@ dir = 8 }, /turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "anG" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -3250,13 +3250,13 @@ dir = 1 }, /turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "anL" = ( /obj/structure/platform_decoration{ dir = 4 }, /turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "anM" = ( /obj/structure/surface/table/almayer, /obj/item/clipboard, @@ -3287,7 +3287,7 @@ dir = 4; icon_state = "silvercorner" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "anU" = ( /obj/structure/machinery/door/airlock/almayer/security{ dir = 2; @@ -3468,7 +3468,7 @@ /turf/open/floor/almayer{ icon_state = "silver" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "aoG" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -3486,7 +3486,7 @@ dir = 1; icon_state = "silver" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "aoI" = ( /turf/open/floor/almayer{ dir = 6; @@ -7112,7 +7112,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "aBD" = ( /obj/structure/closet/basketball, /obj/structure/sign/safety/maint{ @@ -9829,7 +9829,7 @@ /area/almayer/command/lifeboat) "aPy" = ( /turf/closed/wall/almayer/outer, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "aPz" = ( /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -9925,12 +9925,12 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "aPZ" = ( /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "aQb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -9996,7 +9996,7 @@ /area/almayer/hallways/starboard_hallway) "aQv" = ( /turf/closed/wall/almayer, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "aQy" = ( /obj/structure/transmitter{ dir = 8; @@ -10600,7 +10600,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "aTr" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -11673,7 +11673,7 @@ "aZB" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "aZC" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -12037,7 +12037,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "bbr" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -13138,7 +13138,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "bhn" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -13431,14 +13431,14 @@ dir = 8; icon_state = "orangecorner" }, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "bjM" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; pixel_y = 1 }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "bjN" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -13447,7 +13447,7 @@ /turf/open/floor/almayer{ icon_state = "orangecorner" }, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "bjO" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -13466,7 +13466,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "bjQ" = ( /obj/structure/machinery/shower{ dir = 8 @@ -13903,7 +13903,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "bmv" = ( /obj/structure/machinery/door/airlock/almayer/marine/requisitions{ dir = 2; @@ -13923,16 +13923,16 @@ dir = 8; icon_state = "orange" }, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "bmx" = ( /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "bmy" = ( /turf/open/floor/almayer{ dir = 4; icon_state = "orange" }, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "bmz" = ( /obj/structure/surface/table/almayer, /obj/item/tool/kitchen/utensil/spoon{ @@ -14252,7 +14252,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "bou" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/light{ @@ -14262,7 +14262,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "boy" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -14493,7 +14493,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "bpV" = ( /obj/effect/landmark/ert_spawns/distress_cryo, /turf/open/floor/almayer{ @@ -14506,7 +14506,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "bqm" = ( /obj/structure/closet/boxinggloves, /turf/open/floor/almayer{ @@ -14729,13 +14729,13 @@ dir = 1; icon_state = "orangecorner" }, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "brP" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "brQ" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -14745,7 +14745,7 @@ dir = 4; icon_state = "orangecorner" }, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "brS" = ( /obj/structure/bed, /obj/item/bedsheet/brown, @@ -15000,7 +15000,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "btr" = ( /obj/structure/closet/boxinggloves, /obj/structure/machinery/light, @@ -15288,7 +15288,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "bvV" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -15297,7 +15297,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "bvX" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -17078,7 +17078,7 @@ dir = 8; icon_state = "orangecorner" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "bGq" = ( /obj/structure/machinery/light, /obj/effect/decal/warning_stripes{ @@ -17632,7 +17632,7 @@ /area/almayer/living/cryo_cells) "bJh" = ( /turf/closed/wall/almayer, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "bJi" = ( /obj/structure/machinery/light{ dir = 4 @@ -17666,7 +17666,7 @@ /area/almayer/living/auxiliary_officer_office) "bJo" = ( /turf/closed/wall/almayer, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "bJt" = ( /turf/closed/wall/almayer, /area/almayer/living/grunt_rnr) @@ -17722,7 +17722,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "bJS" = ( /obj/structure/surface/rack, /obj/item/tool/wrench, @@ -19211,7 +19211,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "bRA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -19219,7 +19219,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "bRD" = ( /obj/structure/largecrate/random/barrel/red, /obj/effect/decal/warning_stripes{ @@ -19329,7 +19329,7 @@ /area/almayer/shipboard/port_point_defense) "bSg" = ( /turf/closed/wall/almayer/outer, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "bSj" = ( /obj/structure/machinery/light{ dir = 1 @@ -20562,7 +20562,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "caC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -20947,7 +20947,7 @@ /turf/open/floor/almayer{ icon_state = "silvercorner" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "ccN" = ( /turf/open/floor/almayer{ dir = 4; @@ -20983,7 +20983,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "cdc" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -20991,7 +20991,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "cdd" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -21000,7 +21000,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "cdf" = ( /obj/structure/machinery/camera/autoname/almayer{ name = "ship-grade camera" @@ -21044,16 +21044,16 @@ "cdw" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "cdx" = ( /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "cdy" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "cdz" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -21061,7 +21061,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "cdA" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -21096,14 +21096,14 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "cdF" = ( /obj/structure/bed/chair/office/dark{ dir = 8 }, /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "cdI" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -21165,7 +21165,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "cet" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -21174,7 +21174,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "ceu" = ( /turf/open/floor/almayer{ dir = 1; @@ -21187,7 +21187,7 @@ pixel_y = 1 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "cew" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -21197,13 +21197,13 @@ /turf/open/floor/almayer{ icon_state = "orangecorner" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "cex" = ( /obj/structure/machinery/suit_storage_unit/compression_suit/uscm, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "ceC" = ( /obj/structure/prop/almayer/ship_memorial, /turf/open/floor/plating/almayer, @@ -21234,7 +21234,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "ceR" = ( /obj/structure/machinery/prop/almayer/computer{ pixel_y = 20 @@ -21242,12 +21242,12 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "ceU" = ( /turf/open/floor/almayer{ icon_state = "cargo_arrow" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "ceY" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -21328,21 +21328,21 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "cfy" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ dir = 8; icon_state = "orange" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "cfz" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ dir = 4; icon_state = "orange" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "cfA" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/light{ @@ -21352,7 +21352,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "cfE" = ( /turf/open/floor/almayer{ dir = 8; @@ -21371,7 +21371,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "cfN" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -21381,7 +21381,7 @@ dir = 8 }, /turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "cfT" = ( /turf/open/floor/almayer{ dir = 10; @@ -21461,7 +21461,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "cgH" = ( /obj/structure/surface/table/almayer, /obj/item/tank/oxygen/red, @@ -21469,7 +21469,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "cgJ" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -21735,13 +21735,13 @@ dir = 1; icon_state = "orangecorner" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "cin" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" }, /turf/open/floor/almayer, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "cio" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -21750,7 +21750,7 @@ dir = 4; icon_state = "orangecorner" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "cir" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -21910,7 +21910,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "cjm" = ( /obj/structure/machinery/door/poddoor/almayer{ id = "s_umbilical"; @@ -21920,7 +21920,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "cjo" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = 32; @@ -22000,7 +22000,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "cjS" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -22645,7 +22645,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "cmI" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -25276,7 +25276,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "dfg" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -25417,7 +25417,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "diz" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{ id_tag = "Boat1-D4"; @@ -28640,7 +28640,7 @@ "erS" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "esi" = ( /obj/structure/sign/safety/stairs{ pixel_x = 15; @@ -29141,7 +29141,7 @@ dir = 10 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "eBE" = ( /obj/structure/machinery/photocopier{ anchored = 0 @@ -29655,7 +29655,7 @@ /turf/open/floor/almayer{ icon_state = "silver" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "eLC" = ( /obj/structure/surface/table/almayer, /obj/item/tool/kitchen/tray, @@ -32951,7 +32951,7 @@ dir = 8; icon_state = "silvercorner" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "gdJ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -35743,7 +35743,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "hhg" = ( /obj/structure/surface/rack, /turf/open/floor/almayer{ @@ -37113,7 +37113,7 @@ dir = 4; icon_state = "orange" }, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "hIp" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -37627,7 +37627,7 @@ pixel_y = 32 }, /turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "hTc" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -40787,7 +40787,7 @@ dir = 6 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "jdm" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -44587,7 +44587,7 @@ dir = 5 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "kzb" = ( /obj/structure/machinery/vending/walkman, /turf/open/floor/almayer, @@ -45159,7 +45159,7 @@ dir = 8; icon_state = "orange" }, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "kIP" = ( /obj/structure/machinery/cryopod/right{ pixel_y = 6 @@ -46110,7 +46110,7 @@ dir = 4; icon_state = "orange" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "kZN" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/prop/almayer/computer/PC{ @@ -50677,7 +50677,7 @@ }, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "mLz" = ( /obj/structure/machinery/door_control{ id = "pobunk1"; @@ -53222,7 +53222,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "nEF" = ( /obj/structure/machinery/conveyor_switch{ id = "gym_1"; @@ -55620,7 +55620,7 @@ pixel_x = 15 }, /turf/closed/wall/almayer, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "owg" = ( /turf/open/floor/almayer{ icon_state = "mono" @@ -58390,7 +58390,7 @@ dir = 4; icon_state = "orange" }, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "pAV" = ( /obj/structure/platform{ dir = 1 @@ -59543,7 +59543,7 @@ dir = 9 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "pZH" = ( /obj/structure/machinery/shower{ dir = 8 @@ -60178,7 +60178,7 @@ }, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "qlm" = ( /obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/warning_stripes{ @@ -62075,7 +62075,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "qUh" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = -17 @@ -63924,7 +63924,7 @@ dir = 8; icon_state = "orange" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "rBv" = ( /obj/structure/closet/toolcloset, /turf/open/floor/almayer{ @@ -64296,7 +64296,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "rFH" = ( /obj/structure/machinery/body_scanconsole, /obj/structure/disposalpipe/segment{ @@ -65682,7 +65682,7 @@ /turf/open/floor/almayer{ icon_state = "silver" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "sgD" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -66420,7 +66420,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "ssk" = ( /obj/structure/surface/rack, /obj/item/storage/backpack/marine/satchel{ @@ -67667,7 +67667,7 @@ dir = 4; icon_state = "orange" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "sTd" = ( /turf/open/floor/almayer{ dir = 4; @@ -68302,7 +68302,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "tdT" = ( /obj/structure/bed/chair/comfy/beige{ dir = 1 @@ -69020,7 +69020,7 @@ /turf/open/floor/almayer{ icon_state = "silverfull" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "tqE" = ( /obj/structure/machinery/light{ dir = 8 @@ -72487,7 +72487,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "uFP" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -73423,7 +73423,7 @@ "uZQ" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "uZV" = ( /obj/structure/reagent_dispensers/fueltank/gas/methane{ anchored = 1 @@ -73453,7 +73453,7 @@ pixel_y = 32 }, /turf/closed/wall/almayer, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_umbilical) "vaQ" = ( /obj/structure/machinery/door/airlock/almayer/medical{ dir = 1; @@ -73629,7 +73629,7 @@ dir = 10; icon_state = "silver" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "vdL" = ( /obj/structure/sign/safety/reception{ pixel_x = -17; @@ -74952,7 +74952,7 @@ dir = 6; icon_state = "silver" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "vwU" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -81844,7 +81844,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/repair_bay) "xSM" = ( /obj/structure/machinery/light{ dir = 8 From b79aa5421f3d9d70accac4613497cf28997cd500 Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 11 Feb 2024 10:04:03 +0100 Subject: [PATCH 5/9] added six new hallway area to replace the two in lower deck. --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 2315 +++++++++++--------- 1 file changed, 1338 insertions(+), 977 deletions(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 89050733ec85..2fef6b9c8bad 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -79,7 +79,7 @@ vector_y = 98 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "aaq" = ( /obj/item/bedsheet/purple{ layer = 3.2 @@ -635,7 +635,7 @@ dir = 9; icon_state = "green" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "acI" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = -12 @@ -938,7 +938,7 @@ /turf/open/floor/almayer{ icon_state = "redfull" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "aec" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ @@ -992,7 +992,7 @@ /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "aep" = ( /turf/closed/wall/almayer, /area/almayer/engineering/airmix) @@ -1225,6 +1225,11 @@ icon_state = "redfull" }, /area/almayer/shipboard/starboard_missiles) +"afd" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) "afe" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -1738,7 +1743,7 @@ /turf/open/floor/plating/almayer{ allow_construction = 0 }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "ahl" = ( /turf/open/floor/almayer{ dir = 9; @@ -1995,7 +2000,7 @@ pixel_y = 3 }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "aiB" = ( /turf/open/floor/almayer{ dir = 8; @@ -2070,7 +2075,7 @@ }, /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "aje" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -2293,7 +2298,7 @@ /turf/open/floor/plating/almayer{ allow_construction = 0 }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "ajP" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -2328,7 +2333,7 @@ /turf/open/floor/plating/almayer{ allow_construction = 0 }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "ajY" = ( /turf/open/floor/almayer_hull{ dir = 10; @@ -2538,7 +2543,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "akQ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -2704,7 +2709,7 @@ /turf/open/floor/almayer{ icon_state = "redfull" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "aly" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/starboard_missiles) @@ -3004,7 +3009,7 @@ /turf/open/floor/plating/almayer{ allow_construction = 0 }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "amT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -3330,7 +3335,7 @@ /turf/open/floor/plating/almayer{ allow_construction = 0 }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "aod" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -3718,7 +3723,7 @@ pixel_y = 3 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "apo" = ( /obj/structure/disposalpipe/trunk, /obj/structure/machinery/disposal, @@ -3732,7 +3737,7 @@ pixel_y = 2 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "apq" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -3810,7 +3815,7 @@ "apC" = ( /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "apE" = ( /turf/open/floor/almayer{ dir = 9; @@ -4065,7 +4070,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "aqy" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -4139,7 +4144,7 @@ dir = 8 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "aqN" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -4283,7 +4288,7 @@ allow_construction = 0; icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "arp" = ( /obj/structure/bed/chair{ dir = 4 @@ -4388,7 +4393,7 @@ /turf/open/floor/almayer{ allow_construction = 0 }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "arP" = ( /obj/structure/sign/safety/hazard{ pixel_y = 32 @@ -4629,14 +4634,11 @@ id = "laddernorthwest"; name = "\improper North West Ladders Shutters" }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "asP" = ( /obj/structure/machinery/door_control{ id = "laddernorthwest"; @@ -4650,7 +4652,7 @@ dir = 4; icon_state = "greencorner" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "asQ" = ( /obj/structure/surface/rack, /obj/item/device/radio/marine, @@ -5017,7 +5019,7 @@ /turf/open/floor/almayer{ allow_construction = 0 }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "auf" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/closed/wall/almayer/white/hull, @@ -5053,7 +5055,7 @@ allow_construction = 0; icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "aul" = ( /obj/structure/stairs{ dir = 4 @@ -5066,7 +5068,7 @@ /turf/open/floor/plating/almayer{ allow_construction = 0 }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "aum" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -5092,7 +5094,7 @@ /turf/open/floor/plating/almayer{ allow_construction = 0 }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "auu" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -5110,7 +5112,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "auy" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -5512,7 +5514,7 @@ dir = 1 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "avY" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/command/cic) @@ -5536,7 +5538,7 @@ dir = 4 }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "awd" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/living/pilotbunks) @@ -6213,9 +6215,6 @@ }, /area/almayer/medical/lower_medical_medbay) "ayE" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, /obj/structure/disposalpipe/segment, /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "laddersouthwest"; @@ -6226,7 +6225,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "ayI" = ( /obj/structure/surface/rack, /obj/item/storage/toolbox/mechanical{ @@ -6504,19 +6503,6 @@ icon_state = "red" }, /area/almayer/shipboard/navigation) -"azB" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "laddersouthwest"; - name = "\improper South West Ladders Shutters" - }, -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/port_hallway) "azC" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/device/flashlight/lamp/green, @@ -6549,7 +6535,7 @@ dir = 1; icon_state = "greencorner" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "azG" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "laddersouthwest"; @@ -6559,7 +6545,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "azI" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -6567,7 +6553,7 @@ dir = 1; icon_state = "greencorner" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "azJ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/door_control{ @@ -6595,11 +6581,11 @@ dir = 8; icon_state = "greencorner" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "azT" = ( /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "azU" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -6756,7 +6742,7 @@ allow_construction = 0; icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "aAy" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -8112,7 +8098,7 @@ dir = 5; icon_state = "green" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "aGd" = ( /turf/open/floor/almayer{ dir = 8; @@ -9127,9 +9113,6 @@ icon_state = "dark_sterile" }, /area/almayer/living/numbertwobunks) -"aLB" = ( -/turf/closed/wall/almayer, -/area/almayer/hallways/starboard_hallway) "aLE" = ( /obj/docking_port/stationary/emergency_response/external/hangar_starboard{ dwidth = 8 @@ -9138,7 +9121,7 @@ /area/space) "aLG" = ( /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "aLJ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -9363,7 +9346,7 @@ dir = 4; icon_state = "red" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "aMO" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 26 @@ -9400,7 +9383,7 @@ dir = 8; icon_state = "red" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "aMY" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/almayer{ @@ -9435,7 +9418,7 @@ pixel_y = 28 }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "aNr" = ( /obj/effect/landmark/start/chef, /turf/open/floor/plating/plating_catwalk, @@ -9467,7 +9450,7 @@ dir = 4; icon_state = "redcorner" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "aNI" = ( /obj/structure/machinery/door/airlock/almayer/marine/alpha/tl, /turf/open/floor/almayer{ @@ -9476,7 +9459,7 @@ /area/almayer/squads/alpha) "aNO" = ( /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "aNQ" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -9993,7 +9976,7 @@ "aQt" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "aQv" = ( /turf/closed/wall/almayer, /area/almayer/hallways/lower/starboard_umbilical) @@ -10418,7 +10401,7 @@ dir = 4; icon_state = "red" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "aSt" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/chem_dispenser/soda/beer, @@ -10997,6 +10980,11 @@ icon_state = "kitchen" }, /area/almayer/living/captain_mess) +"aVs" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_aft_hallway) "aVC" = ( /obj/structure/machinery/vending/cigarette, /turf/open/floor/almayer{ @@ -11162,6 +11150,9 @@ icon_state = "red" }, /area/almayer/shipboard/brig/chief_mp_office) +"aWi" = ( +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) "aWk" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -11292,11 +11283,11 @@ pixel_y = 30 }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "aWR" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "aWT" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -11399,7 +11390,7 @@ dir = 1 }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "aXT" = ( /obj/structure/pipes/standard/cap/hidden{ dir = 4 @@ -11507,7 +11498,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "aYO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -11516,7 +11507,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "aYQ" = ( /obj/structure/machinery/bioprinter{ stored_metal = 125 @@ -11544,7 +11535,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "aYU" = ( /obj/effect/landmark/yautja_teleport, /turf/open/floor/almayer{ @@ -11561,7 +11552,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "aYW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -11569,7 +11560,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "aYX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -11578,7 +11569,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "aYY" = ( /obj/structure/disposalpipe/junction{ dir = 4 @@ -11586,13 +11577,13 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "aYZ" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "aZe" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -11620,7 +11611,7 @@ dir = 1 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "aZi" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -11629,7 +11620,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "aZl" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -11639,7 +11630,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "aZr" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -11790,7 +11781,7 @@ "bad" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "baf" = ( /obj/structure/barricade/handrail/medical, /turf/open/floor/almayer{ @@ -11809,20 +11800,20 @@ dir = 5 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "bal" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "baq" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "bar" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -11835,7 +11826,7 @@ icon_state = "SW-out" }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "bat" = ( /obj/structure/machinery/door_control{ id = "ARES Mainframe Right"; @@ -11967,27 +11958,27 @@ icon_state = "pipe-c" }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "bbh" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/machinery/light, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "bbi" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "bbj" = ( /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "bbk" = ( /obj/structure/barricade/handrail{ dir = 8 @@ -11999,7 +11990,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor5" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "bbl" = ( /obj/structure/barricade/handrail{ dir = 1; @@ -12008,13 +11999,13 @@ /turf/open/floor/almayer{ icon_state = "test_floor5" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "bbm" = ( /turf/open/floor/almayer{ dir = 8; icon_state = "cargo_arrow" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "bbn" = ( /obj/structure/machinery/camera/autoname/almayer{ name = "ship-grade camera" @@ -12084,7 +12075,7 @@ /turf/open/floor/almayer{ allow_construction = 0 }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "bbC" = ( /obj/structure/machinery/light{ dir = 1 @@ -12095,7 +12086,7 @@ vector_y = 98 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "bbL" = ( /turf/open/floor/almayer{ dir = 8; @@ -12111,7 +12102,7 @@ dir = 4; icon_state = "green" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "bbS" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/starboard_point_defense) @@ -12642,10 +12633,13 @@ }, /area/almayer/medical/operating_room_one) "beB" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 1 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "beE" = ( /obj/structure/platform{ dir = 1 @@ -12893,7 +12887,7 @@ /turf/open/floor/almayer{ icon_state = "redcorner" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "bgj" = ( /obj/structure/machinery/landinglight/ds1{ dir = 8 @@ -13145,7 +13139,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "bho" = ( /obj/structure/machinery/computer/med_data, /turf/open/floor/almayer{ @@ -13643,7 +13637,7 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "blb" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 15; @@ -14783,7 +14777,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "bsp" = ( /obj/structure/sink{ dir = 4; @@ -14920,14 +14914,13 @@ }, /area/almayer/squads/bravo) "bsT" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 1 +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/obj/structure/machinery/light{ - dir = 8 +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "bsU" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray{ @@ -14938,12 +14931,6 @@ icon_state = "red" }, /area/almayer/squads/alpha) -"bsV" = ( -/obj/structure/pipes/vents/pump{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) "bsW" = ( /obj/structure/machinery/cm_vending/clothing/leader/bravo, /turf/open/floor/almayer{ @@ -14955,7 +14942,7 @@ dir = 4; icon_state = "orangecorner" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "btc" = ( /obj/structure/bed/chair{ dir = 8; @@ -15136,6 +15123,9 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_one) +"buk" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_fore_hallway) "bur" = ( /obj/structure/prop/almayer/missile_tube, /obj/effect/decal/warning_stripes{ @@ -15177,17 +15167,20 @@ icon_state = "green" }, /area/almayer/living/offices) +"buF" = ( +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_fore_hallway) "buH" = ( /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "buI" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "buJ" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "buM" = ( /obj/structure/machinery/cm_vending/clothing/smartgun/bravo, /turf/open/floor/almayer{ @@ -15321,7 +15314,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "bwe" = ( /obj/structure/window/framed/almayer, /turf/open/floor/almayer{ @@ -15451,7 +15444,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "bxf" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out" @@ -15494,7 +15487,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "bxm" = ( /turf/open/floor/almayer{ dir = 4; @@ -15512,7 +15505,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "bxA" = ( /obj/structure/machinery/power/apc/almayer/hardened, /obj/effect/decal/warning_stripes{ @@ -15558,7 +15551,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "bxN" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -15653,7 +15646,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "byt" = ( /obj/structure/surface/rack, /obj/item/tool/crowbar, @@ -15696,7 +15689,7 @@ name = "ship-grade camera" }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "byF" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/disposalpipe/segment{ @@ -15705,7 +15698,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "byH" = ( /obj/structure/bed/sofa/south/white/right{ pixel_y = 16 @@ -15725,7 +15718,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "bzg" = ( /obj/structure/pipes/vents/pump{ dir = 8; @@ -15785,7 +15778,7 @@ "bzK" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "bzQ" = ( /obj/structure/largecrate/random/case, /turf/open/floor/plating/plating_catwalk, @@ -15811,7 +15804,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "bzW" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -15820,18 +15813,18 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "bzY" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "bAa" = ( /turf/open/floor/almayer{ icon_state = "orangecorner" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "bAd" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -15972,13 +15965,13 @@ /turf/open/floor/almayer{ icon_state = "greencorner" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "bAX" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ icon_state = "cargo" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "bAY" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out" @@ -16002,7 +15995,7 @@ dir = 4; icon_state = "orange" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "bBb" = ( /obj/structure/machinery/light{ dir = 1 @@ -16011,7 +16004,7 @@ /turf/open/floor/almayer{ icon_state = "greencorner" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "bBc" = ( /obj/structure/surface/rack, /turf/open/floor/almayer{ @@ -16044,14 +16037,6 @@ icon_state = "cargo" }, /area/almayer/squads/alpha) -"bBh" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/starboard_hallway) "bBl" = ( /obj/structure/machinery/light{ dir = 4 @@ -16202,7 +16187,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "bCj" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/open{ dir = 4; @@ -16212,7 +16197,7 @@ /turf/open/floor/almayer{ icon_state = "redfull" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "bCk" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/plating/plating_catwalk, @@ -16250,7 +16235,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "bCu" = ( /obj/structure/bed/chair/comfy/alpha{ dir = 4 @@ -16324,7 +16309,7 @@ icon_state = "pipe-j2" }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "bCG" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -16375,7 +16360,7 @@ dir = 4; icon_state = "orange" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "bCY" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -16422,7 +16407,7 @@ /turf/open/floor/almayer{ icon_state = "redfull" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "bDD" = ( /obj/structure/bed/chair{ dir = 8 @@ -16749,7 +16734,7 @@ dir = 4; icon_state = "orangecorner" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "bEK" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -16941,7 +16926,7 @@ "bFu" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "bFA" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -16986,9 +16971,6 @@ icon_state = "mono" }, /area/almayer/hallways/upper/starboard) -"bGb" = ( -/turf/closed/wall/almayer, -/area/almayer/hallways/port_hallway) "bGc" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -17003,13 +16985,13 @@ dir = 1 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "bGg" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "bGh" = ( /obj/structure/barricade/handrail{ dir = 8 @@ -17018,13 +17000,13 @@ /turf/open/floor/almayer{ icon_state = "test_floor5" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "bGi" = ( /obj/structure/barricade/handrail, /turf/open/floor/almayer{ icon_state = "test_floor5" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "bGj" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -17033,7 +17015,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor5" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "bGk" = ( /obj/structure/machinery/light{ dir = 1 @@ -17042,7 +17024,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor5" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "bGl" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -17051,7 +17033,7 @@ dir = 8; icon_state = "cargo_arrow" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "bGn" = ( /obj/structure/barricade/plasteel/metal, /turf/open/floor/almayer{ @@ -17243,27 +17225,27 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "bGU" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) "bHa" = ( /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "bHb" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "bHd" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "bHg" = ( /obj/structure/bed, /turf/open/floor/almayer{ @@ -17318,7 +17300,7 @@ pixel_x = 1 }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "bHB" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -17352,7 +17334,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "bHI" = ( /obj/structure/anti_air_cannon, /obj/structure/surface/table/almayer, @@ -17368,7 +17350,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "bHP" = ( /turf/open/floor/plating/almayer, /area/almayer/shipboard/weapon_room) @@ -17382,7 +17364,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "bHV" = ( /obj/structure/disposalpipe/junction{ dir = 4; @@ -17394,7 +17376,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "bHW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -17402,7 +17384,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "bHX" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -17413,20 +17395,20 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "bHY" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "bIb" = ( /obj/structure/disposalpipe/junction{ dir = 4; icon_state = "pipe-j2" }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "bId" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -17454,7 +17436,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "bIn" = ( /obj/structure/machinery/computer/cameras/almayer_network, /obj/structure/surface/table/almayer, @@ -17544,7 +17526,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "bIJ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -17571,20 +17553,20 @@ "bIR" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "bIS" = ( /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "bIT" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "bIU" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes{ @@ -17605,7 +17587,7 @@ /obj/structure/disposalpipe/junction, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "bJe" = ( /obj/structure/surface/table/reinforced/black, /obj/item/explosive/grenade/high_explosive/training, @@ -17644,7 +17626,7 @@ /turf/open/floor/almayer{ icon_state = "orangecorner" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "bJl" = ( /obj/structure/machinery/door/airlock/almayer/generic{ access_modified = 1; @@ -17684,10 +17666,11 @@ }, /area/almayer/medical/lower_medical_medbay) "bJz" = ( +/obj/structure/machinery/power/apc/almayer, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "bJC" = ( /turf/closed/wall/almayer, /area/almayer/squads/charlie) @@ -17786,7 +17769,7 @@ pixel_y = -30 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "bKd" = ( /obj/structure/surface/table/almayer, /obj/item/tool/hand_labeler, @@ -17915,7 +17898,7 @@ dir = 4; icon_state = "orange" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "bKJ" = ( /obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/almayer{ @@ -18210,7 +18193,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "bLX" = ( /obj/vehicle/powerloader, /turf/open/floor/almayer{ @@ -18241,7 +18224,7 @@ dir = 4; icon_state = "emerald" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "bMu" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{ req_access = null; @@ -18672,7 +18655,7 @@ dir = 4; icon_state = "emeraldcorner" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "bOx" = ( /obj/structure/machinery/door/airlock/almayer/marine/charlie/tl, /turf/open/floor/almayer{ @@ -18804,7 +18787,7 @@ /turf/open/floor/almayer{ icon_state = "emeraldcorner" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "bOZ" = ( /obj/structure/machinery/light{ dir = 1 @@ -19254,7 +19237,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "bRR" = ( /obj/structure/machinery/door/window/eastleft{ req_one_access_txt = "2;21" @@ -19317,7 +19300,7 @@ name = "ship-grade camera" }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "bSe" = ( /turf/open/floor/almayer{ dir = 6; @@ -19342,7 +19325,7 @@ pixel_y = 32 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "bSn" = ( /obj/structure/machinery/cm_vending/gear/tl{ density = 0; @@ -19437,7 +19420,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "bSZ" = ( /obj/structure/machinery/vending/coffee{ density = 0; @@ -19671,7 +19654,7 @@ dir = 4; icon_state = "bluecorner" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "bUe" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -19687,7 +19670,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "bUf" = ( /obj/structure/machinery/light, /obj/structure/disposalpipe/segment{ @@ -19784,12 +19767,12 @@ }, /area/almayer/squads/req) "bUz" = ( -/obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/manifold/fourway/hidden/supply, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "bUE" = ( /turf/open/floor/almayer{ dir = 4; @@ -19800,7 +19783,7 @@ /turf/open/floor/almayer{ icon_state = "bluecorner" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "bUH" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -19818,7 +19801,7 @@ dir = 8; icon_state = "blue" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "bUN" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray{ @@ -20093,7 +20076,7 @@ dir = 4; icon_state = "orange" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "bXe" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) @@ -20257,7 +20240,7 @@ dir = 4; icon_state = "orangecorner" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "bYF" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -20362,7 +20345,7 @@ pixel_x = 1 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "bZJ" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/effect/landmark/map_item, @@ -20374,7 +20357,7 @@ dir = 10 }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "bZL" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; @@ -20489,7 +20472,7 @@ id = "req_belt" }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "cap" = ( /obj/structure/surface/rack, /obj/item/tool/wirecutters, @@ -20550,7 +20533,7 @@ /turf/open/floor/almayer{ icon_state = "orangecorner" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "cax" = ( /obj/structure/machinery/camera/autoname/almayer{ name = "ship-grade camera" @@ -20714,36 +20697,28 @@ dir = 4; icon_state = "greencorner" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "cbw" = ( /turf/open/floor/almayer{ dir = 1; icon_state = "greencorner" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "cbz" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) +"cbC" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_aft_hallway) "cbD" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/port_hallway) -"cbE" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "cbM" = ( /obj/structure/closet/crate, /obj/item/clothing/glasses/welding, @@ -20764,7 +20739,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "cbR" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -20776,7 +20751,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "cbS" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -20784,7 +20759,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "cbU" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -20793,7 +20768,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "cbV" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -20810,13 +20785,13 @@ pixel_y = 3 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "cbW" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "cbX" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -20824,7 +20799,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "ccb" = ( /obj/structure/surface/table/reinforced/black, /turf/open/floor/almayer{ @@ -20900,7 +20875,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "ccr" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -20909,7 +20884,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "ccs" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -20926,14 +20901,14 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "ccv" = ( /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "ccG" = ( /obj/structure/largecrate/random/secure, /obj/effect/decal/warning_stripes{ @@ -20962,7 +20937,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "ccQ" = ( /obj/effect/landmark/ert_spawns/distress_cryo, /obj/effect/landmark/late_join, @@ -20974,7 +20949,7 @@ id_tag = "mining_outpost_pump" }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "cdb" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -21452,6 +21427,9 @@ icon_state = "plate" }, /area/almayer/squads/charlie) +"cgB" = ( +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_aft_hallway) "cgE" = ( /turf/open/floor/almayer, /area/almayer/living/cryo_cells) @@ -21593,7 +21571,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "chL" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -21834,7 +21812,7 @@ dir = 8 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "ciU" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -21852,7 +21830,7 @@ dir = 4; icon_state = "blue" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "cjc" = ( /obj/effect/landmark/start/marine/alpha, /obj/effect/landmark/late_join/alpha, @@ -21952,7 +21930,7 @@ dir = 5; icon_state = "red" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "cjA" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -22010,7 +21988,7 @@ dir = 4; icon_state = "red" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "cjT" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -22026,7 +22004,7 @@ dir = 8; icon_state = "red" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "cjW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -22097,7 +22075,7 @@ dir = 5; icon_state = "red" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "ckm" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -22110,7 +22088,7 @@ dir = 9; icon_state = "red" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "ckr" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -22129,7 +22107,7 @@ dir = 1 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "ckK" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -22197,7 +22175,7 @@ dir = 6; icon_state = "red" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "clb" = ( /obj/structure/machinery/light{ dir = 4 @@ -22210,7 +22188,7 @@ dir = 10; icon_state = "red" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "cle" = ( /turf/open/floor/almayer{ dir = 4; @@ -22362,7 +22340,7 @@ dir = 4; icon_state = "redcorner" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "clz" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -22372,7 +22350,7 @@ dir = 1; icon_state = "redcorner" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "clC" = ( /obj/structure/stairs, /obj/structure/machinery/light{ @@ -22386,7 +22364,7 @@ /turf/open/floor/plating/almayer{ allow_construction = 0 }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "clE" = ( /obj/structure/machinery/door/airlock/almayer/marine/delta/medic, /turf/open/floor/almayer{ @@ -22451,7 +22429,7 @@ dir = 4; icon_state = "blue" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "clS" = ( /obj/structure/machinery/cm_vending/gear/spec, /obj/structure/sign/safety/hazard{ @@ -22518,7 +22496,7 @@ dir = 5; icon_state = "green" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "cme" = ( /obj/structure/largecrate/random/barrel/red, /obj/structure/prop/invuln/overhead_pipe{ @@ -22539,7 +22517,7 @@ dir = 6; icon_state = "green" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "cmh" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -22553,7 +22531,7 @@ dir = 4; icon_state = "green" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "cml" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -22743,7 +22721,7 @@ /turf/open/floor/plating/almayer{ allow_construction = 0 }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "cnp" = ( /obj/structure/machinery/light{ dir = 4 @@ -23104,7 +23082,7 @@ dir = 10; icon_state = "green" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "cqm" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/folder/white{ @@ -23210,12 +23188,12 @@ }, /area/almayer/squads/req) "crW" = ( -/obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/manifold/fourway/hidden/supply, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "csd" = ( /obj/structure/closet/firecloset, /turf/open/floor/plating/plating_catwalk, @@ -23226,7 +23204,7 @@ dir = 1; icon_state = "greencorner" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "csI" = ( /turf/open/floor/almayer{ dir = 8; @@ -23438,7 +23416,6 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 8; id = "laddersoutheast"; @@ -23447,7 +23424,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "cwS" = ( /obj/structure/blocker/invisible_wall, /turf/open/floor/almayer/no_build{ @@ -23514,7 +23491,7 @@ /turf/open/floor/plating/almayer{ allow_construction = 0 }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "cyL" = ( /obj/structure/surface/table/almayer, /obj/effect/spawner/random/toolbox, @@ -23674,7 +23651,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "cBI" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -23693,7 +23670,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "cBZ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/door_control{ @@ -24236,6 +24213,15 @@ icon_state = "cargo" }, /area/almayer/living/bridgebunks) +"cLW" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_aft_hallway) "cMb" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm{ @@ -24378,7 +24364,7 @@ pixel_y = -32 }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "cOY" = ( /obj/item/clothing/under/blackskirt{ desc = "A stylish skirt, in a business-black and red colour scheme."; @@ -25018,11 +25004,10 @@ id = "laddernortheast"; name = "\improper North East Ladders Shutters" }, -/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "daz" = ( /turf/closed/wall/almayer/white/hull, /area/almayer/command/airoom) @@ -25247,7 +25232,7 @@ pixel_y = -28 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "deT" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -25402,7 +25387,7 @@ /turf/open/floor/almayer{ icon_state = "cargo" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "dhZ" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -26210,11 +26195,10 @@ id = "laddernortheast"; name = "\improper North East Ladders Shutters" }, -/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "dzG" = ( /obj/structure/reagent_dispensers/peppertank{ pixel_y = 26 @@ -26348,6 +26332,12 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/execution) +"dCd" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) "dCe" = ( /obj/structure/machinery/cryopod{ pixel_y = 6 @@ -26513,7 +26503,7 @@ dir = 4; icon_state = "greencorner" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "dEG" = ( /obj/structure/machinery/light{ unacidable = 1; @@ -26707,6 +26697,12 @@ }, /turf/open/floor/plating, /area/almayer/living/bridgebunks) +"dIf" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_midship_hallway) "dIi" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/plating/plating_catwalk{ @@ -26993,6 +26989,15 @@ icon_state = "plate" }, /area/almayer/living/captain_mess) +"dOE" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_aft_hallway) "dPd" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp{ @@ -27107,7 +27112,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "dQv" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -27182,7 +27187,7 @@ dir = 8; icon_state = "red" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "dRP" = ( /obj/structure/bed/chair/comfy/orange, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -27950,6 +27955,14 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) +"efW" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_aft_hallway) "egc" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -28054,7 +28067,7 @@ pixel_y = 3 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "ehL" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/sign/safety/maint{ @@ -28371,7 +28384,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "enQ" = ( /obj/structure/surface/rack, /obj/item/frame/table, @@ -28659,7 +28672,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "esm" = ( /obj/structure/sign/safety/storage{ pixel_x = 8; @@ -28896,7 +28909,7 @@ dir = 1; icon_state = "greencorner" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "ewr" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -29135,7 +29148,13 @@ dir = 4; icon_state = "orange" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) +"eBq" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) "eBC" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -29244,6 +29263,10 @@ icon_state = "plating" }, /area/almayer/shipboard/brig/execution) +"eDb" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_fore_hallway) "eDk" = ( /obj/structure/surface/rack, /obj/item/tool/weldpack, @@ -29296,7 +29319,7 @@ pixel_y = -32 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "eEc" = ( /obj/structure/machinery/light, /obj/effect/decal/warning_stripes{ @@ -29775,7 +29798,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "ePM" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = 32 @@ -29963,6 +29986,11 @@ /obj/effect/landmark/crap_item, /turf/open/floor/almayer, /area/almayer/living/briefing) +"eTf" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "eTD" = ( /obj/structure/bed/chair{ dir = 4 @@ -30279,7 +30307,7 @@ /turf/open/floor/almayer{ allow_construction = 0 }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "eZm" = ( /turf/closed/wall/almayer, /area/almayer/maint/hull/upper/p_stern) @@ -30336,7 +30364,7 @@ icon_state = "pipe-j2" }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "faE" = ( /obj/structure/bookcase{ icon_state = "book-5"; @@ -30849,7 +30877,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "fkX" = ( /turf/closed/wall/almayer/research/containment/wall/corner{ dir = 8 @@ -31029,7 +31057,7 @@ "fpO" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "fpR" = ( /obj/structure/surface/table/almayer, /obj/effect/spawner/random/tool, @@ -31218,7 +31246,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "fsR" = ( /obj/structure/pipes/vents/pump{ dir = 8; @@ -31257,7 +31285,7 @@ /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "ftG" = ( /obj/structure/sign/safety/life_support{ pixel_x = 8; @@ -31371,7 +31399,7 @@ pixel_y = 32 }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "fvN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -31854,6 +31882,12 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_a_s) +"fGF" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_aft_hallway) "fHb" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/plating/plating_catwalk, @@ -32451,7 +32485,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "fTj" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -32498,7 +32532,7 @@ dir = 4; icon_state = "green" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "fUz" = ( /obj/structure/surface/rack, /obj/item/storage/box/cups{ @@ -32600,6 +32634,11 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) +"fXe" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_aft_hallway) "fXg" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -32726,7 +32765,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "fZy" = ( /obj/structure/sign/poster{ pixel_y = -32 @@ -32924,6 +32963,12 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) +"gdd" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_aft_hallway) "gde" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -33056,6 +33101,17 @@ icon_state = "tcomms" }, /area/almayer/command/airoom) +"gfC" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_midship_hallway) "gfE" = ( /obj/structure/machinery/recharge_station, /turf/open/floor/plating, @@ -33158,7 +33214,7 @@ pixel_y = 32 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "ghX" = ( /obj/structure/machinery/power/fusion_engine{ name = "\improper S-52 fusion reactor 14" @@ -33225,7 +33281,7 @@ "gjn" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "gjq" = ( /obj/structure/platform{ dir = 8 @@ -33719,7 +33775,7 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "guo" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -33926,7 +33982,7 @@ dir = 4; icon_state = "orange" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "gyH" = ( /obj/item/tool/warning_cone{ pixel_x = -12; @@ -35344,7 +35400,7 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "hbl" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -35513,7 +35569,7 @@ dir = 4 }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "hec" = ( /turf/open/floor/almayer{ dir = 8; @@ -35596,6 +35652,15 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/lower/engine_core) +"hfo" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_midship_hallway) "hfv" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/almayer{ @@ -35889,6 +35954,17 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south2) +"hkl" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_aft_hallway) "hkz" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -35909,7 +35985,7 @@ /turf/open/floor/almayer{ icon_state = "cargo" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "hkG" = ( /obj/structure/sign/safety/ammunition{ pixel_y = -32 @@ -36026,7 +36102,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "hme" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -36208,7 +36284,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "hoT" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -36538,7 +36614,7 @@ /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "hvq" = ( /obj/structure/bed/chair{ dir = 8; @@ -36601,6 +36677,12 @@ icon_state = "cargo" }, /area/almayer/engineering/lower/engine_core) +"hww" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) "hwC" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -36681,7 +36763,7 @@ dir = 6; icon_state = "green" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "hyw" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -36846,7 +36928,7 @@ /turf/open/floor/plating/almayer{ allow_construction = 0 }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "hBF" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -36923,7 +37005,7 @@ pixel_y = 32 }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "hDR" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/syringe_case{ @@ -37185,6 +37267,9 @@ icon_state = "green" }, /area/almayer/hallways/aft_hallway) +"hJA" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_aft_hallway) "hJD" = ( /obj/structure/bed/sofa/south/grey/right{ pixel_y = 12 @@ -37287,7 +37372,7 @@ dir = 8; icon_state = "green" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "hMG" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, @@ -37362,7 +37447,7 @@ dir = 4 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "hOV" = ( /turf/closed/wall/almayer, /area/almayer/maint/lower/constr) @@ -38481,6 +38566,14 @@ icon_state = "redfull" }, /area/almayer/living/briefing) +"ijN" = ( +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) "ijQ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/door_control{ @@ -38824,6 +38917,12 @@ icon_state = "cargo" }, /area/almayer/shipboard/brig/cryo) +"iri" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) "iry" = ( /obj/structure/platform{ dir = 8 @@ -39077,7 +39176,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "ivL" = ( /obj/structure/platform{ dir = 8 @@ -39282,6 +39381,12 @@ icon_state = "plate" }, /area/almayer/living/offices) +"izq" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) "izG" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -39350,7 +39455,7 @@ dir = 8; icon_state = "blue" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "iBl" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -39369,6 +39474,11 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/p_bow) +"iBO" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_fore_hallway) "iBY" = ( /obj/structure/machinery/vending/snack, /turf/open/floor/almayer{ @@ -39443,7 +39553,10 @@ icon_state = "pipe-c" }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) +"iDY" = ( +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_fore_hallway) "iEa" = ( /obj/structure/machinery/light/small, /turf/open/floor/almayer{ @@ -39455,7 +39568,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "iEg" = ( /turf/open/floor/almayer{ dir = 9; @@ -39595,6 +39708,14 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"iGZ" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_fore_hallway) "iHc" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/notunnel) @@ -40060,13 +40181,13 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "iRx" = ( /obj/structure/machinery/light{ dir = 1 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "iRy" = ( /obj/structure/pipes/vents/pump/on, /turf/open/floor/almayer, @@ -40570,7 +40691,7 @@ dir = 8; icon_state = "emerald" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "iZP" = ( /obj/structure/platform{ dir = 8 @@ -40924,7 +41045,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "jfK" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -41060,7 +41181,7 @@ pixel_y = 25 }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "jhb" = ( /obj/structure/sign/safety/cryo{ pixel_x = -6; @@ -41151,7 +41272,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "jiM" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -41238,7 +41359,7 @@ vector_y = 104 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "jjZ" = ( /obj/structure/machinery/light{ dir = 4 @@ -41259,7 +41380,7 @@ dir = 4; icon_state = "orange" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "jkj" = ( /obj/structure/machinery/portable_atmospherics/powered/pump, /obj/structure/machinery/light{ @@ -41346,6 +41467,15 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"jkJ" = ( +/obj/structure/pipes/vents/pump/on, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_aft_hallway) "jkN" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/almayer{ @@ -41711,7 +41841,7 @@ dir = 4; icon_state = "greencorner" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "jtU" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_m_p) @@ -41881,6 +42011,17 @@ }, /turf/open/floor/almayer, /area/almayer/squads/charlie) +"jxA" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_aft_hallway) "jxB" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -42048,6 +42189,14 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/s_bow) +"jCw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_aft_hallway) "jCK" = ( /obj/effect/decal/medical_decals{ icon_state = "triagedecalbottomleft"; @@ -42260,7 +42409,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "jGQ" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -42290,7 +42439,7 @@ dir = 8 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "jHh" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -42361,6 +42510,10 @@ icon_state = "orange" }, /area/almayer/maint/upper/mess) +"jIE" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_fore_hallway) "jIH" = ( /obj/structure/surface/rack, /obj/item/clothing/suit/straight_jacket, @@ -42405,7 +42558,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "jJk" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -42419,7 +42572,7 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "jKn" = ( /turf/open/floor/almayer{ dir = 5; @@ -42449,7 +42602,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "jKF" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -42507,7 +42660,7 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "jLH" = ( /obj/structure/largecrate/supply/supplies/mre, /turf/open/floor/almayer{ @@ -42522,7 +42675,7 @@ dir = 4; icon_state = "emerald" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "jLM" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -42545,7 +42698,7 @@ pixel_x = 32 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "jMm" = ( /obj/structure/closet/secure_closet/personal/cabinet{ req_access = null @@ -43138,7 +43291,7 @@ }, /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "jWu" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -43154,7 +43307,7 @@ /turf/open/floor/plating/almayer{ allow_construction = 0 }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "jXd" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -43428,7 +43581,7 @@ /turf/open/floor/plating/almayer{ allow_construction = 0 }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "kaI" = ( /obj/structure/bed/chair{ dir = 4 @@ -43684,7 +43837,7 @@ dir = 1 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "kfU" = ( /turf/open/floor/plating, /area/almayer/powered/agent) @@ -43714,7 +43867,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "kgs" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -43971,7 +44124,7 @@ pixel_y = 3 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "kkW" = ( /obj/structure/surface/table/almayer, /obj/item/book/manual/atmospipes, @@ -44073,7 +44226,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "kow" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -44234,7 +44387,7 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "krp" = ( /obj/structure/surface/table/almayer, /obj/item/storage/box/cups, @@ -44690,7 +44843,7 @@ dir = 9; icon_state = "red" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "kzT" = ( /obj/structure/machinery/door_control{ id = "ARES StairsLower"; @@ -44719,6 +44872,14 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south2) +"kAn" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_aft_hallway) "kAp" = ( /obj/structure/surface/rack{ desc = "A bunch of metal shelves stacked on top of eachother. Excellent for storage purposes, less so as cover. One of the shelf legs is damaged, resulting in the rack being propped up by what appears to be circuit boards." @@ -44826,7 +44987,7 @@ pixel_x = 2 }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "kBP" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -44936,7 +45097,7 @@ pixel_y = 28 }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "kEc" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -45107,7 +45268,7 @@ vector_y = 100 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "kHS" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -45230,7 +45391,7 @@ dir = 10; icon_state = "green" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "kJW" = ( /obj/structure/machinery/door/window/westright, /obj/structure/machinery/shower{ @@ -45334,7 +45495,7 @@ dir = 8; icon_state = "red" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "kLB" = ( /obj/docking_port/stationary/escape_pod/east, /turf/open/floor/plating, @@ -46459,7 +46620,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "lhj" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/safety/bulkhead_door{ @@ -47055,7 +47216,7 @@ dir = 1; icon_state = "greencorner" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "lqF" = ( /turf/open/floor/almayer{ dir = 9; @@ -47267,21 +47428,29 @@ }, /area/almayer/living/commandbunks) "luz" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "luE" = ( /obj/structure/sign/poster{ pixel_y = 32 }, /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_p) +"luO" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "luS" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/cardboard{ @@ -47597,7 +47766,7 @@ }, /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "lAQ" = ( /obj/structure/machinery/cm_vending/gear/tl{ density = 0; @@ -47651,7 +47820,7 @@ }, /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "lBB" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -47714,15 +47883,12 @@ id = "laddernorthwest"; name = "\improper North West Ladders Shutters" }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "lDn" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -47745,7 +47911,7 @@ dir = 8; icon_state = "orange" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "lDL" = ( /obj/structure/machinery/light{ dir = 4 @@ -47948,7 +48114,7 @@ pixel_x = -17 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "lHk" = ( /obj/structure/closet/firecloset, /obj/effect/decal/warning_stripes{ @@ -48409,7 +48575,7 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "lRe" = ( /obj/structure/pipes/vents/pump, /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ @@ -48457,7 +48623,7 @@ pixel_y = 32 }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "lRX" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp, @@ -48672,7 +48838,7 @@ /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "lYk" = ( /obj/item/trash/c_tube{ pixel_x = 16; @@ -48843,6 +49009,17 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/morgue) +"mdf" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_aft_hallway) "mdo" = ( /obj/structure/machinery/cm_vending/sorted/marine_food, /turf/open/floor/almayer{ @@ -49098,10 +49275,15 @@ }, /area/almayer/command/cic) "mji" = ( -/obj/structure/pipes/standard/manifold/fourway/hidden/supply, /obj/structure/disposalpipe/segment, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/starboard_aft_hallway) "mjs" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -49535,7 +49717,7 @@ pixel_x = 1 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "mrD" = ( /obj/structure/machinery/light{ dir = 1 @@ -49994,7 +50176,7 @@ pixel_y = -32 }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "mzS" = ( /turf/open/floor/almayer{ dir = 9; @@ -50206,7 +50388,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "mEE" = ( /obj/structure/platform{ dir = 4; @@ -50334,7 +50516,7 @@ pixel_y = -32 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "mHo" = ( /obj/structure/machinery/washing_machine, /obj/structure/machinery/washing_machine{ @@ -50656,7 +50838,7 @@ }, /obj/structure/pipes/standard/manifold/fourway/hidden/supply, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "mLe" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -50688,6 +50870,12 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) +"mLA" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_midship_hallway) "mLE" = ( /turf/open/floor/plating, /area/almayer/command/airoom) @@ -51044,16 +51232,6 @@ icon_state = "red" }, /area/almayer/command/lifeboat) -"mRS" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/starboard_hallway) "mRU" = ( /turf/closed/wall/almayer, /area/almayer/maint/hull/upper/u_m_p) @@ -51109,6 +51287,9 @@ icon_state = "blue" }, /area/almayer/squads/charlie_delta_shared) +"mSZ" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_midship_hallway) "mTb" = ( /obj/structure/machinery/light{ dir = 4 @@ -51150,7 +51331,7 @@ /turf/open/floor/almayer{ icon_state = "cargo" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "mTp" = ( /obj/structure/window/reinforced{ dir = 4; @@ -51186,7 +51367,7 @@ }, /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "mUq" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -51328,7 +51509,7 @@ pixel_x = 32 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "mWy" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_bravo/yellow{ @@ -51407,7 +51588,7 @@ dir = 8; icon_state = "blue" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "mYY" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -52096,7 +52277,7 @@ icon_state = "S" }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "njD" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ @@ -52121,7 +52302,7 @@ dir = 8; icon_state = "emerald" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "njO" = ( /obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, /turf/open/floor/almayer{ @@ -52280,7 +52461,7 @@ pixel_y = 28 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "nmK" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -52948,7 +53129,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "nyQ" = ( /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) @@ -53333,16 +53514,6 @@ icon_state = "test_floor4" }, /area/almayer/engineering/lower/engine_core) -"nFV" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/starboard_hallway) "nFX" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 2; @@ -53546,6 +53717,14 @@ icon_state = "plating" }, /area/almayer/command/airoom) +"nJX" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_midship_hallway) "nKq" = ( /obj/structure/machinery/status_display{ pixel_x = 16; @@ -53566,6 +53745,10 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop) +"nKX" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) "nLg" = ( /obj/effect/projector{ name = "Almayer_Up2"; @@ -53576,7 +53759,7 @@ allow_construction = 0; icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "nLk" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/machinery/power/apc/almayer{ @@ -53634,7 +53817,7 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "nMe" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -54686,6 +54869,9 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) +"ogT" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) "ohj" = ( /obj/structure/machinery/cryopod, /turf/open/floor/almayer{ @@ -54922,7 +55108,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "ojZ" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -55098,7 +55284,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "ond" = ( /obj/structure/machinery/sleep_console{ dir = 8 @@ -55636,7 +55822,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "owU" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -55711,7 +55897,7 @@ pixel_x = -1 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "oyE" = ( /obj/effect/landmark/start/intel, /obj/structure/sign/poster{ @@ -55815,6 +56001,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_a_s) +"oAL" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_fore_hallway) "oAO" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -56221,6 +56414,10 @@ icon_state = "test_floor4" }, /area/almayer/engineering/laundry) +"oHV" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_fore_hallway) "oIa" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -56370,7 +56567,7 @@ pixel_y = 32 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "oLF" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -56410,7 +56607,7 @@ dir = 1 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "oLU" = ( /turf/open/floor/almayer{ dir = 1; @@ -56652,7 +56849,7 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "oQs" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/book/manual/surgery{ @@ -57633,7 +57830,7 @@ dir = 4; icon_state = "green" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "pkz" = ( /turf/open/floor/almayer{ icon_state = "redfull" @@ -57716,7 +57913,7 @@ pixel_y = 32 }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "pns" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -58407,7 +58604,7 @@ dir = 8; icon_state = "greencorner" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "pBG" = ( /turf/closed/wall/almayer, /area/almayer/command/corporateliaison) @@ -58633,7 +58830,7 @@ dir = 1 }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "pGT" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -58781,7 +58978,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "pJR" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_AresUp"; @@ -59544,6 +59741,11 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_umbilical) +"pZF" = ( +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/port_fore_hallway) "pZH" = ( /obj/structure/machinery/shower{ dir = 8 @@ -59603,6 +59805,10 @@ icon_state = "red" }, /area/almayer/living/briefing) +"qbl" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_fore_hallway) "qbx" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -59658,7 +59864,7 @@ pixel_y = 32 }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "qcy" = ( /obj/structure/sign/safety/bathunisex{ pixel_x = 8; @@ -60336,7 +60542,7 @@ dir = 10 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "qmM" = ( /obj/structure/bed/chair{ dir = 8 @@ -60434,6 +60640,14 @@ icon_state = "test_floor4" }, /area/almayer/living/pilotbunks) +"qnM" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_midship_hallway) "qom" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/chem_dispenser/soda{ @@ -60657,7 +60871,7 @@ dir = 9 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "qtv" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -60723,7 +60937,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "quJ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -61310,6 +61524,15 @@ icon_state = "red" }, /area/almayer/shipboard/brig/cells) +"qEB" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_fore_hallway) +"qEC" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_aft_hallway) "qEL" = ( /obj/structure/surface/table/almayer, /obj/structure/largecrate/random/case/small{ @@ -61342,13 +61565,17 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "qFi" = ( /obj/structure/bed/chair/comfy/black{ dir = 4 }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/chief_mp_office) +"qFr" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_aft_hallway) "qFu" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -61455,7 +61682,7 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "qHq" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ dir = 2; @@ -61686,7 +61913,7 @@ dir = 4; icon_state = "greencorner" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "qKY" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -61730,12 +61957,12 @@ "qLo" = ( /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "qLp" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "qLs" = ( /obj/effect/landmark/start/maint, /turf/open/floor/plating/plating_catwalk, @@ -62374,7 +62601,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "qYu" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer{ @@ -62599,7 +62826,7 @@ pixel_y = -32 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "rbY" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -62718,7 +62945,7 @@ dir = 8; icon_state = "blue" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "rec" = ( /obj/structure/bed/chair/comfy/bravo{ dir = 1 @@ -63302,13 +63529,10 @@ /area/almayer/living/grunt_rnr) "rpd" = ( /obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "rph" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -63375,7 +63599,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "rqz" = ( /obj/structure/sign/safety/autoopenclose{ pixel_y = 32 @@ -63504,7 +63728,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "rsK" = ( /obj/structure/sign/safety/hvac_old, /turf/closed/wall/almayer, @@ -64324,7 +64548,7 @@ dir = 9; icon_state = "green" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "rGj" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -64658,7 +64882,7 @@ pixel_y = -28 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "rKA" = ( /obj/structure/bed{ can_buckle = 0 @@ -64838,7 +65062,7 @@ dir = 4; icon_state = "blue" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "rOs" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/clipboard, @@ -65091,6 +65315,14 @@ icon_state = "plate" }, /area/almayer/maint/upper/u_m_p) +"rTg" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_midship_hallway) "rTk" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -65137,16 +65369,6 @@ /obj/effect/landmark/late_join/nurse, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/offices) -"rUs" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/port_hallway) "rUy" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -65328,7 +65550,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "rYp" = ( /obj/effect/landmark/start/marine/medic/delta, /obj/effect/landmark/late_join/delta, @@ -65365,7 +65587,7 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "rZB" = ( /obj/structure/pipes/standard/simple/visible{ dir = 9 @@ -65997,7 +66219,7 @@ pixel_y = -32 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "smw" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/med_data/laptop{ @@ -66216,13 +66438,13 @@ /turf/open/floor/plating/almayer{ allow_construction = 0 }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "sou" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "sov" = ( /turf/open/floor/almayer{ dir = 1; @@ -66464,13 +66686,18 @@ /turf/open/floor/almayer{ icon_state = "greencorner" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "ssU" = ( /obj/structure/machinery/constructable_frame, /turf/open/floor/almayer{ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) +"ssV" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) "ssW" = ( /obj/structure/machinery/light{ dir = 1 @@ -66551,7 +66778,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "suc" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/disposalpipe/segment{ @@ -66606,6 +66833,11 @@ }, /turf/open/floor/almayer, /area/almayer/command/lifeboat) +"svj" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_fore_hallway) "svl" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -66715,7 +66947,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "sxD" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 2; @@ -66768,7 +67000,7 @@ pixel_x = 1 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "szf" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -67128,7 +67360,7 @@ }, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "sFC" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -67393,7 +67625,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "sMu" = ( /obj/item/trash/uscm_mre, /obj/structure/bed/chair/comfy/charlie{ @@ -67783,7 +68015,16 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) +"sVD" = ( +/obj/structure/pipes/vents/pump/on, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_aft_hallway) "sVT" = ( /obj/structure/surface/table/almayer, /obj/item/storage/toolbox/mechanical, @@ -68137,7 +68378,7 @@ dir = 4; icon_state = "red" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "taH" = ( /obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{ id = "Containment Cell 2"; @@ -68359,7 +68600,7 @@ pixel_y = 32 }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "teY" = ( /obj/structure/machinery/light{ dir = 1 @@ -68389,7 +68630,7 @@ pixel_x = 32 }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "tfw" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -68403,7 +68644,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "tfH" = ( /obj/structure/machinery/light/containment, /obj/effect/decal/warning_stripes{ @@ -68444,6 +68685,12 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) +"tgQ" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_aft_hallway) "tgV" = ( /obj/structure/bed, /obj/item/bedsheet/medical, @@ -68569,7 +68816,7 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "tiE" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -68697,7 +68944,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "tkn" = ( /obj/structure/surface/table/almayer, /obj/item/storage/toolbox/mechanical, @@ -68743,6 +68990,12 @@ icon_state = "cargo" }, /area/almayer/living/pilotbunks) +"tlg" = ( +/obj/structure/machinery/power/apc/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "tlk" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -68991,6 +69244,12 @@ icon_state = "silver" }, /area/almayer/living/bridgebunks) +"tpN" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/lower/port_aft_hallway) "tqg" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -69268,7 +69527,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "ttS" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_sn_full_cap" @@ -69497,7 +69756,7 @@ pixel_y = -26 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "twW" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -69520,7 +69779,7 @@ dir = 6 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "txi" = ( /obj/structure/machinery/light{ dir = 8 @@ -69531,7 +69790,7 @@ vector_y = 102 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "txp" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/plating/plating_catwalk, @@ -69599,7 +69858,7 @@ /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "tzx" = ( /obj/structure/machinery/light{ unacidable = 1; @@ -69695,12 +69954,12 @@ "tBF" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "tBL" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "tBU" = ( /obj/structure/platform, /obj/structure/largecrate/random/case/double{ @@ -69769,7 +70028,7 @@ dir = 8; icon_state = "orange" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "tCT" = ( /obj/structure/bed/chair/comfy/blue{ dir = 8 @@ -69778,6 +70037,15 @@ icon_state = "plate" }, /area/almayer/command/cic) +"tDT" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) "tDZ" = ( /obj/structure/machinery/cryopod{ pixel_y = 6 @@ -69924,7 +70192,7 @@ vector_y = 104 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "tGG" = ( /obj/structure/bed/chair/comfy/alpha{ dir = 1 @@ -69947,7 +70215,7 @@ vector_y = 102 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "tGT" = ( /obj/structure/machinery/light{ dir = 1 @@ -70428,7 +70696,6 @@ /obj/structure/machinery/status_display{ pixel_y = -30 }, -/obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 8; id = "laddersoutheast"; @@ -70437,7 +70704,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "tQA" = ( /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ dir = 1 @@ -70571,6 +70838,11 @@ "tUx" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) +"tUK" = ( +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/lower/starboard_aft_hallway) "tUN" = ( /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ access_modified = 1; @@ -71055,7 +71327,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "udG" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes{ @@ -72140,7 +72412,7 @@ /turf/open/floor/almayer{ icon_state = "greencorner" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "uyd" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -72268,6 +72540,12 @@ icon_state = "cargo" }, /area/almayer/squads/bravo) +"uBf" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_aft_hallway) "uBi" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/almayer, @@ -72287,7 +72565,7 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "uBx" = ( /obj/structure/prop/invuln/overhead_pipe{ dir = 4; @@ -72493,7 +72771,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "uGc" = ( /obj/structure/machinery/suit_storage_unit/compression_suit/uscm, /obj/structure/sign/safety/hazard{ @@ -72672,7 +72950,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "uKH" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -72709,7 +72987,7 @@ pixel_y = -32 }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "uLG" = ( /obj/structure/closet/crate/freezer{ desc = "A freezer crate. Someone has written 'open on christmas' in marker on the top." @@ -72730,6 +73008,11 @@ /obj/structure/largecrate/random/secure, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/p_bow) +"uMg" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_aft_hallway) "uMj" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -72901,7 +73184,7 @@ pixel_y = 3 }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "uQo" = ( /obj/structure/machinery/disposal, /obj/item/reagent_container/food/drinks/cans/beer{ @@ -72929,7 +73212,7 @@ /turf/open/floor/plating/almayer{ allow_construction = 0 }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "uRo" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray{ @@ -73346,7 +73629,13 @@ dir = 1 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) +"uXI" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orange" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "uXL" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -73630,6 +73919,11 @@ icon_state = "silver" }, /area/almayer/hallways/lower/repair_bay) +"vdK" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) "vdL" = ( /obj/structure/sign/safety/reception{ pixel_x = -17; @@ -73681,7 +73975,7 @@ dir = 1 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "ven" = ( /obj/structure/bed/chair, /turf/open/floor/almayer{ @@ -73806,7 +74100,7 @@ dir = 4; icon_state = "greencorner" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "vgn" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, @@ -73890,7 +74184,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "vgD" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -73913,7 +74207,7 @@ /turf/open/floor/plating/almayer{ allow_construction = 0 }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "vgO" = ( /turf/closed/wall/almayer/research/containment/wall/east, /area/almayer/medical/containment/cell) @@ -74391,6 +74685,17 @@ icon_state = "red" }, /area/almayer/shipboard/port_missiles) +"vnw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_midship_hallway) "vnD" = ( /obj/structure/barricade/handrail{ dir = 1; @@ -74707,7 +75012,6 @@ }, /area/almayer/medical/upper_medical) "vtB" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 8; id = "laddersoutheast"; @@ -74719,7 +75023,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "vtD" = ( /obj/structure/extinguisher_cabinet{ pixel_y = 26 @@ -75103,13 +75407,13 @@ pixel_y = 3 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "vzu" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "vzz" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; @@ -75546,7 +75850,7 @@ pixel_x = 2 }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "vHt" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/door_control{ @@ -75821,7 +76125,7 @@ name = "ship-grade camera" }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "vME" = ( /turf/open/floor/almayer{ dir = 9; @@ -76296,10 +76600,6 @@ /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/cic_hallway) "vUU" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, /obj/structure/sign/safety/three{ pixel_x = 31; pixel_y = -8 @@ -76312,7 +76612,7 @@ dir = 4; icon_state = "emerald" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "vVb" = ( /obj/structure/machinery/cm_vending/gear/tl{ density = 0; @@ -76545,7 +76845,7 @@ dir = 5 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "vYm" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, @@ -76601,6 +76901,11 @@ }, /turf/open/floor/almayer, /area/almayer/squads/req) +"vYI" = ( +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "vYM" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -76689,7 +76994,7 @@ dir = 4; icon_state = "orange" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "wbu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/camera/autoname/almayer{ @@ -76839,7 +77144,7 @@ /turf/open/floor/plating/almayer{ allow_construction = 0 }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "wdf" = ( /obj/structure/bed/chair{ dir = 1 @@ -77900,6 +78205,11 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_f_p) +"wun" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_midship_hallway) "wup" = ( /obj/structure/supply_drop/echo, /turf/open/floor/almayer, @@ -78006,7 +78316,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "wwJ" = ( /obj/structure/surface/table/almayer, /obj/item/paper, @@ -78139,6 +78449,14 @@ icon_state = "test_floor4" }, /area/almayer/medical/lower_medical_medbay) +"wAH" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_fore_hallway) "wAR" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -78149,7 +78467,7 @@ dir = 4; icon_state = "green" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "wBd" = ( /obj/structure/machinery/status_display{ pixel_x = 32 @@ -78164,6 +78482,15 @@ icon_state = "red" }, /area/almayer/shipboard/brig/lobby) +"wBw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_aft_hallway) "wBI" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/sign/safety/maint{ @@ -78445,7 +78772,7 @@ }, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "wGE" = ( /obj/structure/disposalpipe/segment, /obj/effect/landmark/start/marine/leader/delta, @@ -78661,6 +78988,11 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/notunnel) +"wLj" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_aft_hallway) "wLm" = ( /turf/open/floor/almayer{ dir = 4; @@ -78913,6 +79245,12 @@ icon_state = "orange" }, /area/almayer/engineering/lower/engine_core) +"wRy" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_fore_hallway) "wRN" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/item/seeds/goldappleseed, @@ -79276,7 +79614,7 @@ pixel_y = -25 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "wWR" = ( /obj/structure/machinery/medical_pod/bodyscanner{ dir = 8 @@ -79689,6 +80027,10 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_a_p) +"xfJ" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_aft_hallway) "xfK" = ( /obj/structure/machinery/light{ dir = 1 @@ -80037,7 +80379,7 @@ dir = 8; icon_state = "emerald" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "xlk" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer, @@ -80234,7 +80576,7 @@ /turf/open/floor/plating/almayer{ allow_construction = 0 }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "xpL" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -80596,6 +80938,17 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) +"xww" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/port_midship_hallway) "xwE" = ( /obj/structure/bed/chair/comfy/alpha, /obj/effect/decal/cleanable/dirt, @@ -81617,7 +81970,7 @@ pixel_y = -32 }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "xNL" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -82616,7 +82969,7 @@ dir = 8; icon_state = "orange" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "yfG" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -82724,7 +83077,7 @@ dir = 8; icon_state = "red" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "yit" = ( /obj/structure/machinery/light{ dir = 4 @@ -82736,6 +83089,14 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"yiw" = ( +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_aft_hallway) "yiW" = ( /obj/structure/machinery/cryopod/right{ layer = 3.1; @@ -109082,8 +109443,8 @@ esM uUi xbk aWw -aNO -sLE +buk +wRy qLo bkA nvM @@ -109286,8 +109647,8 @@ soA xbk wfE kEb -sLE -aLG +wRy +iDY bCd iey baf @@ -109309,9 +109670,9 @@ bPk bsj byb bCd -buH +buF iEb -buH +buF app ruL qUZ @@ -109490,7 +109851,7 @@ btx naV bxk aYI -aLG +iDY bCd tmg qjN @@ -109512,9 +109873,9 @@ qjN tzP wYK bCd -buH +buF iEb -buH +buF app ruL gsd @@ -109691,7 +110052,7 @@ esM jpt xbk aWw -aLG +iDY aZi cOM baZ @@ -109717,7 +110078,7 @@ imo baZ oLv iEb -buH +buF app ruL xPq @@ -109894,9 +110255,9 @@ nEF tXi pcE aWw -aLG +iDY aZi -aLG +iDY hqW qjN qjN @@ -109918,9 +110279,9 @@ hDX qjN qjN jpp -buH +buF iEb -buH +buF eDG lFp xlO @@ -110097,9 +110458,9 @@ ljf maL uKe aWw -aLG +iDY avX -tzf +svj vcq qPS qPS @@ -110121,7 +110482,7 @@ iaF bqL bqL ocf -bFu +qbl mKY hvp mWw @@ -110300,7 +110661,7 @@ wDr wDr wDr wDr -aLG +iDY aZi cOM baZ @@ -110326,7 +110687,7 @@ xtM baZ oLv hop -vMx +oAL wDr wDr wDr @@ -110503,9 +110864,9 @@ arO arO arO wDr -beB +wAH byI -beB +qEB bCd mlH bqR @@ -110527,7 +110888,7 @@ cle bCe sdO bCd -bJz +iBO rrV bJz wDr @@ -110706,9 +111067,9 @@ arO arO arO wDr -aLG +iDY aZi -aLG +iDY bCd bmn knH @@ -110730,9 +111091,9 @@ kan iXW iLs bCd -buH +buF hop -buH +buF wDr aue aue @@ -110909,9 +111270,9 @@ nLg nLg nLg wDr -aLG +iDY aZi -bad +oHV kan kan kan @@ -110935,7 +111296,7 @@ kan kan bGe bHL -buH +buF wDr auk auk @@ -111112,9 +111473,9 @@ xpI xpI xpI wDr -aLG +iDY aZi -aLG +iDY kan qWS oDJ @@ -111136,9 +111497,9 @@ kan psO gjK kan -buH +buF bHL -buH +buF wDr aul aul @@ -111315,9 +111676,9 @@ xpI xpI xpI wDr -aLG +iDY aZi -aLG +iDY kan kAp dYU @@ -111339,9 +111700,9 @@ wzZ tdI vbV kan -buH +buF hop -buH +buF wDr aul aul @@ -111520,7 +111881,7 @@ xpI wDr bxD byI -beB +qEB bst bst bst @@ -111542,7 +111903,7 @@ biA biA biA biA -bJz +iBO bHT koc wDr @@ -111723,7 +112084,7 @@ vgF wDr jgU aZi -aLG +iDY bst bui bvz @@ -111745,7 +112106,7 @@ bsQ bmj caS biA -buH +buF bHL wWQ wDr @@ -111924,9 +112285,9 @@ xpI xpI xpI wDr -aLG +iDY aZi -aLG +iDY bst bcR bev @@ -111948,9 +112309,9 @@ bCl bsz caT biA -buH +buF bHL -buH +buF wDr aul aul @@ -112127,7 +112488,7 @@ xpI xpI xpI wDr -aLG +iDY aZi mzR bst @@ -112151,9 +112512,9 @@ bCm bsP hgZ biA -buH +buF bHL -buH +buF wDr aul aul @@ -112330,9 +112691,9 @@ xpI xpI xpI wDr -aLG +iDY aZi -aLG +iDY bst buj bev @@ -112354,9 +112715,9 @@ bCn bsz hMN biA -buH +buF bHL -buH +buF wDr aul aul @@ -112535,7 +112896,7 @@ jWU wDr pGM aZi -aLG +iDY bst aYQ bbd @@ -112557,9 +112918,9 @@ bnT btX byc biA -buH +buF bHL -bIR +jIE wDr cyG cyG @@ -112736,9 +113097,9 @@ lpD wGA lpD hmc -tBF +eDb jWt -aLG +iDY bst bst bst @@ -112932,16 +113293,16 @@ yih kgD deq bwG -aNn -aNO +iGZ +buk asO apC apC apC aqx -aLG +iDY aYO -aLG +iDY kan ihw beW @@ -112963,10 +113324,10 @@ tAU xmT tAU kan -buH +buF bHL -buH -azB +buF +azG azT azT azT @@ -113142,9 +113503,9 @@ asP uKA asP aqx -aLG +iDY aZi -aLG +iDY kan iMI rlZ @@ -113166,10 +113527,10 @@ wJb wJb bPu kan -buH +buF bHL -buH -azB +buF +azG qKM rYj ssE @@ -113347,7 +113708,7 @@ aQF aQF esi byI -beB +qEB kan avW bZn @@ -113369,7 +113730,7 @@ xIk cLA xIk kan -bJz +iBO bHT quI bJt @@ -113550,7 +113911,7 @@ cTC aQF pno aYO -bad +oHV xMs xMs xMs @@ -113753,7 +114114,7 @@ nIj aQF aWM aZi -aLG +iDY xMs aSO feY @@ -113775,9 +114136,9 @@ wZE iGn byd vMo -buH +buF bHL -buH +buF lhB pOY bDs @@ -113978,9 +114339,9 @@ bof vit dxu vMo -buH +buF bHL -buH +buF lhB xCb bDs @@ -114157,9 +114518,9 @@ brb cpp buv aWF -aLG +iDY aZi -aLG +iDY xMs akE qGF @@ -114181,9 +114542,9 @@ ggz dka bye vMo -buH +buF bHL -buH +buF lhB aQW bDs @@ -114362,7 +114723,7 @@ gJP aQF qcl aZi -aLG +iDY xMs aYR dUS @@ -114384,9 +114745,9 @@ jZd vit bzo vMo -buH +buF bHL -buH +buF lhB pxD bDs @@ -114563,9 +114924,9 @@ qZH bsN buB aWD -aLG +iDY aZi -aLG +iDY xMs bXw eiw @@ -114587,9 +114948,9 @@ boh qDP wbP vMo -buH +buF bHL -vMx +oAL bJt qom bDs @@ -114766,9 +115127,9 @@ fHF bml buB aWD -beB +qEB byI -beB +qEB xMs xMs xMs @@ -114790,7 +115151,7 @@ vMo vMo vMo vMo -bJz +iBO bHT uFP bJt @@ -114969,9 +115330,9 @@ htL aUL buB aWD -aLG +iDY aZi -aLG +iDY nyw iXU hDw @@ -114993,9 +115354,9 @@ vEH uFH tQd nyw -buH +buF bHL -buH +buF yfS sEi dck @@ -115174,7 +115535,7 @@ gJP aQF lRU aYO -aLG +iDY nyw beH dcd @@ -115196,9 +115557,9 @@ beH beH beH nyw -buH +buF bHL -buH +buF yfS hgL swt @@ -115375,7 +115736,7 @@ eXr iFH buv aWE -aLG +iDY avX aem aum @@ -115399,9 +115760,9 @@ rCO rCO rCO eVv -bFu +qbl lAO -buH +buF ykj rlQ ven @@ -115578,9 +115939,9 @@ pOi pOi nVF aWF -aLG +iDY aYO -aLG +iDY nyw eGZ ieX @@ -115602,7 +115963,7 @@ bhq dcd eTd nyw -buH +buF vdW qLp kKk @@ -115781,7 +116142,7 @@ tou tou jhy aQF -beB +qEB aYT jfD bdd @@ -115807,7 +116168,7 @@ bdd bdd fZx bHT -bJz +iBO yfS ape ven @@ -115984,9 +116345,9 @@ dVO bsR aQr aQF -aLG +iDY aYO -aLG +iDY tda ngI dkq @@ -116008,9 +116369,9 @@ qby btY bAJ huU -buH +buF bHL -buH +buF yfS ape ven @@ -116211,7 +116572,7 @@ snb xbd bAU bdg -bCi +pZF bCo ivB bJt @@ -116593,9 +116954,9 @@ hCk deq nRN bwG -bwd +vYI auv -bwd +vYI bdg auj bbf @@ -116618,7 +116979,7 @@ tMW bBY bCh bCi -bCo +xww bCi ejw xML @@ -116796,9 +117157,9 @@ lka kpj kpj mQY -aem -mUa -aLG +vdK +ijN +aWi tda mng wTm @@ -116821,7 +117182,7 @@ wTm wCI tda buH -bHL +hfo buH bJt swE @@ -117000,7 +117361,7 @@ bdd bdd bdd teH -aYO +tDT xNB bdd vuA @@ -117024,7 +117385,7 @@ vuA vuA bdd bSj -bHL +hfo bIR bdd bdd @@ -117202,9 +117563,9 @@ eYj aSp mho bdg -aLG +aWi awb -aLG +aWi bdg bqZ bqZ @@ -117405,9 +117766,9 @@ tGG bpA mho bdg -aLG -aYO -aLG +aWi +tDT +aWi bdg bqZ beH @@ -117430,7 +117791,7 @@ beH bqZ bdg buH -bHL +hfo buH bdg lCE @@ -117608,9 +117969,9 @@ tGG lJD mho bdg -aLG -aYO -aLG +aWi +tDT +aWi bdg bqZ beH @@ -117633,7 +117994,7 @@ beH bqZ bdg buH -bHL +hfo buH bdg lCE @@ -117811,9 +118172,9 @@ lCr mpn pZR bdd -beB -aYT -beB +eTf +luO +eTf bCx bqZ beH @@ -117836,7 +118197,7 @@ beH bqZ bCx buH -bHL +hfo buH bdd tSF @@ -118016,7 +118377,7 @@ phd pmv tBF fSK -aLG +aWi nyw bqZ beH @@ -118217,9 +118578,9 @@ bdd bdd bdd bdd -aLG +aWi awb -aLG +aWi bdg bqZ beH @@ -118422,7 +118783,7 @@ vKe dYX tBF lBz -aLG +aWi bdg bqZ beH @@ -118623,9 +118984,9 @@ cHB hDV vmP bdd -aLG +aWi awb -aLG +aWi bdg bqZ bqZ @@ -118826,8 +119187,8 @@ wmz rhy rec bdg -aLG -aYO +aWi +tDT bad bdd bdd @@ -118850,8 +119211,8 @@ bgO cab bdd bdd -bGe -bHL +dIf +hfo buH bdg jLS @@ -119029,10 +119390,10 @@ wmz vbI rec bdg -beB -aYT -beB -beB +eTf +luO +eTf +tlg bdd bqZ bgO @@ -119052,10 +119413,10 @@ gAj bgO bqZ bdd -bJz -bJz -bHT -bJz +qnM +cbD +vnw +cbD bdg jLS frb @@ -119232,10 +119593,10 @@ xgN vgn xgN bdg -aLG -aYO -aLG -aLG +aWi +tDT +aWi +aWi bdg bqZ qMR @@ -119257,7 +119618,7 @@ bqZ bdg buH buH -bHL +hfo buH bdg vLg @@ -119436,9 +119797,9 @@ bdd bdd bdd hDL -aYO -aNO -aLG +tDT +ogT +aWi bdg bqZ beH @@ -119459,8 +119820,8 @@ beH bqZ bdg buH -bHa -bHL +mSZ +hfo bIR bdd bdd @@ -119618,30 +119979,30 @@ bwG bwG bwG bwG -aLB +bwG acF heb cqa -bBh +eTf aMV dRG aMV yiq kLp aMV -bBh +eTf tCN lDJ tCN tCN yfw tCN -bBh -aLG -aLG -aYO -aNO -aLG +eTf +aWi +aWi +tDT +ogT +aWi bdg bqZ beH @@ -119662,8 +120023,8 @@ beH bqZ bdg buH -bHa -bHL +mSZ +hfo buH buH cbD @@ -119821,30 +120182,30 @@ ycl ycl ycl jCg -aLB +bwG nyG iDN tit -nFV -tBL -tBL -tBL -tBL -tBL -tBL -mRS -tBL -tBL -tBL -tBL -tBL -tBL luz -tzf -tBL +afd +afd +afd +afd +afd +afd +luz +afd +afd +afd +afd +afd +afd +luz +ssV +afd fau -aNO -aLG +ogT +aWi bdg bqZ beH @@ -119865,11 +120226,11 @@ beH bqZ bdg buH -bHa +mSZ wwu buI bFu -cbE +rpd buI buI buI @@ -119887,7 +120248,7 @@ rpd fkO bHY kro -bGb +mJO plv plv plv @@ -120024,29 +120385,29 @@ ycl ycl ycl ycl -aLB +bwG csl gjn jJs -bBh +eTf aMM aMM aNG bga taA aSr -bBh +eTf gyC wbh bsX bAa -bKE +uXI eBj -bBh -aLG -aNO -aYT -aNO +eTf +aWi +ogT +luO +ogT bad bdd bDQ @@ -120067,10 +120428,10 @@ vUe kuw cab bdd -bGe -bHa -bHT -bHa +dIf +mSZ +vnw +mSZ buH cbD bMt @@ -120090,7 +120451,7 @@ cbD dQs sFh guc -bGb +mJO plv plv plv @@ -120228,7 +120589,7 @@ ycl ycl ycl jUx -aLG +aWi qmL rZz jeb @@ -120246,11 +120607,11 @@ mWy jeb jeb jeb -aLG -aNO -aYT -aNO -aLG +aWi +ogT +luO +ogT +aWi bdg bqZ udi @@ -120271,9 +120632,9 @@ mDW bqZ bdg buH -bHa -bHT -bHa +mSZ +vnw +mSZ buH vra vra @@ -120430,9 +120791,9 @@ ycl ycl ycl ycl -aLB +bwG dEC -aNO +ogT qHl jeb vlX @@ -120450,10 +120811,10 @@ hmF vlX jeb aNn -aNO -aYT -aNO -aLG +ogT +luO +ogT +aWi bdg bqZ udi @@ -120474,9 +120835,9 @@ mDW bqZ bdg buH -bHa -bHT -bHa +mSZ +vnw +mSZ deH vra asX @@ -120496,7 +120857,7 @@ vra tfw bHY sVf -bGb +mJO plv plv plv @@ -120633,9 +120994,9 @@ ycl ycl ycl ycl -aLB +bwG udF -aNO +ogT nLZ jeb obE @@ -120652,11 +121013,11 @@ xHp xwl rHf jeb -jgU -aNO -aYT -aNO -aLG +dCd +ogT +luO +ogT +aWi bdg bqZ ngI @@ -120677,9 +121038,9 @@ nNH bqZ bdg buH -bHa -bHT -bHa +mSZ +vnw +mSZ bKc vra bMq @@ -120699,7 +121060,7 @@ vra mEb bHY haT -bGb +mJO plv plv plv @@ -120836,7 +121197,7 @@ bwG bwG bwG bwG -aLB +bwG dzF dzF dac @@ -120855,11 +121216,11 @@ gAA fFD vlX jeb -kEb -aNO -aYT -aNO -aLG +eBq +ogT +luO +ogT +aWi bdg bqZ beH @@ -120880,9 +121241,9 @@ beH bqZ bdg buH -bHa -bHT -bHa +mSZ +vnw +mSZ rKy vra asX @@ -120902,7 +121263,7 @@ vra cwQ vtB tQo -bGb +mJO mJO mJO mJO @@ -121039,9 +121400,9 @@ ycl ycl ycl jCg -aLB +bwG enx -aQt +nKX oQj jeb vlX @@ -121058,10 +121419,10 @@ xHp xwl vlX jeb -pGM -aNO -aYT -aNO +iri +ogT +luO +ogT bad bdd bDQ @@ -121082,10 +121443,10 @@ sCA bVw cab bdd -bGe -bHa -bHT -bHa +dIf +mSZ +vnw +mSZ bIR vra asX @@ -121105,7 +121466,7 @@ vra ojR tki lQQ -bGb +mJO plv plv plv @@ -121242,9 +121603,9 @@ ycl ycl ycl ycl -aLB +bwG ewo -aNO +ogT jLv jeb obE @@ -121261,11 +121622,11 @@ xHp diJ rHf jeb -aLG -aNO -aYT -aNO -aLG +aWi +ogT +luO +ogT +aWi bCx bqZ cNf @@ -121286,9 +121647,9 @@ dVe bqZ bCx buH -bHa -rrV -bHa +mSZ +gfC +mSZ buH vra bMq @@ -121308,7 +121669,7 @@ vra fsH bHY pBn -bGb +mJO plv plv plv @@ -121446,8 +121807,8 @@ ycl ycl ycl cmC -aLG -aNO +aWi +ogT uBw jeb vlX @@ -121464,8 +121825,8 @@ xHp xwl vlX jeb -aLG -aNO +aWi +ogT aYV bai bbg @@ -121491,7 +121852,7 @@ bCy bzK bHb bHV -bHa +mSZ rbX vra asX @@ -121648,7 +122009,7 @@ ycl ycl ycl ycl -aLB +bwG fTU bbO cmg @@ -121667,10 +122028,10 @@ xWd oSL jeb jeb -aLG -aNO +aWi +ogT aYW -sLE +hww bbh bdd bDT @@ -121692,9 +122053,9 @@ pzV cad bdd oLT -iEb -bHW -bHa +mLA +rTg +mSZ buH vra vra @@ -121714,7 +122075,7 @@ vra cmd cmh wAR -bGb +mJO plv plv plv @@ -121851,7 +122212,7 @@ ycl ycl ycl ycl -aLB +bwG ahj ahj ahj @@ -121870,8 +122231,8 @@ gAA cGV tkN jeb -aWM -aNO +izq +ogT aYX gjn bbi @@ -121897,7 +122258,7 @@ bdd bGg bHd bHX -bHa +mSZ buH vra gNq @@ -121917,7 +122278,7 @@ vra ajX ajX ajX -bGb +mJO plv plv plv @@ -122073,8 +122434,8 @@ xHp cGV nBa jeb -beB -beB +eTf +eTf aYW bzV cBA @@ -122098,10 +122459,10 @@ beQ beQ bdd bRQ -cbS -bHW -bJz -bJz +nJX +rTg +cbD +cbD vra bMu hXb @@ -122276,8 +122637,8 @@ xHp aUi iow jeb -aLG -aNO +aWi +ogT aYY bal bbj @@ -122301,9 +122662,9 @@ bGw bGw bCz buH -iEb -bHW -bHa +mLA +rTg +mSZ vMx vra wTw @@ -122479,11 +122840,11 @@ aQL aQL aQL aQL -pGM -aNO +iri +ogT aYW -sLE -aLG +hww +aWi bCA bCA bdj @@ -122504,9 +122865,9 @@ bdj bCA bCA buH -iEb -bHW -bHa +mLA +rTg +mSZ bIR bJC bJC @@ -122685,7 +123046,7 @@ aQL vHs ehH aYZ -sLE +hww bAV bCB bCB @@ -122707,7 +123068,7 @@ bCB bCB bCB cbv -iEb +mLA bHY mru syP @@ -122888,7 +123249,7 @@ aQL mTn aiy aYZ -sLE +hww bbk bdk bdk @@ -122910,7 +123271,7 @@ eKI bdk bdk bGh -iEb +mLA bHY njy hkE @@ -123091,7 +123452,7 @@ aQL aQL uQn aYZ -sLE +hww bbl bdl bdl @@ -123113,7 +123474,7 @@ bdl bdl bdl bGi -iEb +mLA bHY oyy bJC @@ -123292,9 +123653,9 @@ brn aRT buM aQL -aLG +aWi aYZ -sLE +hww bbl bdl bEr @@ -123316,7 +123677,7 @@ nmK caf bdl bGj -iEb +mLA bHY buH bJC @@ -123495,9 +123856,9 @@ aQL aUY buN aQL -aLG +aWi aYZ -sLE +hww bbl bdl bDX @@ -123519,7 +123880,7 @@ tUh cag bdl bGk -iEb +mLA bHY buH bJC @@ -123698,9 +124059,9 @@ aQL aQL aQL aQL -pGM +iri aYZ -sLE +hww bbm bdl bDY @@ -123722,7 +124083,7 @@ bCA cah bdl bGl -iEb +mLA bHY bIR bJC @@ -123901,9 +124262,9 @@ brr aUZ buO aQL -aLG +aWi aYZ -sLE +hww jJs bdl bDZ @@ -123925,7 +124286,7 @@ xxa cai bdl bII -iEb +mLA bHY buH bJC @@ -124104,9 +124465,9 @@ brr aRT buO aQL -aLG +aWi aYZ -sLE +hww bkY bdl lOr @@ -124128,7 +124489,7 @@ tiE tiE bdl rqw -iEb +mLA bHY buH bJC @@ -124307,10 +124668,10 @@ brs aRT bew aQL -beB +eTf aYW bzV -beB +eTf mCo iwZ jFy @@ -124330,10 +124691,10 @@ eHa cmo xAB mCo -bJz -cbS -bHW -bJz +cbD +nJX +rTg +cbD bJC bKX cfo @@ -124533,7 +124894,7 @@ bYw nDM bWL sSa -qLp +wun lYi bIb mHm @@ -124713,9 +125074,9 @@ brr aUY buO aQL -aLG +aWi aYZ -sLE +hww jJs mCo bEh @@ -124737,7 +125098,7 @@ cXR cal mCo pJJ -iEb +mLA bHY buH bJC @@ -124916,9 +125277,9 @@ aQL aQL aQL aQL -aLG +aWi aYZ -sLE +hww qFb bdl bEi @@ -124940,7 +125301,7 @@ cir bdl bdl lgX -iEb +mLA bHY buH bJC @@ -125119,9 +125480,9 @@ brt aUZ buS aQL -aLG +aWi aYZ -sLE +hww jJs bdl brp @@ -125143,7 +125504,7 @@ bNQ bGz hMs cbw -iEb +mLA bHY buH bJC @@ -125324,7 +125685,7 @@ buS aQL aNn aYZ -sLE +hww jJs bdl bEl @@ -125346,7 +125707,7 @@ krN oqY can buH -iEb +mLA bHY buH bJC @@ -125525,10 +125886,10 @@ brs bpC abT aQL -beB +eTf aYW bzV -beB +eTf bdl buz bZr @@ -125549,9 +125910,9 @@ bNN vbR pky cbv -cbS -bHW -bJz +nJX +rTg +cbD bJC ack cfo @@ -125728,9 +126089,9 @@ brt aUY buS aQL -aLG +aWi aYZ -sLE +hww uBw bdl bEm @@ -125752,7 +126113,7 @@ uys uys uys iRr -iEb +mLA bHY buH bJC @@ -126135,9 +126496,9 @@ bsS mqK aQL aLG -aYZ +gdd sLE -jJs +tUK bdl bEp bCA @@ -126158,7 +126519,7 @@ hGN pVx uys ttM -iEb +uBf ccv bIS bJC @@ -126338,9 +126699,9 @@ bpC dnE aQL kgr -aYW -bzV -beB +jCw +efW +wLj bdl ycp ycp @@ -126360,9 +126721,9 @@ uys uys uys uys -bJz +uMg cbS -bJz +uMg bHW bJC bMA @@ -126540,10 +126901,10 @@ aQL aQL aQL aQL -pGM -aYZ +tgQ +gdd sLE -jJs +tUK bdl fKT bGy @@ -126564,8 +126925,8 @@ xCa bUy bdl qYt -iEb -bHa +uBf +hJA bIT bJC bJC @@ -126744,9 +127105,9 @@ bpC dnE aQL aLG -aYZ +gdd sLE -jJs +tUK bdl fgm bdj @@ -126766,9 +127127,9 @@ fYZ vYC noj hpS -pJJ -iEb -bHa +tpN +uBf +hJA bIT bJC bMA @@ -126949,7 +127310,7 @@ aQL aLG txe baq -jJs +tUK bdl ntd hgO @@ -126969,7 +127330,7 @@ scH nzO kxL hpS -pJJ +tpN vzu vYi bIT @@ -127150,7 +127511,7 @@ aQL aQL aQL aLG -aYO +wBw kBK hyt bdl @@ -127174,7 +127535,7 @@ wWP rsK aGc kkE -iEb +uBf bIT bJC bJC @@ -127353,7 +127714,7 @@ uqA bES kcl aLG -aYO +wBw sou bAX bdl @@ -127377,7 +127738,7 @@ bdl bdl dhU vzq -iEb +uBf bIT hNw wos @@ -127759,7 +128120,7 @@ aVf bES kcl aLG -aYO +wBw bZK lZM rSR @@ -127783,7 +128144,7 @@ xss xss lZM cbW -iEb +uBf bIT hNw sZq @@ -127961,8 +128322,8 @@ chp aVf aQL aQL -beB -aYT +wLj +mdf bzY cvx cvx @@ -128165,7 +128526,7 @@ aVf lQz aQL aLG -aZi +cLW aLG bbs cbh @@ -128188,8 +128549,8 @@ tez gsm bCM bbr -buH -iEb +cgB +uBf bIT bJC jht @@ -128368,7 +128729,7 @@ aVf iaq aQL aLG -aZi +cLW aLG bbs bKD @@ -128391,8 +128752,8 @@ tez ccQ bCN bbr -buH -iEb +cgB +uBf bIT bJC cjC @@ -128571,7 +128932,7 @@ aVf aQL aQL fvK -aZi +cLW aLG bbs ydM @@ -128594,8 +128955,8 @@ tez ccQ cdn bbr -buH -iEb +cgB +uBf bIT bJC bJC @@ -128774,7 +129135,7 @@ aVf bES kcl aLG -aZi +cLW aLG bbs dvs @@ -128797,8 +129158,8 @@ tez ccQ bCM bbr -buH -iEb +cgB +uBf bIT hNw sZq @@ -128976,9 +129337,9 @@ vfx aVf bES kcl -beB -byI -beB +wLj +hkl +wLj kFY jmK bDL @@ -129180,7 +129541,7 @@ bSe bES kcl aLG -aZi +cLW aLG bBd aPr @@ -129203,8 +129564,8 @@ bSb bEa bFp bBd -buH -iEb +cgB +uBf bIT hNw sZq @@ -129384,7 +129745,7 @@ aQL aQL aLG aZg -tBF +qEC bBe bFq bfm @@ -129406,7 +129767,7 @@ bCD bEb bFq bBe -bFu +xfJ fpO bIT bJC @@ -129585,9 +129946,9 @@ vil bpC qZX aQL -kEb -aZi -bad +fGF +cLW +qFr bbs cdp cdp @@ -129610,7 +129971,7 @@ fJO fJO bbs nmD -iEb +uBf twT bJC lbf @@ -129789,7 +130150,7 @@ bpC qDq kbc aLG -aYO +wBw aLG bbs bdw @@ -129812,8 +130173,8 @@ lJu bEd bFs bbs -buH -iEb +cgB +uBf bIT fzq oXb @@ -129991,8 +130352,8 @@ ngA koC koC xGE -aem -mUa +fXe +yiw aLG lgy ccb @@ -130015,7 +130376,7 @@ rXk xYP jew laU -buH +cgB jGN bJb uCM @@ -130195,8 +130556,8 @@ bpC qDq aQL jKA -aYT -beB +mdf +wLj lgy bsG xYP @@ -130218,9 +130579,9 @@ lJu xYP hLI laU -bJz -rrV -bJz +uMg +jxA +uMg bJC oXb cfo @@ -130423,7 +130784,7 @@ yht blq buJ jHe -buH +cgB bJC kIP cfo @@ -130601,7 +130962,7 @@ pDt aQL aQL aLG -aYO +wBw aLG lgy ccN @@ -130624,9 +130985,9 @@ lJu xYP wbV laU -buH -hop -buH +cgB +dOE +cgB bJC bJC vLA @@ -130804,7 +131165,7 @@ bpC qZX aQL aLG -aYO +wBw aLG lgy ccb @@ -130827,9 +131188,9 @@ rXk xYP jew laU -buH -hop -buH +cgB +dOE +cgB bJC lbf cfo @@ -131007,7 +131368,7 @@ bpC qDq bTb aLG -aYO +wBw aLG bbs ccd @@ -131030,9 +131391,9 @@ lJu huK jeQ bbs -buH -hop -buH +cgB +dOE +cgB xSw oXb cfo @@ -131209,9 +131570,9 @@ osA cHl cHl bTb -beB -aYT -beB +wLj +mdf +wLj bbs cdp cdp @@ -131233,9 +131594,9 @@ fJO fJO fJO bbs -bJz -rrV -bJz +uMg +jxA +uMg xSw ejo ejo @@ -131413,9 +131774,9 @@ qDq qDq bTb aLG -aYO +wBw +aLG aLG -bBh aLG aLG aLG @@ -131426,19 +131787,19 @@ beB aLG aLG bsT -buH -buH -bJz -buH +cgB +cgB +kAn +cgB bSd -buH -buH -buH -buH -cbD -buH -hop -buH +cgB +cgB +cgB +cgB +cgB +cgB +dOE +cgB xSw oXb oXb @@ -131618,7 +131979,7 @@ aQL aLG aZl tzf -mRS +tzf tzf tBL bhn @@ -131637,11 +131998,11 @@ ftx ftx bCE ftx -hvp -rUs -hvp +aVs +aVs +aVs bIl -bIR +cbC bJC kIP qer @@ -131821,29 +132182,29 @@ oBr tfl aLG aLG -bBh +aLG aLG aNO sLE aNO aNO aLG -beB +sVD aLG aLG -bsV -buH -buH -bJz -buH -bHa -bHa -hop -bHa -buH -cbD -buH -buH +bsT +cgB +cgB +jkJ +cgB +hJA +hJA +dOE +hJA +cgB +cgB +cgB +cgB jMb bJC bJC @@ -132034,7 +132395,7 @@ bKE oJk lNR lNR -lNR +oJk lNR lNR oJk From 6ba5d626aa4dc520caf1c00ec47a22fe55bc4dd2 Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 11 Feb 2024 10:06:02 +0100 Subject: [PATCH 6/9] delete the two old area that handled lower halways... --- code/game/area/almayer.dm | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/code/game/area/almayer.dm b/code/game/area/almayer.dm index c0fb0a15746e..2d59e94f6c98 100644 --- a/code/game/area/almayer.dm +++ b/code/game/area/almayer.dm @@ -345,17 +345,6 @@ name = "\improper Lower Deck Starboard Aft Hallway" icon_state = "starboard" -// to delete when replaced. -/area/almayer/hallways/port_hallway - name = "\improper Lower Deck Port Hallway" - icon_state = "port" - fake_zlevel = 2 // lowerdeck - -/area/almayer/hallways/starboard_hallway - name = "\improper Lower Deck Starboard Hallway" - icon_state = "starboard" - fake_zlevel = 2 // lowerdeck - /area/almayer/hallways/aft_hallway name = "\improper Upper Deck Aft Hallway" icon_state = "aft" From 9f66f7615091bda0a88405c996234f621efbf048 Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 11 Feb 2024 10:09:17 +0100 Subject: [PATCH 7/9] finishing up refactor for lower halway. --- code/game/area/almayer.dm | 17 +- maps/map_files/USS_Almayer/USS_Almayer.dmm | 634 ++++++++++----------- 2 files changed, 323 insertions(+), 328 deletions(-) diff --git a/code/game/area/almayer.dm b/code/game/area/almayer.dm index 2d59e94f6c98..69caff078148 100644 --- a/code/game/area/almayer.dm +++ b/code/game/area/almayer.dm @@ -318,7 +318,6 @@ name = "\improper Lower Deck Port Umbilical Hallway" icon_state = "portumbilical" -//new halways area. //port /area/almayer/hallways/lower/port_fore_hallway name = "\improper Lower Deck Port Fore Hallway" @@ -345,21 +344,16 @@ name = "\improper Lower Deck Starboard Aft Hallway" icon_state = "starboard" -/area/almayer/hallways/aft_hallway +/area/almayer/hallways/upper + fake_zlevel = 1 // upperdeck + +/area/almayer/hallways/upper/aft_hallway name = "\improper Upper Deck Aft Hallway" icon_state = "aft" - fake_zlevel = 1 // upperdeck -/area/almayer/hallways/stern_hallway +/area/almayer/hallways/upper/stern_hallway name = "\improper Upper Deck Stern Hallway" icon_state = "stern" - fake_zlevel = 1 // upperdeck - - -//new hallways areas - -/area/almayer/hallways/upper - fake_zlevel = 1 // upperdeck /area/almayer/hallways/upper/port name = "\improper Upper Deck Port Hallway" @@ -369,6 +363,7 @@ name = "\improper Upper Deck Starboard Hallway" icon_state = "starboard" +//area that are used for transition between decks. /area/almayer/stair_clone name = "\improper Lower Deck Stairs" icon_state = "stairs_lowerdeck" diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 2fef6b9c8bad..c5b5a76140a2 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -157,7 +157,7 @@ /turf/open/floor/almayer{ allow_construction = 0 }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aay" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -188,7 +188,7 @@ dir = 10; icon_state = "red" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aaF" = ( /obj/structure/stairs{ dir = 1; @@ -247,13 +247,13 @@ dir = 8; icon_state = "red" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aaO" = ( /turf/open/floor/almayer{ dir = 6; icon_state = "red" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aaY" = ( /obj/structure/lattice, /turf/open/space, @@ -296,7 +296,7 @@ /area/almayer/lifeboat_pumps/north1) "abg" = ( /turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "abh" = ( /turf/closed/wall/almayer/outer, /area/almayer/lifeboat_pumps/north2) @@ -327,7 +327,7 @@ /area/almayer/lifeboat_pumps/north1) "abx" = ( /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "abB" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -626,7 +626,7 @@ /turf/open/floor/almayer{ icon_state = "red" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "acF" = ( /obj/structure/machinery/light{ dir = 1 @@ -733,7 +733,7 @@ allow_construction = 0; icon_state = "plate" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "acW" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -786,13 +786,13 @@ /turf/open/floor/plating/almayer{ allow_construction = 0 }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "adc" = ( /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/plating/almayer{ allow_construction = 0 }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "add" = ( /turf/open/floor/almayer{ icon_state = "mono" @@ -896,7 +896,7 @@ dir = 8; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "adO" = ( /turf/closed/wall/almayer, /area/almayer/engineering/starboard_atmos) @@ -1172,7 +1172,7 @@ dir = 4; icon_state = "red" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aeW" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, @@ -1308,7 +1308,7 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "afx" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1; @@ -1346,7 +1346,7 @@ dir = 5; icon_state = "silver" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "afE" = ( /obj/structure/machinery/vending/dinnerware, /obj/structure/machinery/firealarm{ @@ -1526,7 +1526,7 @@ dir = 9; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "agq" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -1639,7 +1639,7 @@ /turf/open/floor/almayer{ icon_state = "red" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "agK" = ( /obj/structure/bed/chair{ dir = 1 @@ -1762,7 +1762,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "ahr" = ( /obj/structure/machinery/light{ dir = 1 @@ -1771,7 +1771,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "ahy" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -1829,7 +1829,7 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "ahN" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, /turf/open/floor/grass, @@ -1924,7 +1924,7 @@ dir = 4 }, /turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aij" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -1943,13 +1943,13 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aim" = ( /turf/open/floor/almayer{ dir = 6; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "ain" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -1969,7 +1969,7 @@ dir = 8; icon_state = "silver" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aiq" = ( /turf/open/floor/almayer, /area/almayer/living/cafeteria_officer) @@ -1990,7 +1990,7 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aiw" = ( /turf/open/floor/almayer, /area/almayer/engineering/starboard_atmos) @@ -2006,10 +2006,10 @@ dir = 8; icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aiC" = ( /turf/open/floor/almayer, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aiH" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -2129,7 +2129,7 @@ dir = 1; icon_state = "bluecorner" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "ajs" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -2146,7 +2146,7 @@ dir = 4 }, /turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aju" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -2205,7 +2205,7 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "ajD" = ( /obj/structure/surface/table/almayer, /obj/structure/flora/pottedplant{ @@ -2228,7 +2228,7 @@ dir = 4 }, /turf/open/floor/almayer, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "ajG" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -2237,7 +2237,7 @@ dir = 4 }, /turf/open/floor/almayer, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "ajH" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -2287,7 +2287,7 @@ dir = 8; icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "ajO" = ( /obj/structure/stairs, /obj/effect/projector{ @@ -2302,13 +2302,13 @@ "ajP" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "ajR" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "ajT" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -2327,7 +2327,7 @@ dir = 4 }, /turf/open/floor/almayer, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "ajX" = ( /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/plating/almayer{ @@ -2480,7 +2480,7 @@ /turf/open/floor/almayer{ icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "akI" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -2492,7 +2492,7 @@ dir = 6; icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "akJ" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/disposalpipe/segment{ @@ -2504,7 +2504,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "akK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -2516,7 +2516,7 @@ dir = 8; icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "akL" = ( /obj/structure/machinery/light{ dir = 1 @@ -2572,7 +2572,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "akU" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -2581,7 +2581,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "akV" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/disposalpipe/segment{ @@ -2593,7 +2593,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "akW" = ( /turf/open/floor/almayer{ dir = 8; @@ -2647,7 +2647,7 @@ dir = 8; icon_state = "bluecorner" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "alk" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -2664,27 +2664,27 @@ /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "alp" = ( /turf/open/floor/almayer{ dir = 9; icon_state = "silver" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "alq" = ( /obj/structure/disposalpipe/junction, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "als" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ dir = 1; icon_state = "bluecorner" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "alw" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 2; @@ -2750,7 +2750,7 @@ dir = 4; icon_state = "orangecorner" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "alI" = ( /obj/item/stack/cable_coil{ pixel_x = 1; @@ -2770,14 +2770,14 @@ dir = 4; icon_state = "orangecorner" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "alK" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer{ dir = 4; icon_state = "orangecorner" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "alL" = ( /turf/closed/wall/almayer, /area/almayer/command/telecomms) @@ -2789,7 +2789,7 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "alQ" = ( /obj/item/tool/wrench{ pixel_x = -8; @@ -2935,13 +2935,13 @@ /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "amD" = ( /turf/open/floor/almayer{ dir = 8; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "amE" = ( /obj/item/clothing/suit/storage/marine/light/vest, /obj/item/clothing/suit/storage/marine/light/vest, @@ -2979,7 +2979,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "amO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -2988,7 +2988,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "amR" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -3021,7 +3021,7 @@ dir = 4; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "amU" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -3061,7 +3061,7 @@ dir = 8; icon_state = "silvercorner" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "and" = ( /obj/structure/window/reinforced{ dir = 4; @@ -3080,7 +3080,7 @@ /turf/open/floor/almayer{ icon_state = "silvercorner" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "ang" = ( /obj/item/clothing/head/welding{ pixel_y = 6 @@ -3099,14 +3099,14 @@ dir = 6; icon_state = "silver" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "ani" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "anm" = ( /obj/structure/stairs{ icon_state = "ramptop" @@ -3212,7 +3212,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "anD" = ( /obj/structure/platform_decoration{ dir = 8 @@ -3227,7 +3227,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "anH" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -3240,7 +3240,7 @@ dir = 8; icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "anJ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -3249,7 +3249,7 @@ dir = 8; icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "anK" = ( /obj/structure/platform{ dir = 1 @@ -3286,7 +3286,7 @@ dir = 4; icon_state = "red" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "anT" = ( /turf/open/floor/almayer{ dir = 4; @@ -3342,7 +3342,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aoe" = ( /turf/closed/wall/almayer/white, /area/almayer/medical/morgue) @@ -3410,7 +3410,7 @@ /turf/open/floor/almayer{ icon_state = "bluecorner" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aoy" = ( /obj/structure/sign/safety/fire_haz{ pixel_x = 8; @@ -3442,7 +3442,7 @@ dir = 10; icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aoC" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -3456,7 +3456,7 @@ /turf/open/floor/almayer{ icon_state = "orangecorner" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aoE" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -3465,7 +3465,7 @@ /turf/open/floor/almayer{ icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aoF" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -3485,7 +3485,7 @@ /turf/open/floor/almayer{ icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aoH" = ( /turf/open/floor/almayer{ dir = 1; @@ -3575,7 +3575,7 @@ dir = 6; icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aoR" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -3587,7 +3587,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aoS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -3599,7 +3599,7 @@ dir = 8; icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aoT" = ( /turf/open/floor/almayer{ icon_state = "orange" @@ -3616,7 +3616,7 @@ /turf/open/floor/almayer{ icon_state = "orangecorner" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aoV" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/effect/decal/cleanable/dirt, @@ -3663,12 +3663,12 @@ /turf/open/floor/almayer{ icon_state = "orangecorner" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "apd" = ( /turf/open/floor/almayer{ icon_state = "orangecorner" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "ape" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -3683,7 +3683,7 @@ /turf/open/floor/almayer{ icon_state = "orangecorner" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "apg" = ( /turf/open/floor/almayer{ dir = 10; @@ -3701,7 +3701,7 @@ dir = 10; icon_state = "red" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "apk" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Down1"; @@ -3715,7 +3715,7 @@ dir = 9; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "apm" = ( /obj/structure/machinery/line_nexter{ dir = 1; @@ -3787,7 +3787,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "apz" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/door_control{ @@ -3827,13 +3827,13 @@ dir = 8; icon_state = "silver" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "apK" = ( /turf/open/floor/almayer{ dir = 4; icon_state = "silver" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "apL" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/cell_charger, @@ -4212,7 +4212,7 @@ /turf/open/floor/almayer{ icon_state = "silvercorner" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "arg" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, @@ -4474,7 +4474,7 @@ dir = 8; icon_state = "silver" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "asl" = ( /obj/structure/machinery/light{ dir = 1 @@ -4483,7 +4483,7 @@ dir = 1; icon_state = "red" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "asm" = ( /obj/structure/stairs{ dir = 4 @@ -4513,7 +4513,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "asr" = ( /obj/structure/bed/chair/comfy/alpha{ dir = 8 @@ -4694,7 +4694,7 @@ dir = 8; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "asX" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, /turf/open/floor/almayer{ @@ -4766,7 +4766,7 @@ /turf/open/floor/almayer{ allow_construction = 0 }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "atk" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -4791,7 +4791,7 @@ allow_construction = 0; icon_state = "plate" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "atm" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/command/telecomms) @@ -4876,7 +4876,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "atI" = ( /obj/structure/stairs{ dir = 8; @@ -4890,7 +4890,7 @@ /turf/open/floor/plating/almayer{ allow_construction = 0 }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "atK" = ( /turf/open/floor/almayer{ dir = 10; @@ -4902,7 +4902,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "atM" = ( /turf/open/floor/almayer{ dir = 9; @@ -4973,7 +4973,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "atV" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -4984,7 +4984,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aub" = ( /obj/structure/machinery/light{ dir = 1 @@ -5141,7 +5141,7 @@ dir = 4; icon_state = "silver" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "auH" = ( /obj/structure/machinery/door_control{ id = "tcomms_apc"; @@ -5270,19 +5270,19 @@ /turf/open/floor/almayer{ icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "avm" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "avn" = ( /turf/open/floor/almayer{ dir = 4; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "avo" = ( /turf/closed/wall/almayer/outer, /area/almayer/powered/agent) @@ -5330,7 +5330,7 @@ "avD" = ( /obj/effect/landmark/crap_item, /turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "avF" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -5641,7 +5641,7 @@ dir = 8; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "awx" = ( /turf/open/floor/almayer{ dir = 4; @@ -5876,7 +5876,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "axu" = ( /obj/structure/machinery/computer/telecomms/server, /turf/open/floor/almayer{ @@ -6292,7 +6292,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "ayU" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -6301,7 +6301,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "ayV" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -6355,7 +6355,7 @@ dir = 8; icon_state = "cargo_arrow" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "azc" = ( /obj/structure/machinery/computer/telecomms/traffic, /turf/open/floor/almayer{ @@ -6632,7 +6632,7 @@ "azY" = ( /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "azZ" = ( /obj/structure/machinery/keycard_auth, /obj/structure/surface/table/reinforced/black, @@ -6650,7 +6650,7 @@ dir = 8; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aAd" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -6874,7 +6874,7 @@ dir = 8; icon_state = "silver" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aAZ" = ( /obj/structure/bed/chair/office/light{ dir = 8 @@ -7029,7 +7029,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aBr" = ( /obj/structure/ladder{ height = 2; @@ -7278,7 +7278,7 @@ dir = 8; icon_state = "silver" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aCo" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, @@ -7421,7 +7421,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aDm" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -7458,7 +7458,7 @@ dir = 4; icon_state = "silvercorner" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aDr" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -7502,7 +7502,7 @@ dir = 5; icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aDB" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -7652,7 +7652,7 @@ dir = 4 }, /turf/open/floor/almayer, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aEe" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -7669,7 +7669,7 @@ }, /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aEg" = ( /turf/open/floor/almayer{ icon_state = "redfull" @@ -7710,7 +7710,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aEr" = ( /obj/structure/largecrate/random/barrel/yellow, /obj/effect/decal/warning_stripes{ @@ -7770,7 +7770,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aEK" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -7779,7 +7779,7 @@ dir = 5; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aEM" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/emails, @@ -7824,7 +7824,7 @@ dir = 5; icon_state = "red" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aEW" = ( /turf/closed/wall/almayer, /area/almayer/living/numbertwobunks) @@ -7833,7 +7833,7 @@ dir = 4; icon_state = "bluecorner" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aEZ" = ( /obj/structure/surface/table/almayer, /obj/item/storage/box/gloves{ @@ -8029,7 +8029,7 @@ dir = 9; icon_state = "red" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aFI" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -8060,7 +8060,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aFW" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -8068,7 +8068,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aGa" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/toolbox, @@ -8104,7 +8104,7 @@ dir = 8; icon_state = "greencorner" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aGg" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -8205,13 +8205,13 @@ dir = 1; icon_state = "red" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aGD" = ( /turf/open/floor/almayer{ dir = 9; icon_state = "red" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aGH" = ( /obj/structure/machinery/computer/ordercomp, /turf/open/floor/almayer{ @@ -8226,7 +8226,7 @@ /turf/open/floor/almayer{ icon_state = "red" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aGP" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -8425,7 +8425,7 @@ dir = 8; icon_state = "red" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aHR" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -8489,7 +8489,7 @@ dir = 5; icon_state = "red" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aIf" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -8644,7 +8644,7 @@ dir = 1; icon_state = "silver" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aIT" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -8807,7 +8807,7 @@ dir = 8; icon_state = "red" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aJw" = ( /obj/structure/machinery/light{ dir = 4 @@ -9224,7 +9224,7 @@ dir = 8; icon_state = "silver" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aMm" = ( /obj/structure/surface/table/almayer, /obj/item/tool/crowbar, @@ -9661,7 +9661,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aOQ" = ( /obj/structure/closet/crate, /obj/item/storage/briefcase/inflatable, @@ -9681,7 +9681,7 @@ name = "ship-grade camera" }, /turf/open/floor/almayer, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aOU" = ( /obj/structure/platform{ dir = 4 @@ -9729,7 +9729,7 @@ dir = 8; icon_state = "red" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aPe" = ( /obj/structure/largecrate/random/case/double, /obj/structure/sign/safety/bulkhead_door{ @@ -9771,7 +9771,7 @@ /turf/open/floor/almayer{ icon_state = "cargo" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aPn" = ( /obj/structure/machinery/cm_vending/clothing/marine/bravo{ density = 0; @@ -9941,7 +9941,7 @@ dir = 1 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aQp" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ @@ -10420,7 +10420,7 @@ dir = 4; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aSx" = ( /obj/structure/machinery/vending/dinnerware, /obj/structure/sign/safety/maint{ @@ -10435,13 +10435,13 @@ dir = 9; icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aSz" = ( /obj/structure/machinery/light{ dir = 1 }, /turf/open/floor/almayer, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aSA" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -10457,7 +10457,7 @@ dir = 1; icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aSC" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -10465,7 +10465,7 @@ dir = 1; icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aSE" = ( /obj/structure/bed/chair{ dir = 4 @@ -10685,7 +10685,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aTQ" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -10699,13 +10699,13 @@ dir = 8; icon_state = "red" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aTS" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aTT" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -11088,7 +11088,7 @@ dir = 4; icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aWb" = ( /obj/structure/machinery/computer/working_joe{ dir = 4; @@ -11119,7 +11119,7 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aWf" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -11131,7 +11131,7 @@ dir = 8; icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aWg" = ( /obj/structure/machinery/door_control{ id = "CMP Office Shutters"; @@ -11169,7 +11169,7 @@ dir = 8; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aWm" = ( /obj/structure/machinery/light{ dir = 1 @@ -11277,7 +11277,7 @@ /turf/open/floor/almayer{ icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aWM" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -11384,7 +11384,7 @@ "aXE" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aXS" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -11402,7 +11402,7 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aYd" = ( /obj/structure/dropship_equipment/medevac_system, /turf/open/floor/almayer{ @@ -11414,14 +11414,14 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aYn" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aYq" = ( /turf/open/floor/almayer{ dir = 6; @@ -11472,7 +11472,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aYE" = ( /obj/structure/platform, /obj/structure/platform{ @@ -11675,7 +11675,7 @@ "aZE" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "aZF" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Down4"; @@ -11693,7 +11693,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "aZI" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/almayer{ @@ -11853,13 +11853,13 @@ dir = 8; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "baB" = ( /turf/open/floor/almayer{ dir = 10; icon_state = "silver" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "baG" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/almayer, @@ -12092,7 +12092,7 @@ dir = 8; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "bbO" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -13255,7 +13255,7 @@ dir = 10; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "biu" = ( /obj/structure/machinery/door/airlock/almayer/medical/glass{ access_modified = 1; @@ -13415,7 +13415,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "bjL" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -13605,7 +13605,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "bkT" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -13646,7 +13646,7 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "blf" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -14126,7 +14126,7 @@ dir = 1 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "bnF" = ( /obj/structure/machinery/cryopod{ pixel_y = 6 @@ -17788,7 +17788,7 @@ icon_state = "pipe-c" }, /turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "bKf" = ( /turf/open/floor/almayer{ dir = 5; @@ -19178,7 +19178,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "bRx" = ( /obj/structure/machinery/door/poddoor/railing{ id = "vehicle_elevator_railing_aux" @@ -19778,7 +19778,7 @@ dir = 4; icon_state = "red" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "bUF" = ( /turf/open/floor/almayer{ icon_state = "bluecorner" @@ -20051,7 +20051,7 @@ dir = 4; icon_state = "red" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "bWT" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -20169,19 +20169,19 @@ "bYc" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "bYe" = ( /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "bYh" = ( /obj/structure/disposalpipe/junction, /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "bYn" = ( /turf/closed/wall/almayer/outer, /area/almayer/engineering/upper_engineering/port) @@ -20677,7 +20677,7 @@ dir = 4; icon_state = "silvercorner" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "cbu" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ layer = 1.9 @@ -21455,7 +21455,7 @@ pixel_y = 28 }, /turf/open/floor/almayer, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "cgO" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/emails{ @@ -21555,7 +21555,7 @@ dir = 1; icon_state = "red" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "chv" = ( /obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, /turf/open/floor/plating/plating_catwalk, @@ -21912,7 +21912,7 @@ dir = 8; icon_state = "red" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "cjt" = ( /turf/open/floor/almayer{ icon_state = "orange" @@ -22766,7 +22766,7 @@ dir = 1; icon_state = "silvercorner" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "cnE" = ( /obj/structure/machinery/prop/almayer/computer{ dir = 4; @@ -23042,7 +23042,7 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "cpz" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -23152,7 +23152,7 @@ dir = 4; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "crh" = ( /obj/structure/machinery/light{ dir = 1 @@ -23290,7 +23290,7 @@ dir = 4; icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "ctT" = ( /obj/structure/machinery/door/airlock/almayer/security/glass{ dir = 1; @@ -23411,7 +23411,7 @@ dir = 10; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "cwQ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -23527,7 +23527,7 @@ pixel_y = 32 }, /turf/open/floor/almayer, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "cAm" = ( /obj/structure/bed/chair/office/light{ dir = 8 @@ -23877,7 +23877,7 @@ pixel_y = 25 }, /turf/open/floor/almayer, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "cFh" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -23938,7 +23938,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "cGA" = ( /obj/structure/sign/poster{ pixel_y = -32 @@ -24158,7 +24158,7 @@ /turf/open/floor/almayer{ icon_state = "silver" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "cLl" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -24936,7 +24936,7 @@ dir = 1 }, /turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "cZp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -25806,7 +25806,7 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "dqZ" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/chief_mp_office) @@ -25871,7 +25871,7 @@ dir = 4; icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "dsA" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/almayer{ @@ -25890,7 +25890,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "dtZ" = ( /obj/structure/platform_decoration{ dir = 4 @@ -26812,7 +26812,7 @@ dir = 5; icon_state = "plating" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "dKp" = ( /turf/open/floor/almayer/research/containment/corner{ dir = 4 @@ -26900,7 +26900,7 @@ /turf/open/floor/almayer{ icon_state = "silver" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "dMf" = ( /obj/structure/surface/table/almayer, /obj/item/storage/photo_album{ @@ -27577,7 +27577,7 @@ dir = 10; icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "dZr" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -28222,7 +28222,7 @@ /turf/open/floor/almayer{ icon_state = "cargo" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "ejt" = ( /turf/open/floor/almayer/uscm/directional{ dir = 4 @@ -28303,7 +28303,7 @@ /turf/open/floor/almayer{ icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "elE" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -29106,7 +29106,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "eAU" = ( /obj/structure/bed/chair{ dir = 8 @@ -29493,7 +29493,7 @@ dir = 4; icon_state = "bluecorner" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "eGr" = ( /obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ dir = 1; @@ -30007,7 +30007,7 @@ dir = 10; icon_state = "red" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "eUe" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -30349,7 +30349,7 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "fag" = ( /obj/effect/decal/cleanable/blood, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -31630,7 +31630,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "fBO" = ( /obj/structure/machinery/chem_master{ vial_maker = 1 @@ -32220,7 +32220,7 @@ dir = 8; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "fMU" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -32255,7 +32255,7 @@ dir = 8 }, /turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "fOk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -32665,7 +32665,7 @@ /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "fXE" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/emails{ @@ -33074,7 +33074,7 @@ dir = 4; icon_state = "orangecorner" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "gfo" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -33252,7 +33252,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "giR" = ( /obj/structure/machinery/status_display{ pixel_y = -30 @@ -33964,7 +33964,7 @@ dir = 4; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "gyC" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -34720,7 +34720,7 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "gMd" = ( /obj/structure/surface/table/almayer, /obj/item/clipboard, @@ -34919,7 +34919,7 @@ dir = 6; icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "gPS" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -35581,7 +35581,7 @@ dir = 4; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "heo" = ( /obj/structure/machinery/power/apc/almayer{ cell_type = /obj/item/cell/hyper; @@ -36275,7 +36275,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "hop" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -36748,7 +36748,7 @@ /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "hyk" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -37266,7 +37266,7 @@ dir = 8; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "hJA" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_aft_hallway) @@ -37486,7 +37486,7 @@ dir = 1; icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "hPN" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ @@ -38542,7 +38542,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "iiZ" = ( /obj/structure/machinery/cm_vending/sorted/marine_food, /turf/open/floor/almayer{ @@ -38789,7 +38789,7 @@ dir = 6; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "ipa" = ( /obj/effect/decal/cleanable/generic, /obj/effect/decal/warning_stripes{ @@ -39023,7 +39023,7 @@ dir = 1; icon_state = "bluecorner" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "itf" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -39303,7 +39303,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "ixD" = ( /obj/structure/machinery/light, /obj/effect/decal/warning_stripes{ @@ -39437,7 +39437,7 @@ /turf/open/floor/almayer{ icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "iAE" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -40343,7 +40343,7 @@ dir = 4; icon_state = "silver" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "iTQ" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -40466,7 +40466,7 @@ dir = 1 }, /turf/open/floor/almayer, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "iWx" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -40509,7 +40509,7 @@ dir = 1; icon_state = "silver" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "iWQ" = ( /obj/effect/landmark/start/researcher, /obj/effect/landmark/late_join/researcher, @@ -40606,7 +40606,7 @@ dir = 4; icon_state = "red" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "iYm" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/almayer{ @@ -41623,7 +41623,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "jnD" = ( /turf/open/floor/almayer{ dir = 1; @@ -42317,7 +42317,7 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "jFt" = ( /obj/structure/machinery/light/small, /obj/effect/decal/warning_stripes{ @@ -42469,7 +42469,7 @@ /turf/open/floor/almayer{ icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "jHL" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -42636,7 +42636,7 @@ dir = 5; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "jLj" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -42759,7 +42759,7 @@ dir = 1; icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "jML" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/wood/ship, @@ -43534,7 +43534,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "kam" = ( /obj/item/tool/screwdriver{ layer = 2.9; @@ -43559,7 +43559,7 @@ dir = 4; icon_state = "silver" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "kaB" = ( /obj/structure/machinery/cm_vending/gear/tl{ density = 0; @@ -43789,7 +43789,7 @@ dir = 10; icon_state = "red" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "kfo" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -43964,7 +43964,7 @@ dir = 8; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "kio" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -45229,7 +45229,7 @@ icon_state = "S" }, /turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "kGL" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -45238,7 +45238,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "kGQ" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 @@ -45283,7 +45283,7 @@ dir = 5; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "kHY" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -45419,7 +45419,7 @@ dir = 4; icon_state = "red" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "kKk" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -45949,7 +45949,7 @@ }, /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "kSN" = ( /obj/structure/sign/safety/maint{ pixel_x = 32 @@ -45958,7 +45958,7 @@ dir = 8; icon_state = "red" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "kSU" = ( /obj/structure/transmitter/no_dnd{ name = "Requisition Telephone"; @@ -46240,7 +46240,7 @@ dir = 6; icon_state = "red" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "kYU" = ( /obj/structure/sign/safety/escapepod{ pixel_y = 32 @@ -46253,7 +46253,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "kYV" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -47232,7 +47232,7 @@ pixel_y = -32 }, /turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "lqK" = ( /obj/effect/decal/cleanable/ash, /obj/item/trash/cigbutt/ucigbutt{ @@ -47530,7 +47530,7 @@ pixel_y = 32 }, /turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "lwp" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -47701,7 +47701,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "lzq" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -48168,7 +48168,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "lII" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -48301,7 +48301,7 @@ dir = 5; icon_state = "red" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "lKM" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer, @@ -48397,7 +48397,7 @@ dir = 6; icon_state = "red" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "lNw" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -48991,7 +48991,7 @@ /turf/open/floor/almayer{ icon_state = "greencorner" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "mcL" = ( /obj/structure/machinery/vending/snack, /obj/structure/sign/safety/maint{ @@ -49078,7 +49078,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "meT" = ( /obj/structure/machinery/door/poddoor/almayer/open{ id = "Hangar Lockdown"; @@ -49533,7 +49533,7 @@ dir = 8; icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "mnI" = ( /turf/open/floor/almayer{ icon_state = "blue" @@ -50657,7 +50657,7 @@ dir = 6; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "mJa" = ( /obj/structure/closet/crate/trashcart, /obj/item/trash/boonie, @@ -50923,7 +50923,7 @@ dir = 6; icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "mMP" = ( /obj/effect/landmark/start/intel, /turf/open/floor/plating/plating_catwalk, @@ -51032,7 +51032,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "mOR" = ( /obj/structure/surface/rack, /obj/item/roller, @@ -51115,7 +51115,7 @@ /turf/open/floor/almayer{ icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "mQc" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -51142,7 +51142,7 @@ dir = 5; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "mQY" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -51162,7 +51162,7 @@ dir = 4; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "mRn" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "ARES Interior"; @@ -51298,7 +51298,7 @@ dir = 4; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "mTc" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/computer/emails{ @@ -51862,7 +51862,7 @@ dir = 8; icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "ndZ" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/device/flashlight/lamp, @@ -51960,7 +51960,7 @@ }, /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "ngf" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -52450,7 +52450,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "nmD" = ( /obj/structure/machinery/light{ dir = 1 @@ -53090,7 +53090,7 @@ /turf/open/floor/almayer{ icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "nxZ" = ( /obj/structure/machinery/power/fusion_engine{ name = "\improper S-52 fusion reactor 10" @@ -53159,7 +53159,7 @@ dir = 9; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "nzD" = ( /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer, @@ -53258,7 +53258,7 @@ dir = 4; icon_state = "red" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "nCf" = ( /obj/effect/landmark/start/marine/tl/charlie, /obj/effect/landmark/late_join/charlie, @@ -53456,7 +53456,7 @@ dir = 4; icon_state = "greencorner" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "nFs" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -54097,7 +54097,7 @@ "nQx" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "nQA" = ( /turf/open/floor/carpet, /area/almayer/command/corporateliaison) @@ -54333,7 +54333,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "nVi" = ( /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -54493,7 +54493,7 @@ pixel_x = -1 }, /turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "nYD" = ( /obj/structure/closet/secure_closet/medical2, /turf/open/floor/almayer{ @@ -57203,7 +57203,7 @@ /turf/open/floor/almayer{ icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "oXp" = ( /obj/effect/decal/cleanable/ash, /turf/open/floor/wood/ship, @@ -57764,7 +57764,7 @@ /area/almayer/shipboard/panic) "pji" = ( /turf/closed/wall/almayer, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "pjj" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -57813,7 +57813,7 @@ dir = 4; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "pjR" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -58347,7 +58347,7 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "pvJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -58636,7 +58636,7 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "pCQ" = ( /obj/structure/surface/table/almayer, /obj/item/attachable/lasersight, @@ -59380,7 +59380,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "pRO" = ( /obj/structure/bed/chair{ dir = 4 @@ -59427,7 +59427,7 @@ dir = 5; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "pSQ" = ( /obj/structure/reagent_dispensers/fueltank{ anchored = 1 @@ -60111,7 +60111,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "qgK" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/airlock/almayer/generic/press{ @@ -60156,7 +60156,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "qhx" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -61953,7 +61953,7 @@ /turf/open/floor/almayer{ icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "qLo" = ( /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, @@ -62005,7 +62005,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "qLS" = ( /obj/structure/pipes/standard/manifold/hidden/supply/no_boom, /turf/open/floor/almayer/no_build{ @@ -63540,7 +63540,7 @@ /turf/open/floor/almayer{ icon_state = "redfull" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "rpp" = ( /obj/effect/landmark/start/executive, /turf/open/floor/plating/plating_catwalk, @@ -63968,7 +63968,7 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "rxK" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -64539,7 +64539,7 @@ dir = 5; icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "rGg" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -66322,7 +66322,7 @@ dir = 8; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "snt" = ( /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor/almayer{ @@ -66819,7 +66819,7 @@ "suV" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "suY" = ( /obj/structure/platform_decoration, /turf/open/floor/almayer{ @@ -67194,7 +67194,7 @@ dir = 1; icon_state = "silver" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "sDD" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -67983,7 +67983,7 @@ dir = 4; icon_state = "orangecorner" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "sUO" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -68334,7 +68334,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "tan" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -69137,7 +69137,7 @@ pixel_y = 32 }, /turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "tnY" = ( /obj/structure/machinery/cryopod{ pixel_y = 6 @@ -70236,7 +70236,7 @@ /turf/open/floor/almayer{ icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "tHk" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/toolbox, @@ -70764,7 +70764,7 @@ /turf/open/floor/almayer{ icon_state = "redfull" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "tSB" = ( /turf/open/floor/almayer{ dir = 1; @@ -71626,7 +71626,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "ukC" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/almayer{ @@ -72599,7 +72599,7 @@ dir = 1; icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "uBM" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -72794,7 +72794,7 @@ icon_state = "SE-out" }, /turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "uGN" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, @@ -72846,7 +72846,7 @@ dir = 9; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "uIv" = ( /turf/open/floor/almayer{ icon_state = "orange" @@ -72977,7 +72977,7 @@ pixel_y = 30 }, /turf/open/floor/almayer, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "uLv" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_y = -32 @@ -73140,7 +73140,7 @@ /turf/open/floor/almayer{ icon_state = "orangecorner" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "uPN" = ( /obj/item/tool/wirecutters/clippers, /turf/open/floor/almayer{ @@ -73404,7 +73404,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "uTZ" = ( /obj/structure/machinery/light/small, /turf/open/floor/almayer{ @@ -73561,7 +73561,7 @@ dir = 9; icon_state = "red" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "uWV" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -75956,7 +75956,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "vIu" = ( /obj/structure/machinery/light{ dir = 4 @@ -75975,7 +75975,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "vJg" = ( /obj/structure/machinery/light/small, /turf/open/floor/almayer{ @@ -76062,7 +76062,7 @@ /turf/open/floor/plating/almayer{ allow_construction = 0 }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "vKI" = ( /obj/structure/machinery/light{ dir = 1 @@ -77368,7 +77368,7 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "wgf" = ( /obj/structure/sign/safety/nonpress_0g{ pixel_x = 32 @@ -77946,7 +77946,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "wqr" = ( /obj/structure/sign/safety/terminal{ pixel_x = 7; @@ -77965,7 +77965,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "wqW" = ( /obj/structure/closet/secure_closet/CMO, /obj/structure/machinery/light{ @@ -78055,7 +78055,7 @@ dir = 10; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "wsw" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -79148,7 +79148,7 @@ dir = 4; icon_state = "orangecorner" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "wOt" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -79231,7 +79231,7 @@ dir = 1; icon_state = "greencorner" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "wQA" = ( /obj/structure/pipes/standard/simple/visible{ dir = 5 @@ -79298,7 +79298,7 @@ /turf/open/floor/almayer{ icon_state = "orangecorner" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "wSm" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -79463,7 +79463,7 @@ pixel_y = 32 }, /turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "wUJ" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/almayer{ @@ -79571,7 +79571,7 @@ /turf/open/floor/almayer{ icon_state = "silver" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "wWl" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/general_air_control/large_tank_control{ @@ -79764,7 +79764,7 @@ /turf/open/floor/almayer{ icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "wZN" = ( /obj/structure/surface/table/almayer, /obj/item/storage/fancy/cigarettes/lucky_strikes, @@ -80688,7 +80688,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "xrt" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -80853,7 +80853,7 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "xvE" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/multi_tile/almayer/marine/charlie{ @@ -81422,7 +81422,7 @@ dir = 5; icon_state = "silver" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "xFP" = ( /turf/open/floor/almayer{ dir = 5; @@ -81455,7 +81455,7 @@ icon_state = "pipe-c" }, /turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "xGm" = ( /obj/structure/platform_decoration{ dir = 8 @@ -81792,7 +81792,7 @@ /turf/open/floor/plating/almayer{ allow_construction = 0 }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "xMl" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -82168,7 +82168,7 @@ dir = 10; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "xSw" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -82239,7 +82239,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "xTu" = ( /obj/structure/pipes/vents/scrubber{ dir = 1 @@ -82698,7 +82698,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "ybm" = ( /obj/structure/surface/table/almayer, /obj/item/clothing/head/hardhat{ @@ -82960,7 +82960,7 @@ dir = 8; icon_state = "green" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "yfw" = ( /obj/structure/machinery/light{ dir = 8 @@ -83309,7 +83309,7 @@ dir = 4; icon_state = "orangecorner" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "ymg" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; From abcd70bd950cd3fcfac807a882568fbfd04aba4f Mon Sep 17 00:00:00 2001 From: Julien Date: Tue, 20 Feb 2024 08:45:36 +0100 Subject: [PATCH 8/9] random area and fix naming --- code/game/area/almayer.dm | 3 ++- maps/map_files/USS_Almayer/USS_Almayer.dmm | 7 ++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/code/game/area/almayer.dm b/code/game/area/almayer.dm index 69caff078148..516d21d46ff7 100644 --- a/code/game/area/almayer.dm +++ b/code/game/area/almayer.dm @@ -2,6 +2,7 @@ // Fore = West | Aft = East // // Port = South | Starboard = North // // Bow = Western|Stern = Eastern //(those are the front and back small sections) +// Naming convention is to start by port or starboard then put eitheir (bow,fore,midship,aft,stern) /area/almayer icon = 'icons/turf/area_almayer.dmi' // ambience = list('sound/ambience/shipambience.ogg') @@ -474,7 +475,7 @@ name = "\improper Upper Deck Starboard-Stern Hull" /area/almayer/maint/hull/upper/u_f_s - name = "\improper Upper Deck Fore-Starboard Hull" + name = "\improper Upper Deck Starboard-Fore Hull" /area/almayer/maint/hull/upper/u_m_s name = "\improper Upper Deck Starboard-Midship Hull" diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 5f5e763777e8..f19bacb55266 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -52062,9 +52062,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/command/corporateliaison) -"nTT" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/maint/hull/upper) "nTZ" = ( /turf/open/floor/almayer{ dir = 5; @@ -101905,8 +101902,8 @@ aaa aaa aaa aad -nTT -nTT +cZe +cZe cZe vfS cmr From 29e060e2d2f6c13126ca947bcf985e206a1587fe Mon Sep 17 00:00:00 2001 From: Julien Date: Tue, 20 Feb 2024 08:56:04 +0100 Subject: [PATCH 9/9] small fix in names. --- code/game/area/almayer.dm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/code/game/area/almayer.dm b/code/game/area/almayer.dm index 516d21d46ff7..14bc1891ea1f 100644 --- a/code/game/area/almayer.dm +++ b/code/game/area/almayer.dm @@ -321,28 +321,28 @@ //port /area/almayer/hallways/lower/port_fore_hallway - name = "\improper Lower Deck Port Fore Hallway" + name = "\improper Lower Deck Port-Fore Hallway" icon_state = "port" /area/almayer/hallways/lower/port_midship_hallway - name = "\improper Lower Deck Port Midship Hallway" + name = "\improper Lower Deck Port-Midship Hallway" icon_state = "port" /area/almayer/hallways/lower/port_aft_hallway - name = "\improper Lower Deck Port Aft Hallway" + name = "\improper Lower Deck Port-Aft Hallway" icon_state = "port" //starboard /area/almayer/hallways/lower/starboard_fore_hallway - name = "\improper Lower Deck Starboard Fore Hallway" + name = "\improper Lower Deck Starboard-Fore Hallway" icon_state = "starboard" /area/almayer/hallways/lower/starboard_midship_hallway - name = "\improper Lower Deck Starboard Midship Hallway" + name = "\improper Lower Deck Starboard-Midship Hallway" icon_state = "starboard" /area/almayer/hallways/lower/starboard_aft_hallway - name = "\improper Lower Deck Starboard Aft Hallway" + name = "\improper Lower Deck Starboard-Aft Hallway" icon_state = "starboard" /area/almayer/hallways/upper @@ -777,16 +777,16 @@ hijack_evacuation_type = EVACUATION_TYPE_ADDITIVE /area/almayer/lifeboat_pumps/north1 - name = "Starboard Fore Lifeboat Fuel Pump" + name = "Starboard-Fore Lifeboat Fuel Pump" /area/almayer/lifeboat_pumps/north2 - name = "Starboard Aft Lifeboat Fuel Pump" + name = "Starboard-Aft Lifeboat Fuel Pump" /area/almayer/lifeboat_pumps/south1 - name = "Port Fore Lifeboat Fuel Pump" + name = "Port-Fore Lifeboat Fuel Pump" /area/almayer/lifeboat_pumps/south2 - name = "Port Aft Lifeboat Fuel Pump" + name = "Port-Aft Lifeboat Fuel Pump" /area/almayer/command/lifeboat name = "\improper Lifeboat Docking Port"