From 38b4be3a9f2d92f1b3d5bb960c8d1a26b34f9d94 Mon Sep 17 00:00:00 2001 From: ItsVyzo Date: Sun, 3 Dec 2023 18:16:01 +0300 Subject: [PATCH] Revert "Revert "map fixes"" This reverts commit 96f92a9ee0cfe1aedd146664ce189328e230c3e7. --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 10050 ++++++++++--------- 1 file changed, 5484 insertions(+), 4566 deletions(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index edcd89add4a1..263bce521d2a 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -363,15 +363,6 @@ icon_state = "test_floor4" }, /area/almayer/powered) -"abc" = ( -/obj/structure/sign/safety/rewire{ - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) "abd" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -1097,14 +1088,6 @@ "adu" = ( /turf/open/floor/almayer, /area/almayer/shipboard/starboard_missiles) -"adv" = ( -/obj/structure/machinery/light, -/obj/structure/flora/pottedplant{ - pixel_y = 3; - pixel_x = -1 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "ady" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -1303,16 +1286,17 @@ /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) "aeo" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/structure/machinery/light{ + dir = 1 }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ - name = "Brig" +/obj/structure/closet/secure_closet{ + name = "secure evidence locker"; + req_access_txt = "3" }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "cargo" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/evidence_storage) "aep" = ( /turf/closed/wall/almayer, /area/almayer/engineering/airmix) @@ -1331,40 +1315,6 @@ "aet" = ( /turf/closed/wall/almayer, /area/almayer/living/starboard_garden) -"aew" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/item/clothing/mask/cigarette/pipe{ - pixel_y = -7; - layer = 2.8 - }, -/obj/item/reagent_container/spray/cleaner{ - pixel_x = -4; - pixel_y = 7; - layer = 3.04 - }, -/obj/structure/machinery/door_control/brbutton{ - pixel_y = 26; - pixel_x = -12; - id = "Brig Lockdown Shutters"; - name = "Brig Lockdown" - }, -/obj/structure/machinery/door_control/brbutton{ - pixel_y = 26; - id = "ARES StairsLock"; - name = "ARES Exterior Lockdown Override"; - pixel_x = -2 - }, -/obj/structure/machinery/door_control/brbutton{ - pixel_y = 26; - pixel_x = 8; - name = "ARES Emergency Lockdown Override"; - id = "ARES Emergency" - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "aex" = ( /obj/item/reagent_container/food/drinks/cans/beer{ pixel_x = 6; @@ -2161,14 +2111,6 @@ icon_state = "plate" }, /area/almayer/living/cafeteria_officer) -"aha" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/item/bedsheet/hop, -/obj/structure/bed, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "ahb" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -2292,30 +2234,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_p) -"ahv" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/folder/black{ - pixel_y = 8 - }, -/obj/item/folder/yellow, -/obj/item/device/flashlight/lamp/green{ - pixel_y = 8; - pixel_x = -16 - }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) -"ahw" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/machinery/faxmachine/uscm/command/capt{ - name = "Commanding Officer's Fax Machine"; - pixel_y = 3; - pixel_x = -4 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "ahx" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, @@ -2423,18 +2341,6 @@ icon_state = "bluecorner" }, /area/almayer/living/offices/flight) -"ahY" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) -"ahZ" = ( -/obj/structure/machinery/cm_vending/clothing/commanding_officer, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/living/commandbunks) "aia" = ( /turf/open/floor/almayer{ dir = 8; @@ -2646,19 +2552,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) -"aiF" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) -"aiG" = ( -/obj/structure/machinery/status_display{ - pixel_x = 32; - pixel_y = 16 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "aiH" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -2727,15 +2620,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_s) -"aiW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) "aiX" = ( /turf/closed/wall/almayer, /area/almayer/living/pilotbunks) @@ -3079,83 +2963,6 @@ icon_state = "redcorner" }, /area/almayer/shipboard/weapon_room) -"akk" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/machinery/computer/card{ - dir = 4; - pixel_x = 2 - }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) -"akl" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/item/prop/magazine/boots/n160{ - pixel_y = -8; - pixel_x = 4; - layer = 2.8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/living/commandbunks) -"akm" = ( -/obj/structure/toilet{ - dir = 8; - pixel_y = 8; - layer = 2.9 - }, -/obj/structure/window{ - pixel_y = -2; - layer = 2.95 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/commandbunks) -"akn" = ( -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "silver" - }, -/area/almayer/command/cichallway) -"ako" = ( -/obj/structure/machinery/door/window/westright, -/obj/structure/machinery/shower{ - dir = 8; - layer = 3.10; - plane = -4 - }, -/obj/item/tool/soap{ - pixel_x = 2; - pixel_y = 7 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/commandbunks) -"akp" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/storage/bible{ - desc = "As the legendary US Army chaplain once said, 'There are no Athiests in fancy offices'."; - name = "Holy Bible"; - pixel_x = -3; - pixel_y = 9 - }, -/obj/item/prop/helmetgarb/rosary{ - pixel_y = 5; - pixel_x = -4 - }, -/obj/item/device/flashlight/lamp{ - pixel_y = 1; - pixel_x = 3 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "akr" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -3163,21 +2970,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) -"aks" = ( -/obj/structure/bookcase{ - icon_state = "book-5"; - name = "medical manuals bookcase"; - opacity = 0 - }, -/obj/item/book/manual/surgery, -/obj/item/book/manual/research_and_development, -/obj/item/book/manual/medical_diagnostics_manual, -/obj/item/book/manual/medical_cloning, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "akt" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -3405,37 +3197,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/starboard_garden) -"alb" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/coatrack{ - pixel_y = 1; - pixel_x = -5 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) -"alc" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/mirror{ - pixel_x = -29 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/living/commandbunks) "ald" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -3474,18 +3235,6 @@ icon_state = "bluecorner" }, /area/almayer/hallways/aft_hallway) -"alj" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/machinery/power/apc/almayer{ - dir = 8 - }, -/obj/item/storage/briefcase{ - pixel_y = 15 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "alk" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -3503,23 +3252,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/hallways/aft_hallway) -"alo" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/door/airlock/almayer/command/reinforced{ - dir = 1; - id_tag = "CO-Office"; - name = "\improper Commanding Officer's Office"; - req_access = null; - req_access_txt = "31" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/commandbunks) "alp" = ( /turf/open/floor/almayer{ dir = 9; @@ -3540,15 +3272,6 @@ icon_state = "bluecorner" }, /area/almayer/hallways/aft_hallway) -"alu" = ( -/obj/structure/closet/secure_closet/commander, -/obj/item/clothing/suit/storage/marine/light/vest, -/obj/item/device/whistle, -/obj/item/device/megaphone, -/obj/item/device/radio, -/obj/item/clothing/shoes/laceup, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "alw" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 2; @@ -3983,6 +3706,12 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/aft_hallway) +"anl" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_s) "anm" = ( /obj/structure/stairs{ icon_state = "ramptop" @@ -4323,25 +4052,6 @@ icon_state = "bluecorner" }, /area/almayer/hallways/aft_hallway) -"aox" = ( -/obj/structure/machinery/cm_vending/clothing/dress{ - density = 0; - pixel_y = 16 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/machinery/door_control{ - id = "bot_uniforms"; - name = "Uniform Vendor Lockdown"; - pixel_x = -24; - pixel_y = 18; - req_access_txt = "31" - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/command/cic) "aoy" = ( /obj/structure/sign/safety/fire_haz{ pixel_x = 8; @@ -4582,12 +4292,6 @@ icon_state = "plating" }, /area/almayer/engineering/upper_engineering) -"aoZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "apa" = ( /obj/structure/surface/rack, /obj/item/tool/screwdriver, @@ -6860,12 +6564,12 @@ /turf/open/floor/grass, /area/almayer/living/starboard_garden) "avz" = ( -/obj/structure/closet/secure_closet/brig/prisoner, +/obj/structure/machinery/light, +/obj/structure/machinery/vending/security, /turf/open/floor/almayer{ - dir = 8; - icon_state = "redcorner" + icon_state = "plate" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/general_equipment) "avB" = ( /turf/open/floor/almayer{ dir = 8; @@ -9359,12 +9063,29 @@ }, /area/almayer/living/offices/flight) "aEk" = ( -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle, -/turf/open/floor/almayer{ +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/secure_data{ dir = 4; - icon_state = "plating_striped" + pixel_y = 17 }, -/area/almayer/shipboard/brig/armory) +/obj/structure/machinery/computer/cameras/almayer_network{ + dir = 4 + }, +/obj/structure/machinery/computer/card{ + dir = 4; + pixel_y = -16 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/sign/safety/terminal{ + pixel_x = -17; + pixel_y = 7 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/brig/main_office) "aEm" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/working_joe{ @@ -9762,7 +9483,14 @@ id = "Brig Lockdown Shutters"; name = "\improper Brig Lockdown Shutter" }, -/turf/open/floor/plating/plating_catwalk, +/obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; + dir = 2; + req_one_access = list(2,34,30) + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, /area/almayer/hull/upper_hull/u_f_s) "aFV" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -10584,8 +10312,11 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/almayer{ + dir = 4; + icon_state = "redcorner" + }, +/area/almayer/shipboard/brig/main_office) "aJG" = ( /obj/structure/bed/chair/office/dark{ dir = 8; @@ -10967,6 +10698,15 @@ icon_state = "dark_sterile" }, /area/almayer/living/numbertwobunks) +"aLA" = ( +/obj/item/trash/uscm_mre, +/obj/structure/bed/chair/comfy/charlie{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "emeraldfull" + }, +/area/almayer/living/briefing) "aLB" = ( /turf/closed/wall/almayer, /area/almayer/hallways/starboard_hallway) @@ -11675,11 +11415,15 @@ }, /area/almayer/engineering/upper_engineering) "aOY" = ( -/obj/structure/closet/secure_closet/medical2, +/obj/structure/bed/chair, +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, /turf/open/floor/almayer{ - icon_state = "sterile_green_side" + dir = 1; + icon_state = "red" }, -/area/almayer/shipboard/brig/surgery) +/area/almayer/shipboard/brig/processing) "aPa" = ( /obj/structure/machinery/light{ dir = 8 @@ -12286,12 +12030,25 @@ }, /area/almayer/medical/upper_medical) "aSh" = ( -/obj/structure/bed/chair/comfy/alpha{ - dir = 1 +/obj/structure/surface/table/almayer, +/obj/item/device/flashlight/lamp{ + layer = 3.3; + pixel_x = 15 + }, +/obj/item/paper_bin/uscm{ + pixel_x = -7; + pixel_y = 6 + }, +/obj/item/tool/pen{ + pixel_x = -11; + pixel_y = 5 + }, +/obj/item/tool/pen{ + pixel_x = -10; + pixel_y = -2 }, -/obj/item/prop/helmetgarb/helmet_nvg/cosmetic, /turf/open/floor/almayer{ - icon_state = "redfull" + icon_state = "plate" }, /area/almayer/living/briefing) "aSl" = ( @@ -12479,15 +12236,13 @@ /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) "aSS" = ( -/obj/structure/machinery/light{ - dir = 4 +/obj/structure/sink{ + pixel_y = 24 }, -/obj/structure/machinery/power/apc/almayer, -/obj/structure/sign/safety/rewire{ - pixel_y = -38 +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) +/area/almayer/shipboard/brig/perma) "aSY" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -12520,15 +12275,8 @@ }, /area/almayer/lifeboat_pumps/north1) "aTg" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) "aTj" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -12915,6 +12663,12 @@ icon_state = "green" }, /area/almayer/living/offices) +"aUP" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "aUY" = ( /obj/structure/machinery/light{ dir = 4 @@ -15518,16 +15272,12 @@ /turf/open/floor/plating, /area/almayer/living/starboard_garden) "bja" = ( -/obj/structure/bed, -/obj/structure/machinery/flasher{ - id = "Cell 3"; - pixel_x = -24 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/secure_data{ + dir = 1 }, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/main_office) "bjb" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, @@ -16502,11 +16252,18 @@ }, /area/almayer/medical/operating_room_four) "bop" = ( -/obj/structure/machinery/cryopod/right, +/obj/structure/machinery/cm_vending/clothing/military_police{ + density = 0; + pixel_y = 16 + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, /turf/open/floor/almayer{ icon_state = "cargo" }, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/general_equipment) "boq" = ( /obj/structure/bed/chair/comfy/alpha, /turf/open/floor/almayer{ @@ -16878,15 +16635,11 @@ /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) "bqp" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, /turf/open/floor/almayer{ - dir = 5; - icon_state = "red" + dir = 4; + icon_state = "redcorner" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/processing) "bqw" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/wood/ship, @@ -17549,13 +17302,10 @@ }, /area/almayer/living/briefing) "bua" = ( -/obj/structure/toilet{ - dir = 8 - }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "redcorner" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/main_office) "buc" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -17740,12 +17490,12 @@ }, /area/almayer/engineering/engine_core) "buX" = ( -/obj/effect/decal/cleanable/blood, +/obj/effect/landmark/crap_item, /turf/open/floor/almayer{ - dir = 8; - icon_state = "redcorner" + dir = 1; + icon_state = "red" }, -/area/almayer/shipboard/brig/execution) +/area/almayer/shipboard/brig/main_office) "bvb" = ( /obj/structure/machinery/light{ dir = 8 @@ -17800,14 +17550,11 @@ }, /area/almayer/living/briefing) "bvx" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/poddoor/almayer/locked{ - dir = 2; - id = "Perma 1"; - name = "\improper cell shutter" +/turf/open/floor/almayer{ + dir = 10; + icon_state = "red" }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/main_office) "bvz" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/closet/secure_closet/surgical{ @@ -18776,9 +18523,17 @@ }, /area/almayer/shipboard/weapon_room) "bAM" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/perma) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet{ + pixel_y = 26 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/general_equipment) "bAN" = ( /obj/structure/machinery/light{ dir = 1 @@ -19272,14 +19027,6 @@ icon_state = "cargo" }, /area/almayer/living/cryo_cells) -"bCO" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/machinery/computer/emails{ - dir = 4; - pixel_y = 2 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "bCP" = ( /obj/structure/bed/chair{ dir = 1 @@ -19652,13 +19399,11 @@ }, /area/almayer/squads/req) "bEv" = ( -/obj/effect/landmark/start/police, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 2.5 +/turf/open/floor/almayer{ + dir = 1; + icon_state = "cargo_arrow" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/general_equipment) "bEw" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -20441,6 +20186,28 @@ "bHP" = ( /turf/open/floor/plating/almayer, /area/almayer/shipboard/weapon_room) +"bHS" = ( +/obj/structure/surface/table/almayer, +/obj/item/trash/USCMtray{ + pixel_y = 4 + }, +/obj/item/trash/USCMtray{ + pixel_y = 6 + }, +/obj/item/trash/USCMtray{ + pixel_y = 8 + }, +/obj/item/trash/USCMtray{ + pixel_y = 10 + }, +/obj/item/device/flashlight/lamp{ + layer = 3.3; + pixel_x = 15 + }, +/turf/open/floor/almayer{ + icon_state = "emeraldfull" + }, +/area/almayer/living/briefing) "bHT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -20609,12 +20376,6 @@ }, /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/navigation) -"bIz" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) "bIA" = ( /obj/structure/sink{ dir = 4; @@ -21878,14 +21639,9 @@ }, /area/almayer/squads/delta) "bND" = ( -/obj/structure/machinery/keycard_auth{ - pixel_x = 25 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/structure/bed/chair, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/perma) "bNE" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 26 @@ -22713,17 +22469,11 @@ /obj/structure/machinery/light{ dir = 4 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/bed/chair, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" }, -/obj/structure/surface/table/almayer, -/obj/effect/spawner/random/facepaint, -/obj/effect/spawner/random/facepaint, -/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/lobby) "bRo" = ( /obj/effect/landmark/late_join/working_joe, @@ -22816,7 +22566,7 @@ /area/almayer/hull/lower_hull/l_f_p) "bRH" = ( /turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/evidence_storage) +/area/almayer/shipboard/brig/cryo) "bRK" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -23182,7 +22932,7 @@ dir = 6 }, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/main_office) "bTx" = ( /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) @@ -23611,6 +23361,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/medical_science) +"bVg" = ( +/obj/structure/machinery/status_display{ + pixel_x = 32; + pixel_y = 16 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "bVi" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -23676,16 +23433,18 @@ }, /area/almayer/command/corporateliason) "bVC" = ( -/obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 8; - id = "bot_armory"; + id = "cmp_armory"; name = "\improper Armory Shutters" }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 8 +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + name = "\improper Armory" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, -/turf/open/floor/plating, /area/almayer/shipboard/brig/armory) "bVE" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ @@ -23956,18 +23715,10 @@ /area/almayer/engineering/engineering_workshop) "bXc" = ( /obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/snacks/mre_pack/xmas2{ - pixel_x = 5; +/obj/structure/machinery/microwave{ pixel_y = 9 }, -/obj/effect/landmark/map_item{ - layer = 3.03; - pixel_x = -7; - pixel_y = 4 - }, -/obj/item/reagent_container/food/snacks/mre_pack/xmas3{ - pixel_x = 5 - }, +/obj/item/reagent_container/food/snacks/packaged_burger, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -24211,27 +23962,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/aft_hallway) -"bYd" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/tool/stamp/hop{ - name = "Commanding Officer's rubber stamp"; - pixel_x = -5; - pixel_y = 9 - }, -/obj/item/paper_bin/uscm{ - pixel_y = 6; - pixel_x = 7 - }, -/obj/item/tool/pen/red/clicky{ - pixel_x = -6; - pixel_y = 3 - }, -/obj/item/tool/pen/blue/clicky{ - pixel_x = -6; - pixel_y = -3 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "bYe" = ( /turf/open/floor/almayer{ icon_state = "mono" @@ -24585,13 +24315,13 @@ /turf/open/floor/almayer, /area/almayer/hallways/vehiclehangar) "bZN" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "Bathroom" }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/chief_mp_office) "bZO" = ( /obj/structure/machinery/light{ dir = 8 @@ -25182,6 +24912,15 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"ccm" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/closet/secure_closet/fridge/organic, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/grunt_rnr) "ccq" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -25317,14 +25056,14 @@ }, /area/almayer/engineering/lower_engineering) "ccF" = ( -/obj/structure/bed/chair/comfy/alpha{ - dir = 1 - }, /obj/structure/machinery/light{ dir = 8 }, +/obj/structure/bed/chair/comfy/alpha{ + dir = 1 + }, /turf/open/floor/almayer{ - icon_state = "redfull" + icon_state = "plate" }, /area/almayer/living/briefing) "ccG" = ( @@ -25458,6 +25197,15 @@ }, /turf/open/floor/almayer, /area/almayer/squads/charlie) +"cdk" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "redcorner" + }, +/area/almayer/shipboard/brig/main_office) "cdm" = ( /obj/effect/landmark/ert_spawns/distress_cryo, /obj/effect/landmark/late_join, @@ -25918,15 +25666,27 @@ /turf/open/floor/almayer, /area/almayer/squads/charlie) "cgz" = ( -/obj/structure/bed/chair/comfy/charlie, /obj/structure/sign/poster{ desc = "Eat an EAT bar! ...Aren't they called MEAT bars?"; icon_state = "poster7"; name = "EAT - poster"; pixel_x = 27 }, +/obj/structure/surface/table/almayer, +/obj/item/paper_bin/uscm{ + pixel_x = 9; + pixel_y = 6 + }, +/obj/item/tool/pen{ + pixel_x = 9; + pixel_y = 9 + }, +/obj/item/tool/pen{ + pixel_x = 9; + pixel_y = 2 + }, /turf/open/floor/almayer{ - icon_state = "emeraldfull" + icon_state = "plate" }, /area/almayer/living/briefing) "cgA" = ( @@ -26286,19 +26046,15 @@ }, /area/almayer/lifeboat_pumps/north2) "ciF" = ( -/obj/structure/sign/safety/medical{ - pixel_x = -17; - pixel_y = 6 - }, -/obj/structure/sign/safety/restrictedarea{ - pixel_x = -17; - pixel_y = -9 +/obj/structure/sign/safety/cryo{ + pixel_x = 8; + pixel_y = -26 }, /turf/open/floor/almayer{ - dir = 8; + dir = 6; icon_state = "red" }, -/area/almayer/shipboard/brig/lobby) +/area/almayer/shipboard/brig/main_office) "ciN" = ( /turf/open/floor/almayer{ dir = 6; @@ -27403,7 +27159,8 @@ "cos" = ( /obj/structure/machinery/light/small, /obj/effect/decal/warning_stripes{ - icon_state = "N" + icon_state = "N"; + pixel_y = 1 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -27484,17 +27241,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/offices) -"cpr" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = -28 - }, -/turf/open/floor/almayer, -/area/almayer/hull/upper_hull/u_f_s) "cpw" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -27542,16 +27288,17 @@ }, /area/almayer/command/airoom) "cqn" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/recharger, -/obj/item/tool/hand_labeler{ - pixel_x = -8; - pixel_y = 3 +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 2; + id = "bot_armory"; + name = "\improper Armory Shutters" }, -/area/almayer/shipboard/brig/general_equipment) +/turf/open/floor/plating, +/area/almayer/shipboard/brig/armory) "cqz" = ( /obj/structure/surface/table/almayer, /obj/item/facepaint/black, @@ -27620,10 +27367,8 @@ }, /area/almayer/squads/req) "crK" = ( -/obj/structure/bed/chair/comfy/alpha{ - dir = 1 - }, /obj/structure/pipes/vents/pump, +/obj/structure/surface/table/almayer, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -27653,8 +27398,15 @@ }, /area/almayer/hull/upper_hull/u_m_p) "csG" = ( -/obj/structure/bed/chair/comfy/delta, -/obj/item/trash/popcorn, +/obj/structure/surface/table/almayer, +/obj/item/device/flashlight/lamp{ + pixel_x = 15 + }, +/obj/item/paper, +/obj/item/reagent_container/food/drinks/cans/waterbottle{ + pixel_x = -10; + pixel_y = 4 + }, /turf/open/floor/almayer{ icon_state = "bluefull" }, @@ -27691,18 +27443,10 @@ }, /area/almayer/squads/bravo) "ctn" = ( -/obj/structure/sign/safety/security{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/restrictedarea{ - pixel_y = 32 - }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "red" + icon_state = "redcorner" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/lobby) "cts" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -27746,14 +27490,25 @@ }, /area/almayer/hallways/stern_hallway) "cuk" = ( -/obj/structure/machinery/light{ - dir = 8 +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ + name = "\improper Cryogenics Bay" }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "red" + icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/lobby) +/area/almayer/shipboard/brig/cryo) +"cum" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/bed/chair/comfy/charlie{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "cus" = ( /obj/docking_port/stationary/lifeboat_dock/starboard, /turf/open/floor/almayer_hull{ @@ -27894,15 +27649,18 @@ }, /area/almayer/hull/upper_hull/u_a_p) "cxA" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/cameras/almayer_network{ - dir = 4 +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, +/area/almayer/shipboard/brig/main_office) +"cxZ" = ( +/obj/structure/bed/chair/comfy/delta, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ - dir = 8; - icon_state = "red" + icon_state = "plate" }, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/living/briefing) "cyo" = ( /obj/structure/machinery/vending/cigarette, /turf/open/floor/almayer{ @@ -27943,13 +27701,11 @@ /turf/closed/wall/almayer/outer, /area/almayer/hull/upper_hull/u_m_p) "czB" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, +/obj/effect/decal/cleanable/blood, /turf/open/floor/almayer{ - icon_state = "red" + icon_state = "redcorner" }, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/execution) "czG" = ( /obj/structure/machinery/recharge_station, /turf/open/floor/almayer{ @@ -28121,18 +27877,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/chapel) -"cCd" = ( -/obj/structure/sign/prop1{ - pixel_y = 32 - }, -/obj/structure/filingcabinet/security{ - pixel_x = -8 - }, -/obj/structure/filingcabinet/medical{ - pixel_x = 8 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "cCD" = ( /obj/structure/platform{ dir = 8; @@ -28284,7 +28028,9 @@ pixel_x = -27 }, /obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, /area/almayer/living/briefing) "cEO" = ( /obj/structure/largecrate/supply/floodlights, @@ -28332,13 +28078,10 @@ }, /area/almayer/hull/upper_hull/u_a_p) "cFO" = ( -/obj/structure/machinery/power/apc/almayer{ - cell_type = /obj/item/cell/hyper; - dir = 1 - }, +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ dir = 1; - icon_state = "red" + icon_state = "redcorner" }, /area/almayer/shipboard/brig/main_office) "cFP" = ( @@ -28354,11 +28097,6 @@ /obj/effect/decal/warning_stripes{ icon_state = "SE-out" }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera" - }, -/obj/structure/closet/emcloset, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) "cGr" = ( @@ -28400,6 +28138,17 @@ "cHu" = ( /turf/closed/wall/almayer/research/containment/wall/south, /area/almayer/medical/containment/cell/cl) +"cHA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/command/cichallway) "cHE" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -28438,6 +28187,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_s) +"cIl" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "cIr" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -28470,11 +28226,13 @@ }, /area/almayer/hull/lower_hull/l_a_p) "cIK" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 +/obj/structure/janitorialcart, +/obj/item/tool/mop, +/obj/structure/machinery/light/small, +/turf/open/floor/almayer{ + icon_state = "redcorner" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/execution) "cIU" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -28574,13 +28332,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_p) -"cKG" = ( -/obj/structure/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/evidence_storage) "cKL" = ( /turf/open/floor/almayer{ dir = 8; @@ -28588,11 +28339,17 @@ }, /area/almayer/engineering/upper_engineering/port) "cKX" = ( -/obj/structure/platform, /obj/structure/pipes/vents/scrubber{ dir = 4 }, -/turf/open/floor/almayer, +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/emails{ + pixel_x = 2; + pixel_y = 5 + }, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, /area/almayer/living/briefing) "cKY" = ( /obj/structure/machinery/light, @@ -28742,13 +28499,9 @@ /turf/open/floor/almayer, /area/almayer/living/grunt_rnr) "cNY" = ( -/obj/structure/machinery/firealarm{ - pixel_y = -28 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/structure/machinery/computer/crew, /turf/open/floor/almayer{ + dir = 9; icon_state = "red" }, /area/almayer/shipboard/brig/main_office) @@ -28823,6 +28576,23 @@ "cQv" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/general_equipment) +"cQD" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 + }, +/obj/structure/mirror{ + pixel_x = -29 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/commandbunks) "cQF" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/floor/almayer{ @@ -29012,9 +28782,6 @@ /area/almayer/engineering/upper_engineering/starboard) "cVJ" = ( /obj/structure/largecrate/supply, -/obj/structure/sign/safety/bulkhead_door{ - pixel_y = 32 - }, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -29069,16 +28836,17 @@ }, /area/almayer/living/offices) "cWs" = ( -/obj/structure/bed, -/obj/structure/machinery/flasher{ - id = "Cell 6"; - pixel_x = -24 +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer{ dir = 8; - icon_state = "red" + icon_state = "redcorner" }, -/area/almayer/shipboard/brig/cells) +/area/almayer/shipboard/brig/main_office) "cWt" = ( /turf/open/floor/almayer{ dir = 4; @@ -29115,14 +28883,24 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_s) "cWN" = ( -/obj/structure/window/reinforced/ultra{ - pixel_y = -12 +/obj/structure/filingcabinet{ + density = 0; + pixel_x = -8; + pixel_y = 18 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/filingcabinet/security{ + density = 0; + pixel_x = 8; + pixel_y = 18 }, -/obj/structure/bed/chair/bolted, /turf/open/floor/almayer{ - icon_state = "plating_striped" + dir = 9; + icon_state = "red" }, -/area/almayer/shipboard/brig/execution) +/area/almayer/shipboard/brig/chief_mp_office) "cXi" = ( /obj/structure/machinery/light{ unacidable = 1; @@ -29235,7 +29013,7 @@ /area/almayer/hallways/aft_hallway) "cZs" = ( /turf/closed/wall/almayer/outer, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/chief_mp_office) "cZJ" = ( /obj/structure/machinery/door/airlock/almayer/maint{ name = "\improper Core Hatch" @@ -29300,25 +29078,11 @@ }, /area/almayer/hallways/starboard_hallway) "daj" = ( -/obj/structure/filingcabinet{ - density = 0; - pixel_x = -8; - pixel_y = 18 - }, -/obj/structure/filingcabinet{ - density = 0; - pixel_x = 8; - pixel_y = 18 - }, -/obj/structure/machinery/power/apc/almayer{ - dir = 8 - }, -/obj/structure/sign/safety/rewire{ - pixel_x = -17; - pixel_y = 17 +/obj/structure/machinery/iv_drip, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" }, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/evidence_storage) +/area/almayer/shipboard/brig/surgery) "daz" = ( /turf/closed/wall/almayer/white/hull, /area/almayer/command/airoom) @@ -29398,19 +29162,12 @@ /turf/open/floor/almayer, /area/almayer/living/briefing) "dci" = ( -/obj/structure/machinery/door/poddoor/almayer/locked{ - dir = 2; - id = "Perma 1"; - name = "\improper cell shutter" - }, -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - name = "\improper Isolation Cell"; - dir = 2 - }, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 8; + icon_state = "redcorner" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/main_office) "dck" = ( /obj/structure/bed/stool, /turf/open/floor/almayer{ @@ -29423,17 +29180,13 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) "dcP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/machinery/body_scanconsole{ + dir = 8 }, -/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "dark_sterile" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/surgery) "dcS" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -29486,12 +29239,15 @@ }, /area/almayer/squads/req) "deb" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 +/obj/structure/bed, +/obj/structure/machinery/flasher{ + id = "Perma 2"; + pixel_y = -24 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/brig/perma) "deg" = ( /obj/structure/platform_decoration{ dir = 1 @@ -29568,17 +29324,11 @@ }, /area/almayer/shipboard/brig/cells) "dfp" = ( -/obj/structure/window/reinforced/ultra{ - pixel_y = -12 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/bed/chair/bolted, -/turf/open/floor/almayer{ - icon_state = "plating_striped" +/obj/structure/machinery/keycard_auth{ + pixel_y = 25 }, -/area/almayer/shipboard/brig/execution) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/chief_mp_office) "dfC" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -29628,14 +29378,11 @@ }, /area/almayer/living/gym) "dgx" = ( -/obj/structure/bed/chair/wood/normal{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood, /turf/open/floor/almayer{ - icon_state = "cargo" + dir = 8; + icon_state = "red" }, -/area/almayer/shipboard/brig/execution) +/area/almayer/shipboard/brig/chief_mp_office) "dgN" = ( /obj/structure/surface/rack, /obj/item/tool/shovel/etool{ @@ -29694,12 +29441,13 @@ }, /area/almayer/hallways/starboard_umbilical) "diw" = ( -/obj/structure/bed/chair/comfy/delta, /obj/structure/machinery/light{ dir = 8 }, +/obj/structure/bed/chair/comfy/delta, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ - icon_state = "bluefull" + icon_state = "plate" }, /area/almayer/living/briefing) "diz" = ( @@ -29749,17 +29497,15 @@ }, /area/almayer/command/combat_correspondent) "djm" = ( -/obj/structure/surface/table/almayer, -/obj/effect/landmark/map_item, -/obj/item/folder/red, -/obj/structure/transmitter/rotary{ - name = "Brig CMP's Office Telephone"; - phone_category = "Offices"; - phone_id = "Brig CMP's Office"; - pixel_x = 15 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/execution) "djp" = ( /obj/structure/closet/crate, /obj/item/stack/sheet/mineral/plastic{ @@ -29849,6 +29595,25 @@ icon_state = "redfull" }, /area/almayer/living/offices/flight) +"dkn" = ( +/obj/structure/machinery/cm_vending/clothing/dress{ + density = 0; + pixel_y = 16 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/machinery/door_control{ + id = "bot_uniforms"; + name = "Uniform Vendor Lockdown"; + pixel_x = -24; + pixel_y = 18; + req_access_txt = "31" + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/command/cic) "dkq" = ( /obj/structure/machinery/door_control{ id = "hangarentrancenorth"; @@ -29866,25 +29631,11 @@ icon_state = "red" }, /area/almayer/living/briefing) -"dkt" = ( -/obj/structure/toilet{ - dir = 8 - }, -/obj/structure/machinery/light/small, -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/shipboard/brig/chief_mp_office) "dkH" = ( -/obj/structure/bed/chair/comfy/delta, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 }, +/obj/structure/bed/chair/comfy/delta, /turf/open/floor/almayer{ icon_state = "bluefull" }, @@ -29930,15 +29681,13 @@ /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) "dls" = ( -/obj/structure/sign/safety/medical{ - pixel_x = 16; - pixel_y = 27 +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_x = -30 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "red" + icon_state = "dark_sterile" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/surgery) "dlN" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -29959,12 +29708,6 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"dml" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) "dmv" = ( /turf/open/floor/almayer{ dir = 8; @@ -30128,46 +29871,6 @@ icon_state = "cargo" }, /area/almayer/squads/req) -"dpa" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/bodybags{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/storage/box/bodybags, -/obj/structure/machinery/light/small{ - dir = 4; - pixel_y = -12 - }, -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, -/obj/structure/sign/safety/rewire{ - pixel_x = 32; - pixel_y = 17 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/shipboard/brig/execution) -"dpn" = ( -/obj/structure/closet/secure_closet/freezer/fridge/full, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/item/reagent_container/food/condiment/enzyme, -/obj/item/reagent_container/food/condiment/enzyme, -/obj/structure/transmitter{ - name = "Kitchen Telephone"; - phone_category = "Almayer"; - phone_id = "Kitchen"; - pixel_x = -8; - pixel_y = 29 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/grunt_rnr) "dpo" = ( /obj/structure/machinery/light{ dir = 1 @@ -30280,16 +29983,34 @@ icon_state = "green" }, /area/almayer/hallways/aft_hallway) +"dqQ" = ( +/obj/structure/closet/secure_closet/fridge/groceries, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/grunt_rnr) "dqV" = ( -/obj/structure/machinery/door/window/brigdoor/southright{ - id = "Cell 2"; - name = "Cell 2" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/sign/safety/two{ - pixel_x = -17 +/obj/structure/machinery/vending/coffee, +/obj/structure/machinery/light{ + dir = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) +/obj/structure/machinery/door_control{ + id = "perma_lockdown"; + name = "\improper Perma Cells Lockdown"; + pixel_y = 24; + req_access_txt = "3" + }, +/obj/structure/sign/safety/coffee{ + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/perma) "drj" = ( /obj/structure/window/reinforced{ dir = 4; @@ -30310,6 +30031,18 @@ icon_state = "silver" }, /area/almayer/engineering/port_atmos) +"drp" = ( +/obj/structure/toilet{ + dir = 8; + layer = 2.9; + pixel_y = 8 + }, +/obj/structure/window{ + layer = 2.95; + pixel_y = -2 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/commandbunks) "drt" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -30359,18 +30092,14 @@ }, /area/almayer/hull/upper_hull/u_a_p) "dsw" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass{ - dir = 1; - name = "\improper Brig Equipment" - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 2 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/cryo) "dtv" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -30390,18 +30119,11 @@ }, /area/almayer/hallways/aft_hallway) "dtN" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_x = -30 - }, -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 2 - }, +/obj/structure/closet/emcloset, /turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" + icon_state = "plate" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/hull/upper_hull/u_f_p) "dtZ" = ( /obj/structure/platform_decoration{ dir = 4 @@ -30530,6 +30252,9 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) +"dvT" = ( +/turf/closed/wall/almayer, +/area/almayer/shipboard/brig/general_equipment) "dwl" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, @@ -30561,6 +30286,13 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/starboard) +"dxm" = ( +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/general_equipment) "dxu" = ( /obj/structure/sink{ dir = 1; @@ -30617,14 +30349,17 @@ }, /area/almayer/engineering/engineering_workshop/hangar) "dxT" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, /obj/structure/machinery/light{ dir = 4 }, -/turf/open/floor/plating/plating_catwalk, +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, /area/almayer/shipboard/brig/lobby) "dyb" = ( /obj/structure/machinery/smartfridge/chemistry, @@ -30741,7 +30476,9 @@ dir = 8 }, /obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, /area/almayer/living/briefing) "dAX" = ( /obj/structure/machinery/camera/autoname/almayer{ @@ -30946,9 +30683,6 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/obj/structure/machinery/light/small{ - dir = 1 - }, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -31018,16 +30752,8 @@ /obj/structure/machinery/light{ dir = 1 }, -/obj/structure/surface/table/almayer, -/obj/item/toy/deck/uno, -/obj/item/toy/deck{ - pixel_x = -9 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cryo) "dFF" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_21" @@ -31108,6 +30834,26 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"dGD" = ( +/obj/structure/closet/secure_closet{ + name = "\improper Spare Restraints"; + req_one_access_txt = "3" + }, +/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/glasses/sunglasses/blindfold, +/obj/item/clothing/glasses/sunglasses/blindfold, +/obj/item/clothing/glasses/sunglasses/blindfold, +/obj/item/clothing/glasses/sunglasses/blindfold, +/obj/item/clothing/glasses/sunglasses/blindfold, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/processing) "dHd" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -31157,12 +30903,19 @@ /turf/open/floor/wood/ship, /area/almayer/living/basketball) "dHv" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "Bathroom"; - dir = 1 +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/firstaid/toxin{ + pixel_x = 3; + pixel_y = 3 }, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/item/storage/firstaid/adv, +/obj/item/device/defibrillator, +/obj/item/reagent_container/spray/cleaner, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" + }, +/area/almayer/shipboard/brig/surgery) "dHV" = ( /obj/structure/machinery/light{ dir = 1 @@ -31372,12 +31125,9 @@ }, /area/almayer/living/captain_mess) "dOL" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - layer = 2.5 - }, +/obj/structure/bed/chair/comfy/black, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/execution) +/area/almayer/shipboard/brig/chief_mp_office) "dPm" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -31403,10 +31153,6 @@ dir = 4 }, /obj/structure/largecrate/random/barrel/green, -/obj/structure/sign/safety/maint{ - pixel_x = 15; - pixel_y = 32 - }, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -31527,8 +31273,13 @@ /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_s) "dSc" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/general_equipment) +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/main_office) "dSn" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ @@ -31727,15 +31478,22 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) "dWk" = ( -/obj/structure/window/reinforced/ultra{ - pixel_y = -12 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/door_control{ + id = "CMP Office Shutters"; + name = "CMP Office Shutters"; + pixel_y = 32; + req_one_access_txt = "24;31" }, -/obj/structure/bed/chair/bolted, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" +/obj/structure/machinery/door_control{ + id = "Brig Lockdown Shutters"; + name = "Brig Lockdown Shutters"; + pixel_y = 24; + req_access_txt = "3" }, -/area/almayer/shipboard/brig/execution) +/obj/structure/machinery/faxmachine/uscm/brig/chief, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/chief_mp_office) "dWm" = ( /obj/structure/surface/table/almayer, /obj/item/storage/firstaid/o2, @@ -31793,13 +31551,9 @@ }, /area/almayer/medical/lower_medical_medbay) "dXy" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/main_office) "dXG" = ( /obj/structure/pipes/vents/scrubber{ dir = 1 @@ -31839,6 +31593,17 @@ }, /turf/open/floor/almayer, /area/almayer/living/chapel) +"dYH" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/bed/chair/comfy/alpha{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "dYK" = ( /obj/item/folder/red{ desc = "A red folder. The previous contents are a mystery, though the number 28 has been written on the inside of each flap numerous times. Smells faintly of cough syrup."; @@ -31893,13 +31658,21 @@ }, /area/almayer/engineering/upper_engineering) "eaf" = ( -/obj/effect/landmark/start/warrant, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +/obj/structure/machinery/cm_vending/clothing/military_police{ + density = 0; + pixel_y = 16 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cryo) +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/shipboard/brig/general_equipment) "ean" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -31950,23 +31723,25 @@ }, /area/almayer/command/lifeboat) "ebt" = ( -/obj/structure/machinery/cryopod, -/obj/structure/machinery/light{ - dir = 8; - invisibility = 101 - }, -/obj/structure/machinery/status_display{ - pixel_x = -32 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/floor/almayer{ - icon_state = "cargo" +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" }, -/area/almayer/shipboard/brig/cryo) +/obj/structure/closet/secure_closet/guncabinet/blue/riot_control, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/armory) "ebz" = ( -/turf/open/floor/almayer{ - icon_state = "dark_sterile" +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/area/almayer/shipboard/brig/surgery) +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/structure/closet/secure_closet/guncabinet/blue/riot_control, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/armory) "ebD" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -32014,15 +31789,16 @@ }, /area/almayer/command/cichallway) "ecq" = ( +/obj/structure/surface/table/almayer, +/obj/item/book/manual/marine_law{ + pixel_x = -3; + pixel_y = 1 + }, /obj/structure/machinery/status_display{ pixel_x = 32 }, -/obj/structure/surface/table/almayer, -/obj/effect/spawner/random/toy, -/obj/effect/spawner/random/goggles/midchance, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera"; - dir = 1 +/obj/item/device/flashlight/lamp/green{ + pixel_x = 6 }, /turf/open/floor/almayer{ dir = 6; @@ -32179,22 +31955,50 @@ }, /area/almayer/living/grunt_rnr) "eeN" = ( -/obj/structure/bed/chair/bolted, +/obj/structure/bed/chair, /turf/open/floor/almayer{ - dir = 9; + dir = 1; icon_state = "red" }, /area/almayer/shipboard/brig/processing) "efh" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/door_control{ + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutters"; + pixel_x = -8; + pixel_y = -6; + req_access_txt = "3" }, -/obj/structure/machinery/vending/snack{ - density = 0; - pixel_y = 16 +/obj/structure/machinery/door_control{ + id = "Brig Lockdown Shutters"; + name = "Brig Lockdown Shutters"; + pixel_x = -8; + pixel_y = 2; + req_access_txt = "3" }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) +/obj/structure/machinery/door_control{ + id = "courtyard window"; + name = "Courtyard Window Shutters"; + pixel_x = -8; + pixel_y = 10; + req_access_txt = "3" + }, +/obj/structure/machinery/door_control{ + id = "Cell Privacy Shutters"; + name = "Cell Privacy Shutters"; + pixel_x = 2; + pixel_y = 10; + req_access_txt = "3" + }, +/obj/structure/machinery/recharger{ + pixel_x = 6; + pixel_y = -2 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/brig/main_office) "efK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -32268,11 +32072,15 @@ }, /area/almayer/hull/upper_hull/u_a_s) "egR" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, /turf/open/floor/almayer{ - allow_construction = 0 + dir = 8; + icon_state = "red" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/main_office) "egS" = ( /obj/structure/closet, /obj/item/clothing/ears/earmuffs, @@ -32386,12 +32194,7 @@ dir = 4 }, /obj/structure/sign/safety/distribution_pipes{ - pixel_x = -19; - pixel_y = -6 - }, -/obj/structure/sign/safety/bulkhead_door{ - pixel_x = -19; - pixel_y = 6 + pixel_x = -17 }, /turf/open/floor/almayer{ dir = 8; @@ -32411,12 +32214,11 @@ }, /area/almayer/living/port_emb) "eiO" = ( -/obj/structure/bed/chair{ - can_buckle = 0; - dir = 4 +/turf/open/floor/almayer{ + dir = 8; + icon_state = "redcorner" }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/main_office) "eiP" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -32480,7 +32282,7 @@ dir = 4; icon_state = "red" }, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/perma) "eko" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/plating/plating_catwalk, @@ -32524,15 +32326,11 @@ /obj/structure/machinery/light/small{ dir = 4 }, -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, /turf/open/floor/almayer{ - dir = 5; + dir = 4; icon_state = "red" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/perma) "elA" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -32556,6 +32354,22 @@ dir = 1 }, /area/almayer/medical/containment/cell) +"elX" = ( +/obj/structure/surface/table/almayer, +/obj/item/trash/uscm_mre, +/obj/effect/decal/cleanable/dirt, +/obj/item/device/flashlight/lamp{ + layer = 3.3; + pixel_x = 15 + }, +/obj/item/reagent_container/food/drinks/cans/souto/diet/grape{ + pixel_x = -7; + pixel_y = 10 + }, +/turf/open/floor/almayer{ + icon_state = "emeraldfull" + }, +/area/almayer/living/briefing) "eme" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -32626,17 +32440,13 @@ }, /area/almayer/hull/lower_hull/l_m_s) "eni" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 1 +/obj/structure/surface/table/almayer, +/obj/item/prop/magazine/book/spacebeast, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) +/area/almayer/shipboard/brig/evidence_storage) "enx" = ( /obj/structure/pipes/vents/pump, /obj/structure/machinery/status_display{ @@ -32651,11 +32461,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/machinery/vending/snack, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/almayer{ - icon_state = "redcorner" + icon_state = "red" }, /area/almayer/shipboard/brig/main_office) "eoG" = ( @@ -32678,11 +32489,15 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) "eoP" = ( -/obj/structure/bed/chair/comfy/orange{ - dir = 8 +/obj/structure/bed, +/obj/structure/machinery/flasher{ + id = "Perma 1"; + pixel_y = 24 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/brig/perma) "eoT" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -32697,10 +32512,6 @@ }, /area/almayer/hallways/aft_hallway) "epq" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, /obj/structure/sign/poster{ desc = "One of those hot, tanned babes back the beaches of good ol' Earth."; icon_state = "poster12"; @@ -32708,7 +32519,13 @@ pixel_x = 27; serial_number = 12 }, -/turf/open/floor/almayer, +/obj/structure/bed/chair/comfy/delta{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, /area/almayer/living/briefing) "epu" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -32853,20 +32670,18 @@ }, /area/almayer/squads/delta) "erx" = ( -/obj/structure/toilet{ - pixel_y = 13 - }, -/obj/structure/sink{ - dir = 4; - pixel_x = 11 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 2 }, -/obj/structure/machinery/light/small{ - dir = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + icon_state = "plate" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/cryo) "erz" = ( /obj/structure/closet/crate, /obj/item/ammo_box/magazine/l42a, @@ -32899,23 +32714,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_umbilical) -"erZ" = ( -/obj/item/trash/plate{ - pixel_x = 9; - pixel_y = 11 - }, -/obj/item/reagent_container/food/snacks/carpmeat{ - layer = 3.3; - pixel_y = 11; - pixel_x = 8 - }, -/obj/item/reagent_container/food/snacks/carpmeat{ - layer = 3.3; - pixel_y = 11; - pixel_x = 8 - }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) "esi" = ( /obj/structure/sign/safety/stairs{ pixel_x = 15; @@ -32935,6 +32733,20 @@ icon_state = "plate" }, /area/almayer/hallways/starboard_hallway) +"esy" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = -29 + }, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/command/cichallway) "esF" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -33023,6 +32835,33 @@ icon_state = "test_floor4" }, /area/almayer/living/officer_study) +"euM" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/paper_bin/uscm{ + pixel_x = -17; + pixel_y = 7 + }, +/obj/item/tool/pen/clicky{ + pixel_x = -13; + pixel_y = -1 + }, +/obj/item/tool/pen/clicky{ + pixel_x = -13; + pixel_y = 5 + }, +/obj/structure/machinery/door_control{ + id = "CO-Office"; + name = "Door Control"; + normaldoorcontrol = 1; + pixel_y = 7; + req_access_txt = "31" + }, +/obj/item/ashtray/bronze{ + pixel_x = 12; + pixel_y = 1 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "euN" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -33152,12 +32991,16 @@ /turf/open/floor/almayer, /area/almayer/command/lifeboat) "exr" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, /obj/structure/machinery/light{ unacidable = 1; unslashable = 1 }, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + dir = 1; + icon_state = "sterile_green_side" }, /area/almayer/shipboard/brig/surgery) "ext" = ( @@ -33191,14 +33034,13 @@ }, /area/almayer/hull/upper_hull/u_f_p) "eyg" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/machinery/cryopod/right{ + pixel_y = 6 }, -/obj/structure/machinery/power/apc/almayer, /turf/open/floor/almayer{ - icon_state = "red" + icon_state = "cargo" }, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/cryo) "eyv" = ( /obj/structure/machinery/sentry_holder/almayer, /turf/open/floor/almayer{ @@ -33262,13 +33104,17 @@ }, /area/almayer/hallways/hangar) "ezU" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/firealarm{ - dir = 4; - pixel_x = 21 + pixel_y = 28 + }, +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" }, -/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/lobby) "ezX" = ( /obj/structure/bed/chair/wood/normal, @@ -33343,20 +33189,6 @@ icon_state = "orange" }, /area/almayer/hallways/starboard_hallway) -"eBo" = ( -/obj/structure/bed/bedroll{ - name = "cat bed"; - desc = "A bed of cotton fabric, purposely made for a cat to comfortably sleep on." - }, -/mob/living/simple_animal/cat/Jones{ - dir = 8 - }, -/obj/structure/machinery/firealarm{ - pixel_y = 28; - pixel_x = -1 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "eBC" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -33383,14 +33215,15 @@ }, /area/almayer/squads/charlie_delta_shared) "eBW" = ( -/obj/structure/machinery/cryopod/right{ - layer = 3.1; - pixel_y = 13 +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 24 }, /turf/open/floor/almayer{ - icon_state = "cargo" + dir = 8; + icon_state = "red" }, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/evidence_storage) "eBZ" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/firstaid/fire{ @@ -33423,8 +33256,6 @@ }, /area/almayer/lifeboat_pumps/south2) "eCS" = ( -/obj/structure/bed/chair/comfy/delta, -/obj/item/trash/popcorn, /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 }, @@ -33866,14 +33697,6 @@ "eNi" = ( /turf/closed/wall/almayer, /area/almayer/engineering/ce_room) -"eNp" = ( -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/processing) "eNv" = ( /obj/structure/largecrate/random, /turf/open/floor/almayer, @@ -33902,14 +33725,24 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) +"eOh" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "redcorner" + }, +/area/almayer/shipboard/brig/evidence_storage) "eOk" = ( -/obj/structure/bed/chair/bolted{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 }, /turf/open/floor/almayer{ - icon_state = "plate" + allow_construction = 0 }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/lobby) "eOr" = ( /obj/structure/bed/chair{ dir = 8 @@ -33933,24 +33766,18 @@ }, /area/almayer/powered) "eOR" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/cameras/almayer_network{ - dir = 8 +/obj/structure/machinery/light{ + dir = 4 }, /turf/open/floor/almayer{ dir = 4; icon_state = "red" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/main_office) "eOW" = ( /obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/cameras/almayer_network{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "red" - }, +/obj/structure/machinery/computer/sentencing, +/turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) "ePk" = ( /obj/structure/airlock_assembly, @@ -33973,16 +33800,11 @@ }, /area/almayer/hallways/starboard_hallway) "ePB" = ( -/obj/structure/surface/rack, -/obj/item/storage/firstaid/adv{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/storage/firstaid/regular, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "redcorner" }, -/area/almayer/shipboard/brig/execution) +/area/almayer/shipboard/brig/general_equipment) "ePY" = ( /obj/structure/pipes/vents/pump{ dir = 8; @@ -34078,11 +33900,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"eSJ" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "eSU" = ( /obj/structure/prop/almayer/name_stencil{ icon_state = "almayer1" @@ -34123,23 +33940,25 @@ }, /area/almayer/medical/upper_medical) "eTo" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 +/obj/structure/sign/safety/bathunisex{ + pixel_x = 8; + pixel_y = 25 }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) "eTx" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 - }, -/obj/structure/machinery/light{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/general_equipment) +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/armory) "eTO" = ( /obj/structure/sign/safety/maint{ pixel_x = -17 @@ -34207,11 +34026,20 @@ /turf/open/floor/carpet, /area/almayer/command/corporateliason) "eUU" = ( -/obj/structure/machinery/atm{ - pixel_y = 32 +/obj/structure/closet/secure_closet/brig{ + name = "Spare Prison Uniforms" }, +/obj/item/clothing/shoes/orange, +/obj/item/clothing/shoes/orange, +/obj/item/clothing/shoes/orange, +/obj/item/clothing/shoes/orange, +/obj/item/clothing/under/color/orange, +/obj/item/clothing/under/color/orange, +/obj/item/clothing/under/color/orange, +/obj/item/clothing/under/color/orange, /turf/open/floor/almayer{ - allow_construction = 0 + dir = 1; + icon_state = "red" }, /area/almayer/shipboard/brig/processing) "eVj" = ( @@ -34351,16 +34179,6 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"eYC" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/turf/open/floor/almayer{ - icon_state = "silver" - }, -/area/almayer/command/cichallway) "eYH" = ( /obj/structure/platform{ dir = 4 @@ -34413,9 +34231,9 @@ }, /area/almayer/hallways/port_hallway) "eZj" = ( -/obj/structure/closet/firecloset/full, +/obj/structure/closet/secure_closet/guncabinet, /turf/open/floor/almayer{ - dir = 10; + dir = 1; icon_state = "red" }, /area/almayer/shipboard/brig/main_office) @@ -34501,6 +34319,9 @@ }, /area/almayer/living/grunt_rnr) "fbv" = ( +/obj/structure/machinery/light{ + dir = 8 + }, /obj/structure/sign/safety/security{ pixel_x = -17; pixel_y = 6 @@ -34536,6 +34357,26 @@ icon_state = "dark_sterile" }, /area/almayer/medical/upper_medical) +"fbY" = ( +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 2; + id = "Execution Shutters"; + name = "\improper Privacy Shutters" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "perma_lockdown"; + name = "\improper Perma Lockdown Shutter" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/execution) "fcf" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -34692,18 +34533,32 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_two) +"ffl" = ( +/obj/structure/surface/table/almayer, +/obj/effect/landmark/map_item, +/obj/item/paper_bin/uscm{ + pixel_x = -7; + pixel_y = 6 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "ffE" = ( /turf/open/floor/almayer/no_build{ icon_state = "plating" }, /area/almayer/command/airoom) "ffV" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - allow_construction = 0 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/crew/alt, +/obj/structure/transmitter/rotary/no_dnd{ + name = "Brig Cells Telephone"; + phone_category = "Almayer"; + phone_id = "Brig Cells"; + pixel_x = 15 }, +/turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) "fgh" = ( /obj/structure/machinery/light/small{ @@ -34718,12 +34573,10 @@ }, /area/almayer/shipboard/starboard_point_defense) "fgl" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) +/area/almayer/shipboard/brig/perma) "fgm" = ( /obj/structure/machinery/atm{ pixel_y = 32 @@ -34814,14 +34667,6 @@ icon_state = "mono" }, /area/almayer/engineering/upper_engineering/starboard) -"fhQ" = ( -/obj/structure/closet/secure_closet/freezer/fridge/full, -/obj/structure/machinery/light, -/obj/item/reagent_container/food/condiment/sugar, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/grunt_rnr) "fiq" = ( /turf/closed/wall/almayer, /area/almayer/hull/lower_hull/l_m_p) @@ -34836,27 +34681,36 @@ icon_state = "orange" }, /area/almayer/engineering/engine_core) +"fiP" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/storage/fancy/cigar{ + layer = 3.04; + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/reagent_container/food/drinks/bottle/sake{ + pixel_x = -11; + pixel_y = 16 + }, +/obj/item/reagent_container/food/drinks/bottle/sake{ + pixel_x = -2; + pixel_y = 16 + }, +/obj/item/reagent_container/food/drinks/bottle/sake{ + pixel_x = 7; + pixel_y = 16 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "fjO" = ( /obj/item/tool/wet_sign, /obj/effect/decal/cleanable/blood, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) "fkn" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ - dir = 2; - name = "Brig"; - req_one_access_txt = "1;3"; - req_access = null - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, +/obj/structure/machinery/photocopier, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "red" }, /area/almayer/shipboard/brig/main_office) "fkO" = ( @@ -34939,22 +34793,19 @@ }, /area/almayer/hull/lower_hull/l_f_s) "fnl" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/sentencing{ - dir = 8 - }, -/obj/structure/sign/safety/terminal{ - pixel_x = 32; - pixel_y = -22 +/obj/structure/surface/rack, +/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/glasses/sunglasses/blindfold, +/obj/item/clothing/mask/muzzle, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" }, /turf/open/floor/almayer{ dir = 4; - icon_state = "red" + icon_state = "redcorner" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/execution) "fnx" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/door/window/eastright{ @@ -35212,6 +35063,20 @@ icon_state = "plating" }, /area/almayer/hallways/vehiclehangar) +"fso" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + 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" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/cryo) "fsp" = ( /obj/structure/barricade/handrail{ dir = 1; @@ -35223,11 +35088,30 @@ }, /area/almayer/living/gym) "fsz" = ( -/obj/structure/machinery/computer/crew, +/obj/structure/machinery/firealarm{ + dir = 1; + pixel_y = -28 + }, +/obj/structure/surface/table/almayer, +/obj/item/storage/box/flashbangs, +/obj/item/storage/box/flashbangs{ + pixel_x = 5; + pixel_y = 9 + }, +/obj/item/storage/box/flashbangs{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1; + pixel_y = 1 + }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "plating" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/armory) "fsH" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -35238,11 +35122,20 @@ }, /area/almayer/hallways/port_hallway) "fsT" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1; + pixel_y = -1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/general_equipment) +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/brig/armory) "fsU" = ( /obj/structure/machinery/floodlight/landing{ name = "bolted floodlight" @@ -35297,6 +35190,21 @@ /obj/structure/largecrate/random/barrel/green, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) +"fuR" = ( +/obj/structure/bed/bedroll{ + desc = "A bed of cotton fabric, purposely made for a cat to comfortably sleep on."; + name = "cat bed"; + pixel_y = 0 + }, +/mob/living/simple_animal/cat/Jones{ + dir = 8 + }, +/obj/structure/machinery/firealarm{ + pixel_x = -1; + pixel_y = 28 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "fuS" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -35318,15 +35226,14 @@ }, /area/almayer/engineering/laundry) "fuX" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/sentencing{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/poddoor/almayer/locked{ + dir = 8; + id = "Perma 2L"; + name = "\improper cell shutter" }, -/area/almayer/shipboard/brig/processing) +/turf/open/floor/plating, +/area/almayer/shipboard/brig/perma) "fuY" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -35603,22 +35510,21 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) -"fCg" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/faxmachine/uscm/brig, -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/turf/open/floor/almayer{ - allow_construction = 0 - }, -/area/almayer/shipboard/brig/processing) "fCp" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/lifeboat) +"fCt" = ( +/obj/structure/bed/chair/comfy/delta{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "fCL" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -35648,20 +35554,11 @@ }, /area/almayer/medical/lower_medical_medbay) "fDn" = ( -/obj/structure/machinery/vending/security, -/obj/structure/machinery/vending/security, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/shipboard/brig/general_equipment) -"fDC" = ( -/obj/structure/bed/chair/bolted{ - dir = 8 - }, -/turf/open/floor/almayer{ - allow_construction = 0 +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = -25 }, -/area/almayer/shipboard/brig/processing) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/armory) "fDG" = ( /obj/structure/machinery/vending/coffee, /obj/structure/machinery/light{ @@ -35769,26 +35666,15 @@ }, /area/almayer/medical/morgue) "fFq" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/evidence{ - pixel_x = 7; - pixel_y = 6 - }, -/obj/item/storage/box/evidence{ - pixel_x = 1; - pixel_y = 1 - }, -/obj/structure/sign/safety/security{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/restrictedarea{ - pixel_y = 32 +/obj/structure/machinery/light/small{ + dir = 8 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/area/almayer/shipboard/brig/general_equipment) +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/armory) "fFD" = ( /obj/structure/window/reinforced{ dir = 4; @@ -35855,20 +35741,11 @@ }, /area/almayer/medical/medical_science) "fGN" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/airlock/almayer/security/reinforced{ - name = "\improper Execution Equipment"; - dir = 2 - }, +/obj/structure/closet/firecloset, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/shipboard/brig/execution) +/area/almayer/hull/upper_hull/u_f_p) "fGY" = ( /obj/structure/machinery/door_control{ id = "panicroomback"; @@ -35897,6 +35774,17 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) +"fHe" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/flashlight/lamp{ + layer = 3.3; + pixel_x = 15 + }, +/obj/item/prop/helmetgarb/helmet_nvg/cosmetic, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/living/briefing) "fHh" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -35936,14 +35824,18 @@ }, /area/almayer/hull/upper_hull/u_f_s) "fHS" = ( -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "Brig Lockdown Shutters"; - name = "\improper Brig Lockdown Shutter" +/obj/structure/sign/safety/rewire{ + pixel_y = -32 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/machinery/door_control{ + id = "perma_lockdown"; + name = "\improper Perma Cells Lockdown"; + pixel_x = 6; + pixel_y = -24; + req_access_txt = "3" }, -/area/almayer/hull/upper_hull/u_f_s) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/processing) "fIf" = ( /obj/structure/sign/safety/bulkhead_door{ pixel_x = 8; @@ -36132,13 +36024,13 @@ }, /area/almayer/living/grunt_rnr) "fLn" = ( -/obj/effect/landmark/start/police, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cryo) +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/shipboard/brig/general_equipment) "fLX" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -36204,13 +36096,6 @@ icon_state = "green" }, /area/almayer/hallways/aft_hallway) -"fNb" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "fNg" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/plating/plating_catwalk, @@ -36230,12 +36115,26 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +"fNu" = ( +/obj/structure/surface/table/almayer, +/obj/item/paper, +/obj/item/tool/pen{ + pixel_x = -5; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/living/briefing) "fNA" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/closet/fireaxecabinet{ + pixel_y = 32 + }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 1; + icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/general_equipment) "fNC" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /obj/structure/disposalpipe/junction{ @@ -36464,21 +36363,6 @@ icon_state = "green" }, /area/almayer/hallways/starboard_hallway) -"fUn" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21" - }, -/obj/structure/sign/poster{ - desc = "A large piece of cheap printed paper. This one proudly demands that you REMEMBER IO!"; - icon_state = "poster14"; - name = "propaganda poster"; - pixel_y = 32 - }, -/obj/structure/sign/safety/escapepod{ - pixel_x = -17 - }, -/turf/open/floor/wood/ship, -/area/almayer/command/corporateliason) "fUA" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) @@ -36596,6 +36480,18 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/cichallway) +"fYn" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "redcorner" + }, +/area/almayer/shipboard/brig/processing) "fYG" = ( /turf/open/floor/almayer{ dir = 10; @@ -36603,8 +36499,15 @@ }, /area/almayer/engineering/engine_core) "fYX" = ( -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/execution) +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/secure_data{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "redcorner" + }, +/area/almayer/shipboard/brig/chief_mp_office) "fYZ" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -36745,15 +36648,14 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/command/corporateliason) "gbX" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ - name = "Brig" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 }, +/turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) "gcc" = ( /obj/structure/disposalpipe/segment{ @@ -36764,6 +36666,12 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_p) +"gcw" = ( +/obj/structure/bed/chair/comfy/bravo, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "gcK" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -36822,11 +36730,11 @@ /obj/structure/machinery/light{ dir = 1 }, -/obj/structure/machinery/status_display{ - pixel_y = 30 +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/general_equipment) "gdp" = ( /obj/structure/bed/chair{ dir = 4 @@ -36903,28 +36811,20 @@ icon_state = "orangecorner" }, /area/almayer/hallways/stern_hallway) -"geW" = ( -/obj/structure/machinery/photocopier{ - anchored = 0 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "geX" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/ids{ - pixel_y = 8; - pixel_x = -6 +/obj/structure/pipes/vents/scrubber, +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = 32 }, -/obj/item/device/flash, -/obj/structure/machinery/light{ - dir = 8; - invisibility = 101 +/obj/structure/sign/safety/hazard{ + pixel_y = 32 }, /turf/open/floor/almayer{ - dir = 8; + dir = 1; icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/general_equipment) "gfk" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -36955,6 +36855,10 @@ /obj/structure/machinery/recharge_station, /turf/open/floor/plating, /area/almayer/command/airoom) +"gfK" = ( +/obj/structure/bed/chair/comfy/blue, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "gfS" = ( /obj/structure/sign/safety/cryo{ pixel_y = -26 @@ -37064,8 +36968,15 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/main_office) +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/landmark/start/warden, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/brig/cryo) "gjm" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -37164,7 +37075,10 @@ /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 }, -/turf/open/floor/almayer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, /area/almayer/living/briefing) "gkK" = ( /obj/structure/pipes/standard/simple/hidden/supply, @@ -37224,10 +37138,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_p) -"glU" = ( -/obj/structure/pipes/vents/scrubber, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "gmb" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -37248,6 +37158,16 @@ icon_state = "plate" }, /area/almayer/shipboard/starboard_point_defense) +"gmp" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/flashlight/lamp{ + layer = 3.3; + pixel_x = 15 + }, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/living/briefing) "gms" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -37319,13 +37239,16 @@ }, /area/almayer/living/port_emb) "goD" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera"; - pixel_y = 6 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "redcorner" + }, +/area/almayer/shipboard/brig/processing) "goL" = ( /turf/open/floor/almayer{ dir = 10; @@ -37398,21 +37321,18 @@ }, /area/almayer/lifeboat_pumps/north1) "gqW" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" }, +/area/almayer/shipboard/brig/main_office) +"grl" = ( +/obj/effect/landmark/crap_item, /turf/open/floor/almayer{ dir = 8; icon_state = "red" }, /area/almayer/shipboard/brig/main_office) -"grl" = ( -/obj/structure/sign/safety/medical{ - pixel_x = -17 - }, -/turf/closed/wall/almayer, -/area/almayer/shipboard/brig/surgery) "grG" = ( /obj/structure/sign/safety/restrictedarea{ pixel_x = -17 @@ -37541,14 +37461,6 @@ }, /turf/open/floor/carpet, /area/almayer/command/corporateliason) -"guN" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/shipboard/brig/perma) "guS" = ( /obj/structure/reagent_dispensers/fueltank/custom, /turf/open/floor/almayer{ @@ -37786,6 +37698,12 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"gye" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer/uniform_vendors, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/command/cic) "gyt" = ( /obj/item/storage/firstaid/regular, /obj/structure/surface/rack, @@ -37993,7 +37911,8 @@ dir = 1 }, /turf/open/floor/almayer{ - allow_construction = 0 + dir = 1; + icon_state = "redcorner" }, /area/almayer/shipboard/brig/processing) "gBo" = ( @@ -38039,20 +37958,15 @@ /area/almayer/hallways/hangar) "gCI" = ( /obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 + dir = 4 }, -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/firstaid/toxin{ - pixel_x = 8; - pixel_y = -2 +/obj/structure/machinery/cryopod/right{ + pixel_y = 6 }, -/obj/item/storage/firstaid/regular, -/obj/item/reagent_container/spray/cleaner, /turf/open/floor/almayer{ - icon_state = "sterile_green_side" + icon_state = "cargo" }, -/area/almayer/shipboard/brig/surgery) +/area/almayer/shipboard/brig/cryo) "gCP" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/device/flashlight/lamp, @@ -38190,17 +38104,24 @@ /area/almayer/command/combat_correspondent) "gGo" = ( /obj/structure/surface/table/almayer, -/obj/effect/landmark/map_item{ - pixel_x = -8 +/obj/structure/machinery/firealarm{ + pixel_y = 28 }, -/obj/item/toy/plush/therapy/red{ - desc = "A USCM approved plush doll. It's not soft and hardly comforting!"; - force = 15; - layer = 4.1; - name = "Sergeant Huggs"; - pixel_x = 7; - pixel_y = -1; - throwforce = 15 +/obj/structure/prop/holidays/string_lights{ + dir = 8; + pixel_x = 29 + }, +/obj/item/reagent_container/food/condiment/hotsauce/cholula{ + pixel_x = 10; + pixel_y = 14 + }, +/obj/item/trash/USCMtray{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/reagent_container/food/snacks/hotdog{ + pixel_x = -7; + pixel_y = 5 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -38373,10 +38294,10 @@ }, /area/almayer/shipboard/port_missiles) "gKH" = ( -/obj/structure/bed/chair/comfy/charlie, /obj/item/trash/uscm_mre, +/obj/structure/bed/chair/comfy/charlie, /turf/open/floor/almayer{ - icon_state = "emeraldfull" + icon_state = "plate" }, /area/almayer/living/briefing) "gKJ" = ( @@ -38484,25 +38405,15 @@ }, /area/almayer/hallways/aft_hallway) "gMf" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 2; - id = "CMP Office Shutters"; - name = "\improper Privacy Shutters" - }, -/obj/structure/machinery/door/airlock/almayer/security/glass{ - name = "\improper Chief MP's Office"; - dir = 2 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 24 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 4; + icon_state = "red" }, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/perma) "gMx" = ( /obj/structure/closet/firecloset, /turf/open/floor/plating/plating_catwalk, @@ -38566,7 +38477,6 @@ }, /area/almayer/engineering/engine_core) "gNi" = ( -/obj/structure/bed/chair/comfy/delta, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, @@ -38599,6 +38509,18 @@ /obj/effect/spawner/random/tool, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) +"gOm" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/bed/chair/comfy/bravo{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "gOs" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -38721,14 +38643,13 @@ }, /area/almayer/hallways/hangar) "gSi" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/safety/bulkhead_door{ - pixel_y = -34 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/cameras/almayer_network, +/obj/item/storage/box/tapes{ + pixel_x = -16 }, -/area/almayer/hull/upper_hull/u_f_p) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/processing) "gSj" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -38757,6 +38678,11 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) "gSV" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera"; + pixel_y = 6 + }, /obj/structure/sign/safety/biolab{ pixel_x = -17; pixel_y = -8 @@ -38774,17 +38700,14 @@ /turf/open/floor/almayer{ icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/cryo) "gTx" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/toolbox/mechanical/green{ - pixel_y = 8 - }, -/obj/item/storage/toolbox/mechanical, +/obj/structure/machinery/vending/security, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "red" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/main_office) "gTH" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/skills{ @@ -38875,6 +38798,18 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/north2) +"gVm" = ( +/obj/structure/bed/chair/comfy/bravo{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/arcturianstopsign{ + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "gVq" = ( /obj/structure/machinery/light, /obj/effect/decal/warning_stripes{ @@ -39156,18 +39091,6 @@ icon_state = "silver" }, /area/almayer/living/auxiliary_officer_office) -"hbG" = ( -/obj/structure/closet/secure_closet{ - name = "\improper Execution Firearms" - }, -/obj/item/weapon/gun/rifle/m4ra, -/obj/item/weapon/gun/rifle/m4ra, -/obj/item/weapon/gun/rifle/m4ra, -/obj/item/ammo_box/magazine/m4ra, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/shipboard/brig/execution) "hbZ" = ( /obj/structure/surface/table/almayer, /obj/structure/sign/safety/terminal{ @@ -39350,20 +39273,17 @@ }, /area/almayer/living/port_emb) "heQ" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/secure_data{ - dir = 8 - }, -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, +/obj/structure/bed/chair, /obj/structure/extinguisher_cabinet{ - pixel_y = 28; - pixel_x = -14 + pixel_y = 26 + }, +/obj/structure/sign/safety/cryo{ + pixel_x = 21; + pixel_y = 27 }, /turf/open/floor/almayer{ dir = 4; - icon_state = "red" + icon_state = "redcorner" }, /area/almayer/shipboard/brig/processing) "heV" = ( @@ -39398,21 +39318,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) -"hfm" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/machinery/photocopier{ - anchored = 0 - }, -/obj/structure/sign/poster{ - desc = "A large piece of cheap printed paper. This one proudly demands that you REMEMBER IO!"; - icon_state = "poster14"; - name = "propaganda poster"; - pixel_y = 32 - }, -/turf/open/floor/wood/ship, -/area/almayer/command/corporateliason) "hfw" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -39487,17 +39392,20 @@ }, /area/almayer/command/computerlab) "hgF" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, /obj/structure/machinery/light{ unacidable = 1; unslashable = 1 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "red" +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" }, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/execution) "hgH" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -39641,6 +39549,13 @@ icon_state = "test_floor4" }, /area/almayer/living/grunt_rnr) +"hjT" = ( +/obj/structure/bed/chair/comfy/alpha, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "hki" = ( /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor/almayer{ @@ -39813,6 +39728,17 @@ icon_state = "sterile_green" }, /area/almayer/medical/hydroponics) +"hnH" = ( +/obj/structure/surface/table/almayer, +/obj/effect/decal/cleanable/dirt, +/obj/item/prop/magazine/boots/n117{ + pixel_x = 2; + pixel_y = 5 + }, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/living/briefing) "hnV" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, @@ -39846,6 +39772,19 @@ /obj/structure/flora/pottedplant{ icon_state = "pottedplant_10" }, +/obj/structure/closet/secure_closet/cmdcabinet{ + pixel_y = 24; + desc = "A bulletproof cabinet containing communications equipment."; + name = "communications cabinet"; + req_access = null; + req_one_access_txt = "207;203" + }, +/obj/item/device/radio, +/obj/item/device/radio/listening_bug/radio_linked/wy, +/obj/item/device/radio/listening_bug/radio_linked/wy{ + pixel_x = 4; + pixel_y = -3 + }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) "hpk" = ( @@ -40034,6 +39973,18 @@ icon_state = "silver" }, /area/almayer/command/computerlab) +"huR" = ( +/obj/structure/sign/prop1{ + pixel_y = 32 + }, +/obj/structure/filingcabinet/security{ + pixel_x = -8 + }, +/obj/structure/filingcabinet/medical{ + pixel_x = 8 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "huU" = ( /obj/structure/machinery/door/airlock/almayer/security{ access_modified = 1; @@ -40107,21 +40058,21 @@ }, /area/almayer/engineering/upper_engineering) "hwQ" = ( +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 8 + }, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/execution) +"hwS" = ( /obj/structure/bed/chair/comfy/black{ + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/chief_mp_office) -"hwS" = ( -/obj/structure/machinery/light{ - dir = 8; - invisibility = 101 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/shipboard/brig/processing) "hxe" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -40216,11 +40167,19 @@ }, /area/almayer/living/offices) "hyz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/almayer{ + allow_construction = 0 }, -/turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) "hyE" = ( /obj/structure/machinery/door/poddoor/almayer/open{ @@ -40261,14 +40220,40 @@ }, /area/almayer/squads/delta) "hzx" = ( -/obj/structure/machinery/keycard_auth{ - pixel_y = 25 +/obj/structure/machinery/door/airlock/almayer/security/glass{ + name = "\improper Chief MP's Office"; + req_access = null; + req_one_access_txt = "1;3" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "CMP Office Shutters"; + name = "\improper Privacy Shutters" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer{ - dir = 5; - icon_state = "red" + icon_state = "test_floor4" }, /area/almayer/shipboard/brig/chief_mp_office) +"hzJ" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter" + }, +/obj/structure/machinery/door/poddoor/almayer/locked{ + id = "Cell 1"; + name = "\improper Courtyard Divider" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/cells) "hzL" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -40386,6 +40371,25 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_p) +"hBW" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/device/flashlight/lamp/green{ + pixel_x = -7; + pixel_y = 20 + }, +/obj/item/ashtray/bronze{ + pixel_x = 4; + pixel_y = 19 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/effect/landmark/map_item{ + pixel_x = -1; + pixel_y = 3 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "hCo" = ( /obj/structure/surface/table/almayer, /obj/structure/flora/pottedplant{ @@ -40524,20 +40528,23 @@ /obj/structure/largecrate/random/barrel/red, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) -"hGa" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +"hFX" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/bed/chair/comfy/bravo{ dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/perma) -"hGB" = ( -/obj/structure/machinery/cm_vending/clothing/dress{ - req_access = list(1) - }, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "plate" }, -/area/almayer/living/commandbunks) +/area/almayer/living/briefing) +"hGa" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/armory) "hGD" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -40624,6 +40631,23 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) +"hIt" = ( +/obj/structure/surface/table/almayer, +/obj/effect/decal/cleanable/dirt, +/obj/item/tool/kitchen/tray{ + pixel_y = 9 + }, +/obj/item/device/flashlight/lamp{ + pixel_x = 15 + }, +/obj/item/reagent_container/food/snacks/meatpizzaslice{ + pixel_x = -5; + pixel_y = 7 + }, +/turf/open/floor/almayer{ + icon_state = "emeraldfull" + }, +/area/almayer/living/briefing) "hII" = ( /obj/structure/machinery/cm_vending/gear/tl{ density = 0; @@ -40799,6 +40823,14 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_s) +"hMJ" = ( +/obj/structure/bed/chair/comfy/bravo{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "hMN" = ( /obj/structure/machinery/power/apc/almayer, /turf/open/floor/almayer{ @@ -40813,20 +40845,21 @@ /turf/open/floor/plating, /area/almayer/squads/charlie) "hND" = ( -/obj/structure/machinery/door_control{ - id = "CMP Office Shutters"; - name = "CMP Office Shutters"; - req_one_access_txt = "24;31"; - pixel_y = -20 +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" }, -/obj/structure/sign/safety/bulkhead_door{ - pixel_y = -34 +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + dir = 1; + name = "\improper Brig" }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/main_office) "hNM" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/stack/sheet/metal{ @@ -40930,6 +40963,13 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/charlie_delta_shared) +"hQh" = ( +/obj/structure/machinery/light, +/obj/structure/closet/secure_closet/fridge/groceries/stock, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/grunt_rnr) "hQU" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -40988,10 +41028,17 @@ /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) "hRy" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/faxmachine/uscm/brig/chief, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/structure/surface/rack, +/obj/item/storage/firstaid/adv{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/storage/firstaid/regular, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "redcorner" + }, +/area/almayer/shipboard/brig/execution) "hRW" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -41285,6 +41332,12 @@ icon_state = "blue" }, /area/almayer/command/cichallway) +"hWS" = ( +/obj/structure/closet/secure_closet/fridge/organic/stock, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/grunt_rnr) "hWU" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/almayer{ @@ -41422,15 +41475,17 @@ }, /area/almayer/medical/lower_medical_medbay) "hZU" = ( -/obj/structure/sign/safety/three{ - pixel_x = -17 +/obj/structure/transmitter{ + name = "Brig Offices Telephone"; + phone_category = "Almayer"; + phone_id = "Brig Main Offices"; + pixel_y = 32 }, -/obj/structure/machinery/door/window/brigdoor/southright{ - id = "Cell 3"; - name = "Cell 3" +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) +/area/almayer/shipboard/brig/main_office) "iag" = ( /obj/structure/surface/table/almayer, /obj/item/tool/hand_labeler, @@ -41529,6 +41584,23 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"icX" = ( +/obj/structure/machinery/brig_cell/perma_2{ + pixel_x = -32; + pixel_y = -4 + }, +/obj/structure/machinery/door_control{ + id = "Perma 2L"; + name = "Perma 2 Lockdown"; + pixel_x = -24; + pixel_y = 12; + req_access_txt = "3" + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/shipboard/brig/perma) "idx" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -41541,6 +41613,22 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) +"idJ" = ( +/obj/structure/surface/table/almayer, +/obj/effect/decal/cleanable/dirt, +/obj/item/device/flashlight/lamp{ + layer = 3.3; + pixel_x = 15 + }, +/obj/item/paper, +/obj/item/tool/pen{ + pixel_x = -5; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "orangefull" + }, +/area/almayer/living/briefing) "idX" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ @@ -41551,16 +41639,11 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/machinery/door/airlock/almayer/security/glass{ - name = "Brig Breakroom" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - layer = 1.9 - }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 1; + icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/general_equipment) "ieu" = ( /obj/structure/window/reinforced{ dir = 4; @@ -41686,6 +41769,12 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) +"ign" = ( +/obj/structure/closet/secure_closet/fridge/fish/stock, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/grunt_rnr) "igp" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp{ @@ -41906,22 +41995,25 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_s) "ikM" = ( -/obj/structure/sign/safety/hazard{ - pixel_y = 32 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/cameras/almayer_network, +/obj/structure/machinery/computer/secure_data{ + pixel_x = 17 }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = 32 +/obj/structure/machinery/computer/card{ + pixel_x = -16 }, /obj/structure/machinery/light{ dir = 1 }, -/obj/structure/machinery/camera/autoname/almayer, -/obj/structure/machinery/vending/security/riot, +/obj/structure/sign/safety/terminal{ + pixel_x = 8; + pixel_y = 32 + }, /turf/open/floor/almayer{ - icon_state = "plating_striped" + icon_state = "plate" }, -/area/almayer/shipboard/brig/armory) +/area/almayer/shipboard/brig/main_office) "ils" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, @@ -42036,12 +42128,9 @@ }, /area/almayer/hull/upper_hull/u_f_p) "inG" = ( +/obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" + dir = 4 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) @@ -42056,16 +42145,11 @@ }, /area/almayer/medical/medical_science) "inN" = ( -/obj/structure/transmitter{ - name = "Brig Offices Telephone"; - phone_category = "Almayer"; - phone_id = "Brig Main Offices"; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 }, +/turf/open/floor/almayer, /area/almayer/shipboard/brig/main_office) "ioj" = ( /obj/structure/largecrate/random/barrel/green, @@ -42160,15 +42244,9 @@ /turf/open/floor/almayer, /area/almayer/command/computerlab) "iqn" = ( -/obj/structure/machinery/door/window/brigdoor/southright{ - id = "Cell 6"; - name = "Cell 6" - }, -/obj/structure/sign/safety/six{ - pixel_x = -17 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/main_office) "iqo" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -42193,7 +42271,6 @@ /obj/structure/machinery/light/small{ dir = 4 }, -/obj/structure/closet/firecloset, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -42230,8 +42307,11 @@ /obj/structure/machinery/firealarm{ pixel_y = 28 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/main_office) +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/general_equipment) "irS" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/cable/heavyduty{ @@ -42258,6 +42338,18 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"isu" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/item/bedsheet/hop{ + pixel_y = 0 + }, +/obj/structure/bed{ + pixel_y = 0 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "isC" = ( /obj/effect/projector{ name = "Almayer_AresDown"; @@ -42273,10 +42365,17 @@ }, /area/almayer/command/airoom) "isH" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = 26 +/obj/structure/reagent_dispensers/water_cooler/stacks{ + density = 0; + pixel_y = 17 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" }, -/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/general_equipment) "isN" = ( /obj/structure/sink{ @@ -42578,27 +42677,21 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) "iyq" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - name = "\improper Brig" - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 8 +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 2; + id = "Warden Office Shutters"; + name = "\improper Privacy Shutters" }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "courtyard_cells"; - name = "\improper Courtyard Lockdown Shutter"; - dir = 4 +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + dir = 1; + name = "\improper Warden Office" }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/main_office) "iyH" = ( /obj/structure/surface/table/reinforced/almayer_B{ climbable = 0; @@ -42639,14 +42732,14 @@ }, /area/almayer/living/offices) "izr" = ( -/obj/structure/bed/chair/comfy/alpha{ - dir = 1 - }, /obj/structure/sign/poster/propaganda{ pixel_x = -27 }, +/obj/structure/bed/chair/comfy/alpha{ + dir = 1 + }, /turf/open/floor/almayer{ - icon_state = "redfull" + icon_state = "plate" }, /area/almayer/living/briefing) "izx" = ( @@ -42859,6 +42952,14 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_a_p) +"iET" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "iFc" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -42904,6 +43005,21 @@ }, /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) +"iFG" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/bed/chair/comfy/bravo{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/deployable{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "iFH" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -42993,6 +43109,18 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) +"iIm" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 2; + name = "\improper Bathroom" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/commandbunks) "iIP" = ( /obj/structure/toilet{ pixel_y = 16 @@ -43110,10 +43238,9 @@ dir = 8 }, /turf/open/floor/almayer{ - dir = 6; - icon_state = "red" + icon_state = "redcorner" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/general_equipment) "iKZ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -43216,24 +43343,18 @@ }, /area/almayer/hull/lower_hull/l_f_s) "iOh" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/structure/machinery/light/small, +/obj/structure/machinery/status_display{ + pixel_y = -32 }, -/obj/structure/window/framed/almayer, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/cryo) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/armory) "iOD" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) -"iOU" = ( -/obj/structure/sign/safety/bulkhead_door{ - pixel_x = -16 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_f_s) "iPv" = ( /obj/structure/bed/chair/comfy, /obj/structure/window/reinforced/ultra, @@ -43268,13 +43389,15 @@ }, /area/almayer/squads/alpha) "iQg" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/disposalpipe/junction{ - dir = 1 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + allow_construction = 0 }, -/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/lobby) "iQi" = ( /obj/structure/disposalpipe/junction, @@ -43583,33 +43706,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) -"iVZ" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/paper_bin/uscm{ - pixel_y = 7; - pixel_x = -17 - }, -/obj/item/tool/pen/clicky{ - pixel_x = -13; - pixel_y = -1 - }, -/obj/item/tool/pen/clicky{ - pixel_y = 5; - pixel_x = -13 - }, -/obj/structure/machinery/door_control{ - id = "CO-Office"; - name = "Door Control"; - normaldoorcontrol = 1; - req_access_txt = "31"; - pixel_y = 7 - }, -/obj/item/ashtray/bronze{ - pixel_y = 1; - pixel_x = 12 - }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) "iWb" = ( /obj/structure/sign/safety/hazard{ pixel_x = 32; @@ -43650,13 +43746,18 @@ /turf/open/floor/almayer, /area/almayer/hallways/hangar) "iWE" = ( -/obj/structure/platform{ - dir = 1 - }, /obj/structure/pipes/vents/pump{ dir = 4 }, -/turf/open/floor/almayer, +/obj/structure/bed/chair/comfy/bravo{ + dir = 4 + }, +/obj/structure/barricade/deployable{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "orangefull" + }, /area/almayer/living/briefing) "iWL" = ( /obj/structure/pipes/standard/simple/hidden/supply, @@ -43685,19 +43786,27 @@ icon_state = "bluefull" }, /area/almayer/living/briefing) +"iXd" = ( +/turf/open/floor/almayer{ + icon_state = "orangefull" + }, +/area/almayer/living/briefing) "iXt" = ( /obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - dir = 1; - name = "\improper Holding Cell" +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/area/almayer/shipboard/brig/processing) +"iXR" = ( +/obj/structure/bed/chair/comfy/alpha{ + dir = 1 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/living/briefing) "iXT" = ( /obj/item/trash/uscm_mre, /turf/open/floor/almayer, @@ -43789,6 +43898,15 @@ icon_state = "plate" }, /area/almayer/living/gym) +"iYR" = ( +/obj/structure/closet/secure_closet/bar{ + name = "Success Cabinet"; + req_access_txt = "1" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/captain_mess) "iZg" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -43816,14 +43934,10 @@ }, /area/almayer/command/airoom) "iZG" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "Bathroom"; - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/shipboard/brig/main_office) +/obj/structure/window/framed/almayer/hull, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/chief_mp_office) "iZH" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = -17 @@ -43889,11 +44003,18 @@ }, /area/almayer/command/airoom) "jaP" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = -25 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/cameras/almayer_network{ + dir = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/shipboard/brig/perma) "jaR" = ( /obj/structure/largecrate/random/mini/small_case/b{ pixel_x = 8; @@ -44108,17 +44229,11 @@ /obj/structure/machinery/light{ dir = 4 }, -/obj/structure/machinery/cryopod/right{ - layer = 3.1; - pixel_y = 13 - }, -/obj/structure/machinery/status_display{ - pixel_x = 32 - }, /turf/open/floor/almayer{ - icon_state = "cargo" + dir = 1; + icon_state = "cargo_arrow" }, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/general_equipment) "jeO" = ( /obj/structure/machinery/light{ dir = 4 @@ -44181,12 +44296,17 @@ }, /area/almayer/engineering/engine_core) "jfY" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 2.5 +/obj/structure/surface/table/almayer, +/obj/effect/landmark/map_item, +/obj/item/folder/red, +/obj/structure/transmitter/rotary{ + name = "Brig CMP's Office Telephone"; + phone_category = "Offices"; + phone_id = "Brig CMP's Office"; + pixel_x = 15 }, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/execution) +/area/almayer/shipboard/brig/chief_mp_office) "jfZ" = ( /obj/structure/target{ name = "punching bag" @@ -44418,14 +44538,11 @@ /turf/open/floor/almayer, /area/almayer/hallways/vehiclehangar) "jjM" = ( -/obj/item/storage/box/nade_box/tear_gas, -/obj/item/storage/box/nade_box/tear_gas{ - pixel_x = 3; - pixel_y = 5 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 }, -/obj/structure/surface/table/almayer, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/armory) +/area/almayer/shipboard/brig/main_office) "jjS" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -44516,28 +44633,25 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_s) "jkS" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/chief_mp_office) -"jkV" = ( /obj/structure/window/framed/almayer/hull/hijack_bustable, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; + dir = 2; id = "Warden Office Shutters"; name = "\improper Privacy Shutters" }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 8 +/turf/open/floor/plating, +/area/almayer/shipboard/brig/main_office) +"jkV" = ( +/obj/structure/machinery/light{ + dir = 1 }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "courtyard_cells"; - name = "\improper Courtyard Lockdown Shutter"; +/obj/structure/bed/chair/bolted{ dir = 4 }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/brig/perma) "jlA" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -44668,11 +44782,18 @@ }, /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 = 8; - icon_state = "red" + dir = 5; + icon_state = "plating" }, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/armory) "jnD" = ( /turf/open/floor/almayer{ dir = 1; @@ -44680,15 +44801,9 @@ }, /area/almayer/shipboard/brig/cic_hallway) "jnT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, +/obj/structure/bed/chair, /turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" + allow_construction = 0 }, /area/almayer/shipboard/brig/lobby) "jnX" = ( @@ -44716,12 +44831,21 @@ }, /area/almayer/command/combat_correspondent) "jox" = ( -/obj/structure/machinery/brig_cell/cell_4{ - pixel_x = 32; - pixel_y = -32 +/obj/structure/machinery/brig_cell/cell_3{ + pixel_x = -32 }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) +"joE" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/command/cichallway) "joG" = ( /obj/structure/machinery/washing_machine, /obj/structure/sign/poster{ @@ -44780,9 +44904,9 @@ }, /area/almayer/hull/lower_hull/l_f_s) "jpQ" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/almayer{ + allow_construction = 0 + }, /area/almayer/shipboard/brig/lobby) "jqP" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -44877,18 +45001,6 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"jtm" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/obj/structure/bed/sofa/south/grey/left, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/shipboard/brig/lobby) "jtJ" = ( /obj/structure/machinery/door_control{ id = "laddernorthwest"; @@ -44923,14 +45035,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/living/port_emb) -"juN" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_18"; - pixel_y = 12 - }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) "juX" = ( /obj/structure/platform_decoration{ dir = 1 @@ -44952,15 +45056,13 @@ }, /area/almayer/medical/lower_medical_medbay) "jvc" = ( -/obj/structure/reagent_dispensers/water_cooler/stacks{ - density = 0; - pixel_y = 17 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "red" + allow_construction = 0 }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/general_equipment) "jvp" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -44999,15 +45101,11 @@ }, /area/almayer/hull/upper_hull/u_a_p) "jvJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/obj/structure/machinery/camera/autoname/almayer, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) +/area/almayer/hull/upper_hull/u_f_s) "jvX" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -45075,11 +45173,17 @@ /turf/open/floor/plating, /area/almayer/living/bridgebunks) "jxK" = ( -/obj/structure/disposalpipe/segment{ +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, /area/almayer/shipboard/brig/processing) "jyi" = ( /obj/structure/machinery/power/port_gen/pacman, @@ -45141,16 +45245,17 @@ }, /area/almayer/squads/req) "jAG" = ( -/obj/effect/landmark/start/police, -/obj/structure/machinery/power/apc/almayer{ - dir = 1 +/obj/structure/surface/rack, +/obj/item/storage/box/gloves{ + pixel_x = 3; + pixel_y = 3 }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 2.5 +/obj/item/storage/box/masks, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/surgery) "jAJ" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -45232,20 +45337,22 @@ }, /area/almayer/hull/upper_hull/u_m_s) "jCa" = ( -/obj/structure/closet/secure_closet/guncabinet/riot_control, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1; - pixel_y = -1 - }, +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk, /turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" + dir = 9; + icon_state = "red" }, -/area/almayer/shipboard/brig/armory) +/area/almayer/shipboard/brig/main_office) +"jCn" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "jCK" = ( /obj/effect/decal/medical_decals{ icon_state = "triagedecalbottomleft"; @@ -45291,6 +45398,27 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) +"jEI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/computer/cameras/wooden_tv/prop{ + pixel_y = 29 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) +"jEX" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/folder/black{ + pixel_y = 8 + }, +/obj/item/folder/yellow, +/obj/item/device/flashlight/lamp/green{ + pixel_x = -16; + pixel_y = 8 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "jFe" = ( /obj/structure/prop/holidays/string_lights{ pixel_y = 27 @@ -45338,11 +45466,8 @@ }, /area/almayer/living/grunt_rnr) "jFR" = ( -/obj/structure/bed/chair/bolted{ - dir = 4 - }, /turf/open/floor/almayer{ - allow_construction = 0 + icon_state = "redcorner" }, /area/almayer/shipboard/brig/processing) "jFX" = ( @@ -45437,13 +45562,23 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/morgue) -"jIV" = ( -/obj/structure/machinery/iv_drip, +"jIG" = ( +/obj/structure/bed/chair/comfy/charlie{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" + icon_state = "plate" }, -/area/almayer/shipboard/brig/surgery) +/area/almayer/living/briefing) +"jIV" = ( +/obj/structure/surface/rack, +/obj/item/book/manual/marine_law{ + pixel_x = -3; + pixel_y = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_s) "jJe" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -45466,14 +45601,16 @@ }, /area/almayer/living/port_emb) "jJq" = ( -/obj/structure/machinery/light{ - dir = 4 +/obj/structure/surface/rack, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/toxin{ + pixel_x = 8; + pixel_y = -2 }, /turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" + icon_state = "red" }, -/area/almayer/shipboard/brig/cic_hallway) +/area/almayer/shipboard/brig/general_equipment) "jJs" = ( /turf/open/floor/almayer{ icon_state = "green" @@ -45550,15 +45687,6 @@ icon_state = "green" }, /area/almayer/hallways/aft_hallway) -"jLf" = ( -/obj/structure/closet/secure_closet/bar{ - name = "Success Cabinet"; - req_access_txt = "1" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/captain_mess) "jLj" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -45732,6 +45860,14 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) +"jNY" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_18"; + pixel_y = 12 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "jOi" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -45780,9 +45916,11 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/gym) "jOu" = ( +/obj/structure/surface/table/almayer, /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 }, +/obj/structure/machinery/faxmachine/uscm/brig, /turf/open/floor/almayer{ dir = 1; icon_state = "red" @@ -45817,6 +45955,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_s) +"jPn" = ( +/obj/structure/machinery/photocopier{ + anchored = 0 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "jPq" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/almayer{ @@ -46008,9 +46152,6 @@ /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) "jUo" = ( -/obj/structure/bed/chair/comfy/bravo{ - dir = 1 - }, /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer{ icon_state = "orangefull" @@ -46161,16 +46302,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north1) -"jWN" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) "jWU" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/blocker/forcefield/multitile_vehicles, @@ -46245,12 +46376,22 @@ }, /area/almayer/medical/operating_room_four) "jZm" = ( -/obj/structure/machinery/brig_cell/cell_5{ - pixel_x = 32; +/obj/structure/machinery/brig_cell/cell_4{ + pixel_x = -32; pixel_y = -32 }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) +"jZr" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/emails{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/living/briefing) "jZs" = ( /obj/structure/machinery/light/containment{ dir = 4 @@ -46286,6 +46427,24 @@ icon_state = "emerald" }, /area/almayer/squads/charlie) +"jZL" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/cameras/almayer_network{ + dir = 1 + }, +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/obj/structure/transmitter{ + dir = 1; + name = "Brig Warden's Office Telephone"; + phone_category = "Offices"; + phone_id = "Brig Warden's Office"; + pixel_x = -16 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/main_office) "jZO" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/almayer{ @@ -46541,8 +46700,18 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"kfG" = ( +/obj/structure/surface/table/almayer, +/obj/effect/decal/cleanable/dirt, +/obj/item/device/flashlight/lamp{ + pixel_x = 15 + }, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/living/briefing) "kfN" = ( -/obj/structure/closet/secure_closet/brig/prisoner, +/obj/structure/closet/secure_closet/brig, /turf/open/floor/almayer{ icon_state = "red" }, @@ -46564,10 +46733,13 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_p) "kge" = ( -/obj/structure/pipes/vents/scrubber, -/turf/open/floor/almayer{ - allow_construction = 0 +/obj/structure/disposalpipe/segment{ + dir = 4 }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/processing) "kgp" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -46651,6 +46823,12 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) +"khX" = ( +/obj/structure/closet/secure_closet/fridge/dry/stock, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/grunt_rnr) "kif" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -46719,19 +46897,11 @@ }, /area/almayer/squads/alpha) "kjN" = ( -/obj/structure/machinery/door_control{ - id = "perma_lockdown"; - name = "\improper Perma Cells Lockdown"; - pixel_x = -24; - pixel_y = 6; - req_access_txt = "3" - }, -/obj/structure/closet/secure_closet/brig/restraints, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" +/obj/structure/machinery/power/apc/almayer{ + dir = 4 }, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/surgery) "kkt" = ( /obj/structure/surface/table/almayer, /obj/item/book/manual/marine_law, @@ -46763,6 +46933,15 @@ icon_state = "plating" }, /area/almayer/engineering/engine_core) +"klG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "klH" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -46833,21 +47012,8 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_s) "kmY" = ( -/obj/structure/bookcase{ - icon_state = "book-5"; - name = "law and engineering manuals bookcase"; - opacity = 0 - }, -/obj/item/book/manual/marine_law, -/obj/item/book/manual/detective, -/obj/item/book/manual/security_space_law, -/obj/item/book/manual/engineering_guide, -/obj/item/book/manual/engineering_construction, -/obj/item/book/manual/orbital_cannon_manual, -/obj/item/book/manual/ripley_build_and_repair, -/obj/item/book/manual/engineering_hacking, -/obj/structure/machinery/light{ - dir = 8 +/obj/structure/pipes/vents/pump{ + dir = 4 }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) @@ -47138,15 +47304,6 @@ icon_state = "redfull" }, /area/almayer/command/cic) -"ksA" = ( -/obj/structure/closet/secure_closet/freezer/fridge/groceries, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/grunt_rnr) "ksN" = ( /turf/open/floor/almayer/uscm/directional{ dir = 6 @@ -47178,19 +47335,17 @@ /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) "kta" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/cameras/almayer_network{ - dir = 4 - }, -/obj/structure/sign/safety/terminal{ - pixel_x = 8; - pixel_y = 32 - }, /turf/open/floor/almayer{ - dir = 9; + dir = 4; icon_state = "red" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/evidence_storage) +"ktc" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "ktB" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/almayer{ @@ -47334,6 +47489,13 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/laundry) +"kxF" = ( +/obj/structure/bed/chair/comfy/charlie, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "kxL" = ( /obj/structure/closet/coffin/woodencrate, /obj/structure/largecrate/random/mini/wooden{ @@ -47346,12 +47508,27 @@ icon_state = "test_floor4" }, /area/almayer/squads/req) +"kxM" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "redcorner" + }, +/area/almayer/shipboard/brig/processing) "kyI" = ( -/obj/structure/pipes/vents/pump{ +/obj/structure/machinery/light{ dir = 8 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/general_equipment) +/obj/structure/sign/safety/bathunisex{ + pixel_x = 32 + }, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) "kyN" = ( /obj/structure/disposalpipe/segment, /obj/structure/sign/safety/distribution_pipes{ @@ -47363,14 +47540,18 @@ }, /area/almayer/shipboard/navigation) "kyP" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/machinery/cm_vending/sorted/marine_food, +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, /turf/open/floor/almayer{ dir = 1; icon_state = "red" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/perma) "kyX" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -47578,17 +47759,10 @@ /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) "kDb" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass{ - name = "\improper Execution Room" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/shipboard/brig/execution) +/obj/structure/surface/rack, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_s) "kDi" = ( /obj/structure/platform{ dir = 8 @@ -47630,11 +47804,10 @@ }, /area/almayer/medical/containment) "kDA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/pipes/vents/scrubber, +/turf/open/floor/almayer{ + icon_state = "red" }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) "kDR" = ( /obj/structure/disposalpipe/junction{ @@ -47672,27 +47845,6 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) -"kFk" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/storage/fancy/cigar{ - pixel_y = 2; - layer = 3.04; - pixel_x = -2 - }, -/obj/item/reagent_container/food/drinks/bottle/sake{ - pixel_x = -11; - pixel_y = 16 - }, -/obj/item/reagent_container/food/drinks/bottle/sake{ - pixel_y = 16; - pixel_x = -2 - }, -/obj/item/reagent_container/food/drinks/bottle/sake{ - pixel_x = 7; - pixel_y = 16 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "kFq" = ( /obj/structure/surface/table/almayer, /obj/item/book/manual/engineering_construction, @@ -47818,14 +47970,12 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) "kHK" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/effect/decal/cleanable/blood, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/execution) "kHS" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -47901,14 +48051,9 @@ }, /area/almayer/hull/upper_hull/u_a_p) "kJK" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_18" - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "red" - }, -/area/almayer/shipboard/brig/chief_mp_office) +/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" @@ -47970,11 +48115,20 @@ }, /area/almayer/hull/lower_hull/l_f_s) "kKL" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_sn_full_cap" +/obj/structure/bed/chair/comfy/bravo{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster{ + desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE."; + icon_state = "poster11"; + name = "YOU ALWAYS KNOW A WORKING JOE."; + pixel_x = -27; + serial_number = 11 + }, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, /area/almayer/living/briefing) "kKR" = ( /obj/structure/pipes/vents/pump{ @@ -48024,11 +48178,6 @@ icon_state = "red" }, /area/almayer/hallways/starboard_hallway) -"kLs" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/processing) "kLP" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -48081,7 +48230,8 @@ dir = 4 }, /turf/open/floor/almayer{ - allow_construction = 0 + dir = 1; + icon_state = "redcorner" }, /area/almayer/shipboard/brig/processing) "kNk" = ( @@ -48145,26 +48295,14 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) "kOi" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - name = "\improper Warden's Office" - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "Warden Office Shutters"; - name = "\improper Privacy Shutters" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 8 - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "courtyard_cells"; - name = "\improper Courtyard Lockdown Shutter"; - dir = 4 +/obj/structure/sink{ + dir = 1; + pixel_y = -10 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/perma) "kOk" = ( /obj/structure/sign/safety/maint{ pixel_x = 32 @@ -48215,15 +48353,12 @@ }, /area/almayer/hallways/aft_hallway) "kPo" = ( -/obj/item/paper_bin/uscm{ - pixel_y = 7 - }, -/obj/item/tool/pen, -/obj/structure/surface/table/reinforced/black, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" }, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_p) "kPx" = ( /obj/structure/surface/table/almayer, /obj/item/device/mass_spectrometer, @@ -48313,11 +48448,13 @@ /obj/structure/bed/chair/comfy/bravo{ dir = 1 }, -/obj/structure/machinery/light{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/structure/prop/holidays/string_lights{ + dir = 8; + pixel_x = 29 }, /turf/open/floor/almayer{ - icon_state = "orangefull" + icon_state = "plate" }, /area/almayer/living/briefing) "kRd" = ( @@ -48425,14 +48562,16 @@ }, /area/almayer/command/telecomms) "kTx" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 }, -/turf/open/floor/almayer, +/obj/structure/bed/chair/comfy/charlie{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, /area/almayer/living/briefing) "kTM" = ( /obj/item/frame/rack{ @@ -48536,11 +48675,15 @@ }, /area/almayer/hull/lower_hull/l_f_s) "kVZ" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "red" +/obj/structure/machinery/door/window/brigdoor/southright{ + id = "Cell 2"; + name = "Cell 2" }, -/area/almayer/shipboard/brig/main_office) +/obj/structure/sign/safety/two{ + pixel_x = -17 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) "kWk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -48619,6 +48762,13 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"kXH" = ( +/obj/structure/bed/chair/comfy/delta, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/living/briefing) "kXJ" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/secure_data{ @@ -48724,6 +48874,23 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) +"lad" = ( +/obj/structure/surface/table/almayer, +/obj/effect/decal/cleanable/dirt, +/obj/item/device/flashlight/lamp{ + layer = 3.3; + pixel_x = 15 + }, +/obj/item/tool/kitchen/tray{ + pixel_y = 9 + }, +/obj/item/reagent_container/food/snacks/sliceable/pizza/vegetablepizza{ + pixel_y = 8 + }, +/turf/open/floor/almayer{ + icon_state = "emeraldfull" + }, +/area/almayer/living/briefing) "lah" = ( /turf/open/floor/almayer{ dir = 6; @@ -48750,6 +48917,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_p) +"laG" = ( +/obj/structure/safe/co_office, +/obj/item/weapon/pole/fancy_cane, +/obj/item/tool/lighter/zippo/gold{ + layer = 3.05; + pixel_y = 3 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "laO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -48858,21 +49034,19 @@ /turf/open/floor/almayer, /area/almayer/hallways/hangar) "lcW" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/machinery/flasher{ - id = "Perma 2"; - pixel_y = 24 +/obj/item/storage/donut_box{ + pixel_y = 8 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/closet/secure_closet/personal/cabinet{ + req_access = null }, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) "ldj" = ( /obj/structure/pipes/vents/pump, -/obj/structure/platform, -/turf/open/floor/almayer, +/turf/open/floor/almayer{ + icon_state = "emeraldfull" + }, /area/almayer/living/briefing) "ldl" = ( /obj/structure/sign/safety/maint{ @@ -48914,7 +49088,7 @@ dir = 2 }, /turf/open/floor/plating, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/general_equipment) "ldN" = ( /obj/structure/platform{ dir = 1 @@ -49005,12 +49179,25 @@ icon_state = "plating" }, /area/almayer/engineering/engine_core) +"lfT" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/card{ + dir = 4; + pixel_x = 2 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "lfW" = ( -/obj/structure/machinery/brig_cell/cell_6{ - pixel_x = 32; +/obj/structure/sign/safety/high_voltage{ pixel_y = -32 }, -/turf/open/floor/almayer, +/obj/structure/sign/safety/maint{ + pixel_x = 14; + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, /area/almayer/shipboard/brig/processing) "lgy" = ( /obj/structure/window/framed/almayer, @@ -49189,6 +49376,15 @@ /obj/effect/landmark/late_join/bravo, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/bravo) +"ljz" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/bed/chair/comfy/delta{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "ljG" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_container/food/condiment/coldsauce, @@ -49334,15 +49530,12 @@ }, /area/almayer/shipboard/brig/cic_hallway) "lnJ" = ( -/obj/structure/sign/safety/maint{ - pixel_x = -17; - pixel_y = -34 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) "lnP" = ( /obj/structure/machinery/vending/cola, /obj/structure/window/reinforced, @@ -49376,6 +49569,11 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"lnZ" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "lok" = ( /obj/structure/machinery/cm_vending/clothing/marine/charlie{ density = 0; @@ -49584,12 +49782,12 @@ /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) "lrV" = ( -/obj/structure/sign/safety/four{ - pixel_x = -17 - }, /obj/structure/machinery/door/window/brigdoor/southright{ - id = "Cell 4"; - name = "Cell 4" + id = "Cell 3"; + name = "Cell 3" + }, +/obj/structure/sign/safety/three{ + pixel_x = 31 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) @@ -49690,28 +49888,10 @@ /turf/open/floor/plating, /area/almayer/hull/upper_hull/u_m_p) "ltX" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/firstaid/toxin{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/firstaid/adv, -/obj/item/device/defibrillator, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/shipboard/brig/surgery) -"lue" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/closed/wall/almayer/reinforced, +/area/almayer/shipboard/brig/main_office) "luk" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -49723,9 +49903,12 @@ }, /area/almayer/hull/lower_hull/l_a_p) "lut" = ( -/obj/structure/pipes/vents/scrubber, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/general_equipment) +/obj/structure/machinery/computer/crew, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/main_office) "luu" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -49739,11 +49922,11 @@ }, /area/almayer/hull/lower_hull/l_m_p) "luw" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ + dir = 2; + name = "Brig" }, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -49762,16 +49945,29 @@ /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 }, -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/airlock/almayer/security/glass{ - name = "Brig"; - dir = 2 +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "perma_lockdown"; + name = "\improper Perma Lockdown Shutter" }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/lobby) +/area/almayer/shipboard/brig/perma) +"luH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/atm{ + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "redcorner" + }, +/area/almayer/shipboard/brig/processing) "luS" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/cardboard{ @@ -49817,41 +50013,14 @@ }, /area/almayer/living/pilotbunks) "lvZ" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/door_control{ - id = "courtyard_cells"; - name = "\improper Courtyard Lockdown Shutters"; - req_access_txt = "3"; - pixel_x = 6 - }, -/obj/structure/machinery/door_control{ - id = "Brig Lockdown Shutters"; - name = "Brig Lockdown Shutters"; - pixel_x = -6; - req_access_txt = "3" - }, -/obj/structure/machinery/door_control{ - id = "courtyard window"; - name = "Courtyard Window Shutters"; - pixel_x = -6; - pixel_y = 9; - req_access_txt = "3" - }, -/obj/structure/machinery/door_control{ - id = "Cell Privacy Shutters"; - name = "Cell Privacy Shutters"; - pixel_x = 6; - pixel_y = 9; - req_access_txt = "3" - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/poddoor/almayer/locked{ + dir = 8; + id = "Perma 1L"; + name = "\improper cell shutter" }, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/plating, +/area/almayer/shipboard/brig/perma) "lwi" = ( /obj/structure/machinery/door/airlock/almayer/maint{ access_modified = 1; @@ -49990,6 +50159,12 @@ }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) +"lzx" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "redcorner" + }, +/area/almayer/shipboard/brig/main_office) "lzA" = ( /obj/structure/machinery/sleep_console{ dir = 8 @@ -50197,17 +50372,19 @@ }, /area/almayer/engineering/engineering_workshop/hangar) "lCn" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass{ - dir = 1; - name = "\improper Cryo Room" +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = 32 }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/structure/sign/safety/hazard{ + pixel_y = 32 }, -/area/almayer/shipboard/brig/cryo) +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/armory) "lCt" = ( /turf/open/floor/almayer{ dir = 10; @@ -50229,13 +50406,11 @@ }, /area/almayer/hallways/aft_hallway) "lCM" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper_bin/uscm{ - pixel_y = 7 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/item/tool/pen, /turf/open/floor/almayer{ - dir = 8; + dir = 1; icon_state = "red" }, /area/almayer/shipboard/brig/main_office) @@ -50343,22 +50518,11 @@ }, /area/almayer/engineering/upper_engineering) "lEv" = ( -/obj/structure/sign/safety/intercom{ - pixel_x = -17 - }, -/obj/structure/surface/table/almayer, -/obj/item/book/manual/marine_law{ - pixel_x = -3; - pixel_y = 1 - }, -/obj/item/device/flashlight/lamp{ - layer = 3.1; - pixel_x = 7; - pixel_y = 10 +/obj/structure/machinery/light{ + dir = 8 }, -/obj/item/poster, /turf/open/floor/almayer{ - dir = 9; + dir = 8; icon_state = "red" }, /area/almayer/shipboard/brig/lobby) @@ -50424,12 +50588,17 @@ /area/almayer/medical/morgue) "lFs" = ( /obj/structure/disposalpipe/segment{ - dir = 8; + dir = 1; icon_state = "pipe-c" }, -/obj/structure/pipes/standard/manifold/fourway/hidden/supply, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = -26 + }, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/perma) "lFt" = ( /obj/structure/machinery/portable_atmospherics/powered/pump, /obj/structure/sign/safety/maint{ @@ -50710,11 +50879,19 @@ /turf/open/floor/almayer, /area/almayer/squads/charlie) "lLN" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/general_equipment) +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = -30 + }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/brig/armory) "lLS" = ( /obj/structure/sign/safety/galley{ pixel_x = 32 @@ -50780,15 +50957,26 @@ }, /area/almayer/hallways/stern_hallway) "lNs" = ( -/obj/structure/closet/secure_closet/guncabinet/riot_control, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, +/obj/structure/disposalpipe/segment, +/obj/structure/sign/safety/ammunition{ + pixel_x = 32; + pixel_y = 7 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/machinery/door_control{ + id = "cmp_armory"; + name = "Armory Lockdown"; + pixel_x = 24; + pixel_y = -6; + req_access_txt = "4" + }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "plating_striped" + dir = 4; + icon_state = "red" }, -/area/almayer/shipboard/brig/armory) +/area/almayer/shipboard/brig/main_office) "lNw" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -50814,14 +51002,18 @@ }, /area/almayer/hull/lower_hull/l_m_p) "lNF" = ( -/obj/item/storage/donut_box{ - pixel_y = 8 +/obj/structure/closet/secure_closet{ + name = "\improper Lethal Injection Locker" }, -/obj/structure/closet/secure_closet/personal/cabinet{ - req_access = null +/obj/item/reagent_container/ld50_syringe/choral, +/obj/item/reagent_container/ld50_syringe/choral, +/obj/item/reagent_container/ld50_syringe/choral, +/obj/item/reagent_container/ld50_syringe/choral, +/obj/item/reagent_container/ld50_syringe/choral, +/turf/open/floor/almayer{ + icon_state = "redcorner" }, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/execution) "lOl" = ( /obj/structure/machinery/light{ dir = 8 @@ -50889,6 +51081,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) +"lPG" = ( +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/command/cichallway) "lPO" = ( /obj/structure/surface/rack, /turf/open/floor/almayer{ @@ -50915,13 +51116,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"lQq" = ( -/obj/structure/machinery/light, -/obj/structure/machinery/cm_vending/gear/commanding_officer, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/living/commandbunks) "lQu" = ( /obj/structure/bed/stool, /turf/open/floor/almayer{ @@ -51050,6 +51244,14 @@ icon_state = "redfull" }, /area/almayer/hull/lower_hull/l_f_s) +"lUw" = ( +/obj/structure/machinery/light, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_21"; + pixel_y = 3 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "lVl" = ( /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor/almayer, @@ -51102,6 +51304,16 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"lWD" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/structure/sign/safety/bathunisex{ + pixel_x = 11; + pixel_y = -26 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "lXg" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/recharger, @@ -51178,12 +51390,14 @@ }, /area/almayer/hallways/hangar) "lYZ" = ( -/obj/structure/machinery/vending/coffee, -/obj/structure/machinery/light{ - dir = 4 +/obj/structure/surface/table/almayer, +/obj/item/storage/toolbox/mechanical/green{ + pixel_y = 8 }, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 8; + icon_state = "red" }, /area/almayer/shipboard/brig/general_equipment) "lZs" = ( @@ -51230,6 +51444,13 @@ icon_state = "test_floor4" }, /area/almayer/medical/hydroponics) +"maa" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "red" + }, +/area/almayer/shipboard/brig/general_equipment) "maq" = ( /obj/structure/sign/safety/cryo{ pixel_x = 7; @@ -51298,6 +51519,15 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/vehiclehangar) +"mcK" = ( +/obj/structure/closet/secure_closet/commander, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/device/whistle, +/obj/item/device/megaphone, +/obj/item/device/radio, +/obj/item/clothing/shoes/laceup, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "mcL" = ( /obj/structure/machinery/vending/snack, /obj/structure/sign/safety/maint{ @@ -51329,16 +51559,21 @@ }, /area/almayer/squads/alpha) "mdJ" = ( -/obj/structure/machinery/vending/security, -/obj/structure/machinery/light, -/obj/structure/machinery/firealarm{ - dir = 8; - pixel_x = -24 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/perma) +"mdS" = ( +/obj/structure/sign/safety/ammunition{ + pixel_x = 32; + pixel_y = 7 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 4; + icon_state = "red" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/main_office) "mdW" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/effect/decal/warning_stripes{ @@ -51468,6 +51703,19 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/charlie_delta_shared) +"mgR" = ( +/obj/structure/surface/table/almayer, +/obj/item/prop/magazine/dirty{ + pixel_y = 5 + }, +/obj/item/tool/pen{ + pixel_x = 4; + pixel_y = 6 + }, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/living/briefing) "mha" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -51624,7 +51872,13 @@ /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) "mkk" = ( -/turf/open/floor/almayer, +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + allow_construction = 0 + }, /area/almayer/shipboard/brig/lobby) "mkx" = ( /obj/structure/machinery/door_control{ @@ -52140,6 +52394,18 @@ icon_state = "plate" }, /area/almayer/squads/alpha) +"muQ" = ( +/obj/structure/machinery/cm_vending/clothing/dress{ + density = 0; + pixel_y = 16 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/command/cic) "mvl" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -52175,6 +52441,11 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) +"mwz" = ( +/turf/open/floor/almayer{ + icon_state = "emeraldfull" + }, +/area/almayer/living/briefing) "mwA" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -52273,7 +52544,8 @@ "myT" = ( /obj/structure/closet/firecloset, /obj/effect/decal/warning_stripes{ - icon_state = "NE-out" + icon_state = "NE-out"; + pixel_y = 1 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) @@ -52321,6 +52593,25 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) +"mzG" = ( +/obj/structure/bookcase{ + icon_state = "book-5"; + name = "law and engineering manuals bookcase"; + opacity = 0 + }, +/obj/item/book/manual/marine_law, +/obj/item/book/manual/detective, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/engineering_guide, +/obj/item/book/manual/engineering_construction, +/obj/item/book/manual/orbital_cannon_manual, +/obj/item/book/manual/ripley_build_and_repair, +/obj/item/book/manual/engineering_hacking, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "mzO" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -52348,6 +52639,20 @@ /obj/effect/spawner/random/tool, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) +"mAT" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 8; + id = "bot_armory"; + name = "\improper Armory Shutters" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + name = "\improper Armory" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/armory) "mAV" = ( /obj/structure/machinery/cryopod, /turf/open/floor/almayer{ @@ -52505,10 +52810,8 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) -"mFb" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, +"mES" = ( +/obj/structure/pipes/vents/scrubber, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "mFq" = ( @@ -52561,21 +52864,9 @@ /turf/open/floor/almayer, /area/almayer/command/cichallway) "mGn" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ - dir = 2; - name = "Brig"; - req_one_access_txt = "1;3"; - req_access = null - }, +/obj/structure/machinery/cm_vending/clothing/military_police_warden, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, /area/almayer/shipboard/brig/main_office) "mGu" = ( @@ -52786,8 +53077,14 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/main_office) +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/brig/cryo) "mKq" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/living/bridgebunks) @@ -52870,18 +53167,22 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_hallway) "mLb" = ( -/obj/structure/platform{ - dir = 1 +/obj/structure/surface/table/almayer, +/obj/item/toy/deck{ + pixel_x = -6; + pixel_y = -2 }, /obj/item/toy/deck/uno{ pixel_x = 6; pixel_y = -1 }, -/obj/item/toy/deck{ - pixel_x = -6; - pixel_y = -2 +/obj/structure/prop/holidays/string_lights{ + dir = 8; + pixel_x = 29 + }, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, /area/almayer/living/briefing) "mLu" = ( /obj/effect/decal/warning_stripes{ @@ -52918,9 +53219,13 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) "mLI" = ( -/obj/structure/machinery/cm_vending/clothing/military_police_warden, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/almayer{ + allow_construction = 0 + }, +/area/almayer/shipboard/brig/perma) "mLJ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -52942,15 +53247,6 @@ icon_state = "orange" }, /area/almayer/hallways/stern_hallway) -"mMd" = ( -/obj/structure/closet/fireaxecabinet{ - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) "mMP" = ( /obj/effect/landmark/start/intel, /turf/open/floor/plating/plating_catwalk, @@ -53216,17 +53512,6 @@ icon_state = "silverfull" }, /area/almayer/command/securestorage) -"mSI" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/almayer/command/reinforced{ - name = "\improper Commanding Officer's Quarters"; - req_access = null; - req_access_txt = "31" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/commandbunks) "mSK" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/structure/window/reinforced{ @@ -53378,7 +53663,7 @@ /turf/open/floor/almayer{ icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/cryo) "mVE" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -53408,21 +53693,26 @@ pixel_x = -27 }, /obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, +/obj/structure/bed/chair/comfy/charlie{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, /area/almayer/living/briefing) "mWe" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; name = "ship-grade camera" }, -/obj/structure/machinery/cryopod/right, -/obj/structure/sign/safety/cryo{ - pixel_x = 32 +/obj/structure/reagent_dispensers/peppertank{ + pixel_x = 30 }, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "red" }, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/general_equipment) "mWs" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -53685,12 +53975,6 @@ icon_state = "redfull" }, /area/almayer/command/cic) -"nbB" = ( -/obj/structure/closet/secure_closet/freezer/fridge/full, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/grunt_rnr) "ncp" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -53797,6 +54081,22 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +"neF" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/transmitter{ + name = "Kitchen Telephone"; + phone_category = "Almayer"; + phone_id = "Kitchen"; + pixel_x = -8; + pixel_y = 29 + }, +/obj/structure/machinery/vending/ingredients, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/grunt_rnr) "neO" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -54140,12 +54440,11 @@ }, /area/almayer/living/briefing) "nlH" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" }, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/cells) "nlW" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/largecrate/random/barrel/green, @@ -54257,17 +54556,16 @@ /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) "nnz" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/sign/safety/rewire{ - pixel_y = -24; - pixel_x = 12 +/obj/structure/sign/safety/maint{ + pixel_x = 32; + pixel_y = -8 }, -/turf/open/floor/almayer{ - icon_state = "red" +/obj/structure/sign/safety/firingrange{ + pixel_x = 32; + pixel_y = 4 }, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/perma) "nnD" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Down4"; @@ -54283,6 +54581,16 @@ /obj/structure/largecrate/random/barrel/white, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) +"nnG" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "noj" = ( /obj/structure/largecrate, /obj/structure/prop/server_equipment/laptop{ @@ -54294,12 +54602,15 @@ }, /area/almayer/squads/req) "noo" = ( -/obj/structure/machinery/power/apc/almayer, -/obj/structure/sign/safety/rewire{ - pixel_y = -38 +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 8; + id = "bot_armory"; + name = "\improper Armory Shutters" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/general_equipment) +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/armory) "nos" = ( /obj/structure/machinery/chem_storage/medbay{ dir = 1 @@ -54349,6 +54660,28 @@ }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_s) +"npK" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/emails{ + dir = 4; + pixel_y = 2 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) +"npS" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/flashlight/lamp{ + layer = 3.3; + pixel_x = 15 + }, +/obj/structure/prop/server_equipment/laptop{ + pixel_x = -2; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "orangefull" + }, +/area/almayer/living/briefing) "nqx" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -54383,6 +54716,16 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north2) +"nqZ" = ( +/obj/structure/reagent_dispensers/peppertank{ + pixel_x = 30; + pixel_y = -6 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/shipboard/brig/perma) "nrt" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -54482,8 +54825,19 @@ /turf/closed/wall/almayer/reinforced, /area/almayer/command/computerlab) "ntm" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/execution) +/obj/structure/sign/safety/maint{ + pixel_x = -17; + pixel_y = -8 + }, +/obj/structure/machinery/door_control{ + id = "CMP Office Shutters"; + name = "CMP Office Shutters"; + pixel_x = -24; + pixel_y = 8; + req_one_access_txt = "24;31" + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/main_office) "ntr" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/item/seeds/goldappleseed, @@ -54504,12 +54858,11 @@ }, /area/almayer/hallways/vehiclehangar) "ntu" = ( -/obj/structure/machinery/cm_vending/sorted/medical, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" +/obj/structure/machinery/light/small{ + dir = 8 }, -/area/almayer/shipboard/brig/surgery) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) "ntx" = ( /obj/structure/machinery/door/airlock/almayer/generic{ id = "Alpha_2"; @@ -54642,17 +54995,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) -"nwv" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/transmitter/rotary{ - name = "Commanding Officer's Office"; - phone_category = "Offices"; - phone_id = "Commanding Officer's Office"; - pixel_y = 8; - pixel_x = 16 - }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) "nww" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -54671,10 +55013,11 @@ }, /area/almayer/shipboard/port_missiles) "nwz" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + allow_construction = 0 }, -/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/lobby) "nwD" = ( /turf/open/floor/almayer{ @@ -54728,6 +55071,20 @@ icon_state = "green" }, /area/almayer/squads/req) +"nxq" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + dir = 1; + name = "\improper Warden Office" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 2; + id = "Warden Office Shutters"; + name = "\improper Privacy Shutters" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/main_office) "nxK" = ( /obj/structure/sign/safety/high_voltage{ pixel_y = -32 @@ -54783,11 +55140,12 @@ /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) "nza" = ( -/obj/structure/bed/chair/comfy/charlie, /obj/structure/pipes/vents/scrubber{ dir = 4 }, -/obj/item/trash/uscm_mre, +/obj/structure/bed/chair/comfy/charlie{ + dir = 4 + }, /turf/open/floor/almayer{ icon_state = "emeraldfull" }, @@ -54849,11 +55207,11 @@ }, /area/almayer/squads/alpha_bravo_shared) "nBb" = ( -/obj/structure/machinery/vending/security, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "red" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/main_office) "nBc" = ( /obj/structure/largecrate/random, /turf/open/floor/almayer{ @@ -54868,18 +55226,21 @@ dir = 4 }, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/general_equipment) "nBu" = ( -/obj/structure/surface/table/almayer, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser{ - pixel_y = 8 +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/obj/structure/sign/safety/restrictedarea{ + pixel_x = -17; + pixel_y = -8 }, -/obj/structure/machinery/recharger, /turf/open/floor/almayer{ + dir = 8; icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/perma) "nBw" = ( /turf/open/floor/almayer{ dir = 1; @@ -54969,6 +55330,11 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) +"nDV" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/command/cichallway) "nEo" = ( /obj/structure/surface/table/almayer, /obj/item/storage/donut_box{ @@ -55141,10 +55507,9 @@ dir = 1 }, /turf/open/floor/almayer{ - dir = 6; icon_state = "red" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/main_office) "nHF" = ( /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_m_s) @@ -55157,6 +55522,18 @@ icon_state = "plating_striped" }, /area/almayer/living/cryo_cells) +"nHV" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/general_equipment) "nIj" = ( /turf/open/floor/almayer{ icon_state = "green" @@ -55218,25 +55595,21 @@ /turf/open/floor/almayer, /area/almayer/living/basketball) "nIW" = ( -/obj/structure/bed/chair/comfy/bravo{ - dir = 1 - }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 }, +/obj/structure/bed/chair/comfy/bravo{ + dir = 1 + }, /turf/open/floor/almayer{ icon_state = "orangefull" }, /area/almayer/living/briefing) "nJo" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 1 - }, +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) +/area/almayer/shipboard/brig/main_office) "nJs" = ( /obj/structure/largecrate/random/case, /turf/open/floor/almayer{ @@ -55273,6 +55646,15 @@ icon_state = "red" }, /area/almayer/command/lifeboat) +"nKs" = ( +/obj/structure/machinery/cm_vending/clothing/dress{ + pixel_y = 0; + req_access = list(1) + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/living/commandbunks) "nLa" = ( /obj/structure/bed/chair{ dir = 4 @@ -55382,14 +55764,11 @@ }, /area/almayer/living/briefing) "nMu" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21" - }, /turf/open/floor/almayer{ dir = 9; icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/general_equipment) "nMz" = ( /obj/structure/sign/safety/cryo{ pixel_x = 35 @@ -55452,11 +55831,15 @@ }, /area/almayer/living/briefing) "nNQ" = ( +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, /turf/open/floor/almayer{ - dir = 9; + dir = 4; icon_state = "red" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/main_office) "nNV" = ( /obj/structure/bed/chair{ dir = 8; @@ -55485,14 +55868,17 @@ }, /area/almayer/engineering/upper_engineering) "nOe" = ( -/obj/structure/closet/secure_closet/personal/cabinet{ - req_access = null +/obj/structure/window/framed/almayer/hull/hijack_bustable, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "perma_lockdown"; + name = "\improper Perma Lockdown Shutter" }, -/obj/item/storage/donut_box{ - pixel_y = 8 +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 8 }, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/plating, +/area/almayer/shipboard/brig/perma) "nOG" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -55597,6 +55983,13 @@ /obj/structure/machinery/light, /turf/open/floor/almayer, /area/almayer/hallways/aft_hallway) +"nQH" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "nRq" = ( /obj/effect/decal/cleanable/blood/oil/streak, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -55612,6 +56005,17 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"nRQ" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/almayer/command/reinforced{ + name = "\improper Commanding Officer's Quarters"; + req_access = null; + req_access_txt = "31" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/commandbunks) "nRR" = ( /turf/open/floor/almayer{ dir = 1; @@ -55642,12 +56046,10 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/command/telecomms) "nSM" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 26 - }, +/obj/structure/surface/table/almayer, +/obj/item/device/taperecorder, /turf/open/floor/almayer{ - dir = 1; - icon_state = "red" + icon_state = "plate" }, /area/almayer/shipboard/brig/main_office) "nSN" = ( @@ -55820,18 +56222,21 @@ /turf/open/floor/wood/ship, /area/almayer/engineering/ce_room) "nXm" = ( -/obj/structure/closet/secure_closet/surgical{ - pixel_x = -30 +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1 }, -/obj/structure/machinery/power/apc/almayer, -/obj/structure/sign/safety/rewire{ - pixel_y = -38 +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter" + }, +/obj/structure/machinery/door/poddoor/almayer/locked{ + id = "Cell 2"; + name = "\improper Courtyard Divider" }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "sterile_green_corner" + icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/surgery) +/area/almayer/shipboard/brig/cells) "nXF" = ( /obj/structure/bed/sofa/south/white/right{ pixel_y = 16 @@ -55918,12 +56323,9 @@ name = "\improper Courtyard Lockdown Shutter" }, /obj/structure/machinery/door/poddoor/almayer/locked{ - id = "Cell 4"; + id = "Cell 3"; name = "\improper Courtyard Divider" }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -56040,12 +56442,6 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"ocs" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "ocB" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -56117,6 +56513,23 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/bravo) +"odC" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/item/prop/magazine/boots/n160{ + layer = 2.8; + pixel_x = 4; + pixel_y = -8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/commandbunks) "odD" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -56451,9 +56864,6 @@ }, /area/almayer/engineering/engine_core) "okB" = ( -/obj/structure/bed/chair/comfy/alpha{ - dir = 1 - }, /obj/structure/pipes/vents/scrubber{ dir = 4 }, @@ -56470,8 +56880,19 @@ }, /area/space) "okM" = ( -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/structure/machinery/door/airlock/almayer/security/glass{ + name = "\improper Execution Room" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/execution) "olk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -56488,17 +56909,22 @@ }, /area/almayer/engineering/upper_engineering/port) "olv" = ( -/obj/structure/machinery/cm_vending/sorted/marine_food, -/obj/structure/sign/safety/security{ - pixel_x = 32; - pixel_y = -8 +/obj/structure/surface/table/almayer, +/obj/item/tool/hand_labeler{ + pixel_x = -8; + pixel_y = 3 }, -/obj/structure/sign/safety/restrictedarea{ - pixel_x = 32; - pixel_y = 7 +/obj/item/storage/box/evidence{ + pixel_x = 7; + pixel_y = 6 + }, +/obj/item/storage/box/evidence{ + pixel_x = 1; + pixel_y = 1 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 8; + icon_state = "red" }, /area/almayer/shipboard/brig/general_equipment) "olM" = ( @@ -56612,16 +57038,11 @@ }, /area/almayer/living/auxiliary_officer_office) "oog" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 8 - }, -/obj/structure/machinery/door/airlock/almayer/security/reinforced{ - name = "\improper Chief MP's Bedroom" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/execution) "ooh" = ( /obj/structure/sign/safety/restrictedarea{ pixel_x = 8; @@ -56648,21 +57069,24 @@ }, /area/almayer/medical/lower_medical_medbay) "ooR" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 }, -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - dir = 1; - name = "\improper Brig" +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "perma_lockdown"; + name = "\improper Perma Lockdown Shutter" }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/reinforced{ + name = "\improper Perma Cells" }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/perma) "opj" = ( /obj/structure/surface/table/almayer, /obj/effect/spawner/random/powercell, @@ -56689,11 +57113,11 @@ /turf/open/space/basic, /area/space) "opN" = ( +/obj/structure/closet/secure_closet/brig, /obj/structure/machinery/light{ unacidable = 1; unslashable = 1 }, -/obj/structure/closet/secure_closet/brig/prisoner, /turf/open/floor/almayer{ icon_state = "red" }, @@ -56730,12 +57154,6 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) -"oqA" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/uniform_vendors, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/command/cic) "oqD" = ( /obj/structure/surface/table/almayer, /obj/item/tool/wet_sign, @@ -56752,6 +57170,14 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) +"oqP" = ( +/obj/structure/bed/chair/comfy/delta{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "oqS" = ( /obj/structure/toilet{ dir = 1 @@ -56891,11 +57317,20 @@ }, /area/almayer/hull/lower_hull/l_a_p) "osJ" = ( -/obj/structure/bed, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/surface/table/almayer, +/obj/item/folder/white{ + pixel_x = 5; + pixel_y = 5 }, -/area/almayer/shipboard/brig/perma) +/obj/item/paper, +/obj/item/handcuffs, +/obj/item/clothing/mask/cigarette/cigar/classic, +/obj/item/coin/silver{ + desc = "A small coin, bearing the falling falcons insignia."; + name = "falling falcons challenge coin" + }, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) "osT" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/prop/ice_colony/hula_girl{ @@ -56977,18 +57412,33 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"ouV" = ( -/obj/structure/machinery/light{ - dir = 1 +"ouT" = ( +/obj/item/trash/plate{ + pixel_x = 9; + pixel_y = 11 }, -/obj/structure/machinery/flasher{ - id = "Perma 1"; - pixel_y = 24 +/obj/item/reagent_container/food/snacks/carpmeat{ + layer = 3.3; + pixel_x = 8; + pixel_y = 11 + }, +/obj/item/reagent_container/food/snacks/carpmeat{ + layer = 3.3; + pixel_x = 8; + pixel_y = 11 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) +"ouV" = ( +/obj/structure/sign/safety/cryo{ + pixel_x = 1; + pixel_y = 26 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "red" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/main_office) "ouW" = ( /obj/structure/sign/safety/storage{ pixel_x = 8; @@ -57091,15 +57541,13 @@ /turf/open/floor/almayer, /area/almayer/living/cafeteria_officer) "oxn" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/pipes/vents/pump{ + dir = 1 }, -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 +/turf/open/floor/almayer{ + icon_state = "red" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/execution) +/area/almayer/shipboard/brig/chief_mp_office) "oxp" = ( /obj/structure/largecrate/random/case, /turf/open/floor/almayer{ @@ -57122,6 +57570,23 @@ icon_state = "orangecorner" }, /area/almayer/hull/upper_hull/u_a_s) +"oys" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/door/airlock/almayer/command/reinforced{ + dir = 1; + id_tag = "CO-Office"; + name = "\improper Commanding Officer's Office"; + req_access = null; + req_access_txt = "31" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/commandbunks) "oyw" = ( /obj/structure/platform_decoration{ dir = 8 @@ -57276,6 +57741,24 @@ icon_state = "silver" }, /area/almayer/command/cichallway) +"oBW" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/storage/bible{ + desc = "As the legendary US Army chaplain once said, 'There are no Athiests in fancy offices'."; + name = "Holy Bible"; + pixel_x = -3; + pixel_y = 9 + }, +/obj/item/prop/helmetgarb/rosary{ + pixel_x = -4; + pixel_y = 5 + }, +/obj/item/device/flashlight/lamp{ + pixel_x = 3; + pixel_y = 1 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "oCf" = ( /obj/structure/machinery/light{ unacidable = 1; @@ -57304,14 +57787,11 @@ }, /area/almayer/hull/upper_hull/u_f_s) "oCX" = ( -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera"; - dir = 1 - }, /turf/open/floor/almayer{ + dir = 6; icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/cryo) "oDf" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) @@ -57431,16 +57911,12 @@ /turf/open/floor/almayer, /area/almayer/living/briefing) "oEE" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "perma_lockdown"; - name = "\improper Perma Lockdown Shutter"; - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 }, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) "oER" = ( /obj/structure/machinery/light{ dir = 8 @@ -57561,17 +58037,16 @@ icon_state = "test_floor4" }, /area/almayer/engineering/laundry) -"oHY" = ( -/obj/structure/bed/chair/bolted, +"oIc" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 4 + }, +/obj/structure/machinery/light/small, /turf/open/floor/almayer{ - dir = 1; - icon_state = "red" + dir = 6; + icon_state = "orange" }, -/area/almayer/shipboard/brig/processing) -"oIc" = ( -/obj/structure/largecrate/random/barrel/blue, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_f_p) +/area/almayer/shipboard/brig/perma) "oIn" = ( /obj/structure/bed/chair{ dir = 8; @@ -57753,12 +58228,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/hydroponics) -"oMd" = ( -/obj/structure/closet/secure_closet/freezer/meat, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/grunt_rnr) "oMe" = ( /obj/structure/machinery/light{ dir = 8 @@ -57787,6 +58256,13 @@ icon_state = "rasputin3" }, /area/almayer/powered/agent) +"oMC" = ( +/obj/structure/machinery/light, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "oMH" = ( /obj/structure/bed/chair{ dir = 4 @@ -57795,27 +58271,6 @@ icon_state = "redfull" }, /area/almayer/squads/alpha_bravo_shared) -"oMM" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/reagent_container/food/drinks/bottle/whiskey{ - pixel_x = -5; - pixel_y = 16 - }, -/obj/item/reagent_container/food/drinks/bottle/whiskey{ - desc = "A premium double-malt whiskey, this bottle was gifted to the Captain of the USS Almayer after the completion of the ship's space trials by the VADM. himself."; - pixel_x = 3; - pixel_y = 16 - }, -/obj/item/reagent_container/food/drinks/bottle/whiskey{ - pixel_x = 11; - pixel_y = 16 - }, -/obj/item/storage/box/drinkingglasses{ - pixel_x = -1; - pixel_y = 2 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "oMQ" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, @@ -58038,17 +58493,16 @@ }, /area/almayer/command/airoom) "oRZ" = ( -/obj/structure/machinery/light{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/bed/chair/bolted, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "red" +/obj/structure/machinery/light{ + dir = 1 }, +/turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) "oSq" = ( /obj/item/device/radio/intercom{ @@ -58194,14 +58648,16 @@ }, /area/almayer/living/starboard_garden) "oWI" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21" +/obj/structure/machinery/cryopod/right{ + pixel_y = 6 + }, +/obj/structure/sign/safety/cryo{ + pixel_x = 32 }, /turf/open/floor/almayer{ - dir = 6; - icon_state = "red" + icon_state = "cargo" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/cryo) "oXb" = ( /obj/effect/landmark/start/marine/charlie, /obj/effect/landmark/late_join/charlie, @@ -58313,24 +58769,12 @@ }, /area/almayer/medical/containment) "paq" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1 - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "courtyard_cells"; - name = "\improper Courtyard Lockdown Shutter" - }, -/obj/structure/machinery/door/poddoor/almayer/locked{ - id = "Cell 2"; - name = "\improper Courtyard Divider" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, +/obj/structure/surface/table/almayer, +/obj/structure/machinery/faxmachine/uscm/brig, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/shipboard/brig/cells) +/area/almayer/shipboard/brig/main_office) "paI" = ( /obj/structure/sign/safety/debark_lounge{ pixel_x = 15; @@ -58350,21 +58794,16 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/offices) "pbh" = ( -/obj/structure/machinery/cm_vending/clothing/military_police{ - density = 0; - pixel_y = 16 - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 8 +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/light{ + dir = 4 }, /turf/open/floor/almayer{ - icon_state = "cargo" + dir = 5; + icon_state = "red" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/main_office) "pbl" = ( /obj/structure/bed, /obj/item/toy/plush/farwa{ @@ -58390,7 +58829,9 @@ }, /area/almayer/command/cic) "pbC" = ( -/turf/open/floor/plating/plating_catwalk, +/obj/item/bedsheet/red, +/obj/structure/bed, +/turf/open/floor/wood/ship, /area/almayer/shipboard/brig/chief_mp_office) "pbV" = ( /turf/open/floor/almayer{ @@ -58485,9 +58926,6 @@ /obj/structure/machinery/light{ dir = 1 }, -/obj/structure/pipes/vents/pump{ - dir = 4 - }, /turf/open/floor/almayer{ dir = 1; icon_state = "red" @@ -58508,28 +58946,18 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_f_p) -"pdt" = ( -/obj/structure/closet/secure_closet/freezer/fridge/groceries, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/grunt_rnr) "pdG" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/tapes{ - pixel_x = 7; - pixel_y = 6 +/obj/structure/machinery/door/airlock/almayer/security{ + dir = 2; + name = "\improper Chief MP's Bedroom" }, -/obj/item/storage/box/tapes{ - pixel_x = -6; - pixel_y = 6 +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 }, -/obj/item/storage/box/tapes{ - pixel_x = 1; - pixel_y = 1 +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/evidence_storage) +/area/almayer/shipboard/brig/chief_mp_office) "pef" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/sign/safety/maint{ @@ -58573,6 +59001,7 @@ /obj/item/facepaint/black{ pixel_x = -10 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -58774,12 +59203,22 @@ }, /area/almayer/shipboard/brig/surgery) "plZ" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/pipes/standard/simple/hidden/supply{ + 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" + }, /turf/open/floor/almayer{ - icon_state = "red" + icon_state = "test_floor4" }, /area/almayer/shipboard/brig/main_office) "pmk" = ( @@ -58821,18 +59260,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"pmO" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Bathroom"; - dir = 2 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/commandbunks) "pmV" = ( /obj/structure/prop/server_equipment/yutani_server/broken{ density = 0; @@ -58870,16 +59297,6 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) -"poH" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ - dir = 2; - name = "Brig" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/shipboard/brig/processing) "poR" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -58887,15 +59304,17 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_s) "poZ" = ( -/obj/structure/machinery/firealarm{ - dir = 4; - pixel_x = 21 +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/obj/structure/bed/chair/bolted{ + dir = 4 }, /turf/open/floor/almayer{ - dir = 4; - icon_state = "red" + icon_state = "plate" }, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/perma) "ppc" = ( /obj/structure/largecrate/supply/generator, /obj/structure/machinery/light/small{ @@ -59193,14 +59612,12 @@ }, /area/almayer/shipboard/starboard_missiles) "pwt" = ( -/obj/structure/sign/safety/restrictedarea{ - pixel_x = -17; - pixel_y = 7 +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = -25 }, -/obj/structure/machinery/cm_vending/sorted/marine_food, /turf/open/floor/almayer{ - dir = 10; - icon_state = "red" + dir = 8; + icon_state = "redcorner" }, /area/almayer/shipboard/brig/processing) "pwK" = ( @@ -59252,6 +59669,20 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south2) +"pxL" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/coatrack{ + pixel_x = -5; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "pyc" = ( /obj/structure/bed/stool, /turf/open/floor/almayer{ @@ -59328,14 +59759,15 @@ }, /area/almayer/shipboard/weapon_room) "pzc" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 +/obj/structure/pipes/vents/pump, +/obj/structure/bed/chair{ + dir = 1 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "red" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/main_office) "pzG" = ( /obj/docking_port/stationary/emergency_response/port1, /turf/open/floor/almayer{ @@ -59549,22 +59981,30 @@ /area/almayer/lifeboat_pumps/south1) "pFa" = ( /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 8; + icon_state = "pipe-c" }, /obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 + dir = 9 + }, +/turf/open/floor/almayer{ + allow_construction = 0 }, -/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/lobby) "pFg" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 +/obj/structure/window/framed/almayer/hull/hijack_bustable, +/obj/structure/machinery/door/poddoor/almayer/locked{ + dir = 8; + id = "Perma 1"; + name = "\improper isolation shutter" }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter" }, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/plating, +/area/almayer/shipboard/brig/perma) "pFA" = ( /obj/structure/pipes/standard/simple/visible{ dir = 4 @@ -59588,20 +60028,20 @@ /area/almayer/hull/lower_hull/l_a_p) "pGG" = ( /obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/cameras/almayer_network{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/sign/safety/terminal{ - pixel_y = 32 +/obj/item/storage/fancy/cigarettes/lucky_strikes, +/obj/item/tool/lighter, +/obj/item/clothing/glasses/sunglasses/blindfold, +/obj/structure/machinery/firealarm{ + pixel_y = 28 }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" +/obj/structure/machinery/door_control{ + id = "Execution Shutters"; + name = "Privacy Shutters"; + pixel_y = 12; + req_access_txt = "3" }, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/execution) "pGK" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -59697,14 +60137,17 @@ /turf/open/floor/plating/almayer, /area/almayer/hull/lower_hull/l_a_s) "pIH" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 4 +/obj/structure/machinery/door_control{ + id = "perma_exit"; + name = "\improper Exit Shutters"; + pixel_y = -22; + req_access_txt = "3" }, /turf/open/floor/almayer{ - dir = 10; - icon_state = "red" + dir = 8; + icon_state = "redcorner" }, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/perma) "pIU" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -59719,18 +60162,23 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"pJi" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 2; - id = "CMP Office Shutters"; - name = "\improper Privacy Shutters" +"pJe" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/prop/tableflag/uscm{ + pixel_x = -5 }, -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/item/prop/tableflag/uscm2{ + pixel_x = 5 }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) +"pJi" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "red" + }, +/area/almayer/shipboard/brig/general_equipment) "pJn" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light/small{ @@ -59763,29 +60211,47 @@ }, /area/almayer/living/port_emb) "pJE" = ( -/obj/structure/surface/table/almayer, -/obj/item/folder/white{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/paper, -/obj/item/handcuffs, -/obj/item/clothing/mask/cigarette/cigar/classic, -/obj/item/coin/silver{ - desc = "A small coin, bearing the falling falcons insignia."; - name = "falling falcons challenge coin" +/obj/structure/closet/secure_closet{ + name = "\improper Execution Firearms" }, -/obj/structure/machinery/light{ +/obj/item/ammo_magazine/rifle/m4ra, +/obj/item/ammo_magazine/rifle/m4ra, +/obj/item/ammo_magazine/rifle/m4ra, +/obj/item/ammo_magazine/rifle/m4ra, +/obj/item/ammo_magazine/rifle/m4ra, +/obj/item/ammo_magazine/rifle/m4ra, +/obj/item/weapon/gun/rifle/m4ra, +/obj/item/weapon/gun/rifle/m4ra, +/obj/item/weapon/gun/rifle/m4ra, +/obj/structure/machinery/light/small{ dir = 1 }, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer{ + dir = 8; + icon_state = "redcorner" + }, +/area/almayer/shipboard/brig/execution) "pJJ" = ( /turf/open/floor/almayer{ dir = 1; icon_state = "green" }, /area/almayer/hallways/port_hallway) +"pJK" = ( +/obj/structure/bookcase{ + icon_state = "book-5"; + name = "medical manuals bookcase"; + opacity = 0 + }, +/obj/item/book/manual/surgery, +/obj/item/book/manual/research_and_development, +/obj/item/book/manual/medical_diagnostics_manual, +/obj/item/book/manual/medical_cloning, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "pJR" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_AresUp"; @@ -60189,6 +60655,12 @@ icon_state = "test_floor5" }, /area/almayer/medical/hydroponics) +"pSH" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "pSL" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -60434,19 +60906,13 @@ }, /area/almayer/squads/req) "pWG" = ( +/obj/structure/bed/chair{ + dir = 1 + }, /obj/structure/machinery/light{ unacidable = 1; unslashable = 1 }, -/obj/structure/machinery/status_display{ - pixel_y = -32 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, /turf/open/floor/almayer{ icon_state = "red" }, @@ -60543,6 +61009,12 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/containment) +"pYp" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "pYu" = ( /obj/item/tool/warning_cone{ pixel_x = -12; @@ -60554,18 +61026,15 @@ /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) "pYF" = ( +/obj/structure/bed/chair{ + dir = 1 + }, /obj/structure/machinery/camera/autoname/almayer{ dir = 1; name = "ship-grade camera" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, /turf/open/floor/almayer{ - icon_state = "redcorner" + icon_state = "red" }, /area/almayer/shipboard/brig/main_office) "pYX" = ( @@ -60594,17 +61063,18 @@ }, /area/almayer/shipboard/brig/cic_hallway) "pZV" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 }, -/obj/structure/machinery/light/small{ - dir = 4 +/obj/structure/machinery/status_display{ + pixel_x = 32 }, /turf/open/floor/almayer{ dir = 5; icon_state = "red" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/perma) "qam" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ @@ -60616,25 +61086,36 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"qau" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1 +"qan" = ( +/obj/item/device/radio/listening_bug/radio_linked/mp{ + pixel_y = 8 }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "courtyard_cells"; - name = "\improper Courtyard Lockdown Shutter" +/obj/item/device/radio/listening_bug/radio_linked/mp, +/obj/structure/closet/secure_closet/cmdcabinet{ + pixel_y = 24; + desc = "A bulletproof cabinet containing communications equipment."; + name = "communications cabinet"; + req_access = null; + req_one_access_txt = "3" }, -/obj/structure/machinery/door/poddoor/almayer/locked{ - id = "Cell 3"; - name = "\improper Courtyard Divider" +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/area/almayer/shipboard/brig/main_office) +"qau" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, +/obj/effect/landmark/start/warrant, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/shipboard/brig/cells) +/area/almayer/shipboard/brig/cryo) "qaD" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -60642,17 +61123,11 @@ }, /area/almayer/hull/lower_hull/l_a_s) "qaJ" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/pen, -/obj/item/device/whistle, -/obj/item/device/megaphone, -/obj/item/paper_bin/uscm{ - pixel_y = 7 - }, -/turf/open/floor/almayer{ - allow_construction = 0 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/execution) "qaV" = ( /turf/open/floor/almayer{ dir = 10; @@ -60693,6 +61168,12 @@ icon_state = "plate" }, /area/almayer/command/combat_correspondent) +"qbt" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/almayer{ + icon_state = "sterile_green" + }, +/area/almayer/shipboard/brig/surgery) "qbx" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -60944,10 +61425,14 @@ }, /area/almayer/command/cichallway) "qfR" = ( +/obj/structure/machinery/light{ + dir = 1 + }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 9; + icon_state = "red" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/main_office) "qga" = ( /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ dir = 1 @@ -60957,10 +61442,13 @@ }, /area/almayer/living/starboard_garden) "qgw" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" +/obj/structure/bed/chair/comfy/alpha{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, /area/almayer/living/briefing) "qgG" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -61089,7 +61577,9 @@ pixel_x = 27 }, /obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, /area/almayer/living/briefing) "qit" = ( /obj/structure/surface/table/reinforced/almayer_B, @@ -61286,6 +61776,18 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/medical_science) +"qmB" = ( +/obj/structure/bed/chair/comfy/bravo{ + dir = 1 + }, +/obj/structure/prop/holidays/string_lights{ + dir = 8; + pixel_x = 29 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "qmC" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; @@ -61313,15 +61815,22 @@ }, /area/almayer/medical/medical_science) "qmE" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" +/obj/structure/sign/safety/restrictedarea{ + pixel_x = 32; + pixel_y = -8 + }, +/obj/structure/machinery/door_control{ + id = "perma_lockdown"; + name = "\improper Perma Cells Lockdown"; + pixel_x = 24; + pixel_y = 6; + req_access_txt = "3" }, /turf/open/floor/almayer{ dir = 4; icon_state = "red" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/perma) "qmL" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -61333,6 +61842,14 @@ /obj/structure/machinery/faxmachine/uscm, /turf/open/floor/almayer, /area/almayer/command/computerlab) +"qmX" = ( +/obj/structure/toilet{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/brig/perma) "qnd" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -61398,7 +61915,7 @@ name = "\improper Privacy Shutters" }, /turf/open/floor/plating, -/area/almayer/shipboard/brig/cells) +/area/almayer/shipboard/brig/main_office) "qom" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/chem_dispenser/soda{ @@ -61489,11 +62006,14 @@ }, /area/almayer/medical/lower_medical_medbay) "qqN" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = -26 + }, /turf/open/floor/almayer{ - dir = 10; + dir = 8; icon_state = "red" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/main_office) "qqQ" = ( /obj/structure/machinery/cm_vending/sorted/medical/blood{ density = 0; @@ -61528,20 +62048,25 @@ /obj/structure/machinery/status_display{ pixel_x = 32 }, -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/secure_data{ - dir = 8 - }, /turf/open/floor/almayer{ - dir = 5; + dir = 4; icon_state = "red" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/main_office) "qrv" = ( /turf/open/floor/almayer{ icon_state = "silver" }, /area/almayer/command/computerlab) +"qsa" = ( +/obj/structure/bed/chair/comfy/bravo{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "qsd" = ( /obj/structure/largecrate/random, /turf/open/floor/almayer{ @@ -61662,14 +62187,13 @@ }, /area/almayer/living/grunt_rnr) "qvf" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/poddoor/almayer/locked{ - dir = 2; - id = "Perma 2"; - name = "\improper cell shutter" +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/cryo) "qvC" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -61802,10 +62326,9 @@ }, /area/almayer/medical/containment/cell) "qyd" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 +/turf/open/floor/almayer{ + allow_construction = 0 }, -/turf/open/floor/almayer, /area/almayer/shipboard/brig/perma) "qyi" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -61986,12 +62509,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) -"qCi" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_f_s) "qCo" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -62215,13 +62732,16 @@ }, /area/almayer/powered) "qHF" = ( -/obj/structure/machinery/cm_vending/clothing/senior_officer{ - req_access = null; - req_access_txt = 19; - req_one_access = null +/obj/structure/surface/table/almayer, +/obj/item/storage/box/bodybags{ + pixel_x = 6; + pixel_y = 6 }, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/item/storage/box/bodybags, +/turf/open/floor/almayer{ + icon_state = "redcorner" + }, +/area/almayer/shipboard/brig/execution) "qHM" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -62522,6 +63042,11 @@ }, /area/almayer/squads/delta) "qNv" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/pen, +/obj/item/paper_bin/uscm{ + pixel_y = 7 + }, /turf/open/floor/almayer{ icon_state = "red" }, @@ -62645,9 +63170,17 @@ }, /area/almayer/engineering/upper_engineering/port) "qQM" = ( -/obj/structure/closet/secure_closet/warrant_officer, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" + }, +/area/almayer/shipboard/brig/surgery) "qQP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -62689,6 +63222,14 @@ icon_state = "silvercorner" }, /area/almayer/shipboard/brig/cic_hallway) +"qRo" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/shipboard/brig/general_equipment) "qRL" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -62703,21 +63244,24 @@ }, /area/almayer/living/pilotbunks) "qRT" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/secure_data{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 }, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/execution) "qSl" = ( /obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 + dir = 4 + }, +/obj/structure/machinery/power/apc/almayer{ + dir = 1 }, /turf/open/floor/almayer{ dir = 1; icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/general_equipment) "qSm" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -62764,17 +63308,9 @@ /area/almayer/hallways/starboard_umbilical) "qUb" = ( /obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/crew/alt{ - dir = 4 - }, -/obj/structure/transmitter/rotary/no_dnd{ - name = "Brig Cells Telephone"; - phone_category = "Almayer"; - phone_id = "Brig Cells"; - pixel_x = 16 - }, +/obj/structure/machinery/recharger, /turf/open/floor/almayer{ - dir = 10; + dir = 1; icon_state = "red" }, /area/almayer/shipboard/brig/processing) @@ -62835,23 +63371,10 @@ }, /area/almayer/living/captain_mess) "qVF" = ( -/obj/structure/machinery/door_control{ - id = "CMP Office Shutters"; - name = "CMP Office Shutters"; - pixel_y = 32; - req_one_access_txt = "24;31" - }, -/obj/structure/machinery/door_control{ - id = "Brig Lockdown Shutters"; - name = "Brig Lockdown Shutters"; - pixel_y = 24; - req_access_txt = "3" - }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "red" + icon_state = "cargo" }, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/execution) "qVM" = ( /turf/closed/wall/almayer, /area/almayer/hull/upper_hull/u_m_p) @@ -62898,6 +63421,12 @@ icon_state = "plate" }, /area/almayer/squads/delta) +"qWy" = ( +/obj/structure/bed/chair/comfy/delta, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "qWI" = ( /obj/structure/machinery/status_display{ pixel_y = -30 @@ -63004,16 +63533,17 @@ }, /area/almayer/command/lifeboat) "qYH" = ( -/obj/structure/surface/rack, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/glasses/sunglasses/blindfold, -/obj/item/clothing/mask/muzzle, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 8 + }, +/obj/structure/machinery/door/airlock/almayer/security/reinforced{ + name = "\improper Execution Equipment" }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, /area/almayer/shipboard/brig/execution) "qYN" = ( @@ -63058,10 +63588,10 @@ /turf/open/floor/almayer, /area/almayer/living/briefing) "qZg" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/recharger, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - icon_state = "red" + dir = 8; + icon_state = "redcorner" }, /area/almayer/shipboard/brig/processing) "qZH" = ( @@ -63086,12 +63616,8 @@ /obj/structure/sign/safety/maint{ pixel_x = -17 }, -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, /turf/open/floor/almayer{ - dir = 10; + dir = 8; icon_state = "red" }, /area/almayer/shipboard/brig/main_office) @@ -63230,6 +63756,29 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_s) +"rdb" = ( +/obj/structure/surface/table/almayer, +/obj/effect/decal/cleanable/dirt, +/obj/item/paper_bin/uscm{ + pixel_x = 9; + pixel_y = 6 + }, +/obj/item/tool/pen{ + pixel_x = 9; + pixel_y = 2 + }, +/obj/item/tool/pen{ + pixel_x = 9; + pixel_y = 9 + }, +/obj/structure/prop/holidays/string_lights{ + dir = 8; + pixel_x = 29 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "rde" = ( /obj/structure/sign/prop1, /turf/closed/wall/almayer, @@ -63345,6 +63894,18 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_m_s) +"rfv" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/faxmachine/uscm/command/capt{ + name = "Commanding Officer's Fax Machine"; + pixel_x = -4; + pixel_y = 3 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "rfI" = ( /obj/structure/sign/safety/airlock{ pixel_y = -32 @@ -63392,14 +63953,6 @@ "rgJ" = ( /obj/structure/machinery/light, /obj/structure/machinery/disposal, -/obj/item/bananapeel{ - desc = "An experimental B8 Smart-Scope. Based on the technologies used in the Smart Gun by ARMAT, this sight has integrated IFF systems. It can only attach to the L42A Battle Rifle, M44 Combat Revolver, and M46C Pulse Rifle. This one appears to be covered in gun oil"; - icon = 'icons/obj/items/weapons/guns/attachments.dmi'; - icon_state = "iffbarrel"; - name = "Broken B8 Smart-Scope"; - pixel_x = -1; - pixel_y = 11 - }, /obj/structure/disposalpipe/trunk{ dir = 1 }, @@ -63432,13 +63985,16 @@ }, /area/almayer/living/briefing) "rhD" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/recharger, -/obj/item/device/flash, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/machinery/light/small{ + dir = 8 }, -/area/almayer/shipboard/brig/general_equipment) +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/armory) "rhO" = ( /obj/structure/machinery/vending/cola/research{ pixel_x = 4 @@ -63527,13 +64083,11 @@ }, /area/almayer/living/grunt_rnr) "rjw" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = 26 - }, -/turf/open/floor/almayer{ - icon_state = "plating_striped" +/obj/structure/machinery/light{ + dir = 4 }, -/area/almayer/shipboard/brig/armory) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) "rjG" = ( /obj/structure/pipes/standard/tank/oxygen, /turf/open/floor/almayer{ @@ -63598,11 +64152,18 @@ }, /area/almayer/engineering/upper_engineering) "rkh" = ( +/obj/structure/machinery/door/poddoor/almayer/locked{ + dir = 8; + id = "Perma 1L"; + name = "\improper cell shutter" + }, +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + name = "\improper Isolation Cell" + }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" + icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/perma) "rku" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/tool/wrench{ @@ -63622,31 +64183,20 @@ /turf/open/floor/almayer, /area/almayer/living/gym) "rkK" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1 - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "courtyard_cells"; - name = "\improper Courtyard Lockdown Shutter" - }, -/obj/structure/machinery/door/poddoor/almayer/locked{ - id = "Cell 1"; - name = "\improper Courtyard Divider" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 4; + icon_state = "redcorner" }, -/area/almayer/shipboard/brig/cells) +/area/almayer/shipboard/brig/execution) "rkL" = ( -/obj/structure/machinery/brig_cell/cell_3{ - pixel_x = 32; - pixel_y = -32 +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 2; + id = "Warden Office Shutters"; + name = "\improper Privacy Shutters" }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/processing) +/turf/open/floor/plating, +/area/almayer/shipboard/brig/main_office) "rlf" = ( /obj/structure/machinery/cm_vending/clothing/synth/snowflake, /turf/open/floor/almayer{ @@ -63909,9 +64459,29 @@ icon_state = "plate" }, /area/almayer/squads/delta) +"rqH" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/transmitter/rotary{ + name = "Commanding Officer's Office"; + phone_category = "Offices"; + phone_id = "Commanding Officer's Office"; + pixel_x = 16; + pixel_y = 8 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "rra" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/plating/plating_catwalk, +/obj/structure/machinery/door/poddoor/almayer/locked{ + dir = 8; + id = "Perma 2L"; + name = "\improper cell shutter" + }, +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + name = "\improper Isolation Cell" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, /area/almayer/shipboard/brig/perma) "rri" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -64112,8 +64682,13 @@ }, /area/almayer/hallways/hangar) "rvo" = ( -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cryo) +/obj/structure/machinery/power/apc/almayer{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/almayer/shipboard/brig/evidence_storage) "rvA" = ( /turf/open/floor/almayer, /area/almayer/living/numbertwobunks) @@ -64213,11 +64788,23 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/command/airoom) "rzj" = ( -/obj/structure/machinery/brig_cell/perma_1{ - pixel_x = 32 +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/perma) +/obj/effect/decal/warning_stripes{ + 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" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/main_office) "rzN" = ( /turf/open/floor/almayer{ icon_state = "dark_sterile" @@ -64401,14 +64988,11 @@ }, /area/almayer/squads/req) "rCL" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "red" }, -/turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) "rCO" = ( /obj/structure/pipes/standard/simple/hidden/supply, @@ -64430,16 +65014,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) -"rDd" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/structure/sign/safety/bathunisex{ - pixel_x = 11; - pixel_y = -26 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "rDe" = ( /obj/structure/surface/table/almayer, /obj/structure/sign/safety/cryo{ @@ -64566,6 +65140,14 @@ icon_state = "plate" }, /area/almayer/squads/delta) +"rEJ" = ( +/obj/structure/machinery/light, +/obj/structure/flora/pottedplant{ + pixel_x = -1; + pixel_y = 3 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "rEL" = ( /obj/structure/machinery/cm_vending/gear/intelligence_officer, /turf/open/floor/almayer{ @@ -64628,6 +65210,29 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"rFV" = ( +/obj/structure/surface/table/almayer, +/obj/effect/decal/cleanable/dirt, +/obj/item/device/flashlight/lamp{ + layer = 3.3; + pixel_x = 15 + }, +/obj/item/paper_bin/uscm{ + pixel_x = -7; + pixel_y = 6 + }, +/obj/item/tool/pen{ + pixel_x = -10; + pixel_y = 6 + }, +/obj/item/tool/pen{ + pixel_x = -10; + pixel_y = -2 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "rFY" = ( /turf/open/floor/almayer{ dir = 5; @@ -64927,12 +65532,6 @@ icon_state = "containment_window_h" }, /area/almayer/medical/containment/cell/cl) -"rLN" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - allow_construction = 0 - }, -/area/almayer/shipboard/brig/processing) "rLU" = ( /turf/open/floor/almayer/research/containment/floor2{ dir = 8 @@ -65004,12 +65603,13 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, +/obj/structure/machinery/vending/cigarette{ + density = 0; + pixel_y = 16 + }, /obj/effect/decal/warning_stripes{ icon_state = "SW-out" }, -/obj/structure/machinery/vending/cigarette/free{ - pixel_y = 16 - }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) "rPt" = ( @@ -65089,18 +65689,16 @@ }, /area/almayer/lifeboat_pumps/south1) "rQY" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/flashbangs, -/obj/item/storage/box/flashbangs{ - pixel_x = 5; - pixel_y = 9 +/obj/structure/bed, +/obj/structure/machinery/flasher{ + id = "Cell 3"; + pixel_x = 24 }, -/obj/item/storage/box/flashbangs{ - pixel_x = -8; - pixel_y = 5 +/turf/open/floor/almayer{ + dir = 6; + icon_state = "red" }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/armory) +/area/almayer/shipboard/brig/cells) "rRq" = ( /turf/closed/wall/almayer, /area/almayer/lifeboat_pumps/south2) @@ -65112,11 +65710,13 @@ }, /area/almayer/lifeboat_pumps/south1) "rRQ" = ( -/obj/structure/machinery/brig_cell/perma_2{ - pixel_x = -32 +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/main_office) "rRU" = ( /obj/structure/machinery/light{ dir = 8 @@ -65170,11 +65770,17 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) "rSH" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 8 + }, +/obj/structure/surface/rack, +/obj/effect/spawner/random/tool, +/obj/effect/spawner/random/powercell, /turf/open/floor/almayer{ dir = 8; - icon_state = "red" + icon_state = "orange" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/lobby) "rSK" = ( /obj/structure/machinery/light/small, /turf/open/floor/almayer{ @@ -65188,15 +65794,14 @@ /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) "rTt" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/fancy/cigarettes/lucky_strikes, -/obj/item/tool/lighter, -/obj/item/clothing/glasses/sunglasses/blindfold, -/obj/structure/machinery/light/small{ - dir = 8 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/execution) +/turf/open/floor/almayer{ + dir = 1; + icon_state = "redcorner" + }, +/area/almayer/shipboard/brig/chief_mp_office) "rTJ" = ( /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/almayer{ @@ -65316,13 +65921,11 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) "rXd" = ( -/obj/effect/landmark/start/warden, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +/obj/structure/machinery/vending/security, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/general_equipment) "rXj" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -65355,7 +65958,7 @@ dir = 4 }, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/general_equipment) "rXS" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/disposalpipe/segment{ @@ -65457,11 +66060,11 @@ }, /area/almayer/shipboard/starboard_point_defense) "rZR" = ( -/obj/structure/machinery/cryopod, /turf/open/floor/almayer{ - icon_state = "cargo" + dir = 4; + icon_state = "red" }, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/general_equipment) "sah" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -65565,7 +66168,7 @@ }, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/general_equipment) "scH" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -65616,19 +66219,19 @@ }, /area/almayer/medical/upper_medical) "sdq" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_21"; + layer = 3.1; + pixel_x = -8 }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera"; - pixel_y = 6 +/obj/structure/machinery/power/apc/almayer{ + dir = 8 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" + dir = 10; + icon_state = "red" }, -/area/almayer/shipboard/brig/execution) +/area/almayer/shipboard/brig/chief_mp_office) "sdu" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -65651,26 +66254,15 @@ }, /area/almayer/squads/delta) "sdF" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/reinforced{ - dir = 2; - name = "\improper Perma Brig" - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "perma_lockdown"; - name = "\improper Perma Lockdown Shutter"; - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/machinery/firealarm{ + dir = 8; + pixel_x = -24 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 8; + icon_state = "redcorner" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/processing) "sdO" = ( /obj/structure/ladder{ height = 1; @@ -65720,7 +66312,7 @@ /area/almayer/squads/req) "sgi" = ( /turf/closed/wall/almayer, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/processing) "sgj" = ( /obj/item/storage/belt/medical/full, /obj/item/storage/belt/medical/full, @@ -65760,6 +66352,17 @@ icon_state = "plating" }, /area/almayer/hull/lower_hull/l_f_s) +"sgE" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/reagent_dispensers/water_cooler{ + density = 0; + pixel_x = 12; + pixel_y = 6 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "sgM" = ( /obj/structure/closet/toolcloset, /turf/open/floor/almayer{ @@ -65830,16 +66433,14 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) "sip" = ( -/obj/structure/machinery/firealarm{ - dir = 8; - pixel_x = -24 +/obj/structure/reagent_dispensers/peppertank{ + pixel_x = -30 }, -/obj/structure/closet/secure_closet/brig/prison_uni, /turf/open/floor/almayer{ - dir = 8; - icon_state = "red" + dir = 1; + icon_state = "redcorner" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/main_office) "siz" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/cameras/hangar{ @@ -66128,13 +66729,12 @@ /turf/open/floor/almayer, /area/almayer/living/gym) "soD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/landmark/crap_item, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" }, -/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/main_office) "soK" = ( /obj/item/storage/firstaid/fire/empty, @@ -66249,12 +66849,29 @@ }, /area/almayer/shipboard/brig/cells) "srV" = ( -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun, +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/obj/structure/surface/table/almayer, +/obj/item/toy/deck{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/item/paper_bin/uscm{ + pixel_x = -6; + pixel_y = 7 + }, +/obj/item/tool/pen{ + pixel_x = -6 + }, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - dir = 8; - icon_state = "plating_striped" + dir = 4; + icon_state = "red" }, -/area/almayer/shipboard/brig/armory) +/area/almayer/shipboard/brig/main_office) "ssa" = ( /obj/structure/machinery/door/poddoor/almayer/open{ id = "Hangar Lockdown"; @@ -66269,6 +66886,12 @@ icon_state = "test_floor4" }, /area/almayer/hallways/repair_bay) +"ssn" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "ssD" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -66291,15 +66914,6 @@ icon_state = "greencorner" }, /area/almayer/hallways/port_hallway) -"ssT" = ( -/obj/structure/machinery/power/apc/almayer, -/obj/structure/sign/safety/rewire{ - pixel_y = -38 - }, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/shipboard/brig/lobby) "ssU" = ( /obj/structure/machinery/constructable_frame, /turf/open/floor/almayer{ @@ -66416,11 +67030,15 @@ /turf/open/floor/plating, /area/almayer/shipboard/brig/surgery) "swo" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/machinery/vending/security, +/obj/structure/machinery/light{ + dir = 1 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/execution) +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/main_office) "swt" = ( /turf/open/floor/almayer{ icon_state = "greencorner" @@ -66514,18 +67132,11 @@ /turf/open/floor/almayer, /area/almayer/squads/delta) "syM" = ( -/obj/structure/closet/secure_closet{ - name = "\improper Lethal Injection Locker" - }, -/obj/item/reagent_container/ld50_syringe/choral, -/obj/item/reagent_container/ld50_syringe/choral, -/obj/item/reagent_container/ld50_syringe/choral, -/obj/item/reagent_container/ld50_syringe/choral, -/obj/item/reagent_container/ld50_syringe/choral, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/machinery/light/small{ + dir = 8 }, -/area/almayer/shipboard/brig/execution) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_p) "syP" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -66545,11 +67156,14 @@ }, /area/almayer/engineering/engine_core) "szy" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer{ + dir = 1; + icon_state = "redcorner" + }, +/area/almayer/shipboard/brig/main_office) "szE" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -66625,30 +67239,27 @@ icon_state = "orange" }, /area/almayer/engineering/ce_room) -"sBF" = ( -/obj/structure/machinery/cm_vending/clothing/dress{ - density = 0; - pixel_y = 16 - }, -/obj/structure/machinery/light{ - dir = 4 +"sBs" = ( +/obj/structure/surface/table/almayer, +/obj/effect/decal/cleanable/dirt, +/obj/item/paper, +/obj/item/tool/pen{ + pixel_x = -5; + pixel_y = 2 }, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "redfull" }, -/area/almayer/command/cic) +/area/almayer/living/briefing) "sBH" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "CMP Office Shutters"; - name = "\improper Privacy Shutters" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 }, -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - layer = 1.9 +/obj/structure/machinery/status_display{ + pixel_x = 32 }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/execution) "sBL" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/structure/machinery/light, @@ -66740,11 +67351,10 @@ }, /area/almayer/squads/delta) "sEa" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/turf/open/floor/almayer{ + icon_state = "redcorner" }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/execution) +/area/almayer/shipboard/brig/chief_mp_office) "sEd" = ( /obj/structure/machinery/cryopod/right, /obj/structure/machinery/light{ @@ -66912,6 +67522,17 @@ /obj/structure/mirror, /turf/closed/wall/almayer, /area/almayer/living/gym) +"sGX" = ( +/obj/structure/machinery/firealarm{ + pixel_y = -28 + }, +/obj/structure/bed/chair/comfy/charlie{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "sGZ" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ @@ -66993,24 +67614,10 @@ }, /area/almayer/hull/upper_hull/u_f_p) "sIw" = ( -/obj/structure/machinery/door_control{ - id = "cmp_armory"; - name = "Armory Lockdown"; - req_access_txt = "4"; - pixel_y = 24 - }, -/obj/structure/sign/safety/ammunition{ - pixel_y = 32 - }, -/obj/structure/sign/safety/restrictedarea{ - pixel_x = 15; - pixel_y = 32 - }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "red" + icon_state = "redfull" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/evidence_storage) "sIx" = ( /obj/effect/landmark/yautja_teleport, /turf/open/floor/plating/plating_catwalk, @@ -67052,11 +67659,25 @@ }, /area/almayer/hull/lower_hull/l_a_p) "sIY" = ( +/obj/structure/machinery/brig_cell/perma_1{ + pixel_x = -32; + pixel_y = 4 + }, +/obj/structure/machinery/door_control{ + id = "Perma 1L"; + name = "Perma 1 Lockdown"; + pixel_x = -24; + pixel_y = -12; + req_access_txt = "3" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, /turf/open/floor/almayer{ - dir = 5; - icon_state = "red" + dir = 8; + icon_state = "redcorner" }, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/perma) "sJC" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray{ @@ -67261,18 +67882,16 @@ }, /area/almayer/command/lifeboat) "sQS" = ( -/obj/structure/machinery/power/apc/almayer{ - cell_type = /obj/item/cell/hyper; - dir = 1 - }, -/obj/structure/sign/safety/rewire{ - pixel_x = -15; - pixel_y = 25 +/obj/structure/surface/table/almayer, +/obj/item/tool/stamp{ + pixel_x = 3; + pixel_y = 10 }, +/obj/item/device/taperecorder, /turf/open/floor/almayer{ - icon_state = "plating_striped" + icon_state = "plate" }, -/area/almayer/shipboard/brig/armory) +/area/almayer/shipboard/brig/main_office) "sQU" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -67334,12 +67953,6 @@ }, /area/almayer/lifeboat_pumps/south2) "sSm" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, /obj/structure/reagent_dispensers/water_cooler/stacks{ density = 0; pixel_y = 17 @@ -67518,35 +68131,11 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) "sVy" = ( -/obj/item/bedsheet/brown{ - pixel_y = 13 - }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 - }, -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 - }, -/obj/structure/bed{ - can_buckle = 0 - }, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 - }, -/obj/item/bedsheet/brown{ - layer = 3.1 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "red" +/obj/structure/machinery/power/apc/almayer{ + dir = 1 }, -/area/almayer/shipboard/brig/main_office) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cryo) "sWW" = ( /obj/structure/machinery/flasher{ alpha = 1; @@ -67849,9 +68438,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) -"tbQ" = ( -/turf/closed/wall/almayer, -/area/almayer/shipboard/brig/processing) "tce" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ @@ -67859,12 +68445,24 @@ }, /area/almayer/hull/lower_hull/l_a_s) "tcP" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/processing) +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "perma_lockdown"; + name = "\improper Perma Lockdown Shutter" + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ + name = "\improper Perma Cells" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/perma) "tda" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -67895,7 +68493,10 @@ /area/almayer/hallways/hangar) "tdv" = ( /obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, /area/almayer/shipboard/brig/main_office) "tdx" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -68032,15 +68633,30 @@ }, /area/almayer/medical/containment/cell) "tfO" = ( -/obj/structure/machinery/firealarm{ - dir = 4; - pixel_x = 24 +/obj/structure/machinery/power/apc/almayer{ + dir = 4 + }, +/obj/item/storage/box/nade_box/tear_gas, +/obj/item/storage/box/nade_box/tear_gas{ + pixel_x = 3; + 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 = 4; - icon_state = "red" + dir = 5; + icon_state = "plating" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/armory) +"tgE" = ( +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/living/briefing) "tgK" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -68088,6 +68704,15 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/alpha_bravo_shared) +"thE" = ( +/obj/structure/bed/chair/comfy/charlie{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "emeraldfull" + }, +/area/almayer/living/briefing) "thL" = ( /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) @@ -68276,9 +68901,10 @@ }, /area/almayer/squads/alpha_bravo_shared) "tkV" = ( +/obj/structure/bed/chair, /turf/open/floor/almayer{ - dir = 5; - icon_state = "red" + dir = 1; + icon_state = "redcorner" }, /area/almayer/shipboard/brig/processing) "tld" = ( @@ -68324,15 +68950,20 @@ /area/almayer/medical/lower_medical_lobby) "tmy" = ( /obj/structure/surface/table/almayer, -/obj/structure/machinery/faxmachine/uscm/brig, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera"; - dir = 1 +/obj/item/handcuffs{ + pixel_y = 12 + }, +/obj/item/handcuffs{ + pixel_y = 6 + }, +/obj/item/handcuffs, +/obj/item/weapon/baton{ + pixel_x = -12 }, /turf/open/floor/almayer{ icon_state = "red" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/main_office) "tmA" = ( /obj/structure/machinery/light{ dir = 8 @@ -68521,6 +69152,14 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) +"tqe" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" + }, +/area/almayer/shipboard/brig/surgery) "tqg" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -68577,6 +69216,28 @@ icon_state = "red" }, /area/almayer/command/lifeboat) +"tqI" = ( +/obj/structure/machinery/door/window/westright, +/obj/structure/machinery/shower{ + dir = 8; + layer = 3.10; + plane = -4 + }, +/obj/item/tool/soap{ + pixel_x = 2; + pixel_y = 7 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/commandbunks) +"tqV" = ( +/obj/structure/extinguisher_cabinet{ + pixel_y = 26 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/general_equipment) "trb" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, @@ -68788,11 +69449,14 @@ }, /area/almayer/lifeboat_pumps/south1) "tvA" = ( -/obj/structure/bed/chair{ - dir = 1 +/obj/structure/machinery/sleep_console{ + dir = 8 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/main_office) +/turf/open/floor/almayer{ + dir = 8; + icon_state = "sterile_green_side" + }, +/area/almayer/shipboard/brig/surgery) "tvM" = ( /obj/structure/bed/chair{ dir = 1 @@ -68963,9 +69627,9 @@ }, /area/almayer/hull/upper_hull/u_a_p) "tzj" = ( -/obj/structure/closet/secure_closet/brig/prisoner, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/perma) +/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{ @@ -69029,6 +69693,12 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/port) +"tAJ" = ( +/obj/structure/closet/secure_closet/fridge/dry, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/grunt_rnr) "tAL" = ( /obj/structure/machinery/cryopod, /turf/open/floor/almayer{ @@ -69193,10 +69863,11 @@ }, /area/almayer/command/airoom) "tFv" = ( -/turf/open/floor/almayer{ - allow_construction = 0 +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 }, -/area/almayer/shipboard/brig/cryo) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/general_equipment) "tFS" = ( /obj/structure/machinery/computer/supplycomp, /obj/structure/sign/safety/terminal{ @@ -69238,12 +69909,12 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) "tGg" = ( -/obj/structure/janitorialcart, -/obj/item/tool/mop, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "redcorner" }, -/area/almayer/shipboard/brig/execution) +/area/almayer/shipboard/brig/main_office) "tGh" = ( /obj/structure/sign/nosmoking_2{ pixel_x = -28 @@ -69317,17 +69988,34 @@ }, /area/almayer/living/briefing) "tHB" = ( -/obj/structure/machinery/sleep_console{ - dir = 8 +/obj/structure/surface/table/almayer, +/obj/structure/reagent_dispensers/peppertank{ + pixel_x = -30 + }, +/obj/structure/machinery/recharger{ + layer = 3.1; + pixel_y = 8 }, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + icon_state = "plate" }, -/area/almayer/shipboard/brig/surgery) +/area/almayer/shipboard/brig/main_office) "tHS" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/shipboard/brig/cells) +"tHU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/power/apc/almayer{ + dir = 8 + }, +/obj/item/storage/briefcase{ + pixel_y = 15 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "tIp" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Dorms" @@ -69405,26 +70093,30 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) "tJp" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/item/vehicle_clamp, -/obj/item/vehicle_clamp, -/obj/item/vehicle_clamp, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; +/obj/structure/surface/table/almayer, +/obj/item/tool/crowbar/red, +/obj/item/clipboard{ pixel_x = 1; - pixel_y = -1 + pixel_y = 4 }, -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) +/obj/item/storage/box/handcuffs{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/reagent_container/spray/cleaner, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/brig/main_office) "tJy" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, /turf/open/floor/almayer{ - dir = 6; - icon_state = "red" + dir = 4; + icon_state = "redcorner" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/main_office) "tJz" = ( /obj/structure/machinery/firealarm{ pixel_y = -28 @@ -69504,6 +70196,17 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_s) +"tMc" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/bed/chair/comfy/alpha{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "tMf" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -69516,9 +70219,13 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) -"tMn" = ( -/obj/structure/bed/chair/comfy/blue, -/turf/open/floor/carpet, +"tMu" = ( +/obj/structure/machinery/cm_vending/clothing/commanding_officer{ + pixel_y = 0 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, /area/almayer/living/commandbunks) "tMW" = ( /obj/effect/decal/warning_stripes{ @@ -69531,27 +70238,29 @@ /area/almayer/living/briefing) "tNj" = ( /obj/structure/surface/table/almayer, -/obj/item/device/camera{ - pixel_x = 4; - pixel_y = 8 +/obj/structure/machinery/computer/sentencing{ + dir = 4 }, -/obj/item/device/camera_film{ - pixel_x = 4; - pixel_y = -2 +/obj/structure/machinery/light{ + dir = 8 }, -/obj/item/device/camera_film, /turf/open/floor/almayer{ - dir = 10; + dir = 8; icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/perma) "tNF" = ( -/obj/structure/machinery/door/window/ultra{ - dir = 8; - req_access_txt = "3" +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "CMP Office Shutters"; + name = "\improper Privacy Shutters" }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/perma) +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 8 + }, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/chief_mp_office) "tNP" = ( /obj/structure/sign/safety/debark_lounge{ pixel_x = 15; @@ -69665,12 +70374,6 @@ /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) -"tQM" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "tQV" = ( /turf/closed/wall/almayer/outer, /area/almayer/lifeboat_pumps/south1) @@ -69685,22 +70388,15 @@ }, /area/almayer/hull/lower_hull/l_m_s) "tRA" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 2; - id = "cmp_armory"; - name = "\improper Armory Shutters" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - name = "\improper Armory"; - dir = 2 +/obj/structure/bed/chair, +/obj/structure/machinery/firealarm{ + pixel_y = 28 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 1; + icon_state = "redcorner" }, -/area/almayer/shipboard/brig/armory) +/area/almayer/shipboard/brig/processing) "tRD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -69754,6 +70450,28 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_p) +"tSv" = ( +/obj/structure/surface/table/almayer, +/obj/effect/decal/cleanable/dirt, +/obj/item/device/flashlight/lamp{ + pixel_x = 15 + }, +/obj/item/paper_bin/uscm{ + pixel_x = -7; + pixel_y = 6 + }, +/obj/item/tool/pen{ + pixel_x = -9; + pixel_y = 3 + }, +/obj/item/tool/pen{ + pixel_x = 4; + pixel_y = -4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "tSw" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -69886,17 +70604,13 @@ }, /area/almayer/hull/lower_hull/l_m_p) "tWg" = ( -/obj/structure/machinery/cryopod{ - layer = 3.1; - pixel_y = 13 - }, -/obj/structure/sign/safety/cryo{ - pixel_x = -16 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "redcorner" }, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/general_equipment) "tWi" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -69950,14 +70664,14 @@ }, /area/almayer/squads/req) "tXs" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = -30 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "red" + icon_state = "plate" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/cryo) "tXz" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -70092,20 +70806,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) -"tZB" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = -29 - }, -/turf/open/floor/almayer{ - icon_state = "silver" - }, -/area/almayer/command/cichallway) "tZF" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -70180,15 +70880,6 @@ dir = 4 }, /area/almayer/medical/containment/cell) -"uaq" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/obj/structure/sign/safety/bulkhead_door{ - pixel_x = -16 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_f_p) "uay" = ( /obj/structure/machinery/iv_drip, /turf/open/floor/almayer{ @@ -70245,15 +70936,6 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"uca" = ( -/obj/structure/machinery/light{ - dir = 4; - invisibility = 101 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/shipboard/brig/execution) "uck" = ( /obj/structure/surface/rack, /obj/item/stack/cable_coil, @@ -70363,6 +71045,10 @@ /obj/structure/machinery/firealarm{ pixel_y = -28 }, +/obj/structure/bed/chair/comfy/delta{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -70397,6 +71083,24 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) +"ueo" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass{ + name = "Evidence Room" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/evidence_storage) +"ueD" = ( +/obj/structure/machinery/light, +/obj/structure/machinery/cm_vending/gear/commanding_officer{ + pixel_y = 0 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/living/commandbunks) "ueG" = ( /obj/item/bedsheet/orange, /obj/structure/bed{ @@ -70473,28 +71177,29 @@ icon_state = "plate" }, /area/almayer/command/combat_correspondent) -"ugb" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/device/flashlight/lamp/green{ - pixel_y = 20; - pixel_x = -7 +"ugs" = ( +/obj/structure/surface/table/almayer, +/obj/item/book/manual/marine_law{ + pixel_x = -3; + pixel_y = 1 }, -/obj/item/ashtray/bronze{ - pixel_y = 19; - pixel_x = 4 +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" }, -/obj/structure/machinery/light{ - dir = 8 +/obj/structure/sign/safety/medical{ + pixel_x = -17; + pixel_y = 6 }, -/obj/effect/landmark/map_item{ - pixel_y = 3; - pixel_x = -1 +/obj/structure/sign/safety/restrictedarea{ + pixel_x = -17; + pixel_y = -9 }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) -"ugs" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/shipboard/brig/execution) +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/shipboard/brig/lobby) "ugu" = ( /obj/structure/machinery/cm_vending/sorted/marine_food, /turf/open/floor/almayer, @@ -70510,6 +71215,11 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) +"ugT" = ( +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/shipboard/brig/main_office) "ugV" = ( /obj/structure/surface/table/almayer, /obj/item/tool/kitchen/tray, @@ -70649,12 +71359,20 @@ /turf/open/floor/plating, /area/almayer/engineering/engineering_workshop/hangar) "ukA" = ( -/obj/structure/platform, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/almayer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "emeraldfull" + }, /area/almayer/living/briefing) +"ukS" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/general_equipment) "ukU" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -70669,14 +71387,16 @@ /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) "ula" = ( -/obj/structure/disposalpipe/junction{ +/obj/structure/machinery/door/airlock/almayer/security/glass{ + name = "Evidence Room" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 8 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/evidence_storage) "uli" = ( /turf/open/floor/grass, /area/almayer/living/starboard_garden) @@ -70890,6 +71610,16 @@ }, /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{ + pixel_y = 7 + }, +/obj/item/tool/pen, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/brig/main_office) "upe" = ( /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor/almayer{ @@ -71006,10 +71736,17 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) "ush" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/cameras/almayer_network{ + dir = 8 + }, +/obj/structure/machinery/light{ + dir = 4 + }, /turf/open/floor/almayer{ - icon_state = "cargo" + allow_construction = 0 }, -/area/almayer/shipboard/brig/execution) +/area/almayer/shipboard/brig/chief_mp_office) "usi" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -71034,16 +71771,15 @@ }, /area/almayer/hull/upper_hull/u_m_p) "usr" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - name = "\improper Warden's Office" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 8 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/secure_data{ + dir = 1 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 6; + icon_state = "red" }, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/perma) "usw" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -71087,6 +71823,27 @@ icon_state = "cargo" }, /area/almayer/engineering/upper_engineering) +"utw" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/reagent_container/food/drinks/bottle/whiskey{ + pixel_x = -5; + pixel_y = 16 + }, +/obj/item/reagent_container/food/drinks/bottle/whiskey{ + desc = "A premium double-malt whiskey, this bottle was gifted to the Captain of the USS Almayer after the completion of the ship's space trials by the VADM. himself."; + pixel_x = 3; + pixel_y = 16 + }, +/obj/item/reagent_container/food/drinks/bottle/whiskey{ + pixel_x = 11; + pixel_y = 16 + }, +/obj/item/storage/box/drinkingglasses{ + pixel_x = -1; + pixel_y = 2 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "utK" = ( /obj/structure/machinery/light{ dir = 4 @@ -71112,19 +71869,15 @@ }, /area/almayer/hull/upper_hull/u_f_p) "uue" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper_bin{ - pixel_x = -7 - }, -/obj/item/tool/pen, -/obj/item/tool/pen{ - pixel_y = 3 +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ + dir = 1; + name = "\improper Cryogenics Bay" }, /turf/open/floor/almayer{ - dir = 10; - icon_state = "red" + icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/cryo) "uuj" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray{ @@ -71137,16 +71890,16 @@ /turf/open/floor/almayer, /area/almayer/squads/bravo) "uuq" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 +/obj/structure/bed, +/obj/structure/machinery/flasher{ + id = "Cell 4"; + pixel_x = 24 }, -/obj/structure/surface/table/almayer, -/obj/item/storage/donut_box, /turf/open/floor/almayer{ + dir = 6; icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/cells) "uuu" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -71202,17 +71955,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) -"uve" = ( -/obj/structure/bed, -/obj/structure/machinery/flasher{ - id = "Cell 5"; - pixel_x = -24 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/shipboard/brig/cells) "uvk" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -71250,14 +71992,20 @@ }, /area/almayer/squads/bravo) "uvy" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1; + pixel_y = 1 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/processing) +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/brig/armory) "uvG" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -71296,14 +72044,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/cells) -"uvZ" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "uws" = ( /obj/structure/machinery/light{ dir = 4 @@ -71414,6 +72154,25 @@ icon_state = "dark_sterile" }, /area/almayer/medical/chemistry) +"uzb" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/flashlight/lamp{ + layer = 3.3; + pixel_x = 15 + }, +/obj/item/tool/screwdriver, +/obj/item/bananapeel{ + desc = "An experimental B8 Smart-Scope. Based on the technologies used in the Smart Gun by ARMAT, this sight has integrated IFF systems. It can only attach to the L42A Battle Rifle, M44 Combat Revolver, and M46C Pulse Rifle. This one appears to be covered in gun oil"; + icon = 'icons/obj/items/weapons/guns/attachments.dmi'; + icon_state = "iffbarrel"; + name = "Broken B8 Smart-Scope"; + pixel_x = -3; + pixel_y = 7 + }, +/turf/open/floor/almayer{ + icon_state = "orangefull" + }, +/area/almayer/living/briefing) "uzg" = ( /obj/structure/sign/safety/water{ pixel_x = 8; @@ -71433,14 +72192,21 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/hull/upper_hull/u_f_s) "uzx" = ( -/obj/structure/closet/emcloset/legacy, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, /turf/open/floor/almayer{ - dir = 6; - icon_state = "red" + icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/cryo) "uzy" = ( /obj/item/reagent_container/glass/bucket, /obj/effect/decal/cleanable/blood/oil, @@ -71456,18 +72222,34 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/ce_room) "uzU" = ( -/obj/item/vehicle_clamp, -/obj/item/vehicle_clamp, -/obj/item/vehicle_clamp, -/obj/structure/machinery/light/small{ - dir = 4 +/obj/structure/disposalpipe/segment, +/obj/structure/surface/table/almayer, +/obj/item/ashtray/bronze{ + pixel_x = 5; + pixel_y = 3 }, -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun, +/obj/item/trash/cigbutt/cigarbutt{ + pixel_x = 10; + pixel_y = 15 + }, +/obj/item/clothing/mask/cigarette{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/clothing/mask/cigarette{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/item/clothing/mask/cigarette{ + pixel_x = -5; + pixel_y = 9 + }, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - dir = 8; - icon_state = "plating_striped" + dir = 4; + icon_state = "redcorner" }, -/area/almayer/shipboard/brig/armory) +/area/almayer/shipboard/brig/main_office) "uAb" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -71593,11 +72375,11 @@ }, /area/almayer/living/grunt_rnr) "uCl" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/closet/secure_closet/surgical{ + pixel_x = -30 }, /turf/open/floor/almayer{ - dir = 9; + dir = 4; icon_state = "sterile_green_side" }, /area/almayer/shipboard/brig/surgery) @@ -71636,11 +72418,12 @@ }, /area/almayer/shipboard/navigation) "uDp" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 +/obj/structure/closet/secure_closet/brig, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/perma) "uDA" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -71706,11 +72489,10 @@ }, /area/almayer/medical/lockerroom) "uFp" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - layer = 1.9 +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" }, -/turf/open/floor/plating, /area/almayer/shipboard/brig/general_equipment) "uFt" = ( /obj/structure/largecrate/random/case/double, @@ -71875,15 +72657,14 @@ }, /area/almayer/hull/lower_hull/l_m_s) "uJs" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/secure_data{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/main_office) "uJB" = ( /obj/structure/janitorialcart, /obj/item/tool/mop, @@ -71965,6 +72746,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/starboard) +"uLe" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "uLn" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -71986,14 +72775,18 @@ /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) "uLJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/structure/machinery/light{ + dir = 4; + invisibility = 101 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/sign/safety/ammunition{ + pixel_x = 32; + pixel_y = -7 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/shipboard/brig/execution) "uLN" = ( /obj/structure/closet/secure_closet/engineering_welding, /turf/open/floor/almayer{ @@ -72052,17 +72845,11 @@ }, /area/almayer/squads/delta) "uNe" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - layer = 1.9 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "CMP Office Shutters"; - name = "\improper Privacy Shutters" +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/perma) "uNg" = ( /obj/structure/machinery/cryopod, /turf/open/floor/almayer{ @@ -72070,9 +72857,14 @@ }, /area/almayer/living/bridgebunks) "uNl" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/execution) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "redcorner" + }, +/area/almayer/shipboard/brig/chief_mp_office) "uNB" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -72159,14 +72951,11 @@ /turf/open/floor/almayer, /area/almayer/living/port_emb) "uQm" = ( -/obj/structure/bed/chair/comfy/black{ +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/perma) "uQn" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -72202,15 +72991,6 @@ allow_construction = 0 }, /area/almayer/hallways/port_hallway) -"uRc" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/main_office) "uRo" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray{ @@ -72380,16 +73160,13 @@ }, /area/almayer/squads/charlie) "uUs" = ( -/obj/structure/bed, -/obj/structure/machinery/flasher{ - id = "Cell 4"; - pixel_x = -24 +/obj/structure/pipes/vents/pump{ + dir = 1 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "red" + icon_state = "redcorner" }, -/area/almayer/shipboard/brig/cells) +/area/almayer/shipboard/brig/perma) "uUt" = ( /obj/structure/surface/table/almayer, /obj/effect/spawner/random/technology_scanner, @@ -72412,11 +73189,15 @@ /area/almayer/engineering/upper_engineering/port) "uUO" = ( /obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/sentencing{ - dir = 4 +/obj/structure/machinery/door_control{ + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutters"; + pixel_x = 16; + req_access_txt = "3" }, +/obj/structure/machinery/recharger, /turf/open/floor/almayer{ - dir = 8; + dir = 1; icon_state = "red" }, /area/almayer/shipboard/brig/processing) @@ -72476,14 +73257,14 @@ }, /area/almayer/living/cryo_cells) "uVF" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/almayer{ dir = 4; icon_state = "redcorner" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/perma) "uVR" = ( /obj/structure/machinery/power/apc/almayer, /turf/open/floor/almayer{ @@ -72519,13 +73300,6 @@ /obj/item/pizzabox/margherita{ pixel_y = 8 }, -/obj/item/weapon/pizza_cutter{ - force = 20; - name = "\improper Replica PIZZA TIME"; - desc = "A cheap replica of the fabled PIZZA TIME novelty pizza cutter, this one is not as sharp as the original which legends said could slice any pizza...."; - pixel_x = -6; - pixel_y = 8 - }, /turf/open/floor/almayer{ dir = 1; icon_state = "green" @@ -72629,6 +73403,17 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/hallways/repair_bay) +"uZX" = ( +/obj/structure/surface/table/almayer, +/obj/item/paper{ + pixel_x = -4; + pixel_y = 5 + }, +/obj/item/tool/pen, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/living/briefing) "uZZ" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Basketball Court" @@ -72729,15 +73514,15 @@ }, /area/almayer/lifeboat_pumps/south2) "vcG" = ( -/obj/structure/machinery/vending/snack, -/obj/structure/machinery/status_display{ - pixel_x = 32 - }, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" +/obj/structure/surface/table/almayer, +/obj/structure/machinery/recharger, +/obj/item/device/flash, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 9; + icon_state = "red" }, /area/almayer/shipboard/brig/general_equipment) "vcK" = ( @@ -72823,26 +73608,13 @@ }, /area/almayer/living/briefing) "vez" = ( -/obj/structure/machinery/light{ - dir = 1 - }, /obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/secure_data{ - dir = 4 - }, -/obj/structure/sign/safety/terminal{ - pixel_x = 3; - pixel_y = 27 - }, -/obj/structure/sign/safety/rewire{ - pixel_x = 15; - pixel_y = 27 - }, +/obj/item/device/camera, +/obj/item/device/camera_film, /turf/open/floor/almayer{ - dir = 8; - icon_state = "red" + icon_state = "plate" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/main_office) "vfa" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -72866,14 +73638,17 @@ }, /area/almayer/powered) "vfv" = ( -/obj/structure/bed/chair{ +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/obj/structure/machinery/power/apc/almayer{ dir = 4 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "red" + dir = 8; + icon_state = "redcorner" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/execution) "vfx" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -73183,6 +73958,19 @@ icon_state = "plating" }, /area/almayer/shipboard/port_missiles) +"vjn" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_21" + }, +/obj/structure/sign/poster/io{ + name = "propaganda poster"; + pixel_y = 32 + }, +/obj/structure/sign/safety/escapepod{ + pixel_x = -17 + }, +/turf/open/floor/wood/ship, +/area/almayer/command/corporateliason) "vjx" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/almayer{ @@ -73265,20 +74053,27 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_s) "vkM" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 2; - id = "Warden Office Shutters"; - name = "\improper Privacy Shutters" +/obj/structure/machinery/door/airlock/almayer/security/glass{ + dir = 1; + name = "\improper Brig Equipment" }, /obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - dir = 1; - name = "\improper Warden's Office" +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/general_equipment) +"vkN" = ( +/obj/structure/bed/chair/comfy/charlie{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "vkR" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -73289,6 +74084,22 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"vli" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/structure/machinery/power/apc/almayer/hardened{ + dir = 8 + }, +/obj/structure/surface/rack, +/obj/item/stack/sheet/glass/reinforced{ + amount = 50 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "orange" + }, +/area/almayer/shipboard/brig/processing) "vln" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -73311,7 +74122,9 @@ dir = 4 }, /obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, /area/almayer/living/briefing) "vlX" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, @@ -73426,34 +74239,31 @@ }, /area/almayer/lifeboat_pumps/south1) "vpt" = ( -/obj/structure/bed/chair/comfy/bravo{ - dir = 1 +/obj/structure/surface/table/almayer, +/obj/item/paper_bin/uscm{ + pixel_x = 9; + pixel_y = 6 }, -/obj/structure/sign/poster{ - desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE."; - icon_state = "poster11"; - name = "YOU ALWAYS KNOW A WORKING JOE."; - pixel_x = 27; - serial_number = 11 +/obj/item/tool/pen{ + pixel_x = 9; + pixel_y = 2 + }, +/obj/item/tool/pen{ + pixel_x = 9; + pixel_y = 9 + }, +/obj/structure/prop/holidays/string_lights{ + dir = 8; + pixel_x = 29 }, -/obj/item/stack/folding_barricade, /turf/open/floor/almayer{ - icon_state = "orangefull" + icon_state = "plate" }, /area/almayer/living/briefing) "vpI" = ( -/obj/structure/surface/table/almayer, -/obj/item/folder/red{ - pixel_x = -4 - }, -/obj/item/folder/blue{ - pixel_x = 4 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/evidence_storage) +/obj/effect/landmark/start/police, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cryo) "vpV" = ( /turf/open/floor/almayer{ dir = 10; @@ -73584,35 +74394,35 @@ }, /area/almayer/living/offices) "vrM" = ( -/obj/structure/sign/safety/hazard{ - pixel_x = 32; - pixel_y = -8 - }, -/obj/structure/sign/safety/firingrange{ - pixel_x = 32; - pixel_y = 6 +/obj/structure/closet/secure_closet{ + name = "secure evidence locker"; + req_access_txt = "3" }, /turf/open/floor/almayer{ icon_state = "cargo" }, -/area/almayer/shipboard/brig/execution) +/area/almayer/shipboard/brig/evidence_storage) "vrQ" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 2; - id = "bot_armory"; - name = "\improper Armory Shutters" + id = "perma_exit"; + name = "\improper Exit Shutters" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "perma_lockdown"; + name = "\improper Perma Lockdown Shutter" }, /obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 + dir = 1 }, /obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - name = "\improper Armory"; - dir = 2 + dir = 1; + name = "\improper Brig" }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/armory) +/area/almayer/shipboard/brig/perma) "vrW" = ( /turf/open/floor/almayer{ dir = 8; @@ -73643,12 +74453,18 @@ }, /area/almayer/hallways/hangar) "vsJ" = ( -/obj/structure/machinery/optable, -/turf/open/floor/almayer{ +/obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; dir = 1; - icon_state = "sterile_green_corner" + name = "\improper Power Control Room"; + req_access = null; + req_one_access = null; + req_one_access_txt = "3;6" }, -/area/almayer/shipboard/brig/surgery) +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/processing) "vsV" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -73693,6 +74509,12 @@ icon_state = "rasputin3" }, /area/almayer/powered/agent) +"vtt" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "vtx" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Bathroom" @@ -73715,17 +74537,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/port_hallway) -"vtT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "silver" - }, -/area/almayer/command/cichallway) "vub" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/sea_office) @@ -73875,12 +74686,9 @@ }, /area/almayer/hull/lower_hull/l_f_p) "vwO" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/general_equipment) "vwP" = ( /obj/structure/surface/table/almayer, /obj/item/prop/helmetgarb/prescription_bottle{ @@ -73917,18 +74725,10 @@ /turf/open/floor/almayer, /area/almayer/hallways/hangar) "vxC" = ( -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle, -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = -30 - }, /turf/open/floor/almayer{ - dir = 4; - icon_state = "plating_striped" + icon_state = "red" }, -/area/almayer/shipboard/brig/armory) +/area/almayer/shipboard/brig/general_equipment) "vxM" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/cryo) @@ -73988,28 +74788,28 @@ }, /area/almayer/medical/lower_medical_lobby) "vyE" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 8 - }, -/obj/structure/sign/safety/rewire{ - pixel_x = -17; - pixel_y = 17 +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 }, +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - dir = 8; - icon_state = "red" + icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/lobby) "vyI" = ( /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/port) "vyU" = ( -/obj/structure/bed/chair/comfy/charlie, /obj/structure/machinery/light{ dir = 4 }, +/obj/structure/bed/chair/comfy/charlie{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ - icon_state = "emeraldfull" + icon_state = "plate" }, /area/almayer/living/briefing) "vzl" = ( @@ -74086,17 +74886,8 @@ }, /area/almayer/squads/alpha) "vAG" = ( -/obj/structure/window/reinforced/ultra{ - pixel_y = -12 - }, -/obj/structure/bed/chair/bolted, -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/turf/open/floor/almayer{ - icon_state = "plating_striped" - }, -/area/almayer/shipboard/brig/execution) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/chief_mp_office) "vAQ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/reagent_analyzer{ @@ -74135,17 +74926,17 @@ }, /area/almayer/living/briefing) "vBJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/surface/table/almayer, +/obj/item/tool/pen, +/obj/item/device/whistle, +/obj/item/device/megaphone, +/obj/item/paper_bin/uscm{ + pixel_y = 7 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "redcorner" + allow_construction = 0 }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/chief_mp_office) "vBU" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -74203,19 +74994,17 @@ }, /area/almayer/lifeboat_pumps/north1) "vCG" = ( -/obj/structure/machinery/door/poddoor/almayer/locked{ - dir = 2; - id = "Perma 2"; - name = "\improper cell shutter" +/obj/structure/toilet{ + dir = 8 }, -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - name = "\improper Isolation Cell"; - dir = 2 +/obj/structure/sink{ + pixel_y = 24 }, +/obj/structure/machinery/light/small, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "dark_sterile" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/chief_mp_office) "vCO" = ( /obj/effect/landmark/start/bridge, /turf/open/floor/plating/plating_catwalk, @@ -74236,11 +75025,15 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/synthcloset) "vEn" = ( -/obj/structure/bed/chair/comfy/bravo{ - dir = 1 +/obj/structure/surface/table/almayer, +/obj/item/device/flashlight/lamp{ + layer = 3.3; + pixel_x = 15 }, -/obj/item/stack/sheet/mineral/uranium{ - layer = 2.99 +/obj/item/paper, +/obj/item/tool/pen{ + pixel_x = -5; + pixel_y = 2 }, /turf/open/floor/almayer{ icon_state = "orangefull" @@ -74745,12 +75538,12 @@ }, /area/almayer/command/cic) "vOd" = ( -/obj/structure/machinery/body_scanconsole{ - dir = 8 +/obj/structure/machinery/optable, +/obj/structure/sign/safety/medical{ + pixel_x = -17 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "sterile_green_side" + icon_state = "dark_sterile" }, /area/almayer/shipboard/brig/surgery) "vOh" = ( @@ -74881,12 +75674,9 @@ name = "\improper Courtyard Lockdown Shutter" }, /obj/structure/machinery/door/poddoor/almayer/locked{ - id = "Cell 5"; + id = "Cell 4"; name = "\improper Courtyard Divider" }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -75031,6 +75821,7 @@ /obj/structure/machinery/firealarm{ pixel_y = 28 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -75105,21 +75896,12 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) "vUL" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/sign/safety/cryo{ - pixel_x = 3; - pixel_y = 25 - }, -/obj/structure/sign/safety/rewire{ - pixel_x = 15; - pixel_y = 25 - }, +/obj/structure/surface/table/almayer, +/obj/item/device/flash, /turf/open/floor/almayer{ - allow_construction = 0 + icon_state = "plate" }, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/main_office) "vUU" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -75163,15 +75945,6 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) -"vVp" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) "vVs" = ( /turf/open/floor/almayer{ icon_state = "sterile_green" @@ -75203,6 +75976,12 @@ icon_state = "redfull" }, /area/almayer/living/offices/flight) +"vWo" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "redcorner" + }, +/area/almayer/shipboard/brig/evidence_storage) "vWt" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/glass/beaker/large, @@ -75320,7 +76099,7 @@ dir = 1 }, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/perma) "vXX" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/tool, @@ -75475,18 +76254,15 @@ /area/almayer/hallways/aft_hallway) "wbe" = ( /obj/structure/surface/table/almayer, -/obj/effect/landmark/map_item{ - layer = 3.03; - pixel_x = 7; - pixel_y = 4 - }, -/obj/item/prop/helmetgarb/spacejam_tickets{ +/obj/item/reagent_container/food/drinks/coffeecup{ pixel_x = -8; - pixel_y = 5 + pixel_y = -1 }, -/obj/item/prop/helmetgarb/spacejam_tickets{ - pixel_x = -8; - pixel_y = -3 +/obj/item/reagent_container/food/drinks/coffee{ + pixel_y = 9 + }, +/obj/item/tool/pen{ + pixel_x = 5 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -75522,6 +76298,40 @@ icon_state = "mono" }, /area/almayer/living/pilotbunks) +"wbw" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/item/clothing/mask/cigarette/pipe{ + layer = 2.8; + pixel_y = -7 + }, +/obj/item/reagent_container/spray/cleaner{ + layer = 3.04; + pixel_x = -4; + pixel_y = 7 + }, +/obj/structure/machinery/door_control/brbutton{ + id = "Brig Lockdown Shutters"; + name = "Brig Lockdown"; + pixel_x = -12; + pixel_y = 26 + }, +/obj/structure/machinery/door_control/brbutton{ + id = "ARES StairsLock"; + name = "ARES Exterior Lockdown Override"; + pixel_x = -2; + pixel_y = 26 + }, +/obj/structure/machinery/door_control/brbutton{ + id = "ARES Emergency"; + name = "ARES Emergency Lockdown Override"; + pixel_x = 8; + pixel_y = 26 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "wbx" = ( /obj/structure/sign/safety/hazard{ desc = "A sign that warns of a hazardous environment nearby"; @@ -75652,8 +76462,10 @@ }, /area/almayer/medical/medical_science) "wdr" = ( -/obj/structure/pipes/vents/scrubber, -/turf/open/floor/almayer, +/obj/structure/machinery/power/apc/almayer, +/turf/open/floor/almayer{ + icon_state = "red" + }, /area/almayer/shipboard/brig/main_office) "wdv" = ( /obj/structure/machinery/light{ @@ -75742,6 +76554,27 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) +"wfd" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/tool/stamp/hop{ + name = "Commanding Officer's rubber stamp"; + pixel_x = -5; + pixel_y = 9 + }, +/obj/item/paper_bin/uscm{ + pixel_x = 7; + pixel_y = 6 + }, +/obj/item/tool/pen/red/clicky{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/tool/pen/blue/clicky{ + pixel_x = -6; + pixel_y = -3 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "wft" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -75752,18 +76585,14 @@ /turf/closed/wall/almayer, /area/almayer/living/gym) "wfL" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" +/obj/structure/bed/chair/wood/normal{ + dir = 1 }, +/obj/effect/decal/cleanable/blood, /turf/open/floor/almayer{ - dir = 6; - icon_state = "red" + icon_state = "cargo" }, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/execution) "wfZ" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = -12 @@ -75877,11 +76706,15 @@ /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop) "wir" = ( -/obj/structure/sign/safety/bulkhead_door{ - pixel_x = -16 +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_f_p) +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer{ + allow_construction = 0 + }, +/area/almayer/shipboard/brig/lobby) "wiz" = ( /obj/structure/bed/chair{ dir = 4 @@ -75890,6 +76723,19 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) +"wiF" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/machinery/photocopier{ + anchored = 0 + }, +/obj/structure/sign/poster/io{ + name = "propaganda poster"; + pixel_y = 32 + }, +/turf/open/floor/wood/ship, +/area/almayer/command/corporateliason) "wiG" = ( /obj/structure/sign/poster{ pixel_x = -30; @@ -76088,15 +76934,14 @@ }, /area/almayer/hull/lower_hull/l_m_p) "wly" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 2.5 +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 +/turf/open/floor/almayer{ + icon_state = "red" }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/execution) +/area/almayer/shipboard/brig/chief_mp_office) "wlE" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -76113,6 +76958,16 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south2) +"wlH" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/emails{ + pixel_x = 2; + pixel_y = 5 + }, +/turf/open/floor/almayer{ + icon_state = "emeraldfull" + }, +/area/almayer/living/briefing) "wlK" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -76148,11 +77003,11 @@ /area/almayer/living/briefing) "wmE" = ( /obj/structure/machinery/door/window/brigdoor/southright{ - id = "Cell 5"; - name = "Cell 5" + id = "Cell 4"; + name = "Cell 4" }, -/obj/structure/sign/safety/five{ - pixel_x = -17 +/obj/structure/sign/safety/four{ + pixel_x = 32 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) @@ -76313,19 +77168,9 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/stern_hallway) "wqu" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = 26 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/shipboard/brig/processing) -"wqv" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/command/cichallway) +/obj/structure/window/framed/almayer, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/lobby) "wqA" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -76400,29 +77245,31 @@ /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) "wsP" = ( -/obj/structure/platform{ - dir = 1 - }, /obj/item/prop/helmetgarb/gunoil{ layer = 4.2; pixel_x = -3; - pixel_y = 1 + pixel_y = 6 }, /obj/item/prop/helmetgarb/gunoil{ layer = 4.2; pixel_x = -10; - pixel_y = 1 + pixel_y = 10 }, /obj/item/prop/helmetgarb/gunoil{ layer = 4.2; pixel_x = 4; - pixel_y = 1 + pixel_y = 9 }, /obj/item/weapon/broken_bottle{ - pixel_x = 11; - pixel_y = -2 + layer = 4.51; + pixel_x = 9; + pixel_y = 1 + }, +/obj/structure/surface/table/almayer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, /area/almayer/living/briefing) "wsR" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -76526,33 +77373,25 @@ }, /area/almayer/lifeboat_pumps/south1) "wvI" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/recharger, -/obj/structure/sign/safety/terminal{ - pixel_y = 32 - }, -/obj/structure/transmitter/rotary{ - name = "Brig CMP's Office Telephone"; - phone_category = "Offices"; - phone_id = "Brig CMP's Office"; - pixel_x = 15 +/obj/item/paper_bin/uscm{ + pixel_y = 7 }, +/obj/item/tool/pen, +/obj/structure/surface/table/reinforced/black, /turf/open/floor/almayer{ - dir = 9; - icon_state = "red" + icon_state = "plate" }, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/perma) "wvT" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" + dir = 4 }, /obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 + dir = 4 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "red" + icon_state = "test_floor4" }, /area/almayer/shipboard/brig/processing) "wvU" = ( @@ -76565,13 +77404,8 @@ }, /area/almayer/living/synthcloset) "wwk" = ( -/obj/structure/bed/chair/comfy/bravo{ - dir = 1 - }, -/obj/item/stack/folding_barricade, -/obj/item/stack/sheet/mineral/uranium{ - layer = 2.99 - }, +/obj/structure/surface/table/almayer, +/obj/effect/landmark/map_item, /turf/open/floor/almayer{ icon_state = "orangefull" }, @@ -76738,7 +77572,8 @@ /area/almayer/hull/lower_hull/l_a_s) "wzx" = ( /obj/effect/decal/warning_stripes{ - icon_state = "NW-out" + icon_state = "NW-out"; + pixel_y = 1 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) @@ -76774,12 +77609,32 @@ }, /area/almayer/hallways/port_hallway) "wAU" = ( -/obj/structure/bed/chair/comfy/delta, /obj/structure/sign/poster/music{ pixel_x = -27 }, +/obj/structure/surface/table/almayer, +/obj/effect/decal/cleanable/dirt, +/obj/item/device/flashlight/lamp{ + pixel_x = 15 + }, +/obj/item/paper_bin/uscm{ + pixel_x = -7; + pixel_y = 6 + }, +/obj/item/tool/pen{ + pixel_x = -10; + pixel_y = -1 + }, +/obj/item/tool/pen{ + pixel_x = 3; + pixel_y = -4 + }, +/obj/item/tool/pen{ + pixel_x = -11; + pixel_y = 5 + }, /turf/open/floor/almayer{ - icon_state = "bluefull" + icon_state = "plate" }, /area/almayer/living/briefing) "wBY" = ( @@ -76811,15 +77666,20 @@ }, /area/almayer/living/briefing) "wCM" = ( -/obj/structure/pipes/vents/pump, -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/light{ + dir = 1 }, /turf/open/floor/almayer{ dir = 1; - icon_state = "sterile_green_side" + icon_state = "red" }, -/area/almayer/shipboard/brig/surgery) +/area/almayer/shipboard/brig/processing) "wCT" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_AresDown"; @@ -77157,6 +78017,11 @@ "wJH" = ( /turf/closed/wall/almayer/research/containment/wall/east, /area/almayer/medical/containment/cell/cl) +"wJL" = ( +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/living/briefing) "wKn" = ( /obj/structure/surface/rack, /obj/item/facepaint/sniper, @@ -77295,9 +78160,13 @@ }, /area/almayer/medical/containment) "wLV" = ( -/obj/structure/bed/chair/comfy/charlie, +/obj/structure/machinery/vending/cola{ + density = 0; + pixel_y = 16 + }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ - icon_state = "emeraldfull" + icon_state = "plate" }, /area/almayer/living/briefing) "wMm" = ( @@ -77363,12 +78232,17 @@ /turf/open/floor/almayer, /area/almayer/living/briefing) "wNU" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; + dir = 2; + 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 = "plate" + icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_f_p) "wOh" = ( @@ -77403,8 +78277,11 @@ }, /area/almayer/lifeboat_pumps/south1) "wPk" = ( -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer{ + dir = 1; + icon_state = "redcorner" + }, +/area/almayer/shipboard/brig/execution) "wPz" = ( /turf/open/floor/almayer{ icon_state = "mono" @@ -77448,16 +78325,21 @@ }, /area/almayer/hallways/aft_hallway) "wQk" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, -/obj/structure/machinery/door/airlock/almayer/security/glass{ - name = "Evidence Room" +/obj/structure/machinery/status_display{ + pixel_y = -32 + }, +/obj/structure/machinery/vending/coffee, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "red" }, -/area/almayer/shipboard/brig/evidence_storage) +/area/almayer/shipboard/brig/main_office) "wQv" = ( /obj/structure/machinery/light{ dir = 8 @@ -77474,14 +78356,15 @@ }, /area/almayer/hull/upper_hull/u_a_s) "wRm" = ( -/obj/structure/machinery/brig_cell/cell_2{ - pixel_x = 32; - pixel_y = -32 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer{ - allow_construction = 0 +/obj/structure/machinery/vending/snack{ + density = 0; + pixel_y = 16 }, -/area/almayer/shipboard/brig/processing) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) "wRN" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/item/seeds/goldappleseed, @@ -77720,22 +78603,11 @@ }, /area/almayer/squads/charlie_delta_shared) "wVz" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/card{ +/obj/structure/machinery/light/small{ dir = 4 }, -/obj/structure/machinery/computer/secure_data{ - dir = 4; - pixel_y = 17 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/shipboard/brig/processing) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_p) "wVB" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -77760,28 +78632,24 @@ /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) "wVV" = ( -/obj/structure/closet/secure_closet{ - name = "secure evidence locker"; - req_access_txt = "3" +/obj/structure/machinery/cryopod{ + pixel_y = 6 }, /turf/open/floor/almayer{ icon_state = "cargo" }, -/area/almayer/shipboard/brig/evidence_storage) +/area/almayer/shipboard/brig/cryo) "wVW" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/command/cic) "wVY" = ( -/obj/structure/surface/rack, -/obj/item/storage/box/gloves{ - pixel_x = 3; - pixel_y = 3 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/item/storage/box/masks, /turf/open/floor/almayer{ - icon_state = "sterile_green_side" + allow_construction = 0 }, -/area/almayer/shipboard/brig/surgery) +/area/almayer/shipboard/brig/lobby) "wWf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -77969,7 +78837,7 @@ /turf/open/floor/almayer{ icon_state = "redcorner" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/general_equipment) "wZv" = ( /obj/structure/prop/invuln{ desc = "An inflated membrane. This one is puncture proof. Wow!"; @@ -78333,9 +79201,6 @@ desc = "A supply crate containing everything you need to stop a CLF uprising."; name = "\improper USCM crate 'FOB supplies'" }, -/obj/structure/sign/arcturianstopsign{ - pixel_y = 32 - }, /obj/item/folded_tent/big{ pixel_x = -6; pixel_y = 10 @@ -78513,6 +79378,14 @@ icon_state = "emerald" }, /area/almayer/hallways/port_hallway) +"xkY" = ( +/obj/structure/bed/chair/comfy/alpha{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "xlk" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer, @@ -78619,6 +79492,12 @@ /obj/effect/landmark/start/requisition, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) +"xnQ" = ( +/obj/structure/closet/secure_closet/fridge/meat/stock, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/grunt_rnr) "xnR" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1; @@ -78699,22 +79578,16 @@ /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "Brig Lockdown Shutters"; - name = "\improper Brig Lockdown Shutter" - }, -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - dir = 1; - name = "\improper Brig" - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "perma_lockdown"; - name = "\improper Perma Lockdown Shutter" +/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" }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/lobby) "xpt" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -78786,9 +79659,13 @@ /turf/closed/wall/almayer, /area/almayer/command/securestorage) "xqM" = ( -/obj/structure/platform, /obj/structure/pipes/vents/pump, -/turf/open/floor/almayer, +/obj/structure/bed/chair/comfy/delta{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, /area/almayer/living/briefing) "xqS" = ( /obj/effect/decal/warning_stripes{ @@ -78798,14 +79675,13 @@ /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) "xro" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/structure/toilet{ + pixel_y = 13 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) +/area/almayer/shipboard/brig/perma) "xrr" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -78820,10 +79696,12 @@ }, /area/almayer/hull/upper_hull/u_a_p) "xrP" = ( -/turf/open/floor/almayer{ - allow_construction = 0 +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/area/almayer/shipboard/brig/main_office) +/turf/open/floor/plating, +/area/almayer/shipboard/brig/evidence_storage) "xsl" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -78878,11 +79756,16 @@ }, /area/almayer/medical/lower_medical_lobby) "xub" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/general_equipment) +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/brig/armory) "xuc" = ( /obj/structure/surface/table/almayer, /obj/item/tool/extinguisher, @@ -78975,23 +79858,18 @@ }, /area/almayer/hallways/aft_hallway) "xvr" = ( -/obj/structure/toilet{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/shipboard/brig/perma) +/turf/closed/wall/almayer, +/area/almayer/shipboard/brig/chief_mp_office) "xvw" = ( +/obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 }, -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/perma) "xvE" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/multi_tile/almayer/marine/charlie{ @@ -79221,12 +80099,7 @@ /area/almayer/hallways/hangar) "xyz" = ( /obj/structure/sign/safety/maint{ - pixel_x = -19; - pixel_y = -6 - }, -/obj/structure/sign/safety/bulkhead_door{ - pixel_x = -19; - pixel_y = 6 + pixel_x = -17 }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) @@ -79265,9 +80138,6 @@ /turf/open/floor/plating, /area/almayer/hull/upper_hull/u_a_p) "xzp" = ( -/obj/structure/bed/chair/comfy/bravo{ - dir = 1 - }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, @@ -79276,15 +80146,26 @@ }, /area/almayer/living/briefing) "xzu" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, /obj/effect/decal/warning_stripes{ icon_state = "SE-out" }, -/obj/structure/sign/safety/bathunisex{ - pixel_y = 25; - pixel_x = 8 - }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) +"xzB" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/bed/chair/comfy/delta{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/briefing) "xAe" = ( /turf/closed/wall/almayer/research/containment/wall/corner, /area/almayer/medical/containment/cell) @@ -79343,6 +80224,12 @@ "xBe" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/engineering/upper_engineering) +"xBg" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "xBn" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{ id_tag = "Boat1-D3"; @@ -79378,11 +80265,12 @@ }, /area/almayer/squads/req) "xCd" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/structure/reagent_dispensers/peppertank{ + pixel_x = 30 + }, +/turf/open/floor/almayer{ + icon_state = "redcorner" }, -/turf/open/floor/plating, /area/almayer/shipboard/brig/processing) "xCj" = ( /obj/structure/closet/emcloset, @@ -79442,41 +80330,36 @@ }, /area/almayer/command/airoom) "xDQ" = ( -/obj/structure/platform, -/obj/item/trash/USCMtray{ - pixel_y = 4 +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/snacks/mre_pack/xmas3{ + pixel_x = 5 }, -/obj/item/trash/USCMtray{ - pixel_y = 6 +/obj/item/reagent_container/food/snacks/mre_pack/xmas2{ + pixel_x = 5; + pixel_y = 9 }, -/obj/item/trash/USCMtray{ - pixel_y = 8 +/obj/effect/landmark/map_item{ + layer = 3.03; + pixel_x = -7; + pixel_y = 4 }, -/obj/item/trash/USCMtray{ - pixel_y = 10 +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, /area/almayer/living/briefing) "xEc" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/sign/safety/hazard{ - pixel_y = -32 +/turf/open/floor/almayer{ + dir = 9; + icon_state = "red" }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/execution) +/area/almayer/shipboard/brig/main_office) "xEe" = ( +/obj/structure/bed, +/obj/structure/machinery/status_display{ + pixel_x = -32 + }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "red" + icon_state = "plate" }, /area/almayer/shipboard/brig/perma) "xEz" = ( @@ -79509,11 +80392,19 @@ unacidable = 1; unslashable = 1 }, -/obj/structure/machinery/computer/crew, +/obj/structure/surface/table/almayer, +/obj/item/storage/box/handcuffs{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/device/flash{ + pixel_y = -8 + }, /turf/open/floor/almayer{ + dir = 10; icon_state = "red" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/main_office) "xFw" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -79605,17 +80496,31 @@ icon_state = "red" }, /area/almayer/living/briefing) -"xHe" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 +"xGL" = ( +/obj/structure/surface/table/almayer, +/obj/effect/decal/cleanable/dirt, +/obj/item/paper_bin/uscm{ + pixel_x = 9; + pixel_y = 6 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/item/tool/pen{ + pixel_x = 9; + pixel_y = 2 + }, +/obj/item/tool/pen{ + pixel_x = 9; + pixel_y = 9 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "redcorner" + icon_state = "plate" + }, +/area/almayer/living/briefing) +"xHe" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "red" }, /area/almayer/shipboard/brig/main_office) "xHp" = ( @@ -79629,6 +80534,13 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) +"xHM" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/sentencing, +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/processing) "xHW" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -79678,11 +80590,12 @@ }, /area/almayer/medical/lower_medical_medbay) "xIw" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - layer = 1.9 +/obj/structure/machinery/brig_cell/cell_2{ + pixel_x = 32 + }, +/turf/open/floor/almayer{ + allow_construction = 0 }, -/turf/open/floor/plating, /area/almayer/shipboard/brig/processing) "xIQ" = ( /obj/effect/decal/warning_stripes{ @@ -79855,12 +80768,6 @@ density = 0; pixel_y = 16 }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) "xMR" = ( @@ -79962,13 +80869,20 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) "xPR" = ( -/obj/structure/platform{ - dir = 1 - }, /obj/structure/pipes/vents/scrubber{ dir = 4 }, -/turf/open/floor/almayer, +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/emails{ + dir = 1 + }, +/obj/item/reagent_container/food/snacks/grown/banana{ + pixel_x = 18; + pixel_y = 5 + }, +/turf/open/floor/almayer{ + icon_state = "orangefull" + }, /area/almayer/living/briefing) "xPZ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -80000,19 +80914,19 @@ }, /area/almayer/medical/containment/cell) "xQD" = ( -/obj/item/stack/sheet/glass/reinforced{ - amount = 50 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = -25 }, -/obj/effect/spawner/random/toolbox, -/obj/effect/spawner/random/powercell, -/obj/effect/spawner/random/powercell, -/obj/structure/surface/rack, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera"; - dir = 1 +/obj/item/paper_bin/uscm{ + pixel_y = 7 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/item/tool/pen, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "red" + }, +/area/almayer/shipboard/brig/perma) "xQV" = ( /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer/no_build{ @@ -80148,16 +81062,26 @@ }, /area/almayer/shipboard/brig/cic_hallway) "xSA" = ( -/obj/structure/sign/safety/restrictedarea{ - pixel_y = 32 +/obj/structure/surface/table/almayer, +/obj/item/device/flashlight/lamp{ + layer = 3.1; + pixel_x = 7; + pixel_y = 10 }, -/obj/structure/sign/safety/security{ - pixel_x = 15; - pixel_y = 32 +/obj/item/book/manual/marine_law{ + pixel_x = -3; + pixel_y = 1 + }, +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/obj/structure/sign/safety/intercom{ + pixel_x = -17 }, -/obj/structure/bed/sofa/south/grey/right, /turf/open/floor/almayer{ - dir = 1; + dir = 9; icon_state = "red" }, /area/almayer/shipboard/brig/lobby) @@ -80201,11 +81125,14 @@ }, /area/almayer/medical/containment) "xTp" = ( -/obj/structure/machinery/light{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer{ - dir = 9; + dir = 1; icon_state = "red" }, /area/almayer/shipboard/brig/processing) @@ -80431,22 +81358,19 @@ }, /area/almayer/shipboard/sea_office) "xYj" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1 - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "courtyard_cells"; - name = "\improper Courtyard Lockdown Shutter" - }, -/obj/structure/machinery/door/poddoor/almayer/locked{ - id = "Cell 6"; - name = "\improper Courtyard Divider" +/obj/structure/machinery/power/apc/almayer{ + dir = 8 }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/structure/surface/rack, +/obj/effect/spawner/random/toolbox, +/obj/structure/machinery/computer/working_joe{ + dir = 4; + pixel_x = -17; + pixel_y = 14 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 10; + icon_state = "orange" }, /area/almayer/shipboard/brig/cells) "xYB" = ( @@ -80489,14 +81413,6 @@ icon_state = "redfull" }, /area/almayer/command/cic) -"xZz" = ( -/obj/structure/machinery/light, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21"; - pixel_y = 3 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "xZI" = ( /obj/structure/prop/invuln/lattice_prop{ dir = 1; @@ -80574,12 +81490,19 @@ }, /area/almayer/command/airoom) "ybb" = ( -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, +/obj/structure/surface/table/almayer, +/obj/item/storage/box/ids{ + pixel_x = -4; + pixel_y = 14 + }, +/obj/item/device/flash{ + pixel_y = -8 + }, +/obj/structure/machinery/faxmachine/uscm/brig, /turf/open/floor/almayer{ - dir = 4; - icon_state = "plating_striped" + icon_state = "plate" }, -/area/almayer/shipboard/brig/armory) +/area/almayer/shipboard/brig/main_office) "ybf" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -80657,23 +81580,8 @@ /area/almayer/squads/req) "ycr" = ( /obj/structure/surface/table/almayer, -/obj/structure/machinery/recharger, -/obj/structure/machinery/door_control{ - id = "courtyard_cells"; - name = "\improper Courtyard Lockdown Shutters"; - pixel_x = 16; - req_access_txt = "3" - }, -/obj/structure/machinery/door_control{ - id = "Brig Lockdown Shutters"; - name = "Brig Lockdown Shutters"; - pixel_x = 16; - req_access_txt = "3"; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - icon_state = "red" - }, +/obj/structure/machinery/computer/secure_data, +/turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) "ycV" = ( /obj/structure/curtain/red, @@ -80749,6 +81657,20 @@ icon_state = "cargo" }, /area/almayer/living/cryo_cells) +"ydU" = ( +/obj/structure/window/framed/almayer/hull/hijack_bustable, +/obj/structure/machinery/door/poddoor/almayer/locked{ + dir = 8; + id = "Perma 2"; + name = "\improper isolation shutter" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter" + }, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/perma) "ydY" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -80757,25 +81679,6 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) -"yeo" = ( -/obj/structure/safe/co_office, -/obj/item/weapon/pole/fancy_cane, -/obj/item/tool/lighter/zippo/gold{ - pixel_y = 3; - layer = 3.05 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) -"yev" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/prop/tableflag/uscm{ - pixel_x = -5 - }, -/obj/item/prop/tableflag/uscm2{ - pixel_x = 5 - }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) "yeH" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -80804,6 +81707,16 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"yeO" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "yeP" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -80812,26 +81725,20 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_s) "yeR" = ( -/obj/structure/bed, -/obj/item/bedsheet/red, +/obj/structure/machinery/cm_vending/clothing/senior_officer{ + req_access = null; + req_access_txt = 19; + req_one_access = null + }, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/chief_mp_office) "yeX" = ( -/obj/structure/machinery/cm_vending/clothing/military_police{ - density = 0; - pixel_y = 16 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/area/almayer/shipboard/brig/general_equipment) +/obj/structure/closet/secure_closet/guncabinet/blue/riot_control, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/armory) "yfm" = ( /obj/effect/landmark/start/marine/delta, /obj/effect/landmark/late_join/delta, @@ -80976,6 +81883,17 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) +"yiL" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = -28 + }, +/turf/open/floor/almayer, +/area/almayer/hull/upper_hull/u_f_s) "yiW" = ( /obj/structure/machinery/cryopod/right{ layer = 3.1; @@ -87893,10 +88811,10 @@ aaa aaa aaa aaa -bdH -bdH -bdH -bdH +aaa +aaa +aaa +aaa aaa aaa aac @@ -88092,7 +89010,7 @@ aaa aaa aaa aaa -bdH +aaa aaa aaa aaa @@ -88103,13 +89021,13 @@ aaa aaa aaa aad -ugs -ugs -ugs -ugs -ugs -ugs -ugs +cZs +cZs +iZG +iZG +iZG +cZs +cZs ajZ aaa aaa @@ -88295,7 +89213,7 @@ aaa aaa aaa aaa -bdH +aaa aaa aaa aaa @@ -88306,13 +89224,13 @@ aaf aaf aaf aag -ugs +cZs cWN -sEa -buX +dgx +dgx dgx sdq -ugs +cZs aag aaf aaf @@ -88498,7 +89416,7 @@ aaa aaa aaa aaa -bdH +aaa aaa aaa aaa @@ -88509,18 +89427,18 @@ cZs cZs cZs cZs -ugs +cZs dfp sEa -ntm +vBJ uNl oxn -ugs -ugs -ugs -ugs -ugs -ugs +cZs +xEF +xEF +xEF +xEF +xEF ajZ aaa aaa @@ -88708,22 +89626,22 @@ aac aaf aag cZs -naB -naB -naB -naB -mtl +yeR +aTg +kyI +aTg +pdG vAG dOL jfY -jfY +hwS wly -xEc -mtl +wIC +dtN syM -rTt -ePB -ugs +irr +dAb +xEF aag aaf ajY @@ -88914,19 +89832,19 @@ cZs osJ aTg xvr -naB -mtl +bZN +wIC dWk fYX ush -uca -vrM -swo +rTt +vAG +wIC fGN -ntm -ntm -tGg -ugs +kIV +kIV +shw +xEF xEF xEF ajZ @@ -89113,23 +90031,23 @@ aaf pCi pCi myT -naB +wIC lcW -pHp -qfR +pbC +xvr vCG -rRQ +wIC tNF -mtl -mtl -mtl -mtl -kDb -mtl -hbG -dpa -qYH -mtl +tNF +wIC +hzx +wIC +wIC +vBm +vBm +bIi +mnm +kPo cFX xEF xEF @@ -89316,23 +90234,23 @@ pCi pCi cpf cos -naB -osJ -eOk -kPo -qvf -tzj -qPD -tXs +wIC +wIC +wIC +wIC +wIC +wIC +cNY +tak sip -kjN -vyE +mLJ +ntm hND -mtl -mtl -mtl -mtl -mtl +kif +hND +mnm +wVz +kIV dDQ sGe xEF @@ -89513,35 +90431,35 @@ pCi mUQ rPC wcn -iOU +wcn xhM wcn tng hGD wzx -naB -naB -naB -naB -naB -xEe -qPD -qPD -qPD -qPD -bTw -lnJ -xps -guN -xps -uaq +vBm +paq +uoY +vUL +vez +xys +swo +eRL +eRL +mLJ +bua +vBm +xkd +xkd +xkd +xkd kIV iYi gSs eyd kIV kQz -wir +mnm kIV kIV flP @@ -89722,26 +90640,26 @@ dPY rTV wcn tYB -naB -osJ -eOk -kPo +vBm +qfR +tak +tak bvx -tzj -qPD -qyd -bAM -bAM -rra +xys +qan +eRL +eRL +mLJ +eiO xFs xkd +eiH +aTV xkd xkd xkd -xkd -xkd -shw -oIc +mnm +mnm iqx qFl vUI @@ -89925,22 +90843,22 @@ vBm vBm qmC vBm -naB +vBm ouV -pHp -qfR +bTw +sjc dci rzj -qPD -eiO -qPD -qPD -hGa +tGg +sjc +sjc +iqn +eRL tmy xkd -eiH -aTV -xkd +rUB +dSn +soa xzu xkd xkd @@ -90024,97 +90942,97 @@ aaa aaa aaa aaa -aad -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag -ajZ -aaa -bdH -bdH -bdH -bdH -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aab -aaa -aaa -"} -(45,1,1) = {" -aaa -aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aad +aag +aag +aag +aag +aag +aag +aag +aag +aag +aag +aag +aag +aag +aag +aag +aag +aag +aag +aag +ajZ aaa bdH bdH bdH +bdH +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aab +aaa +aaa +"} +(45,1,1) = {" +aaa +aaa +aab +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +bdH +bdH aad aag pCi @@ -90128,22 +91046,22 @@ mqo vBm eRL rag -naB -osJ -pzc +qqN +lzx +mLJ bua -naB -naB +gcT +dSc qre -fnl +eRL eOR -qPD aJz +dXy nHg xkd -rUB -dSn -soa +ghX +rAv +xkd eTo iHG dCe @@ -90314,8 +91232,8 @@ aaa aaa aaa aaa -bdH -bdH +aaa +aaa bdH bdH aad @@ -90330,22 +91248,22 @@ wgi wgi ckS eRL -cNY -naB -naB -naB -naB -naB -naB -sgi -sgi -sgi -oEE -sdF +bua +gcT +gcT +tJy +fnC +tpn +tpn +tpn +ula +tpn +wvT +luw sgi xkd -ghX -rAv +xkd +xkd xkd kmd tUx @@ -90518,7 +91436,7 @@ aaa aaa aaa aaa -bdH +aaa bdH bdH aad @@ -90535,20 +91453,20 @@ vBm pcQ xHe gqW -tak +gqW lCM -geX -tNj -xys +ugT +tpn +vrM kta -wVz -dtN -egR -ula +vWo +xrP +xTp +pyj pwt xkd -xkd -xkd +uvY +oBq xkd rPh iOD @@ -90721,7 +91639,7 @@ aaa aaa aaa aaa -bdH +aaa bdH bdH aad @@ -90736,24 +91654,24 @@ xhE xhE vBm hKq -giZ +cdk soD tdv -tdv +szy wdr -xrP +tpn aeo -wdF -wdF -wdF -wdF -cMl -avz -xkd -uvY -oBq -xkd -nJo +sIw +eni +xrP +xTp +pyj +hTt +kMH +tUx +iTI +hzJ +cyZ jVa jVa tHS @@ -90924,7 +91842,7 @@ aaa aaa aaa aaa -bdH +aaa bdH bdH aad @@ -90939,24 +91857,24 @@ ssD gcT rmv eRL -eRL -nBo -xrP -xrP -xrP +mLJ +bua +nNQ +gcT +ciF +tpn +vrM +eBW +eOh xrP -bZN -wdF -wdF -wdF -wdF -cMl -hTt -kMH -tUx -iTI -rkK -eZH +xTp +pyj +kfN +xkd +qFu +xkd +xkd +qJZ jVa jVa tHS @@ -91127,7 +92045,7 @@ aaa aaa aaa aaa -bdH +aaa bdH bdH aad @@ -91135,29 +92053,29 @@ aag ahE nBc wcn -lrq -lrq -lrq -lrq -lrq -lrq -lrq -fNA +vBm +vBm +vBm +vBm +vBm +vBm +hZU +mLJ fkn +gaJ +gaJ +gaJ +gaJ tpn tpn -wQk -tpn +ueo tpn -vez -uUO -qUb -wdF -cMl -lMc -xkd -qFu +wCM +pyj +opN xkd +uvY +duT xkd vdM jVa @@ -91330,38 +92248,38 @@ aaa aaa aaa aaa +aaa bdH bdH -bdH aad aag pCi mUQ aou -lrq +vBm tJp ybb -ybb +tHB aEk -vxC -lrq -eRL +nSM +ldu +mLJ pYF -tpn -daj -bRH +gaJ wVV -tpn -ffV -fDC -qZg +wVV +wVV +gaJ +aOY wdF -wSm -opN -xkd -uvY -duT -xkd +sdF +kNi +pyj +xIw +kVZ +tUx +iTI +nXm eZH jVa jVa @@ -91533,7 +92451,7 @@ aaa aaa aaa aaa -bdH +aaa bdH bdH aad @@ -91541,34 +92459,34 @@ aag pCi hKi rPC -lrq +vBm sQS -uqo -uqo -uqo -uqo -tRA -eRL -igt -tpn +xEc +grl +egR +tak +lzx +mLJ +ugT +fso vpI -bRH -wVV -tpn -fCg -wdF -wdF -wdF -wSm +vpI +vpI +cuk +tkV +jFR +oRk +kxM +jSw +vBm +vBm +qof +vBm +vBm wRm -dqV -tUx -iTI -paq -eZH tUx vrx -goD +tUx gSV eZH tUx @@ -91744,31 +92662,31 @@ aag ahE nnF rPC -lrq +vBm ikM -uqo +pzc jjM -rQY -uqo -lrq -sIw -igt -tpn -pdG -cKG -wVV -tpn -eUU -jFR +eRL +eRL +eRL +mLJ +ugT +qvf +vpI +vpI +vpI +qvf +wdF +lMc ycr kge kDA -jSw -xkd -qof -xkd -xkd +rkL +eZj efh +mGn +jkS +cyZ thL thL thL @@ -91947,31 +92865,31 @@ aag ahE hUg wcn -lrq -rjw -uqo -uqo -uqo -uqo -vrQ +vBm +gqW +buX +mLJ eRL +eRL +eRL +mLJ pWG -tpn -tpn -tpn -tpn -tpn +gaJ +eyg +gCI +eyg +gaJ heQ -fuX +lMc eOW -wdF cMl -kfN -xkd -uvY +lMc +nxq +ldu +kJK bja -xkd -qJZ +jkS +eZH ohJ thL thL @@ -92150,31 +93068,31 @@ aag ahE rPC wcn -lrq +vBm jCa -lNs +cFO lNs srV uzU -lrq +nJo inN -vBJ -eZj -grl -vsJ -nXm -kHa -dls -wdF -wdF -wdF +wQk +gaJ +gaJ +gaJ +gaJ +gaJ +tRA +lMc +ffV cMl +oeB rkL -hZU -tUx -iTI -qau -eZH +ldu +eRL +jZL +vBm +qJZ ohJ thL thL @@ -92354,29 +93272,29 @@ pCi wcn wcn lrq -bVC -bVC -bVC +lrq bVC lrq lrq -mMd +lut +eRL +eRL enz -uzx -kHa -jIV -ebz +swn +vOd +uCl +dls eGr -wdF -wdF -wdF -wdF -kNi -cqM -xkd -qof -xkd -xkd +gbX +rCL +xHM +jxK +hyz +ltX +pbh +rRQ +rRQ +iyq inG omt omt @@ -92556,30 +93474,30 @@ aag pCi rPC rwS -cQv +lrq fFq +uqo rhD cqn gTx -cQv -cQv -nSM +eRL +eRL igt -kHa -kHa -wCM +swn +daj +qbt exr kHa -xIw -xIw -tbQ -wdF -wSm -kfN -xkd -uvY -uUs -xkd +luH +lMc +ycr +bju +goD +vBm +vBm +qof +vBm +vBm sSm thL thL @@ -92759,31 +93677,31 @@ aag ahE rPC nfI -cQv +lrq eTx -dSc -dSc -ajj -mdJ -cQv -ctn -igt +uqo +hGa +cqn +ldu +eRL +eRL +cWs swn -vOd -uCl -tHB +dcP +tvA +dQv swn -eeN -rSH -xCd -wdF +xTp +lMc +gSi +bju wSm jox lrV tUx -iTI +ntu nYP -uLJ +tUx thL oXp thL @@ -92962,29 +93880,29 @@ aag ahE rPC heV -cQv -yeX -rkh +lrq +lCn +uqo xub -lut +cqn nBb -cqJ +mdS eRL -igt +uJs swn dfO -dQv doj +dQv swn -oHY -gBi +fYn +qZg iXt -rLN -jxK -lMc -xkd -qFu +gBi +wSm +opN xkd +nlH +rQY xkd xMQ ezX @@ -93165,31 +94083,31 @@ aag ahE wcn nBc -cQv -yeX -rkh +lrq +ebt +uqo lLN -pGT -pGT -dsw -sjc +lrq +mAT +lrq +cxA plZ kHa qPO -wuc qPO +wuc qPO oRZ -oRk -xCd wdF -cMl -opN +xCd +bqp +wSm +kfN xkd -uvY -uve +qFu xkd -jvJ +xkd +jVa ezX prY rUk @@ -93368,38 +94286,38 @@ aag pCi wcn wcn -cQv +lrq yeX -rkh +uqo fsT -ajj +jnA fDn -cqJ -eRL -igt +lrq +tqV +nBo +maa swn plI -dQv -aOY +tqe qPO +wvT +luw emp -emp -emp -wqu -cMl +uUO +wSm jZm wmE tUx -iTI +ntu vQN -xro -thL -thL -thL -thL -thL -thL +jVa +rjw +tUx +lnJ +rjw tUx +jVa +oEE xkd kIV hFW @@ -93571,39 +94489,39 @@ aag pCi oCL wcn -cQv -yeX -rkh -cIK -kyI -nBb -cQv +lrq +ebz +uqo +uqo +uqo +iOh +lrq gdo -igt +nBo +jJq swn -ltX -dQv -gCI +dHv +qQM qPO xTp -rSH -gbX -hyz -rCL -cqM -xkd -qFu -xkd +lMc +jcf +qUb +wSm +jSw xkd -eni -thL -thL -thL -thL -thL -thL -tUx +nlH +uuq xkd +naB +naB +pFg +naB +naB +naB +ydU +naB +naB kIV mnm xEF @@ -93774,39 +94692,39 @@ aag pCi rPC aou -cQv -pbh -rkh -dSc -ajj +lrq +yeX +uqo +uvy +tfO fsz -cQv +lrq irJ nBo +pJi swn -ntu -dQv -wVY +jAG +tqe qPO -wvT -kLs -luw -eNp -dXy -kfN +xTp +lMc +jcf +eUU +wSm +cqM +xkd xkd -uvY -cWs xkd -xro -tUx -tUx -tUx -tUx -tUx -fgl -vwO xkd +naB +eoP +fgl +xEe +naB +xEe +fgl +deb +naB lmk kIV xEF @@ -93977,39 +94895,39 @@ pCi pCi wcn tYB -cQv -isH -dSc +lrq noo -cQv -uFp -cQv +noo +noo +lrq +lrq +lrq fNA -mGn +nBo +cQv qPO qPO wuc qPO -qPO -dcP -poH +wvT +luw emp -jOu +dGD wSm lfW -iqn -tUx -iTI +emp +vli +rSH xYj -xro +naB aSS -wIC -jkV -jkV +pHp +poZ +naB jkV -wIC +pHp kOi -wIC +naB xCj kIV xEF @@ -94184,35 +95102,35 @@ cQv vcG lYZ olv -cqJ +dxm nMu -tak -eRL +uFp +ePB nBo tsX +xSA +ugs +wVY lEv -nwz -ciF -cuk -jnT -ssT -emp -bju +iQg +jpQ +tsX +jOu wSm -jSw -emp -emp -emp -emp -iyq -emp -wIC +pyj +vsJ +kjN +rvo +oIc +naB +xro +fgl wvI -uJs -cxA -jnA -pbC -wIC +naB +wvI +fgl +qmX +naB lTK mnm kIV @@ -94382,41 +95300,41 @@ aad pCi dSA rPC -vxM -vxM -vxM -vxM -vxM -vxM +cQv +cQv +geX +tFv +pGT +vkM jvc -eRL -eRL +ajj +ajj nBo -tsX -jtm -nwz -mkk -mkk +xps +jpQ +jpQ +wVY +eOk pFa -qNv -jcf -bju +ctn +wqu +eeN cMl -oeB -emp -nNQ -rSH -hwS -uvy -qqN -wIC +fHS +naB +naB +naB +naB +naB +naB +rkh lvZ -eoP -okM -okM -deb -wIC -wIC +naB +fuX +rra +naB +naB +naB mnm kIV xEF @@ -94576,7 +95494,7 @@ aaa aaa aaa aaa -bdH +aaa aaa aaa bdH @@ -94585,41 +95503,41 @@ aad pCi wcn rPC -vxM -rZR -ebt +cQv +eaf +bEv tWg rZR -iOh -ldu -eRL -eRL -nBo -tsX -xSA +cqJ +isH +vwO +scD +rXC +vyE +nwz nwz mkk -mkk -pFa +wir +jnT qNv -jcf -bju +wqu +eeN cMW qEy ooR xvw -tcP +nBu tcP lFs -vXQ -vkM -uDp +sIY +qyd uDp +tNj uDp -szy -pbC +qyd +icX xQD -wIC +naB kIV lre xEF @@ -94788,41 +95706,41 @@ aag pCi mNR wcn -vxM +cQv eaf -fLn +bEv fLn rXd -iOh +dvT qSl -sjc -scD -rXC -luC +ajj +ukS +wZa +tsX ezU dxT jpQ iQg bRm ecq -emp +tsX tkV -oRk -tJy -emp +pyj +pyj +luC elq qmE -tfO +luC uVF -pyj -wIC -sIY -ekg -ekg -poZ +uQm +qPD +qPD +qPD +qPD +qPD bND jaP -wIC +naB kIV rQU xEF @@ -94991,16 +95909,16 @@ aag pCi tCb aou -vxM -vUL -tFv -tFv -rvo -lCn -mLJ -wZa +cQv +eaf +bEv +fLn +avz +dvT +nHV +ajj iKX -vBm +cQv tsX tsX tsX @@ -95008,24 +95926,24 @@ epu oLF tsX tsX -emp +tsX vyi vyi vyi -emp -emp -emp -emp -kyP -wIC -wIC -sBH -uNe +naB +naB +naB +naB +dqV +mdJ +vXQ +vXQ uNe -wIC -wIC +uUs +nqZ +ekg usr -wIC +naB inC mKf xEF @@ -95194,16 +96112,16 @@ aag pCi oCL wcn -vxM -jAG -bEv -bEv +cQv +eaf bEv -iOh -mLJ -kVZ -vBm -vBm +qRo +rXd +dvT +bAM +wZa +cQv +cQv tHr mqg eiK @@ -95218,17 +96136,17 @@ xuZ rCU rEY gxU -emp +naB kyP -pJi -kJK -jnA +qPD +qPD +qPD uQm pIH -wIC +naB nOe -nlH -wIC +nOe +naB bIi fQk xEF @@ -95397,14 +96315,14 @@ aag pCi wcn rPC -vxM +cQv bop jeK mWe -eBW -iOh -mLJ -eRL +rXd +dvT +ieo +vxC ldD ceZ jnD @@ -95421,17 +96339,17 @@ rWs rQt cgT xuc -emp +naB pZV gMf -uDp -uDp -uDp +ekg +ekg +uQm nnz -wIC +vrQ mLI -yeR -wIC +qyd +vrQ mnm sIk xEF @@ -95600,21 +96518,21 @@ aag pCi wcn rPC -vxM -vxM -vxM -vxM -vxM -gaJ +cQv +cQv +cQv +cQv +cQv +dvT ieo -xys -vBm +vxC +ldD vGA hUW dHd vka lnt -jJq +uVA uVA uVA uVA @@ -95624,17 +96542,17 @@ uVA wIQ xWv aQb -emp -emp -wIC -pFg +naB +naB +mtl +hwQ hwQ okM -eyg -wIC -wIC -wIC -wIC +mtl +mtl +naB +naB +naB mnm hPT xEF @@ -95806,12 +96724,12 @@ wcn aFN wcn cXZ -vBm -erx -iZG -mKh +jIV +vxM +gaJ +uzx uue -vBm +vxM iuE uwN vka @@ -95829,17 +96747,17 @@ wIQ mPj omy xpo -wIC +mtl pGG qRT djm hgF -wIC +mtl kIV hUc wNU mnm -kIV +sIk xEF aag aag @@ -96006,15 +96924,15 @@ adG adG gqq iCz -fHS +aFN rPC rPC -vBm -vBm -vBm -uRc -nBu -vBm +kDb +vxM +wVV +qau +mVi +vxM udK mwA lnt @@ -96032,12 +96950,12 @@ mgj wIQ jHh jUY -wIC +fbY qVF -jkS +oog qaJ czB -wIC +mtl mnm kIV wNU @@ -96212,12 +97130,12 @@ akC akC cVJ rPC -vBm -vBm +jvJ +vxM sVy mKh -uuq -vBm +mVi +vxM bmz wSR mMV @@ -96235,14 +97153,14 @@ awz woy laO nRH -wIC -hzx -okM +fbY +qVF +oog kHK wfL -wIC +mtl mnm -gSi +dGc kCi kCi kCi @@ -96415,12 +97333,12 @@ bzz akC cRc rPC -wgi -vBm -cFO +wcn +vxM +eyg giZ gTl -vBm +vxM pZS pEB jUY @@ -96438,12 +97356,12 @@ qwp pZS jHh jUY -wIC -wIC +fbY +uLJ oog -wIC -wIC -wIC +sBH +vfv +mtl mnm dGc kCi @@ -96618,12 +97536,12 @@ aHZ akC oCL rPC -wgi -vBm -abc -wgi +wcn +vxM +vxM +tXs oCX -vBm +vxM vkR wsD jUY @@ -96641,12 +97559,12 @@ qwp vGA uwN uVd -wIC -qQM -wPk -dHv -dkt -wIC +mtl +mtl +qYH +mtl +mtl +mtl kIV kIV kCi @@ -96669,7 +97587,7 @@ aaa aaa aaa aaa -bdH +aaa aaa aaa aaa @@ -96821,12 +97739,12 @@ btv akC dDC rPC -wgi -vBm -vfv -wgi -mVi -vBm +wcn +vxM +wVV +erx +dsw +vxM kfE wsD jUY @@ -96844,12 +97762,12 @@ qwp cDn uwN jUY -wIC +mtl lNF -wPk -wIC -wIC -wIC +rkK +cIK +mtl +tzj kIV bbR kCi @@ -96872,7 +97790,7 @@ aaa aaa aaa aaa -bdH +aaa aaa aaa aaa @@ -97024,12 +97942,12 @@ aHZ akC eKM ake -kif -vBm +rPC +vxM dFC -tvA -fnC -vBm +bRH +bRH +vxM xDn pEB jUY @@ -97047,12 +97965,12 @@ awz gGr jHh sCQ -wIC +mtl pJE wPk hRy -wIC -mnm +mtl +tzj kIV bVT kCi @@ -97228,11 +98146,11 @@ akC akC tRX uzm -vBm -bqp -gcT +vxM +eyg +eyg oWI -vBm +vxM nNv pEB jUY @@ -97250,11 +98168,11 @@ qwp ora laO rKQ -wIC +mtl qHF -wPk -yeR -wIC +fnl +mtl +mtl utZ pUJ pUJ @@ -97430,12 +98348,12 @@ hxG akC fvu qkn -wgi -vBm -vBm -vBm -vBm -vBm +wcn +vxM +vxM +vxM +vxM +vxM xSz pEB jUY @@ -97453,11 +98371,11 @@ qwp pZS jHh vCx -wIC -wIC -wIC -wIC -wIC +mtl +mtl +mtl +mtl +qFl mnm xyz gpe @@ -100065,14 +100983,14 @@ svp avl agj agj -aew -bCO -ugb -alj -ahZ +wbw +npK +hBW +tHU +tMu kcN -aox -oqA +dkn +gye aic aov wVW @@ -100267,15 +101185,15 @@ npB umY avl agj -yeo +laG agc -bIz +aUP agc -ahY -lQq +ktc +ueD kcN cod -oqA +gye aic aov wVW @@ -100468,17 +101386,17 @@ ahE aiV wBY hJJ -qCi +anl agj -eBo -erZ +fuR +ouT agc agc -ahY -hGB +ktc +nKs kcN -sBF -oqA +muQ +gye aic aKq luZ @@ -100671,13 +101589,13 @@ pCi kwS avl avl -cpr +yiL agj -oMM -ocs -mFb -glU -rDd +utw +kmY +pSH +mES +lWD mXj kcN kcN @@ -100876,14 +101794,14 @@ avl hCo lIh agj -kFk +fiP hvH -aoZ +pYp hvH hvH -pmO -akl -alc +iIm +odC +cQD agj bFA aov @@ -101079,14 +101997,14 @@ avl hMI lFb agj -alu -tQM -aoZ -aha -akp +mcK +xBg +pYp +isu +oBW mXj -akm -ako +drp +tqI agj aic aoA @@ -101273,7 +102191,7 @@ bdH aaa aaa bdH -aaa +bdH aaa aad ahE @@ -101284,7 +102202,7 @@ tDx agj mXj mXj -mSI +nRQ mXj mXj mXj @@ -101476,7 +102394,7 @@ bdH bdH bdH aaa -aaa +bdH aaa aad pCi @@ -101486,12 +102404,12 @@ jgM lFb agj mXj -lue -fNb -eSJ -eSJ -alb -kmY +yeO +nQH +lnZ +lnZ +pxL +mzG mXj agj amI @@ -101688,17 +102606,17 @@ avl jpJ lzH agj -uvZ +iET akr -akk -juN +lfT +jNY agc -vVp -ocs -adv +jCn +kmY +rEJ agj aic -tZB +esy wVW asQ awG @@ -101891,17 +102809,17 @@ avl llM lGL agj -geW +jPn hvH agc -iVZ +euM pxG -aiW +klG agc agc agj aic -vtT +cHA wVW nww atN @@ -102094,17 +103012,17 @@ avl avl mrc agj -cCd +huR hvH -tMn -nwv +gfK +rqH agc -jWN +nnG xyk xyk -alo -wqv -eYC +oys +nDV +joE wVW qyJ qEk @@ -102297,16 +103215,16 @@ pCi jTi nRq agj -bYd +wfd hvH agc -yev +pJe pxG -dml +vtt agc agc agj -akn +lPG aov wVW qyJ @@ -102500,14 +103418,14 @@ pCi avl myn agj -ahw +rfv hvH qck -ahv +jEX agc -aiF -glU -xZz +ssn +mES +lUw agj aic aov @@ -102704,12 +103622,12 @@ cnX lIh agj mXj -tQM +xBg hvH hvH -aiG +bVg hvH -aks +pJK mXj agj aic @@ -104151,7 +105069,7 @@ aGV rvA aKE awF -jLf +iYR aUw aUm aET @@ -111773,8 +112691,8 @@ bJt xOL gGI eeu -nbB -ksA +dqQ +ccm gAz fiq uaa @@ -112176,7 +113094,7 @@ buH bHL buH lhB -nbB +tAJ bDs bIJ bDs @@ -112481,7 +113399,7 @@ kSJ avj cGr awE -fUn +vjn wQv rne guC @@ -112796,7 +113714,7 @@ jFE jFE idx hAz -fhQ +hQh bJt vhI oed @@ -112995,11 +113913,11 @@ vzP bJt hjB bJt -dpn +neF bDs gSk bDs -pdt +khX bJt kTq oed @@ -113608,7 +114526,7 @@ rBj bDs gSk bDs -oMd +hWS bJt oDf uqH @@ -113811,7 +114729,7 @@ bJt oKb gSk bDs -pdt +ign bJt sIx bxX @@ -114416,7 +115334,7 @@ qBM wXI nUd lkd -oMd +xnQ bDs gSk oDE @@ -114916,7 +115834,7 @@ ajr aii avm awE -hfm +wiF rne rne fAo @@ -115393,8 +116311,8 @@ wsP izr aSh ccF -tGG -tGG +rFV +iXR bdg aLG awb @@ -115424,12 +116342,12 @@ buH hOR buH bdg -sNI +cxZ wAU diw -csG -sNI -wNT +tSv +cxZ +ffl wbe bdd qXo @@ -115591,13 +116509,13 @@ hhw umv hhw bdd -bqZ -kbV -tGG -tGG -tGG +hjT +jZr tGG +fHe tGG +sBs +iXR bdg aLG aYO @@ -115627,13 +116545,13 @@ buH bHL buH bdg -sNI -sNI -sNI -sNI +cxZ +hnH +kXH +kfG dkH cKX -bqZ +oqP bdd tLc rsM @@ -115795,12 +116713,12 @@ aSm eoM bdd vTt -kbV -tGG -tGG -tGG -tGG +tgE +tgE +fNu tGG +gmp +iXR bdg aLG aYO @@ -115830,13 +116748,13 @@ buH bHL buH bdg -sNI +cxZ csG sNI -sNI +mgR gNi -wNT -cab +wJL +oMC bdd hxZ rsM @@ -115997,14 +116915,14 @@ aSm aSm kOf bdd -bDQ -kbV -tGG +dYH +bDP +tgE okB -tGG +tgE crK -tGG -bdg +xkY +bdd beB aYT beB @@ -116032,11 +116950,11 @@ bCx buH bHL buH -bdg -sNI -sNI -sNI -sNI +bdd +qWy +uZX +wJL +wJL eCS xqM udV @@ -116200,12 +117118,12 @@ mhl aSm ylY bdd -bqZ qgw -beH -qMR +qgw +qgw +tMc vlR -dRT +uLe qin pmv tBF @@ -116236,13 +117154,13 @@ bFu omW bFu hLS -eBg -eBg -eBg -eBg -fOk +vKe +vKe +sgE +ljz +xzB epq -bqZ +fCt bdd hTf rKO @@ -116606,13 +117524,13 @@ pOB hfk aLf bdd -bqZ +gVm kKL -aLJ -eBg +gOm +hFX dAO cEG -eBg +vKe dYX tBF lBz @@ -116642,13 +117560,13 @@ buH uXu bFu iUk -eBg +cIl gkJ -eBg -eBg +vKe +cum mVZ kTx -bqZ +jIG bdd hTf wRO @@ -116809,14 +117727,14 @@ lQu lQu aSm bdd -bDQ +iFG iWE jUo -wmz -wmz +iXd +iXd wwk -wmz -bdg +hMJ +bdd aLG awb aLG @@ -116844,14 +117762,14 @@ bdg buH hOR buH -bdg +bdd wLV nza -wLV -wLV -wLV +mwz +mwz +mwz ukA -bqZ +jIG bdd gKB rsM @@ -117012,13 +117930,13 @@ yfy ugV vUi bdd -vTt -kbV +jEI +iXd xzp vEn wmz -wmz -wmz +npS +qsa bdg aLG aYO @@ -117048,13 +117966,13 @@ bGe bHL buH bdg -wLV -wLV -wLV -wLV -gKH +kxF +elX +gAj +bHS +aLA ldj -cab +oMC bdd sOt cNX @@ -117215,13 +118133,13 @@ aLf qce aSm bdd -bqZ +gcw xPR nIW +uzb wmz -wmz -wmz -wmz +idJ +qsa bdg beB aYT @@ -117251,13 +118169,13 @@ bJz bHT bJz bdg -wLV -wLV -wLV -wLV -wLV -wNT -udV +kxF +lad +thE +hIt +gAj +wlH +sGX bdd pEl roU @@ -117420,11 +118338,11 @@ qEW bdd gGo mLb -wmz +qmB vpt kQU -wmz -wmz +rdb +kQU bdg aLG aYO @@ -117457,8 +118375,8 @@ bdg gKH cgz vyU -wLV -wLV +xGL +vkN xDQ bXc bdd