From cf249fcf9d65f7d77b799fe929eb73e4a09ec2de Mon Sep 17 00:00:00 2001 From: Julian56 <117036822+Huffie56@users.noreply.github.com> Date: Wed, 1 May 2024 18:51:21 +0200 Subject: [PATCH] Almayer Fix some pipes going bellow windows and their surrounding. (#6174) # About the pull request Mainly fix. a bit of rework and eastetic around upper engi (that was so ugly and nothing like that was around the ship.) # Explain why it's good for the game # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: maptweak: Officer cafeteria added back missing emergency shutters and move the pipes from bellow the windows. maptweak: Starboard aft hull removed the two walls. maptweak: Upper engi area around lobby remove pipping going bellow window also rework the area to better fit aestetic of almayer. /:cl: Co-authored-by: Julien --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 681 +++++++++------------ 1 file changed, 282 insertions(+), 399 deletions(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 1c2e3e5b68b0..c87ab7b4c09a 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -1475,6 +1475,9 @@ name = "\improper Officer's Cafeteria" }, /obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -1494,7 +1497,7 @@ /area/almayer/living/cafeteria_officer) "ain" = ( /obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 + dir = 9 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -1650,10 +1653,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north1) -"ajJ" = ( -/obj/structure/window/framed/almayer, -/turf/open/floor/plating, -/area/almayer/living/cafeteria_officer) "ajM" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -2670,18 +2669,6 @@ icon_state = "tcomms" }, /area/almayer/command/telecomms) -"aqe" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/engineering/upper_engineering) "aqf" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -2690,19 +2677,15 @@ /area/almayer/engineering/upper_engineering) "aqg" = ( /obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/junction, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering) "aqh" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, /obj/structure/flora/pottedplant{ icon_state = "pottedplant_21" }, @@ -2714,15 +2697,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering) -"aqj" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/turf/open/floor/plating, -/area/almayer/engineering/upper_engineering) "aqm" = ( /obj/item/bedsheet/brown, /obj/structure/bed, @@ -3018,15 +2992,8 @@ name = "General Listening Channel"; pixel_y = 28 }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering) -"arw" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/junction{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/open/floor/almayer{ dir = 1; @@ -4443,27 +4410,8 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/north2) -"ayd" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" - }, -/area/almayer/engineering/upper_engineering) "aye" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/bed/chair, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, /turf/open/floor/almayer{ dir = 1; icon_state = "orange" @@ -5227,12 +5175,11 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering) "aBl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering) @@ -5624,8 +5571,6 @@ }, /area/almayer/engineering/upper_engineering) "aDh" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ icon_state = "cargo" }, @@ -6073,11 +6018,9 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/command/telecomms) "aFl" = ( -/obj/structure/disposalpipe/segment, /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" }, @@ -6461,19 +6404,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/telecomms) -"aHt" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering) "aHu" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ @@ -18392,14 +18322,6 @@ icon_state = "test_floor4" }, /area/almayer/engineering/lower/engine_core) -"cla" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/hallways/upper/aft_hallway) "cle" = ( /turf/open/floor/almayer{ dir = 4; @@ -21428,6 +21350,9 @@ dir = 4 }, /obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -21547,6 +21472,14 @@ icon_state = "red" }, /area/almayer/shipboard/brig/chief_mp_office) +"dgI" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/almayer/living/cafeteria_officer) "dha" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -22884,13 +22817,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/starboard_hallway) -"dFB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/light, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/aft_hallway) "dFF" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_21" @@ -22914,6 +22840,16 @@ icon_state = "plate" }, /area/almayer/hallways/lower/vehiclehangar) +"dFN" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering/upper_engineering) "dFR" = ( /turf/open/floor/almayer{ dir = 9; @@ -23382,19 +23318,6 @@ }, /turf/open/floor/plating, /area/almayer/maint/lower/constr) -"dPB" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" - }, -/area/almayer/hallways/upper/midship_hallway) "dPC" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -23954,18 +23877,6 @@ icon_state = "test_floor4" }, /area/almayer/living/briefing) -"dZr" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering) "dZu" = ( /obj/structure/machinery/light{ dir = 1 @@ -24589,6 +24500,13 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/living/grunt_rnr) +"ejx" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/hallways/upper/midship_hallway) "ejV" = ( /obj/structure/closet, /obj/item/device/flashlight/pen, @@ -24776,10 +24694,6 @@ /area/almayer/medical/medical_science) "emL" = ( /obj/structure/machinery/light, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer{ icon_state = "orange" }, @@ -24827,17 +24741,6 @@ icon_state = "test_floor4" }, /area/almayer/maint/hull/lower/l_m_s) -"eol" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/hallways/upper/midship_hallway) "eox" = ( /obj/structure/machinery/light/small, /turf/open/floor/plating/plating_catwalk, @@ -25792,6 +25695,15 @@ }, /turf/open/floor/almayer, /area/almayer/living/bridgebunks) +"eDT" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering) "eEc" = ( /obj/structure/machinery/light, /obj/effect/decal/warning_stripes{ @@ -26191,17 +26103,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_s) -"eLV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/hallways/upper/aft_hallway) "eLX" = ( /obj/structure/bed/chair{ dir = 4 @@ -29058,13 +28959,6 @@ icon_state = "plating" }, /area/almayer/shipboard/sea_office) -"fOJ" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/engineering/upper_engineering) "fOK" = ( /obj/structure/surface/table/almayer, /obj/item/device/camera, @@ -35503,6 +35397,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) +"iav" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/almayer/engineering/upper_engineering) "iaF" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -35773,13 +35679,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_m_s) -"igC" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/aft_hallway) "igS" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -37131,6 +37030,11 @@ icon_state = "plate" }, /area/almayer/maint/upper/u_a_s) +"iJs" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering/upper_engineering) "iJB" = ( /obj/structure/sign/safety/galley{ pixel_x = 8; @@ -39315,12 +39219,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/execution) -"jrc" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/midship_hallway) "jre" = ( /obj/structure/closet/secure_closet/cargotech, /obj/item/clothing/accessory/storage/webbing, @@ -40213,6 +40111,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/morgue) +"jIs" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/midship_hallway) "jIC" = ( /obj/structure/machinery/computer/working_joe{ dir = 4; @@ -42904,6 +42809,16 @@ icon_state = "dark_sterile" }, /area/almayer/medical/containment) +"kDH" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering/upper_engineering) "kDK" = ( /obj/structure/pipes/vents/scrubber, /turf/open/floor/wood/ship, @@ -43428,6 +43343,14 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) +"kNV" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/hallways/upper/starboard) "kNX" = ( /obj/structure/bed/chair/comfy/charlie{ dir = 1 @@ -44011,12 +43934,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"kXD" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/midship_hallway) "kXN" = ( /obj/item/clothing/glasses/sunglasses/aviator{ pixel_x = -1; @@ -44196,6 +44113,8 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor/glass{ name = "\improper Engineering Reception" }, +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -45757,10 +45676,6 @@ }, /turf/open/floor/plating, /area/almayer/maint/lower/constr) -"lDH" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/midship_hallway) "lDL" = ( /obj/structure/machinery/light{ dir = 4 @@ -46203,6 +46118,15 @@ icon_state = "orangecorner" }, /area/almayer/hallways/upper/midship_hallway) +"lLA" = ( +/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" + }, +/area/almayer/hallways/upper/midship_hallway) "lLC" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer, @@ -47701,6 +47625,15 @@ icon_state = "test_floor4" }, /area/almayer/hallways/lower/starboard_umbilical) +"mpZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/engineering/upper_engineering) "mqb" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -47794,19 +47727,6 @@ icon_state = "green" }, /area/almayer/squads/req) -"mrO" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "orange" - }, -/area/almayer/hallways/upper/midship_hallway) "msg" = ( /obj/structure/machinery/light, /obj/structure/sign/safety/waterhazard{ @@ -47956,8 +47876,6 @@ /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) "mux" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, /obj/structure/machinery/camera/autoname/almayer{ dir = 8; name = "ship-grade camera" @@ -48655,12 +48573,6 @@ icon_state = "silver" }, /area/almayer/command/securestorage) -"mGL" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/hallways/upper/midship_hallway) "mGT" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -54216,12 +54128,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_aft_hallway) -"oxi" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer, -/area/almayer/living/cafeteria_officer) "oxl" = ( /obj/structure/window/reinforced{ dir = 8; @@ -55293,6 +55199,17 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) +"oOW" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering) "oOZ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -55830,17 +55747,6 @@ icon_state = "orange" }, /area/almayer/engineering/lower) -"oXP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/hallways/upper/midship_hallway) "oXY" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -57396,6 +57302,12 @@ "pzW" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/hallways/lower/vehiclehangar) +"pzX" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/almayer, +/area/almayer/engineering/upper_engineering) "pAm" = ( /turf/open/floor/almayer, /area/almayer/engineering/lower/engine_core) @@ -59781,6 +59693,13 @@ icon_state = "plating_striped" }, /area/almayer/squads/req) +"qsG" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) "qsL" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -60658,11 +60577,14 @@ }, /area/almayer/powered) "qHD" = ( -/obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/almayer, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/aft_hallway) "qHG" = ( /obj/structure/machinery/light/small{ @@ -61010,6 +60932,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/armory) +"qMI" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-y" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/aft_hallway) "qMP" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -61284,15 +61216,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/port_point_defense) -"qSp" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/hallways/upper/aft_hallway) "qSE" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/cholula, @@ -61551,18 +61474,6 @@ dir = 4 }, /area/almayer/medical/containment/cell/cl) -"qXh" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "orange" - }, -/area/almayer/hallways/upper/midship_hallway) "qXk" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -65742,8 +65653,6 @@ }, /area/almayer/shipboard/brig/perma) "sqo" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, /obj/structure/bed/chair{ dir = 8 }, @@ -66232,6 +66141,13 @@ icon_state = "blue" }, /area/almayer/squads/delta) +"sAw" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/engineering/upper_engineering) "sAz" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -66740,12 +66656,6 @@ icon_state = "cargo" }, /area/almayer/engineering/lower/workshop/hangar) -"sJN" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/aft_hallway) "sJY" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -67065,23 +66975,6 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) -"sRC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/upper/aft_hallway) -"sRM" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_s) "sRZ" = ( /obj/effect/projector{ name = "Almayer_Down2"; @@ -70405,6 +70298,14 @@ icon_state = "test_floor4" }, /area/almayer/squads/req) +"tXn" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_s) "tXo" = ( /turf/open/floor/almayer{ icon_state = "redcorner" @@ -70828,6 +70729,10 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lockerroom) +"uez" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) "ueG" = ( /obj/item/bedsheet/orange, /obj/structure/bed{ @@ -74210,6 +74115,12 @@ icon_state = "plate" }, /area/almayer/living/gym) +"vnM" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/starboard) "vnY" = ( /turf/open/floor/almayer, /area/almayer/hallways/lower/repair_bay) @@ -75450,16 +75361,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_f_p) -"vGi" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/aft_hallway) "vGn" = ( /turf/open/floor/almayer{ dir = 1; @@ -77049,14 +76950,6 @@ /obj/effect/landmark/late_join/charlie, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) -"wdE" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/hallways/upper/midship_hallway) "wdF" = ( /turf/open/floor/almayer{ allow_construction = 0 @@ -80140,8 +80033,10 @@ }, /area/almayer/engineering/laundry) "xfm" = ( -/obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, /turf/open/floor/plating, /area/almayer/living/cafeteria_officer) "xfq" = ( @@ -82747,7 +82642,7 @@ /obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 }, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/almayer, /area/almayer/engineering/upper_engineering) "xZk" = ( /obj/item/prop/helmetgarb/gunoil{ @@ -82993,18 +82888,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"ycA" = ( -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/hallways/upper/aft_hallway) "ycH" = ( /obj/structure/surface/table/almayer, /obj/item/pizzabox/margherita{ @@ -120276,10 +120159,10 @@ sVV sVV sVV sVV -sVV -wNC -sfz -lGh +vnM +lLA +ejx +jIs xLw vOy woh @@ -120479,7 +120362,7 @@ xMz lIY gxn aMy -aMy +kNV wNC wlr xyp @@ -120885,7 +120768,7 @@ lzt ael afE agT -agT +dgI ael ogT yiu @@ -121291,10 +121174,10 @@ qTi ael afI agY -oxi +aiq xfm -lDH -vIZ +xIj +qdJ iCg mOi mOi @@ -121495,7 +121378,7 @@ ael afJ agY aiq -ajJ +xfm xIj qdJ xIj @@ -124339,8 +124222,8 @@ fjo opu hlj iso -dPB -mrO +ceV +nsH alL alL alL @@ -124542,7 +124425,7 @@ asA msS nZf rho -lDH +jIs emL jvY jvY @@ -124745,8 +124628,8 @@ nBK wYa hlj giW -mGL -qXh +puP +tfF jvY arg atf @@ -124948,8 +124831,8 @@ aeC beN mdm lLt -xIj -oXP +qdJ +vCv jvY arh atm @@ -125151,8 +125034,8 @@ ggQ aME aep lLt -kXD -eol +lGh +vCv jvY ari aoP @@ -125354,8 +125237,8 @@ afk agM aep lLt -jrc -wdE +yiu +vCv jvY arj atm @@ -125557,8 +125440,8 @@ afk afk aep lLt -jrc -wdE +poD +vCv jvY ark atm @@ -125761,7 +125644,7 @@ aep aep umI ddO -sRC +umI jvY alL atk @@ -125963,8 +125846,8 @@ aep aep aep sHI -cNC -cla +jao +qhT jvY arl atm @@ -126166,8 +126049,8 @@ cMx cMx cMx sHI -cNC -cla +jao +qhT jvY abF atm @@ -126369,8 +126252,8 @@ oVo oVo cMx nSw -pqY -cla +qsG +qhT jvY jvY jvY @@ -126572,8 +126455,8 @@ fIK fIK wuS tzF -pqY -cla +qsG +qhT alL urM dBG @@ -126775,9 +126658,9 @@ oVo oVo cMx nWf -cNC -igC -aqe +lOn +acQ +kwd amw anO arq @@ -126978,20 +126861,20 @@ oVo rYU cMx nXV -wHr -vGi +qMI +rUN aqg -arr -atn +oOW atn atn atn +sAw anP aBh anP -atn -atn -atn +anP +iJs +dFN atn aOB aRj @@ -127181,21 +127064,21 @@ iVz rAS cMx sHI -tof -jao +lOn +acQ kwd -amA -atq -atq +eDT amx amx amx -atq +awy amx amx amx -atq -atq +amx +amx +mpZ +amx aoT kwd acQ @@ -127384,20 +127267,20 @@ cMx cMx cMx sHI -tof -eLV +jao +qhT alO ars amx amx aqf +pzX amx amx -atq -amx amx amx amx +mpZ amx aOC alO @@ -127587,20 +127470,20 @@ oaP jhQ cMx kYb -tof -eLV +jao +qhT inw -amA +eDT amx amx -awy amx amx amx amx amx amx -atq +amx +aBo amx aoT inw @@ -127790,21 +127673,21 @@ oVo oVo cMx sHI -tof -ycA -aqj -arw -anP -fOJ +jao +qhT +inw +eDT +amx +auB aqh sqo sqo aDh aDh mux -ayd -atq -atq +aya +aBo +amx wwJ inw sHI @@ -127993,8 +127876,8 @@ oVo oVo cMx nWf -tof -cla +jao +qhT inw qHM emn @@ -128006,7 +127889,7 @@ aBi aDi alO aye -amx +aBo amx aBs inw @@ -128196,8 +128079,8 @@ qbw qbw vTE kGS -tof -dFB +lOn +wCe alO alO alO @@ -128209,8 +128092,8 @@ anO aDj inw aye -atq -atq +mpZ +amx aBs alO sHI @@ -128399,21 +128282,21 @@ oVo oVo btb sHI -tof -sJN +lOn +qhT alO gKZ vTv auL alO axy -amA -atq +azh +aBk aoT inw aye -atq -atq +mpZ +amx aBs alO uSk @@ -128602,20 +128485,20 @@ pVh mSl btb sHI -tof -sJN +jao +qhT alO arz atq aoT alO aOG -azh -aBk -aoT +amA +kDH +aOB laQ -dZr -auB +arr +iav atc aOF alO @@ -128805,8 +128688,8 @@ cMx cMx cMx sHI -tof -sJN +jao +qhT alO arz atq @@ -128815,9 +128698,9 @@ alO axA amA aBl -aOB +aoT aFl -aHt +arm aIU aMq aOG @@ -129008,8 +128891,8 @@ yfn nkc cMx sHI -tof -sJN +jao +qhT alO arz atq @@ -129211,8 +129094,8 @@ oVo iIU cMx uSk -tof -sJN +jao +kGS xHt arm ats @@ -129415,7 +129298,7 @@ whO bYL dlT qHD -qSp +qhT alO arA att @@ -129617,7 +129500,7 @@ cMx cMx cMx nWf -tof +cNC qhT wDM wDM @@ -130023,7 +129906,7 @@ jhx dnH gpc tzF -pqY +uez qhT wDM uto @@ -130226,7 +130109,7 @@ owg owg ptK sHI -cNC +tof qhT wDM aOQ @@ -130632,7 +130515,7 @@ wiG nWN eNi sHI -cNC +tof qhT wDM wDM @@ -131735,7 +131618,7 @@ emA emA emA ikT -oBr +jEM aQL qDq qDq @@ -132758,8 +132641,8 @@ jEM gCu jEM jEM -oBr -sRM +tXn +jEM jEM jEM oBr