diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 95352008b2ae..9201ddfc5382 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -790,7 +790,7 @@ "acE" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "cargo" }, /area/almayer/lifeboat_pumps/north2) "acF" = ( @@ -918,7 +918,7 @@ "acT" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "cargo" }, /area/almayer/lifeboat_pumps/north2) "acU" = ( @@ -1177,11 +1177,14 @@ }, /area/almayer/lifeboat_pumps/north1) "adQ" = ( -/obj/structure/closet/emcloset, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/lifeboat_pumps/north1) +/area/almayer/lifeboat_pumps/north2) "adR" = ( /obj/structure/machinery/door/airlock/almayer/generic{ access_modified = 1; @@ -1211,11 +1214,12 @@ }, /area/almayer/hallways/aft_hallway) "adZ" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "mono" +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/area/almayer/lifeboat_pumps/north1) +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north2) "aea" = ( /obj/structure/machinery/light{ dir = 1 @@ -1580,6 +1584,10 @@ density = 0; pixel_y = 17 }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_s) "afd" = ( @@ -3060,6 +3068,10 @@ /obj/structure/machinery/light{ dir = 1 }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, @@ -3336,21 +3348,22 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/starboard_garden) "alb" = ( +/obj/structure/toilet{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/commandbunks) +"alc" = ( /obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 + dir = 4; + pixel_x = 11 }, /obj/structure/mirror{ - pixel_x = -28 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" + pixel_x = 28 }, -/area/almayer/living/commandbunks) -"alc" = ( -/obj/structure/toilet{ - dir = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 }, /turf/open/floor/almayer{ icon_state = "dark_sterile" @@ -6144,7 +6157,7 @@ /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "cargo" }, /area/almayer/command/lifeboat) "atZ" = ( @@ -8939,6 +8952,14 @@ icon_state = "orangecorner" }, /area/almayer/command/telecomms) +"aDc" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/command/lifeboat) "aDe" = ( /obj/structure/machinery/light{ dir = 8 @@ -11229,7 +11250,7 @@ /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "cargo" }, /area/almayer/command/lifeboat) "aNi" = ( @@ -12638,11 +12659,9 @@ /area/almayer/living/basketball) "aTV" = ( /obj/structure/toilet{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" + dir = 4 }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) "aTW" = ( /obj/structure/bed/chair{ @@ -13182,9 +13201,7 @@ pixel_x = -6; pixel_y = -10 }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/living/captain_mess) "aWD" = ( /obj/structure/window/framed/almayer, @@ -14800,6 +14817,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) +"bfe" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/port) "bfl" = ( /turf/open/floor/almayer{ dir = 5; @@ -20549,8 +20576,11 @@ unacidable = 1; unslashable = 1 }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "dark_sterile" }, /area/almayer/living/auxiliary_officer_office) "bII" = ( @@ -22639,9 +22669,7 @@ /obj/structure/machinery/light{ dir = 8 }, -/turf/open/floor/almayer/no_build{ - icon_state = "ai_floors" - }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/command/airoom) "bRr" = ( /obj/structure/machinery/fuelcell_recycler, @@ -26493,41 +26521,14 @@ }, /area/almayer/hull/upper_hull/u_a_s) "ckE" = ( -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 - }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 - }, -/obj/structure/bed{ - can_buckle = 0 - }, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 - }, -/obj/item/bedsheet/yellow{ - layer = 3.2 - }, -/obj/item/bedsheet/yellow{ - pixel_y = 13 - }, -/obj/structure/sign/safety/bathunisex{ - pixel_x = -16; - pixel_y = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 }, -/obj/item/toy/plush/barricade, -/obj{ - name = "---Merge conflict marker---" +/turf/open/floor/almayer{ + icon_state = "mono" }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/living/briefing) +/area/almayer/lifeboat_pumps/north1) "ckI" = ( /obj/structure/disposalpipe/segment, /obj/item/device/radio/intercom{ @@ -27869,8 +27870,8 @@ /area/almayer/shipboard/brig/execution) "czG" = ( /obj/structure/machinery/recharge_station, -/turf/open/floor/almayer/no_build{ - icon_state = "ai_floors" +/turf/open/floor/almayer{ + icon_state = "cargo" }, /area/almayer/command/airoom) "czJ" = ( @@ -29652,6 +29653,14 @@ icon_state = "orange" }, /area/almayer/engineering/engineering_workshop/hangar) +"djN" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/engineering/upper_engineering/port) "djQ" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -29740,9 +29749,7 @@ dir = 2 }, /obj/item/clothing/mask/cigarette/weed, -/turf/open/floor/prison{ - icon_state = "kitchen" - }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) "dll" = ( /obj/structure/surface/table/almayer, @@ -29867,6 +29874,10 @@ /obj/structure/machinery/camera/autoname/almayer{ name = "ship-grade camera" }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, /turf/open/floor/almayer{ dir = 1; icon_state = "red" @@ -30164,6 +30175,12 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/cryo) +"dtv" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/turf/open/floor/almayer, +/area/almayer/command/lifeboat) "dtH" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -31327,6 +31344,13 @@ /area/almayer/shipboard/brig/main_office) "dSn" = ( /obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, @@ -31733,7 +31757,7 @@ "eaX" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "cargo" }, /area/almayer/engineering/upper_engineering/starboard) "ebd" = ( @@ -31904,13 +31928,19 @@ pixel_x = 8; pixel_y = -32 }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, /area/almayer/command/lifeboat) "edM" = ( /obj/structure/closet/firecloset, -/turf/open/floor/almayer, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, /area/almayer/hallways/vehiclehangar) "eed" = ( /turf/open/floor/almayer{ @@ -32202,15 +32232,13 @@ }, /area/almayer/medical/containment/cell) "eiH" = ( -/obj/structure/sink{ - pixel_y = 24 - }, /obj/structure/machinery/light{ dir = 8 }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" +/obj/structure/toilet{ + dir = 4 }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) "eiK" = ( /obj/structure/bed/chair{ @@ -32844,7 +32872,7 @@ "euY" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "cargo" }, /area/almayer/engineering/upper_engineering/port) "eva" = ( @@ -34792,9 +34820,7 @@ /obj/structure/machinery/door/window/tinted{ dir = 1 }, -/turf/open/floor/prison{ - icon_state = "kitchen" - }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) "fnZ" = ( /obj/structure/machinery/portable_atmospherics/canister/air, @@ -34916,6 +34942,12 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) +"fqg" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south2) "fqu" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/floor/almayer, @@ -36351,6 +36383,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/hallways/aft_hallway) +"fXM" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer, +/area/almayer/command/lifeboat) "fXN" = ( /obj/effect/landmark/start/marine/delta, /obj/effect/landmark/late_join/delta, @@ -36837,19 +36875,12 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_p) "ghX" = ( -/obj/structure/window/reinforced/tinted{ - pixel_y = -8 - }, /obj/structure/machinery/shower{ dir = 8 }, -/obj/structure/machinery/door/window/tinted{ - dir = 8 - }, /obj/item/toy/inflatable_duck, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, +/obj/structure/window/reinforced, +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) "gio" = ( /obj/structure/closet/emcloset, @@ -37462,6 +37493,9 @@ /area/almayer/living/basketball) "gwu" = ( /obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, /turf/open/floor/almayer{ icon_state = "red" }, @@ -37881,6 +37915,10 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 2 + }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) "gDW" = ( @@ -37937,12 +37975,12 @@ }, /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/door_control{ + id = "cl_evac"; + name = "Evac Pod Door Control"; + normaldoorcontrol = 1; pixel_x = -5; pixel_y = 2; - req_access_txt = "200"; - name = "Evac Pod Door Control"; - id = "cl_evac"; - normaldoorcontrol = 1 + req_access_txt = "200" }, /turf/open/floor/carpet, /area/almayer/command/corporateliason) @@ -39215,6 +39253,10 @@ dir = 1; name = "ship-grade camera" }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, /turf/open/floor/almayer{ icon_state = "red" }, @@ -39377,6 +39419,13 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) +"hiN" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer, +/area/almayer/command/lifeboat) "hiQ" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -41117,6 +41166,12 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) +"hWX" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hull/upper_hull/u_f_p) "hXb" = ( /turf/open/floor/almayer{ dir = 1; @@ -41154,6 +41209,15 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) +"hXD" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/south1) "hXS" = ( /obj/structure/sign/safety/water{ pixel_x = 8; @@ -42205,6 +42269,16 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) +"iuw" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/port) "iuy" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -42239,7 +42313,7 @@ name = "ship-grade camera" }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "cargo" }, /area/almayer/hull/upper_hull/u_f_s) "ivf" = ( @@ -43791,6 +43865,10 @@ /obj/structure/machinery/light{ dir = 8 }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, /turf/open/floor/almayer{ dir = 9; icon_state = "red" @@ -44032,8 +44110,12 @@ /obj/structure/mirror{ pixel_x = 29 }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, /turf/open/floor/almayer{ - icon_state = "sterile" + icon_state = "dark_sterile" }, /area/almayer/living/captain_mess) "jgw" = ( @@ -44478,8 +44560,8 @@ pixel_y = 5 }, /obj/item/folder/black{ - pixel_y = -3; - pixel_x = 7 + pixel_x = 7; + pixel_y = -3 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -45842,11 +45924,25 @@ icon_state = "plate" }, /area/almayer/living/offices) +"jWC" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/command/lifeboat) "jWH" = ( /obj/structure/machinery/power/apc/almayer/hardened{ cell_type = /obj/item/cell/hyper; dir = 1 }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, /turf/open/floor/almayer{ icon_state = "mono" }, @@ -45882,7 +45978,7 @@ "jXW" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "cargo" }, /area/almayer/command/lifeboat) "jXY" = ( @@ -49826,6 +49922,13 @@ icon_state = "test_floor4" }, /area/almayer/hallways/starboard_hallway) +"lDj" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 2 + }, +/turf/open/floor/almayer, +/area/almayer/hull/upper_hull/u_f_p) "lDJ" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = -17 @@ -50855,6 +50958,16 @@ icon_state = "greencorner" }, /area/almayer/hallways/aft_hallway) +"mcl" = ( +/obj/structure/sign/safety/ladder{ + pixel_x = -16 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/vehiclehangar) "mcL" = ( /obj/structure/machinery/vending/snack, /obj/structure/sign/safety/maint{ @@ -51721,6 +51834,15 @@ icon_state = "bluecorner" }, /area/almayer/squads/delta) +"mvH" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/south2) "mvI" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -52235,7 +52357,7 @@ "mIA" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "cargo" }, /area/almayer/lifeboat_pumps/south2) "mIB" = ( @@ -52741,6 +52863,13 @@ icon_state = "test_floor4" }, /area/almayer/hallways/starboard_hallway) +"mRU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer, +/area/almayer/hull/upper_hull/u_f_p) "mRW" = ( /turf/open/floor/almayer/research/containment/corner1, /area/almayer/medical/containment/cell/cl) @@ -53156,8 +53285,11 @@ /obj/structure/machinery/light/small{ dir = 4 }, -/turf/open/floor/prison{ - icon_state = "kitchen" +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" }, /area/almayer/engineering/upper_engineering/port) "naR" = ( @@ -53722,10 +53854,11 @@ }, /area/almayer/command/securestorage) "nna" = ( +/obj/structure/closet/firecloset, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + icon_state = "cargo" }, -/area/almayer/living/port_emb) +/area/almayer/hull/upper_hull/u_f_s) "nnc" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -53854,21 +53987,12 @@ }, /area/almayer/medical/containment) "npB" = ( -/obj/structure/sink{ - dir = 1; - pixel_y = -10 - }, -/obj/structure/pipes/vents/scrubber{ - dir = 1 - }, -/obj/structure/surface/rack{ - density = 0; - pixel_x = 26 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 }, -/area/almayer/living/port_emb) +/turf/open/floor/almayer, +/area/almayer/hull/upper_hull/u_f_s) "nqx" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -54358,6 +54482,9 @@ /obj/structure/machinery/light{ dir = 8 }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, /turf/open/floor/almayer{ dir = 10; icon_state = "red" @@ -54945,51 +55072,15 @@ }, /area/almayer/hull/lower_hull/l_m_s) "nMM" = ( -/obj/item/bedsheet/blue{ - layer = 3.2 - }, -/obj/item/bedsheet/blue{ - pixel_y = 13 - }, -/obj/item/toy/plush/therapy/red{ - desc = "A USCM approved plush doll. It's not soft and hardly comforting!"; - force = 15; - layer = 4.1; - name = "Sergeant Huggs"; - pixel_y = 15; - throwforce = 15 - }, -/obj/item/clothing/head/cmcap{ - layer = 4.1; - pixel_x = -1; - pixel_y = 22 - }, -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 - }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 - }, -/obj/structure/bed{ - can_buckle = 0 - }, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 - }, -/obj{ - name = "---Merge conflict marker---" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/bed/chair/comfy/charlie, -/turf/open/floor/almayer{ - icon_state = "emeraldfull" +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 2 }, -/area/almayer/living/briefing) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_s) "nMV" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -56071,12 +56162,16 @@ }, /area/almayer/shipboard/brig/execution) "olk" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Bathroom" - }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 2 + }, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Bathroom" + }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -57200,6 +57295,15 @@ "oIB" = ( /turf/closed/wall/almayer, /area/almayer/command/combat_correspondent) +"oIY" = ( +/obj/structure/machinery/cryopod/right{ + layer = 3.1; + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/command/airoom) "oJp" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -58150,8 +58254,11 @@ /obj/structure/machinery/light/small{ dir = 8 }, -/turf/open/floor/prison{ - icon_state = "kitchen" +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" }, /area/almayer/engineering/upper_engineering/port) "pfH" = ( @@ -59436,6 +59543,14 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) +"pNK" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/auxiliary_officer_office) "pNM" = ( /obj/structure/platform{ dir = 4 @@ -59544,6 +59659,10 @@ /area/almayer/hull/upper_hull/u_a_s) "pPF" = ( /obj/structure/machinery/power/apc/almayer/hardened, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, /turf/open/floor/almayer{ icon_state = "mono" }, @@ -59577,6 +59696,9 @@ pixel_x = 23; specialfunctions = 4 }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, @@ -59764,6 +59886,10 @@ /area/almayer/command/computerlab) "pUe" = ( /obj/structure/machinery/power/apc/almayer/hardened, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, /turf/open/floor/almayer{ icon_state = "mono" }, @@ -59791,6 +59917,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_p) +"pUl" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/vehiclehangar) "pUp" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -60652,6 +60787,15 @@ /obj/effect/landmark/late_join/charlie, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) +"qkj" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/lifeboat) "qkn" = ( /obj/structure/sign/safety/maint{ pixel_x = -17 @@ -60947,8 +61091,10 @@ /area/almayer/medical/chemistry) "qpU" = ( /obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" + icon_state = "pottedplant_22"; + pixel_y = 12 }, +/obj/structure/surface/table/almayer, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -61071,7 +61217,7 @@ "qtR" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "cargo" }, /area/almayer/command/lifeboat) "qtS" = ( @@ -61344,6 +61490,13 @@ icon_state = "plating" }, /area/almayer/hallways/vehiclehangar) +"qyH" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer, +/area/almayer/command/lifeboat) "qyJ" = ( /obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun, /turf/open/floor/almayer{ @@ -61452,16 +61605,13 @@ /turf/open/floor/almayer, /area/almayer/living/briefing) "qCg" = ( -/obj/structure/pipes/vents/pump, /obj/structure/mirror{ pixel_y = 32 }, /obj/structure/sink{ pixel_y = 24 }, -/turf/open/floor/prison{ - icon_state = "kitchen" - }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) "qCi" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -62124,6 +62274,16 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) +"qQL" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/port) "qQM" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -63481,8 +63641,13 @@ /turf/open/floor/almayer, /area/almayer/command/computerlab) "rsW" = ( -/turf/open/floor/prison{ - icon_state = "kitchen" +/obj/structure/pipes/vents/pump, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" }, /area/almayer/engineering/upper_engineering/port) "rsY" = ( @@ -63683,9 +63848,7 @@ "rzf" = ( /obj/effect/landmark/late_join/working_joe, /obj/effect/landmark/start/working_joe, -/turf/open/floor/almayer/no_build{ - icon_state = "ai_floors" - }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/command/airoom) "rzj" = ( /obj/structure/pipes/standard/simple/hidden/supply, @@ -63729,15 +63892,11 @@ }, /area/almayer/living/briefing) "rAv" = ( -/obj/structure/toilet{ - dir = 8 - }, -/obj/structure/machinery/door/window/tinted{ +/obj/structure/machinery/shower{ dir = 8 }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, +/obj/structure/window/reinforced, +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) "rAx" = ( /obj/structure/disposalpipe/junction{ @@ -64708,11 +64867,21 @@ /area/almayer/command/computerlab) "rUB" = ( /obj/structure/pipes/vents/pump, +/obj/item/tool/soap, +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/sink{ + pixel_y = 24 + }, /obj/structure/mirror{ pixel_y = 32 }, -/obj/item/tool/soap, -/obj/effect/decal/cleanable/blood, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, @@ -64752,6 +64921,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) +"rWF" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/lifeboat) "rWL" = ( /obj/structure/barricade/metal, /turf/open/floor/almayer{ @@ -64858,6 +65035,14 @@ icon_state = "plate" }, /area/almayer/living/offices/flight) +"rYZ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 2 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/vehiclehangar) "rZz" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -65332,6 +65517,9 @@ /obj/structure/machinery/light/small{ dir = 8 }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, /turf/open/floor/almayer{ dir = 10; icon_state = "orange" @@ -65490,6 +65678,15 @@ /area/almayer/squads/delta) "soa" = ( /obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1; name = "Bathroom" @@ -65821,11 +66018,15 @@ }, /area/almayer/command/lifeboat) "svp" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "mono" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/lifeboat_pumps/south1) +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_s) "swn" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -67589,6 +67790,10 @@ pixel_x = -2; pixel_y = 8 }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, /turf/open/floor/almayer{ dir = 6; icon_state = "orange" @@ -67997,6 +68202,10 @@ /obj/structure/machinery/light{ dir = 1 }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, /turf/open/floor/almayer{ dir = 1; icon_state = "red" @@ -68448,7 +68657,7 @@ "tAh" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "cargo" }, /area/almayer/engineering/upper_engineering/port) "tAi" = ( @@ -68856,6 +69065,11 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 2; + pixel_y = 2 + }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) "tJp" = ( @@ -69231,8 +69445,8 @@ pixel_y = 12 }, /obj/item/paper_bin/uscm{ - pixel_y = 6; - pixel_x = 6 + pixel_x = 6; + pixel_y = 6 }, /obj/item/tool/pen{ pixel_x = 4; @@ -69412,6 +69626,13 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/cryo) +"tXz" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/vehiclehangar) "tXM" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -69470,6 +69691,12 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) +"tYv" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hull/upper_hull/u_f_p) "tYw" = ( /obj/effect/decal/medical_decals{ icon_state = "triagedecalbottomleft"; @@ -70166,6 +70393,10 @@ cell_type = /obj/item/cell/hyper; dir = 1 }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, /turf/open/floor/almayer{ icon_state = "mono" }, @@ -70188,13 +70419,16 @@ }, /area/almayer/hull/lower_hull/l_f_p) "umY" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 2 }, -/area/almayer/living/port_emb) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_s) "unh" = ( /obj/structure/surface/table/almayer, /obj/item/storage/firstaid/o2, @@ -70635,11 +70869,13 @@ /turf/open/floor/wood/ship, /area/almayer/living/basketball) "uvk" = ( -/obj/structure/closet/firecloset, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "orange" }, -/area/almayer/lifeboat_pumps/south1) +/area/almayer/engineering/upper_engineering/starboard) "uvs" = ( /obj/structure/machinery/conveyor{ id = "lower_garbage" @@ -71209,7 +71445,7 @@ "uGa" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "cargo" }, /area/almayer/lifeboat_pumps/south2) "uGc" = ( @@ -71894,9 +72130,7 @@ /obj/structure/machinery/door/window/tinted{ dir = 2 }, -/turf/open/floor/prison{ - icon_state = "kitchen" - }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) "uVb" = ( /obj/structure/closet/toolcloset, @@ -72114,6 +72348,15 @@ }, /turf/closed/wall/almayer, /area/almayer/hallways/starboard_umbilical) +"vba" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/engineering/upper_engineering/port) "vbf" = ( /obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 8 @@ -73781,6 +74024,16 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/living/port_emb) +"vHl" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/command/lifeboat) "vHq" = ( /obj/item/device/assembly/mousetrap/armed, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -75651,6 +75904,13 @@ icon_state = "rasputin3" }, /area/almayer/powered/agent) +"wpj" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 2 + }, +/turf/open/floor/almayer, +/area/almayer/hull/upper_hull/u_f_p) "wpw" = ( /obj/structure/bed/chair/comfy/ares{ dir = 1 @@ -76083,9 +76343,7 @@ }, /obj/effect/landmark/late_join/working_joe, /obj/effect/landmark/start/working_joe, -/turf/open/floor/almayer/no_build{ - icon_state = "ai_floors" - }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/command/airoom) "wyO" = ( /obj/structure/largecrate/random/barrel/red, @@ -76576,6 +76834,15 @@ }, /turf/open/floor/plating, /area/almayer/medical/containment) +"wKS" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "red" + }, +/area/almayer/command/lifeboat) "wLi" = ( /obj/structure/machinery/door_control/airlock{ id = "s_engi"; @@ -77204,6 +77471,14 @@ /obj/structure/machinery/light{ dir = 8 }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, @@ -77777,10 +78052,14 @@ /area/almayer/living/grunt_rnr) "xjw" = ( /obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 + dir = 4 }, -/turf/open/floor/prison{ - icon_state = "kitchen" +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" }, /area/almayer/engineering/upper_engineering/port) "xjz" = ( @@ -78651,9 +78930,7 @@ /area/almayer/squads/req) "xAC" = ( /obj/structure/surface/rack, -/turf/open/floor/prison{ - icon_state = "kitchen" - }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) "xAI" = ( /obj/structure/platform{ @@ -79055,7 +79332,7 @@ "xJn" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "cargo" }, /area/almayer/engineering/upper_engineering/starboard) "xJC" = ( @@ -80224,6 +80501,10 @@ }, /area/almayer/command/lifeboat) "ygs" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Bathroom" }, @@ -80377,6 +80658,16 @@ icon_state = "cargo" }, /area/almayer/hull/lower_hull/l_m_s) +"ykD" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/command/lifeboat) "ykF" = ( /obj/structure/machinery/cm_vending/sorted/tech/tool_storage, /turf/open/floor/almayer{ @@ -80428,9 +80719,9 @@ }, /area/almayer/squads/delta) "ylg" = ( -/obj/structure/machinery/cryopod, -/turf/open/floor/almayer/no_build{ - icon_state = "ai_floors" +/obj/structure/machinery/cryopod/right, +/turf/open/floor/almayer{ + icon_state = "cargo" }, /area/almayer/command/airoom) "ylJ" = ( @@ -93405,7 +93696,7 @@ poR mGL pNp kcp -bTS +pNK bIA alU uDn @@ -93813,9 +94104,9 @@ bTS lxo qcy kcp -bAg edM -egq +edM +mcl bLt bXX bKh @@ -94016,9 +94307,9 @@ oQM aqI aqI kcp -bzA -bBB -bBB +pUl +tXz +rYZ bLu bBB bBB @@ -98809,7 +99100,7 @@ vCO vCO vCO jxB -gpe +wpj gDq tJo bGr @@ -99012,9 +99303,9 @@ wmT jhW mWD jxB -fGN -dtN -gpe +hWX +tYv +mRU xuB gpe xEF @@ -99175,7 +99466,7 @@ aad aai aai pCi -lFb +nMM avl avl agj @@ -99217,7 +99508,7 @@ aES aES aES aES -gpe +lDj uEv gpe xEF @@ -99377,8 +99668,8 @@ aaa aad ahE iuT -naf -lFb +nna +svp avl agj agj @@ -99580,8 +99871,8 @@ aaa aad ahE afc -avl -lFb +npB +umY avl agj yeo @@ -104445,8 +104736,8 @@ bdH bdH aaC abw -adQ -awW +aee +avd acW awW auK @@ -104504,8 +104795,8 @@ mlz sOy baw sgU -baw -svp +xVF +njD trb aaC bdH @@ -104648,8 +104939,8 @@ bdH aaa aaY abw -adZ -awW +aec +avd acW awW avc @@ -104707,8 +104998,8 @@ fDS iLd baw sgU -baw -uvk +xVF +dLz trb aaC bdH @@ -104852,7 +105143,7 @@ aaa aaY abs adq -add +ckE ajI add fsU @@ -104910,7 +105201,7 @@ qys gBW aJU tiW -aJU +hXD pgD tQV aaY @@ -115306,7 +115597,7 @@ kxd viu nsY iIP -nna +kxd dDt nsY xiz @@ -115509,8 +115800,8 @@ vHq vvY nsY pPV -umY -npB +bxC +jiU nsY glr mhl @@ -115929,7 +116220,7 @@ aLJ eBg dAO cEG -ckE +eBg dYX tBF lBz @@ -116570,7 +116861,7 @@ bJz bdg wLV wLV -nMM +wLV wLV wLV wNT @@ -121497,7 +121788,7 @@ aag aag abh acx -aeC +adQ ajs aeC wXh @@ -121557,7 +121848,7 @@ eyG kpo vcE kUV -vcE +mvH rRq uOi aag @@ -121700,7 +121991,7 @@ aah aah abi acE -aeA +adZ ajk aeA asY @@ -121760,7 +122051,7 @@ deg wLu lJY xVS -lJY +fqg uGa uyC aah @@ -121903,7 +122194,7 @@ bdH bdH abi acT -aeA +adZ ajk aeA atp @@ -121963,7 +122254,7 @@ pfH wlF lJY xVS -lJY +fqg mIA uyC bdH @@ -130879,7 +131170,7 @@ cxo jWh uUV rsW -rsW +djN fnQ jWh lbB @@ -131081,7 +131372,7 @@ xct cxo jWh dkS -rsW +vba naQ fnQ jWh @@ -131264,7 +131555,7 @@ ptK dmQ psm psm -eky +qyH arV wZX eky @@ -131278,7 +131569,7 @@ aDQ eky wZX arV -eky +dtv vuv vuv cxo @@ -131467,7 +131758,7 @@ dmQ aeq psm aNe -eky +hiN arV wZX eky @@ -131481,7 +131772,7 @@ aHe eky wZX arV -eky +fXM aNe vuv ahb @@ -131670,7 +131961,7 @@ dmQ jXY psm atY -aMT +qkj aMT svl pzJ @@ -131684,7 +131975,7 @@ qDt pzJ sQO aMT -aMT +rWF atY vuv woM @@ -131873,7 +132164,7 @@ dmQ atD psm psm -aRp +vHl aRp jBX akS @@ -132303,7 +132594,7 @@ qMu qMu qMu euY -vME +iuw jHL wOK uIv @@ -132472,7 +132763,7 @@ cuC riJ kHY uhM -fcP +uvk xJn cuC aag @@ -132506,7 +132797,7 @@ aag aag bYn tAh -thV +bfe rDb qjV rID @@ -132709,7 +133000,7 @@ mNX qOk bYn bYn -tjj +qQL kHS rID bYn @@ -133906,7 +134197,7 @@ xVk aad jbq qtR -avu +jWC eky eky nJu @@ -133914,7 +134205,7 @@ aNl eky eky eky -aMU +aDc qtR jbq ajZ @@ -136139,7 +136430,7 @@ xVk aad jbq aNe -avu +jWC eky eky esT @@ -136147,7 +136438,7 @@ nYE orH eky eky -aMU +aDc aNe jbq ajZ @@ -136342,7 +136633,7 @@ xVk aad jbq atY -avu +jWC eky eky bAe @@ -136350,7 +136641,7 @@ aBG sGh eky eky -aMU +aDc atY jbq ajZ @@ -136545,7 +136836,7 @@ xVk aad aPw qpU -aqJ +ykD dqj eky xaS @@ -136553,7 +136844,7 @@ ejt mPf eky gUV -aqp +wKS qpU aPw ajZ @@ -139846,7 +140137,7 @@ lmz daz czG ylg -ylg +oIY daz daz daz