From b5fa7dd94f7bd14dc03f3bdcdc4dd2b05ab37f5c Mon Sep 17 00:00:00 2001 From: spartanbobby <71467726+spartanbobby@users.noreply.github.com> Date: Thu, 28 Sep 2023 03:29:42 +0100 Subject: [PATCH] USS Almayer, CL & CC Hypersleep bay, fixes symmetry issue in CIC hallway (that I broke), adds some warning stripes around for detailing, re-gigs the PO bunk area to get rid of horrible 1x3 hallway (#4510) # About the pull request Title # Explain why it's good for the game Lets shotgun this out Hypersleep: CL having his own pod was an oversight everyone should be spawning in a hypersleep bay we shouldn't have any solo pod, the CC didn't have a bay so he goes in the new bay that I made out of an old maint tunnel PO area, 1x3 hallways are really bad so I gutted it redid the room and put the vendors north-facing indented into a wall because it looks better had to remove a janitor area in the process but all the items in there got moved to the nearby maint area symmetry those hallways were meant to be symmetrical I messed up when adding the command hypersleep bay, it's my bad so I'm fixing it # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl:SpartanBobby maptweak: CL now spawns in a hypersleep bay "Passenger Bay" it's right next to his office, the CC spawns with him too since his landmark was in the latejoin bay on the lowerdeck maptweak: re-arranged PO bunks should allow for better traffic in and out maptweak: fixed symmetry issue in north-south CIC hallway maptweak: minor warning stripe decal additions around Almayer /:cl: --------- Co-authored-by: Morrow --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 5534 +++++++++++--------- 1 file changed, 3079 insertions(+), 2455 deletions(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 36fd4cb7f2a2..32937d821d60 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -1052,7 +1052,8 @@ name = "ship-grade camera" }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 4; + icon_state = "green" }, /area/almayer/living/starboard_garden) "adp" = ( @@ -1073,15 +1074,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north1) -"ads" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/north1) "adt" = ( /obj/item/reagent_container/glass/bucket/janibucket{ pixel_x = -1; @@ -1116,8 +1108,8 @@ pixel_y = -9 }, /obj/item/stock_parts/scanning_module/adv{ - pixel_y = 15; - pixel_x = 4 + pixel_x = 4; + pixel_y = 15 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -1170,8 +1162,11 @@ }, /area/almayer/hallways/aft_hallway) "adI" = ( -/obj/docking_port/stationary/escape_pod/south, -/turf/open/floor/plating, +/obj/structure/reagent_dispensers/fueltank, +/obj/structure/machinery/light/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, /area/almayer/hull/upper_hull/u_m_p) "adO" = ( /turf/closed/wall/almayer, @@ -1190,9 +1185,9 @@ /area/almayer/lifeboat_pumps/north1) "adR" = ( /obj/structure/machinery/door/airlock/almayer/generic{ + access_modified = 1; name = "\improper Pilot's Office"; - req_one_access_txt = "3;22;19"; - access_modified = 1 + req_one_access_txt = "3;22;19" }, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 8 @@ -1223,12 +1218,11 @@ }, /area/almayer/lifeboat_pumps/north1) "aea" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "mono" +/obj/structure/machinery/light{ + dir = 1 }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) "aeb" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -1241,10 +1235,9 @@ }, /area/almayer/hallways/starboard_hallway) "aec" = ( -/obj/structure/surface/table/almayer, -/obj/effect/spawner/random/tool, +/obj/structure/closet/firecloset, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "cargo" }, /area/almayer/lifeboat_pumps/north1) "aed" = ( @@ -1259,10 +1252,9 @@ }, /area/almayer/living/basketball) "aee" = ( -/obj/structure/surface/table/almayer, -/obj/effect/spawner/random/toolbox, +/obj/structure/closet/emcloset, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "cargo" }, /area/almayer/lifeboat_pumps/north1) "aef" = ( @@ -1277,11 +1269,12 @@ }, /area/almayer/living/offices/flight) "aei" = ( -/obj/structure/bed/chair{ - dir = 8 +/obj/structure/machinery/light{ + dir = 1 }, /turf/open/floor/almayer{ - icon_state = "mono" + dir = 5; + icon_state = "red" }, /area/almayer/lifeboat_pumps/north1) "aej" = ( @@ -1336,11 +1329,12 @@ /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "aex" = ( -/turf/open/floor/almayer{ - dir = 6; - icon_state = "red" +/obj/item/reagent_container/food/drinks/cans/beer{ + pixel_x = 6; + pixel_y = 12 }, -/area/almayer/shipboard/starboard_missiles) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/lifeboat_pumps/north2) "aey" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -1367,6 +1361,9 @@ /obj/structure/machinery/light{ dir = 1 }, +/obj/structure/sign/safety/rewire{ + pixel_y = 32 + }, /turf/open/floor/almayer{ icon_state = "mono" }, @@ -1378,9 +1375,9 @@ /area/almayer/lifeboat_pumps/north2) "aeD" = ( /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ + access_modified = 1; req_one_access = null; - req_one_access_txt = "2;7"; - access_modified = 1 + req_one_access_txt = "2;7" }, /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; @@ -1528,6 +1525,7 @@ }, /area/almayer/hallways/aft_hallway) "aeW" = ( +/obj/effect/decal/cleanable/dirt, /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) @@ -1654,15 +1652,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) -"afp" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "red" - }, -/area/almayer/lifeboat_pumps/north1) "afq" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -1733,16 +1722,10 @@ "afz" = ( /turf/open/floor/almayer/empty, /area/almayer/hallways/vehiclehangar) -"afA" = ( +"afB" = ( /obj/structure/machinery/light{ dir = 1 }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "red" - }, -/area/almayer/lifeboat_pumps/north1) -"afB" = ( /turf/open/floor/almayer{ dir = 9; icon_state = "red" @@ -1863,11 +1846,11 @@ }, /obj/structure/disposalpipe/segment, /obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + access_modified = 1; dir = 1; name = "\improper Particle Cannon Systems Room"; req_access = null; - req_one_access_txt = "3;19"; - access_modified = 1 + req_one_access_txt = "3;19" }, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -1882,9 +1865,6 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/starboard) -"afY" = ( -/turf/open/floor/grass, -/area/almayer/living/starboard_garden) "afZ" = ( /obj/structure/bed/chair/comfy/blue{ dir = 8 @@ -1929,16 +1909,12 @@ icon_state = "bluecorner" }, /area/almayer/living/offices/flight) -"agh" = ( -/obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/floor/grass, -/area/almayer/living/starboard_garden) "agi" = ( /obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; req_access = null; req_one_access = null; - req_one_access_txt = "3;22;19"; - access_modified = 1 + req_one_access_txt = "3;22;19" }, /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; @@ -1957,12 +1933,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/aft_hallway) -"agm" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/aft_hallway) "agn" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -2003,12 +1973,6 @@ "agu" = ( /turf/open/floor/almayer, /area/almayer/living/officer_study) -"agv" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/turf/open/floor/grass, -/area/almayer/living/starboard_garden) "agw" = ( /obj/structure/machinery/light{ dir = 8 @@ -2030,13 +1994,10 @@ /turf/open/floor/plating, /area/almayer/living/basketball) "agB" = ( -/obj/structure/flora/bush/ausbushes/var3/fullgrass, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 +/turf/open/floor/almayer{ + dir = 9; + icon_state = "red" }, -/turf/open/floor/grass, /area/almayer/living/starboard_garden) "agG" = ( /obj/structure/stairs/perspective{ @@ -2110,10 +2071,6 @@ icon_state = "test_floor4" }, /area/almayer/living/officer_study) -"agP" = ( -/obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/floor/grass, -/area/almayer/living/starboard_garden) "agQ" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ @@ -2121,12 +2078,10 @@ }, /area/almayer/living/cafeteria_officer) "agS" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" }, -/turf/open/floor/grass, /area/almayer/living/starboard_garden) "agT" = ( /turf/open/floor/prison{ @@ -2138,6 +2093,7 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) "agV" = ( @@ -2161,10 +2117,10 @@ "aha" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/almayer/command/reinforced{ + access_modified = 1; name = "\improper Commanding Officer's Quarters"; req_access = null; - req_access_txt = "31"; - access_modified = 1 + req_access_txt = "31" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -2186,11 +2142,11 @@ /area/almayer/living/cafeteria_officer) "ahd" = ( /obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; dir = 1; req_access = null; req_one_access = null; - req_one_access_txt = "3;22;19"; - access_modified = 1 + req_one_access_txt = "3;22;19" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -2248,8 +2204,10 @@ }, /area/almayer/hull/upper_hull/u_m_s) "ahl" = ( -/obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/floor/grass, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "green" + }, /area/almayer/living/starboard_garden) "ahn" = ( /obj/structure/machinery/light/small{ @@ -2267,10 +2225,6 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/living/offices/flight) -"ahp" = ( -/obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/floor/grass, -/area/almayer/living/starboard_garden) "ahq" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -2289,42 +2243,12 @@ icon_state = "green" }, /area/almayer/hallways/aft_hallway) -"ahs" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper_bin/uscm{ - pixel_y = 6 - }, -/obj/item/tool/pen, -/obj/structure/sign/safety/terminal{ - pixel_x = -17 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "aht" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_p) -"ahu" = ( -/obj/item/device/flashlight/lamp/green{ - pixel_y = 10 - }, -/obj/structure/surface/table/almayer, -/obj/item/trash/uscm_mre{ - pixel_x = 7; - pixel_y = 4 - }, -/obj/item/reagent_container/food/snacks/mre_pack/meal1{ - pixel_x = -13; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "ahv" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -2340,19 +2264,17 @@ /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "ahx" = ( -/obj/structure/closet, -/obj/item/clothing/under/marine/engineer, -/turf/open/floor/almayer{ - icon_state = "plate" - }, +/obj/structure/window/framed/almayer/hull, +/turf/open/floor/plating, /area/almayer/hull/upper_hull/u_m_s) "ahy" = ( -/obj/structure/closet, -/obj/item/clothing/under/marine, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 }, -/area/almayer/hull/upper_hull/u_m_s) +/turf/closed/wall/almayer, +/area/almayer/living/starboard_garden) "ahz" = ( /obj/structure/machinery/light{ dir = 1 @@ -2375,12 +2297,6 @@ /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, /area/almayer/hull/upper_hull/u_f_s) -"ahF" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/aft_hallway) "ahG" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ dir = 2; @@ -2420,11 +2336,9 @@ }, /area/almayer/hallways/aft_hallway) "ahN" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) +/obj/structure/flora/bush/ausbushes/var3/ywflowers, +/turf/open/floor/grass, +/area/almayer/living/starboard_garden) "ahR" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -2456,18 +2370,6 @@ icon_state = "bluecorner" }, /area/almayer/living/offices/flight) -"ahW" = ( -/obj/structure/surface/rack, -/obj/item/tool/extinguisher/mini{ - pixel_x = -4 - }, -/obj/item/tool/extinguisher/mini{ - pixel_x = 6 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "ahX" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -2520,9 +2422,9 @@ "aib" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ + access_modified = 1; req_one_access = null; - req_one_access_txt = "7;19"; - access_modified = 1 + req_one_access_txt = "7;19" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -2683,6 +2585,13 @@ "aiw" = ( /turf/open/floor/almayer, /area/almayer/engineering/starboard_atmos) +"aiy" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 3 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/starboard_hallway) "aiz" = ( /obj/structure/closet, /obj/item/clothing/under/marine, @@ -2724,12 +2633,10 @@ /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "aiH" = ( -/obj/item/tool/crew_monitor, -/obj/structure/surface/rack, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hull/upper_hull/u_m_s) +/area/almayer/living/starboard_garden) "aiJ" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Down3"; @@ -2741,14 +2648,11 @@ }, /area/almayer/stair_clone/upper) "aiP" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/structure/largecrate/random, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 4; + icon_state = "red" }, -/area/almayer/hull/upper_hull/u_m_s) +/area/almayer/living/starboard_garden) "aiQ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/faxmachine, @@ -2774,6 +2678,9 @@ /obj/structure/closet, /obj/item/device/flashlight/pen, /obj/item/attachable/reddot, +/obj/structure/machinery/light/small{ + dir = 1 + }, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -2789,6 +2696,7 @@ "aiU" = ( /obj/structure/surface/table/almayer, /obj/item/card/id/visa, +/obj/item/tool/crew_monitor, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -2970,7 +2878,10 @@ /area/almayer/hallways/aft_hallway) "ajD" = ( /obj/structure/surface/table/almayer, -/obj/effect/spawner/random/tool, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 8 + }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) "ajE" = ( @@ -3139,6 +3050,7 @@ /area/almayer/hull/upper_hull/u_a_s) "ake" = ( /obj/structure/largecrate/random/barrel/white, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -3151,25 +3063,21 @@ }, /area/almayer/shipboard/weapon_room) "akk" = ( -/obj/structure/window/reinforced/tinted/frosted, -/obj/structure/mirror{ - pixel_x = -28 - }, -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 +/obj/structure/machinery/door/window/westright{ + dir = 4 }, -/turf/open/floor/almayer{ - icon_state = "sterile" +/obj/structure/machinery/shower{ + dir = 4 }, +/obj/structure/window/reinforced, +/turf/open/floor/plating/plating_catwalk, /area/almayer/living/commandbunks) "akl" = ( /obj/structure/machinery/light{ dir = 1 }, /turf/open/floor/almayer{ - icon_state = "sterile" + icon_state = "dark_sterile" }, /area/almayer/living/commandbunks) "akm" = ( @@ -3444,20 +3352,22 @@ }, /area/almayer/hallways/starboard_hallway) "akY" = ( -/obj/effect/step_trigger/message/memorial, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/cable/heavyduty{ + icon_state = "4-8" }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/living/starboard_garden) "alb" = ( -/obj/structure/machinery/door/window/westright{ - dir = 4 +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 }, -/obj/structure/machinery/shower{ - dir = 4 +/obj/structure/mirror{ + pixel_x = -28 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "dark_sterile" }, /area/almayer/living/commandbunks) "alc" = ( @@ -3465,7 +3375,7 @@ dir = 8 }, /turf/open/floor/almayer{ - icon_state = "sterile" + icon_state = "dark_sterile" }, /area/almayer/living/commandbunks) "ald" = ( @@ -3477,29 +3387,29 @@ /obj/structure/machinery/light{ dir = 4 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/bed/chair{ + dir = 8 }, +/turf/open/floor/almayer, /area/almayer/living/starboard_garden) "alf" = ( -/obj/structure/machinery/light/small{ +/obj/structure/machinery/light{ dir = 8 }, -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/atmos_alert{ - dir = 4; - pixel_y = 5 +/obj/structure/bed/chair{ + dir = 4 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hull/upper_hull/u_m_s) +/area/almayer/living/starboard_garden) "alg" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 +/obj/structure/flora/bush/ausbushes/ppflowers, +/obj/structure/bed/chair{ + dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_m_s) +/turf/open/floor/grass, +/area/almayer/living/starboard_garden) "ali" = ( /turf/open/floor/almayer{ dir = 8; @@ -3559,15 +3469,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/aft_hallway) -"alr" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/obj/structure/largecrate/random/barrel/green, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "als" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -3717,10 +3618,27 @@ }, /area/almayer/command/cic) "amb" = ( +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/obj/structure/machinery/shower{ + dir = 1 + }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/pilotbunks) "amd" = ( -/turf/open/floor/almayer, +/obj/structure/machinery/vending/cola{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, /area/almayer/living/pilotbunks) "amg" = ( /turf/open/floor/plating/plating_catwalk, @@ -3951,7 +3869,11 @@ pixel_x = -17; pixel_y = 7 }, -/obj/structure/machinery/cm_vending/clothing/pilot_officer, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/structure/machinery/disposal, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -3972,7 +3894,17 @@ }, /area/almayer/hallways/aft_hallway) "and" = ( -/obj/effect/landmark/yautja_teleport, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/obj/structure/machinery/shower{ + dir = 1 + }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/pilotbunks) "anf" = ( @@ -4198,6 +4130,8 @@ /obj/structure/surface/table/almayer, /obj/item/clipboard, /obj/item/tool/pen, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/tool, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) "anO" = ( @@ -4320,14 +4254,6 @@ "aoi" = ( /turf/open/floor/almayer, /area/almayer/shipboard/navigation) -"aok" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/emails, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/shipboard/starboard_missiles) "aol" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -4615,13 +4541,10 @@ }, /area/almayer/hallways/stern_hallway) "aoV" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ - dir = 10; - icon_state = "red" + icon_state = "test_floor4" }, /area/almayer/lifeboat_pumps/north1) "aoW" = ( @@ -4743,21 +4666,15 @@ /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) "apq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "plate" }, /area/almayer/living/pilotbunks) "apr" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, +/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ - dir = 6; - icon_state = "red" + icon_state = "test_floor4" }, /area/almayer/lifeboat_pumps/north1) "aps" = ( @@ -4774,9 +4691,15 @@ /obj/structure/machinery/power/apc/almayer{ dir = 1 }, -/turf/open/floor/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, /area/almayer/living/pilotbunks) "apu" = ( +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, /turf/open/floor/almayer{ dir = 10; icon_state = "red" @@ -4834,12 +4757,6 @@ icon_state = "orange" }, /area/almayer/hallways/hangar) -"apF" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/grass, -/area/almayer/living/starboard_garden) "apI" = ( /obj/structure/machinery/door/airlock/almayer/command{ dir = 2; @@ -4902,8 +4819,8 @@ dir = 1 }, /obj/structure/pipes/vents/pump/no_boom{ - welded = 1; - name = "Secure Reinforced Air Vent" + name = "Secure Reinforced Air Vent"; + welded = 1 }, /turf/open/floor/almayer{ icon_state = "sterile_green" @@ -5070,10 +4987,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering) -"aqi" = ( -/obj/structure/prop/almayer/ship_memorial, -/turf/open/floor/plating/almayer, -/area/almayer/living/starboard_garden) "aqj" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -5084,7 +4997,11 @@ /turf/open/floor/plating, /area/almayer/engineering/upper_engineering) "aqk" = ( -/turf/open/floor/plating/almayer, +/obj/structure/sign/safety/escapepod{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/almayer, /area/almayer/living/starboard_garden) "aqm" = ( /obj/item/bedsheet/brown, @@ -5139,9 +5056,11 @@ /turf/open/floor/almayer, /area/almayer/shipboard/weapon_room) "aqw" = ( -/obj/structure/machinery/cm_vending/clothing/pilot_officer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "mono" }, /area/almayer/living/pilotbunks) "aqx" = ( @@ -5158,16 +5077,16 @@ }, /area/almayer/hallways/starboard_hallway) "aqy" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera"; - pixel_x = 27; - pixel_y = -27 - }, /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 }, -/turf/open/floor/almayer, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, /area/almayer/living/pilotbunks) "aqz" = ( /obj/structure/machinery/door/airlock/almayer/generic{ @@ -5317,12 +5236,6 @@ "arb" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/morgue) -"arc" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/grass, -/area/almayer/living/starboard_garden) "ard" = ( /obj/structure/filingcabinet, /obj/item/folder/yellow, @@ -5433,13 +5346,13 @@ }, /area/almayer/hallways/starboard_hallway) "arp" = ( -/obj/item/roller, -/obj/item/roller, -/obj/structure/surface/rack, +/obj/structure/bed/chair{ + dir = 4 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hull/upper_hull/u_m_s) +/area/almayer/living/starboard_garden) "arq" = ( /obj/structure/bed/chair{ dir = 4 @@ -5468,13 +5381,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering) -"aru" = ( -/obj/structure/surface/table/almayer, -/obj/item/weapon/gun/rifle/m41a/stripped, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "arw" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/junction{ @@ -5485,21 +5391,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering) -"ary" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/wrench, -/obj/item/reagent_container/food/drinks/cans/souto/cherry{ - pixel_x = 4; - pixel_y = 14 - }, -/obj/item/attachable/lasersight{ - pixel_x = -14; - pixel_y = 12 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "arz" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ @@ -5556,14 +5447,6 @@ icon_state = "redfull" }, /area/almayer/engineering/upper_engineering) -"arI" = ( -/obj/structure/closet, -/obj/item/clothing/under/marine/mp, -/obj/item/device/flash, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "arJ" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -5647,18 +5530,20 @@ /area/almayer/command/cic) "ase" = ( /turf/open/floor/almayer{ - icon_state = "sterile" + icon_state = "cargo" }, /area/almayer/living/pilotbunks) "asf" = ( -/obj/structure/machinery/shower{ - dir = 8 +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/obj/structure/window/reinforced/tinted/frosted, -/obj/structure/machinery/door/window/westright, -/obj/item/tool/soap, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "dark_sterile" }, /area/almayer/living/pilotbunks) "asi" = ( @@ -5841,10 +5726,10 @@ /area/almayer/engineering/engineering_workshop/hangar) "asF" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ + access_modified = 1; name = "\improper AI Reception"; req_access = null; - req_one_access_txt = "91;92"; - access_modified = 1 + req_one_access_txt = "91;92" }, /turf/open/floor/almayer/no_build{ icon_state = "ai_floors" @@ -5952,11 +5837,8 @@ }, /area/almayer/command/cic) "asS" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/starboard_garden) "asT" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, @@ -6219,11 +6101,11 @@ /area/almayer/hull/upper_hull/u_a_s) "atA" = ( /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ + access_modified = 1; dir = 1; name = "\improper Spare Bomb Suit"; req_one_access = null; - req_one_access_txt = "35"; - access_modified = 1 + req_one_access_txt = "35" }, /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) @@ -6344,24 +6226,19 @@ icon_state = "test_floor4" }, /area/almayer/command/cic) -"atS" = ( -/obj/structure/machinery/light, -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/turf/open/floor/almayer{ - icon_state = "sterile" - }, -/area/almayer/living/pilotbunks) "atT" = ( /obj/structure/toilet{ - dir = 8 + dir = 1 }, -/turf/open/floor/almayer{ - icon_state = "sterile" +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/living/pilotbunks) "atU" = ( /obj/structure/machinery/status_display{ @@ -6383,6 +6260,11 @@ icon_state = "blue" }, /area/almayer/hallways/aft_hallway) +"atW" = ( +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/lifeboat_pumps/north1) "atY" = ( /obj/structure/closet/emcloset, /obj/item/clothing/mask/gas, @@ -6411,11 +6293,18 @@ /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) "aub" = ( -/obj/structure/machinery/vending/cigarette, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, /turf/open/floor/almayer{ - icon_state = "mono" + dir = 9; + icon_state = "red" }, -/area/almayer/lifeboat_pumps/south1) +/area/almayer/lifeboat_pumps/north1) "auc" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -6724,10 +6613,10 @@ dir = 2 }, /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ + access_modified = 1; dir = 2; name = "Telecommunications"; - req_access_txt = "6"; - access_modified = 1 + req_access_txt = "6" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -6866,12 +6755,11 @@ }, /area/almayer/engineering/engineering_workshop/hangar) "auZ" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, /obj/structure/machinery/light, -/turf/open/floor/almayer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, /area/almayer/living/pilotbunks) "ava" = ( /obj/effect/decal/warning_stripes{ @@ -6910,10 +6798,11 @@ /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) "avd" = ( -/obj/item/tool/warning_cone, -/turf/open/floor/almayer{ - icon_state = "mono" +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, +/turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) "ave" = ( /obj/item/reagent_container/glass/bucket/janibucket, @@ -6945,10 +6834,10 @@ /area/almayer/hallways/aft_hallway) "avk" = ( /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ + access_modified = 1; dir = 1; req_one_access = null; - req_one_access_txt = "35"; - access_modified = 1 + req_one_access_txt = "35" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -7003,19 +6892,11 @@ /turf/open/floor/plating, /area/almayer/shipboard/weapon_room) "avx" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - pixel_y = 8 - }, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - pixel_x = -16; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - icon_state = "mono" +/obj/structure/machinery/light{ + dir = 1 }, -/area/almayer/lifeboat_pumps/north1) +/turf/open/floor/grass, +/area/almayer/living/starboard_garden) "avz" = ( /obj/structure/machinery/light, /obj/structure/machinery/vending/security, @@ -7069,16 +6950,15 @@ }, /area/almayer/medical/containment) "avJ" = ( -/obj/item/clothing/head/helmet/marine{ - pixel_x = 16; - pixel_y = 6 +/obj/structure/machinery/door/airlock/almayer/secure/reinforced{ + dir = 2; + name = "\improper Evacuation Airlock SU-5"; + req_access = null }, -/obj/item/reagent_container/food/snacks/grown/poppy, -/obj/effect/step_trigger/message/memorial, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/living/starboard_garden) +/area/almayer/powered) "avK" = ( /turf/open/floor/almayer/no_build{ icon_state = "ai_floors" @@ -7194,14 +7074,11 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/pilotbunks) "avV" = ( -/obj/item/reagent_container/food/snacks/grown/poppy{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/effect/step_trigger/message/memorial, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/machinery/power/apc/almayer{ + dir = 1 }, +/obj/structure/bed/chair, +/turf/open/floor/grass, /area/almayer/living/starboard_garden) "avW" = ( /obj/structure/surface/table/reinforced/prison, @@ -7236,12 +7113,12 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/command/cic) "avZ" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 +/obj/structure/flora/bush/ausbushes/var3/fullgrass, +/obj/structure/machinery/light{ + dir = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/lifeboat_pumps/south1) +/turf/open/floor/grass, +/area/almayer/living/starboard_garden) "awa" = ( /turf/open/shuttle/dropship{ icon_state = "rasputin15" @@ -7260,32 +7137,16 @@ /turf/closed/wall/almayer/reinforced, /area/almayer/living/pilotbunks) "awe" = ( -/obj/structure/surface/table/almayer, -/obj/item/prop/helmetgarb/gunoil{ - pixel_x = -6; - pixel_y = 9 - }, -/obj/item/tool/screwdriver{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/structure/machinery/light/small{ +/turf/open/floor/plating/almayer, +/area/almayer/living/starboard_garden) +"awi" = ( +/obj/structure/bed/chair{ dir = 8 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hull/upper_hull/u_m_s) -"awh" = ( -/obj/item/stool, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_m_s) -"awi" = ( -/obj/structure/closet/fireaxecabinet{ - pixel_y = 32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_m_s) +/area/almayer/living/starboard_garden) "awj" = ( /obj/structure/machinery/photocopier, /obj/structure/sign/safety/terminal{ @@ -7336,7 +7197,9 @@ /obj/structure/machinery/light{ dir = 1 }, -/turf/open/floor/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, /area/almayer/living/pilotbunks) "awt" = ( /turf/open/floor/almayer{ @@ -7402,11 +7265,11 @@ /area/almayer/command/cic) "awB" = ( /obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; dir = 1; name = "\improper Engineering Storage"; req_one_access = null; - req_one_access_txt = "2;7"; - access_modified = 1 + req_one_access_txt = "2;7" }, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -7523,10 +7386,13 @@ /area/almayer/living/pilotbunks) "awZ" = ( /obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/computer/emails{ - dir = 1 +/obj/item/paper_bin/uscm{ + pixel_x = 8; + pixel_y = 12 + }, +/turf/open/floor/almayer{ + icon_state = "bluefull" }, -/turf/open/floor/almayer, /area/almayer/living/pilotbunks) "axa" = ( /turf/open/shuttle/dropship{ @@ -7614,9 +7480,11 @@ icon_state = "NW-out"; layer = 2.5 }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "green" + icon_state = "test_floor4" }, /area/almayer/hallways/aft_hallway) "axu" = ( @@ -8055,12 +7923,11 @@ }, /area/almayer/command/cic) "ayP" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/storage/bible, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/living/bridgebunks) +/area/almayer/hull/upper_hull/u_f_s) "ayQ" = ( /obj/structure/platform_decoration{ dir = 4 @@ -8669,11 +8536,11 @@ /area/almayer/command/cic) "aAG" = ( /obj/structure/machinery/door/airlock/almayer/medical{ + access_modified = 1; dir = 2; name = "Morgue"; req_access_txt = "25"; - req_one_access = null; - access_modified = 1 + req_one_access = null }, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -8814,9 +8681,9 @@ /area/almayer/medical/containment/cell) "aBf" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ + access_modified = 1; name = "Telecommunications"; - req_access_txt = "6"; - access_modified = 1 + req_access_txt = "6" }, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 8 @@ -9053,9 +8920,9 @@ /area/almayer/hull/upper_hull/u_f_p) "aBP" = ( /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ + access_modified = 1; dir = 1; - req_one_access = list(36); - access_modified = 1 + req_one_access = list(36) }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -10070,9 +9937,9 @@ name = "\improper Brig Lockdown Shutter" }, /obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; dir = 2; - req_one_access = list(2,34,30); - access_modified = 1 + req_one_access = list(2,34,30) }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -10108,6 +9975,16 @@ icon_state = "plate" }, /area/almayer/command/cichallway) +"aGc" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 2 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "green" + }, +/area/almayer/hallways/port_hallway) "aGd" = ( /turf/open/floor/almayer{ dir = 8; @@ -10215,26 +10092,25 @@ }, /area/almayer/hallways/aft_hallway) "aGP" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "red" }, -/area/almayer/hull/upper_hull/u_f_p) +/area/almayer/lifeboat_pumps/north1) "aGQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/almayer/maint{ - req_one_access = null; - req_one_access_txt = "2;30;34" +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 9; + icon_state = "red" }, -/area/almayer/hull/upper_hull/u_f_p) +/area/almayer/lifeboat_pumps/north1) "aGR" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -10312,7 +10188,13 @@ /obj/structure/mirror{ pixel_y = 21 }, -/turf/open/floor/almayer, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, /area/almayer/living/numbertwobunks) "aHl" = ( /obj/structure/machinery/portable_atmospherics/canister/air, @@ -10324,9 +10206,7 @@ }, /obj/structure/machinery/door/window/westleft, /obj/structure/window/reinforced/tinted/frosted, -/turf/open/floor/almayer{ - icon_state = "mono" - }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/living/numbertwobunks) "aHo" = ( /obj/structure/machinery/computer/working_joe{ @@ -10380,12 +10260,12 @@ pixel_y = 1 }, /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ + access_modified = 1; dir = 1; name = "\improper Engineering Storage"; no_panel = 1; req_one_access = null; - req_one_access_txt = "2;7"; - access_modified = 1 + req_one_access_txt = "2;7" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -10400,12 +10280,12 @@ pixel_y = 1 }, /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ + access_modified = 1; dir = 1; name = "\improper Engineering Storage"; no_panel = 1; req_one_access = null; - req_one_access_txt = "2;7"; - access_modified = 1 + req_one_access_txt = "2;7" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -10491,13 +10371,12 @@ }, /area/almayer/living/numbertwobunks) "aHY" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 24 }, -/obj/structure/machinery/disposal, /turf/open/floor/almayer{ - dir = 8; - icon_state = "red" + icon_state = "cargo" }, /area/almayer/shipboard/starboard_missiles) "aHZ" = ( @@ -10598,16 +10477,13 @@ }, /area/almayer/lifeboat_pumps/north1) "aIx" = ( -/obj/item/tool/weldpack, -/obj/structure/surface/rack, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/north1) +/obj/structure/flora/bush/ausbushes/ppflowers, +/turf/open/floor/grass, +/area/almayer/living/starboard_garden) "aIB" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/north1) +/obj/structure/flora/bush/ausbushes/var3/fullgrass, +/turf/open/floor/grass, +/area/almayer/living/starboard_garden) "aIC" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/warning_stripes{ @@ -10655,10 +10531,10 @@ "aIQ" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/almayer/command/reinforced{ + access_modified = 1; name = "\improper XO's Quarters"; req_access = null; - req_access_txt = "1"; - access_modified = 1 + req_access_txt = "1" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -10683,10 +10559,10 @@ dir = 2 }, /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ + access_modified = 1; dir = 2; name = "Telecommunications"; - req_access_txt = "6"; - access_modified = 1 + req_access_txt = "6" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -10928,18 +10804,20 @@ }, /area/almayer/command/cic) "aJJ" = ( -/obj/item/tool/screwdriver, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/north1) +/obj/structure/flora/bush/ausbushes/var3/brflowers, +/obj/structure/bed/chair, +/turf/open/floor/grass, +/area/almayer/living/starboard_garden) "aJL" = ( -/obj/structure/surface/rack, -/obj/item/frame/rack{ - pixel_y = 19 - }, -/turf/open/floor/almayer{ - icon_state = "mono" +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/snacks/mre_pack/meal5, +/obj/item/device/flashlight/lamp{ + pixel_x = 3; + pixel_y = 12 }, -/area/almayer/lifeboat_pumps/north1) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_m_s) "aJM" = ( /obj/docking_port/stationary/escape_pod/east, /turf/open/floor/plating, @@ -10949,22 +10827,9 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) -"aJW" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/starboard_garden) "aKa" = ( /turf/open/floor/almayer, /area/almayer/command/cichallway) -"aKc" = ( -/obj/item/stack/cable_coil, -/obj/structure/surface/rack, -/obj/item/attachable/flashlight/grip, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "aKf" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -10976,12 +10841,9 @@ }, /area/almayer/command/cichallway) "aKg" = ( -/obj/structure/surface/rack, -/obj/item/device/multitool, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) +/obj/structure/flora/bush/ausbushes/var3/brflowers, +/turf/open/floor/grass, +/area/almayer/living/starboard_garden) "aKi" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -11135,19 +10997,28 @@ }, /area/almayer/command/cic) "aKG" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/extinguisher, -/obj/item/tool/crowbar, -/turf/open/floor/almayer, +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, /area/almayer/living/pilotbunks) "aKH" = ( -/obj/structure/janitorialcart, -/obj/item/tool/mop, -/obj/structure/machinery/light/small{ - dir = 1 +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "dark_sterile" }, /area/almayer/living/pilotbunks) "aKI" = ( @@ -11267,14 +11138,24 @@ pixel_x = 8; pixel_y = -26 }, -/obj/structure/surface/rack, -/turf/open/floor/almayer, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, /area/almayer/living/numbertwobunks) "aLt" = ( -/obj/structure/toilet{ - dir = 8 +/obj/structure/surface/rack, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" }, -/turf/open/floor/almayer, /area/almayer/living/numbertwobunks) "aLB" = ( /turf/closed/wall/almayer, @@ -12046,7 +11927,7 @@ "aPm" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "cargo" }, /area/almayer/hallways/aft_hallway) "aPn" = ( @@ -12228,6 +12109,8 @@ "aQs" = ( /obj/structure/surface/table/almayer, /obj/item/tool/extinguisher, +/obj/item/tool/extinguisher, +/obj/item/tool/crowbar, /turf/open/floor/almayer{ dir = 10; icon_state = "orange" @@ -12500,11 +12383,11 @@ /area/almayer/living/captain_mess) "aRF" = ( /obj/structure/machinery/door/airlock/almayer/medical{ + access_modified = 1; dir = 2; name = "Morgue Processing"; req_access_txt = "25"; - req_one_access = null; - access_modified = 1 + req_one_access = null }, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -12647,10 +12530,6 @@ }, /area/almayer/medical/hydroponics) "aSo" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; pixel_x = -1 @@ -12658,6 +12537,9 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/hydroponics) "aSq" = ( @@ -13484,17 +13366,29 @@ }, /area/almayer/hallways/aft_hallway) "aWm" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 5; + icon_state = "red" }, -/area/almayer/lifeboat_pumps/south1) +/area/almayer/lifeboat_pumps/north1) "aWn" = ( -/obj/structure/bed/chair/comfy/teal, +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ - icon_state = "mono" + dir = 6; + icon_state = "red" }, -/area/almayer/lifeboat_pumps/south1) +/area/almayer/lifeboat_pumps/north1) "aWo" = ( /obj/structure/pipes/unary/outlet_injector, /turf/open/floor/engine, @@ -13516,16 +13410,13 @@ /turf/open/floor/plating, /area/almayer/engineering/lower_engineering) "aWs" = ( -/obj/structure/surface/rack, -/obj/effect/spawner/random/tool, -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 +/obj/structure/machinery/power/apc/almayer{ + dir = 4 }, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "plate" }, -/area/almayer/lifeboat_pumps/north1) +/area/almayer/hull/upper_hull/u_m_s) "aWt" = ( /obj/structure/machinery/vending/coffee, /obj/structure/sign/safety/coffee{ @@ -13537,12 +13428,13 @@ }, /area/almayer/living/bridgebunks) "aWu" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" +/obj/structure/sign/safety/escapepod{ + pixel_x = 8; + pixel_y = -32 }, /turf/open/floor/almayer{ - icon_state = "mono" + dir = 6; + icon_state = "red" }, /area/almayer/lifeboat_pumps/north1) "aWw" = ( @@ -13808,35 +13700,23 @@ /turf/open/floor/plating, /area/almayer/command/corporateliason) "aYq" = ( -/obj/item/tool/warning_cone{ - pixel_x = -12; - pixel_y = 16 - }, /turf/open/floor/almayer{ - icon_state = "mono" + dir = 6; + icon_state = "red" }, -/area/almayer/lifeboat_pumps/north1) +/area/almayer/living/starboard_garden) "aYr" = ( -/obj/structure/surface/rack, -/obj/item/frame/rack{ - layer = 3.1; - pixel_y = 19 - }, -/obj/item/reagent_container/food/snacks/cracker, -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 +/obj/structure/bed/chair/office/dark{ + dir = 8 }, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "plate" }, -/area/almayer/lifeboat_pumps/north1) +/area/almayer/hull/upper_hull/u_m_s) "aYs" = ( -/obj/structure/machinery/light{ - dir = 8 - }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 10; + icon_state = "red" }, /area/almayer/living/starboard_garden) "aYt" = ( @@ -13851,10 +13731,6 @@ }, /area/almayer/hallways/hangar) "aYz" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, /obj/structure/closet/firecloset, /turf/open/floor/almayer{ icon_state = "cargo" @@ -13904,12 +13780,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) -"aYM" = ( -/obj/structure/largecrate/supply/supplies/tables_racks, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "aYO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -14258,6 +14128,9 @@ pixel_x = 8; pixel_y = -32 }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) "bat" = ( @@ -14597,18 +14470,14 @@ }, /area/almayer/hallways/starboard_hallway) "bbV" = ( -/obj/structure/largecrate/random/secure, -/obj/item/reagent_container/food/drinks/cans/beer{ - pixel_x = 6; - pixel_y = 12 - }, -/turf/open/floor/almayer{ - icon_state = "mono" +/obj/structure/machinery/light{ + dir = 8 }, -/area/almayer/lifeboat_pumps/north2) +/turf/open/floor/almayer, +/area/almayer/shipboard/starboard_missiles) "bbX" = ( -/obj/structure/machinery/constructable_frame, /obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/constructable_frame, /turf/open/floor/almayer{ icon_state = "mono" }, @@ -14620,11 +14489,11 @@ }, /area/almayer/squads/alpha) "bbZ" = ( -/obj/structure/machinery/constructable_frame, -/turf/open/floor/almayer{ - icon_state = "mono" +/obj/structure/bed/chair{ + dir = 1 }, -/area/almayer/lifeboat_pumps/north2) +/turf/open/floor/almayer, +/area/almayer/shipboard/starboard_missiles) "bca" = ( /obj/structure/machinery/cm_vending/gear/smartgun, /obj/structure/sign/safety/hazard{ @@ -15446,6 +15315,13 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"bfP" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer, +/area/almayer/hull/upper_hull/u_f_p) "bfV" = ( /obj/structure/machinery/landinglight/ds2{ dir = 8 @@ -15863,11 +15739,11 @@ /area/almayer/hallways/aft_hallway) "biu" = ( /obj/structure/machinery/door/airlock/almayer/medical/glass{ + access_modified = 1; dir = 2; name = "\improper Chemistry Laboratory"; req_access_txt = "20"; - req_one_access = null; - access_modified = 1 + req_one_access = null }, /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -15929,17 +15805,19 @@ }, /area/almayer/lifeboat_pumps/north2) "biT" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "red" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) +/area/almayer/living/starboard_garden) "biV" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) +/turf/open/floor/plating, +/area/almayer/living/starboard_garden) "bja" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/secure_data{ @@ -16031,8 +15909,7 @@ "bjJ" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" + dir = 4 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/aft_hallway) @@ -16148,11 +16025,11 @@ dir = 2 }, /obj/structure/machinery/door/airlock/almayer/medical/glass{ + access_modified = 1; dir = 2; name = "\improper Nurse Office"; req_access_txt = "20"; - req_one_access = null; - access_modified = 1 + req_one_access = null }, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -16353,11 +16230,11 @@ /area/almayer/living/offices) "blq" = ( /obj/structure/machinery/door/airlock/almayer/security/glass{ + access_modified = 1; dir = 2; name = "Firing Range"; req_access = null; - req_one_access_txt = "2;4;7;9;21"; - access_modified = 1 + req_one_access_txt = "2;4;7;9;21" }, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -16771,6 +16648,12 @@ icon_state = "orange" }, /area/almayer/squads/bravo) +"bny" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/north1) "bnA" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -16868,6 +16751,17 @@ icon_state = "plate" }, /area/almayer/squads/bravo) +"bnZ" = ( +/obj/structure/surface/table/almayer, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 8 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/south1) "bob" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -16995,12 +16889,7 @@ /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop) "boL" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, +/turf/open/floor/almayer, /area/almayer/living/starboard_garden) "boN" = ( /obj/structure/surface/table/almayer, @@ -17086,11 +16975,11 @@ dir = 2 }, /obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + access_modified = 1; dir = 1; name = "\improper Particle Cannon Systems Room"; req_access = null; - req_one_access_txt = "3;19"; - access_modified = 1 + req_one_access_txt = "3;19" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -17323,9 +17212,9 @@ }, /area/almayer/hallways/hangar) "bqG" = ( -/obj/structure/largecrate/supply/supplies/flares, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 6; + icon_state = "silver" }, /area/almayer/hull/upper_hull/u_m_p) "bqH" = ( @@ -18240,10 +18129,7 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) "bvl" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/command/corporateliason) "bvr" = ( @@ -18328,6 +18214,10 @@ }, /area/almayer/hallways/starboard_umbilical) "bvU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, /obj/structure/machinery/door/airlock/almayer/generic{ dir = 2; name = "\improper Liasion's Bathroom" @@ -18800,18 +18690,13 @@ /obj/structure/bed/chair/office/dark{ dir = 8 }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, /turf/open/floor/almayer, /area/almayer/command/corporateliason) "byq" = ( /obj/structure/machinery/light{ dir = 4 }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/command/corporateliason) "byr" = ( @@ -18992,19 +18877,18 @@ /obj/structure/machinery/door/window/westright, /obj/structure/window/reinforced/tinted/frosted, /obj/item/tool/soap/deluxe, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/command/corporateliason) "bzy" = ( /turf/closed/wall/almayer, /area/almayer/hallways/vehiclehangar) "bzz" = ( -/obj/item/stack/sheet/metal, -/turf/open/floor/almayer{ - icon_state = "mono" +/obj/structure/disposalpipe/trunk{ + dir = 4 }, -/area/almayer/lifeboat_pumps/north1) +/obj/structure/machinery/disposal, +/turf/open/floor/almayer, +/area/almayer/shipboard/starboard_missiles) "bzA" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -19309,7 +19193,7 @@ "bAX" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "cargo" }, /area/almayer/hallways/starboard_hallway) "bAY" = ( @@ -19501,14 +19385,11 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/vehiclehangar) "bBC" = ( -/obj/structure/disposalpipe/segment{ +/obj/structure/bed/chair{ dir = 4 }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "green" - }, -/area/almayer/hallways/aft_hallway) +/turf/open/floor/grass, +/area/almayer/living/starboard_garden) "bBD" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -19577,11 +19458,11 @@ dir = 2 }, /obj/structure/machinery/door/airlock/almayer/security{ + access_modified = 1; dir = 2; name = "\improper Security Checkpoint"; req_access = null; - req_one_access_txt = "3;19"; - access_modified = 1 + req_one_access_txt = "3;19" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -19827,6 +19708,20 @@ icon_state = "plate" }, /area/almayer/shipboard/weapon_room) +"bDe" = ( +/obj/structure/surface/table/almayer, +/obj/item/circuitboard{ + pixel_x = 12; + pixel_y = 7 + }, +/obj/item/tool/crowbar{ + pixel_x = 6; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_p) "bDn" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/closed/wall/almayer, @@ -19862,9 +19757,7 @@ /obj/structure/bed/chair{ dir = 8 }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, +/turf/open/floor/almayer, /area/almayer/living/starboard_garden) "bDF" = ( /obj/structure/machinery/door/poddoor/almayer{ @@ -19887,10 +19780,10 @@ /area/almayer/hallways/hangar) "bDL" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/almayer{ + access_modified = 1; dir = 1; name = "\improper Auxiliary Combat Support Secondary Preparations"; - req_one_access = "19;27;22"; - access_modified = 1 + req_one_access = "19;27;22" }, /turf/open/floor/almayer{ icon_state = "plate" @@ -20802,11 +20695,11 @@ }, /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + access_modified = 1; dir = 1; name = "\improper Particle Cannon Systems Room"; req_access = null; - req_one_access_txt = "3;19"; - access_modified = 1 + req_one_access_txt = "3;19" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -21076,9 +20969,9 @@ "bIu" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/almayer/generic{ + access_modified = 1; name = "Storage"; - req_one_access = "2;21"; - access_modified = 1 + req_one_access = "2;21" }, /turf/open/floor/almayer{ icon_state = "plate" @@ -21274,10 +21167,10 @@ /area/almayer/engineering/lower_engineering) "bJl" = ( /obj/structure/machinery/door/airlock/almayer/generic{ + access_modified = 1; dir = 1; name = "\improper Auxiliary Support Officers Quarters"; - req_one_access_txt = "37"; - access_modified = 1 + req_one_access_txt = "37" }, /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -21462,11 +21355,11 @@ }, /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + access_modified = 1; dir = 1; name = "\improper Particle Cannon Systems Room"; req_access = null; - req_one_access_txt = "7;19"; - access_modified = 1 + req_one_access_txt = "7;19" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -21940,7 +21833,7 @@ /area/almayer/shipboard/weapon_room) "bLO" = ( /obj/structure/bed/chair{ - dir = 1 + dir = 8 }, /turf/open/floor/grass, /area/almayer/living/starboard_garden) @@ -23993,8 +23886,15 @@ }, /area/almayer/hallways/port_hallway) "bUA" = ( -/obj/docking_port/stationary/escape_pod/north, -/turf/open/floor/plating, +/obj/structure/surface/table/almayer, +/obj/item/tool/screwdriver, +/obj/item/prop/helmetgarb/gunoil{ + pixel_x = -7; + pixel_y = 12 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, /area/almayer/hull/upper_hull/u_m_s) "bUE" = ( /turf/open/floor/almayer{ @@ -24318,15 +24218,16 @@ }, /area/almayer/shipboard/port_point_defense) "bWd" = ( -/obj/structure/machinery/door/airlock/almayer/secure/reinforced{ - dir = 2; - name = "\improper Evacuation Airlock SU-6"; - req_access = null +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/bed/chair{ + dir = 8 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/powered) +/area/almayer/living/starboard_garden) "bWe" = ( /turf/open/floor/almayer{ dir = 5; @@ -24334,13 +24235,14 @@ }, /area/almayer/shipboard/port_point_defense) "bWf" = ( -/obj/structure/surface/rack, -/obj/effect/spawner/random/tool, -/obj/effect/spawner/random/tool, +/obj/structure/machinery/light, +/obj/structure/bed/chair{ + dir = 1 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hull/upper_hull/u_m_s) +/area/almayer/living/starboard_garden) "bWh" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ dir = 2; @@ -24351,12 +24253,6 @@ icon_state = "test_floor4" }, /area/almayer/powered) -"bWj" = ( -/obj/structure/largecrate/supply, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "bWn" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -24383,12 +24279,13 @@ }, /area/almayer/shipboard/port_point_defense) "bWq" = ( -/obj/structure/surface/rack, -/obj/effect/spawner/random/toolbox, +/obj/structure/bed/chair{ + dir = 1 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hull/upper_hull/u_m_s) +/area/almayer/living/starboard_garden) "bWr" = ( /obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/almayer{ @@ -24444,13 +24341,9 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/auxiliary_officer_office) "bWK" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/starboard_garden) +/obj/docking_port/stationary/escape_pod/north, +/turf/open/floor/plating, +/area/almayer/hull/upper_hull/u_m_s) "bWL" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -24981,12 +24874,6 @@ }, /area/almayer/command/cic) "bZa" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1; - name = "\improper Flight Crew Quarters"; - req_one_access_txt = "19;22"; - access_modified = 1 - }, /obj/structure/disposalpipe/segment, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -25009,16 +24896,12 @@ }, /area/almayer/lifeboat_pumps/north1) "bZg" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 }, -/area/almayer/living/pilotbunks) +/obj/structure/machinery/light, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_s) "bZi" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -25258,11 +25141,11 @@ "cau" = ( /obj/structure/disposalpipe/segment, /obj/structure/machinery/door/airlock/almayer/security/glass{ + access_modified = 1; dir = 2; name = "Firing Range"; req_access = null; - req_one_access_txt = "2;4;7;9;21"; - access_modified = 1 + req_one_access_txt = "2;4;7;9;21" }, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -25637,6 +25520,10 @@ /obj/structure/sign/safety/storage{ pixel_y = 32 }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 3 + }, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) "cbW" = ( @@ -25675,17 +25562,6 @@ icon_state = "red" }, /area/almayer/living/cryo_cells) -"ccc" = ( -/obj/structure/sign/safety/bathunisex{ - pixel_x = 8; - pixel_y = 25 - }, -/obj/structure/sign/safety/bathunisex{ - pixel_x = 8; - pixel_y = -25 - }, -/turf/open/floor/almayer, -/area/almayer/living/pilotbunks) "ccd" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, /turf/open/floor/almayer{ @@ -26232,9 +26108,11 @@ }, /area/almayer/hallways/port_umbilical) "ceu" = ( -/obj/item/trash/barcardine, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_m_s) +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/living/starboard_garden) "cev" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -26259,13 +26137,8 @@ }, /area/almayer/hallways/port_umbilical) "ceC" = ( -/obj/structure/machinery/light, -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, +/obj/structure/prop/almayer/ship_memorial, +/turf/open/floor/plating/almayer, /area/almayer/living/starboard_garden) "ceD" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ @@ -26308,12 +26181,22 @@ }, /area/almayer/hallways/repair_bay) "ceZ" = ( -/obj/structure/bed/sofa/south, +/obj/structure/bed/sofa/south/grey/left, /turf/open/floor/almayer{ dir = 9; icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"cfk" = ( +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/port_missiles) "cfo" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) @@ -26764,17 +26647,15 @@ }, /area/almayer/squads/req) "cit" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/surface/table/almayer, +/obj/item/paper_bin{ + pixel_x = -6; + pixel_y = 7 }, -/area/almayer/living/starboard_garden) +/obj/item/tool/pen, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_m_s) "ciu" = ( /obj/structure/platform{ dir = 8 @@ -27681,10 +27562,10 @@ }, /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/almayer/security/reinforced{ + access_modified = 1; name = "\improper Astronavigational Deck"; req_access = null; - req_one_access_txt = "3;19"; - access_modified = 1 + req_one_access_txt = "3;19" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -27693,10 +27574,10 @@ "cmJ" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/almayer/security/reinforced{ + access_modified = 1; name = "\improper Astronavigational Deck"; req_access = null; - req_one_access_txt = "3;19"; - access_modified = 1 + req_one_access_txt = "3;19" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -28479,6 +28360,7 @@ pixel_x = 8; pixel_y = -32 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) "czM" = ( @@ -28916,6 +28798,7 @@ /obj/structure/machinery/light{ dir = 4 }, +/obj/structure/surface/table/almayer, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) "cIi" = ( @@ -28995,7 +28878,10 @@ /obj/structure/machinery/light{ dir = 1 }, -/turf/open/floor/almayer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, /area/almayer/living/pilotbunks) "cJB" = ( /obj/structure/machinery/vending/coffee, @@ -29438,11 +29324,6 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 }, -/obj/structure/machinery/door/airlock/almayer/medical/glass{ - dir = 2; - name = "\improper Port Viewing Room"; - req_one_access = null - }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -29537,6 +29418,12 @@ icon_state = "orange" }, /area/almayer/engineering/lower_engineering) +"cWv" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/living/starboard_garden) "cWy" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/item/reagent_container/food/snacks/packaged_burger, @@ -29748,14 +29635,19 @@ }, /area/almayer/shipboard/brig/surgery) "dav" = ( -/obj/structure/machinery/constructable_frame{ - icon_state = "box_2" +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" + }, +/obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; + dir = 2; + req_one_access = list(2,34,30) }, -/obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "plate" }, -/area/almayer/lifeboat_pumps/south1) +/area/almayer/hull/upper_hull/u_f_s) "daz" = ( /turf/closed/wall/almayer/white/hull, /area/almayer/command/airoom) @@ -30058,10 +29950,6 @@ pixel_y = 3 }, /obj/item/device/camera, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, /turf/open/floor/almayer, /area/almayer/command/corporateliason) "dhR" = ( @@ -30077,8 +29965,7 @@ "dhU" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ - dir = 5; - icon_state = "green" + icon_state = "cargo" }, /area/almayer/hallways/port_hallway) "dhZ" = ( @@ -30565,6 +30452,7 @@ /area/almayer/hull/lower_hull/l_f_p) "dqN" = ( /obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ icon_state = "green" }, @@ -30747,14 +30635,10 @@ }, /area/almayer/living/briefing) "dux" = ( -/obj/structure/surface/table/almayer, -/obj/item/pizzabox{ - pixel_y = 10 - }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "mono" }, -/area/almayer/hull/upper_hull/u_m_p) +/area/almayer/living/starboard_garden) "duF" = ( /obj/structure/closet/secure_closet/personal, /turf/open/floor/almayer{ @@ -31134,9 +31018,11 @@ /obj/structure/sign/nosmoking_2{ pixel_x = 32 }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "red" + icon_state = "test_floor4" }, /area/almayer/lifeboat_pumps/south1) "dCK" = ( @@ -31194,6 +31080,7 @@ /obj/structure/machinery/light/small{ dir = 1 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -31306,6 +31193,12 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) +"dGc" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_f_p) "dGl" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_AresUp"; @@ -31327,7 +31220,10 @@ /obj/structure/pipes/vents/scrubber{ dir = 8 }, -/turf/open/floor/almayer, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, /area/almayer/living/pilotbunks) "dGw" = ( /obj/effect/step_trigger/clone_cleaner, @@ -31348,8 +31244,14 @@ /area/almayer/hull/lower_hull/l_a_p) "dGC" = ( /obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/plating_catwalk, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, /area/almayer/lifeboat_pumps/south1) "dGD" = ( /obj/structure/closet/secure_closet{ @@ -31373,11 +31275,11 @@ /area/almayer/shipboard/brig/processing) "dGW" = ( /obj/structure/machinery/door/airlock/almayer/security{ + access_modified = 1; dir = 2; name = "\improper Security Checkpoint"; req_access = null; - req_one_access_txt = "3;19"; - access_modified = 1 + req_one_access_txt = "3;19" }, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -31567,10 +31469,9 @@ }, /area/almayer/shipboard/sea_office) "dLz" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/backpack/satchel, +/obj/structure/closet/firecloset, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "cargo" }, /area/almayer/lifeboat_pumps/south1) "dLE" = ( @@ -31715,6 +31616,16 @@ icon_state = "dark_sterile" }, /area/almayer/shipboard/brig/surgery) +"dQE" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/janitorialcart, +/obj/item/tool/mop, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_p) "dQH" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -31804,6 +31715,7 @@ /obj/structure/machinery/camera/autoname/almayer{ name = "ship-grade camera" }, +/obj/structure/surface/table/almayer, /turf/open/floor/almayer{ dir = 9; icon_state = "red" @@ -31857,6 +31769,10 @@ pixel_y = 6; serial_number = 12 }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, @@ -31896,16 +31812,25 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_s) "dUI" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Port Viewing Room" + }, /turf/open/floor/almayer{ - dir = 9; - icon_state = "red" + icon_state = "test_floor4" }, -/area/almayer/shipboard/port_missiles) +/area/almayer/hull/upper_hull/u_f_s) "dUS" = ( /turf/open/floor/almayer{ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_two) +"dUZ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "red" + }, +/area/almayer/shipboard/port_missiles) "dVd" = ( /obj/structure/machinery/seed_extractor{ density = 0; @@ -32056,7 +31981,10 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/almayer, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, /area/almayer/living/pilotbunks) "dYh" = ( /obj/structure/machinery/power/apc/almayer{ @@ -32540,6 +32468,9 @@ /area/almayer/hallways/hangar) "ehj" = ( /obj/item/stack/catwalk, +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) "ehx" = ( @@ -32547,6 +32478,14 @@ /obj/effect/landmark/late_join/alpha, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) +"ehH" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 2; + pixel_y = 3 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/starboard_hallway) "ehR" = ( /obj/structure/window/reinforced{ dir = 4; @@ -32684,7 +32623,7 @@ "ejp" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "cargo" }, /area/almayer/hallways/aft_hallway) "ejt" = ( @@ -32732,18 +32671,25 @@ "eky" = ( /turf/open/floor/almayer, /area/almayer/command/lifeboat) -"ekY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +"ekO" = ( +/obj/structure/machinery/cryopod{ + pixel_y = 6 }, -/obj/structure/sign/safety/maint{ - pixel_x = 8; - pixel_y = -32 +/obj/structure/sign/safety/cryo{ + pixel_x = -17 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "cargo" }, /area/almayer/hull/upper_hull/u_m_p) +"ekY" = ( +/obj/structure/machinery/door/airlock/almayer/generic/glass{ + name = "\improper Memorial Room" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/starboard_garden) "elf" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -32761,6 +32707,7 @@ /obj/structure/machinery/light{ dir = 8 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) "elq" = ( @@ -33224,17 +33171,15 @@ }, /area/almayer/command/airoom) "euO" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 2; - id = "Warden Office Shutters"; - name = "\improper Privacy Shutters" +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 }, /turf/open/floor/almayer{ - dir = 5; + dir = 10; icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/lifeboat_pumps/north1) "euV" = ( /turf/open/floor/almayer/uscm/directional{ dir = 8; @@ -33258,17 +33203,12 @@ /area/almayer/living/basketball) "evg" = ( /obj/structure/surface/table/reinforced/almayer_B, -/obj/item/clipboard{ - pixel_x = -6 - }, -/obj/item/tool/pen/blue{ - pixel_x = -6 +/obj/structure/machinery/computer/emails{ + dir = 1 }, -/obj/item/paper_bin/uscm{ - pixel_x = 8; - pixel_y = 12 +/turf/open/floor/almayer{ + icon_state = "bluefull" }, -/turf/open/floor/almayer, /area/almayer/living/pilotbunks) "evk" = ( /obj/structure/surface/rack, @@ -33716,6 +33656,17 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"eFM" = ( +/obj/structure/surface/table/almayer, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 8 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/south1) "eFT" = ( /obj/structure/bed/sofa/vert/grey, /obj/structure/bed/sofa/vert/grey{ @@ -33723,6 +33674,14 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) +"eGb" = ( +/obj/structure/machinery/constructable_frame{ + icon_state = "box_2" + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/north2) "eGg" = ( /obj/structure/machinery/door/poddoor/railing{ dir = 8; @@ -33949,12 +33908,17 @@ /obj/structure/mirror{ pixel_x = 28 }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, /area/almayer/command/corporateliason) "eKM" = ( /obj/structure/surface/rack, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -33992,6 +33956,19 @@ icon_state = "test_floor4" }, /area/almayer/engineering/laundry) +"eMn" = ( +/obj/structure/machinery/light, +/obj/structure/sign/safety/waterhazard{ + pixel_y = -32 + }, +/obj/structure/sign/safety/rewire{ + pixel_y = -32; + pixel_x = 14 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/south1) "eMP" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; @@ -34069,6 +34046,16 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) +"eOM" = ( +/obj/structure/machinery/door/airlock/almayer/secure/reinforced{ + dir = 2; + name = "\improper Evacuation Airlock PU-6"; + req_access = null + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/powered) "eOR" = ( /obj/structure/machinery/light{ dir = 4 @@ -34174,15 +34161,16 @@ /turf/open/floor/almayer, /area/almayer/shipboard/brig/main_office) "eRR" = ( -/obj/structure/surface/rack, -/obj/effect/spawner/random/tool, -/obj/structure/machinery/light{ - dir = 1 +/obj/item/clothing/head/helmet/marine{ + pixel_x = 16; + pixel_y = 6 }, +/obj/item/reagent_container/food/snacks/grown/poppy, +/obj/effect/step_trigger/message/memorial, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "plate" }, -/area/almayer/lifeboat_pumps/south1) +/area/almayer/living/starboard_garden) "eSo" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -34563,6 +34551,12 @@ icon_state = "red" }, /area/almayer/hull/upper_hull/u_a_p) +"fad" = ( +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/aft_hallway) "fau" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /obj/structure/disposalpipe/junction{ @@ -35037,10 +35031,10 @@ /area/almayer/living/briefing) "fmf" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/almayer/glass{ + access_modified = 1; dir = 2; name = "\improper Requisitions Break Room"; - req_one_access = "19;21"; - access_modified = 1 + req_one_access = "19;21" }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -35070,7 +35064,9 @@ /obj/structure/bed/chair/comfy{ dir = 8 }, -/turf/open/floor/almayer, +/turf/open/floor/almayer{ + icon_state = "bluecorner" + }, /area/almayer/living/pilotbunks) "fmS" = ( /obj/structure/closet/secure_closet/engineering_electrical, @@ -35101,8 +35097,7 @@ dir = 8 }, /turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" + icon_state = "redfull" }, /area/almayer/medical/upper_medical) "fnC" = ( @@ -35176,6 +35171,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/medical_science) +"foR" = ( +/obj/structure/largecrate/random/case, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_p) "fpd" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -35251,6 +35252,17 @@ /obj/structure/largecrate/random/barrel/red, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_s) +"fqx" = ( +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "silver" + }, +/area/almayer/hull/upper_hull/u_m_p) "fqO" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -35342,10 +35354,10 @@ dir = 2 }, /obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ + access_modified = 1; name = "\improper Cryogenics Bay"; req_access = null; - req_one_access_txt = "1;3"; - access_modified = 1 + req_one_access_txt = "1;3" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -35376,7 +35388,15 @@ pixel_x = -8; pixel_y = 5 }, -/turf/open/floor/plating/plating_catwalk, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, /area/almayer/shipboard/brig/armory) "fsH" = ( /obj/structure/disposalpipe/segment{ @@ -35388,6 +35408,15 @@ }, /area/almayer/hallways/port_hallway) "fsT" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1; + pixel_y = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -35429,12 +35458,9 @@ }, /area/almayer/hallways/vehiclehangar) "fuz" = ( -/obj/structure/toilet{ - dir = 8 - }, -/obj/structure/window/reinforced/tinted/frosted, +/obj/structure/machinery/cm_vending/clothing/pilot_officer, /turf/open/floor/almayer{ - icon_state = "sterile" + icon_state = "plate" }, /area/almayer/living/pilotbunks) "fuB" = ( @@ -35485,11 +35511,17 @@ }, /area/almayer/living/briefing) "fvu" = ( -/obj/item/tool/crowbar, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer, +/area/almayer/hull/upper_hull/u_f_s) +"fvv" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Port Viewing Room" + }, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "test_floor4" }, -/area/almayer/lifeboat_pumps/south1) +/area/almayer/hull/upper_hull/u_f_p) "fvB" = ( /obj/structure/closet/secure_closet/staff_officer/armory/m4a1, /turf/open/floor/almayer{ @@ -35521,15 +35553,15 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/port_point_defense) "fwD" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/plate{ +/obj/item/reagent_container/food/snacks/grown/poppy{ pixel_x = 4; - pixel_y = 9 + pixel_y = 4 }, +/obj/effect/step_trigger/message/memorial, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "plate" }, -/area/almayer/lifeboat_pumps/south1) +/area/almayer/living/starboard_garden) "fwF" = ( /obj/structure/largecrate/random/case/double, /obj/structure/machinery/camera/autoname/almayer{ @@ -35785,10 +35817,7 @@ /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = -25 }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/armory) "fDG" = ( /obj/structure/machinery/vending/coffee, @@ -35856,9 +35885,9 @@ /area/almayer/command/cichallway) "fEo" = ( /obj/structure/machinery/door/airlock/almayer/generic{ + access_modified = 1; name = "Kitchen"; - req_one_access_txt = "30;19"; - access_modified = 1 + req_one_access_txt = "30;19" }, /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ @@ -36094,9 +36123,9 @@ /area/almayer/squads/bravo) "fIX" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/almayer{ + access_modified = 1; name = "\improper Requisitions Auxiliary Storage Room"; - req_one_access = "19;21"; - access_modified = 1 + req_one_access = "19;21" }, /turf/open/floor/almayer{ icon_state = "plate" @@ -36536,7 +36565,9 @@ /obj/structure/sign/safety/storage{ pixel_x = -17 }, -/turf/open/floor/almayer, +/turf/open/floor/almayer{ + icon_state = "red" + }, /area/almayer/lifeboat_pumps/north1) "fSF" = ( /obj/structure/sink{ @@ -36896,9 +36927,7 @@ /obj/structure/toilet{ dir = 8 }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/command/corporateliason) "gbX" = ( /obj/structure/disposalpipe/segment{ @@ -36910,6 +36939,15 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) +"gcc" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_f_p) "gcK" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -36925,10 +36963,10 @@ /area/almayer/hull/lower_hull/l_a_s) "gcN" = ( /obj/structure/machinery/door/airlock/almayer/command{ + access_modified = 1; name = "\improper Senior Enlisted Advisor's Office"; req_access = null; - req_access_txt = "19;29"; - access_modified = 1 + req_access_txt = "19;29" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -37175,6 +37213,10 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) +"ghW" = ( +/obj/effect/landmark/start/liaison, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_m_p) "ghX" = ( /obj/structure/window/reinforced/tinted{ pixel_y = -8 @@ -37462,10 +37504,10 @@ /area/almayer/lifeboat_pumps/north1) "gol" = ( /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ + access_modified = 1; dir = 1; req_one_access = null; - req_one_access_txt = "7;19"; - access_modified = 1 + req_one_access_txt = "7;19" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -38569,9 +38611,9 @@ /area/almayer/hull/lower_hull/l_f_p) "gMA" = ( /obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; dir = 8; - req_one_access = list(2,34,30); - access_modified = 1 + req_one_access = list(2,34,30) }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -39156,8 +39198,8 @@ }, /area/almayer/command/cichallway) "haM" = ( -/obj/structure/machinery/constructable_frame, /obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/constructable_frame, /turf/open/floor/almayer{ icon_state = "mono" }, @@ -39367,6 +39409,12 @@ icon_state = "plate" }, /area/almayer/engineering/engine_core) +"heH" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/lifeboat_pumps/north1) "heQ" = ( /obj/structure/bed/chair, /obj/structure/extinguisher_cabinet{ @@ -39661,6 +39709,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/port_point_defense) +"hkE" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/port_hallway) "hkG" = ( /obj/structure/sign/safety/ammunition{ pixel_y = -32 @@ -39799,6 +39853,20 @@ icon_state = "sterile_green" }, /area/almayer/medical/hydroponics) +"hnI" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{ + access_modified = 1; + name = "\improper Flight Crew Quarters"; + req_access_txt = null; + req_one_access_txt = "19;22" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/pilotbunks) "hnV" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, @@ -40163,6 +40231,16 @@ icon_state = "plate" }, /area/almayer/squads/charlie_delta_shared) +"hyt" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 2 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "green" + }, +/area/almayer/hallways/starboard_hallway) "hyw" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -40437,6 +40515,10 @@ icon_state = "plate" }, /area/almayer/medical/lower_medical_medbay) +"hDv" = ( +/obj/effect/landmark/start/reporter, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_m_p) "hDw" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/emails{ @@ -40511,10 +40593,10 @@ /area/almayer/medical/medical_science) "hFF" = ( /obj/structure/machinery/door/airlock/almayer/medical{ + access_modified = 1; name = "Autopsy"; req_access_txt = "25"; - req_one_access = null; - access_modified = 1 + req_one_access = null }, /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ @@ -40636,9 +40718,9 @@ name = "\improper Privacy Shutters" }, /obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; req_access_txt = "200"; - req_one_access = null; - access_modified = 1 + req_one_access = null }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -41054,11 +41136,11 @@ /area/almayer/living/grunt_rnr) "hSI" = ( /obj/structure/machinery/door/airlock/almayer/medical{ + access_modified = 1; dir = 2; name = "Morgue"; req_access_txt = "25"; - req_one_access = null; - access_modified = 1 + req_one_access = null }, /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -41266,6 +41348,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) +"hWB" = ( +/obj/structure/sign/safety/escapepod{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/south1) "hWJ" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/almayer{ @@ -41312,6 +41404,15 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) +"hXV" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/south1) "hXY" = ( /turf/open/floor/almayer{ dir = 4; @@ -41716,21 +41817,33 @@ /area/almayer/squads/bravo) "iid" = ( /obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; dir = 2; req_one_access = null; - req_one_access_txt = "19;34;30"; - access_modified = 1 + req_one_access_txt = "19;34;30" }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_m_p) "iit" = ( -/obj/effect/landmark/ert_spawns/distress_cryo, -/obj/effect/landmark/late_join, -/obj/effect/landmark/start/reporter, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/cryo_cells) +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/hydroponics) "iiz" = ( /obj/structure/surface/rack, /obj/item/reagent_container/food/drinks/bottle/sake{ @@ -41889,6 +42002,9 @@ /area/almayer/hallways/hangar) "ilJ" = ( /obj/structure/bed/chair, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) "ilZ" = ( @@ -41916,11 +42032,14 @@ /area/almayer/living/offices/flight) "ina" = ( /obj/structure/surface/table/almayer, -/obj/effect/spawner/random/tool, +/obj/structure/machinery/computer/emails{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "plate" }, -/area/almayer/lifeboat_pumps/south1) +/area/almayer/hull/upper_hull/u_m_s) "ins" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -42022,11 +42141,11 @@ }, /area/almayer/squads/alpha_bravo_shared) "ipK" = ( -/obj/structure/largecrate/random/case/small, +/obj/effect/step_trigger/message/memorial, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hull/upper_hull/u_m_s) +/area/almayer/living/starboard_garden) "ipQ" = ( /obj/structure/surface/rack, /obj/item/storage/fancy/vials/empty, @@ -42074,9 +42193,9 @@ /area/almayer/squads/req) "iqp" = ( /obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; req_one_access = null; - req_one_access_txt = "37"; - access_modified = 1 + req_one_access_txt = "37" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -43150,6 +43269,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/lifeboat) +"iPH" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/south1) "iPS" = ( /obj/structure/machinery/cryopod/right, /turf/open/floor/almayer{ @@ -43228,9 +43357,9 @@ /area/almayer/hull/lower_hull/l_f_p) "iQL" = ( /obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; dir = 2; - req_one_access = list(2,34,30); - access_modified = 1 + req_one_access = list(2,34,30) }, /obj/structure/prop/invuln/lattice_prop{ dir = 1; @@ -43575,12 +43704,14 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_p) "iYr" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/machinery/light{ + dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south1) +/turf/open/floor/almayer{ + dir = 4; + icon_state = "green" + }, +/area/almayer/living/starboard_garden) "iYt" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -43900,6 +44031,11 @@ dir = 8; name = "ship-grade camera" }, +/obj/structure/surface/table/almayer, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 8 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "red" @@ -44146,11 +44282,21 @@ icon_state = "cargo" }, /area/almayer/living/bridgebunks) +"jhY" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/hull/upper_hull/u_m_p) "jip" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + access_modified = 1; name = "\improper Main Kitchen"; - req_one_access_txt = "30;19"; - access_modified = 1 + req_one_access_txt = "30;19" }, /turf/open/floor/prison{ icon_state = "kitchen" @@ -44441,6 +44587,19 @@ icon_state = "test_floor4" }, /area/almayer/hallways/aft_hallway) +"jnA" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/brig/armory) "jnD" = ( /turf/open/floor/almayer{ dir = 1; @@ -44564,6 +44723,7 @@ icon_state = "NW-out"; pixel_y = 1 }, +/obj/structure/bed/chair/comfy, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -44596,6 +44756,15 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"jsP" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/south1) "jtj" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -44706,14 +44875,11 @@ }, /area/almayer/hull/upper_hull/u_a_p) "jvJ" = ( -/obj/structure/machinery/light{ - dir = 4 - }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ - dir = 4; - icon_state = "red" + icon_state = "plate" }, -/area/almayer/shipboard/starboard_missiles) +/area/almayer/hull/upper_hull/u_f_s) "jvX" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -45253,11 +45419,14 @@ }, /area/almayer/hull/lower_hull/l_a_s) "jMm" = ( -/obj/effect/spawner/random/tool, +/obj/structure/closet/secure_closet/personal/cabinet{ + req_access = null + }, +/obj/item/clothing/mask/rebreather/scarf, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "plate" }, -/area/almayer/lifeboat_pumps/south2) +/area/almayer/living/pilotbunks) "jMr" = ( /obj/structure/surface/table/almayer, /obj/item/storage/donut_box{ @@ -45762,6 +45931,15 @@ icon_state = "plate" }, /area/almayer/living/offices) +"jWH" = ( +/obj/structure/machinery/power/apc/almayer/hardened{ + cell_type = /obj/item/cell/hyper; + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/north1) "jWU" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/blocker/forcefield/multitile_vehicles, @@ -45910,8 +46088,7 @@ "jZY" = ( /obj/structure/closet/l3closet/virology, /turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" + icon_state = "redfull" }, /area/almayer/medical/upper_medical) "kaj" = ( @@ -45919,9 +46096,11 @@ /obj/effect/decal/warning_stripes{ icon_state = "SW-out" }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, /turf/open/floor/almayer{ - dir = 9; - icon_state = "green" + icon_state = "test_floor4" }, /area/almayer/hallways/aft_hallway) "kan" = ( @@ -46383,6 +46562,14 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south2) +"kkE" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 2; + pixel_y = 3 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "kkO" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -46778,7 +46965,8 @@ /area/almayer/shipboard/brig/evidence_storage) "ktn" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N" + icon_state = "N"; + pixel_y = 2 }, /obj/structure/closet/secure_closet/guncabinet/red, /obj/item/weapon/gun/rifle/m4ra, @@ -46822,6 +47010,12 @@ icon_state = "greencorner" }, /area/almayer/living/grunt_rnr) +"kuk" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south1) "kuu" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /obj/structure/disposalpipe/segment{ @@ -46988,12 +47182,13 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south1) "kyY" = ( -/obj/structure/largecrate/random/case/small, -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = -25 +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 }, /turf/open/floor/almayer{ - icon_state = "mono" + dir = 6; + icon_state = "red" }, /area/almayer/lifeboat_pumps/north1) "kyZ" = ( @@ -47120,6 +47315,13 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) +"kBK" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 2 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/starboard_hallway) "kBP" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -47181,6 +47383,7 @@ /area/almayer/hull/lower_hull/l_f_p) "kDb" = ( /obj/structure/surface/rack, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) "kDi" = ( @@ -47223,15 +47426,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/containment) -"kDt" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "red" - }, -/area/almayer/lifeboat_pumps/south1) "kDA" = ( /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer{ @@ -47265,11 +47459,15 @@ }, /area/almayer/medical/morgue) "kFe" = ( -/obj/structure/machinery/constructable_frame, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "plate" }, -/area/almayer/lifeboat_pumps/south2) +/area/almayer/living/pilotbunks) "kFk" = ( /obj/structure/closet/secure_closet/commander, /turf/open/floor/wood/ship, @@ -47347,11 +47545,19 @@ icon_state = "emerald" }, /area/almayer/squads/charlie) +"kGI" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/aft_hallway) "kGL" = ( /obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "green" + icon_state = "test_floor4" }, /area/almayer/hallways/aft_hallway) "kGQ" = ( @@ -47487,6 +47693,14 @@ /obj/structure/bed/chair/comfy/orange, /turf/open/floor/almayer, /area/almayer/shipboard/brig/main_office) +"kJL" = ( +/obj/structure/machinery/constructable_frame{ + icon_state = "box_2" + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/north1) "kJV" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -47709,6 +47923,10 @@ /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) "kOv" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ icon_state = "cargo_arrow" }, @@ -47718,7 +47936,13 @@ icon_state = "N"; pixel_y = 1 }, -/obj/structure/bed/chair/comfy, +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/clipboard{ + pixel_x = -6 + }, +/obj/item/tool/pen/blue{ + pixel_x = -6 + }, /turf/open/floor/almayer{ icon_state = "bluefull" }, @@ -47984,12 +48208,14 @@ /turf/open/floor/almayer, /area/almayer/hallways/hangar) "kUh" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{ + access_modified = 1; + dir = 1; name = "\improper Flight Crew Quarters"; - req_one_access_txt = "19;22"; - access_modified = 1 + req_access_txt = null; + req_one_access_txt = "19;22" }, -/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -48023,6 +48249,13 @@ icon_state = "cargo" }, /area/almayer/engineering/upper_engineering/port) +"kUQ" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/obj/structure/machinery/constructable_frame, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/south1) "kUV" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -48074,11 +48307,11 @@ }, /area/almayer/command/cichallway) "kWT" = ( -/obj/structure/machinery/power/apc/almayer/hardened, /turf/open/floor/almayer{ - icon_state = "mono" + dir = 9; + icon_state = "blue" }, -/area/almayer/lifeboat_pumps/south1) +/area/almayer/living/pilotbunks) "kWY" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -49079,6 +49312,11 @@ icon_state = "plate" }, /area/almayer/living/port_emb) +"lrF" = ( +/obj/structure/machinery/light, +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south1) "lrT" = ( /obj/structure/bed/chair, /turf/open/floor/almayer, @@ -49182,6 +49420,13 @@ icon_state = "emerald" }, /area/almayer/squads/charlie) +"ltK" = ( +/obj/structure/window/framed/almayer, +/obj/structure/curtain/open/shower{ + name = "hypersleep curtain" + }, +/turf/open/floor/plating, +/area/almayer/hull/upper_hull/u_m_p) "ltU" = ( /obj/structure/filingcabinet, /turf/open/floor/almayer{ @@ -49313,13 +49558,11 @@ }, /area/almayer/command/cic) "lvA" = ( -/obj/structure/machinery/power/apc/almayer/hardened{ - dir = 1 - }, /turf/open/floor/almayer{ - icon_state = "mono" + dir = 1; + icon_state = "blue" }, -/area/almayer/lifeboat_pumps/north1) +/area/almayer/living/pilotbunks) "lvZ" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/almayer/locked{ @@ -49331,10 +49574,10 @@ /area/almayer/shipboard/brig/perma) "lwi" = ( /obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; dir = 1; req_one_access = null; - req_one_access_txt = "2;7"; - access_modified = 1 + req_one_access_txt = "2;7" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -49422,6 +49665,12 @@ icon_state = "plate" }, /area/almayer/living/auxiliary_officer_office) +"lxT" = ( +/obj/structure/machinery/constructable_frame, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/south2) "lxW" = ( /obj/structure/sign/prop2{ pixel_y = 29 @@ -49470,6 +49719,13 @@ icon_state = "plate" }, /area/almayer/living/auxiliary_officer_office) +"lza" = ( +/obj/structure/bed/sofa/vert/grey, +/obj/structure/bed/sofa/vert/grey/top{ + pixel_y = 11 + }, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south1) "lzj" = ( /obj/structure/sign/safety/storage{ pixel_x = 8; @@ -49711,18 +49967,23 @@ }, /area/almayer/squads/req) "lDN" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/obj/structure/sign/safety/coffee{ - pixel_y = 32 +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 }, -/obj/structure/sign/safety/east{ - pixel_x = 15; - pixel_y = 32 +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 1 }, -/turf/open/floor/almayer, -/area/almayer/hull/upper_hull/u_f_p) +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/hydroponics) "lDV" = ( /obj/effect/landmark/start/marine/medic/bravo, /obj/effect/landmark/late_join/bravo, @@ -50194,7 +50455,7 @@ }, /turf/open/floor/almayer{ dir = 4; - icon_state = "redcorner" + icon_state = "red" }, /area/almayer/shipboard/brig/main_office) "lNw" = ( @@ -50238,6 +50499,10 @@ /obj/structure/machinery/light{ dir = 8 }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, @@ -50634,16 +50899,15 @@ }, /area/almayer/shipboard/brig/general_equipment) "maq" = ( -/obj/structure/machinery/cryopod/right{ - pixel_y = 6 - }, /obj/structure/sign/safety/cryo{ pixel_x = 7; pixel_y = -26 }, -/turf/open/floor/almayer{ - icon_state = "cargo" +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 }, +/turf/open/floor/almayer, /area/almayer/command/corporateliason) "maw" = ( /obj/structure/disposalpipe/segment, @@ -50854,6 +51118,10 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"mgy" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cic_hallway) "mgF" = ( /obj/structure/window/reinforced{ dir = 4; @@ -51034,6 +51302,11 @@ pixel_x = -25; req_access_txt = "200" }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 2 + }, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, @@ -51210,14 +51483,11 @@ /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) "mov" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/light/small, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/bed/chair{ + dir = 1 }, -/area/almayer/hull/upper_hull/u_m_p) +/turf/open/floor/grass, +/area/almayer/living/starboard_garden) "moB" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/brig/cells) @@ -51323,6 +51593,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) +"mru" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/port_hallway) "mrD" = ( /obj/structure/machinery/light{ dir = 1 @@ -51434,6 +51711,19 @@ icon_state = "red" }, /area/almayer/command/lifeboat) +"mtE" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/sign/safety/east{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/sign/safety/coffee{ + pixel_y = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_p) "mtM" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -51464,6 +51754,13 @@ icon_state = "plate" }, /area/almayer/living/gym) +"muq" = ( +/obj/structure/bed/sofa/vert/grey/bot, +/obj/structure/bed/sofa/vert/grey{ + pixel_y = 11 + }, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north1) "mux" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -51652,6 +51949,10 @@ /obj/structure/machinery/light, /turf/open/floor/almayer, /area/almayer/living/offices) +"mzF" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/lifeboat_pumps/south2) "mzO" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -51729,6 +52030,18 @@ icon_state = "bluefull" }, /area/almayer/squads/charlie_delta_shared) +"mBe" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/pilotbunks) "mBk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -51744,10 +52057,10 @@ dir = 4 }, /obj/structure/machinery/door/airlock/almayer/security/reinforced{ + access_modified = 1; name = "\improper Astronavigational Deck"; req_access = null; - req_one_access_txt = "3;19"; - access_modified = 1 + req_one_access_txt = "3;19" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -51763,6 +52076,7 @@ dir = 4; name = "ship-grade camera" }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) "mBJ" = ( @@ -51957,12 +52271,11 @@ /area/almayer/living/gym) "mHD" = ( /obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 + icon_state = "S" }, /obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 + icon_state = "N"; + pixel_y = 1 }, /turf/open/floor/almayer{ icon_state = "mono" @@ -51975,8 +52288,11 @@ }, /area/almayer/command/airoom) "mHO" = ( +/obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light, -/turf/open/floor/almayer, +/turf/open/floor/almayer{ + icon_state = "mono" + }, /area/almayer/living/pilotbunks) "mHR" = ( /obj/structure/sign/safety/hvac_old{ @@ -52066,11 +52382,10 @@ /turf/open/floor/almayer/uscm/directional, /area/almayer/command/cic) "mJL" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/turf/open/floor/almayer{ + dir = 5; + icon_state = "blue" }, -/turf/closed/wall/almayer, /area/almayer/living/pilotbunks) "mJP" = ( /obj/structure/machinery/cm_vending/gear/tl{ @@ -52335,11 +52650,17 @@ }, /area/almayer/hull/lower_hull/l_m_s) "mOb" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_m_p) +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/starboard_garden) "mOg" = ( /obj/structure/sign/safety/maint{ pixel_x = 32 @@ -52534,9 +52855,9 @@ name = "\improper Privacy Shutters" }, /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ + access_modified = 1; req_one_access = null; - req_one_access_txt = "19;30"; - access_modified = 1 + req_one_access_txt = "19;30" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -52585,6 +52906,12 @@ icon_state = "red" }, /area/almayer/shipboard/navigation) +"mTn" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/starboard_hallway) "mTp" = ( /obj/structure/window/reinforced{ dir = 4; @@ -52810,15 +53137,6 @@ icon_state = "blue" }, /area/almayer/hallways/port_hallway) -"mYx" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/south1) "mYY" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -53034,9 +53352,9 @@ /area/almayer/shipboard/port_missiles) "nec" = ( /obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; req_access_txt = "200"; - req_one_access = null; - access_modified = 1 + req_one_access = null }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -53244,11 +53562,11 @@ /area/almayer/lifeboat_pumps/south1) "nim" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ + access_modified = 1; dir = 2; name = "\improper Chief Engineer's Office"; req_one_access = null; - req_one_access_txt = "1;6"; - access_modified = 1 + req_one_access_txt = "1;6" }, /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -53314,11 +53632,16 @@ icon_state = "red" }, /area/almayer/squads/alpha) +"njy" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "njD" = ( -/obj/structure/surface/table/almayer, -/obj/item/clothing/suit/storage/hazardvest, +/obj/structure/closet/emcloset, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "cargo" }, /area/almayer/lifeboat_pumps/south1) "njJ" = ( @@ -53373,6 +53696,8 @@ /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 }, +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/emails, /turf/open/floor/almayer{ dir = 1; icon_state = "red" @@ -53602,6 +53927,17 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) +"nqG" = ( +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/south1) "nqU" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_p) @@ -53792,11 +54128,9 @@ /obj/structure/bed/chair{ dir = 8 }, -/obj/structure/sign/safety/maint{ - pixel_x = 32 - }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "green" }, /area/almayer/living/starboard_garden) "nun" = ( @@ -53833,15 +54167,11 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) "nuY" = ( -/obj/structure/machinery/door/airlock/almayer/secure/reinforced{ - dir = 2; - name = "\improper Evacuation Airlock PU-6"; - req_access = null - }, +/obj/structure/closet, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/powered) +/area/almayer/hull/upper_hull/u_m_s) "nvM" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -53898,6 +54228,12 @@ /obj/item/tool/lighter/zippo/gold, /turf/open/floor/carpet, /area/almayer/living/commandbunks) +"nwx" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/shipboard/port_missiles) "nwz" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -53967,7 +54303,9 @@ id = "Warden Office Shutters"; name = "\improper Privacy Shutters" }, -/turf/open/floor/plating, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, /area/almayer/shipboard/brig/main_office) "nxK" = ( /obj/structure/sign/safety/high_voltage{ @@ -54124,12 +54462,10 @@ }, /area/almayer/living/briefing) "nBE" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, +/turf/open/floor/almayer{ + icon_state = "mono" + }, /area/almayer/living/pilotbunks) "nBW" = ( /obj/structure/sign/safety/maint{ @@ -54667,9 +55003,11 @@ }, /area/almayer/shipboard/brig/cic_hallway) "nNA" = ( -/obj/structure/largecrate/random, +/obj/structure/machinery/cryopod{ + pixel_y = 6 + }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "cargo" }, /area/almayer/hull/upper_hull/u_m_p) "nNH" = ( @@ -54829,15 +55167,6 @@ icon_state = "plate" }, /area/almayer/squads/req) -"nPX" = ( -/obj/structure/sign/safety/rewire{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/north2) "nQv" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -54926,6 +55255,13 @@ }, /turf/open/floor/almayer, /area/almayer/command/computerlab) +"nTH" = ( +/obj/structure/sign/safety/storage{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south1) "nTZ" = ( /turf/open/floor/almayer{ dir = 5; @@ -54959,6 +55295,14 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"nUn" = ( +/obj/structure/surface/table/almayer, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 8 + }, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south1) "nUv" = ( /obj/structure/machinery/light{ dir = 1 @@ -55042,6 +55386,14 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/starboard) +"nWc" = ( +/obj/structure/machinery/door/airlock/almayer/generic/glass{ + name = "\improper Passenger Cryogenics Bay" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hull/upper_hull/u_m_p) "nWN" = ( /obj/structure/surface/table/almayer, /turf/open/floor/wood/ship, @@ -55062,6 +55414,15 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/cells) +"nXF" = ( +/obj/structure/bed/sofa/south/white/right{ + pixel_y = 16 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "silver" + }, +/area/almayer/hull/upper_hull/u_m_p) "nXP" = ( /turf/closed/wall/almayer/outer, /area/almayer/hull/lower_hull/l_f_s) @@ -55112,6 +55473,13 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) +"nYv" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/aft_hallway) "nYD" = ( /obj/structure/closet/secure_closet/medical2, /turf/open/floor/almayer{ @@ -55171,6 +55539,10 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) +"oaK" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south1) "oaW" = ( /obj/structure/machinery/cryopod/right, /turf/open/floor/almayer{ @@ -55453,11 +55825,8 @@ }, /area/almayer/shipboard/weapon_room) "ohB" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - pixel_y = 8 - }, /obj/structure/machinery/light, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ icon_state = "mono" }, @@ -55917,7 +56286,9 @@ name = "General Listening Channel"; pixel_y = 28 }, -/turf/open/floor/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, /area/almayer/living/pilotbunks) "oqA" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/uniform_vendors, @@ -56273,10 +56644,10 @@ dir = 4 }, /obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; req_access = null; req_one_access = null; - req_one_access_txt = "19;29"; - access_modified = 1 + req_one_access_txt = "19;29" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -56324,6 +56695,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_p) +"oyy" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "oyE" = ( /obj/effect/landmark/start/intel, /obj/structure/sign/poster{ @@ -56660,26 +57038,21 @@ }, /area/almayer/living/synthcloset) "oGy" = ( -/obj/structure/disposalpipe/segment{ +/obj/structure/machinery/camera/autoname/almayer{ dir = 1; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_p) -"oGC" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - pixel_y = 8 + name = "ship-grade camera" }, -/obj/structure/machinery/light{ +/obj/structure/bed/chair{ dir = 1 }, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "plate" }, -/area/almayer/lifeboat_pumps/south1) +/area/almayer/living/starboard_garden) +"oGC" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north1) "oGP" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -57098,6 +57471,7 @@ /area/almayer/hull/lower_hull/l_f_s) "oQo" = ( /obj/item/stool, +/obj/effect/landmark/yautja_teleport, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -57341,9 +57715,11 @@ }, /area/almayer/shipboard/brig/cic_hallway) "oWz" = ( -/obj/item/stool, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south1) +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/starboard_garden) "oWI" = ( /obj/structure/machinery/cryopod/right{ pixel_y = 6 @@ -57357,10 +57733,10 @@ /area/almayer/shipboard/brig/cryo) "oWX" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + access_modified = 1; dir = 1; name = "\improper Kitchen Hydroponics"; - req_one_access_txt = "30;19"; - access_modified = 1 + req_one_access_txt = "30;19" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -57371,6 +57747,14 @@ /obj/effect/landmark/late_join/charlie, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) +"oXd" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/hallways/aft_hallway) "oXp" = ( /obj/effect/decal/cleanable/ash, /turf/open/floor/wood/ship, @@ -57728,15 +58112,6 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) -"pgo" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/lifeboat_pumps/south1) "pgD" = ( /turf/closed/wall/almayer, /area/almayer/lifeboat_pumps/south1) @@ -57899,11 +58274,11 @@ dir = 4 }, /obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ + access_modified = 1; dir = 2; name = "Brig"; req_access = null; - req_one_access_txt = "1;3"; - access_modified = 1 + req_one_access_txt = "1;3" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -57918,15 +58293,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) -"pmn" = ( -/obj/structure/sign/safety/storage{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "pmq" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -58017,11 +58383,9 @@ /turf/open/floor/almayer, /area/almayer/living/auxiliary_officer_office) "pqc" = ( -/obj/structure/machinery/firealarm{ - dir = 4; - pixel_x = 24 +/turf/open/floor/almayer{ + icon_state = "mono" }, -/turf/open/floor/almayer, /area/almayer/living/pilotbunks) "pqi" = ( /obj/item/stack/cable_coil, @@ -58307,13 +58671,6 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/processing) -"pwG" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "red" - }, -/area/almayer/lifeboat_pumps/south1) "pwK" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -58466,14 +58823,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) -"pzy" = ( -/obj/structure/sign/safety/maint{ - pixel_x = 32 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/north1) "pzG" = ( /obj/docking_port/stationary/emergency_response/port1, /turf/open/floor/almayer{ @@ -58575,14 +58924,14 @@ }, /area/almayer/engineering/upper_engineering/starboard) "pDm" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, +/obj/structure/surface/rack, +/obj/item/roller, +/obj/item/roller, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hull/upper_hull/u_m_p) +/area/almayer/hull/upper_hull/u_m_s) "pDo" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -58678,17 +59027,11 @@ }, /area/almayer/medical/containment/cell) "pEY" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - pixel_y = 8 - }, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - pixel_x = -16; - pixel_y = 8 +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "test_floor4" }, /area/almayer/lifeboat_pumps/south1) "pFa" = ( @@ -58939,11 +59282,11 @@ "pJW" = ( /obj/structure/disposalpipe/segment, /obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; dir = 1; req_access = null; req_one_access = null; - req_one_access_txt = "3;22;19"; - access_modified = 1 + req_one_access_txt = "3;22;19" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -58983,15 +59326,11 @@ }, /area/almayer/medical/containment/cell) "pLW" = ( -/obj/structure/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ - dir = 5; - icon_state = "red" + icon_state = "cargo" }, -/area/almayer/shipboard/port_missiles) +/area/almayer/living/pilotbunks) "pLZ" = ( /obj/effect/landmark/crap_item, /turf/open/floor/almayer, @@ -59104,8 +59443,13 @@ /area/almayer/hull/lower_hull/l_m_s) "pOD" = ( /obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, /area/almayer/living/pilotbunks) "pON" = ( /turf/open/floor/almayer/uscm/directional{ @@ -59152,6 +59496,12 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) +"pPF" = ( +/obj/structure/machinery/power/apc/almayer/hardened, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/south2) "pPM" = ( /obj/structure/surface/rack, /turf/open/floor/almayer{ @@ -59160,6 +59510,7 @@ }, /area/almayer/command/securestorage) "pPN" = ( +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ dir = 4; icon_state = "red" @@ -59222,9 +59573,8 @@ }, /area/almayer/medical/medical_science) "pQV" = ( -/obj/structure/machinery/vending/cola, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "blue" }, /area/almayer/living/pilotbunks) "pQY" = ( @@ -59330,6 +59680,12 @@ icon_state = "mono" }, /area/almayer/command/computerlab) +"pUe" = ( +/obj/structure/machinery/power/apc/almayer/hardened, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/south1) "pUf" = ( /obj/structure/bed/chair{ dir = 4 @@ -59532,7 +59888,9 @@ /area/almayer/shipboard/brig/main_office) "pWN" = ( /obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, +/turf/open/floor/almayer{ + icon_state = "blue" + }, /area/almayer/living/pilotbunks) "pXj" = ( /obj/structure/closet/radiation, @@ -59773,13 +60131,11 @@ }, /area/almayer/living/briefing) "qbO" = ( -/obj/structure/machinery/power/apc/almayer/hardened{ - dir = 1 - }, /turf/open/floor/almayer{ - icon_state = "mono" + dir = 6; + icon_state = "blue" }, -/area/almayer/lifeboat_pumps/north2) +/area/almayer/living/pilotbunks) "qbZ" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor/glass{ dir = 1; @@ -59808,6 +60164,21 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) +"qcq" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/sign/safety/waterhazard{ + pixel_y = 32 + }, +/obj/structure/sign/safety/rewire{ + pixel_y = 32; + pixel_x = 14 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/north1) "qcy" = ( /obj/structure/sign/safety/bathunisex{ pixel_x = 8; @@ -59918,10 +60289,8 @@ /obj/structure/machinery/computer/emails{ dir = 1 }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" - }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer, /area/almayer/shipboard/port_missiles) "qfh" = ( /obj/structure/bed/chair{ @@ -59970,14 +60339,13 @@ }, /area/almayer/shipboard/brig/main_office) "qga" = ( -/obj/structure/machinery/space_heater, -/obj/structure/sign/safety/maint{ - pixel_x = 32 +/obj/structure/machinery/door/airlock/almayer/maint/reinforced{ + dir = 1 }, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "test_floor4" }, -/area/almayer/lifeboat_pumps/south1) +/area/almayer/living/starboard_garden) "qgG" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -60002,8 +60370,8 @@ "qgK" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/airlock/almayer/generic/press{ - name = "\improper Combat Correspondent Room"; - dir = 1 + dir = 1; + name = "\improper Combat Correspondent Room" }, /turf/open/floor/almayer, /area/almayer/command/combat_correspondent) @@ -60165,6 +60533,7 @@ /obj/structure/sign/safety/maint{ pixel_x = -17 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_s) "qld" = ( @@ -60301,6 +60670,12 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/perma) +"qnd" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/hangar) "qnh" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -60717,6 +61092,16 @@ }, /turf/closed/wall/almayer/research/containment/wall/purple, /area/almayer/medical/containment/cell) +"qxz" = ( +/obj/structure/machinery/door/airlock/almayer/secure/reinforced{ + dir = 2; + name = "\improper Evacuation Airlock PU-5"; + req_access = null + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/powered) "qxA" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ @@ -60805,10 +61190,6 @@ /obj/structure/surface/table/almayer, /obj/item/storage/photo_album, /obj/item/device/camera_film, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, /turf/open/floor/almayer, /area/almayer/command/corporateliason) "qyD" = ( @@ -61088,13 +61469,14 @@ }, /area/almayer/squads/delta) "qFQ" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_y = 13 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_m_p) +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/hallways/aft_hallway) "qFW" = ( /obj/structure/sign/safety/storage{ pixel_x = 8; @@ -61149,20 +61531,15 @@ }, /area/almayer/hallways/starboard_hallway) "qHq" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/ashtray/bronze, -/obj/item/clothing/mask/cigarette/weed{ - desc = "What in the god damn?"; - name = "marijuana cigarette" - }, -/obj/item/trash/cigbutt{ - pixel_x = -10; - pixel_y = 13 +/obj/structure/machinery/door/airlock/almayer/secure/reinforced{ + dir = 2; + name = "\improper Evacuation Airlock SU-6"; + req_access = null }, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "test_floor4" }, -/area/almayer/lifeboat_pumps/south1) +/area/almayer/powered) "qHF" = ( /obj/structure/surface/table/almayer, /obj/item/storage/box/bodybags{ @@ -61364,11 +61741,13 @@ }, /area/almayer/medical/containment) "qLj" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south1) +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/hallways/aft_hallway) "qLo" = ( /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, @@ -61708,6 +62087,16 @@ }, /turf/open/floor/plating, /area/almayer/living/port_emb) +"qSX" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/south1) "qTY" = ( /obj/structure/machinery/gibber, /turf/open/floor/plating/plating_catwalk, @@ -61833,6 +62222,12 @@ icon_state = "plate" }, /area/almayer/squads/delta) +"qWI" = ( +/obj/structure/machinery/status_display{ + pixel_y = -30 + }, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north1) "qWR" = ( /turf/closed/wall/almayer/research/containment/wall/corner{ dir = 4 @@ -62383,6 +62778,9 @@ /area/almayer/hull/upper_hull/u_m_p) "riP" = ( /obj/structure/machinery/light, +/obj/structure/sign/safety/rewire{ + pixel_y = -32 + }, /turf/open/floor/almayer{ icon_state = "mono" }, @@ -62959,10 +63357,6 @@ }, /area/almayer/hallways/hangar) "ruz" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, /obj/structure/reagent_dispensers/watertank, /turf/open/floor/almayer{ icon_state = "cargo" @@ -63058,14 +63452,11 @@ }, /area/almayer/medical/lower_medical_medbay) "ryG" = ( -/obj/structure/largecrate/random/case, -/obj/structure/machinery/light{ - dir = 1 - }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/lifeboat_pumps/south1) +/area/almayer/lifeboat_pumps/north1) "ryR" = ( /obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep{ req_access = list(1) @@ -63090,10 +63481,10 @@ icon_state = "NW-out" }, /obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ + access_modified = 1; name = "\improper Brig"; req_access = null; - req_one_access_txt = "1;3"; - access_modified = 1 + req_one_access_txt = "1;3" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -63103,6 +63494,7 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) "rzN" = ( @@ -63204,7 +63596,7 @@ "rBx" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/tool/stamp/ro{ - name = "spare quartermaster's rubber stamp"; + name = "spare requisitions officer's rubber stamp"; pixel_x = -7; pixel_y = 11 }, @@ -63213,7 +63605,9 @@ }, /area/almayer/command/cichallway) "rBH" = ( -/obj/structure/machinery/constructable_frame, +/obj/structure/machinery/constructable_frame{ + icon_state = "box_2" + }, /turf/open/floor/almayer{ icon_state = "mono" }, @@ -63725,13 +64119,14 @@ }, /area/almayer/powered/agent) "rKs" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/machinery/door/airlock/almayer/maint{ + req_one_access = null; + req_one_access_txt = "2;30;34" }, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "test_floor4" }, -/area/almayer/lifeboat_pumps/south1) +/area/almayer/hull/upper_hull/u_m_s) "rKy" = ( /obj/structure/machinery/firealarm{ dir = 1; @@ -63837,6 +64232,7 @@ /obj/structure/surface/table/reinforced/almayer_B, /obj/item/clipboard, /obj/item/device/binoculars, +/obj/item/storage/bible, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -63937,7 +64333,13 @@ /area/almayer/squads/charlie) "rQW" = ( /obj/item/tool/screwdriver, -/turf/open/floor/almayer, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, /area/almayer/lifeboat_pumps/south1) "rQY" = ( /obj/structure/bed, @@ -63953,6 +64355,13 @@ "rRq" = ( /turf/closed/wall/almayer, /area/almayer/lifeboat_pumps/south2) +"rRz" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/south1) "rRQ" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -64290,6 +64699,16 @@ icon_state = "red" }, /area/almayer/shipboard/brig/general_equipment) +"sah" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "red" + }, +/area/almayer/hallways/aft_hallway) "saB" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -64630,11 +65049,8 @@ }, /area/almayer/lifeboat_pumps/south2) "sht" = ( -/obj/structure/machinery/power/apc/almayer/hardened, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/south2) +/turf/open/floor/almayer, +/area/almayer/living/pilotbunks) "shw" = ( /obj/structure/largecrate/random/barrel/green, /turf/open/floor/plating/plating_catwalk, @@ -64882,6 +65298,12 @@ allow_construction = 0 }, /area/almayer/hallways/port_hallway) +"sou" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/starboard_hallway) "sow" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -65313,6 +65735,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) +"syP" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "szm" = ( /obj/structure/machinery/power/fusion_engine{ name = "\improper S-52 fusion reactor 10" @@ -65356,11 +65785,20 @@ }, /area/almayer/squads/charlie) "szO" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/pilot_officer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/living/pilotbunks) +"szU" = ( +/obj/structure/toilet{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/numbertwobunks) "sAc" = ( /obj/structure/bed/chair{ dir = 8; @@ -65408,12 +65846,12 @@ }, /obj/structure/disposalpipe/segment, /obj/structure/machinery/door/airlock/almayer/command/reinforced{ + access_modified = 1; dir = 1; id_tag = "CO-Office"; name = "\improper Commanding Officer's Office"; req_access = null; - req_access_txt = "31"; - access_modified = 1 + req_access_txt = "31" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -65469,7 +65907,10 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 }, -/turf/open/floor/almayer, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, /area/almayer/living/pilotbunks) "sCQ" = ( /obj/structure/machinery/light, @@ -65498,10 +65939,17 @@ pixel_y = 26 }, /turf/open/floor/almayer{ - dir = 4; - icon_state = "silvercorner" + dir = 1; + icon_state = "silver" }, /area/almayer/hallways/aft_hallway) +"sDD" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/port_missiles) "sDM" = ( /turf/open/floor/almayer{ dir = 9; @@ -65722,22 +66170,19 @@ /turf/open/floor/engine, /area/almayer/engineering/airmix) "sHp" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/obj/structure/largecrate/random/case/small, +/obj/structure/sign/safety/maint{ + pixel_x = 32 + }, /turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) +/area/almayer/lifeboat_pumps/north1) "sHM" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/bed/chair{ - dir = 1 - }, +/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ - dir = 8; - icon_state = "red" + icon_state = "test_floor4" }, -/area/almayer/shipboard/starboard_missiles) +/area/almayer/living/pilotbunks) "sHY" = ( /obj/structure/sign/poster{ pixel_y = -32 @@ -66175,6 +66620,12 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"sTB" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "sTV" = ( /obj/structure/machinery/power/apc/almayer/hardened{ cell_type = /obj/item/cell/hyper; @@ -66379,15 +66830,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"sYn" = ( -/obj/structure/sign/safety/rewire{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/south2) "sYw" = ( /obj/structure/platform{ dir = 8 @@ -66405,7 +66847,8 @@ "sYB" = ( /obj/structure/closet/secure_closet/guncabinet/red, /obj/effect/decal/warning_stripes{ - icon_state = "N" + icon_state = "N"; + pixel_y = 2 }, /obj/item/ammo_magazine/smg/m39, /obj/item/ammo_magazine/smg/m39, @@ -66709,9 +67152,14 @@ /turf/open/floor/almayer, /area/almayer/living/cryo_cells) "teB" = ( -/obj/structure/largecrate/random/case/small, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/north1) +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "teY" = ( /obj/structure/machinery/light{ dir = 1 @@ -66772,6 +67220,11 @@ pixel_y = 5 }, /obj/structure/surface/table/almayer, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1; + pixel_y = 1 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -66936,9 +67389,9 @@ "tiR" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ + access_modified = 1; req_one_access = null; - req_one_access_txt = "7;19"; - access_modified = 1 + req_one_access_txt = "7;19" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -67007,13 +67460,12 @@ }, /area/almayer/shipboard/brig/processing) "tld" = ( -/obj/structure/machinery/shower{ - dir = 8 +/obj/structure/machinery/prop/almayer/computer{ + dir = 8; + pixel_x = 16 }, -/obj/structure/machinery/door/window/westright, -/obj/item/tool/soap, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "cargo" }, /area/almayer/living/pilotbunks) "tly" = ( @@ -67082,6 +67534,17 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"tmI" = ( +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/south1) "tmK" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1; @@ -67389,7 +67852,7 @@ pixel_x = 32 }, /turf/open/floor/almayer{ - icon_state = "red" + icon_state = "test_floor4" }, /area/almayer/lifeboat_pumps/north1) "tsy" = ( @@ -67705,6 +68168,9 @@ /area/almayer/medical/containment/cell) "tyK" = ( /obj/effect/spawner/random/toolbox, +/obj/structure/machinery/light{ + dir = 4 + }, /turf/open/floor/almayer{ dir = 1; icon_state = "cargo_arrow" @@ -67733,6 +68199,10 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) +"tzj" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_p) "tzx" = ( /obj/structure/machinery/cm_vending/sorted/medical/blood, /obj/structure/machinery/light{ @@ -67752,20 +68222,13 @@ }, /area/almayer/engineering/engineering_workshop) "tzL" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, /obj/structure/sign/safety/waterhazard{ pixel_x = 8; pixel_y = -32 }, +/obj/structure/machinery/portable_atmospherics/hydroponics, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "test_floor5" }, /area/almayer/medical/hydroponics) "tzP" = ( @@ -67792,8 +68255,8 @@ "tAq" = ( /obj/structure/surface/table/reinforced/black, /obj/item/clothing/mask/breath{ - pixel_y = -5; - pixel_x = -3 + pixel_x = -3; + pixel_y = -5 }, /obj/item/clothing/head/helmet/space/compression/uscm, /obj/item/cell/crap{ @@ -67840,8 +68303,11 @@ }, /area/almayer/medical/lower_medical_medbay) "tAV" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_m_s) +"tBq" = ( +/obj/item/tool/crowbar, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south1) "tBz" = ( @@ -67898,9 +68364,13 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) "tDA" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_m_p) +/obj/item/tool/weldpack{ + pixel_y = 15 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "tDZ" = ( /obj/structure/machinery/cryopod{ pixel_y = 6 @@ -67979,13 +68449,12 @@ /area/almayer/squads/req) "tFW" = ( /obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ - dir = 1; - icon_state = "red" + icon_state = "test_floor4" }, /area/almayer/lifeboat_pumps/south1) "tGd" = ( @@ -68201,10 +68670,10 @@ dir = 1 }, /obj/structure/machinery/door/airlock/almayer/generic{ + access_modified = 1; dir = 1; name = "Storage"; - req_one_access = "2;21"; - access_modified = 1 + req_one_access = "2;21" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -68444,10 +68913,10 @@ /area/almayer/living/grunt_rnr) "tPj" = ( /obj/structure/machinery/door/airlock/almayer/marine/requisitions{ + access_modified = 1; name = "\improper Requisition's Office"; - req_one_access_txt = "1;26"; req_one_access = null; - access_modified = 1 + req_one_access_txt = "1;26" }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -68474,10 +68943,10 @@ /turf/open/floor/almayer, /area/almayer/living/briefing) "tQE" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 +/obj/item/clothing/head/welding, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_s) "tQL" = ( /obj/structure/pipes/standard/simple/hidden/supply, @@ -68704,10 +69173,10 @@ name = "\improper CMO Office Shutters" }, /obj/structure/machinery/door/airlock/almayer/medical/glass{ + access_modified = 1; name = "\improper CMO's Office"; req_one_access = null; - req_one_access_txt = "1;5"; - access_modified = 1 + req_one_access_txt = "1;5" }, /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ @@ -68752,9 +69221,9 @@ "tXG" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/door/window/eastright{ + access_modified = 1; dir = 8; - req_access_txt = "19"; - access_modified = 1 + req_access_txt = "19" }, /obj/effect/landmark/map_item, /obj/structure/machinery/door/window/eastleft{ @@ -68932,10 +69401,11 @@ /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_m_p) "uac" = ( -/obj/structure/largecrate/random/case, /obj/structure/machinery/light{ dir = 1 }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/almayer, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) "uah" = ( @@ -68991,11 +69461,11 @@ /turf/open/floor/almayer, /area/almayer/command/computerlab) "uaZ" = ( -/obj/structure/sign/safety/storage{ - pixel_x = 8; - pixel_y = -32 +/obj/structure/surface/table/almayer, +/obj/item/weapon/gun/rifle/m41a, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_s) "ubd" = ( /obj/structure/surface/rack, @@ -69374,10 +69844,10 @@ /area/almayer/squads/charlie_delta_shared) "ukW" = ( /obj/structure/machinery/door/airlock/almayer/security{ + access_modified = 1; name = "\improper Security Checkpoint"; req_access = null; - req_one_access_txt = "3;19"; - access_modified = 1 + req_one_access_txt = "3;19" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -69395,12 +69865,8 @@ }, /area/almayer/shipboard/brig/evidence_storage) "uli" = ( -/obj/structure/surface/rack, -/obj/effect/spawner/random/facepaint, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) +/turf/open/floor/grass, +/area/almayer/living/starboard_garden) "uly" = ( /obj/structure/bed/stool, /turf/open/floor/almayer{ @@ -69445,16 +69911,24 @@ icon_state = "mono" }, /area/almayer/medical/upper_medical) +"umR" = ( +/obj/structure/machinery/power/apc/almayer/hardened{ + cell_type = /obj/item/cell/hyper; + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/north2) "umS" = ( -/obj/structure/machinery/firealarm{ - dir = 4; - pixel_x = 24 +/obj/structure/bed/chair/comfy{ + dir = 8 }, /turf/open/floor/almayer{ dir = 4; - icon_state = "red" + icon_state = "blue" }, -/area/almayer/shipboard/starboard_missiles) +/area/almayer/living/pilotbunks) "umT" = ( /obj/structure/machinery/door/airlock/almayer/security/glass{ name = "Brig" @@ -69538,13 +70012,12 @@ }, /area/almayer/command/computerlab) "uoS" = ( -/obj/structure/sign/safety/maint{ - pixel_x = -17 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light/small{ + dir = 4 }, -/area/almayer/living/starboard_garden) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_m_s) "uoY" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm{ @@ -69703,6 +70176,13 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) +"uso" = ( +/obj/structure/largecrate/random/case/double, +/obj/structure/machinery/light/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_p) "usr" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/secure_data{ @@ -69901,6 +70381,21 @@ icon_state = "orangecorner" }, /area/almayer/squads/bravo) +"uvy" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/brig/armory) "uvG" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -69934,12 +70429,13 @@ }, /area/almayer/medical/containment/cell) "uvS" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = 32 +/obj/structure/surface/rack, +/obj/item/stack/cable_coil, +/obj/item/attachable/flashlight/grip, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south1) +/area/almayer/hull/upper_hull/u_m_s) "uvY" = ( /turf/open/floor/almayer{ dir = 8; @@ -69966,6 +70462,14 @@ /obj/structure/surface/table/woodentable/fancy, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) +"uws" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "cargo_arrow" + }, +/area/almayer/shipboard/port_missiles) "uwv" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/weapon_room/notunnel) @@ -70188,8 +70692,15 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/main_office) +"uAb" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/hangar) "uAj" = ( /obj/structure/bed/chair, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ dir = 1; icon_state = "red" @@ -70243,7 +70754,12 @@ }, /area/almayer/squads/bravo) "uBi" = ( -/obj/structure/largecrate/random/case/double, +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/almayer, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 8 + }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) "uBn" = ( @@ -70490,6 +71006,12 @@ icon_state = "test_floor4" }, /area/almayer/hallways/aft_hallway) +"uGt" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/aft_hallway) "uGw" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/drinks/cans/souto/diet/lime{ @@ -70499,13 +71021,12 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) "uGz" = ( -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/largecrate/random/secure, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "plate" }, -/area/almayer/lifeboat_pumps/south1) +/area/almayer/hull/upper_hull/u_m_s) "uGQ" = ( /obj/structure/machinery/suit_storage_unit/compression_suit/uscm, /turf/open/floor/almayer{ @@ -70513,13 +71034,15 @@ }, /area/almayer/engineering/upper_engineering/starboard) "uId" = ( -/obj/structure/bed/chair/comfy/teal{ - dir = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, +/obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer{ - icon_state = "mono" + dir = 9; + icon_state = "green" }, -/area/almayer/lifeboat_pumps/south1) +/area/almayer/hallways/aft_hallway) "uIp" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/light{ @@ -70838,11 +71361,10 @@ /turf/closed/wall/almayer/outer, /area/almayer/lifeboat_pumps/south2) "uOJ" = ( -/obj/structure/machinery/prop/almayer/computer{ - dir = 8; - pixel_x = 16 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "mono" }, -/turf/open/floor/almayer, /area/almayer/living/pilotbunks) "uPr" = ( /turf/open/floor/almayer{ @@ -70872,6 +71394,13 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/perma) +"uQn" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 3 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/starboard_hallway) "uQU" = ( /obj/structure/stairs{ dir = 1 @@ -71002,9 +71531,12 @@ /turf/open/floor/almayer, /area/almayer/squads/bravo) "uTN" = ( -/obj/effect/landmark/start/liaison, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/corporateliason) +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/living/pilotbunks) "uTU" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -71020,11 +71552,12 @@ }, /area/almayer/command/cic) "uTY" = ( -/obj/item/trash/cigbutt/ucigbutt, +/obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer{ - icon_state = "mono" + dir = 1; + icon_state = "green" }, -/area/almayer/lifeboat_pumps/south1) +/area/almayer/hallways/aft_hallway) "uTZ" = ( /obj/structure/machinery/light/small, /turf/open/floor/almayer{ @@ -71177,13 +71710,9 @@ /obj/structure/machinery/light{ dir = 1 }, -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/machinery/cm_vending/sorted/cargo_guns/pilot_officer, /turf/open/floor/almayer{ - icon_state = "sterile" + icon_state = "plate" }, /area/almayer/living/pilotbunks) "uWc" = ( @@ -71398,12 +71927,9 @@ }, /area/almayer/medical/lower_medical_medbay) "vce" = ( -/obj/structure/surface/rack, -/obj/effect/spawner/random/tool, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/south1) +/obj/docking_port/stationary/escape_pod/south, +/turf/open/floor/plating, +/area/almayer/hull/upper_hull/u_m_p) "vcq" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -71437,6 +71963,10 @@ icon_state = "red" }, /area/almayer/shipboard/brig/general_equipment) +"vcK" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer, +/area/almayer/hull/upper_hull/u_f_p) "vdJ" = ( /obj/structure/surface/table/almayer, /obj/item/pipe{ @@ -71901,6 +72431,10 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"vjK" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer, +/area/almayer/shipboard/port_missiles) "vka" = ( /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) @@ -72034,6 +72568,11 @@ /area/almayer/hull/lower_hull/l_f_s) "vmN" = ( /obj/structure/machinery/light, +/obj/structure/surface/table/almayer, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 8 + }, /turf/open/floor/almayer{ icon_state = "mono" }, @@ -72286,15 +72825,15 @@ /area/almayer/shipboard/brig/armory) "vsJ" = ( /obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; dir = 1; name = "\improper Power Control Room"; req_access = null; req_one_access = null; - req_one_access_txt = "3;6"; - access_modified = 1 + req_one_access_txt = "3;6" }, /turf/open/floor/almayer{ - icon_state = "orangefull" + icon_state = "test_floor4" }, /area/almayer/shipboard/brig/processing) "vsV" = ( @@ -72596,6 +73135,13 @@ "vzp" = ( /turf/open/floor/almayer/research/containment/entrance, /area/almayer/medical/containment/cell/cl) +"vzq" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 3 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "vzu" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -72823,11 +73369,11 @@ /area/almayer/living/briefing) "vEI" = ( /obj/structure/machinery/door/airlock/almayer/medical/glass{ + access_modified = 1; dir = 2; name = "\improper Field Surgery Equipment"; req_access_txt = "20"; - req_one_access = null; - access_modified = 1 + req_one_access = null }, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -72837,9 +73383,16 @@ }, /area/almayer/medical/lower_medical_medbay) "vFb" = ( -/obj/item/tool/crowbar, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south1) +/obj/structure/surface/table/almayer, +/obj/item/attachable/lasersight, +/obj/item/reagent_container/food/drinks/cans/souto/vanilla{ + pixel_x = 10; + pixel_y = 11 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "vFh" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/toolbox/mechanical{ @@ -72894,6 +73447,15 @@ icon_state = "orangefull" }, /area/almayer/living/briefing) +"vGI" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/numbertwobunks) "vHa" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/ares_console{ @@ -72916,6 +73478,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/living/port_emb) +"vHs" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 2 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/starboard_hallway) "vHO" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -73122,6 +73691,15 @@ icon_state = "test_floor4" }, /area/almayer/medical/upper_medical) +"vLv" = ( +/obj/structure/largecrate/random/case/double, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_p) "vLA" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -73920,14 +74498,15 @@ }, /area/almayer/hallways/aft_hallway) "wbu" = ( -/obj/structure/machinery/light{ - dir = 8 +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "red" + icon_state = "mono" }, -/area/almayer/shipboard/port_missiles) +/area/almayer/living/pilotbunks) "wbx" = ( /obj/structure/sign/safety/hazard{ desc = "A sign that warns of a hazardous environment nearby"; @@ -73969,7 +74548,15 @@ /obj/structure/machinery/status_display{ pixel_y = 30 }, -/turf/open/floor/almayer, +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_21"; + pixel_y = 15 + }, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, /area/almayer/living/pilotbunks) "wbP" = ( /obj/structure/machinery/bioprinter{ @@ -74094,11 +74681,14 @@ }, /area/almayer/medical/hydroponics) "wex" = ( -/obj/structure/machinery/light{ - dir = 4 +/obj/structure/sign/safety/bathunisex{ + pixel_x = 8; + pixel_y = -25 }, -/turf/open/floor/almayer, -/area/almayer/hull/upper_hull/u_f_s) +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/living/pilotbunks) "weB" = ( /obj/item/tool/screwdriver{ layer = 2.9; @@ -74388,9 +74978,9 @@ "wkc" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/door/window/eastright{ + access_modified = 1; dir = 8; - req_access_txt = "8"; - access_modified = 1 + req_access_txt = "8" }, /obj/structure/machinery/door/window/eastleft{ req_access_txt = "8" @@ -74670,8 +75260,8 @@ dir = 1 }, /obj/structure/pipes/vents/pump/no_boom{ - name = "Security Vent"; - desc = "Has a valve and pump attached to it, connected to multiple gas tanks." + desc = "Has a valve and pump attached to it, connected to multiple gas tanks."; + name = "Security Vent" }, /turf/open/floor/almayer/no_build{ icon_state = "plating" @@ -74772,11 +75362,14 @@ }, /turf/open/floor/almayer, /area/almayer/living/gym) -"wrT" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +"wrQ" = ( +/obj/structure/sign/safety/storage{ + pixel_x = 8; + pixel_y = -32 }, +/turf/open/floor/almayer, +/area/almayer/living/starboard_garden) +"wrT" = ( /obj/structure/surface/table/almayer, /obj/item/device/radio/marine, /obj/item/device/radio/marine, @@ -74797,6 +75390,16 @@ icon_state = "sterile_green" }, /area/almayer/medical/containment) +"wst" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "green" + }, +/area/almayer/hallways/aft_hallway) "wsD" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -74810,12 +75413,11 @@ }, /area/almayer/squads/bravo) "wta" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/closet/crate, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) +/area/almayer/hull/upper_hull/u_m_s) "wtd" = ( /obj/structure/machinery/vending/coffee, /obj/item/toy/bikehorn/rubberducky{ @@ -74913,11 +75515,11 @@ /area/almayer/lifeboat_pumps/south1) "wvl" = ( /obj/structure/machinery/door/airlock/almayer/security{ + access_modified = 1; dir = 2; name = "\improper Security Checkpoint"; req_access = null; - req_one_access_txt = "3;19"; - access_modified = 1 + req_one_access_txt = "3;19" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -75407,10 +76009,7 @@ /obj/structure/machinery/light{ dir = 4 }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, +/turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/port_missiles) "wGX" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -75479,10 +76078,10 @@ /area/almayer/medical/lower_medical_medbay) "wJo" = ( /obj/structure/machinery/door/airlock/almayer/research/reinforced{ + access_modified = 1; dir = 1; name = "\improper CMO's Bedroom"; - req_one_access_txt = "1;5"; - access_modified = 1 + req_one_access_txt = "1;5" }, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -75521,17 +76120,16 @@ /turf/closed/wall/almayer/research/containment/wall/east, /area/almayer/medical/containment/cell/cl) "wKn" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/structure/surface/rack, +/obj/item/facepaint/sniper, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hull/upper_hull/u_m_p) +/area/almayer/hull/upper_hull/u_m_s) "wKF" = ( /obj/structure/machinery/power/apc/almayer{ - dir = 1; - pixel_y = 25 + cell_type = /obj/item/cell/hyper; + dir = 1 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -75591,8 +76189,8 @@ /area/almayer/lifeboat_pumps/south2) "wLy" = ( /obj/structure/pipes/vents/pump/no_boom{ - welded = 1; - name = "Secure Reinforced Air Vent" + name = "Secure Reinforced Air Vent"; + welded = 1 }, /turf/open/floor/almayer/research/containment/floor2{ dir = 1 @@ -75713,9 +76311,13 @@ /area/almayer/living/briefing) "wNU" = ( /obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; dir = 2; - req_one_access = list(2,34,30); - access_modified = 1 + req_one_access = list(2,34,30) + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -75949,10 +76551,9 @@ }, /area/almayer/squads/charlie_delta_shared) "wTy" = ( -/obj/item/reagent_container/glass/rag, +/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ - dir = 4; - icon_state = "red" + icon_state = "test_floor4" }, /area/almayer/lifeboat_pumps/south1) "wTJ" = ( @@ -76037,7 +76638,10 @@ /obj/structure/bed/chair/comfy{ dir = 4 }, -/turf/open/floor/almayer, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "blue" + }, /area/almayer/living/pilotbunks) "wUS" = ( /obj/structure/disposalpipe/segment{ @@ -76074,7 +76678,8 @@ /obj/item/vehicle_clamp, /obj/item/vehicle_clamp, /obj/effect/decal/warning_stripes{ - icon_state = "N" + icon_state = "N"; + pixel_y = 2 }, /obj/item/ammo_magazine/smg/m39, /obj/item/ammo_magazine/smg/m39, @@ -76192,13 +76797,10 @@ /turf/closed/wall/almayer/research/containment/wall/north, /area/almayer/medical/containment/cell) "wWC" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/turf/open/floor/almayer{ + dir = 10; + icon_state = "blue" }, -/turf/open/floor/almayer, /area/almayer/living/pilotbunks) "wWL" = ( /obj/item/tool/screwdriver, @@ -76269,18 +76871,24 @@ icon_state = "test_floor4" }, /area/almayer/hallways/hangar) -"wYA" = ( -/obj/structure/bed/chair/comfy/teal{ - dir = 8 +"wYj" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 }, -/obj/item/trash/cigbutt{ - pixel_x = -12; - pixel_y = 17 +/obj/structure/bed/sofa/south/white/left{ + pixel_y = 16 }, /turf/open/floor/almayer{ - icon_state = "mono" + dir = 9; + icon_state = "silver" }, -/area/almayer/lifeboat_pumps/south1) +/area/almayer/hull/upper_hull/u_m_p) +"wYA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north1) "wYK" = ( /obj/structure/barricade/handrail/medical, /turf/open/floor/almayer{ @@ -76358,12 +76966,13 @@ }, /area/almayer/hull/lower_hull/l_a_s) "wZM" = ( -/obj/structure/bed/sofa/south, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "silver" + icon_state = "blue" }, -/area/almayer/shipboard/brig/cic_hallway) +/area/almayer/hallways/aft_hallway) "wZT" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -76560,15 +77169,11 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull) "xfh" = ( -/obj/structure/machinery/door/airlock/almayer/secure/reinforced{ - dir = 2; - name = "\improper Evacuation Airlock PU-5"; - req_access = null - }, +/obj/structure/largecrate/supply/floodlights, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/powered) +/area/almayer/hull/upper_hull/u_m_p) "xfi" = ( /obj/structure/machinery/power/smes/buildable, /obj/structure/machinery/light{ @@ -77027,10 +77632,8 @@ /area/almayer/engineering/upper_engineering/port) "xoS" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E" + icon_state = "N"; + pixel_y = 2 }, /obj/structure/closet/secure_closet/guncabinet/red, /obj/item/weapon/gun/rifle/m4ra, @@ -77078,10 +77681,10 @@ dir = 1 }, /obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ + access_modified = 1; name = "\improper Brig"; req_access = null; - req_one_access_txt = "1;3"; - access_modified = 1 + req_one_access_txt = "1;3" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -77230,10 +77833,10 @@ /area/almayer/hallways/vehiclehangar) "xtC" = ( /obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; dir = 1; req_one_access = null; - req_one_access_txt = "30;19"; - access_modified = 1 + req_one_access_txt = "30;19" }, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -77330,6 +77933,13 @@ icon_state = "plating" }, /area/almayer/engineering/engine_core) +"xuY" = ( +/obj/structure/sign/safety/escapepod{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south1) "xuZ" = ( /turf/open/floor/almayer{ dir = 8; @@ -77787,6 +78397,7 @@ pixel_y = 3 }, /obj/item/folder/yellow, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -77960,15 +78571,11 @@ }, /area/almayer/squads/alpha_bravo_shared) "xHG" = ( -/obj/structure/machinery/door/airlock/almayer/secure/reinforced{ - dir = 2; - name = "\improper Evacuation Airlock SU-5"; - req_access = null - }, +/obj/structure/surface/rack, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/powered) +/area/almayer/hull/upper_hull/u_m_p) "xHM" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/sentencing, @@ -78355,7 +78962,10 @@ /obj/structure/pipes/vents/pump{ dir = 8 }, -/turf/open/floor/almayer, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "bluecorner" + }, /area/almayer/living/pilotbunks) "xQm" = ( /turf/open/floor/almayer/research/containment/floor2{ @@ -78694,6 +79304,12 @@ "xVk" = ( /turf/open/space, /area/space/almayer/lifeboat_dock) +"xVF" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south1) "xVI" = ( /obj/structure/largecrate/random/case, /turf/open/floor/almayer{ @@ -78739,9 +79355,9 @@ /area/almayer/squads/alpha_bravo_shared) "xWo" = ( /obj/structure/machinery/door/airlock/almayer/maint{ - req_one_access_txt = "19;21"; access_modified = 1; - req_one_access = null + req_one_access = null; + req_one_access_txt = "19;21" }, /turf/open/floor/almayer{ icon_state = "plate" @@ -78757,22 +79373,20 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) "xWF" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 2; - req_one_access = list(2,34,30); - access_modified = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/structure/machinery/light/small{ + dir = 8 }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_p) "xWO" = ( -/obj/item/stack/catwalk, -/obj/structure/cable/heavyduty{ - icon_state = "4-8" +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = -25 }, -/turf/open/floor/plating, -/area/almayer/lifeboat_pumps/south1) +/obj/structure/largecrate/random/case/small, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/north1) "xWT" = ( /obj/structure/machinery/shower{ pixel_y = 16 @@ -79334,13 +79948,8 @@ }, /area/almayer/medical/morgue) "yji" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/almayer/maint, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_p) "yjq" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ @@ -79352,11 +79961,14 @@ }, /area/almayer/engineering/upper_engineering/notunnel) "yjM" = ( -/obj/effect/decal/cleanable/blood/oil, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, /turf/open/floor/almayer{ - icon_state = "mono" + dir = 4; + icon_state = "blue" }, -/area/almayer/lifeboat_pumps/south2) +/area/almayer/living/pilotbunks) "ykj" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -79467,6 +80079,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) +"ymi" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + req_one_access = null; + req_one_access_txt = "2;30;34" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hull/upper_hull/u_f_p) (1,1,1) = {" aaa @@ -90483,7 +91107,7 @@ lMc gjL cMl oeB -euO +rkL ldu eRL jZL @@ -91686,7 +92310,7 @@ lrq mAr uqo fsT -fsT +jnA fDn lrq tqV @@ -92091,7 +92715,7 @@ aou lrq mAr uqo -fsT +uvy tfO fsz lrq @@ -93923,7 +94547,7 @@ dvT ieo vxC ldD -wZM +vGA hUW dHd vka @@ -94318,9 +94942,9 @@ adG adG adG adG -akC -akC -akC +rPC +rPC +dav rPC rPC kDb @@ -94354,9 +94978,9 @@ czB mtl mnm kIV -kCi -kCi -kCi +wNU +kIV +kIV tuA tuA tuA @@ -94520,13 +95144,13 @@ aeK aeK bur hdd -aok -sHM -aHY +akC +akC +akC akC cVJ rPC -rPC +jvJ vxM sVy mKh @@ -94556,11 +95180,11 @@ kHK wfL mtl mnm -kIV +dGc +kCi +kCi +kCi kCi -dUI -wbu -rVN hjA nIE jKn @@ -94724,8 +95348,8 @@ aeK bur wdI sFf -adu -aHZ +bbV +bzz akC cRc rPC @@ -94759,9 +95383,9 @@ sBH vfv mtl mnm -kIV +dGc kCi -nRR +sDD kOv cRv sQF @@ -95130,7 +95754,7 @@ amz amz aly nkx -adu +bbZ btv akC dDC @@ -95163,7 +95787,7 @@ lNF rkK cIK mtl -mnm +tzj kIV bbR kCi @@ -95366,7 +95990,7 @@ pJE wPk hRy mtl -mnm +tzj kIV bVT kCi @@ -95742,7 +96366,7 @@ nIt adu hxG akC -avl +fvu qkn wcn vxM @@ -95981,7 +96605,7 @@ tJo bpd bqT vZv -btD +vjK awC uMj uMj @@ -96176,16 +96800,16 @@ rWs mIy eEw lPC -vka +mgy wWT xuB -gpe +vcK czJ kCi nRR btM -btD -hjA +vjK +dUZ nIE jKn pyi @@ -96347,7 +96971,7 @@ afa aeK bur wdI -sFf +aHY tyK iKI akC @@ -96385,10 +97009,10 @@ lIV gsH qFl kCi -nRR -kOv +cfk +uws cRv -sQF +nwx nIE jKn vjg @@ -96550,14 +97174,14 @@ aeK aeK bur xFP -umS -jvJ -aex +akC +akC +akC akC fcF avl lFb -avl +fvu age age vSN @@ -96585,12 +97209,12 @@ qFl qFl gpe xuB -gpe +vcK mBA kCi -pLW +kCi wGI -pPN +kCi vmW nIE jKn @@ -96754,13 +97378,13 @@ adG adG adG adG -akC -akC -akC +puK +avl +dUI avl avl lFb -avl +fvu xDp age xDn @@ -96789,10 +97413,10 @@ rnM gpe sDy ukU -cNe -qFl -qFl -kCi +bfP +fvv +vcK +vcK tuA tuA tuA @@ -96957,9 +97581,9 @@ aag aag aag pCi -puK +avl nMc -iJf +ayP iJf iJf sFZ @@ -97161,10 +97785,10 @@ aag aag pCi dRV -tGf -wex -avl -puK +bZg +kcH +kcH +kcH kcH kcH kcH @@ -98214,8 +98838,8 @@ aES aES aES aES -aES -lDN +gpe +uEv gpe xEF xEF @@ -98416,9 +99040,9 @@ ceK sxD bhJ bHG -ayP aES -xuB +aES +mtE gpe cEg hgm @@ -100456,7 +101080,7 @@ ils ajZ aaa aaa -bdH +aaa bdH bdH bdH @@ -100659,7 +101283,7 @@ xEF ajZ aaa aaa -bdH +aaa bdH bdH bdH @@ -100862,7 +101486,7 @@ aag ajZ aaa aaa -bdH +aaa bdH bdH bdH @@ -101065,7 +101689,7 @@ aag ajZ aaa aaa -bdH +aaa bdH bdH bdH @@ -101423,8 +102047,8 @@ pCi ifR jMt gpY -awW -awW +uBi +wYA awW awW awW @@ -101460,8 +102084,8 @@ baw oxu baw baw -baw -baw +oaK +nUn pgD xuB gpe @@ -101626,7 +102250,7 @@ pCi avl lIh gpY -aeX +uac vFw ajf ajf @@ -101664,7 +102288,7 @@ aZz aZz aZz wUP -cxk +lrF pgD uEv gpe @@ -101833,8 +102457,8 @@ mto acW awW awW -awW -awW +oGC +oGC aSJ goj iff @@ -102025,7 +102649,7 @@ adq aeW ajD anM -awW +oGC add aSA bvb @@ -102034,8 +102658,8 @@ ajI pYu awW acW -ads add +ryG ohB aiX awd @@ -102066,9 +102690,9 @@ ecr ecr ygs aET -oGC +nUv +aJU aJU -mYx sgU baw dqb @@ -102225,7 +102849,7 @@ bdH bdH abs adq -aeX +aea ajE awW awW @@ -102245,7 +102869,7 @@ unT kng fDV aiX -wWC +aiX tAL awX tAL @@ -102649,7 +103273,7 @@ aoI weD fdE amh -fdE +amh aiX cJu pXx @@ -102850,15 +103474,15 @@ afr akc buc weD -amh +jMm pcG iFn qnD -amd -amd +amh +kWT wUR wUR -amd +wWC auZ aiX aiX @@ -103037,7 +103661,7 @@ bdH aaC abs adq -aeY +qcq ajI add add @@ -103058,10 +103682,10 @@ aiX aiX aiX oqw -amd +lvA osT cZV -amd +pQV apq ana aiX @@ -103095,7 +103719,7 @@ gjq aJU aJU tiW -usm +eMn pgD tQV aaC @@ -103240,13 +103864,13 @@ bdH aaC abs adq -lvA +jWH ajI add auJ aHU aTm -aea +awW aTm jgF auJ @@ -103260,17 +103884,17 @@ fdE mLz iFn alw -amd +amh dGr rtY fJy xQg -apq +wWC szO aiX atU amO -avj +qLj awF awF aEW @@ -103292,13 +103916,13 @@ aJU lqZ ouQ iun -aJU +baw vPm qys lqZ aJU tiW -kWT +pUe pgD tQV aaC @@ -103383,7 +104007,7 @@ baI baI bGO bHB -btO +uAb bcm mzo sYC @@ -103466,18 +104090,18 @@ aiX amd dXY fmB -fmB -dXY -apq +umS +yjM +qbO aqw -aiX -atV +hnI +ayT amO -avj -agm +wZM +aPm awF aHk -rvA +vGI aLp awF jss @@ -103487,7 +104111,7 @@ aVk ldC vkb aET -gnv +eFM yhI tTu sgU @@ -103586,7 +104210,7 @@ bEN baX bcp bHB -aYt +xAY aYz mzo vhq @@ -103652,7 +104276,7 @@ awW avc aIv aTm -bvd +kJL cbM jzZ sLo @@ -103669,18 +104293,18 @@ aiX apt sCI pWN -pWN +uTN aqy nBE pOD bZa ahM aEf -avj -ahF +wZM +ejp awF aHn -rvA +szU aLt awF aRC @@ -103698,7 +104322,7 @@ baw hJk yac vbB -dav +kUQ vbB fDS iLd @@ -103789,7 +104413,7 @@ wqh xyw bcc bHB -aYt +xAY aYz mzo xIj @@ -103855,7 +104479,7 @@ add auJ aHU aTm -bzz +awW aTm jgF auJ @@ -103870,16 +104494,16 @@ aiX aiX aiX awq -amd -amd +lvA +pQV mHO aiX aiX -mJL aiX -ayT +aiX +atV amO -avj +oXd qFl qFl qFl @@ -103893,7 +104517,7 @@ prE aUw aUw awS -aJU +nJs aJU aJU tiW @@ -103901,8 +104525,8 @@ aJU lqZ ouQ vbB -fvu -vbB +baw +tBq qys lqZ aJU @@ -103992,7 +104616,7 @@ bEO rOc fVz bHB -btO +uII ruz mzo gwm @@ -104072,14 +104696,14 @@ fdE feS iFn alw -amd -amd -amd -amd +kFe +mJL +qbO +wbu aiX aKG amb -bZg +aiX bYe amO avj @@ -104119,15 +104743,15 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -104195,7 +104819,7 @@ gfW gfW xyw bHB -btO +uII wrT mzo pVu @@ -104275,11 +104899,11 @@ nwL amh nPx aiX -pQV +aiX uOJ pqc -amd -aiX +pqc +aqz aKH and aiX @@ -104302,8 +104926,8 @@ awS tvQ yhI tTu -gVF -qLj +sgU +baw aJU aJU aJU @@ -104322,15 +104946,15 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -104398,7 +105022,7 @@ bEP gfW bGQ bHB -btO +qnd cmp cmp cmp @@ -104478,10 +105102,10 @@ akv eGH qnl aiX -aiX -aiX -aiX -amd +fuz +pLW +sht +wex aiX aiX aiX @@ -104525,15 +105149,15 @@ bdH aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -104674,20 +105298,20 @@ awW awW abB add -add -kyY -aau +xWO +aiX +aiX aau aau aau aau uVX ase +sht +uOJ aqz -amd -aqz -ase -atS +mBe +atT aiX ayU amO @@ -104705,8 +105329,8 @@ pUJ pUJ pUJ pUJ -ryG -aJU +pgD +nUv aJU pIV baw @@ -104728,15 +105352,15 @@ bdH aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -104855,9 +105479,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +bdH +bdH +bdH aaa aaa aaa @@ -104877,17 +105501,17 @@ awW awW acW qdQ -eFT -hhA +muq +aiX +aiX aau dBs dBs -dBs aau fuz tld -aiX -ccc +uOJ +mHO aiX asf atT @@ -104906,13 +105530,13 @@ bsO aal xKW aht -aGP -pUJ -mSi -wHp +aht +gcc +pgD +lza gZw -sgU -baw +gVF +kuk baw aJU nig @@ -104928,18 +105552,18 @@ tQV aaa bdH bdH -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -105058,9 +105682,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +bdH +bdH +bdH aaa aaa aaa @@ -105070,26 +105694,26 @@ adq awW awW awW -awW -add +oGC +ryG aVL bBl aeZ -pzy -awW +ryG +oGC awW acW -ads add -ohB +bny +aiX +aiX aiX vwV vwV -vwV -aiX aiX aiX aiX +sHM kUh aiX aiX @@ -105109,16 +105733,16 @@ pUJ pUJ pUJ pUJ -aGQ pUJ -oGC +ymi +pgD +nUv aJU -mYx sgU baw baw aJU -tTu +bnZ cIe jez aJU @@ -105131,18 +105755,18 @@ tQV aaa aaa bdH -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -105261,32 +105885,32 @@ aaa aaa aaa aaa -aaa -aaa -aaa +bdH +bdH +bdH aaa aaa aaa aaa abs adq -aeZ +aei aka -aoI +aWn aar aar aar aar -tiM aar -teB +aar +oGC awW acW awW awW awW fSm -aSJ +atW apl bbL bbL @@ -105312,8 +105936,8 @@ bbL kij bbL xRU -pgo -baw +pEY +jsP baw fGg baw @@ -105326,26 +105950,26 @@ qVM qVM qVM qVM -gnv +hXV yhI -tTu +rRz pgD tQV aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -105464,32 +106088,32 @@ aaa aaa aaa aaa -aaa -aaa -aaa +bdH +bdH +bdH aaa aaa aaa aaa abs adq -afp -akc +apr +apr aoV aar -aIx -aWs -aar -aap +aIZ +aIZ +aIZ +bWK aar -uac -awW +aea +oGC xjD ajf ajf ajf -ajf oAO +heH aod qgG amC @@ -105513,42 +106137,42 @@ suV bYc bYc bYc -biT +qgG dqN tFW dGC -tAV -tAV -tAV -avZ -iYr +aZz +aZz +aZz +nsc +baw cxk qVM -csz -qVM -eRR +iBt +iBt +iBt vce qVM -crh -csI -qhb +wTy +wTy +wTy pgD tQV aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -105667,31 +106291,31 @@ aaa aaa aaa aaa +bdH +bdH +bdH aaa aaa aaa aaa -aaa -aaa -aaa -abw -aea -awW -akt -awW -avd -awW -awW +abs +adq +aub +akc +euO aar -wFm +aIZ +aIZ +aIZ +aIZ aar -uBi -awW -awW -awW +oGC +sHp +oGC awW awW awW +aSJ tsv dtM aii @@ -105716,42 +106340,42 @@ avn mTb avn nFr -asS +aii ajC dCD -baw +aXe baw baw baw mnA -rKs -aJU -xWF -csz -xWF aJU -baw aJU -baw -sMM -baw -wiz -trb -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +qVM +iBt +iBt +iBt +iBt +qVM +crh +csI +nqG +pgD +tQV aaa aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -105870,25 +106494,25 @@ aaa aaa aaa aaa +bdH +bdH +bdH aaa aaa aaa aaa -aaa -aaa -aaa -abw +abs aec -awW +avd akt awW -add -aIB -awW -aar -ceu -aar +qHq +aIZ +aIZ +aIZ +aIZ aar +rKs aar aar aar @@ -105919,42 +106543,42 @@ aoe aoe aoe aEI -asS +aii aik qVM -aWm -aWm -aWm -aWm qVM -yji qVM qVM -dux qVM -baw -vFb -aJU +qVM +xeG +qVM +qVM +iBt +iBt +iBt +iBt +eOM baw sMM -baw +xVF dLz -trb -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +tQV aaa aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -106073,23 +106697,23 @@ aaa aaa aaa aaa -aaa -aaa -aaa +bdH +bdH +bdH aaa aaa aaa aaa abs adq -aeZ +aGP aka -aoI -ads -add aWu aar -aao +aIZ +aIZ +aIZ +aIZ aar uLW tZe @@ -106122,38 +106746,38 @@ isN cnZ aoe dtM -asS +aii ajC qVM -aWn -baw -baw -uTY -qVM -mOb -qVM -qVM +gKS +gKS +csz +xCX +csz +vGk +vGk qVM +iBt +iBt +iBt +iBt qVM -uGz -aJU -mYx -gnv +hWB yhI -tTu +qSX pgD tQV aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -106276,24 +106900,24 @@ aaa aaa aaa aaa -aaa -aaa -aaa +bdH +bdH +bdH aaa aaa aaa aaa abs adq -afr +aGQ akc apg -avx -add -aYq aar -aao -aao +aIZ +aIZ +aIZ +aIZ +aar aao aap ijU @@ -106325,38 +106949,38 @@ aEi coa aoe ahr -biV +akU ajC +xCX +csz +vGk +vGk qVM -aub -uId -qHq -wYA +bDe +csz +csz qVM -pDm -tDA -qFQ -oGy +iBt +iBt +iBt +iBt qVM -aJU -aJU -pEY wvj csI -goL +iPH pgD tQV aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -106486,16 +107110,16 @@ aaa aaa aaa aaa -abw +abs aee -awW +avd akt -awW -add -aJJ -awW +qWI +aar +aar +aar +aar aar -aap lYA lYA lYA @@ -106528,7 +107152,7 @@ aEi fFh aoe dtM -biV +akU ajC czu czu @@ -106539,27 +107163,27 @@ czu czu czu czu -mov qVM -baw -baw -aJU +qVM +qVM +qVM +qVM ehj irS ilJ njD -trb -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +tQV aaa aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -106689,16 +107313,16 @@ aaa aaa aaa aaa -abw -aei -awW -akt -awW -add -awW -awW +abs +adq +aWm +aka +kyY aar -wFm +cit +ina +nuY +nuY lYA aax aax @@ -106731,7 +107355,7 @@ hFF aoe aoe dtM -asS +aii ajC czu aiJ @@ -106742,27 +107366,27 @@ atj atj atj czu -wKn +foR +usi +vGk +foR qVM -uvS -oWz -aJU rQW -xWO -baw -aJU -trb -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +yhI +tmI +pgD +tQV aaa aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -106894,14 +107518,14 @@ aaa aaa abs adq -afA -aka +apr +apr apr aar aJL aYr -aar -aap +aao +aao lYA aax aax @@ -106934,7 +107558,7 @@ aQz aRJ ajl dtM -biV +akU ajC czu aiJ @@ -106945,14 +107569,14 @@ atj atj atj czu -wKn -qVM -nUv -qga +usi +vGk +vGk +vLv qVM -kDt wTy -pwG +wTy +wTy pgD tQV aaa @@ -107102,9 +107726,9 @@ akW apu aar aar -aar -aar -tiM +aao +aap +pDm lYA acV acV @@ -107137,7 +107761,7 @@ aQz aRK ajl aDk -biV +akU ajC czu aiJ @@ -107148,14 +107772,14 @@ atl atl atl czu -wKn -qVM -gMA +dQE +vGk +csz qVM qVM -vpn +crh csI -goL +qhb pgD tQV bdH @@ -107300,14 +107924,14 @@ aaf aaf acv aez -aJW -aJW -boL boL +akY boL -aYs +aiH +aiv +aap uoS -aJW +pDm lYA adb adb @@ -107340,7 +107964,7 @@ fOL aRS ajl ahq -asS +aii ajC czu alW @@ -107351,11 +107975,11 @@ atI atI atI czu -mOb -qVM -vGk -qVM -ina +usi +foR +csz +xCX +aJU baw sMM baw @@ -107503,14 +108127,14 @@ aag aag acv aez -agh -afY -apF -apF -apF -agP -agh -aJW +boL +akY +wrQ +aar +aar +aar +aar +aar lYA adb adb @@ -107543,7 +108167,7 @@ akw alD vEx bYe -biV +akU ajC czu alW @@ -107554,12 +108178,12 @@ atI atI atI czu -mOb qVM -vGk qVM -teg -baw +qVM +qVM +qVM +nTH sMM baw teg @@ -107706,13 +108330,13 @@ aag aag acf aet -agv -afY -ahp -afY -afY -afY -bLO +agS +aiP +aYq +aar +aIZ +aIZ +aIZ bWK lYA adb @@ -107746,7 +108370,7 @@ onQ alD ajl hon -biV +akU ajC czu alW @@ -107757,10 +108381,10 @@ atI atI atI czu -ekY -qVM -csz -qVM +iBt +iBt +iBt +vce qVM gnv yhI @@ -107910,13 +108534,13 @@ aag acf aet agB -akY -akY -akY -agP -afY -bLO -ceC +akW +aYs +aar +aIZ +aIZ +aIZ +aIZ lYA vKF adb @@ -107949,7 +108573,7 @@ aCp alD ajl wqA -asS +aii ajC czu alW @@ -107960,10 +108584,10 @@ atI atI xMk czu -wKn -xCX -hoX -qVM +iBt +iBt +iBt +iBt qVM vpn csI @@ -108112,14 +108736,14 @@ aag aag acv aez -agP +boL akY -aqi +boL avJ -afY -ahl -bLO -bWK +aIZ +aIZ +aIZ +aIZ lYA adb adb @@ -108152,7 +108776,7 @@ akx alD gWG dtM -asS +aii ajC czu alW @@ -108163,11 +108787,11 @@ atI atI atI czu -wKn -qVM -csz -qVM -wiz +iBt +iBt +iBt +iBt +qxz baw sMM baw @@ -108315,14 +108939,14 @@ aag aag acv aez -afY +boL akY aqk -avV -afY -afY -bLO -cit +aar +aIZ +aIZ +aIZ +aIZ lYA adb adb @@ -108355,7 +108979,7 @@ akx alD gWG dtM -asS +aii ajC czu alW @@ -108366,12 +108990,12 @@ atI atI atI czu -mOb -qVM -vGk +iBt +iBt +iBt +iBt qVM -fwD -baw +xuY sMM baw oby @@ -108519,13 +109143,13 @@ aag acf aet agS -akY -akY -akY -afY -agP -bLO -ceC +aiP +aYq +aar +aIZ +aIZ +aIZ +aIZ lYA adb adb @@ -108558,7 +109182,7 @@ hVz alD ajl ahr -asS +aii ajC czu alW @@ -108569,10 +109193,10 @@ atI atI atI czu -mOb -qVM -vGk -qVM +iBt +iBt +iBt +iBt qVM gnv yhI @@ -108721,14 +109345,14 @@ aag aag acf aet -ahl -afY -afY -afY -afY -afY -bLO -bWK +afB +akW +biT +aar +aar +aar +aar +aar lYA adc adc @@ -108761,7 +109385,7 @@ nMV vIf ajl aEI -biV +akU gMa czu czu @@ -108772,9 +109396,9 @@ adc adc adc czu -yji qVM -gMA +qVM +qVM qVM qVM crh @@ -108924,16 +109548,16 @@ aag aag acv aez -agh -ahp -afY +boL +boL +boL ahl -agh -ahp -afY -aJW +cWv +cWv +cWv +cWv kaj -aww +uId adH adH fMA @@ -108964,7 +109588,7 @@ aos alE bVE bYe -biV +akU aGd aWl hJu @@ -108973,12 +109597,12 @@ atC aAa aww aww -aww +wst axs -bBC +bbL bbL bYe -yfv +bbL bit baw baw @@ -109127,16 +109751,16 @@ aag aag acv aez -ahp -agh -arc -arc -arc -afY -agh -aJW +boL +asS +boL +ceu +boL +boL +boL +boL kGL -azY +uTY azY azY azY @@ -109168,17 +109792,17 @@ aSb aEe ait bjJ -aZE -aZE -aZE -aZE -xwG -agl -agl -agl -agl -sHp -wta +abx +abx +abx +abx +atC +azY +azY +azY +fad +kGL +abg abg abg abg @@ -109330,18 +109954,18 @@ aah aah acf acf -aJW +boL ale bDD nub -bDD -ale -aJW +dux +iYr +dux ado +atC kHT avn avn -avn mTb atC avn @@ -109379,8 +110003,8 @@ atC mTb avn avn -avn -avn +aim +atC avn bYe cre @@ -109533,14 +110157,14 @@ aaa aaa aaa lYA -aar -aar -aar -aar -tiM -aar -tiM -aar +aet +aet +biV +biV +ekY +aet +ekY +aet abE abE abE @@ -109735,15 +110359,15 @@ aaa aaa aaa aaa -lYA -ahs +ahx +aiH alf arp -aar -aap -aao -aap -aar +arp +aiH +aiH +aiH +aet kPB aci aci @@ -109938,15 +110562,15 @@ aaa aaa aaa aaa -lYA -ahu +ahx +aiH alg -arp -aar -aap -aao -aap -aar +bBC +bBC +aIx +aIB +aiH +aet kPZ acI acj @@ -110142,14 +110766,14 @@ aaa aaa aaa lYA -ahx -aap +aet +avx ahN -aar -awJ -aao +uli +uli +uli bWf -aar +aet lwC aTT acl @@ -110345,14 +110969,14 @@ aaa aaa aaa lYA -ahy -aap -aao -aar -pmn -aao -bWj -aar +aet +avV +uli +uli +uli +mov +bWq +aet lhX aXc acl @@ -110534,28 +111158,28 @@ aab aaa aaa aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -lYA -fZF -alr -aao -sMs -aao -aao +ahx +aez +uli +aIx +uli +uli +mov bWq -aar +aet lhX eYM uuR @@ -110737,28 +111361,28 @@ aab aaa aaa aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -lYA -aar -aar -aar -aar -aap -aao -aap -aar +ahx +aez +uli +uli +uli +uli +uli +aiH +aet lhX acl acl @@ -110940,28 +111564,28 @@ aab aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa lYA -aao -aao -acD -aao -aap -aao -aap -aar +ahy +avZ +ipK +ipK +ipK +uli +bWf +aet lhX acl acl @@ -111143,28 +111767,28 @@ aab aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa lYA -aao -aar -aar -aar -aar -aar -aao -aar +aet +aIx +ipK +ceC +eRR +uli +bWq +aet loV acK acm @@ -111346,28 +111970,28 @@ aab aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa lYA -aap -aar -aru +aet +uli +ipK awe -fZF -aar -aap -aar +fwD +uli +oGy +aet lhX acl acl @@ -111549,28 +112173,28 @@ aab aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa lYA -wFm -aar -ary -awh +aet +avx ipK -aar -wFm -aar +ipK +ipK +uli +bWq +aet lhX acl acl @@ -111587,7 +112211,7 @@ vOy aID gLc mKx -mKx +iit kZV vOy vOy @@ -111752,28 +112376,28 @@ aab aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH bdH aaa aaa -lYA -aap -sMs -ahN -aap -aKc -aar -aap -aar +ahx +aez +uli +uli +uli +uli +uli +oWz +aet lhX gsZ uxO @@ -111790,7 +112414,7 @@ vOy aMd pGK pRX -pRX +mHD pRX vOy jFf @@ -111955,28 +112579,28 @@ aab aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH bdH bdH aaa -lYA -uaZ -aar -arI -ahg +ahx +aez +aIB +aKg uli -aar -aap -aar +uli +mov +bWq +aet lhX kNO acl @@ -111992,7 +112616,7 @@ avj vOy aMg aSo -mHD +pRX mHD tzL vOy @@ -112158,28 +112782,28 @@ aab aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH bdH aaa aaa lYA -ahN -aar -aar -aar -aar -aar -aao -aar +aet +aJJ +aIB +uli +uli +mov +bWq +aet lwC tIK acl @@ -112196,7 +112820,7 @@ vOy aQZ bkT pRX -pRX +mHD pRX vOy foP @@ -112361,28 +112985,28 @@ aab aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH bdH aaa aaa lYA -cIU -aao -sMs -aao +aet +avx +ahN +aIB aKg -aYM -aao -aar +uli +bWf +aet abK acL acn @@ -112399,7 +113023,7 @@ vOy dVd lea hKl -mKx +lDN kZV vOy vOy @@ -112564,28 +113188,28 @@ aab aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH bdH aaa aaa -lYA -ahW -aao -aar -aao -aap -aap -aap -sMs +ahx +aiH +uli +bLO +bLO +bLO +bLO +aiH +qga eAU eAU eAU @@ -112628,7 +113252,7 @@ bqo aRD aGt byp -uTN +aGt awE vGk qVM @@ -112767,8 +113391,8 @@ aab aaa aaa aaa -aaa -aaa +bdH +bdH aaa aaa aaa @@ -112780,15 +113404,15 @@ aaa bdH aaa aaa -lYA +ahx aiH -aao -aar +aiH +bWd awi -aao -aao -aao -aar +bWd +mOb +aiH +aet aBD acU uPr @@ -112984,10 +113608,10 @@ bdH aaa aaa lYA -aiP -aao aar -awJ +tiM +aar +aar aNi aNi bWr @@ -113189,8 +113813,8 @@ aaa lYA aiS aao -aar aao +acD aNi cYT aNm @@ -113392,7 +114016,7 @@ aaa lYA aiT aap -aar +aao aap aNi aZe @@ -113595,7 +114219,7 @@ aaa lYA aiU aap -aar +aap aap aNi aZr @@ -113798,8 +114422,8 @@ aaa lYA aiZ aap -aar -tQE +aao +aap aNi aZs aNm @@ -114001,7 +114625,7 @@ aaa lYA adf aao -aar +aao aao aNi jWr @@ -114203,9 +114827,9 @@ aaa aaa lYA fZF -aao +aWs aar -aao +tiM aNi aNi aNi @@ -114406,7 +115030,7 @@ aaa aaa lYA aar -tiM +aar aar awJ bzE @@ -114812,7 +115436,7 @@ aam aam aam lYA -aao +qsd aap aar aar @@ -114853,7 +115477,7 @@ akU jHG qVM qVM -xeG +qVM qVM qVM qVM @@ -115056,8 +115680,8 @@ akU avj qVM nNA -vGk -csz +ekO +nNA qVM iBt iBt @@ -115257,10 +115881,10 @@ vOy ayT aii avj -qVM -har +ltK vGk -hoX +hDv +ghW qVM iBt iBt @@ -115460,10 +116084,10 @@ vOy ayT aii avj -qVM -csz -vGk -csz +ltK +wYj +jhY +fqx qVM iBt iBt @@ -115663,8 +116287,8 @@ vOy aEK aSv ioX -qVM -pzQ +ltK +nXF vGk bqG qVM @@ -115868,7 +116492,7 @@ akV atL qVM qVM -xeG +nWc qVM qVM qVM @@ -116649,7 +117273,7 @@ abg caF aar aar -aar +tiM aar aar ael @@ -116659,8 +117283,8 @@ aih ael tnl amO -abg anc +atC apJ apJ aMl @@ -116674,8 +117298,8 @@ apJ aMl apJ apJ +atC cnv -abg amO lqJ qVM @@ -116684,7 +117308,7 @@ xeG qVM qVM qVM -qVM +xeG qVM qVM qVM @@ -116851,9 +117475,9 @@ bWs abg caF aar -aIZ -aIZ -aIZ +nuY +sTB +uaZ bUA ael afE @@ -116863,7 +117487,7 @@ ael cZm akU abg -abg +atC abg abx abx @@ -116877,7 +117501,7 @@ abx abx abx avD -abg +atC abg amO nQx @@ -116886,9 +117510,9 @@ usi csz usi qVM -iBt -iBt -iBt +xfh +vGk +vGk adI qVM acG @@ -117054,10 +117678,10 @@ acO aJs cbN aar -aIZ -aIZ -aIZ -aIZ +sTB +aap +aao +vFb ael afH agV @@ -117065,8 +117689,8 @@ ain ael eGl aii -abg anf +atC apK anf apK @@ -117080,19 +117704,19 @@ aDp apK cbr apK +atC cbr -abg amO -abg +uGt qVM qVM vGk har qVM -iBt -iBt -iBt -iBt +xHG +csz +vGk +xHG qVM aJd aJs @@ -117256,11 +117880,11 @@ aba pNQ abx hTy -bWd -aIZ -aIZ -aIZ -aIZ +aar +teB +aao +aao +wta ael afI agY @@ -117268,7 +117892,7 @@ oxi xfm als ani -aow +anc mOi mOi mOi @@ -117284,19 +117908,19 @@ aHq aHq aHq aHq -abg +iWN ajt -abg +kGI aPm qVM vGk -hoX +csz +xCX +vGk +vGk +vGk +csz qVM -iBt -iBt -iBt -iBt -nuY jSY abx hLO @@ -117458,12 +118082,12 @@ aIZ aar acP bUE -cbO +qFQ aar -aIZ -aIZ -aIZ -aIZ +aao +aap +aao +sTB ael afJ agY @@ -117471,7 +118095,7 @@ aiq ajJ aEX ajt -ali +aow mOi rCw rCw @@ -117489,18 +118113,18 @@ bti aHq sDC ajt -abg +kGI ejp qVM vGk -csz +hoX qVM -iBt -iBt -iBt -iBt +xHG +csz +vGk +csz qVM -acP +sah bUE cbO qVM @@ -117663,10 +118287,10 @@ acG abx caF aar -aIZ -aIZ -aIZ -aIZ +aap +aap +aao +sTB ael afK ahc @@ -117674,7 +118298,7 @@ air ael isW ajt -abg +ali mOi wCT sIf @@ -117692,16 +118316,16 @@ rUy cnS iWN ajt -abg +nYv qVM qVM vGk pzQ qVM -iBt -iBt -iBt -iBt +usi +vzl +vGk +csz qVM acG abx @@ -117866,10 +118490,10 @@ oPD abx lCz aar -aar -aar -aar -aar +tAV +sTB +uvS +wKn ael afL ahe @@ -117903,7 +118527,7 @@ dWm qVM qVM qVM -qVM +xeG qVM qVM oPD @@ -118069,10 +118693,10 @@ acG abx caF aar -aIZ -aIZ -aIZ -bUA +tiM +aar +aar +aar adO adO adO @@ -118104,10 +118728,10 @@ qVM qVM qVM qVM -iBt -iBt -iBt -adI +xfh +xWF +vGk +yji qVM acG abx @@ -118272,10 +118896,10 @@ acO aJs arJ aar -aIZ -aIZ -aIZ -aIZ +aao +aao +uGz +uGz adO afM fpR @@ -118307,10 +118931,10 @@ aXx jKI aXx qVM -iBt -iBt -iBt -iBt +usi +csz +vGk +csz qVM acO aJs @@ -118474,11 +119098,11 @@ bWh jSY abx hTy -xHG -aIZ -aIZ -aIZ -aIZ +aar +wFm +tQE +aao +sTB adO afN ahh @@ -118510,11 +119134,11 @@ oyE mMP mMP qVM -iBt -iBt -iBt -iBt -xfh +vGk +csz +vGk +csz +qVM jSY abx hLO @@ -118676,12 +119300,12 @@ aIZ aar acP bUE -cbO +qFQ aar -aIZ -aIZ -aIZ -aIZ +aap +aap +aao +fZF adO afO ahh @@ -118713,12 +119337,12 @@ sIA gSj aXA qVM -iBt -iBt -iBt -iBt +vGk +csz +vGk +xHG qVM -acP +sah bUE cbO qVM @@ -118881,10 +119505,10 @@ aJa abg ccf aar -aIZ -aIZ -aIZ -aIZ +tDA +aao +aap +fZF adO jkj ahh @@ -118916,10 +119540,10 @@ ckK iKM aHM qVM -iBt -iBt -iBt -iBt +vGk +csz +yji +uso qVM aJa abg @@ -119086,7 +119710,7 @@ kOG aar aar aar -aar +tiM aar aar lFt @@ -119119,7 +119743,7 @@ dbv lII aWc qVM -qVM +xeG qVM qVM qVM @@ -119190,8 +119814,8 @@ aQL mJP bSn aQL -aLG -aNO +vHs +ehH aYZ sLE bAV @@ -119217,8 +119841,8 @@ bCB cbv iEb bHY -bHa -buH +mru +syP bJC jSp lAQ @@ -119290,7 +119914,7 @@ aiv ahg aap aap -aap +aao rfg aiw ahh @@ -119393,8 +120017,8 @@ aTw aUj kLk aQL -aWN -aLG +mTn +aiy aYZ sLE bbk @@ -119420,8 +120044,8 @@ bdk bGh iEb bHY -buH -fBx +njy +hkE bJC ojF bNG @@ -119597,7 +120221,7 @@ aQL aQL aQL aQL -aLG +uQn aYZ sLE bbl @@ -119623,7 +120247,7 @@ bdl bGi iEb bHY -buH +oyy bJC bJC bJC @@ -120500,8 +121124,8 @@ aeC asV ayn atr -bbV -atr +aeA +aex ciw asV aeC @@ -120547,8 +121171,8 @@ kkx vcE mMu iMx -bXe -jMm +tGi +lJY bXe eyG mMu @@ -120906,7 +121530,7 @@ aeA atp ayR atr -bbZ +eGb atr cji nqV @@ -120954,7 +121578,7 @@ lJY hlX umh bXe -kFe +lxT tGi pfH wlF @@ -121103,13 +121727,13 @@ aaa bdH abh acx -aeC +umR ajs aeC asV ayn atr -aeC +aeA bXz ciw asV @@ -121157,13 +121781,13 @@ vcE mMu iMx bXe -yjM -bXe +lJY +mzF eyG mMu vcE kUV -vcE +pPF rRq uOi bdH @@ -122120,7 +122744,7 @@ abh abh abh abh -nPX +aeC atr aeC atr @@ -122176,7 +122800,7 @@ vcE bXe vcE bXe -sYn +vcE uOi uOi uOi @@ -122323,7 +122947,7 @@ aad aag aag abh -qbO +aeC atr aeC atr @@ -122379,7 +123003,7 @@ vcE bXe vcE bXe -sht +vcE uOi aag aag @@ -123659,8 +124283,8 @@ aQL aQL aLG aYO -aLG -jJs +kBK +hyt bdl tFS bdj @@ -123680,8 +124304,8 @@ jaR mJa wWP rsK -pJJ -buH +aGc +kkE iEb bIT bJC @@ -123862,7 +124486,7 @@ bES kcl aLG aYO -aLG +sou bAX bdl wIr @@ -123884,7 +124508,7 @@ bdl bdl bdl dhU -buH +vzq iEb bIT hNw @@ -125491,7 +126115,7 @@ kFY jmK bDL bbs -iit +ccQ bCN rbF vub