From 9ca7a485f70da4aca052db837a4aa66bc965031b Mon Sep 17 00:00:00 2001 From: Vyzo Date: Sat, 25 Nov 2023 02:41:14 +0300 Subject: [PATCH 01/10] brig remap full commit --- code/game/machinery/computer/security.dm | 2 +- code/game/machinery/doors/brig_system.dm | 8 + code/game/machinery/vending/vending_types.dm | 17 + .../crates_lockers/closets/secure/security.dm | 52 + maps/map_files/USS_Almayer/USS_Almayer.dmm | 12419 ++++++++-------- 5 files changed, 6074 insertions(+), 6424 deletions(-) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 2d9a4a1dbea4..258160287472 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -187,7 +187,7 @@ if("Released") background = "'background-color:#3BB9FF;'" if("Suspect") - background = "'background-color:#1AAFFF;'" + background = "'background-color:#686A6C;'" if("NJP") background = "'background-color:#faa20a;'" if("None") diff --git a/code/game/machinery/doors/brig_system.dm b/code/game/machinery/doors/brig_system.dm index 58c3282abed4..be6291c7485e 100644 --- a/code/game/machinery/doors/brig_system.dm +++ b/code/game/machinery/doors/brig_system.dm @@ -390,6 +390,14 @@ name = "Cell 4" id = "Cell 4" +/obj/structure/machinery/brig_cell/cell_5 + name = "Cell 5" + id = "Cell 5" + +/obj/structure/machinery/brig_cell/cell_6 + name = "Cell 6" + id = "Cell 6" + /obj/structure/machinery/brig_cell/perma_1 name = "Perma 1" id = "Perma 1" diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm index a57bbfe7d29f..0403574d70fe 100644 --- a/code/game/machinery/vending/vending_types.dm +++ b/code/game/machinery/vending/vending_types.dm @@ -252,6 +252,23 @@ ) contraband = list(/obj/item/clothing/glasses/sunglasses = 2,/obj/item/storage/donut_box = 2) +/obj/structure/machinery/vending/security/riot + name = "\improper RiotTech" + desc = "A security riot equipment vendor." + hacking_safety = TRUE + wrenchable = FALSE + products = list( + /obj/item/handcuffs/zip = 40, + /obj/item/explosive/grenade/flashbang = 20, + /obj/item/explosive/grenade/custom/teargas = 40, + /obj/item/ammo_magazine/smg/m39/rubber = 40, + /obj/item/ammo_magazine/pistol/rubber = 40, + /obj/item/ammo_magazine/pistol/mod88/rubber = 40, + /obj/item/ammo_magazine/rifle/rubber = 40, + /obj/item/ammo_magazine/rifle/m4ra/rubber = 40, + /obj/item/clothing/head/helmet/marine/MP = 8, + ) + /obj/structure/machinery/vending/sea name = "\improper SeaTech" desc = "An equipment vendor designed to save lives" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 9557013268bf..150f806b3a4d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -196,6 +196,58 @@ locked = TRUE var/id = null +/obj/structure/closet/secure_closet/brig/prisoner + +/obj/structure/closet/secure_closet/brig/prisoner/Initialize() + . = ..() + new /obj/item/clothing/under/color/orange(src) + new /obj/item/clothing/shoes/orange(src) + new /obj/item/device/radio/headset(src) + +/obj/structure/closet/secure_closet/brig/prison_uni + name = "Spare Prison Uniforms" + req_one_access = list(ACCESS_MARINE_BRIG, ACCESS_CIVILIAN_BRIG) + anchored = TRUE + locked = TRUE +/obj/structure/closet/secure_closet/brig/prison_uni/Initialize() + . = ..() + new /obj/item/clothing/shoes/orange(src) + new /obj/item/clothing/shoes/orange(src) + new /obj/item/clothing/shoes/orange(src) + new /obj/item/clothing/shoes/orange(src) + new /obj/item/clothing/shoes/orange(src) + new /obj/item/clothing/under/color/orange(src) + new /obj/item/clothing/under/color/orange(src) + new /obj/item/clothing/under/color/orange(src) + new /obj/item/clothing/under/color/orange(src) + new /obj/item/clothing/under/color/orange(src) + new /obj/item/device/radio/headset(src) + new /obj/item/device/radio/headset(src) + new /obj/item/device/radio/headset(src) + new /obj/item/device/radio/headset(src) + new /obj/item/device/radio/headset(src) + +/obj/structure/closet/secure_closet/brig/restraints + name = "Spare Restraints" + req_one_access = list(ACCESS_MARINE_BRIG, ACCESS_CIVILIAN_BRIG) + anchored = TRUE + locked = TRUE +/obj/structure/closet/secure_closet/brig/restraints/Initialize() + . = ..() + new /obj/item/clothing/suit/straight_jacket(src) + new /obj/item/clothing/suit/straight_jacket(src) + new /obj/item/clothing/suit/straight_jacket(src) + new /obj/item/clothing/suit/straight_jacket(src) + new /obj/item/clothing/suit/straight_jacket(src) + new /obj/item/clothing/glasses/sunglasses/blindfold(src) + new /obj/item/clothing/glasses/sunglasses/blindfold(src) + new /obj/item/clothing/glasses/sunglasses/blindfold(src) + new /obj/item/clothing/glasses/sunglasses/blindfold(src) + new /obj/item/clothing/glasses/sunglasses/blindfold(src) + +/obj/structure/closet/secure_closet/brig/Initialize() + . = ..() + /obj/structure/closet/secure_closet/brig/Initialize() . = ..() new /obj/item/clothing/under/color/orange(src) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index c8daef1600fd..b5367f0790d8 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -363,6 +363,15 @@ 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" @@ -529,17 +538,6 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) -"abQ" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/obj/structure/machinery/cm_vending/clothing/staff_officer_armory, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/command/cic) "abR" = ( /obj/item/tank/phoron, /turf/open/floor/almayer{ @@ -798,6 +796,12 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_s) +"acE" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/lifeboat_pumps/north2) "acF" = ( /obj/structure/machinery/light{ dir = 1 @@ -920,20 +924,12 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) -"acS" = ( -/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 - }, +"acT" = ( +/obj/structure/closet/firecloset, /turf/open/floor/almayer{ - icon_state = "silver" + icon_state = "cargo" }, -/area/almayer/command/cichallway) +/area/almayer/lifeboat_pumps/north2) "acU" = ( /obj/structure/closet/basketball, /turf/open/floor/almayer{ @@ -1101,6 +1097,12 @@ "adu" = ( /turf/open/floor/almayer, /area/almayer/shipboard/starboard_missiles) +"adv" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 8 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "ady" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -1183,6 +1185,15 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north1) +"adQ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/north2) "adR" = ( /obj/structure/machinery/door/airlock/almayer/generic{ access_modified = 1; @@ -1211,6 +1222,13 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) +"adZ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north2) "aea" = ( /obj/structure/machinery/light{ dir = 1 @@ -1283,17 +1301,16 @@ /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) "aeo" = ( -/obj/structure/machinery/light{ - dir = 1 +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/obj/structure/closet/secure_closet{ - name = "secure evidence locker"; - req_access_txt = "3" +/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ + name = "Brig" }, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/evidence_storage) +/area/almayer/shipboard/brig/main_office) "aep" = ( /turf/closed/wall/almayer, /area/almayer/engineering/airmix) @@ -1312,6 +1329,16 @@ "aet" = ( /turf/closed/wall/almayer, /area/almayer/living/starboard_garden) +"aew" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/obj/structure/closet/secure_closet/bar{ + name = "Success Cabinet"; + req_access_txt = "1" + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "aex" = ( /obj/item/reagent_container/food/drinks/cans/beer{ pixel_x = 6; @@ -1560,6 +1587,17 @@ icon_state = "redfull" }, /area/almayer/shipboard/starboard_missiles) +"afc" = ( +/obj/structure/reagent_dispensers/water_cooler/stacks{ + density = 0; + pixel_y = 17 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer, +/area/almayer/hull/upper_hull/u_f_s) "afd" = ( /obj/structure/largecrate/random/barrel/white, /obj/structure/sign/safety/bulkhead_door{ @@ -2097,6 +2135,18 @@ icon_state = "plate" }, /area/almayer/living/cafeteria_officer) +"aha" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/almayer/command/reinforced{ + access_modified = 1; + name = "\improper Commanding Officer's Quarters"; + req_access = null; + req_access_txt = "31" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/commandbunks) "ahb" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -2220,6 +2270,20 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_p) +"ahv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) +"ahw" = ( +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "ahx" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, @@ -2327,6 +2391,43 @@ icon_state = "bluecorner" }, /area/almayer/living/offices/flight) +"ahY" = ( +/obj/structure/machinery/light, +/obj/structure/surface/table/woodentable/fancy, +/obj/item/clothing/shoes/laceup{ + desc = "The height of fashion, and they're pre-polished! The name 'Bob' is written on the inside."; + pixel_y = -5 + }, +/obj/effect/landmark/map_item, +/obj/item/device/flashlight/lamp/green, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) +"ahZ" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/paper_bin/uscm, +/obj/item/tool/pen, +/obj/structure/machinery/door_control{ + id = "ARES StairsLock"; + name = "ARES Exterior Lockdown Override"; + pixel_x = 8; + pixel_y = -24; + req_one_access_txt = "90;91;92" + }, +/obj/structure/machinery/door_control{ + id = "ARES Emergency"; + name = "ARES Emergency Lockdown Override"; + pixel_y = -24; + req_one_access_txt = "91;92" + }, +/obj/structure/machinery/door_control{ + id = "Brig Lockdown Shutters"; + name = "Brig Lockdown Override"; + pixel_x = -8; + pixel_y = -24; + req_access_txt = "1;3" + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "aia" = ( /turf/open/floor/almayer{ dir = 8; @@ -2538,6 +2639,14 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) +"aiF" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) +"aiG" = ( +/obj/structure/filingcabinet, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "aiH" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -2559,14 +2668,6 @@ icon_state = "red" }, /area/almayer/living/starboard_garden) -"aiQ" = ( -/obj/structure/machinery/faxmachine, -/obj/structure/surface/table/almayer, -/obj/structure/machinery/light/small, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "aiR" = ( /obj/structure/stairs{ dir = 8; @@ -2615,13 +2716,7 @@ }, /area/almayer/hull/upper_hull/u_f_s) "aiW" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/carpet, /area/almayer/living/commandbunks) "aiX" = ( @@ -2667,12 +2762,6 @@ "ajl" = ( /turf/closed/wall/almayer/white, /area/almayer/medical/upper_medical) -"ajm" = ( -/obj/structure/closet/secure_closet/securecom, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/command/cic) "ajp" = ( /obj/structure/surface/table/almayer, /obj/structure/dropship_equipment/fuel/cooling_system{ @@ -2973,15 +3062,72 @@ icon_state = "redcorner" }, /area/almayer/shipboard/weapon_room) -"ako" = ( -/obj/structure/disposalpipe/segment{ +"akk" = ( +/obj/structure/machinery/door/window/westright{ dir = 4 }, -/obj/structure/pipes/standard/manifold/hidden/supply{ +/obj/structure/machinery/shower{ + dir = 4 + }, +/obj/structure/window/reinforced, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/commandbunks) +"akl" = ( +/obj/structure/machinery/light{ dir = 1 }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/commandbunks) +"akm" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Bathroom" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/commandbunks) +"akn" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, /turf/open/floor/carpet, /area/almayer/living/commandbunks) +"ako" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) +"akp" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) +"akr" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) +"aks" = ( +/obj/structure/surface/table/almayer, +/obj/item/clipboard, +/obj/item/device/binoculars, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "akt" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -3209,6 +3355,28 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/starboard_garden) +"alb" = ( +/obj/structure/toilet{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/commandbunks) +"alc" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/structure/mirror{ + pixel_x = 28 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/commandbunks) "ald" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -3247,6 +3415,15 @@ icon_state = "bluecorner" }, /area/almayer/hallways/aft_hallway) +"alj" = ( +/obj/structure/surface/table/almayer, +/obj/item/paper, +/obj/item/device/whistle, +/obj/structure/sign/safety/bathunisex{ + pixel_x = -17 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "alk" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -3264,6 +3441,13 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/hallways/aft_hallway) +"alo" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_18" + }, +/obj/structure/machinery/light, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "alp" = ( /turf/open/floor/almayer{ dir = 9; @@ -3284,6 +3468,12 @@ icon_state = "bluecorner" }, /area/almayer/hallways/aft_hallway) +"alu" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/megaphone, +/obj/item/device/radio, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "alw" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 2; @@ -3516,15 +3706,6 @@ icon_state = "blue" }, /area/almayer/hallways/aft_hallway) -"amE" = ( -/obj/item/clothing/suit/storage/marine/light/vest, -/obj/item/clothing/suit/storage/marine/light/vest, -/obj/item/clothing/suit/storage/marine/light/vest, -/obj/structure/surface/rack, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/engineering/upper_engineering) "amF" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -3747,47 +3928,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_s) -"anp" = ( -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/medical/upper_medical) -"anq" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/obj/item/clothing/suit/storage/marine/light/vest, -/obj/item/clothing/suit/storage/marine/light/vest, -/obj/item/clothing/suit/storage/marine/light/vest, -/obj/item/clothing/suit/storage/marine/light/vest, -/obj/item/clothing/suit/storage/marine/light/vest, -/obj/item/clothing/suit/storage/marine/light/vest, -/obj/structure/surface/rack, -/obj/item/clothing/suit/storage/marine/light/vest, -/obj/item/clothing/suit/storage/marine/light/vest, -/obj/item/clothing/suit/storage/marine/light/vest, -/obj/item/clothing/suit/storage/marine/light/vest, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/medical/upper_medical) -"anr" = ( -/obj/structure/sign/safety/intercom{ - pixel_x = 8; - pixel_y = 32 - }, -/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/medical/upper_medical) "ans" = ( /turf/open/floor/almayer{ dir = 8; @@ -4108,6 +4248,15 @@ icon_state = "bluecorner" }, /area/almayer/hallways/aft_hallway) +"aox" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/command/cichallway) "aoy" = ( /obj/structure/sign/safety/fire_haz{ pixel_x = 8; @@ -4348,6 +4497,10 @@ icon_state = "plating" }, /area/almayer/engineering/upper_engineering) +"aoZ" = ( +/obj/structure/sign/prop1, +/turf/closed/wall/almayer/reinforced, +/area/almayer/living/commandbunks) "apa" = ( /obj/structure/surface/rack, /obj/item/tool/screwdriver, @@ -5410,16 +5563,6 @@ /obj/structure/surface/table/almayer, /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) -"asu" = ( -/obj/structure/sign/safety/hazard{ - pixel_x = 32; - pixel_y = -8 - }, -/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/medical/upper_medical) "asv" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/machinery/light{ @@ -5837,12 +5980,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) -"atx" = ( -/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/command/cic) "aty" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/almayer{ @@ -6018,6 +6155,14 @@ icon_state = "blue" }, /area/almayer/hallways/aft_hallway) +"atY" = ( +/obj/structure/closet/emcloset, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/command/lifeboat) "atZ" = ( /obj/structure/machinery/door_control{ id = "OTStore"; @@ -6628,12 +6773,12 @@ /turf/open/floor/grass, /area/almayer/living/starboard_garden) "avz" = ( -/obj/structure/machinery/light, -/obj/structure/machinery/vending/security, +/obj/structure/closet/secure_closet/brig/prisoner, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 8; + icon_state = "redcorner" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/processing) "avB" = ( /turf/open/floor/almayer{ dir = 8; @@ -7339,16 +7484,6 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering) -"axR" = ( -/obj/structure/machinery/shower, -/obj/structure/window/reinforced/tinted{ - dir = 8 - }, -/obj/structure/machinery/door/window/tinted{ - dir = 2 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering/upper_engineering/port) "axV" = ( /obj/structure/machinery/telecomms/server/presets/command, /turf/open/floor/almayer{ @@ -7795,33 +7930,6 @@ icon_state = "bluecorner" }, /area/almayer/living/offices/flight) -"azm" = ( -/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) "azn" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ @@ -7837,12 +7945,6 @@ icon_state = "plating" }, /area/almayer/engineering/upper_engineering) -"azp" = ( -/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/engineering/upper_engineering) "azq" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -8853,6 +8955,14 @@ icon_state = "orangecorner" }, /area/almayer/command/telecomms) +"aDc" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/command/lifeboat) "aDe" = ( /obj/structure/machinery/light{ dir = 8 @@ -9162,29 +9272,12 @@ }, /area/almayer/living/offices/flight) "aEk" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/secure_data{ - dir = 4; - pixel_y = 17 - }, -/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 - }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 4; + icon_state = "plating_striped" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/armory) "aEm" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/working_joe{ @@ -9582,14 +9675,7 @@ id = "Brig Lockdown Shutters"; name = "\improper Brig Lockdown Shutter" }, -/obj/structure/machinery/door/airlock/almayer/maint{ - access_modified = 1; - dir = 2; - req_one_access = list(2,34,30) - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) "aFV" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -9646,6 +9732,12 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_four) +"aGi" = ( +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle_ap, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/command/cic) "aGj" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 2; @@ -9824,6 +9916,24 @@ "aHe" = ( /turf/closed/wall/almayer, /area/almayer/command/lifeboat) +"aHk" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/sink{ + pixel_y = 16 + }, +/obj/structure/mirror{ + pixel_y = 21 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/numbertwobunks) "aHl" = ( /obj/structure/machinery/portable_atmospherics/canister/air, /turf/open/floor/engine, @@ -9978,6 +10088,12 @@ }, /turf/open/floor/engine, /area/almayer/engineering/airmix) +"aHT" = ( +/obj/structure/bed/chair/wood/normal, +/obj/item/bedsheet/brown, +/obj/item/toy/plush/farwa, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/cells) "aHU" = ( /obj/structure/platform{ dir = 1 @@ -10204,12 +10320,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering) -"aIV" = ( -/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/engineering/upper_engineering) "aIX" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -10387,11 +10497,8 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "redcorner" - }, -/area/almayer/shipboard/brig/main_office) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/perma) "aJG" = ( /obj/structure/bed/chair/office/dark{ dir = 8; @@ -10472,11 +10579,6 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"aKk" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "aKn" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -10768,6 +10870,16 @@ icon_state = "dark_sterile" }, /area/almayer/living/numbertwobunks) +"aLt" = ( +/obj/structure/surface/rack, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/numbertwobunks) "aLB" = ( /turf/closed/wall/almayer, /area/almayer/hallways/starboard_hallway) @@ -11109,6 +11221,14 @@ icon_state = "red" }, /area/almayer/squads/alpha) +"aNe" = ( +/obj/structure/closet/firecloset, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/command/lifeboat) "aNi" = ( /turf/closed/wall/almayer, /area/almayer/living/chapel) @@ -11264,18 +11384,6 @@ /obj/effect/landmark/start/nurse, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/offices) -"aOj" = ( -/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) "aOq" = ( /obj/structure/surface/table/almayer, /obj/item/tool/extinguisher, @@ -11480,15 +11588,11 @@ }, /area/almayer/engineering/upper_engineering) "aOY" = ( -/obj/structure/bed/chair, -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, +/obj/structure/closet/secure_closet/medical2, /turf/open/floor/almayer{ - dir = 1; - icon_state = "red" + icon_state = "sterile_green_side" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/surgery) "aPa" = ( /obj/structure/machinery/light{ dir = 8 @@ -12288,13 +12392,15 @@ /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) "aSS" = ( -/obj/structure/sink{ - pixel_y = 24 +/obj/structure/machinery/light{ + dir = 4 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/machinery/power/apc/almayer, +/obj/structure/sign/safety/rewire{ + pixel_y = -38 }, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) "aSY" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -12327,8 +12433,15 @@ }, /area/almayer/lifeboat_pumps/north1) "aTg" = ( -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/brig/perma) "aTj" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -12352,11 +12465,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/cichallway) -"aTl" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/command/cichallway) "aTm" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/north1) @@ -12530,6 +12638,12 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) +"aTV" = ( +/obj/structure/toilet{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) "aTW" = ( /obj/structure/bed/chair{ dir = 8 @@ -13053,6 +13167,23 @@ icon_state = "test_floor4" }, /area/almayer/lifeboat_pumps/south1) +"aWA" = ( +/obj/structure/toilet{ + pixel_y = 13 + }, +/obj/item/paper_bin/uscm{ + pixel_x = 9; + pixel_y = -3 + }, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/obj/item/prop/magazine/dirty{ + pixel_x = -6; + pixel_y = -10 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/captain_mess) "aWD" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -14653,6 +14784,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) +"bfe" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/port) "bfl" = ( /turf/open/floor/almayer{ dir = 5; @@ -15172,10 +15313,6 @@ icon_state = "bluefull" }, /area/almayer/living/bridgebunks) -"bhM" = ( -/obj/structure/safe/cl_office, -/turf/open/floor/wood/ship, -/area/almayer/command/corporateliason) "bhT" = ( /obj/structure/cargo_container/lockmart/mid{ layer = 3.1; @@ -15270,22 +15407,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_medbay) -"biJ" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/command/lifeboat) "biL" = ( /obj/structure/platform{ dir = 4 @@ -15310,12 +15431,16 @@ /turf/open/floor/plating, /area/almayer/living/starboard_garden) "bja" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/secure_data{ - dir = 1 +/obj/structure/bed, +/obj/structure/machinery/flasher{ + id = "Cell 3"; + pixel_x = -24 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/main_office) +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/shipboard/brig/cells) "bjb" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, @@ -15449,13 +15574,6 @@ icon_state = "plate" }, /area/almayer/hallways/starboard_umbilical) -"bjQ" = ( -/obj/structure/machinery/shower{ - dir = 8 - }, -/obj/structure/window/reinforced, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) "bjR" = ( /obj/structure/cargo_container/arious/right, /turf/open/floor/almayer, @@ -16276,16 +16394,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_p) -"boc" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 2 - }, -/turf/open/floor/almayer, -/area/almayer/hull/upper_hull/u_f_p) "bof" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -16307,18 +16415,11 @@ }, /area/almayer/medical/operating_room_four) "bop" = ( -/obj/structure/machinery/cm_vending/clothing/military_police{ - density = 0; - pixel_y = 16 - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, +/obj/structure/machinery/cryopod/right, /turf/open/floor/almayer{ icon_state = "cargo" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/cryo) "boq" = ( /obj/structure/bed/chair/comfy/alpha, /turf/open/floor/almayer{ @@ -16541,15 +16642,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"bpw" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/south1) "bpz" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -16699,11 +16791,15 @@ /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) "bqp" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, /turf/open/floor/almayer{ - dir = 4; - icon_state = "redcorner" + dir = 5; + icon_state = "red" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/main_office) "bqw" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/wood/ship, @@ -17366,10 +17462,13 @@ }, /area/almayer/living/briefing) "bua" = ( +/obj/structure/toilet{ + dir = 8 + }, /turf/open/floor/almayer{ - icon_state = "redcorner" + icon_state = "plate" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/perma) "buc" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -17554,12 +17653,12 @@ }, /area/almayer/engineering/engine_core) "buX" = ( -/obj/effect/landmark/crap_item, +/obj/effect/decal/cleanable/blood, /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) "bvb" = ( /obj/structure/machinery/light{ dir = 8 @@ -17614,11 +17713,14 @@ }, /area/almayer/living/briefing) "bvx" = ( -/turf/open/floor/almayer{ - dir = 10; - icon_state = "red" +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/poddoor/almayer/locked{ + dir = 2; + id = "Perma 1"; + name = "\improper cell shutter" }, -/area/almayer/shipboard/brig/main_office) +/turf/open/floor/plating, +/area/almayer/shipboard/brig/perma) "bvz" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/closet/secure_closet/surgical{ @@ -17986,16 +18088,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/starboard_hallway) -"bxA" = ( -/obj/structure/machinery/power/apc/almayer/hardened, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/south2) "bxB" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -18597,17 +18689,9 @@ }, /area/almayer/shipboard/weapon_room) "bAM" = ( -/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) +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/perma) "bAN" = ( /obj/structure/machinery/light{ dir = 1 @@ -19101,6 +19185,18 @@ icon_state = "cargo" }, /area/almayer/living/cryo_cells) +"bCO" = ( +/obj/item/tool/kitchen/tray{ + layer = 2.9 + }, +/obj/item/reagent_container/food/snacks/carpmeat{ + layer = 3.3 + }, +/obj/item/reagent_container/food/snacks/carpmeat{ + layer = 3.3 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "bCP" = ( /obj/structure/bed/chair{ dir = 1 @@ -19473,11 +19569,13 @@ }, /area/almayer/squads/req) "bEv" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" +/obj/effect/landmark/start/police, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 }, -/area/almayer/shipboard/brig/general_equipment) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cryo) "bEw" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -19957,16 +20055,6 @@ icon_state = "green" }, /area/almayer/squads/req) -"bGz" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "green" - }, -/area/almayer/squads/req) "bGF" = ( /obj/structure/machinery/landinglight/ds2{ dir = 1 @@ -20438,6 +20526,31 @@ }, /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/navigation) +"bIz" = ( +/mob/living/simple_animal/cat/Jones{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) +"bIA" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/structure/mirror{ + pixel_x = 29 + }, +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/auxiliary_officer_office) "bII" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = 8; @@ -21682,9 +21795,14 @@ }, /area/almayer/squads/delta) "bND" = ( -/obj/structure/bed/chair, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/perma) +/obj/structure/machinery/keycard_auth{ + pixel_x = 25 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/shipboard/brig/chief_mp_office) "bNE" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 26 @@ -22323,23 +22441,6 @@ icon_state = "tcomms" }, /area/almayer/engineering/engine_core) -"bQl" = ( -/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) "bQm" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/almayer{ @@ -22442,12 +22543,6 @@ }, /turf/closed/wall/almayer, /area/almayer/squads/req) -"bQS" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_ammo/cargo/blend, -/turf/open/floor/almayer{ - icon_state = "green" - }, -/area/almayer/squads/req) "bQU" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -22535,12 +22630,26 @@ /obj/structure/machinery/light{ dir = 4 }, -/obj/structure/bed/chair, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, +/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, +/obj/effect/landmark/start/working_joe, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/airoom) "bRr" = ( /obj/structure/machinery/fuelcell_recycler, /turf/open/floor/almayer{ @@ -22624,7 +22733,7 @@ /area/almayer/hull/lower_hull/l_f_p) "bRH" = ( /turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/evidence_storage) "bRK" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -22990,7 +23099,7 @@ dir = 6 }, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/perma) "bTx" = ( /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) @@ -23207,19 +23316,6 @@ icon_state = "blue" }, /area/almayer/squads/charlie_delta_shared) -"bUo" = ( -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/sign/safety/hazard{ - pixel_y = -32 - }, -/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/squads/req) "bUp" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -23465,12 +23561,6 @@ icon_state = "blue" }, /area/almayer/squads/delta) -"bVs" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "bVw" = ( /turf/open/floor/almayer{ dir = 4; @@ -23503,18 +23593,16 @@ }, /area/almayer/command/corporateliason) "bVC" = ( +/obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 8; - id = "cmp_armory"; + 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" +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 8 }, +/turf/open/floor/plating, /area/almayer/shipboard/brig/armory) "bVE" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ @@ -24036,17 +24124,14 @@ /obj/structure/machinery/light, /turf/open/floor/almayer, /area/almayer/hallways/vehiclehangar) -"bYa" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/cargo/blend, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "green" - }, -/area/almayer/squads/req) "bYc" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/aft_hallway) +"bYd" = ( +/obj/structure/bookcase/manuals/engineering, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "bYe" = ( /turf/open/floor/almayer{ icon_state = "mono" @@ -24400,13 +24485,13 @@ /turf/open/floor/almayer, /area/almayer/hallways/vehiclehangar) "bZN" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "Bathroom" +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/main_office) "bZO" = ( /obj/structure/machinery/light{ dir = 8 @@ -25273,15 +25358,6 @@ }, /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, @@ -25359,13 +25435,6 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/hallways/hangar) -"cdB" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "cdE" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/drinks/cans/waterbottle{ @@ -26016,6 +26085,12 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/alpha) +"cij" = ( +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/engineering/upper_engineering) "cil" = ( /obj/structure/machinery/light, /obj/structure/sign/safety/waterhazard{ @@ -26111,15 +26186,19 @@ }, /area/almayer/lifeboat_pumps/north2) "ciF" = ( -/obj/structure/sign/safety/cryo{ - pixel_x = 8; - pixel_y = -26 +/obj/structure/sign/safety/medical{ + pixel_x = -17; + pixel_y = 6 + }, +/obj/structure/sign/safety/restrictedarea{ + pixel_x = -17; + pixel_y = -9 }, /turf/open/floor/almayer{ - dir = 6; + dir = 8; icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/lobby) "ciN" = ( /turf/open/floor/almayer{ dir = 6; @@ -26402,6 +26481,15 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_a_s) +"ckE" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/north1) "ckI" = ( /obj/structure/disposalpipe/segment, /obj/item/device/radio/intercom{ @@ -26881,16 +26969,6 @@ icon_state = "plating" }, /area/almayer/shipboard/port_point_defense) -"cmo" = ( -/obj/structure/surface/table/almayer, -/obj/effect/spawner/random/powercell, -/obj/effect/spawner/random/tool, -/obj/item/packageWrap, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "green" - }, -/area/almayer/squads/req) "cmp" = ( /turf/closed/wall/almayer, /area/almayer/engineering/engineering_workshop/hangar) @@ -27219,18 +27297,13 @@ icon_state = "blue" }, /area/almayer/squads/delta) -"com" = ( -/obj/structure/largecrate/supply/weapons/pistols, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_m_s) "cop" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/living/tankerbunks) "cos" = ( /obj/structure/machinery/light/small, /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 + icon_state = "N" }, /turf/open/floor/almayer{ icon_state = "plate" @@ -27244,14 +27317,6 @@ icon_state = "plate" }, /area/almayer/squads/alpha_bravo_shared) -"coD" = ( -/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) "coG" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/almayer{ @@ -27366,17 +27431,16 @@ }, /area/almayer/command/airoom) "cqn" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/recharger, +/obj/item/tool/hand_labeler{ + pixel_x = -8; + pixel_y = 3 }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 2; - id = "bot_armory"; - name = "\improper Armory Shutters" +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/armory) +/area/almayer/shipboard/brig/general_equipment) "cqz" = ( /obj/structure/surface/table/almayer, /obj/item/facepaint/black, @@ -27437,21 +27501,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"crw" = ( -/obj/structure/bed/bedroll{ - name = "cat bed"; - desc = "A bed of cotton fabric, purposely made for a cat to comfortably sleep on."; - pixel_y = 0 - }, -/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) "crD" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -27531,10 +27580,18 @@ }, /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{ - icon_state = "redcorner" + dir = 1; + icon_state = "red" }, -/area/almayer/shipboard/brig/lobby) +/area/almayer/shipboard/brig/main_office) "cts" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -27578,16 +27635,14 @@ }, /area/almayer/hallways/stern_hallway) "cuk" = ( -/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" +/obj/structure/machinery/light{ + dir = 8 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 8; + icon_state = "red" }, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/lobby) "cus" = ( /obj/docking_port/stationary/lifeboat_dock/starboard, /turf/open/floor/almayer_hull{ @@ -27728,11 +27783,15 @@ }, /area/almayer/hull/upper_hull/u_a_p) "cxA" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/cameras/almayer_network{ + dir = 4 + }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 8; + icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/chief_mp_office) "cyo" = ( /obj/structure/machinery/vending/cigarette, /turf/open/floor/almayer{ @@ -27773,11 +27832,19 @@ /turf/closed/wall/almayer/outer, /area/almayer/hull/upper_hull/u_m_p) "czB" = ( -/obj/effect/decal/cleanable/blood, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, /turf/open/floor/almayer{ - icon_state = "redcorner" + icon_state = "red" }, -/area/almayer/shipboard/brig/execution) +/area/almayer/shipboard/brig/chief_mp_office) +"czG" = ( +/obj/structure/machinery/recharge_station, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/command/airoom) "czJ" = ( /obj/structure/sign/safety/restrictedarea{ pixel_x = 8; @@ -27943,6 +28010,12 @@ }, /turf/open/floor/almayer, /area/almayer/living/chapel) +"cCd" = ( +/obj/structure/bookcase{ + icon_state = "book-5" + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "cCD" = ( /obj/structure/platform{ dir = 8; @@ -28142,10 +28215,13 @@ }, /area/almayer/hull/upper_hull/u_a_p) "cFO" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/machinery/power/apc/almayer{ + cell_type = /obj/item/cell/hyper; + dir = 1 + }, /turf/open/floor/almayer{ dir = 1; - icon_state = "redcorner" + icon_state = "red" }, /area/almayer/shipboard/brig/main_office) "cFP" = ( @@ -28161,6 +28237,11 @@ /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" = ( @@ -28272,13 +28353,11 @@ }, /area/almayer/hull/lower_hull/l_a_p) "cIK" = ( -/obj/structure/janitorialcart, -/obj/item/tool/mop, -/obj/structure/machinery/light/small, -/turf/open/floor/almayer{ - icon_state = "redcorner" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 }, -/area/almayer/shipboard/brig/execution) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/general_equipment) "cIU" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -28378,6 +28457,13 @@ 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; @@ -28529,15 +28615,6 @@ icon_state = "test_floor4" }, /area/almayer/medical/containment/cell/cl) -"cNK" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/obj/structure/machinery/light/small, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "cNX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -28548,9 +28625,13 @@ /turf/open/floor/almayer, /area/almayer/living/grunt_rnr) "cNY" = ( -/obj/structure/machinery/computer/crew, +/obj/structure/machinery/firealarm{ + pixel_y = -28 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/almayer{ - dir = 9; icon_state = "red" }, /area/almayer/shipboard/brig/main_office) @@ -28663,6 +28744,16 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_s) +"cRg" = ( +/obj/item/tool/weldpack{ + pixel_y = 15 + }, +/obj/structure/surface/table/almayer, +/obj/item/clothing/head/welding, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "cRi" = ( /turf/open/floor/almayer{ icon_state = "mono" @@ -28785,12 +28876,6 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_f_p) -"cVb" = ( -/obj/structure/machinery/sentry_holder/almayer, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/north2) "cVs" = ( /obj/structure/platform_decoration{ dir = 8 @@ -28810,6 +28895,9 @@ /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" }, @@ -28864,17 +28952,16 @@ }, /area/almayer/living/offices) "cWs" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/bed, +/obj/structure/machinery/flasher{ + id = "Cell 6"; + pixel_x = -24 }, /turf/open/floor/almayer{ dir = 8; - icon_state = "redcorner" + icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/cells) "cWt" = ( /turf/open/floor/almayer{ dir = 4; @@ -28900,16 +28987,6 @@ /obj/structure/largecrate/random/barrel/red, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_s) -"cWE" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/port) "cWI" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -28921,24 +28998,14 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_s) "cWN" = ( -/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/window/reinforced/ultra{ + pixel_y = -12 }, +/obj/structure/bed/chair/bolted, /turf/open/floor/almayer{ - dir = 9; - icon_state = "red" + icon_state = "plating_striped" }, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/execution) "cXi" = ( /obj/structure/machinery/light{ unacidable = 1; @@ -29051,7 +29118,7 @@ /area/almayer/hallways/aft_hallway) "cZs" = ( /turf/closed/wall/almayer/outer, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/perma) "cZJ" = ( /obj/structure/machinery/door/airlock/almayer/maint{ name = "\improper Core Hatch" @@ -29116,11 +29183,25 @@ }, /area/almayer/hallways/starboard_hallway) "daj" = ( -/obj/structure/machinery/iv_drip, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" +/obj/structure/filingcabinet{ + density = 0; + pixel_x = -8; + pixel_y = 18 }, -/area/almayer/shipboard/brig/surgery) +/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 + }, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/evidence_storage) "daz" = ( /turf/closed/wall/almayer/white/hull, /area/almayer/command/airoom) @@ -29200,12 +29281,19 @@ /turf/open/floor/almayer, /area/almayer/living/briefing) "dci" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +/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 + }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "redcorner" + icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/perma) "dck" = ( /obj/structure/bed/stool, /turf/open/floor/almayer{ @@ -29218,13 +29306,17 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) "dcP" = ( -/obj/structure/machinery/body_scanconsole{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, +/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/surgery) +/area/almayer/shipboard/brig/processing) "dcS" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -29270,16 +29362,19 @@ icon_state = "plating" }, /area/almayer/engineering/engine_core) -"deb" = ( -/obj/structure/bed, -/obj/structure/machinery/flasher{ - id = "Perma 2"; - pixel_y = -24 - }, +"ddN" = ( +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "redfull" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/squads/req) +"deb" = ( +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/chief_mp_office) "deg" = ( /obj/structure/platform_decoration{ dir = 1 @@ -29356,11 +29451,17 @@ }, /area/almayer/shipboard/brig/cells) "dfp" = ( -/obj/structure/machinery/keycard_auth{ - pixel_y = 25 +/obj/structure/window/reinforced/ultra{ + pixel_y = -12 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/bed/chair/bolted, +/turf/open/floor/almayer{ + icon_state = "plating_striped" + }, +/area/almayer/shipboard/brig/execution) "dfC" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -29375,6 +29476,17 @@ icon_state = "dark_sterile" }, /area/almayer/shipboard/brig/surgery) +"dfP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/guncabinet, +/obj/item/weapon/gun/rifle/l42a, +/obj/item/weapon/gun/rifle/l42a{ + pixel_y = 6 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "dgg" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -29399,11 +29511,14 @@ }, /area/almayer/living/gym) "dgx" = ( +/obj/structure/bed/chair/wood/normal{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood, /turf/open/floor/almayer{ - dir = 8; - icon_state = "red" + icon_state = "cargo" }, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/execution) "dgN" = ( /obj/structure/surface/rack, /obj/item/tool/shovel/etool{ @@ -29415,11 +29530,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) -"dha" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "dhQ" = ( /obj/structure/sign/safety/terminal{ pixel_x = -17 @@ -29513,16 +29623,26 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/alpha_bravo_shared) -"djm" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +"diM" = ( +/obj/structure/bed/chair{ + dir = 8 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/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 }, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/execution) +/area/almayer/shipboard/brig/chief_mp_office) "djp" = ( /obj/structure/closet/crate, /obj/item/stack/sheet/mineral/plastic{ @@ -29567,6 +29687,14 @@ icon_state = "orange" }, /area/almayer/engineering/engineering_workshop/hangar) +"djN" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/engineering/upper_engineering/port) "djQ" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -29621,6 +29749,20 @@ 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{ @@ -29646,6 +29788,17 @@ allow_construction = 0 }, /area/almayer/stair_clone/upper) +"dkS" = ( +/obj/structure/machinery/shower, +/obj/structure/window/reinforced/tinted{ + dir = 8 + }, +/obj/structure/machinery/door/window/tinted{ + dir = 2 + }, +/obj/item/clothing/mask/cigarette/weed, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering/upper_engineering/port) "dll" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer{ @@ -29660,13 +29813,24 @@ /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) "dls" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_x = -30 +/obj/structure/sign/safety/medical{ + pixel_x = 16; + pixel_y = 27 }, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + dir = 1; + icon_state = "red" }, -/area/almayer/shipboard/brig/surgery) +/area/almayer/shipboard/brig/processing) +"dlN" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/lifeboat_pumps/north1) "dmg" = ( /obj/structure/machinery/vending/coffee, /obj/structure/sign/safety/coffee{ @@ -29762,6 +29926,22 @@ icon_state = "mono" }, /area/almayer/engineering/upper_engineering/starboard) +"dnJ" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/command/lifeboat) "dnS" = ( /obj/structure/safe, /turf/open/floor/almayer{ @@ -29825,10 +30005,28 @@ icon_state = "cargo" }, /area/almayer/squads/req) -"doU" = ( -/obj/structure/surface/rack, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering/upper_engineering/port) +"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{ @@ -29960,27 +30158,15 @@ }, /area/almayer/hallways/aft_hallway) "dqV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/vending/coffee, -/obj/structure/machinery/light{ - dir = 1 - }, -/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 +/obj/structure/machinery/door/window/brigdoor/southright{ + id = "Cell 2"; + name = "Cell 2" }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" +/obj/structure/sign/safety/two{ + pixel_x = -17 }, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) "drj" = ( /obj/structure/window/reinforced{ dir = 4; @@ -30050,14 +30236,24 @@ }, /area/almayer/hull/upper_hull/u_a_p) "dsw" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 2 +/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 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/general_equipment) +"dtv" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/turf/open/floor/almayer, +/area/almayer/command/lifeboat) "dtH" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -30071,11 +30267,18 @@ }, /area/almayer/hallways/aft_hallway) "dtN" = ( -/obj/structure/closet/emcloset, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_x = -30 + }, +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 2 + }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "redcorner" }, -/area/almayer/hull/upper_hull/u_f_p) +/area/almayer/shipboard/brig/processing) "dtZ" = ( /obj/structure/platform_decoration{ dir = 4 @@ -30141,15 +30344,6 @@ icon_state = "mono" }, /area/almayer/living/starboard_garden) -"duz" = ( -/obj/structure/mirror{ - pixel_y = 32 - }, -/obj/structure/sink{ - pixel_y = 24 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering/upper_engineering/port) "duF" = ( /obj/structure/closet/secure_closet/personal, /turf/open/floor/almayer{ @@ -30213,9 +30407,6 @@ }, /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, @@ -30247,13 +30438,6 @@ 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; @@ -30310,17 +30494,14 @@ }, /area/almayer/engineering/engineering_workshop/hangar) "dxT" = ( -/obj/structure/machinery/light{ +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 }, -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" +/obj/structure/machinery/light{ + dir = 4 }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/lobby) "dyb" = ( /obj/structure/machinery/smartfridge/chemistry, @@ -30344,15 +30525,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"dyj" = ( -/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) "dyp" = ( /obj/structure/machinery/ares/cpu, /turf/open/floor/almayer/no_build{ @@ -30418,6 +30590,17 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_p) +"dAi" = ( +/obj/structure/sign/nosmoking_2{ + pixel_x = 32 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/lifeboat_pumps/north1) "dAq" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/disposalpipe/segment{ @@ -30640,6 +30823,9 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, +/obj/structure/machinery/light/small{ + dir = 1 + }, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -30685,12 +30871,6 @@ icon_state = "greencorner" }, /area/almayer/hallways/starboard_hallway) -"dEJ" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/lifeboat_pumps/north2) "dEQ" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/tabasco, @@ -30705,24 +30885,6 @@ /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) -"dFb" = ( -/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) "dFk" = ( /turf/open/floor/almayer{ dir = 8; @@ -30733,8 +30895,16 @@ /obj/structure/machinery/light{ dir = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cryo) +/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) "dFF" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_21" @@ -30815,26 +30985,6 @@ 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; @@ -30884,19 +31034,12 @@ /turf/open/floor/wood/ship, /area/almayer/living/basketball) "dHv" = ( -/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, -/obj/item/reagent_container/spray/cleaner, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "Bathroom"; + dir = 1 }, -/area/almayer/shipboard/brig/surgery) +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) "dHV" = ( /obj/structure/machinery/light{ dir = 1 @@ -30938,16 +31081,6 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"dID" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/command/lifeboat) "dII" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_bravo, /obj/effect/decal/warning_stripes{ @@ -30970,12 +31103,6 @@ icon_state = "cargo" }, /area/almayer/hull/lower_hull/l_m_s) -"dKa" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/hull/upper_hull/u_f_s) "dKm" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -31018,16 +31145,6 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) -"dLe" = ( -/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) "dLt" = ( /obj/structure/sign/safety/hazard{ pixel_x = -17; @@ -31052,20 +31169,6 @@ icon_state = "silver" }, /area/almayer/hallways/aft_hallway) -"dMf" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/photo_album{ - pixel_x = -4; - pixel_y = 5 - }, -/obj/item/folder/black{ - pixel_x = 7; - pixel_y = -3 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "dMB" = ( /turf/open/floor/almayer{ dir = 8; @@ -31146,9 +31249,12 @@ }, /area/almayer/living/captain_mess) "dOL" = ( -/obj/structure/bed/chair/comfy/black, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + layer = 2.5 + }, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/execution) "dPm" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -31174,6 +31280,10 @@ 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" }, @@ -31195,25 +31305,6 @@ icon_state = "silver" }, /area/almayer/command/airoom) -"dQp" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1; - name = "Bathroom" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/shipboard/brig/cells) "dQs" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -31257,12 +31348,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/hydroponics) -"dRs" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/engineering/upper_engineering/port) "dRv" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -31319,13 +31404,21 @@ /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_s) "dSc" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/general_equipment) +"dSn" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "dark_sterile" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/cells) "dSp" = ( /obj/structure/machinery/camera/autoname/almayer{ name = "ship-grade camera" @@ -31511,22 +31604,15 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) "dWk" = ( -/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/window/reinforced/ultra{ + pixel_y = -12 }, -/obj/structure/machinery/door_control{ - id = "Brig Lockdown Shutters"; - name = "Brig Lockdown Shutters"; - pixel_y = 24; - req_access_txt = "3" +/obj/structure/bed/chair/bolted, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" }, -/obj/structure/machinery/faxmachine/uscm/brig/chief, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/execution) "dWm" = ( /obj/structure/surface/table/almayer, /obj/item/storage/firstaid/o2, @@ -31573,13 +31659,6 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/laundry) -"dXo" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/taperecorder, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "dXr" = ( /obj/structure/bed/chair{ dir = 8; @@ -31591,9 +31670,13 @@ }, /area/almayer/medical/lower_medical_medbay) "dXy" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/processing) "dXG" = ( /obj/structure/pipes/vents/scrubber{ dir = 1 @@ -31687,21 +31770,13 @@ }, /area/almayer/engineering/upper_engineering) "eaf" = ( -/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/landmark/start/warrant, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/area/almayer/shipboard/brig/general_equipment) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cryo) "ean" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -31732,6 +31807,12 @@ icon_state = "plate" }, /area/almayer/shipboard/port_point_defense) +"eaX" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/engineering/upper_engineering/starboard) "ebd" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, @@ -31745,6 +31826,24 @@ icon_state = "plate" }, /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 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/shipboard/brig/cryo) +"ebz" = ( +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/shipboard/brig/surgery) "ebD" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -31792,16 +31891,15 @@ }, /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/item/device/flashlight/lamp/green{ - pixel_x = 6 +/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 }, /turf/open/floor/almayer{ dir = 6; @@ -31874,6 +31972,26 @@ icon_state = "sterile_green" }, /area/almayer/medical/medical_science) +"edx" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/sign/safety/maint{ + pixel_x = 8; + pixel_y = -32 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/command/lifeboat) +"edM" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/vehiclehangar) "eed" = ( /turf/open/floor/almayer{ icon_state = "mono" @@ -31938,50 +32056,22 @@ }, /area/almayer/living/grunt_rnr) "eeN" = ( -/obj/structure/bed/chair, +/obj/structure/bed/chair/bolted, /turf/open/floor/almayer{ - dir = 1; + dir = 9; icon_state = "red" }, /area/almayer/shipboard/brig/processing) "efh" = ( -/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/door_control{ - id = "Brig Lockdown Shutters"; - name = "Brig Lockdown Shutters"; - pixel_x = -8; - pixel_y = 2; - req_access_txt = "3" - }, -/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 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/machinery/vending/snack{ + density = 0; + pixel_y = 16 }, -/area/almayer/shipboard/brig/main_office) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cells) "efK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -32055,15 +32145,11 @@ }, /area/almayer/hull/upper_hull/u_a_s) "egR" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ - dir = 8; - icon_state = "red" + allow_construction = 0 }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/processing) "egS" = ( /obj/structure/closet, /obj/item/clothing/ears/earmuffs, @@ -32163,12 +32249,26 @@ dir = 1 }, /area/almayer/medical/containment/cell) +"eiH" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/toilet{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) "eiK" = ( /obj/structure/bed/chair{ dir = 4 }, /obj/structure/sign/safety/distribution_pipes{ - pixel_x = -17 + pixel_x = -19; + pixel_y = -6 + }, +/obj/structure/sign/safety/bulkhead_door{ + pixel_x = -19; + pixel_y = 6 }, /turf/open/floor/almayer{ dir = 8; @@ -32188,11 +32288,12 @@ }, /area/almayer/living/port_emb) "eiO" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "redcorner" +/obj/structure/bed/chair{ + can_buckle = 0; + dir = 4 }, -/area/almayer/shipboard/brig/main_office) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/perma) "eiP" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -32256,7 +32357,7 @@ dir = 4; icon_state = "red" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/chief_mp_office) "eko" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/plating/plating_catwalk, @@ -32300,11 +32401,15 @@ /obj/structure/machinery/light/small{ dir = 4 }, +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/open/floor/almayer{ - dir = 4; + dir = 5; icon_state = "red" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/processing) "elA" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -32323,15 +32428,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_one) -"elM" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "elR" = ( /turf/closed/wall/almayer/research/containment/wall/corner{ dir = 1 @@ -32407,13 +32503,17 @@ }, /area/almayer/hull/lower_hull/l_m_s) "eni" = ( -/obj/structure/surface/table/almayer, -/obj/item/prop/magazine/book/spacebeast, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/area/almayer/shipboard/brig/evidence_storage) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cells) "enx" = ( /obj/structure/pipes/vents/pump, /obj/structure/machinery/status_display{ @@ -32428,12 +32528,11 @@ /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 = "red" + icon_state = "redcorner" }, /area/almayer/shipboard/brig/main_office) "eoG" = ( @@ -32456,15 +32555,11 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) "eoP" = ( -/obj/structure/bed, -/obj/structure/machinery/flasher{ - id = "Perma 1"; - pixel_y = 24 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/bed/chair/comfy/orange{ + dir = 8 }, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/chief_mp_office) "eoT" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -32513,6 +32608,18 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_s) +"epK" = ( +/obj/structure/closet/secure_closet/guncabinet, +/obj/item/weapon/gun/smg/m39{ + pixel_y = 6 + }, +/obj/item/weapon/gun/smg/m39{ + pixel_y = -6 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "eqb" = ( /obj/structure/surface/table/almayer, /obj/item/tool/stamp/denied{ @@ -32623,18 +32730,28 @@ }, /area/almayer/squads/delta) "erx" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 2 +/obj/structure/toilet{ + pixel_y = 13 }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" }, +/area/almayer/shipboard/brig/main_office) +"erz" = ( +/obj/structure/closet/crate, +/obj/item/ammo_box/magazine/l42a, +/obj/item/ammo_box/magazine/l42a, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/shipboard/brig/cryo) +/area/almayer/hull/upper_hull/u_m_s) "erG" = ( /obj/structure/disposalpipe/junction{ dir = 2; @@ -32659,6 +32776,10 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_umbilical) +"erZ" = ( +/obj/structure/pipes/vents/scrubber, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "esi" = ( /obj/structure/sign/safety/stairs{ pixel_x = 15; @@ -32678,23 +32799,6 @@ icon_state = "plate" }, /area/almayer/hallways/starboard_hallway) -"esC" = ( -/obj/structure/toilet{ - pixel_y = 13 - }, -/obj/item/paper_bin/uscm{ - pixel_x = 9; - pixel_y = -3 - }, -/obj/structure/machinery/light/small{ - dir = 4 - }, -/obj/item/prop/magazine/dirty{ - pixel_x = -6; - pixel_y = -10 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/captain_mess) "esF" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -32728,14 +32832,6 @@ icon_state = "plating_striped" }, /area/almayer/command/lifeboat) -"etn" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/command/lifeboat) "ets" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -32822,6 +32918,12 @@ icon_state = "logo_c" }, /area/almayer/command/cic) +"euY" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/engineering/upper_engineering/port) "eva" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = 32 @@ -32914,16 +33016,12 @@ /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{ - dir = 1; - icon_state = "sterile_green_side" + icon_state = "dark_sterile" }, /area/almayer/shipboard/brig/surgery) "ext" = ( @@ -32957,13 +33055,20 @@ }, /area/almayer/hull/upper_hull/u_f_p) "eyg" = ( -/obj/structure/machinery/cryopod/right{ - pixel_y = 6 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, +/obj/structure/machinery/power/apc/almayer, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "red" }, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/chief_mp_office) +"eyv" = ( +/obj/structure/machinery/sentry_holder/almayer, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/south1) "eyG" = ( /obj/structure/platform, /turf/open/floor/almayer{ @@ -33021,17 +33126,13 @@ }, /area/almayer/hallways/hangar) "ezU" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "red" + dir = 4; + pixel_x = 21 }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/lobby) "ezX" = ( /obj/structure/bed/chair/wood/normal, @@ -33106,18 +33207,16 @@ icon_state = "orange" }, /area/almayer/hallways/starboard_hallway) +"eBo" = ( +/obj/structure/machinery/cm_vending/gear/commanding_officer, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "eBC" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_umbilical) -"eBE" = ( -/obj/structure/machinery/photocopier{ - anchored = 0 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "eBO" = ( /obj/structure/bed, /turf/open/floor/almayer{ @@ -33138,15 +33237,14 @@ }, /area/almayer/squads/charlie_delta_shared) "eBW" = ( -/obj/structure/machinery/firealarm{ - dir = 4; - pixel_x = 24 +/obj/structure/machinery/cryopod/right{ + layer = 3.1; + pixel_y = 13 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "red" + icon_state = "cargo" }, -/area/almayer/shipboard/brig/evidence_storage) +/area/almayer/shipboard/brig/cryo) "eBZ" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/firstaid/fire{ @@ -33286,17 +33384,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) -"eFG" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/surface/table/almayer, -/obj/item/tool/hand_labeler, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/chemistry) "eFH" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_s) @@ -33633,6 +33720,14 @@ "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, @@ -33661,24 +33756,14 @@ }, /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/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 +/obj/structure/bed/chair/bolted{ + dir = 1 }, /turf/open/floor/almayer{ - allow_construction = 0 + icon_state = "plate" }, -/area/almayer/shipboard/brig/lobby) +/area/almayer/shipboard/brig/perma) "eOr" = ( /obj/structure/bed/chair{ dir = 8 @@ -33702,18 +33787,24 @@ }, /area/almayer/powered) "eOR" = ( -/obj/structure/machinery/light{ - dir = 4 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/cameras/almayer_network{ + dir = 8 }, /turf/open/floor/almayer{ dir = 4; icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/perma) "eOW" = ( /obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/sentencing, -/turf/open/floor/almayer, +/obj/structure/machinery/computer/cameras/almayer_network{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "red" + }, /area/almayer/shipboard/brig/processing) "ePk" = ( /obj/structure/airlock_assembly, @@ -33736,11 +33827,16 @@ }, /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{ - dir = 1; - icon_state = "redcorner" + icon_state = "plate" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/execution) "ePY" = ( /obj/structure/pipes/vents/pump{ dir = 8; @@ -33774,6 +33870,19 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) +"eRt" = ( +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/sign/safety/hazard{ + pixel_y = 32 + }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/hull/lower_hull/l_f_s) "eRu" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -33823,6 +33932,16 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"eSJ" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/transmitter/rotary{ + name = "Captain's Office"; + phone_category = "Offices"; + phone_id = "Captain's Office"; + pixel_y = 6 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "eSU" = ( /obj/structure/prop/almayer/name_stencil{ icon_state = "almayer1" @@ -33841,19 +33960,45 @@ /obj/effect/landmark/crap_item, /turf/open/floor/almayer, /area/almayer/living/briefing) -"eTo" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +"eTh" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 }, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/structure/surface/rack, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/medical/upper_medical) +"eTo" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/obj/structure/sign/safety/bathunisex{ - pixel_x = 8; - pixel_y = 25 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 }, /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 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/general_equipment) "eTO" = ( /obj/structure/sign/safety/maint{ pixel_x = -17 @@ -33921,20 +34066,11 @@ /turf/open/floor/carpet, /area/almayer/command/corporateliason) "eUU" = ( -/obj/structure/closet/secure_closet/brig{ - name = "Spare Prison Uniforms" +/obj/structure/machinery/atm{ + pixel_y = 32 }, -/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{ - dir = 1; - icon_state = "red" + allow_construction = 0 }, /area/almayer/shipboard/brig/processing) "eVj" = ( @@ -34015,14 +34151,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"eXk" = ( -/obj/effect/landmark/late_join/working_joe, -/obj/effect/landmark/start/working_joe, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/airoom) "eXo" = ( /obj/structure/machinery/light/small, /turf/open/floor/plating/plating_catwalk, @@ -34034,17 +34162,15 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, /area/almayer/living/offices) -"eXS" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 +"eXU" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 2; - pixel_y = 2 +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_f_p) +/area/almayer/hull/upper_hull/u_m_s) "eYr" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -34084,6 +34210,10 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"eYC" = ( +/obj/structure/machinery/vending/cigarette, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "eYH" = ( /obj/structure/platform{ dir = 4 @@ -34136,9 +34266,9 @@ }, /area/almayer/hallways/port_hallway) "eZj" = ( -/obj/structure/closet/secure_closet/guncabinet, +/obj/structure/closet/firecloset/full, /turf/open/floor/almayer{ - dir = 1; + dir = 10; icon_state = "red" }, /area/almayer/shipboard/brig/main_office) @@ -34177,25 +34307,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) -"faE" = ( -/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) "faO" = ( /obj/item/stack/cable_coil, /turf/open/floor/plating/plating_catwalk, @@ -34243,9 +34354,6 @@ }, /area/almayer/living/grunt_rnr) "fbv" = ( -/obj/structure/machinery/light{ - dir = 8 - }, /obj/structure/sign/safety/security{ pixel_x = -17; pixel_y = 6 @@ -34281,26 +34389,6 @@ 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 @@ -34463,15 +34551,12 @@ }, /area/almayer/command/airoom) "ffV" = ( -/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 +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + allow_construction = 0 }, -/turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) "fgh" = ( /obj/structure/machinery/light/small{ @@ -34486,10 +34571,12 @@ }, /area/almayer/shipboard/starboard_point_defense) "fgl" = ( -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" }, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cells) "fgm" = ( /obj/structure/machinery/atm{ pixel_y = 32 @@ -34608,9 +34695,21 @@ /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) "fkn" = ( -/obj/structure/machinery/photocopier, +/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 + }, /turf/open/floor/almayer{ - icon_state = "red" + icon_state = "test_floor4" }, /area/almayer/shipboard/brig/main_office) "fkO" = ( @@ -34693,25 +34792,22 @@ }, /area/almayer/hull/lower_hull/l_f_s) "fnl" = ( -/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/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 }, /turf/open/floor/almayer{ dir = 4; - icon_state = "redcorner" - }, -/area/almayer/shipboard/brig/execution) -"fnv" = ( -/obj/structure/machinery/light{ - dir = 4 + icon_state = "red" }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) +/area/almayer/shipboard/brig/perma) "fnx" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/door/window/eastright{ @@ -34753,6 +34849,18 @@ icon_state = "test_floor4" }, /area/almayer/squads/req) +"fnQ" = ( +/obj/structure/toilet{ + dir = 1 + }, +/obj/structure/window/reinforced/tinted{ + dir = 8 + }, +/obj/structure/machinery/door/window/tinted{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering/upper_engineering/port) "fnZ" = ( /obj/structure/machinery/portable_atmospherics/canister/air, /obj/structure/machinery/light/small{ @@ -34873,6 +34981,12 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) +"fqg" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south2) "fqu" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/floor/almayer, @@ -34929,20 +35043,6 @@ icon_state = "red" }, /area/almayer/shipboard/starboard_missiles) -"frJ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/hazard{ - pixel_y = 32 - }, -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) "frM" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -34956,19 +35056,6 @@ icon_state = "tcomms" }, /area/almayer/command/airoom) -"frY" = ( -/obj/structure/closet/secure_closet/guncabinet, -/obj/item/weapon/gun/rifle/l42a{ - pixel_y = 6 - }, -/obj/item/weapon/gun/rifle/l42a, -/obj/item/weapon/gun/rifle/l42a{ - pixel_y = -6 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "fsd" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -34978,20 +35065,6 @@ 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; @@ -35003,30 +35076,11 @@ }, /area/almayer/living/gym) "fsz" = ( -/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 - }, +/obj/structure/machinery/computer/crew, /turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" + icon_state = "plate" }, -/area/almayer/shipboard/brig/armory) +/area/almayer/shipboard/brig/general_equipment) "fsH" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -35037,20 +35091,11 @@ }, /area/almayer/hallways/port_hallway) "fsT" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1; - pixel_y = -1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/shipboard/brig/armory) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/general_equipment) "fsU" = ( /obj/structure/machinery/floodlight/landing{ name = "bolted floodlight" @@ -35126,14 +35171,15 @@ }, /area/almayer/engineering/laundry) "fuX" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/poddoor/almayer/locked{ - dir = 8; - id = "Perma 2L"; - name = "\improper cell shutter" +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/sentencing{ + dir = 8 }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/shipboard/brig/processing) "fuY" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -35410,6 +35456,16 @@ 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 @@ -35445,11 +35501,20 @@ }, /area/almayer/medical/lower_medical_medbay) "fDn" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = -25 +/obj/structure/machinery/vending/security, +/obj/structure/machinery/vending/security, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/armory) +/area/almayer/shipboard/brig/general_equipment) +"fDC" = ( +/obj/structure/bed/chair/bolted{ + dir = 8 + }, +/turf/open/floor/almayer{ + allow_construction = 0 + }, +/area/almayer/shipboard/brig/processing) "fDG" = ( /obj/structure/machinery/vending/coffee, /obj/structure/machinery/light{ @@ -35556,6 +35621,27 @@ icon_state = "sterile_green_side" }, /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 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/brig/general_equipment) "fFD" = ( /obj/structure/window/reinforced{ dir = 4; @@ -35591,16 +35677,6 @@ icon_state = "plate" }, /area/almayer/medical/morgue) -"fGa" = ( -/obj/structure/surface/rack, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/living/numbertwobunks) "fGg" = ( /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/almayer, @@ -35632,11 +35708,20 @@ }, /area/almayer/medical/medical_science) "fGN" = ( -/obj/structure/closet/firecloset, +/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 + }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/hull/upper_hull/u_f_p) +/area/almayer/shipboard/brig/execution) "fGY" = ( /obj/structure/machinery/door_control{ id = "panicroomback"; @@ -35704,18 +35789,14 @@ }, /area/almayer/hull/upper_hull/u_f_s) "fHS" = ( -/obj/structure/sign/safety/rewire{ - pixel_y = -32 +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" }, -/obj/structure/machinery/door_control{ - id = "perma_lockdown"; - name = "\improper Perma Cells Lockdown"; - pixel_x = 6; - pixel_y = -24; - req_access_txt = "3" +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/processing) +/area/almayer/hull/upper_hull/u_f_s) "fIf" = ( /obj/structure/sign/safety/bulkhead_door{ pixel_x = 8; @@ -35904,13 +35985,13 @@ }, /area/almayer/living/grunt_rnr) "fLn" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "red" +/obj/effect/landmark/start/police, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/area/almayer/shipboard/brig/general_equipment) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cryo) "fLX" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -35976,6 +36057,13 @@ icon_state = "green" }, /area/almayer/hallways/aft_hallway) +"fNb" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/card{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "fNg" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/plating/plating_catwalk, @@ -35996,14 +36084,11 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) "fNA" = ( -/obj/structure/closet/fireaxecabinet{ - pixel_y = 32 - }, +/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ - dir = 1; - icon_state = "red" + icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/main_office) "fNC" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /obj/structure/disposalpipe/junction{ @@ -36011,21 +36096,19 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/aft_hallway) +"fOh" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4; + icon_state = "exposed01-supply" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/combat_correspondent) "fOk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 }, /turf/open/floor/almayer, /area/almayer/living/briefing) -"fOv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) "fOz" = ( /obj/structure/target{ name = "punching bag" @@ -36131,20 +36214,6 @@ /obj/effect/step_trigger/clone_cleaner, /turf/closed/wall/almayer, /area/almayer/hull/upper_hull/u_m_p) -"fQY" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/largecrate/supply/weapons/m39{ - pixel_x = 2 - }, -/obj/structure/largecrate/supply/weapons/m41a{ - layer = 3.1; - pixel_x = 6; - pixel_y = 17 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "fRr" = ( /obj/structure/machinery/light{ dir = 1 @@ -36248,6 +36317,21 @@ 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) @@ -36271,18 +36355,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/chemistry) -"fWi" = ( -/obj/structure/toilet{ - dir = 1 - }, -/obj/structure/window/reinforced/tinted{ - dir = 8 - }, -/obj/structure/machinery/door/window/tinted{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering/upper_engineering/port) "fWT" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ dir = 2; @@ -36311,6 +36383,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/morgue) +"fXt" = ( +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "green" + }, +/area/almayer/squads/req) "fXx" = ( /obj/structure/surface/rack, /turf/open/floor/almayer{ @@ -36331,33 +36413,17 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/hallways/aft_hallway) -"fXE" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/emails{ - pixel_x = 2; - pixel_y = 5 - }, -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +"fXM" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/area/almayer/command/combat_correspondent) +/turf/open/floor/almayer, +/area/almayer/command/lifeboat) "fXN" = ( /obj/effect/landmark/start/marine/delta, /obj/effect/landmark/late_join/delta, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/delta) -"fXP" = ( -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "silver" - }, -/area/almayer/command/cichallway) "fYb" = ( /turf/open/floor/almayer{ dir = 8; @@ -36383,18 +36449,6 @@ /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; @@ -36402,15 +36456,8 @@ }, /area/almayer/engineering/engine_core) "fYX" = ( -/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) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/execution) "fYZ" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -36551,14 +36598,15 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/command/corporateliason) "gbX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ + name = "Brig" }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, -/turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) "gcc" = ( /obj/structure/disposalpipe/segment{ @@ -36627,11 +36675,11 @@ /obj/structure/machinery/light{ dir = 1 }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" +/obj/structure/machinery/status_display{ + pixel_y = 30 }, -/area/almayer/shipboard/brig/general_equipment) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/main_office) "gdp" = ( /obj/structure/bed/chair{ dir = 4 @@ -36708,20 +36756,44 @@ icon_state = "orangecorner" }, /area/almayer/hallways/stern_hallway) -"geX" = ( -/obj/structure/pipes/vents/scrubber, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; +"geW" = ( +/obj/structure/sign/prop1{ pixel_y = 32 }, -/obj/structure/sign/safety/hazard{ - pixel_y = 32 +/obj/item/storage/fancy/cigar, +/obj/item/reagent_container/food/drinks/bottle/sake{ + layer = 3.6; + pixel_x = 9; + pixel_y = 16 + }, +/obj/item/reagent_container/food/drinks/bottle/sake{ + layer = 3.6; + pixel_y = 16 + }, +/obj/item/reagent_container/food/drinks/bottle/sake{ + layer = 3.6; + pixel_x = -9; + pixel_y = 16 + }, +/obj/structure/surface/table/woodentable/fancy, +/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/item/device/flash, +/obj/structure/machinery/light{ + dir = 8; + invisibility = 101 }, /turf/open/floor/almayer{ - dir = 1; + dir = 8; icon_state = "red" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/main_office) "gfk" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -36816,6 +36888,14 @@ /obj/effect/landmark/start/liaison, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_p) +"ghX" = ( +/obj/structure/machinery/shower{ + dir = 8 + }, +/obj/item/toy/inflatable_duck, +/obj/structure/window/reinforced, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) "gio" = ( /obj/structure/closet/emcloset, /obj/structure/sign/safety/restrictedarea{ @@ -36853,15 +36933,8 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 }, -/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) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/main_office) "gjm" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -36952,12 +37025,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_s) -"gka" = ( -/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/hull/lower_hull/l_f_s) "gks" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/plating, @@ -37026,6 +37093,10 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_p) +"glU" = ( +/obj/structure/bed/chair/office/dark, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "gmb" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -37117,16 +37188,13 @@ }, /area/almayer/living/port_emb) "goD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "redcorner" +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera"; + pixel_y = 6 }, -/area/almayer/shipboard/brig/processing) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) "goL" = ( /turf/open/floor/almayer{ dir = 10; @@ -37173,6 +37241,15 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_s) +"gqF" = ( +/obj/structure/machinery/photocopier, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "gqK" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -37190,18 +37267,21 @@ }, /area/almayer/lifeboat_pumps/north1) "gqW" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, -/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 @@ -37330,6 +37410,14 @@ }, /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{ @@ -37392,12 +37480,6 @@ icon_state = "green" }, /area/almayer/squads/req) -"gvW" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/hull/upper_hull/u_f_p) "gwm" = ( /obj/structure/largecrate/random/case/small, /obj/item/device/taperecorder{ @@ -37424,6 +37506,15 @@ icon_state = "bluecorner" }, /area/almayer/living/basketball) +"gwu" = ( +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/command/lifeboat) "gww" = ( /obj/structure/bed/chair, /obj/structure/machinery/light{ @@ -37623,13 +37714,6 @@ icon_state = "orange" }, /area/almayer/engineering/ce_room) -"gyU" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/north2) "gzn" = ( /obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 8 @@ -37778,8 +37862,7 @@ dir = 1 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" + allow_construction = 0 }, /area/almayer/shipboard/brig/processing) "gBo" = ( @@ -37823,30 +37906,22 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"gCB" = ( -/obj/structure/machinery/power/apc/almayer/hardened{ - cell_type = /obj/item/cell/hyper; - dir = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/north2) "gCI" = ( /obj/structure/machinery/light{ - dir = 4 + unacidable = 1; + unslashable = 1 }, -/obj/structure/machinery/cryopod/right{ - pixel_y = 6 +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/firstaid/toxin{ + pixel_x = 8; + pixel_y = -2 }, +/obj/item/storage/firstaid/regular, +/obj/item/reagent_container/spray/cleaner, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "sterile_green_side" }, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/surgery) "gCP" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/device/flashlight/lamp, @@ -37855,14 +37930,16 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) -"gDP" = ( -/obj/structure/closet/crate, -/obj/item/ammo_box/magazine/l42a, -/obj/item/ammo_box/magazine/l42a, -/turf/open/floor/almayer{ - icon_state = "plate" +"gDq" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 }, -/area/almayer/hull/upper_hull/u_m_s) +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 2 + }, +/turf/open/floor/almayer, +/area/almayer/hull/upper_hull/u_f_p) "gDW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -37896,6 +37973,36 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/port) +"gEI" = ( +/obj/item/device/flashlight/lamp/green{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/structure/machinery/door_control{ + id = "cl_shutters"; + name = "Privacy Shutters"; + pixel_x = -5; + pixel_y = 8; + req_access_txt = "200" + }, +/obj/structure/machinery/door_control{ + id = "RoomDivider"; + name = "Room Divider"; + pixel_x = -5; + pixel_y = -4; + req_access_txt = "200" + }, +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/door_control{ + id = "cl_evac"; + name = "Evac Pod Door Control"; + normaldoorcontrol = 1; + pixel_x = -5; + pixel_y = 2; + req_access_txt = "200" + }, +/turf/open/floor/carpet, +/area/almayer/command/corporateliason) "gEK" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -37943,22 +38050,31 @@ icon_state = "plate" }, /area/almayer/squads/delta) -"gGp" = ( +"gGl" = ( /obj/structure/surface/table/almayer, -/obj/item/clothing/mask/cigarette/pipe{ - pixel_x = 8 +/obj/item/device/taperecorder, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/obj/structure/transmitter/rotary{ - name = "Reporter Telephone"; - phone_category = "Almayer"; - phone_id = "Reporter"; - pixel_x = -4; - pixel_y = 6 +/area/almayer/command/combat_correspondent) +"gGo" = ( +/obj/structure/surface/table/almayer, +/obj/effect/landmark/map_item{ + pixel_x = -8 + }, +/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 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/command/combat_correspondent) +/area/almayer/living/briefing) "gGr" = ( /obj/structure/machinery/vending/cigarette, /turf/open/floor/almayer{ @@ -38091,6 +38207,12 @@ icon_state = "orange" }, /area/almayer/engineering/lower_engineering) +"gJs" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_ammo/cargo/blend, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/squads/req) "gJP" = ( /obj/structure/machinery/light, /obj/structure/disposalpipe/segment{ @@ -38231,15 +38353,25 @@ }, /area/almayer/hallways/aft_hallway) "gMf" = ( -/obj/structure/machinery/firealarm{ - dir = 4; - pixel_x = 24 +/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 }, /turf/open/floor/almayer{ - dir = 4; - icon_state = "red" + icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/chief_mp_office) "gMx" = ( /obj/structure/closet/firecloset, /turf/open/floor/plating/plating_catwalk, @@ -38458,13 +38590,14 @@ }, /area/almayer/hallways/hangar) "gSi" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/cameras/almayer_network, -/obj/item/storage/box/tapes{ - pixel_x = -16 +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/safety/bulkhead_door{ + pixel_y = -34 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/processing) +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_f_p) "gSj" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -38493,11 +38626,6 @@ /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 @@ -38515,14 +38643,17 @@ /turf/open/floor/almayer{ icon_state = "red" }, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/main_office) "gTx" = ( -/obj/structure/machinery/vending/security, +/obj/structure/surface/table/almayer, +/obj/item/storage/toolbox/mechanical/green{ + pixel_y = 8 + }, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/almayer{ - dir = 1; - icon_state = "red" + icon_state = "plate" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/general_equipment) "gTH" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/skills{ @@ -38546,6 +38677,14 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"gUr" = ( +/obj/item/stack/folding_barricade/three, +/obj/item/stack/folding_barricade/three, +/obj/structure/surface/rack, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/hull/lower_hull/l_f_s) "gUv" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -38605,18 +38744,6 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/north2) -"gVd" = ( -/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) "gVq" = ( /obj/structure/machinery/light, /obj/effect/decal/warning_stripes{ @@ -38898,16 +39025,18 @@ icon_state = "silver" }, /area/almayer/living/auxiliary_officer_office) -"hbI" = ( -/obj/structure/sign/safety/ammunition{ - pixel_x = 32; - pixel_y = 7 +"hbG" = ( +/obj/structure/closet/secure_closet{ + name = "\improper Execution Firearms" }, -/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, +/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 = "redfull" + icon_state = "plate" }, -/area/almayer/medical/upper_medical) +/area/almayer/shipboard/brig/execution) "hbZ" = ( /obj/structure/surface/table/almayer, /obj/structure/sign/safety/terminal{ @@ -38993,16 +39122,6 @@ "hcZ" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/living/offices) -"hdb" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_f_s) "hdd" = ( /turf/open/floor/almayer{ dir = 9; @@ -39083,6 +39202,13 @@ icon_state = "plate" }, /area/almayer/engineering/engine_core) +"hey" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/obj/structure/machinery/sentry_holder/almayer, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/south1) "heK" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1; @@ -39093,17 +39219,20 @@ }, /area/almayer/living/port_emb) "heQ" = ( -/obj/structure/bed/chair, -/obj/structure/extinguisher_cabinet{ - pixel_y = 26 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/secure_data{ + dir = 8 }, -/obj/structure/sign/safety/cryo{ - pixel_x = 21; - pixel_y = 27 +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/obj/structure/extinguisher_cabinet{ + pixel_y = 28; + pixel_x = -14 }, /turf/open/floor/almayer{ dir = 4; - icon_state = "redcorner" + icon_state = "red" }, /area/almayer/shipboard/brig/processing) "heV" = ( @@ -39138,6 +39267,37 @@ 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" + }, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/command/lifeboat) "hfy" = ( /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, @@ -39196,20 +39356,17 @@ }, /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/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/execution) +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/shipboard/brig/chief_mp_office) "hgH" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -39283,14 +39440,6 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) -"hiy" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/lifeboat_pumps/north1) "hiB" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -39304,6 +39453,13 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) +"hiN" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer, +/area/almayer/command/lifeboat) "hiQ" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -39526,19 +39682,6 @@ icon_state = "sterile_green" }, /area/almayer/medical/hydroponics) -"hnI" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{ - access_modified = 1; - name = "\improper Flight Crew Quarters"; - req_one_access_txt = "19;22" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/pilotbunks) "hnV" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, @@ -39729,18 +39872,6 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/starboard) -"htG" = ( -/obj/item/tool/soap, -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/engineering/upper_engineering/port) "htI" = ( /obj/structure/platform_decoration{ dir = 1 @@ -39845,21 +39976,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 @@ -39954,19 +40085,11 @@ }, /area/almayer/living/offices) "hyz" = ( -/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 +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, +/turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) "hyE" = ( /obj/structure/machinery/door/poddoor/almayer/open{ @@ -39982,13 +40105,6 @@ "hyQ" = ( /turf/closed/wall/almayer, /area/almayer/living/synthcloset) -"hzb" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4; - icon_state = "exposed01-supply" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/combat_correspondent) "hzc" = ( /turf/closed/wall/almayer/outer, /area/almayer/engineering/upper_engineering/notunnel) @@ -40014,40 +40130,14 @@ }, /area/almayer/squads/delta) "hzx" = ( -/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 +/obj/structure/machinery/keycard_auth{ + pixel_y = 25 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 5; + icon_state = "red" }, /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{ @@ -40156,12 +40246,6 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) -"hBL" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/command/lifeboat) "hBU" = ( /obj/structure/largecrate/random/secure, /obj/effect/decal/warning_stripes{ @@ -40309,12 +40393,14 @@ /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{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/perma) "hGB" = ( /obj/structure/machinery/light, -/obj/structure/flora/pottedplant{ - pixel_y = 3; - pixel_x = -1 - }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "hGD" = ( @@ -40438,6 +40524,19 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_s) +"hJh" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/emails{ + pixel_x = 2; + pixel_y = 5 + }, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "hJk" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -40511,61 +40610,6 @@ icon_state = "cargo_arrow" }, /area/almayer/engineering/engineering_workshop/hangar) -"hLB" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/structure/closet/crate, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_m_s) "hLC" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer{ @@ -40634,21 +40678,20 @@ /turf/open/floor/plating, /area/almayer/squads/charlie) "hND" = ( -/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_control{ + id = "CMP Office Shutters"; + name = "CMP Office Shutters"; + req_one_access_txt = "24;31"; + pixel_y = -20 }, -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - dir = 1; - name = "\improper Brig" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/structure/sign/safety/bulkhead_door{ + pixel_y = -34 }, -/area/almayer/shipboard/brig/main_office) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/perma) "hNM" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/stack/sheet/metal{ @@ -40810,17 +40853,10 @@ /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) "hRy" = ( -/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) +/obj/structure/surface/table/almayer, +/obj/structure/machinery/faxmachine/uscm/brig/chief, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) "hRW" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -41120,6 +41156,12 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) +"hWX" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hull/upper_hull/u_f_p) "hXb" = ( /turf/open/floor/almayer{ dir = 1; @@ -41157,18 +41199,15 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) -"hXG" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, +"hXD" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 + icon_state = "SW-out"; + pixel_x = -1 }, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + icon_state = "mono" }, -/area/almayer/engineering/upper_engineering/port) +/area/almayer/lifeboat_pumps/south1) "hXS" = ( /obj/structure/sign/safety/water{ pixel_x = 8; @@ -41248,23 +41287,15 @@ }, /area/almayer/medical/lower_medical_medbay) "hZU" = ( -/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/sign/safety/three{ + pixel_x = -17 }, -/area/almayer/shipboard/brig/main_office) -"iaa" = ( -/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle_ap, -/turf/open/floor/almayer{ - icon_state = "redfull" +/obj/structure/machinery/door/window/brigdoor/southright{ + id = "Cell 3"; + name = "Cell 3" }, -/area/almayer/command/cic) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) "iag" = ( /obj/structure/surface/table/almayer, /obj/item/tool/hand_labeler, @@ -41315,6 +41346,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) +"iaE" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_m_s) "iaF" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -41357,23 +41394,6 @@ 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; @@ -41396,11 +41416,16 @@ /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{ - dir = 1; - icon_state = "red" + icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/main_office) "ieu" = ( /obj/structure/window/reinforced{ dir = 4; @@ -41502,6 +41527,15 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/north1) +"ift" = ( +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/structure/surface/rack, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/engineering/upper_engineering) "ifR" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -41604,6 +41638,19 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_m_p) +"iii" = ( +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = -32 + }, +/obj/structure/sign/safety/hazard{ + pixel_y = -32 + }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/squads/req) "iit" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -41724,25 +41771,22 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_s) "ikM" = ( -/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/hazard{ + pixel_y = 32 }, -/obj/structure/machinery/computer/card{ - pixel_x = -16 +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = 32 }, /obj/structure/machinery/light{ dir = 1 }, -/obj/structure/sign/safety/terminal{ - pixel_x = 8; - pixel_y = 32 - }, +/obj/structure/machinery/camera/autoname/almayer, +/obj/structure/machinery/vending/security/riot, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "plating_striped" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/armory) "ils" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, @@ -41808,13 +41852,14 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/living/offices/flight) -"imJ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 +"imW" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 }, -/turf/open/floor/almayer, -/area/almayer/hull/upper_hull/u_f_p) +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "ina" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/emails{ @@ -41856,9 +41901,12 @@ }, /area/almayer/hull/upper_hull/u_f_p) "inG" = ( -/obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) @@ -41873,11 +41921,16 @@ }, /area/almayer/medical/medical_science) "inN" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 +/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" }, -/turf/open/floor/almayer, /area/almayer/shipboard/brig/main_office) "ioj" = ( /obj/structure/largecrate/random/barrel/green, @@ -41972,9 +42025,15 @@ /turf/open/floor/almayer, /area/almayer/command/computerlab) "iqn" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/main_office) +/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) "iqo" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -41999,6 +42058,7 @@ /obj/structure/machinery/light/small{ dir = 4 }, +/obj/structure/closet/firecloset, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -42035,11 +42095,8 @@ /obj/structure/machinery/firealarm{ pixel_y = 28 }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/shipboard/brig/general_equipment) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/main_office) "irS" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/cable/heavyduty{ @@ -42081,29 +42138,11 @@ }, /area/almayer/command/airoom) "isH" = ( -/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" +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = 26 }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/general_equipment) -"isI" = ( -/obj/structure/sign/nosmoking_2{ - pixel_x = 32 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/lifeboat_pumps/north1) "isN" = ( /obj/structure/sink{ dir = 8; @@ -42115,6 +42154,17 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/morgue) +"isS" = ( +/obj/item/stack/sheet/cardboard{ + amount = 50 + }, +/obj/structure/surface/rack, +/obj/item/packageWrap, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "green" + }, +/area/almayer/squads/req) "isW" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -42204,6 +42254,16 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) +"iuw" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/port) "iuz" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/warhead, @@ -42221,6 +42281,16 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"iuT" = ( +/obj/structure/closet/emcloset, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hull/upper_hull/u_f_s) "ivf" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/device/camera, @@ -42313,15 +42383,6 @@ /obj/structure/bed/chair/comfy/beige, /turf/open/floor/carpet, /area/almayer/command/cichallway) -"iwZ" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/fancy/cigarettes/lucky_strikes, -/obj/item/packageWrap, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "green" - }, -/area/almayer/squads/req) "ixj" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/crew/alt, @@ -42382,21 +42443,27 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) "iyq" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 2; - id = "Warden Office Shutters"; - name = "\improper Privacy Shutters" - }, -/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" + 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/almayer/open{ + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter"; + dir = 4 }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/processing) "iyH" = ( /obj/structure/surface/table/reinforced/almayer_B{ climbable = 0; @@ -42657,14 +42724,6 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_a_p) -"iEz" = ( -/obj/structure/machinery/light, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21"; - pixel_y = 3 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "iFc" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -42916,9 +42975,10 @@ dir = 8 }, /turf/open/floor/almayer{ - icon_state = "redcorner" + dir = 6; + icon_state = "red" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/main_office) "iKZ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -43009,13 +43069,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"iNY" = ( -/obj/structure/machinery/status_display{ - pixel_x = 32; - pixel_y = 16 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "iNZ" = ( /obj/structure/machinery/light{ dir = 8 @@ -43028,30 +43081,24 @@ }, /area/almayer/hull/lower_hull/l_f_s) "iOh" = ( -/obj/structure/machinery/light/small, -/obj/structure/machinery/status_display{ - pixel_y = -32 +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/armory) +/obj/structure/window/framed/almayer, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/cryo) "iOD" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) -"iPu" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/item/bedsheet/hop{ - pixel_y = 0 - }, -/obj/structure/bed{ - pixel_y = 0 +"iOU" = ( +/obj/structure/sign/safety/bulkhead_door{ + pixel_x = -16 }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) +/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, @@ -43086,15 +43133,13 @@ }, /area/almayer/squads/alpha) "iQg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 }, -/turf/open/floor/almayer{ - allow_construction = 0 +/obj/structure/disposalpipe/junction{ + dir = 1 }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/lobby) "iQi" = ( /obj/structure/disposalpipe/junction, @@ -43251,25 +43296,6 @@ /obj/item/facepaint/black, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) -"iTd" = ( -/obj/structure/machinery/sentry_holder/almayer, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/south2) -"iTe" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/command/lifeboat) "iTf" = ( /obj/structure/closet/crate/trashcart, /obj/item/clothing/gloves/yellow, @@ -43366,6 +43392,14 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) +"iUC" = ( +/obj/structure/machinery/faxmachine, +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "iUW" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -43414,6 +43448,30 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) +"iVZ" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/folder/black, +/obj/item/storage/bible/booze, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door_control{ + id = "CO-Office"; + name = "Door Control"; + normaldoorcontrol = 1; + pixel_x = 18; + req_access_txt = "31" + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) +"iWb" = ( +/obj/structure/sign/safety/hazard{ + pixel_x = 32; + pixel_y = -8 + }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/medical/upper_medical) "iWc" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -43481,9 +43539,15 @@ /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" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "red" + icon_state = "test_floor4" }, /area/almayer/shipboard/brig/processing) "iXT" = ( @@ -43604,10 +43668,14 @@ }, /area/almayer/command/airoom) "iZG" = ( -/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) +/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) "iZH" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = -17 @@ -43672,28 +43740,12 @@ icon_state = "plating" }, /area/almayer/command/airoom) -"jaK" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/vehiclehangar) "jaP" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/cameras/almayer_network{ - dir = 1 - }, -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, -/turf/open/floor/almayer{ - icon_state = "red" +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = -25 }, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/chief_mp_office) "jaR" = ( /obj/structure/largecrate/random/mini/small_case/b{ pixel_x = 8; @@ -43798,6 +43850,19 @@ icon_state = "plating_striped" }, /area/almayer/engineering/upper_engineering/starboard) +"jcZ" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "red" + }, +/area/almayer/command/lifeboat) "jdk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -43895,11 +43960,17 @@ /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{ - dir = 1; - icon_state = "cargo_arrow" + icon_state = "cargo" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/cryo) "jeO" = ( /obj/structure/machinery/light{ dir = 4 @@ -43962,17 +44033,12 @@ }, /area/almayer/engineering/engine_core) "jfY" = ( -/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 = "W"; + layer = 2.5 }, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/execution) "jfZ" = ( /obj/structure/target{ name = "punching bag" @@ -44026,28 +44092,22 @@ icon_state = "test_floor4" }, /area/almayer/living/auxiliary_officer_office) -"jgr" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/camera{ - pixel_x = -8; - pixel_y = 12 - }, -/obj/item/paper_bin/uscm{ - pixel_x = 6; - pixel_y = 6 +"jgu" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 }, -/obj/item/tool/pen{ - pixel_x = 4; - pixel_y = -4 +/obj/structure/mirror{ + pixel_x = 29 }, -/obj/item/storage/box/donkpockets{ - pixel_x = -8; - pixel_y = -1 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "dark_sterile" }, -/area/almayer/command/combat_correspondent) +/area/almayer/living/captain_mess) "jgw" = ( /obj/structure/sign/safety/nonpress_0g{ pixel_x = 32 @@ -44130,21 +44190,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) -"jhB" = ( -/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) "jhD" = ( /obj/structure/machinery/firealarm{ pixel_y = -28 @@ -44225,11 +44270,14 @@ /turf/open/floor/almayer, /area/almayer/hallways/vehiclehangar) "jjM" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 +/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, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/armory) "jjS" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -44314,26 +44362,34 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"jkL" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/weldingtool, +/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 = 2; + dir = 4; id = "Warden Office Shutters"; name = "\improper Privacy Shutters" }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/main_office) -"jkV" = ( -/obj/structure/machinery/light{ - dir = 1 +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 8 }, -/obj/structure/bed/chair/bolted{ +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter"; dir = 4 }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/plating, +/area/almayer/shipboard/brig/chief_mp_office) "jlA" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -44464,18 +44520,11 @@ }, /area/almayer/hallways/aft_hallway) "jnA" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, /turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" + dir = 8; + icon_state = "red" }, -/area/almayer/shipboard/brig/armory) +/area/almayer/shipboard/brig/chief_mp_office) "jnD" = ( /turf/open/floor/almayer{ dir = 1; @@ -44483,9 +44532,15 @@ }, /area/almayer/shipboard/brig/cic_hallway) "jnT" = ( -/obj/structure/bed/chair, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, /turf/open/floor/almayer{ - allow_construction = 0 + dir = 1; + icon_state = "redcorner" }, /area/almayer/shipboard/brig/lobby) "jnX" = ( @@ -44498,9 +44553,24 @@ /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/plating, /area/almayer/command/cic) +"jog" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/photo_album{ + pixel_x = -4; + pixel_y = 5 + }, +/obj/item/folder/black{ + pixel_x = 7; + pixel_y = -3 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "jox" = ( -/obj/structure/machinery/brig_cell/cell_3{ - 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) @@ -44562,9 +44632,9 @@ }, /area/almayer/hull/lower_hull/l_f_s) "jpQ" = ( -/turf/open/floor/almayer{ - allow_construction = 0 - }, +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/lobby) "jqP" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -44613,6 +44683,16 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"jrV" = ( +/obj/structure/surface/table/almayer, +/obj/item/weapon/gun/rifle/l42a{ + pixel_y = 6 + }, +/obj/item/weapon/gun/rifle/l42a, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "jss" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -44649,6 +44729,18 @@ 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"; @@ -44662,6 +44754,12 @@ icon_state = "greencorner" }, /area/almayer/hallways/starboard_hallway) +"juf" = ( +/obj/structure/machinery/sentry_holder/almayer, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/north1) "jup" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -44677,6 +44775,14 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/living/port_emb) +"juN" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/paper_bin/uscm, +/obj/item/tool/pen{ + pixel_y = 7 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "juX" = ( /obj/structure/platform_decoration{ dir = 1 @@ -44698,13 +44804,15 @@ }, /area/almayer/medical/lower_medical_medbay) "jvc" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 +/obj/structure/reagent_dispensers/water_cooler/stacks{ + density = 0; + pixel_y = 17 }, /turf/open/floor/almayer{ - allow_construction = 0 + dir = 1; + icon_state = "red" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/main_office) "jvp" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -44743,11 +44851,15 @@ }, /area/almayer/hull/upper_hull/u_a_p) "jvJ" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/area/almayer/hull/upper_hull/u_f_s) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/camera/autoname/almayer, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cells) "jvX" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -44815,25 +44927,12 @@ /turf/open/floor/plating, /area/almayer/living/bridgebunks) "jxK" = ( -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/shipboard/brig/processing) -"jxP" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, +/obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/vehiclehangar) +/area/almayer/shipboard/brig/processing) "jyi" = ( /obj/structure/machinery/power/port_gen/pacman, /turf/open/floor/almayer{ @@ -44861,15 +44960,6 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/notunnel) -"jzE" = ( -/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) "jzZ" = ( /obj/structure/platform_decoration, /turf/open/floor/almayer{ @@ -44903,17 +44993,16 @@ }, /area/almayer/squads/req) "jAG" = ( -/obj/structure/surface/rack, -/obj/item/storage/box/gloves{ - pixel_x = 3; - pixel_y = 3 +/obj/effect/landmark/start/police, +/obj/structure/machinery/power/apc/almayer{ + dir = 1 }, -/obj/item/storage/box/masks, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 }, -/area/almayer/shipboard/brig/surgery) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cryo) "jAJ" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -44964,14 +45053,51 @@ icon_state = "test_floor4" }, /area/almayer/command/lifeboat) +"jBY" = ( +/obj/structure/surface/rack, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0; + pixel_x = -6; + pixel_y = 7 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0; + pixel_x = -6; + pixel_y = -3 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0; + pixel_x = 5; + pixel_y = 9 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0; + pixel_x = 5; + pixel_y = -3 + }, +/obj/structure/noticeboard{ + desc = "The note is haphazardly attached to the cork board by what looks like a bent firing pin. 'The order has come in to perform end of life service checks on all L42A service rifles, any that are defective are to be dis-assembled and packed into a crate and sent to to the cargo hold. L42A service rifles that are in working order after servicing, are to be locked in secure cabinets ready to be off-loaded at Chinook. Scheduled end of life service for the L42A - Complete'"; + pixel_y = 29 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "jCa" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk, +/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 + }, /turf/open/floor/almayer{ - dir = 9; - icon_state = "red" + dir = 5; + icon_state = "plating" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/armory) "jCK" = ( /obj/effect/decal/medical_decals{ icon_state = "triagedecalbottomleft"; @@ -45064,8 +45190,11 @@ }, /area/almayer/living/grunt_rnr) "jFR" = ( +/obj/structure/bed/chair/bolted{ + dir = 4 + }, /turf/open/floor/almayer{ - icon_state = "redcorner" + allow_construction = 0 }, /area/almayer/shipboard/brig/processing) "jFX" = ( @@ -45074,12 +45203,6 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_a_s) -"jFY" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/engineering/upper_engineering/port) "jGn" = ( /obj/structure/machinery/light{ dir = 1 @@ -45167,13 +45290,12 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/morgue) "jIV" = ( -/obj/structure/surface/rack, -/obj/item/book/manual/marine_law{ - pixel_x = -3; - pixel_y = 1 +/obj/structure/machinery/iv_drip, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_f_s) +/area/almayer/shipboard/brig/surgery) "jJe" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -45196,16 +45318,14 @@ }, /area/almayer/living/port_emb) "jJq" = ( -/obj/structure/surface/rack, -/obj/item/storage/firstaid/regular, -/obj/item/storage/firstaid/toxin{ - pixel_x = 8; - pixel_y = -2 +/obj/structure/machinery/light{ + dir = 4 }, /turf/open/floor/almayer{ - icon_state = "red" + dir = 4; + icon_state = "silver" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/cic_hallway) "jJs" = ( /turf/open/floor/almayer{ icon_state = "green" @@ -45372,16 +45492,6 @@ }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_s) -"jMx" = ( -/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) "jMG" = ( /obj/structure/largecrate/random/case/small, /obj/structure/largecrate/random/mini/wooden{ @@ -45465,13 +45575,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"jND" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "jOi" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -45520,11 +45623,9 @@ /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" @@ -45610,6 +45711,15 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"jRZ" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/engineering/upper_engineering) "jSo" = ( /obj/item/tool/warning_cone, /turf/open/floor/almayer{ @@ -45871,6 +45981,29 @@ icon_state = "plate" }, /area/almayer/living/offices) +"jWC" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/command/lifeboat) +"jWH" = ( +/obj/structure/machinery/power/apc/almayer/hardened{ + cell_type = /obj/item/cell/hyper; + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/north1) "jWU" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/blocker/forcefield/multitile_vehicles, @@ -45899,54 +46032,18 @@ icon_state = "plating" }, /area/almayer/hallways/vehiclehangar) +"jXW" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/command/lifeboat) "jXY" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) -"jYc" = ( -/obj/item/bedsheet/blue{ - layer = 3.2 - }, -/obj/item/bedsheet/blue{ - pixel_y = 13 - }, -/obj/item/toy/plush/therapy/red{ - desc = "A USCM approved plush doll. It's not soft and hardly comforting!"; - force = 15; - layer = 4.1; - name = "Sergeant Huggs"; - pixel_y = 15; - throwforce = 15 - }, -/obj/item/clothing/head/cmcap{ - layer = 4.1; - pixel_x = -1; - pixel_y = 22 - }, -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 - }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 - }, -/obj/structure/bed{ - can_buckle = 0 - }, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/living/port_emb) "jYd" = ( /obj/structure/machinery/gear{ id = "vehicle_elevator_gears" @@ -45981,8 +46078,8 @@ }, /area/almayer/medical/operating_room_four) "jZm" = ( -/obj/structure/machinery/brig_cell/cell_4{ - pixel_x = -32; +/obj/structure/machinery/brig_cell/cell_5{ + pixel_x = 32; pixel_y = -32 }, /turf/open/floor/almayer, @@ -46022,24 +46119,6 @@ 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{ @@ -46131,20 +46210,20 @@ icon_state = "bluefull" }, /area/almayer/squads/charlie_delta_shared) +"kaJ" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "kaN" = ( /obj/structure/platform{ dir = 1 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_p) -"kaS" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "kbc" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -46257,14 +46336,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"kdv" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) "kdB" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -46276,27 +46347,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/starboard) -"keT" = ( -/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) "kff" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -46325,7 +46375,7 @@ }, /area/almayer/shipboard/brig/cic_hallway) "kfN" = ( -/obj/structure/closet/secure_closet/brig, +/obj/structure/closet/secure_closet/brig/prisoner, /turf/open/floor/almayer{ icon_state = "red" }, @@ -46336,17 +46386,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) -"kfR" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 2 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_f_s) "kfU" = ( /turf/open/floor/plating, /area/almayer/powered/agent) @@ -46358,13 +46397,10 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_p) "kge" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 +/obj/structure/pipes/vents/scrubber, +/turf/open/floor/almayer{ + allow_construction = 0 }, -/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/processing) "kgp" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -46516,11 +46552,19 @@ }, /area/almayer/squads/alpha) "kjN" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 +/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, -/area/almayer/shipboard/brig/surgery) +/obj/structure/closet/secure_closet/brig/restraints, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/shipboard/brig/perma) "kkt" = ( /obj/structure/surface/table/almayer, /obj/item/book/manual/marine_law, @@ -46569,12 +46613,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) -"kmk" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/hallways/vehiclehangar) "kmp" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -46651,12 +46689,10 @@ /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) -"knL" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/lifeboat_pumps/south2) +"knT" = ( +/obj/structure/safe/cl_office, +/turf/open/floor/wood/ship, +/area/almayer/command/corporateliason) "koc" = ( /obj/structure/machinery/status_display{ pixel_y = -30 @@ -46910,6 +46946,12 @@ icon_state = "cargo" }, /area/almayer/squads/bravo) +"ksv" = ( +/obj/structure/closet/secure_closet/securecom, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/command/cic) "ksA" = ( /obj/structure/closet/secure_closet/freezer/fridge/groceries, /obj/structure/machinery/light{ @@ -46950,22 +46992,19 @@ /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) "kta" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/cameras/almayer_network{ + dir = 4 }, -/area/almayer/shipboard/brig/evidence_storage) -"ktn" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 +/obj/structure/sign/safety/terminal{ + pixel_x = 8; + pixel_y = 32 }, -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle, /turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" + dir = 9; + icon_state = "red" }, -/area/almayer/shipboard/brig/armory) +/area/almayer/shipboard/brig/processing) "ktB" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/almayer{ @@ -47121,27 +47160,12 @@ 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/machinery/light{ +/obj/structure/pipes/vents/pump{ dir = 8 }, -/obj/structure/sign/safety/bathunisex{ - pixel_x = 32 - }, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/general_equipment) "kyN" = ( /obj/structure/disposalpipe/segment, /obj/structure/sign/safety/distribution_pipes{ @@ -47153,18 +47177,14 @@ }, /area/almayer/shipboard/navigation) "kyP" = ( -/obj/structure/disposalpipe/segment{ +/obj/structure/pipes/standard/simple/hidden/supply{ 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/perma) +/area/almayer/shipboard/brig/processing) "kyX" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -47372,10 +47392,17 @@ /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) "kDb" = ( -/obj/structure/surface/rack, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_f_s) +/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) "kDi" = ( /obj/structure/platform{ dir = 8 @@ -47417,15 +47444,12 @@ }, /area/almayer/medical/containment) "kDA" = ( -/obj/structure/pipes/vents/scrubber, -/turf/open/floor/almayer{ - icon_state = "red" +/obj/structure/disposalpipe/segment{ + dir = 4 }, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) -"kDK" = ( -/obj/structure/pipes/vents/scrubber, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "kDR" = ( /obj/structure/disposalpipe/junction{ dir = 1; @@ -47462,6 +47486,10 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) +"kFk" = ( +/obj/structure/closet/secure_closet/commander, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "kFq" = ( /obj/structure/surface/table/almayer, /obj/item/book/manual/engineering_construction, @@ -47587,12 +47615,14 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) "kHK" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/pipes/vents/pump{ + dir = 1 }, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/execution) +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/shipboard/brig/chief_mp_office) "kHS" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -47645,12 +47675,6 @@ icon_state = "plate" }, /area/almayer/squads/alpha) -"kJm" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "kJC" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -47674,9 +47698,14 @@ }, /area/almayer/hull/upper_hull/u_a_p) "kJK" = ( -/obj/structure/bed/chair/comfy/orange, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/main_office) +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_18" + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "red" + }, +/area/almayer/shipboard/brig/chief_mp_office) "kJL" = ( /obj/structure/machinery/constructable_frame{ icon_state = "box_2" @@ -47692,19 +47721,6 @@ icon_state = "green" }, /area/almayer/hallways/port_hallway) -"kJW" = ( -/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) "kKb" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -47805,6 +47821,11 @@ 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 @@ -47857,8 +47878,7 @@ dir = 4 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" + allow_construction = 0 }, /area/almayer/shipboard/brig/processing) "kNk" = ( @@ -47873,18 +47893,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) -"kNq" = ( -/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) "kNx" = ( /obj/structure/sign/safety/ref_bio_storage{ pixel_x = -17; @@ -47934,14 +47942,26 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) "kOi" = ( -/obj/structure/sink{ - dir = 1; - pixel_y = -10 +/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 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/chief_mp_office) "kOk" = ( /obj/structure/sign/safety/maint{ pixel_x = 32 @@ -47992,12 +48012,15 @@ }, /area/almayer/hallways/aft_hallway) "kPo" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera" +/obj/item/paper_bin/uscm{ + pixel_y = 7 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_f_p) +/obj/item/tool/pen, +/obj/structure/surface/table/reinforced/black, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/brig/perma) "kPx" = ( /obj/structure/surface/table/almayer, /obj/item/device/mass_spectrometer, @@ -48035,12 +48058,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) -"kPH" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south2) "kPJ" = ( /obj/structure/machinery/cryopod/right{ pixel_y = 6 @@ -48109,12 +48126,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_three) -"kRg" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/command/lifeboat) "kRu" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -48166,18 +48177,6 @@ icon_state = "tcomms" }, /area/almayer/command/airoom) -"kSH" = ( -/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) "kSJ" = ( /obj/structure/disposalpipe/junction{ dir = 4; @@ -48207,16 +48206,6 @@ icon_state = "plating" }, /area/almayer/squads/req) -"kTc" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) "kTq" = ( /obj/structure/largecrate/supply/supplies/mre, /turf/open/floor/almayer{ @@ -48272,18 +48261,23 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"kUh" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{ - access_modified = 1; - dir = 1; - name = "\improper Flight Crew Quarters"; - req_one_access_txt = "19;22" - }, +"kUb" = ( +/obj/structure/closet/secure_closet, +/obj/item/device/camera_film, +/obj/item/device/camera_film, +/obj/item/device/camera_film, +/obj/item/storage/box/tapes, +/obj/item/clothing/head/fedora, +/obj/item/clothing/suit/storage/marine/light/reporter, +/obj/item/clothing/head/helmet/marine/reporter, +/obj/item/clothing/head/cmcap/reporter, +/obj/item/device/flashlight, +/obj/item/device/toner, +/obj/item/device/toner, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/living/pilotbunks) +/area/almayer/command/combat_correspondent) "kUt" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -48328,27 +48322,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south2) -"kVT" = ( -/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) "kVX" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -48360,15 +48333,11 @@ }, /area/almayer/hull/lower_hull/l_f_s) "kVZ" = ( -/obj/structure/machinery/door/window/brigdoor/southright{ - id = "Cell 2"; - name = "Cell 2" - }, -/obj/structure/sign/safety/two{ - pixel_x = -17 +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "red" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) +/area/almayer/shipboard/brig/main_office) "kWk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -48528,12 +48497,6 @@ icon_state = "orange" }, /area/almayer/hallways/port_umbilical) -"kZH" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_m_s) "kZN" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/prop/almayer/computer/PC{ @@ -48627,16 +48590,6 @@ }, /turf/open/floor/plating, /area/almayer/command/cic) -"laY" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 4; - pixel_y = -3 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "lbb" = ( /obj/structure/surface/table/almayer, /obj/item/organ/heart/prosthetic{ @@ -48702,14 +48655,17 @@ /turf/open/floor/almayer, /area/almayer/hallways/hangar) "lcW" = ( -/obj/item/storage/donut_box{ - pixel_y = 8 +/obj/structure/machinery/light{ + dir = 1 }, -/obj/structure/closet/secure_closet/personal/cabinet{ - req_access = null +/obj/structure/machinery/flasher{ + id = "Perma 2"; + pixel_y = 24 }, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/brig/perma) "ldj" = ( /obj/structure/pipes/vents/pump, /obj/structure/platform, @@ -48755,7 +48711,7 @@ dir = 2 }, /turf/open/floor/plating, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/main_office) "ldN" = ( /obj/structure/platform{ dir = 1 @@ -48847,16 +48803,11 @@ }, /area/almayer/engineering/engine_core) "lfW" = ( -/obj/structure/sign/safety/high_voltage{ - pixel_y = -32 - }, -/obj/structure/sign/safety/maint{ - pixel_x = 14; +/obj/structure/machinery/brig_cell/cell_6{ + pixel_x = 32; pixel_y = -32 }, -/turf/open/floor/almayer{ - icon_state = "red" - }, +/turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) "lgy" = ( /obj/structure/window/framed/almayer, @@ -49083,12 +49034,6 @@ icon_state = "red" }, /area/almayer/living/offices/flight) -"lkm" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/engineering/upper_engineering/starboard) "lkM" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -49113,6 +49058,22 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"llt" = ( +/obj/structure/machinery/conveyor{ + id = "req_belt" + }, +/obj/structure/plasticflaps, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/squads/req) +"llD" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/combat_correspondent) "llM" = ( /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer, @@ -49170,12 +49131,15 @@ }, /area/almayer/shipboard/brig/cic_hallway) "lnJ" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" +/obj/structure/sign/safety/maint{ + pixel_x = -17; + pixel_y = -34 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/perma) "lnP" = ( /obj/structure/machinery/vending/cola, /obj/structure/window/reinforced, @@ -49417,12 +49381,12 @@ /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) "lrV" = ( -/obj/structure/machinery/door/window/brigdoor/southright{ - id = "Cell 3"; - name = "Cell 3" +/obj/structure/sign/safety/four{ + pixel_x = -17 }, -/obj/structure/sign/safety/three{ - pixel_x = 31 +/obj/structure/machinery/door/window/brigdoor/southright{ + id = "Cell 4"; + name = "Cell 4" }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) @@ -49496,11 +49460,6 @@ icon_state = "plating_striped" }, /area/almayer/squads/req) -"ltc" = ( -/obj/effect/landmark/late_join/working_joe, -/obj/effect/landmark/start/working_joe, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/airoom) "lto" = ( /obj/structure/machinery/iv_drip, /turf/open/floor/almayer{ @@ -49527,19 +49486,24 @@ }, /turf/open/floor/plating, /area/almayer/hull/upper_hull/u_m_p) -"ltU" = ( -/obj/structure/bed/chair{ - dir = 8 +"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{ - icon_state = "plate" + dir = 1; + icon_state = "sterile_green_side" }, -/area/almayer/command/combat_correspondent) -"ltX" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/closed/wall/almayer/reinforced, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/surgery) +"lue" = ( +/obj/structure/surface/table/almayer, +/obj/item/folder/yellow, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "luk" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -49550,24 +49514,10 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_p) -"lul" = ( -/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) "lut" = ( -/obj/structure/machinery/computer/crew, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) +/obj/structure/pipes/vents/scrubber, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/general_equipment) "luu" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -49581,11 +49531,11 @@ }, /area/almayer/hull/lower_hull/l_m_p) "luw" = ( -/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/machinery/door/firedoor/border_only/almayer{ + dir = 1 }, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -49604,29 +49554,16 @@ /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "perma_lockdown"; - name = "\improper Perma Lockdown Shutter" +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/airlock/almayer/security/glass{ + name = "Brig"; + dir = 2 }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/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) +/area/almayer/shipboard/brig/lobby) "luS" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/cardboard{ @@ -49672,14 +49609,41 @@ }, /area/almayer/living/pilotbunks) "lvZ" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/poddoor/almayer/locked{ - dir = 8; - id = "Perma 1L"; - name = "\improper cell shutter" +/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 }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/perma) +/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" + }, +/area/almayer/shipboard/brig/chief_mp_office) "lwi" = ( /obj/structure/machinery/door/airlock/almayer/maint{ access_modified = 1; @@ -49818,12 +49782,6 @@ }, /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 @@ -49853,6 +49811,61 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) +"lAj" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/structure/closet/crate, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_m_s) "lAl" = ( /turf/open/floor/almayer{ dir = 4; @@ -49975,6 +49988,18 @@ icon_state = "plate" }, /area/almayer/engineering/engineering_workshop/hangar) +"lCn" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass{ + dir = 1; + name = "\improper Cryo Room" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/cryo) "lCt" = ( /turf/open/floor/almayer{ dir = 10; @@ -49996,11 +50021,13 @@ }, /area/almayer/hallways/aft_hallway) "lCM" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/surface/table/almayer, +/obj/item/paper_bin/uscm{ + pixel_y = 7 }, +/obj/item/tool/pen, /turf/open/floor/almayer{ - dir = 1; + dir = 8; icon_state = "red" }, /area/almayer/shipboard/brig/main_office) @@ -50027,22 +50054,13 @@ icon_state = "test_floor4" }, /area/almayer/hallways/starboard_hallway) -"lDn" = ( +"lDj" = ( /obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 + icon_state = "NW-out"; + pixel_y = 2 }, /turf/open/floor/almayer, -/area/almayer/command/lifeboat) -"lDD" = ( -/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) +/area/almayer/hull/upper_hull/u_f_p) "lDJ" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = -17 @@ -50052,6 +50070,20 @@ icon_state = "orange" }, /area/almayer/hallways/starboard_hallway) +"lDK" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/largecrate/supply/weapons/m39{ + pixel_x = 2 + }, +/obj/structure/largecrate/supply/weapons/m41a{ + layer = 3.1; + pixel_x = 6; + pixel_y = 17 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "lDL" = ( /obj/structure/machinery/light{ dir = 4 @@ -50103,11 +50135,21 @@ }, /area/almayer/engineering/upper_engineering) "lEv" = ( -/obj/structure/machinery/light{ - dir = 8 +/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 }, /turf/open/floor/almayer{ - dir = 8; + dir = 9; icon_state = "red" }, /area/almayer/shipboard/brig/lobby) @@ -50173,17 +50215,12 @@ /area/almayer/medical/morgue) "lFs" = ( /obj/structure/disposalpipe/segment{ - dir = 1; + dir = 8; icon_state = "pipe-c" }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -26 - }, +/obj/structure/pipes/standard/manifold/fourway/hidden/supply, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/processing) "lFt" = ( /obj/structure/machinery/portable_atmospherics/powered/pump, /obj/structure/sign/safety/maint{ @@ -50323,15 +50360,6 @@ }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_s) -"lIl" = ( -/obj/structure/machinery/door/airlock/almayer/secure/reinforced{ - name = "\improper Armourer's Workshop"; - req_access = null - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hull/upper_hull/u_m_s) "lIp" = ( /obj/structure/bed/chair/comfy/beige{ dir = 1 @@ -50424,19 +50452,6 @@ icon_state = "cargo" }, /area/almayer/living/offices) -"lJL" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/shipboard/brig/cells) "lJO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -50485,6 +50500,12 @@ /obj/structure/surface/table/almayer, /turf/open/floor/almayer, /area/almayer/squads/charlie) +"lLN" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/general_equipment) "lLS" = ( /obj/structure/sign/safety/galley{ pixel_x = 32 @@ -50525,12 +50546,6 @@ icon_state = "plating_striped" }, /area/almayer/squads/req) -"lMx" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/engineering/upper_engineering/starboard) "lMM" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -50556,26 +50571,15 @@ }, /area/almayer/hallways/stern_hallway) "lNs" = ( -/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" - }, +/obj/structure/closet/secure_closet/guncabinet/riot_control, +/obj/item/weapon/shield/riot, +/obj/item/weapon/shield/riot, +/obj/item/weapon/shield/riot, /turf/open/floor/almayer{ - dir = 4; - icon_state = "red" + dir = 8; + icon_state = "plating_striped" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/armory) "lNw" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -50601,18 +50605,14 @@ }, /area/almayer/hull/lower_hull/l_m_p) "lNF" = ( -/obj/structure/closet/secure_closet{ - name = "\improper Lethal Injection Locker" +/obj/item/storage/donut_box{ + pixel_y = 8 }, -/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" +/obj/structure/closet/secure_closet/personal/cabinet{ + req_access = null }, -/area/almayer/shipboard/brig/execution) +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) "lOl" = ( /obj/structure/machinery/light{ dir = 8 @@ -50687,14 +50687,6 @@ icon_state = "silver" }, /area/almayer/command/securestorage) -"lQi" = ( -/obj/structure/machinery/cm_vending/clothing/commanding_officer{ - pixel_y = 0 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/living/commandbunks) "lQj" = ( /obj/structure/machinery/door_control{ id = "InnerShutter"; @@ -50714,6 +50706,11 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) +"lQq" = ( +/obj/structure/bed, +/obj/item/bedsheet/hop, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "lQu" = ( /obj/structure/bed/stool, /turf/open/floor/almayer{ @@ -50836,16 +50833,12 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) -"lUA" = ( -/obj/structure/surface/table/almayer, -/obj/item/weapon/gun/rifle/l42a{ - pixel_y = 6 - }, -/obj/item/weapon/gun/rifle/l42a, +"lUv" = ( +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "redfull" }, -/area/almayer/hull/upper_hull/u_m_s) +/area/almayer/hull/lower_hull/l_f_s) "lVl" = ( /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor/almayer, @@ -50974,14 +50967,12 @@ }, /area/almayer/hallways/hangar) "lYZ" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/toolbox/mechanical/green{ - pixel_y = 8 +/obj/structure/machinery/vending/coffee, +/obj/structure/machinery/light{ + dir = 4 }, -/obj/item/storage/toolbox/mechanical, /turf/open/floor/almayer{ - dir = 8; - icon_state = "red" + icon_state = "plate" }, /area/almayer/shipboard/brig/general_equipment) "lZs" = ( @@ -51028,13 +51019,6 @@ 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; @@ -51093,6 +51077,16 @@ icon_state = "greencorner" }, /area/almayer/hallways/aft_hallway) +"mcl" = ( +/obj/structure/sign/safety/ladder{ + pixel_x = -16 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/vehiclehangar) "mcL" = ( /obj/structure/machinery/vending/snack, /obj/structure/sign/safety/maint{ @@ -51124,21 +51118,16 @@ }, /area/almayer/squads/alpha) "mdJ" = ( -/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 +/obj/structure/machinery/vending/security, +/obj/structure/machinery/light, +/obj/structure/machinery/firealarm{ + dir = 8; + pixel_x = -24 }, /turf/open/floor/almayer{ - dir = 4; - icon_state = "red" + icon_state = "plate" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/general_equipment) "mdW" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/effect/decal/warning_stripes{ @@ -51352,13 +51341,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) -"mje" = ( -/obj/structure/machinery/light, -/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle_ap, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/command/cic) "mji" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -51431,24 +51413,8 @@ /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) "mkk" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - allow_construction = 0 - }, +/turf/open/floor/almayer, /area/almayer/shipboard/brig/lobby) -"mko" = ( -/obj/item/tool/weldpack{ - pixel_y = 15 - }, -/obj/structure/surface/table/almayer, -/obj/item/clothing/head/welding, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "mkx" = ( /obj/structure/machinery/door_control{ id = "cl_shutters 2"; @@ -51673,12 +51639,6 @@ /obj/structure/disposalpipe/segment, /turf/closed/wall/almayer, /area/almayer/squads/req) -"mqb" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "mqg" = ( /obj/structure/bed/chair{ dir = 4 @@ -51864,17 +51824,6 @@ icon_state = "orange" }, /area/almayer/squads/bravo) -"mts" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/secure_closet/guncabinet, -/obj/item/weapon/gun/rifle/l42a, -/obj/item/weapon/gun/rifle/l42a{ - pixel_y = 6 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "mtD" = ( /obj/structure/machinery/status_display{ pixel_x = 16; @@ -51919,6 +51868,48 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) +"mus" = ( +/obj/item/bedsheet/blue{ + layer = 3.2 + }, +/obj/item/bedsheet/blue{ + pixel_y = 13 + }, +/obj/item/toy/plush/therapy/red{ + desc = "A USCM approved plush doll. It's not soft and hardly comforting!"; + force = 15; + layer = 4.1; + name = "Sergeant Huggs"; + pixel_y = 15; + throwforce = 15 + }, +/obj/item/clothing/head/cmcap{ + layer = 4.1; + pixel_x = -1; + pixel_y = 22 + }, +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/living/port_emb) "mux" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -51951,6 +51942,15 @@ icon_state = "bluecorner" }, /area/almayer/squads/delta) +"mvH" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/south2) "mvI" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -52025,19 +52025,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_p) -"myl" = ( -/obj/structure/machinery/power/apc/almayer/hardened{ - cell_type = /obj/item/cell/hyper; - dir = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/north1) "myn" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -52075,8 +52062,7 @@ "myT" = ( /obj/structure/closet/firecloset, /obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 + icon_state = "NE-out" }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) @@ -52151,27 +52137,6 @@ /obj/effect/spawner/random/tool, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"mAr" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/closet/secure_closet/guncabinet/blue/riot_control, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) -"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{ @@ -52302,23 +52267,6 @@ icon_state = "emerald" }, /area/almayer/living/briefing) -"mDX" = ( -/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) "mEb" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -52396,9 +52344,21 @@ /turf/open/floor/almayer, /area/almayer/command/cichallway) "mGn" = ( -/obj/structure/machinery/cm_vending/clothing/military_police_warden, +/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 + }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, /area/almayer/shipboard/brig/main_office) "mGu" = ( @@ -52499,6 +52459,12 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"mIA" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/lifeboat_pumps/south2) "mIB" = ( /obj/structure/machinery/cm_vending/sorted/medical/marinemed, /obj/structure/sign/safety/medical{ @@ -52509,26 +52475,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"mIJ" = ( -/obj/structure/sign/safety/ladder{ - pixel_x = -16 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) -"mIP" = ( -/obj/structure/pipes/vents/pump, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/engineering/upper_engineering/port) "mIW" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -52623,14 +52569,8 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/shipboard/brig/cryo) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/main_office) "mKq" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/living/bridgebunks) @@ -52658,15 +52598,6 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) -"mKy" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/lifeboat) "mKJ" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -52770,13 +52701,9 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) "mLI" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/almayer{ - allow_construction = 0 - }, -/area/almayer/shipboard/brig/perma) +/obj/structure/machinery/cm_vending/clothing/military_police_warden, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) "mLJ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -52798,6 +52725,15 @@ 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, @@ -53021,33 +52957,6 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) -"mRp" = ( -/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) -"mRQ" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/command/lifeboat) "mRS" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -53058,6 +52967,13 @@ icon_state = "test_floor4" }, /area/almayer/hallways/starboard_hallway) +"mRU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer, +/area/almayer/hull/upper_hull/u_f_p) "mRW" = ( /turf/open/floor/almayer/research/containment/corner1, /area/almayer/medical/containment/cell/cl) @@ -53123,14 +53039,6 @@ icon_state = "green" }, /area/almayer/hallways/aft_hallway) -"mTc" = ( -/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) "mTd" = ( /obj/structure/machinery/smartfridge/chemistry{ pixel_x = -3; @@ -53242,7 +53150,7 @@ /turf/open/floor/almayer{ icon_state = "red" }, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/main_office) "mVE" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -53279,13 +53187,14 @@ dir = 8; name = "ship-grade camera" }, -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = 30 +/obj/structure/machinery/cryopod/right, +/obj/structure/sign/safety/cryo{ + pixel_x = 32 }, /turf/open/floor/almayer{ - icon_state = "red" + icon_state = "cargo" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/cryo) "mWs" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -53353,6 +53262,19 @@ dir = 1 }, /area/almayer/medical/containment/cell) +"mXa" = ( +/obj/structure/closet/secure_closet/guncabinet, +/obj/item/weapon/gun/rifle/l42a{ + pixel_y = 6 + }, +/obj/item/weapon/gun/rifle/l42a, +/obj/item/weapon/gun/rifle/l42a{ + pixel_y = -6 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "mXj" = ( /turf/closed/wall/almayer, /area/almayer/living/commandbunks) @@ -53390,6 +53312,17 @@ icon_state = "blue" }, /area/almayer/hallways/port_hallway) +"mYX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/guncabinet, +/obj/item/weapon/gun/rifle/m41a{ + pixel_y = 6 + }, +/obj/item/weapon/gun/rifle/m41a, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "mYY" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -53477,6 +53410,17 @@ "naB" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/perma) +"naQ" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/engineering/upper_engineering/port) "naR" = ( /obj/structure/machinery/iv_drip, /obj/effect/decal/warning_stripes{ @@ -53504,6 +53448,15 @@ icon_state = "test_floor4" }, /area/almayer/living/gym) +"nbr" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/command/cic) "nbB" = ( /obj/structure/closet/secure_closet/freezer/fridge/full, /turf/open/floor/almayer{ @@ -53616,15 +53569,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) -"neG" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "red" - }, -/area/almayer/command/lifeboat) "neO" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -53968,11 +53912,12 @@ }, /area/almayer/living/briefing) "nlH" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 }, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) "nlW" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/largecrate/random/barrel/green, @@ -54038,6 +53983,12 @@ icon_state = "silver" }, /area/almayer/command/securestorage) +"nna" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hull/upper_hull/u_f_s) "nnc" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -54078,16 +54029,17 @@ /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) "nnz" = ( -/obj/structure/sign/safety/maint{ - pixel_x = 32; - pixel_y = -8 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 }, -/obj/structure/sign/safety/firingrange{ - pixel_x = 32; - pixel_y = 4 +/obj/structure/sign/safety/rewire{ + pixel_y = -24; + pixel_x = 12 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/shipboard/brig/chief_mp_office) "nnD" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Down4"; @@ -54103,12 +54055,6 @@ /obj/structure/largecrate/random/barrel/white, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) -"nnX" = ( -/obj/structure/machinery/sentry_holder/almayer, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/south1) "noj" = ( /obj/structure/largecrate, /obj/structure/prop/server_equipment/laptop{ @@ -54120,15 +54066,12 @@ }, /area/almayer/squads/req) "noo" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 8; - id = "bot_armory"; - name = "\improper Armory Shutters" +/obj/structure/machinery/power/apc/almayer, +/obj/structure/sign/safety/rewire{ + pixel_y = -38 }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/armory) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/general_equipment) "nos" = ( /obj/structure/machinery/chem_storage/medbay{ dir = 1 @@ -54171,6 +54114,13 @@ icon_state = "dark_sterile" }, /area/almayer/medical/containment) +"npB" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer, +/area/almayer/hull/upper_hull/u_f_s) "nqx" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -54205,16 +54155,6 @@ }, /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" @@ -54283,22 +54223,6 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_f_s) -"nsQ" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/structure/mirror{ - pixel_x = 29 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/living/captain_mess) "nsY" = ( /turf/closed/wall/almayer, /area/almayer/living/port_emb) @@ -54330,19 +54254,8 @@ /turf/closed/wall/almayer/reinforced, /area/almayer/command/computerlab) "ntm" = ( -/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) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/execution) "ntr" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/item/seeds/goldappleseed, @@ -54363,11 +54276,12 @@ }, /area/almayer/hallways/vehiclehangar) "ntu" = ( -/obj/structure/machinery/light/small{ - dir = 8 +/obj/structure/machinery/cm_vending/sorted/medical, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) +/area/almayer/shipboard/brig/surgery) "ntx" = ( /obj/structure/machinery/door/airlock/almayer/generic{ id = "Alpha_2"; @@ -54421,6 +54335,17 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha) +"nuI" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/surface/table/almayer, +/obj/item/tool/hand_labeler, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/chemistry) "nuK" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/franks{ @@ -54442,24 +54367,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_s) -"nvG" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/sink{ - pixel_y = 16 - }, -/obj/structure/mirror{ - pixel_y = 21 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/living/numbertwobunks) "nvM" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -54507,6 +54414,26 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) +"nwv" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/paper{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/tool/lighter/zippo/gold, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) +"nww" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/obj/structure/machinery/cm_vending/clothing/staff_officer_armory, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/command/cic) "nwx" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -54514,11 +54441,10 @@ }, /area/almayer/shipboard/port_missiles) "nwz" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - allow_construction = 0 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/lobby) "nwD" = ( /turf/open/floor/almayer{ @@ -54572,20 +54498,6 @@ 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 @@ -54670,6 +54582,18 @@ icon_state = "blue" }, /area/almayer/hallways/aft_hallway) +"nzI" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "red" + }, +/area/almayer/command/lifeboat) "nzO" = ( /obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/warning_stripes{ @@ -54695,11 +54619,11 @@ }, /area/almayer/squads/alpha_bravo_shared) "nBb" = ( +/obj/structure/machinery/vending/security, /turf/open/floor/almayer{ - dir = 5; - icon_state = "red" + icon_state = "plate" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/general_equipment) "nBc" = ( /obj/structure/largecrate/random, /turf/open/floor/almayer{ @@ -54714,21 +54638,18 @@ dir = 4 }, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/main_office) "nBu" = ( -/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/surface/table/almayer, +/obj/item/weapon/gun/energy/taser, +/obj/item/weapon/gun/energy/taser{ + pixel_y = 8 }, +/obj/structure/machinery/recharger, /turf/open/floor/almayer{ - dir = 8; icon_state = "red" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/main_office) "nBw" = ( /turf/open/floor/almayer{ dir = 1; @@ -54771,46 +54692,6 @@ icon_state = "orange" }, /area/almayer/squads/bravo) -"nCx" = ( -/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) -"nCR" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/structure/mirror{ - pixel_x = 29 - }, -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/living/auxiliary_officer_office) "nCT" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -54819,33 +54700,6 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) -"nCU" = ( -/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) -"nDd" = ( -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/hazard{ - pixel_y = 32 - }, -/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/hull/lower_hull/l_f_s) "nDh" = ( /obj/structure/transmitter/rotary{ name = "CL Office Telephone"; @@ -55051,21 +54905,16 @@ icon_state = "plate" }, /area/almayer/shipboard/port_point_defense) -"nGY" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/lifeboat_pumps/north2) "nHg" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ dir = 1 }, /turf/open/floor/almayer{ + dir = 6; icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/perma) "nHF" = ( /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_m_s) @@ -55078,18 +54927,6 @@ 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" @@ -55162,10 +54999,14 @@ }, /area/almayer/living/briefing) "nJo" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/light{ + dir = 1 + }, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/cells) "nJs" = ( /obj/structure/largecrate/random/case, /turf/open/floor/almayer{ @@ -55311,11 +55152,14 @@ }, /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/general_equipment) +/area/almayer/shipboard/brig/main_office) "nMz" = ( /obj/structure/sign/safety/cryo{ pixel_x = 35 @@ -55324,6 +55168,16 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) +"nMM" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 2 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_s) "nMV" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -55368,15 +55222,11 @@ }, /area/almayer/living/briefing) "nNQ" = ( -/obj/structure/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, /turf/open/floor/almayer{ - dir = 4; + dir = 9; icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/processing) "nNV" = ( /obj/structure/bed/chair{ dir = 8; @@ -55405,17 +55255,14 @@ }, /area/almayer/engineering/upper_engineering) "nOe" = ( -/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/structure/closet/secure_closet/personal/cabinet{ + req_access = null }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 8 +/obj/item/storage/donut_box{ + pixel_y = 8 }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) "nOG" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -55501,18 +55348,6 @@ icon_state = "plate" }, /area/almayer/squads/req) -"nPY" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "red" - }, -/area/almayer/command/lifeboat) "nQg" = ( /obj/structure/sink{ pixel_y = 24 @@ -55557,6 +55392,13 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering) +"nSj" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/cargo/blend, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "green" + }, +/area/almayer/squads/req) "nSG" = ( /obj/structure/machinery/door_control{ id = "tcomms"; @@ -55570,10 +55412,12 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/command/telecomms) "nSM" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/taperecorder, +/obj/structure/extinguisher_cabinet{ + pixel_y = 26 + }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "red" }, /area/almayer/shipboard/brig/main_office) "nSN" = ( @@ -55613,10 +55457,6 @@ }, /turf/open/floor/almayer, /area/almayer/command/computerlab) -"nTA" = ( -/obj/structure/bed/chair/comfy/blue, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) "nTH" = ( /obj/structure/sign/safety/storage{ pixel_x = 8; @@ -55750,21 +55590,18 @@ /turf/open/floor/wood/ship, /area/almayer/engineering/ce_room) "nXm" = ( -/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/closet/secure_closet/surgical{ + pixel_x = -30 }, -/obj/structure/machinery/door/poddoor/almayer/locked{ - id = "Cell 2"; - name = "\improper Courtyard Divider" +/obj/structure/machinery/power/apc/almayer, +/obj/structure/sign/safety/rewire{ + pixel_y = -38 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 8; + icon_state = "sterile_green_corner" }, -/area/almayer/shipboard/brig/cells) +/area/almayer/shipboard/brig/surgery) "nXF" = ( /obj/structure/bed/sofa/south/white/right{ pixel_y = 16 @@ -55851,9 +55688,12 @@ name = "\improper Courtyard Lockdown Shutter" }, /obj/structure/machinery/door/poddoor/almayer/locked{ - id = "Cell 3"; + 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" }, @@ -55970,6 +55810,12 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"ocs" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "ocB" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -56160,6 +56006,16 @@ icon_state = "cargo" }, /area/almayer/squads/charlie) +"ohl" = ( +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "green" + }, +/area/almayer/squads/req) "ohA" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -56207,18 +56063,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/north2) -"ohS" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 - }, -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Bathroom" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/captain_mess) "oih" = ( /obj/structure/bed{ icon_state = "abed" @@ -56396,36 +56240,35 @@ }, /area/space) "okM" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass{ - name = "\improper Execution Room" - }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/chief_mp_office) +"olk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 2 + }, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Bathroom" }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/execution) +/area/almayer/engineering/upper_engineering/port) "olv" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/hand_labeler{ - pixel_x = -8; - pixel_y = 3 - }, -/obj/item/storage/box/evidence{ - pixel_x = 7; - pixel_y = 6 +/obj/structure/machinery/cm_vending/sorted/marine_food, +/obj/structure/sign/safety/security{ + pixel_x = 32; + pixel_y = -8 }, -/obj/item/storage/box/evidence{ - pixel_x = 1; - pixel_y = 1 +/obj/structure/sign/safety/restrictedarea{ + pixel_x = 32; + pixel_y = 7 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "red" + icon_state = "plate" }, /area/almayer/shipboard/brig/general_equipment) "olM" = ( @@ -56478,13 +56321,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) -"omu" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) "omy" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -56546,11 +56382,16 @@ }, /area/almayer/living/auxiliary_officer_office) "oog" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 8 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/execution) +/obj/structure/machinery/door/airlock/almayer/security/reinforced{ + name = "\improper Chief MP's Bedroom" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/chief_mp_office) "ooh" = ( /obj/structure/sign/safety/restrictedarea{ pixel_x = 8; @@ -56558,17 +56399,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"ooo" = ( -/obj/structure/reagent_dispensers/water_cooler/stacks{ - density = 0; - pixel_y = 17 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/turf/open/floor/almayer, -/area/almayer/hull/upper_hull/u_f_s) "oos" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) @@ -56588,24 +56418,31 @@ }, /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/poddoor/almayer/open{ - id = "perma_lockdown"; - name = "\improper Perma Lockdown Shutter" +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + dir = 1; + name = "\improper Brig" }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/reinforced{ - name = "\improper Perma Cells" +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/processing) +"opj" = ( +/obj/structure/surface/table/almayer, +/obj/effect/spawner/random/powercell, +/obj/effect/spawner/random/tool, +/obj/item/packageWrap, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/squads/req) "opC" = ( /obj/structure/machinery/door/airlock/almayer/command/reinforced{ name = "\improper Combat Information Center" @@ -56617,33 +56454,16 @@ "opD" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/living/gym) -"opI" = ( -/obj/structure/closet/secure_closet, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/storage/box/tapes, -/obj/item/clothing/head/fedora, -/obj/item/clothing/suit/storage/marine/light/reporter, -/obj/item/clothing/head/helmet/marine/reporter, -/obj/item/clothing/head/cmcap/reporter, -/obj/item/device/flashlight, -/obj/item/device/toner, -/obj/item/device/toner, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "opJ" = ( /obj/docking_port/stationary/emergency_response/external/port4, /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" }, @@ -56680,6 +56500,13 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) +"oqA" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer/uniform_vendors, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "cargo_arrow" + }, +/area/almayer/command/cic) "oqD" = ( /obj/structure/surface/table/almayer, /obj/item/tool/wet_sign, @@ -56710,16 +56537,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) -"oqY" = ( -/obj/structure/machinery/conveyor{ - id = "req_belt" - }, -/obj/structure/plasticflaps, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/squads/req) "oqZ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/microwave{ @@ -56845,20 +56662,11 @@ }, /area/almayer/hull/lower_hull/l_a_p) "osJ" = ( -/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/bed, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/perma) "osT" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/prop/ice_colony/hula_girl{ @@ -56870,6 +56678,18 @@ "otu" = ( /turf/closed/wall/almayer/research/containment/wall/connect_w, /area/almayer/medical/containment/cell) +"otK" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{ + access_modified = 1; + dir = 1; + name = "\improper Flight Crew Quarters"; + req_one_access_txt = "19;22" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/pilotbunks) "otX" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -56929,15 +56749,17 @@ }, /area/almayer/lifeboat_pumps/south1) "ouV" = ( -/obj/structure/sign/safety/cryo{ - pixel_x = 1; - pixel_y = 26 +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/machinery/flasher{ + id = "Perma 1"; + pixel_y = 24 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "red" + icon_state = "plate" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/perma) "ouW" = ( /obj/structure/sign/safety/storage{ pixel_x = 8; @@ -57040,13 +56862,15 @@ /turf/open/floor/almayer, /area/almayer/living/cafeteria_officer) "oxn" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer{ - icon_state = "red" +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 }, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/execution) "oxp" = ( /obj/structure/largecrate/random/case, /turf/open/floor/almayer{ @@ -57251,11 +57075,14 @@ }, /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/cryo) +/area/almayer/shipboard/brig/main_office) "oDf" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) @@ -57315,6 +57142,12 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) +"oDO" = ( +/obj/structure/machinery/sentry_holder/almayer, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/south2) "oDR" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -57369,12 +57202,16 @@ /turf/open/floor/almayer, /area/almayer/living/briefing) "oEE" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 +/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/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/perma) "oER" = ( /obj/structure/machinery/light{ dir = 8 @@ -57495,16 +57332,17 @@ icon_state = "test_floor4" }, /area/almayer/engineering/laundry) -"oIc" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, -/obj/structure/machinery/light/small, +"oHY" = ( +/obj/structure/bed/chair/bolted, /turf/open/floor/almayer{ - dir = 6; - icon_state = "orange" + dir = 1; + icon_state = "red" }, -/area/almayer/shipboard/brig/perma) +/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) "oIn" = ( /obj/structure/bed/chair{ dir = 8; @@ -57536,15 +57374,18 @@ icon_state = "test_floor4" }, /area/almayer/medical/medical_science) -"oIt" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer, -/area/almayer/command/lifeboat) "oIB" = ( /turf/closed/wall/almayer, /area/almayer/command/combat_correspondent) +"oIY" = ( +/obj/structure/machinery/cryopod/right{ + layer = 3.1; + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/command/airoom) "oJp" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -57725,6 +57566,13 @@ icon_state = "redfull" }, /area/almayer/squads/alpha_bravo_shared) +"oMM" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/machinery/cm_vending/clothing/commanding_officer, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "oMQ" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, @@ -57739,14 +57587,6 @@ icon_state = "mono" }, /area/almayer/engineering/ce_room) -"oNf" = ( -/obj/item/stack/folding_barricade/three, -/obj/item/stack/folding_barricade/three, -/obj/structure/surface/rack, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/hull/lower_hull/l_f_s) "oNj" = ( /obj/structure/sign/prop1{ pixel_x = -32; @@ -57955,16 +57795,17 @@ }, /area/almayer/command/airoom) "oRZ" = ( -/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, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, +/obj/structure/bed/chair/bolted, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, /area/almayer/shipboard/brig/processing) "oSq" = ( /obj/item/device/radio/intercom{ @@ -58060,40 +57901,6 @@ icon_state = "cargo" }, /area/almayer/squads/alpha) -"oTM" = ( -/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) "oUG" = ( /obj/structure/machinery/light{ dir = 8 @@ -58144,16 +57951,14 @@ }, /area/almayer/living/starboard_garden) "oWI" = ( -/obj/structure/machinery/cryopod/right{ - pixel_y = 6 - }, -/obj/structure/sign/safety/cryo{ - pixel_x = 32 +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_21" }, /turf/open/floor/almayer{ - icon_state = "cargo" + dir = 6; + icon_state = "red" }, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/main_office) "oXb" = ( /obj/effect/landmark/start/marine/charlie, /obj/effect/landmark/late_join/charlie, @@ -58265,12 +58070,24 @@ }, /area/almayer/medical/containment) "paq" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/faxmachine/uscm/brig, +/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 + }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/cells) "paI" = ( /obj/structure/sign/safety/debark_lounge{ pixel_x = 15; @@ -58290,16 +58107,30 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/offices) "pbh" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/light{ - dir = 4 +/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 }, /turf/open/floor/almayer{ - dir = 5; - icon_state = "red" + icon_state = "cargo" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/general_equipment) +"pbl" = ( +/obj/structure/bed, +/obj/item/toy/plush/farwa{ + pixel_x = 5 + }, +/obj/item/clothing/under/redpyjamas, +/obj/item/bedsheet/orange, +/turf/open/floor/wood/ship, +/area/almayer/command/corporateliason) "pbp" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -58316,9 +58147,7 @@ }, /area/almayer/command/cic) "pbC" = ( -/obj/item/bedsheet/red, -/obj/structure/bed, -/turf/open/floor/wood/ship, +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/chief_mp_office) "pbV" = ( /turf/open/floor/almayer{ @@ -58413,6 +58242,9 @@ /obj/structure/machinery/light{ dir = 1 }, +/obj/structure/pipes/vents/pump{ + dir = 4 + }, /turf/open/floor/almayer{ dir = 1; icon_state = "red" @@ -58440,17 +58272,21 @@ }, /area/almayer/living/grunt_rnr) "pdG" = ( -/obj/structure/machinery/door/airlock/almayer/security{ - dir = 2; - name = "\improper Chief MP's Bedroom" +/obj/structure/surface/table/almayer, +/obj/item/storage/box/tapes{ + pixel_x = 7; + pixel_y = 6 }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 +/obj/item/storage/box/tapes{ + pixel_x = -6; + pixel_y = 6 }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/item/storage/box/tapes{ + pixel_x = 1; + pixel_y = 1 }, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/evidence_storage) "pef" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/sign/safety/maint{ @@ -58516,6 +58352,18 @@ allow_construction = 0 }, /area/almayer/stair_clone) +"pfA" = ( +/obj/item/tool/soap, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/engineering/upper_engineering/port) "pfH" = ( /obj/structure/platform_decoration, /turf/open/floor/almayer{ @@ -58544,15 +58392,6 @@ icon_state = "orange" }, /area/almayer/hull/lower_hull/l_m_s) -"pgw" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/engineering/upper_engineering/port) "pgD" = ( /turf/closed/wall/almayer, /area/almayer/lifeboat_pumps/south1) @@ -58588,15 +58427,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"phj" = ( -/obj/structure/machinery/photocopier, -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "piO" = ( /obj/structure/surface/rack, /obj/item/tool/weldingtool, @@ -58672,16 +58502,6 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) -"pjR" = ( -/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) "pky" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/almayer{ @@ -58711,22 +58531,12 @@ }, /area/almayer/shipboard/brig/surgery) "plZ" = ( -/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{ - access_modified = 1; - dir = 2; - name = "Brig"; - req_access = null; - req_one_access_txt = "1;3" - }, +/obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "red" }, /area/almayer/shipboard/brig/main_office) "pmk" = ( @@ -58768,16 +58578,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"pmI" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 2 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_f_s) "pmV" = ( /obj/structure/prop/server_equipment/yutani_server/broken{ density = 0; @@ -58802,23 +58602,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"pnL" = ( -/obj/structure/machinery/constructable_frame{ - icon_state = "box_2" - }, -/obj/item/weapon/baseballbat/metal{ - pixel_x = -2; - pixel_y = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) "pop" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -58832,6 +58615,16 @@ }, /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 @@ -58839,17 +58632,15 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_s) "poZ" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, -/obj/structure/bed/chair/bolted{ - dir = 4 +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 21 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 4; + icon_state = "red" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/chief_mp_office) "ppc" = ( /obj/structure/largecrate/supply/generator, /obj/structure/machinery/light/small{ @@ -59147,12 +58938,14 @@ }, /area/almayer/shipboard/starboard_missiles) "pwt" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = -25 +/obj/structure/sign/safety/restrictedarea{ + pixel_x = -17; + pixel_y = 7 }, +/obj/structure/machinery/cm_vending/sorted/marine_food, /turf/open/floor/almayer{ - dir = 8; - icon_state = "redcorner" + dir = 10; + icon_state = "red" }, /area/almayer/shipboard/brig/processing) "pwK" = ( @@ -59280,15 +59073,14 @@ }, /area/almayer/shipboard/weapon_room) "pzc" = ( -/obj/structure/pipes/vents/pump, -/obj/structure/bed/chair{ - dir = 1 +/obj/structure/sink{ + dir = 4; + pixel_x = 11 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "red" + icon_state = "plate" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/perma) "pzG" = ( /obj/docking_port/stationary/emergency_response/port1, /turf/open/floor/almayer{ @@ -59502,30 +59294,22 @@ /area/almayer/lifeboat_pumps/south1) "pFa" = ( /obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" + dir = 4 }, /obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer{ - allow_construction = 0 + dir = 4 }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/lobby) "pFg" = ( -/obj/structure/window/framed/almayer/hull/hijack_bustable, -/obj/structure/machinery/door/poddoor/almayer/locked{ - dir = 8; - id = "Perma 1"; - name = "\improper isolation shutter" +/obj/structure/machinery/firealarm{ + pixel_y = 28 }, -/obj/structure/machinery/door/poddoor/almayer/open{ - dir = 4; - id = "courtyard_cells"; - name = "\improper Courtyard Lockdown Shutter" +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/chief_mp_office) "pFA" = ( /obj/structure/pipes/standard/simple/visible{ dir = 4 @@ -59549,20 +59333,20 @@ /area/almayer/hull/lower_hull/l_a_p) "pGG" = ( /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/firealarm{ - pixel_y = 28 +/obj/structure/machinery/computer/cameras/almayer_network{ + dir = 4 }, -/obj/structure/machinery/door_control{ - id = "Execution Shutters"; - name = "Privacy Shutters"; - pixel_y = 12; - req_access_txt = "3" +/obj/structure/machinery/light{ + dir = 1 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/execution) +/obj/structure/sign/safety/terminal{ + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/chief_mp_office) "pGK" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -59658,17 +59442,14 @@ /turf/open/floor/plating/almayer, /area/almayer/hull/lower_hull/l_a_s) "pIH" = ( -/obj/structure/machinery/door_control{ - id = "perma_exit"; - name = "\improper Exit Shutters"; - pixel_y = -22; - req_access_txt = "3" +/obj/structure/bed/chair/comfy/black{ + dir = 4 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "redcorner" + dir = 10; + icon_state = "red" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/chief_mp_office) "pIU" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -59683,22 +59464,30 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"pIZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +"pJi" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 2; + id = "CMP Office Shutters"; + name = "\improper Privacy Shutters" + }, +/obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/turf/open/floor/plating, +/area/almayer/shipboard/brig/chief_mp_office) +"pJn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/structure/largecrate/random/secure{ + pixel_x = -5 }, -/area/almayer/lifeboat_pumps/north1) -"pJi" = ( -/obj/structure/closet/firecloset, /turf/open/floor/almayer{ - dir = 6; - icon_state = "red" + icon_state = "plate" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/hull/upper_hull/u_m_s) "pJD" = ( /obj/structure/pipes/vents/scrubber{ dir = 1 @@ -59719,26 +59508,23 @@ }, /area/almayer/living/port_emb) "pJE" = ( -/obj/structure/closet/secure_closet{ - name = "\improper Execution Firearms" +/obj/structure/surface/table/almayer, +/obj/item/folder/white{ + pixel_x = 5; + pixel_y = 5 }, -/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 +/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/almayer{ - dir = 8; - icon_state = "redcorner" +/obj/structure/machinery/light{ + dir = 1 }, -/area/almayer/shipboard/brig/execution) +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) "pJJ" = ( /turf/open/floor/almayer{ dir = 1; @@ -59816,15 +59602,6 @@ icon_state = "plate" }, /area/almayer/living/captain_mess) -"pMk" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/north2) "pMp" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -59871,6 +59648,14 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) +"pNK" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/auxiliary_officer_office) "pNM" = ( /obj/structure/platform{ dir = 4 @@ -59977,6 +59762,16 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) +"pPF" = ( +/obj/structure/machinery/power/apc/almayer/hardened, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/south2) "pPM" = ( /obj/structure/surface/rack, /turf/open/floor/almayer{ @@ -59991,6 +59786,28 @@ icon_state = "red" }, /area/almayer/shipboard/port_missiles) +"pPV" = ( +/obj/structure/pipes/vents/pump, +/obj/structure/mirror{ + pixel_y = 32 + }, +/obj/structure/sink{ + pixel_y = 24 + }, +/obj/structure/machinery/door_control{ + id = "Alpha_2"; + name = "Door Lock"; + normaldoorcontrol = 1; + pixel_x = 23; + specialfunctions = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/port_emb) "pQq" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -60172,6 +59989,16 @@ icon_state = "mono" }, /area/almayer/command/computerlab) +"pUe" = ( +/obj/structure/machinery/power/apc/almayer/hardened, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/south1) "pUf" = ( /obj/structure/bed/chair{ dir = 4 @@ -60195,6 +60022,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_p) +"pUl" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/vehiclehangar) "pUp" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -60250,12 +60086,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) -"pVx" = ( -/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/squads/req) "pVA" = ( /obj/item/trash/cigbutt/ucigbutt{ pixel_x = 2; @@ -60349,13 +60179,19 @@ }, /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" }, @@ -60463,15 +60299,18 @@ /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 = "red" + icon_state = "redcorner" }, /area/almayer/shipboard/brig/main_office) "pYX" = ( @@ -60500,18 +60339,17 @@ }, /area/almayer/shipboard/brig/cic_hallway) "pZV" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 }, -/obj/structure/machinery/status_display{ - pixel_x = 32 +/obj/structure/machinery/light/small{ + dir = 4 }, /turf/open/floor/almayer{ dir = 5; icon_state = "red" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/processing) "qam" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ @@ -60524,18 +60362,24 @@ }, /area/almayer/medical/medical_science) "qau" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 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 3"; + name = "\improper Courtyard Divider" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/obj/effect/landmark/start/warrant, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/cells) "qaD" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -60543,11 +60387,17 @@ }, /area/almayer/hull/lower_hull/l_a_s) "qaJ" = ( -/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/plating/plating_catwalk, -/area/almayer/shipboard/brig/execution) +/turf/open/floor/almayer{ + allow_construction = 0 + }, +/area/almayer/shipboard/brig/chief_mp_office) "qaV" = ( /turf/open/floor/almayer{ dir = 10; @@ -60579,12 +60429,15 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) -"qbt" = ( -/obj/structure/pipes/vents/pump, +"qbh" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/obj/structure/machinery/light/small, /turf/open/floor/almayer{ - icon_state = "sterile_green" + icon_state = "plate" }, -/area/almayer/shipboard/brig/surgery) +/area/almayer/command/combat_correspondent) "qbx" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -60835,21 +60688,11 @@ icon_state = "silvercorner" }, /area/almayer/command/cichallway) -"qfD" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) "qfR" = ( -/obj/structure/machinery/light{ - dir = 1 - }, /turf/open/floor/almayer{ - dir = 9; - icon_state = "red" + icon_state = "plate" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/perma) "qga" = ( /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ dir = 1 @@ -60905,16 +60748,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/delta) -"qgU" = ( -/obj/structure/machinery/power/apc/almayer/hardened, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/south1) "qhb" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -61069,19 +60902,15 @@ /obj/effect/landmark/late_join/charlie, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) -"qkm" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21" - }, -/obj/structure/sign/poster/io{ - pixel_y = 32; - name = "propaganda poster" +"qkj" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/obj/structure/sign/safety/escapepod{ - pixel_x = -17 +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/wood/ship, -/area/almayer/command/corporateliason) +/area/almayer/command/lifeboat) "qkn" = ( /obj/structure/sign/safety/maint{ pixel_x = -17 @@ -61116,16 +60945,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/hallways/starboard_umbilical) -"qlp" = ( -/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) "qlz" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -61135,14 +60954,6 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/sea_office) -"qlI" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "qmk" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -61157,6 +60968,21 @@ icon_state = "bluecorner" }, /area/almayer/squads/delta) +"qmr" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/screwdriver, +/obj/item/prop/helmetgarb/gunoil{ + pixel_x = -7; + pixel_y = 12 + }, +/obj/item/weapon/gun/rifle/l42a{ + pixel_x = 17; + pixel_y = 6 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "qmt" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -61232,22 +61058,15 @@ }, /area/almayer/medical/medical_science) "qmE" = ( -/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" +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" }, /turf/open/floor/almayer{ dir = 4; icon_state = "red" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/processing) "qmL" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -61259,25 +61078,6 @@ /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) -"qmZ" = ( -/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) "qnd" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -61343,7 +61143,7 @@ name = "\improper Privacy Shutters" }, /turf/open/floor/plating, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/cells) "qom" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/chem_dispenser/soda{ @@ -61404,6 +61204,16 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/chemistry) +"qpU" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 12 + }, +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/lifeboat) "qqn" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -61411,15 +61221,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) -"qqr" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/engineering/upper_engineering) "qqu" = ( /turf/open/floor/almayer{ dir = 1; @@ -61433,14 +61234,11 @@ }, /area/almayer/medical/lower_medical_medbay) "qqN" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -26 - }, /turf/open/floor/almayer{ - dir = 8; + dir = 10; icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/processing) "qqQ" = ( /obj/structure/machinery/cm_vending/sorted/medical/blood{ density = 0; @@ -61475,11 +61273,15 @@ /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 = 4; + dir = 5; icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/perma) "qrv" = ( /turf/open/floor/almayer{ icon_state = "silver" @@ -61528,6 +61330,12 @@ icon_state = "plate" }, /area/almayer/living/gym) +"qtR" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/command/lifeboat) "qtS" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer, @@ -61553,20 +61361,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/cryo_tubes) -"quy" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/sign/safety/maint{ - pixel_x = 8; - pixel_y = -32 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/command/lifeboat) "quI" = ( /obj/structure/machinery/door_control{ id = "laddersouthwest"; @@ -61613,13 +61407,14 @@ }, /area/almayer/living/grunt_rnr) "qvf" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/poddoor/almayer/locked{ + dir = 2; + id = "Perma 2"; + name = "\improper cell shutter" }, -/area/almayer/shipboard/brig/cryo) +/turf/open/floor/plating, +/area/almayer/shipboard/brig/perma) "qvC" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -61752,9 +61547,10 @@ }, /area/almayer/medical/containment/cell) "qyd" = ( -/turf/open/floor/almayer{ - allow_construction = 0 +/obj/structure/pipes/vents/pump{ + dir = 1 }, +/turf/open/floor/almayer, /area/almayer/shipboard/brig/perma) "qyi" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -61812,6 +61608,35 @@ icon_state = "plating" }, /area/almayer/hallways/vehiclehangar) +"qyH" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer, +/area/almayer/command/lifeboat) +"qyJ" = ( +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/command/cic) +"qyM" = ( +/obj/structure/surface/table/almayer, +/obj/item/clothing/mask/cigarette/pipe{ + pixel_x = 8 + }, +/obj/structure/transmitter/rotary{ + name = "Reporter Telephone"; + phone_category = "Almayer"; + phone_id = "Reporter"; + pixel_x = -4; + pixel_y = 6 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "qyW" = ( /obj/structure/bed/chair{ dir = 4 @@ -61897,10 +61722,24 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"qCg" = ( +/obj/structure/mirror{ + pixel_y = 32 + }, +/obj/structure/sink{ + pixel_y = 24 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering/upper_engineering/port) "qCi" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 }, +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = -28 + }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) "qCo" = ( @@ -62083,12 +61922,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_two) -"qGU" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/lifeboat_pumps/south2) "qHb" = ( /obj/structure/bed/chair{ dir = 8 @@ -62132,16 +61965,13 @@ }, /area/almayer/powered) "qHF" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/bodybags{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/storage/box/bodybags, -/turf/open/floor/almayer{ - icon_state = "redcorner" +/obj/structure/machinery/cm_vending/clothing/senior_officer{ + req_access = null; + req_access_txt = 19; + req_one_access = null }, -/area/almayer/shipboard/brig/execution) +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) "qHM" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -62172,15 +62002,6 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) -"qJf" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/engineering/upper_engineering) "qJj" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -62236,15 +62057,6 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) -"qJU" = ( -/obj/structure/bed, -/obj/item/toy/plush/farwa{ - pixel_x = 5 - }, -/obj/item/clothing/under/redpyjamas, -/obj/item/bedsheet/orange, -/turf/open/floor/wood/ship, -/area/almayer/command/corporateliason) "qJY" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/drinks/bottle/orangejuice{ @@ -62290,16 +62102,6 @@ icon_state = "plating" }, /area/almayer/engineering/upper_engineering) -"qKt" = ( -/obj/structure/closet/emcloset, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/hull/upper_hull/u_f_s) "qKz" = ( /obj/structure/machinery/light/small, /turf/open/floor/almayer{ @@ -62328,16 +62130,6 @@ icon_state = "greencorner" }, /area/almayer/hallways/port_hallway) -"qKY" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/port) "qLi" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -62480,11 +62272,6 @@ }, /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" }, @@ -62580,15 +62367,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) -"qPX" = ( -/obj/structure/machinery/light, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" - }, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/command/lifeboat) "qQc" = ( /obj/structure/closet/secure_closet/personal/patient{ name = "morgue closet" @@ -62606,18 +62384,20 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) -"qQM" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 +"qQL" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 }, /turf/open/floor/almayer{ - icon_state = "sterile_green_side" + dir = 5; + icon_state = "orange" }, -/area/almayer/shipboard/brig/surgery) +/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) "qQP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -62659,33 +62439,35 @@ icon_state = "silvercorner" }, /area/almayer/shipboard/brig/cic_hallway) -"qRo" = ( -/obj/structure/pipes/vents/pump{ - dir = 8 +"qRL" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{ + access_modified = 1; + name = "\improper Flight Crew Quarters"; + req_one_access_txt = "19;22" }, /turf/open/floor/almayer{ - icon_state = "red" + icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/living/pilotbunks) "qRT" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/secure_data{ + dir = 4 }, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/execution) +/area/almayer/shipboard/brig/chief_mp_office) "qSl" = ( /obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/power/apc/almayer{ - dir = 1 + dir = 6 }, /turf/open/floor/almayer{ dir = 1; icon_state = "red" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/main_office) "qSm" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -62732,9 +62514,17 @@ /area/almayer/hallways/starboard_umbilical) "qUb" = ( /obj/structure/surface/table/almayer, -/obj/structure/machinery/recharger, +/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 + }, /turf/open/floor/almayer{ - dir = 1; + dir = 10; icon_state = "red" }, /area/almayer/shipboard/brig/processing) @@ -62795,10 +62585,23 @@ }, /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{ - icon_state = "cargo" + dir = 1; + icon_state = "red" }, -/area/almayer/shipboard/brig/execution) +/area/almayer/shipboard/brig/chief_mp_office) "qVM" = ( /turf/closed/wall/almayer, /area/almayer/hull/upper_hull/u_m_p) @@ -62951,17 +62754,16 @@ }, /area/almayer/command/lifeboat) "qYH" = ( -/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" +/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{ - icon_state = "test_floor4" + icon_state = "plate" }, /area/almayer/shipboard/brig/execution) "qYN" = ( @@ -63006,10 +62808,10 @@ /turf/open/floor/almayer, /area/almayer/living/briefing) "qZg" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/surface/table/almayer, +/obj/structure/machinery/recharger, /turf/open/floor/almayer{ - dir = 8; - icon_state = "redcorner" + icon_state = "red" }, /area/almayer/shipboard/brig/processing) "qZH" = ( @@ -63034,8 +62836,12 @@ /obj/structure/sign/safety/maint{ pixel_x = -17 }, +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/open/floor/almayer{ - dir = 8; + dir = 10; icon_state = "red" }, /area/almayer/shipboard/brig/main_office) @@ -63094,15 +62900,6 @@ icon_state = "silvercorner" }, /area/almayer/command/computerlab) -"rbE" = ( -/obj/structure/machinery/cm_vending/clothing/dress{ - req_access = list(1); - pixel_y = 0 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/living/commandbunks) "rbF" = ( /obj/effect/landmark/late_join, /obj/effect/landmark/ert_spawns/distress_cryo, @@ -63175,6 +62972,14 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering) +"rcW" = ( +/obj/item/storage/toolbox/mechanical{ + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "rde" = ( /obj/structure/sign/prop1, /turf/closed/wall/almayer, @@ -63376,6 +63181,14 @@ icon_state = "emeraldcorner" }, /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" + }, +/area/almayer/shipboard/brig/general_equipment) "rhO" = ( /obj/structure/machinery/vending/cola/research{ pixel_x = 4 @@ -63464,11 +63277,13 @@ }, /area/almayer/living/grunt_rnr) "rjw" = ( -/obj/structure/machinery/light{ - dir = 4 +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = 26 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/almayer{ + icon_state = "plating_striped" + }, +/area/almayer/shipboard/brig/armory) "rjG" = ( /obj/structure/pipes/standard/tank/oxygen, /turf/open/floor/almayer{ @@ -63533,18 +63348,11 @@ }, /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{ - icon_state = "test_floor4" + dir = 1; + icon_state = "cargo_arrow" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/general_equipment) "rku" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/tool/wrench{ @@ -63564,20 +63372,31 @@ /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{ - dir = 4; - icon_state = "redcorner" + icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/execution) +/area/almayer/shipboard/brig/cells) "rkL" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 2; - id = "Warden Office Shutters"; - name = "\improper Privacy Shutters" +/obj/structure/machinery/brig_cell/cell_3{ + pixel_x = 32; + pixel_y = -32 }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/main_office) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/processing) "rlf" = ( /obj/structure/machinery/cm_vending/clothing/synth/snowflake, /turf/open/floor/almayer{ @@ -63670,17 +63489,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"rmE" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/engineering/upper_engineering/port) "rmN" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -63852,17 +63660,8 @@ }, /area/almayer/squads/delta) "rra" = ( -/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" - }, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/perma) "rri" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -63958,6 +63757,16 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer, /area/almayer/command/computerlab) +"rsW" = ( +/obj/structure/pipes/vents/pump, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/engineering/upper_engineering/port) "rsY" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -64037,22 +63846,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) -"rur" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - pixel_y = -1 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/living/port_emb) "rux" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, @@ -64069,13 +63862,8 @@ }, /area/almayer/hallways/hangar) "rvo" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/shipboard/brig/evidence_storage) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cryo) "rvA" = ( /turf/open/floor/almayer, /area/almayer/living/numbertwobunks) @@ -64103,6 +63891,12 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) +"rwT" = ( +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/engineering/upper_engineering) "rwY" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -64163,30 +63957,17 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north1) -"ryR" = ( -/obj/structure/machinery/cm_vending/clothing/staff_officer_armory, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/command/cic) +"rzf" = ( +/obj/effect/landmark/late_join/working_joe, +/obj/effect/landmark/start/working_joe, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/airoom) "rzj" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/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" +/obj/structure/machinery/brig_cell/perma_1{ + pixel_x = 32 }, -/area/almayer/shipboard/brig/main_office) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/perma) "rzN" = ( /turf/open/floor/almayer{ icon_state = "dark_sterile" @@ -64210,6 +63991,13 @@ icon_state = "bluecorner" }, /area/almayer/living/briefing) +"rAv" = ( +/obj/structure/machinery/shower{ + dir = 8 + }, +/obj/structure/window/reinforced, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) "rAx" = ( /obj/structure/disposalpipe/junction{ dir = 4 @@ -64363,11 +64151,14 @@ }, /area/almayer/squads/req) "rCL" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "red" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, +/turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) "rCO" = ( /obj/structure/pipes/standard/simple/hidden/supply, @@ -64389,26 +64180,27 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) +"rDd" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/emails{ + dir = 1; + pixel_y = 2 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "rDe" = ( /obj/structure/surface/table/almayer, -/obj/structure/sign/safety/cryo{ +/obj/item/reagent_container/food/snacks/kepler_crisps{ pixel_x = 8; - pixel_y = 33 + pixel_y = 4 }, /obj/item/toy/deck{ pixel_x = -4; - pixel_y = 10 - }, -/obj/item/reagent_container/food/drinks/cans/souto/diet/cherry{ - pixel_x = 9; - pixel_y = 12 - }, -/obj/item/ashtray/plastic{ - pixel_y = -4 + pixel_y = 1 }, -/obj/item/trash/cigbutt{ - pixel_x = 1; - pixel_y = 5 +/obj/structure/sign/safety/cryo{ + pixel_x = 8; + pixel_y = 33 }, /turf/open/floor/almayer{ dir = 6; @@ -64752,6 +64544,11 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) +"rJg" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "rJh" = ( /obj/item/storage/backpack/marine/satchel{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; @@ -64871,33 +64668,17 @@ 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 }, /area/almayer/medical/containment/cell/cl) -"rNb" = ( -/obj/structure/pipes/vents/pump, -/obj/structure/mirror{ - pixel_y = 32 - }, -/obj/structure/sink{ - pixel_y = 24 - }, -/obj/structure/machinery/door_control{ - id = "Alpha_2"; - name = "Door Lock"; - normaldoorcontrol = 1; - pixel_x = 23; - specialfunctions = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/living/port_emb) "rNF" = ( /obj/structure/machinery/light{ unacidable = 1; @@ -64949,17 +64730,27 @@ icon_state = "plate" }, /area/almayer/living/gym) +"rOZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/guncabinet, +/obj/item/weapon/gun/rifle/l42a{ + pixel_y = 6 + }, +/obj/item/weapon/gun/rifle/l42a, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "rPh" = ( /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" = ( @@ -65039,16 +64830,18 @@ }, /area/almayer/lifeboat_pumps/south1) "rQY" = ( -/obj/structure/bed, -/obj/structure/machinery/flasher{ - id = "Cell 3"; - pixel_x = 24 +/obj/structure/surface/table/almayer, +/obj/item/storage/box/flashbangs, +/obj/item/storage/box/flashbangs{ + pixel_x = 5; + pixel_y = 9 }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "red" +/obj/item/storage/box/flashbangs{ + pixel_x = -8; + pixel_y = 5 }, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/armory) "rRq" = ( /turf/closed/wall/almayer, /area/almayer/lifeboat_pumps/south2) @@ -65060,13 +64853,11 @@ }, /area/almayer/lifeboat_pumps/south1) "rRQ" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" +/obj/structure/machinery/brig_cell/perma_2{ + pixel_x = -32 }, -/area/almayer/shipboard/brig/main_office) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/perma) "rRU" = ( /obj/structure/machinery/light{ dir = 8 @@ -65120,17 +64911,11 @@ /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 = "orange" + icon_state = "red" }, -/area/almayer/shipboard/brig/lobby) +/area/almayer/shipboard/brig/processing) "rSK" = ( /obj/structure/machinery/light/small, /turf/open/floor/almayer{ @@ -65144,14 +64929,15 @@ /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) "rTt" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" +/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 }, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/execution) "rTJ" = ( /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/almayer{ @@ -65193,6 +64979,27 @@ icon_state = "silver" }, /area/almayer/command/computerlab) +"rUB" = ( +/obj/structure/pipes/vents/pump, +/obj/item/tool/soap, +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/sink{ + pixel_y = 24 + }, +/obj/structure/mirror{ + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/shipboard/brig/cells) "rUU" = ( /obj/structure/machinery/door/airlock/almayer/maint{ req_access = null; @@ -65228,6 +65035,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) +"rWF" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/lifeboat) "rWL" = ( /obj/structure/barricade/metal, /turf/open/floor/almayer{ @@ -65242,11 +65057,13 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) "rXd" = ( -/obj/structure/machinery/vending/security, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/effect/landmark/start/warden, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/area/almayer/shipboard/brig/general_equipment) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cryo) "rXj" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -65279,7 +65096,7 @@ dir = 4 }, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/main_office) "rXS" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/disposalpipe/segment{ @@ -65334,6 +65151,14 @@ icon_state = "plate" }, /area/almayer/living/offices/flight) +"rYZ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 2 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/vehiclehangar) "rZz" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -65373,11 +65198,11 @@ }, /area/almayer/shipboard/starboard_point_defense) "rZR" = ( +/obj/structure/machinery/cryopod, /turf/open/floor/almayer{ - dir = 4; - icon_state = "red" + icon_state = "cargo" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/cryo) "sah" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -65481,7 +65306,7 @@ }, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/main_office) "scH" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -65532,19 +65357,19 @@ }, /area/almayer/medical/upper_medical) "sdq" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21"; - layer = 3.1; - pixel_x = -8 +/obj/structure/pipes/vents/pump{ + dir = 1 }, -/obj/structure/machinery/power/apc/almayer{ - dir = 8 +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera"; + pixel_y = 6 }, /turf/open/floor/almayer{ - dir = 10; - icon_state = "red" + dir = 1; + icon_state = "redcorner" }, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/execution) "sdu" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -65567,15 +65392,26 @@ }, /area/almayer/squads/delta) "sdF" = ( -/obj/structure/machinery/firealarm{ - dir = 8; - pixel_x = -24 +/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 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "redcorner" + icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/perma) "sdO" = ( /obj/structure/ladder{ height = 1; @@ -65625,7 +65461,7 @@ /area/almayer/squads/req) "sgi" = ( /turf/closed/wall/almayer, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/perma) "sgj" = ( /obj/item/storage/belt/medical/full, /obj/item/storage/belt/medical/full, @@ -65735,14 +65571,16 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) "sip" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = -30 +/obj/structure/machinery/firealarm{ + dir = 8; + pixel_x = -24 }, +/obj/structure/closet/secure_closet/brig/prison_uni, /turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" + dir = 8; + icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/perma) "siz" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/cameras/hangar{ @@ -65804,6 +65642,18 @@ icon_state = "test_floor4" }, /area/almayer/command/lifeboat) +"skg" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/starboard) "skl" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -65955,6 +65805,25 @@ icon_state = "blue" }, /area/almayer/squads/delta) +"soa" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1; + name = "Bathroom" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/cells) "soq" = ( /obj/structure/machinery/computer/working_joe{ dir = 4; @@ -66000,12 +65869,13 @@ /turf/open/floor/almayer, /area/almayer/living/gym) "soD" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/landmark/crap_item, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/main_office) "soK" = ( /obj/item/storage/firstaid/fire/empty, @@ -66120,29 +65990,12 @@ }, /area/almayer/shipboard/brig/cells) "srV" = ( -/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, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun, /turf/open/floor/almayer{ - dir = 4; - icon_state = "red" + dir = 8; + icon_state = "plating_striped" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/armory) "ssa" = ( /obj/structure/machinery/door/poddoor/almayer/open{ id = "Hangar Lockdown"; @@ -66179,21 +66032,21 @@ 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{ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) -"ssW" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/command/cic) "ssX" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -66228,12 +66081,6 @@ allow_construction = 0 }, /area/almayer/stair_clone/upper) -"stu" = ( -/obj/structure/machinery/sentry_holder/almayer, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/north1) "stY" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -66292,18 +66139,16 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) -"svC" = ( -/obj/structure/closet/secure_closet/guncabinet, -/obj/item/weapon/gun/smg/m39{ - pixel_y = 6 - }, -/obj/item/weapon/gun/smg/m39{ - pixel_y = -6 +"svp" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 }, -/area/almayer/hull/upper_hull/u_m_s) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_s) "swn" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -66312,15 +66157,11 @@ /turf/open/floor/plating, /area/almayer/shipboard/brig/surgery) "swo" = ( -/obj/structure/machinery/vending/security, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/shipboard/brig/main_office) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/execution) "swt" = ( /turf/open/floor/almayer{ icon_state = "greencorner" @@ -66404,28 +66245,6 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) -"sxT" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/secure_closet/guncabinet, -/obj/item/weapon/gun/rifle/m41a{ - pixel_y = 6 - }, -/obj/item/weapon/gun/rifle/m41a, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) -"sxW" = ( -/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) "syH" = ( /obj/structure/machinery/firealarm{ pixel_y = -28 @@ -66436,11 +66255,18 @@ /turf/open/floor/almayer, /area/almayer/squads/delta) "syM" = ( -/obj/structure/machinery/light/small{ - dir = 8 +/obj/structure/closet/secure_closet{ + name = "\improper Lethal Injection Locker" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_f_p) +/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" + }, +/area/almayer/shipboard/brig/execution) "syP" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -66460,14 +66286,11 @@ }, /area/almayer/engineering/engine_core) "szy" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" +/obj/structure/pipes/vents/pump{ + dir = 1 }, -/area/almayer/shipboard/brig/main_office) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/chief_mp_office) "szE" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -66543,15 +66366,36 @@ icon_state = "orange" }, /area/almayer/engineering/ce_room) +"sBF" = ( +/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{ + access_modified = 1; + 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) "sBH" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "CMP Office Shutters"; + name = "\improper Privacy Shutters" }, -/obj/structure/machinery/status_display{ - pixel_x = 32 +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + layer = 1.9 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/execution) +/turf/open/floor/plating, +/area/almayer/shipboard/brig/chief_mp_office) "sBL" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/structure/machinery/light, @@ -66643,10 +66487,11 @@ }, /area/almayer/squads/delta) "sEa" = ( -/turf/open/floor/almayer{ - icon_state = "redcorner" +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/execution) "sEd" = ( /obj/structure/machinery/cryopod/right, /obj/structure/machinery/light{ @@ -66895,10 +66740,24 @@ }, /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{ - icon_state = "redfull" + dir = 1; + icon_state = "red" }, -/area/almayer/shipboard/brig/evidence_storage) +/area/almayer/shipboard/brig/main_office) "sIx" = ( /obj/effect/landmark/yautja_teleport, /turf/open/floor/plating/plating_catwalk, @@ -66940,25 +66799,11 @@ }, /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 = 8; - icon_state = "redcorner" + dir = 5; + icon_state = "red" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/chief_mp_office) "sJC" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray{ @@ -67008,25 +66853,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) -"sLZ" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/device/flashlight/lamp/green{ - pixel_y = 20; - pixel_x = -7 - }, -/obj/item/ashtray/bronze{ - pixel_y = 19; - pixel_x = 4 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/effect/landmark/map_item{ - pixel_y = 3; - pixel_x = -1 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "sMs" = ( /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ dir = 1 @@ -67132,15 +66958,6 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"sOZ" = ( -/obj/structure/sign/safety/ammunition{ - pixel_y = 32 - }, -/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/medical/upper_medical) "sPc" = ( /obj/structure/machinery/light{ dir = 1 @@ -67191,16 +67008,18 @@ }, /area/almayer/command/lifeboat) "sQS" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/stamp{ - pixel_x = 3; - pixel_y = 10 +/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/item/device/taperecorder, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "plating_striped" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/armory) "sQU" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -67262,6 +67081,12 @@ }, /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 @@ -67440,32 +67265,35 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) "sVy" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 +/obj/item/bedsheet/brown{ + pixel_y = 13 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cryo) -"sWs" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "cargo" +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 }, -/area/almayer/hull/upper_hull/u_f_p) -"sWC" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 2 +/obj/structure/bed{ + can_buckle = 0 }, -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Bathroom" +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/bedsheet/brown{ + layer = 3.1 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 5; + icon_state = "red" }, -/area/almayer/engineering/upper_engineering/port) +/area/almayer/shipboard/brig/main_office) "sWW" = ( /obj/structure/machinery/flasher{ alpha = 1; @@ -67586,14 +67414,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south2) -"sYB" = ( -/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) "sYC" = ( /obj/structure/machinery/door/airlock/almayer/maint, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -67723,12 +67543,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/aft_hallway) -"tan" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) "tat" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -67782,6 +67596,9 @@ /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{ @@ -67789,32 +67606,12 @@ }, /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 }, -/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) -"tcZ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/engineering/upper_engineering/port) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/processing) "tda" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -67845,10 +67642,7 @@ /area/almayer/hallways/hangar) "tdv" = ( /obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/main_office) "tdx" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -67925,15 +67719,6 @@ /obj/effect/landmark/late_join, /turf/open/floor/almayer, /area/almayer/living/cryo_cells) -"teE" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/toilet{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) "teH" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -67994,25 +67779,15 @@ }, /area/almayer/medical/containment/cell) "tfO" = ( -/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 +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 24 }, /turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" + dir = 4; + icon_state = "red" }, -/area/almayer/shipboard/brig/armory) +/area/almayer/shipboard/brig/processing) "tgK" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -68074,18 +67849,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"thR" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/structure/largecrate/random/secure{ - pixel_x = -5 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "thT" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -68146,6 +67909,23 @@ icon_state = "green" }, /area/almayer/hallways/starboard_hallway) +"tiw" = ( +/obj/structure/machinery/constructable_frame{ + icon_state = "box_2" + }, +/obj/item/weapon/baseballbat/metal{ + pixel_x = -2; + pixel_y = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "orange" + }, +/area/almayer/engineering/upper_engineering/starboard) "tiE" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -68243,10 +68023,9 @@ }, /area/almayer/squads/alpha_bravo_shared) "tkV" = ( -/obj/structure/bed/chair, /turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" + dir = 5; + icon_state = "red" }, /area/almayer/shipboard/brig/processing) "tld" = ( @@ -68292,20 +68071,15 @@ /area/almayer/medical/lower_medical_lobby) "tmy" = ( /obj/structure/surface/table/almayer, -/obj/item/handcuffs{ - pixel_y = 12 - }, -/obj/item/handcuffs{ - pixel_y = 6 - }, -/obj/item/handcuffs, -/obj/item/weapon/baton{ - pixel_x = -12 +/obj/structure/machinery/faxmachine/uscm/brig, +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera"; + dir = 1 }, /turf/open/floor/almayer{ icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/perma) "tmA" = ( /obj/structure/machinery/light{ dir = 8 @@ -68462,6 +68236,12 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_m_s) +"tpt" = ( +/obj/structure/machinery/sentry_holder/almayer, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/north2) "tpD" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -68488,29 +68268,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) -"tqd" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/screwdriver, -/obj/item/prop/helmetgarb/gunoil{ - pixel_x = -7; - pixel_y = 12 - }, -/obj/item/weapon/gun/rifle/l42a{ - pixel_x = 17; - pixel_y = 6 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) -"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" @@ -68554,15 +68311,19 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) -"tqV" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 26 +"tqB" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 }, /turf/open/floor/almayer{ dir = 1; icon_state = "red" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/command/lifeboat) "trb" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, @@ -68774,14 +68535,11 @@ }, /area/almayer/lifeboat_pumps/south1) "tvA" = ( -/obj/structure/machinery/sleep_console{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "sterile_green_side" +/obj/structure/bed/chair{ + dir = 1 }, -/area/almayer/shipboard/brig/surgery) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/main_office) "tvM" = ( /obj/structure/bed/chair{ dir = 1 @@ -68838,25 +68596,6 @@ icon_state = "outerhull_dir" }, /area/space) -"twI" = ( -/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) "twT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -68971,9 +68710,9 @@ }, /area/almayer/hull/upper_hull/u_a_p) "tzj" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_f_p) +/obj/structure/closet/secure_closet/brig/prisoner, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/perma) "tzx" = ( /obj/structure/machinery/cm_vending/sorted/medical/blood, /obj/structure/machinery/light{ @@ -69008,6 +68747,12 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) +"tAh" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/engineering/upper_engineering/port) "tAi" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -69075,13 +68820,6 @@ /obj/item/tool/crowbar, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south1) -"tBu" = ( -/obj/effect/decal/cleanable/blood/oil/streak, -/obj/structure/machinery/sentry_holder/almayer, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/south1) "tBz" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -69202,11 +68940,10 @@ }, /area/almayer/command/airoom) "tFv" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 +/turf/open/floor/almayer{ + allow_construction = 0 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/cryo) "tFS" = ( /obj/structure/machinery/computer/supplycomp, /obj/structure/sign/safety/terminal{ @@ -69248,12 +68985,12 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) "tGg" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/janitorialcart, +/obj/item/tool/mop, /turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" + icon_state = "plate" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/execution) "tGh" = ( /obj/structure/sign/nosmoking_2{ pixel_x = -28 @@ -69267,15 +69004,6 @@ /obj/effect/spawner/random/tool, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) -"tGj" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/north1) "tGq" = ( /obj/effect/projector{ name = "Almayer_Up4"; @@ -69336,28 +69064,17 @@ }, /area/almayer/living/briefing) "tHB" = ( -/obj/structure/surface/table/almayer, -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = -30 - }, -/obj/structure/machinery/recharger{ - layer = 3.1; - pixel_y = 8 +/obj/structure/machinery/sleep_console{ + dir = 8 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "dark_sterile" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/surgery) "tHS" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/shipboard/brig/cells) -"tId" = ( -/obj/structure/machinery/recharge_station, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/command/airoom) "tIp" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Dorms" @@ -69423,46 +69140,44 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) -"tJp" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/crowbar/red, -/obj/item/clipboard{ - pixel_x = 1; - pixel_y = 4 +"tJo" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 }, -/obj/item/storage/box/handcuffs{ - pixel_x = 5; - pixel_y = 5 +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 2; + pixel_y = 2 }, -/obj/item/reagent_container/spray/cleaner, -/turf/open/floor/almayer{ - icon_state = "plate" +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_p) +"tJp" = ( +/obj/structure/machinery/light/small{ + dir = 8 }, -/area/almayer/shipboard/brig/main_office) -"tJy" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/item/vehicle_clamp, +/obj/item/vehicle_clamp, +/obj/item/vehicle_clamp, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1; + pixel_y = -1 }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/armory) +"tJy" = ( /turf/open/floor/almayer{ - dir = 4; - icon_state = "redcorner" + dir = 6; + icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/processing) "tJz" = ( /obj/structure/machinery/firealarm{ pixel_y = -28 }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) -"tJN" = ( -/obj/structure/machinery/cryopod/right{ - layer = 3.1; - pixel_y = 13 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/command/airoom) "tJR" = ( /obj/structure/machinery/vending/cigarette, /obj/structure/sign/safety/medical{ @@ -69548,6 +69263,11 @@ icon_state = "red" }, /area/almayer/hallways/aft_hallway) +"tMn" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/bed/chair/comfy/beige, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "tMW" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -69559,29 +69279,27 @@ /area/almayer/living/briefing) "tNj" = ( /obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/sentencing{ - dir = 4 +/obj/item/device/camera{ + pixel_x = 4; + pixel_y = 8 }, -/obj/structure/machinery/light{ - dir = 8 +/obj/item/device/camera_film{ + pixel_x = 4; + pixel_y = -2 }, +/obj/item/device/camera_film, /turf/open/floor/almayer{ - dir = 8; + dir = 10; icon_state = "red" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/main_office) "tNF" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "CMP Office Shutters"; - name = "\improper Privacy Shutters" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 8 +/obj/structure/machinery/door/window/ultra{ + dir = 8; + req_access_txt = "3" }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/perma) "tNP" = ( /obj/structure/sign/safety/debark_lounge{ pixel_x = 15; @@ -69695,6 +69413,10 @@ /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +"tQM" = ( +/obj/structure/safe/co_office, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "tQV" = ( /turf/closed/wall/almayer/outer, /area/almayer/lifeboat_pumps/south1) @@ -69709,15 +69431,22 @@ }, /area/almayer/hull/lower_hull/l_m_s) "tRA" = ( -/obj/structure/bed/chair, -/obj/structure/machinery/firealarm{ - pixel_y = 28 +/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 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" + icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/armory) "tRD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -69783,12 +69512,28 @@ icon_state = "orangecorner" }, /area/almayer/living/briefing) -"tTk" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +"tSF" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/camera{ + pixel_x = -8; + pixel_y = 12 }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) +/obj/item/paper_bin/uscm{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/tool/pen{ + pixel_x = 4; + pixel_y = -4 + }, +/obj/item/storage/box/donkpockets{ + pixel_x = -8; + pixel_y = -1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "tTp" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/sriracha{ @@ -69887,13 +69632,17 @@ }, /area/almayer/hull/lower_hull/l_m_p) "tWg" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/machinery/cryopod{ + layer = 3.1; + pixel_y = 13 + }, +/obj/structure/sign/safety/cryo{ + pixel_x = -16 }, /turf/open/floor/almayer{ - icon_state = "redcorner" + icon_state = "cargo" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/cryo) "tWi" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -69947,14 +69696,21 @@ }, /area/almayer/squads/req) "tXs" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +/obj/structure/reagent_dispensers/peppertank{ + pixel_x = -30 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 8; + icon_state = "red" }, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/perma) +"tXz" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/vehiclehangar) "tXM" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -70013,6 +69769,12 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) +"tYv" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hull/upper_hull/u_f_p) "tYw" = ( /obj/effect/decal/medical_decals{ icon_state = "triagedecalbottomleft"; @@ -70034,12 +69796,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_s) -"tYM" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) "tYX" = ( /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -70082,6 +69838,12 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) +"tZB" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "tZF" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -70156,6 +69918,15 @@ 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{ @@ -70189,13 +69960,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/command/computerlab) -"uaX" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/turf/open/floor/almayer, -/area/almayer/hull/upper_hull/u_f_s) "uaZ" = ( /obj/structure/surface/table/almayer, /obj/item/weapon/gun/rifle/m41a, @@ -70219,6 +69983,26 @@ 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, +/obj/item/attachable/flashlight/grip, +/obj/item/ammo_box/magazine/l42a{ + pixel_y = 14 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "ucp" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -70251,36 +70035,15 @@ icon_state = "plate" }, /area/almayer/command/cic) -"ucI" = ( -/obj/item/device/flashlight/lamp/green{ - pixel_x = 5; - pixel_y = 3 - }, -/obj/structure/machinery/door_control{ - id = "cl_shutters"; - name = "Privacy Shutters"; - pixel_x = -5; - pixel_y = 8; - req_access_txt = "200" - }, -/obj/structure/machinery/door_control{ - id = "RoomDivider"; - name = "Room Divider"; - pixel_x = -5; - pixel_y = -4; - req_access_txt = "200" +"udb" = ( +/obj/structure/sign/safety/ammunition{ + pixel_y = 32 }, -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/machinery/door_control{ - id = "cl_evac"; - name = "Evac Pod Door Control"; - normaldoorcontrol = 1; - pixel_x = -5; - pixel_y = 2; - req_access_txt = "200" +/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol, +/turf/open/floor/almayer{ + icon_state = "redfull" }, -/turf/open/floor/carpet, -/area/almayer/command/corporateliason) +/area/almayer/medical/upper_medical) "udi" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -70372,15 +70135,6 @@ 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) "ueG" = ( /obj/item/bedsheet/orange, /obj/structure/bed{ @@ -70447,35 +70201,19 @@ icon_state = "cargo" }, /area/almayer/squads/req) -"ufL" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/uniform_vendors, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/command/cic) -"ugs" = ( -/obj/structure/surface/table/almayer, -/obj/item/book/manual/marine_law{ - pixel_x = -3; - pixel_y = 1 - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera" - }, -/obj/structure/sign/safety/medical{ - pixel_x = -17; - pixel_y = 6 - }, -/obj/structure/sign/safety/restrictedarea{ - pixel_x = -17; - pixel_y = -9 +"ufS" = ( +/obj/structure/sign/safety/terminal{ + pixel_x = 7; + pixel_y = 29 }, +/obj/structure/filingcabinet, /turf/open/floor/almayer{ - dir = 8; - icon_state = "red" + icon_state = "plate" }, -/area/almayer/shipboard/brig/lobby) +/area/almayer/command/combat_correspondent) +"ugs" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/shipboard/brig/execution) "ugu" = ( /obj/structure/machinery/cm_vending/sorted/marine_food, /turf/open/floor/almayer, @@ -70491,11 +70229,6 @@ 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, @@ -70641,12 +70374,6 @@ }, /turf/open/floor/almayer, /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 @@ -70661,16 +70388,14 @@ /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) "ula" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass{ - name = "Evidence Room" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ +/obj/structure/disposalpipe/junction{ dir = 8 }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/shipboard/brig/evidence_storage) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/processing) "uli" = ( /turf/open/floor/grass, /area/almayer/living/starboard_garden) @@ -70728,6 +70453,19 @@ icon_state = "mono" }, /area/almayer/medical/upper_medical) +"umR" = ( +/obj/structure/machinery/power/apc/almayer/hardened{ + cell_type = /obj/item/cell/hyper; + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/north2) "umS" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -70745,6 +70483,17 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_f_p) +"umY" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 2 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_s) "unh" = ( /obj/structure/surface/table/almayer, /obj/item/storage/firstaid/o2, @@ -70795,6 +70544,40 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"uoh" = ( +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/bedsheet/yellow{ + layer = 3.2 + }, +/obj/item/bedsheet/yellow{ + pixel_y = 13 + }, +/obj/structure/sign/safety/bathunisex{ + pixel_x = -16; + pixel_y = 8 + }, +/obj/item/toy/plush/barricade, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/port_emb) "uoi" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -70826,16 +70609,6 @@ }, /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{ @@ -70952,17 +70725,10 @@ /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{ - allow_construction = 0 + icon_state = "cargo" }, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/execution) "usi" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -70987,15 +70753,16 @@ }, /area/almayer/hull/upper_hull/u_m_p) "usr" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/secure_data{ - dir = 1 +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + name = "\improper Warden's Office" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 8 }, /turf/open/floor/almayer{ - dir = 6; - icon_state = "red" + icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/chief_mp_office) "usw" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -71064,15 +70831,19 @@ }, /area/almayer/hull/upper_hull/u_f_p) "uue" = ( -/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" +/obj/structure/surface/table/almayer, +/obj/item/paper_bin{ + pixel_x = -7 + }, +/obj/item/tool/pen, +/obj/item/tool/pen{ + pixel_y = 3 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 10; + icon_state = "red" }, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/main_office) "uuj" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray{ @@ -71085,16 +70856,16 @@ /turf/open/floor/almayer, /area/almayer/squads/bravo) "uuq" = ( -/obj/structure/bed, -/obj/structure/machinery/flasher{ - id = "Cell 4"; - pixel_x = 24 +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 }, +/obj/structure/surface/table/almayer, +/obj/item/storage/donut_box, /turf/open/floor/almayer{ - dir = 6; icon_state = "red" }, -/area/almayer/shipboard/brig/cells) +/area/almayer/shipboard/brig/main_office) "uuu" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -71150,24 +70921,25 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) -"uva" = ( -/obj/structure/surface/table/almayer, -/obj/effect/landmark/map_item{ - pixel_x = -8 +"uve" = ( +/obj/structure/bed, +/obj/structure/machinery/flasher{ + id = "Cell 5"; + pixel_x = -24 }, -/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 +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/shipboard/brig/cells) +"uvk" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "orange" }, -/area/almayer/living/briefing) +/area/almayer/engineering/upper_engineering/starboard) "uvs" = ( /obj/structure/machinery/conveyor{ id = "lower_garbage" @@ -71197,20 +70969,14 @@ }, /area/almayer/squads/bravo) "uvy" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1; - pixel_y = 1 +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/shipboard/brig/armory) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/processing) "uvG" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -71249,6 +71015,26 @@ icon_state = "red" }, /area/almayer/shipboard/brig/cells) +"uvZ" = ( +/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 = 1; + pixel_y = 16 + }, +/obj/item/reagent_container/food/drinks/bottle/whiskey{ + pixel_x = 9; + pixel_y = 16 + }, +/obj/item/reagent_container/food/drinks/bottle/whiskey{ + pixel_x = -7; + pixel_y = 16 + }, +/obj/item/clothing/mask/cigarette/pipe{ + pixel_y = 5 + }, +/obj/structure/surface/table/woodentable/fancy, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "uws" = ( /obj/structure/machinery/light{ dir = 4 @@ -71378,21 +71164,14 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hull/upper_hull/u_f_s) +/area/almayer/shipboard/brig/main_office) "uzx" = ( -/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 - }, +/obj/structure/closet/emcloset/legacy, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 6; + icon_state = "red" }, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/main_office) "uzy" = ( /obj/item/reagent_container/glass/bucket, /obj/effect/decal/cleanable/blood/oil, @@ -71408,34 +71187,18 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/ce_room) "uzU" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/surface/table/almayer, -/obj/item/ashtray/bronze{ - pixel_x = 5; - pixel_y = 3 - }, -/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/item/vehicle_clamp, +/obj/item/vehicle_clamp, +/obj/item/vehicle_clamp, +/obj/structure/machinery/light/small{ + dir = 4 }, -/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun, /turf/open/floor/almayer{ - dir = 4; - icon_state = "redcorner" + dir = 8; + icon_state = "plating_striped" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/armory) "uAb" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -71450,16 +71213,6 @@ icon_state = "red" }, /area/almayer/shipboard/port_missiles) -"uAl" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/port) "uAs" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -71498,12 +71251,6 @@ icon_state = "emerald" }, /area/almayer/living/port_emb) -"uAL" = ( -/obj/structure/bed/chair/wood/normal, -/obj/item/bedsheet/brown, -/obj/item/toy/plush/farwa, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/cells) "uAW" = ( /obj/structure/machinery/cryopod{ layer = 3.1; @@ -71543,12 +71290,6 @@ icon_state = "orange" }, /area/almayer/hallways/stern_hallway) -"uBM" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/combat_correspondent) "uBN" = ( /obj/structure/disposalpipe/trunk{ dir = 8 @@ -71583,11 +71324,11 @@ }, /area/almayer/living/grunt_rnr) "uCl" = ( -/obj/structure/closet/secure_closet/surgical{ - pixel_x = -30 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer{ - dir = 4; + dir = 9; icon_state = "sterile_green_side" }, /area/almayer/shipboard/brig/surgery) @@ -71626,12 +71367,11 @@ }, /area/almayer/shipboard/navigation) "uDp" = ( -/obj/structure/closet/secure_closet/brig, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 }, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/chief_mp_office) "uDA" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -71697,10 +71437,11 @@ }, /area/almayer/medical/lockerroom) "uFp" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + layer = 1.9 }, +/turf/open/floor/plating, /area/almayer/shipboard/brig/general_equipment) "uFt" = ( /obj/structure/largecrate/random/case/double, @@ -71728,6 +71469,12 @@ icon_state = "plate" }, /area/almayer/hallways/port_hallway) +"uGa" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/lifeboat_pumps/south2) "uGc" = ( /obj/structure/machinery/suit_storage_unit/compression_suit/uscm, /obj/structure/sign/safety/hazard{ @@ -71859,14 +71606,15 @@ }, /area/almayer/hull/lower_hull/l_m_s) "uJs" = ( -/obj/structure/disposalpipe/segment{ +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/secure_data{ dir = 4 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/chief_mp_office) "uJB" = ( /obj/structure/janitorialcart, /obj/item/tool/mop, @@ -71969,18 +71717,14 @@ /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) "uLJ" = ( -/obj/structure/machinery/light{ - dir = 4; - invisibility = 101 - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 32; - pixel_y = -7 +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/turf/open/floor/almayer{ - icon_state = "cargo" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/shipboard/brig/execution) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) "uLN" = ( /obj/structure/closet/secure_closet/engineering_welding, /turf/open/floor/almayer{ @@ -72039,11 +71783,17 @@ }, /area/almayer/squads/delta) "uNe" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + layer = 1.9 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/perma) +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "CMP Office Shutters"; + name = "\improper Privacy Shutters" + }, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/chief_mp_office) "uNg" = ( /obj/structure/machinery/cryopod, /turf/open/floor/almayer{ @@ -72051,14 +71801,9 @@ }, /area/almayer/living/bridgebunks) "uNl" = ( -/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) +/obj/effect/decal/cleanable/blood, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/execution) "uNB" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -72145,11 +71890,14 @@ /turf/open/floor/almayer, /area/almayer/living/port_emb) "uQm" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/bed/chair/comfy/black{ dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/shipboard/brig/chief_mp_office) "uQn" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -72185,6 +71933,15 @@ 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{ @@ -72201,19 +71958,6 @@ icon_state = "plate" }, /area/almayer/engineering/engineering_workshop/hangar) -"uRs" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "red" - }, -/area/almayer/command/lifeboat) "uRt" = ( /obj/structure/machinery/light{ dir = 8 @@ -72367,13 +72111,16 @@ }, /area/almayer/squads/charlie) "uUs" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 +/obj/structure/bed, +/obj/structure/machinery/flasher{ + id = "Cell 4"; + pixel_x = -24 }, /turf/open/floor/almayer{ - icon_state = "redcorner" + dir = 8; + icon_state = "red" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/cells) "uUt" = ( /obj/structure/surface/table/almayer, /obj/effect/spawner/random/technology_scanner, @@ -72396,18 +72143,24 @@ /area/almayer/engineering/upper_engineering/port) "uUO" = ( /obj/structure/surface/table/almayer, -/obj/structure/machinery/door_control{ - id = "courtyard_cells"; - name = "\improper Courtyard Lockdown Shutters"; - pixel_x = 16; - req_access_txt = "3" +/obj/structure/machinery/computer/sentencing{ + dir = 4 }, -/obj/structure/machinery/recharger, /turf/open/floor/almayer{ - dir = 1; + dir = 8; icon_state = "red" }, /area/almayer/shipboard/brig/processing) +"uUV" = ( +/obj/structure/machinery/shower, +/obj/structure/window/reinforced/tinted{ + dir = 8 + }, +/obj/structure/machinery/door/window/tinted{ + dir = 2 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering/upper_engineering/port) "uVb" = ( /obj/structure/closet/toolcloset, /turf/open/floor/almayer{ @@ -72454,14 +72207,14 @@ }, /area/almayer/living/cryo_cells) "uVF" = ( -/obj/structure/disposalpipe/segment{ +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/almayer{ dir = 4; icon_state = "redcorner" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/processing) "uVR" = ( /obj/structure/machinery/power/apc/almayer, /turf/open/floor/almayer{ @@ -72494,15 +72247,14 @@ /area/almayer/hallways/stern_hallway) "uWI" = ( /obj/structure/surface/table/almayer, -/obj/item/pizzabox/margherita{ +/obj/item/ashtray/plastic, +/obj/item/trash/cigbutt{ + pixel_x = 1; 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 +/obj/item/reagent_container/food/drinks/cans/souto/diet/cherry{ + pixel_x = -9; + pixel_y = 12 }, /turf/open/floor/almayer{ dir = 1; @@ -72580,16 +72332,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) -"uYd" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - pixel_y = 12 - }, -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/lifeboat) "uYg" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -72617,16 +72359,6 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/hallways/repair_bay) -"uZY" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/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) "uZZ" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Basketball Court" @@ -72645,6 +72377,15 @@ }, /turf/closed/wall/almayer, /area/almayer/hallways/starboard_umbilical) +"vba" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/engineering/upper_engineering/port) "vbf" = ( /obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 8 @@ -72674,23 +72415,6 @@ icon_state = "orange" }, /area/almayer/squads/bravo) -"vbP" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 2 - }, -/turf/open/floor/almayer, -/area/almayer/hull/upper_hull/u_f_p) -"vbR" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "green" - }, -/area/almayer/squads/req) "vbS" = ( /obj/structure/closet/secure_closet/personal/patient{ name = "morgue closet" @@ -72735,15 +72459,15 @@ }, /area/almayer/lifeboat_pumps/south2) "vcG" = ( -/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 +/obj/structure/machinery/vending/snack, +/obj/structure/machinery/status_display{ + pixel_x = 32 + }, +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" }, /turf/open/floor/almayer{ - dir = 9; - icon_state = "red" + icon_state = "plate" }, /area/almayer/shipboard/brig/general_equipment) "vcK" = ( @@ -72829,13 +72553,26 @@ }, /area/almayer/living/briefing) "vez" = ( +/obj/structure/machinery/light{ + dir = 1 + }, /obj/structure/surface/table/almayer, -/obj/item/device/camera, -/obj/item/device/camera_film, +/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 + }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 8; + icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/processing) "vfa" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -72859,17 +72596,14 @@ }, /area/almayer/powered) "vfv" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/obj/structure/machinery/power/apc/almayer{ +/obj/structure/bed/chair{ dir = 4 }, /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) "vfx" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -73169,16 +72903,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"vjd" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/command/lifeboat) "vjg" = ( /obj/structure/prop/almayer/missile_tube{ icon_state = "missiletubesouth" @@ -73271,18 +72995,20 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_s) "vkM" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass{ - dir = 1; - name = "\improper Brig Equipment" +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 2; + id = "Warden Office Shutters"; + name = "\improper Privacy Shutters" }, /obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + dir = 1; + name = "\improper Warden's Office" }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/chief_mp_office) "vkR" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -73293,30 +73019,6 @@ 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) -"vlk" = ( -/obj/structure/closet/emcloset, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/command/lifeboat) "vln" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -73334,40 +73036,6 @@ icon_state = "redfull" }, /area/almayer/shipboard/port_missiles) -"vlO" = ( -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 - }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 - }, -/obj/structure/bed{ - can_buckle = 0 - }, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 - }, -/obj/item/bedsheet/yellow{ - layer = 3.2 - }, -/obj/item/bedsheet/yellow{ - pixel_y = 13 - }, -/obj/structure/sign/safety/bathunisex{ - pixel_x = -16; - pixel_y = 8 - }, -/obj/item/toy/plush/barricade, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/port_emb) "vlR" = ( /obj/structure/machinery/light{ dir = 4 @@ -73503,21 +73171,19 @@ icon_state = "orangefull" }, /area/almayer/living/briefing) -"vpv" = ( -/obj/structure/machinery/shower, -/obj/structure/window/reinforced/tinted{ - dir = 8 +"vpI" = ( +/obj/structure/surface/table/almayer, +/obj/item/folder/red{ + pixel_x = -4 }, -/obj/structure/machinery/door/window/tinted{ - dir = 2 +/obj/item/folder/blue{ + pixel_x = 4 }, -/obj/item/clothing/mask/cigarette/weed, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering/upper_engineering/port) -"vpI" = ( -/obj/effect/landmark/start/police, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cryo) +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/evidence_storage) "vpV" = ( /turf/open/floor/almayer{ dir = 10; @@ -73648,35 +73314,35 @@ }, /area/almayer/living/offices) "vrM" = ( -/obj/structure/closet/secure_closet{ - name = "secure evidence locker"; - req_access_txt = "3" +/obj/structure/sign/safety/hazard{ + pixel_x = 32; + pixel_y = -8 + }, +/obj/structure/sign/safety/firingrange{ + pixel_x = 32; + pixel_y = 6 }, /turf/open/floor/almayer{ icon_state = "cargo" }, -/area/almayer/shipboard/brig/evidence_storage) +/area/almayer/shipboard/brig/execution) "vrQ" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 2; - id = "perma_exit"; - name = "\improper Exit Shutters" - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "perma_lockdown"; - name = "\improper Perma Lockdown Shutter" + id = "bot_armory"; + name = "\improper Armory Shutters" }, /obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 + dir = 2 }, /obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - dir = 1; - name = "\improper Brig" + name = "\improper Armory"; + dir = 2 }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/armory) "vrW" = ( /turf/open/floor/almayer{ dir = 8; @@ -73706,29 +73372,13 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"vsI" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/obj/structure/closet/secure_closet/guncabinet/blue/riot_control, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) "vsJ" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - access_modified = 1; - dir = 1; - name = "\improper Power Control Room"; - req_access = null; - req_one_access = null; - req_one_access_txt = "3;6" - }, +/obj/structure/machinery/optable, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 1; + icon_state = "sterile_green_corner" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/surgery) "vsV" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -73795,6 +73445,14 @@ icon_state = "test_floor4" }, /area/almayer/hallways/port_hallway) +"vtT" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, +/turf/open/floor/almayer, +/area/almayer/command/cichallway) "vub" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/sea_office) @@ -73944,9 +73602,12 @@ }, /area/almayer/hull/lower_hull/l_f_p) "vwO" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/general_equipment) +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) "vwP" = ( /obj/structure/surface/table/almayer, /obj/item/prop/helmetgarb/prescription_bottle{ @@ -73983,10 +73644,18 @@ /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{ - icon_state = "red" + dir = 4; + icon_state = "plating_striped" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/armory) "vxM" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/cryo) @@ -74046,15 +73715,18 @@ }, /area/almayer/medical/lower_medical_lobby) "vyE" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 +/obj/structure/machinery/power/apc/almayer{ + dir = 8 + }, +/obj/structure/sign/safety/rewire{ + pixel_x = -17; + pixel_y = 17 }, -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 8; + icon_state = "red" }, -/area/almayer/shipboard/brig/lobby) +/area/almayer/shipboard/brig/perma) "vyI" = ( /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/port) @@ -74141,8 +73813,17 @@ }, /area/almayer/squads/alpha) "vAG" = ( -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/chief_mp_office) +/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) "vAQ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/reagent_analyzer{ @@ -74181,17 +73862,17 @@ }, /area/almayer/living/briefing) "vBJ" = ( -/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 +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer{ - allow_construction = 0 + dir = 8; + icon_state = "redcorner" }, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/main_office) "vBU" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -74240,18 +73921,28 @@ icon_state = "green" }, /area/almayer/shipboard/brig/cells) +"vCz" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/lifeboat_pumps/north1) "vCG" = ( -/obj/structure/toilet{ - dir = 8 +/obj/structure/machinery/door/poddoor/almayer/locked{ + dir = 2; + id = "Perma 2"; + name = "\improper cell shutter" }, -/obj/structure/sink{ - pixel_y = 24 +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + name = "\improper Isolation Cell"; + dir = 2 }, -/obj/structure/machinery/light/small, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/perma) "vCO" = ( /obj/effect/landmark/start/bridge, /turf/open/floor/plating/plating_catwalk, @@ -74264,14 +73955,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/hydroponics) -"vEf" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "vEj" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -74402,6 +74085,16 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/living/port_emb) +"vHl" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/command/lifeboat) "vHq" = ( /obj/item/device/assembly/mousetrap/armed, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -74719,6 +74412,14 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) +"vMC" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "vME" = ( /turf/open/floor/almayer{ dir = 9; @@ -74771,12 +74472,12 @@ }, /area/almayer/command/cic) "vOd" = ( -/obj/structure/machinery/optable, -/obj/structure/sign/safety/medical{ - pixel_x = -17 +/obj/structure/machinery/body_scanconsole{ + dir = 8 }, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + dir = 8; + icon_state = "sterile_green_side" }, /area/almayer/shipboard/brig/surgery) "vOh" = ( @@ -74907,9 +74608,12 @@ name = "\improper Courtyard Lockdown Shutter" }, /obj/structure/machinery/door/poddoor/almayer/locked{ - id = "Cell 4"; + id = "Cell 5"; name = "\improper Courtyard Divider" }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -75116,14 +74820,6 @@ /obj/structure/machinery/light/small, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) -"vUk" = ( -/obj/item/storage/toolbox/mechanical{ - pixel_y = 13 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "vUI" = ( /obj/structure/largecrate/random/barrel/white, /obj/structure/sign/safety/security{ @@ -75136,12 +74832,21 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) "vUL" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/flash, +/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 + }, /turf/open/floor/almayer{ - icon_state = "plate" + allow_construction = 0 }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/cryo) "vUU" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -75190,13 +74895,6 @@ icon_state = "sterile_green" }, /area/almayer/medical/containment) -"vVu" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer, -/area/almayer/command/lifeboat) "vVw" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -75223,12 +74921,6 @@ 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, @@ -75299,27 +74991,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) -"vWG" = ( -/obj/structure/pipes/vents/pump, -/obj/item/tool/soap, -/obj/effect/decal/cleanable/blood, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/sink{ - pixel_y = 24 - }, -/obj/structure/mirror{ - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/shipboard/brig/cells) "vWJ" = ( /obj/structure/machinery/landinglight/ds1/delaytwo{ dir = 4 @@ -75367,7 +75038,7 @@ dir = 1 }, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/processing) "vXX" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/tool, @@ -75482,6 +75153,16 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull) +"vZJ" = ( +/obj/structure/sign/safety/intercom{ + pixel_x = 8; + pixel_y = 32 + }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/medical/upper_medical) "wan" = ( /obj/structure/surface/table/almayer, /obj/item/facepaint/brown, @@ -75689,11 +75370,18 @@ }, /area/almayer/medical/medical_science) "wdr" = ( -/obj/structure/machinery/power/apc/almayer, +/obj/structure/pipes/vents/scrubber, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/main_office) +"wdv" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, /turf/open/floor/almayer{ - icon_state = "red" + icon_state = "redfull" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/engineering/upper_engineering) "wdz" = ( /obj/effect/landmark/start/marine/engineer/charlie, /obj/effect/landmark/late_join/charlie, @@ -75782,14 +75470,18 @@ /turf/closed/wall/almayer, /area/almayer/living/gym) "wfL" = ( -/obj/structure/bed/chair/wood/normal{ - dir = 1 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" }, -/obj/effect/decal/cleanable/blood, /turf/open/floor/almayer{ - icon_state = "cargo" + dir = 6; + icon_state = "red" }, -/area/almayer/shipboard/brig/execution) +/area/almayer/shipboard/brig/chief_mp_office) "wfZ" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = -12 @@ -75903,15 +75595,11 @@ /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop) "wir" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer{ - allow_construction = 0 +/obj/structure/sign/safety/bulkhead_door{ + pixel_x = -16 }, -/area/almayer/shipboard/brig/lobby) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_p) "wiz" = ( /obj/structure/bed/chair{ dir = 4 @@ -76028,12 +75716,6 @@ icon_state = "test_floor4" }, /area/almayer/medical/medical_science) -"wkA" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" - }, -/turf/open/floor/almayer, -/area/almayer/command/lifeboat) "wkH" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/device/whistle{ @@ -76046,17 +75728,6 @@ icon_state = "bluefull" }, /area/almayer/command/cichallway) -"wkL" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/secure_closet/guncabinet, -/obj/item/weapon/gun/rifle/l42a{ - pixel_y = 6 - }, -/obj/item/weapon/gun/rifle/l42a, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "wkM" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "ARES StairsLower"; @@ -76135,14 +75806,15 @@ }, /area/almayer/hull/lower_hull/l_m_p) "wly" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 }, -/turf/open/floor/almayer{ - icon_state = "red" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 }, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/execution) "wlE" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -76194,11 +75866,11 @@ /area/almayer/living/briefing) "wmE" = ( /obj/structure/machinery/door/window/brigdoor/southright{ - id = "Cell 4"; - name = "Cell 4" + id = "Cell 5"; + name = "Cell 5" }, -/obj/structure/sign/safety/four{ - pixel_x = 32 +/obj/structure/sign/safety/five{ + pixel_x = -17 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) @@ -76298,6 +75970,13 @@ icon_state = "rasputin3" }, /area/almayer/powered/agent) +"wpj" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 2 + }, +/turf/open/floor/almayer, +/area/almayer/hull/upper_hull/u_f_p) "wpw" = ( /obj/structure/bed/chair/comfy/ares{ dir = 1 @@ -76351,20 +76030,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/stern_hallway) -"wqr" = ( -/obj/structure/sign/safety/terminal{ - pixel_x = 7; - pixel_y = 29 +"wqu" = ( +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = 26 }, -/obj/structure/filingcabinet, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "red" }, -/area/almayer/command/combat_correspondent) -"wqu" = ( -/obj/structure/window/framed/almayer, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/lobby) +/area/almayer/shipboard/brig/processing) "wqA" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -76548,18 +76222,6 @@ /obj/item/reagent_container/food/snacks/sliceable/pizza/vegetablepizza, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) -"wuT" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "orange" - }, -/area/almayer/engineering/upper_engineering/starboard) "wvb" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -76577,25 +76239,33 @@ }, /area/almayer/lifeboat_pumps/south1) "wvI" = ( -/obj/item/paper_bin/uscm{ - pixel_y = 7 +/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/tool/pen, -/obj/structure/surface/table/reinforced/black, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 9; + icon_state = "red" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/chief_mp_office) "wvT" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 4; + icon_state = "pipe-c" }, /obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 + dir = 6 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 1; + icon_state = "red" }, /area/almayer/shipboard/brig/processing) "wvU" = ( @@ -76736,6 +76406,18 @@ icon_state = "bluefull" }, /area/almayer/command/cichallway) +"wyv" = ( +/obj/structure/machinery/door_control{ + id = "ARES JoeCryo"; + name = "Working Joe Cryogenics Lockdown"; + pixel_x = -24; + pixel_y = -8; + req_one_access_txt = "91;92" + }, +/obj/effect/landmark/late_join/working_joe, +/obj/effect/landmark/start/working_joe, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/airoom) "wyO" = ( /obj/structure/largecrate/random/barrel/red, /obj/structure/prop/invuln/overhead_pipe{ @@ -76769,8 +76451,7 @@ /area/almayer/hull/lower_hull/l_a_s) "wzx" = ( /obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 + icon_state = "NW-out" }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) @@ -76787,6 +76468,13 @@ icon_state = "sterile_green" }, /area/almayer/medical/lower_medical_medbay) +"wAd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/hull/upper_hull/u_f_p) "wAR" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -76836,20 +76524,15 @@ }, /area/almayer/living/briefing) "wCM" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 1 +/obj/structure/pipes/vents/pump, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 }, /turf/open/floor/almayer{ dir = 1; - icon_state = "red" + icon_state = "sterile_green_side" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/surgery) "wCT" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_AresDown"; @@ -77020,18 +76703,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"wFJ" = ( -/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) "wFR" = ( /turf/open/floor/almayer, /area/almayer/living/gym) @@ -77072,13 +76743,6 @@ /obj/effect/landmark/late_join/delta, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/delta) -"wGI" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/hull/upper_hull/u_f_p) "wGX" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -77185,12 +76849,6 @@ icon_state = "plate" }, /area/almayer/hallways/vehiclehangar) -"wJB" = ( -/obj/structure/machinery/cryopod/right, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/command/airoom) "wJD" = ( /obj/structure/bed/chair{ dir = 8; @@ -77212,23 +76870,6 @@ "wJH" = ( /turf/closed/wall/almayer/research/containment/wall/east, /area/almayer/medical/containment/cell/cl) -"wJQ" = ( -/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) "wKn" = ( /obj/structure/surface/rack, /obj/item/facepaint/sniper, @@ -77260,6 +76901,15 @@ }, /turf/open/floor/plating, /area/almayer/medical/containment) +"wKS" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "red" + }, +/area/almayer/command/lifeboat) "wLi" = ( /obj/structure/machinery/door_control/airlock{ id = "s_engi"; @@ -77372,14 +77022,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_s) -"wMv" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/living/auxiliary_officer_office) "wMG" = ( /obj/structure/machinery/cryopod/right{ pixel_y = 6 @@ -77429,30 +77071,17 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull) -"wNS" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/lifeboat) "wNT" = ( /obj/structure/platform, /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 = "test_floor4" + icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_p) "wOh" = ( @@ -77487,11 +77116,8 @@ }, /area/almayer/lifeboat_pumps/south1) "wPk" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" - }, -/area/almayer/shipboard/brig/execution) +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) "wPz" = ( /turf/open/floor/almayer{ icon_state = "mono" @@ -77518,6 +77144,16 @@ icon_state = "bluefull" }, /area/almayer/command/cichallway) +"wQa" = ( +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/medical/upper_medical) "wQg" = ( /turf/open/floor/almayer{ dir = 1; @@ -77525,21 +77161,16 @@ }, /area/almayer/hallways/aft_hallway) "wQk" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/machinery/status_display{ - pixel_y = -32 +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 8 }, -/obj/structure/machinery/vending/coffee, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 +/obj/structure/machinery/door/airlock/almayer/security/glass{ + name = "Evidence Room" }, /turf/open/floor/almayer{ - icon_state = "red" + icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/evidence_storage) "wQv" = ( /obj/structure/machinery/light{ dir = 8 @@ -77556,15 +77187,14 @@ }, /area/almayer/hull/upper_hull/u_a_s) "wRm" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/machinery/brig_cell/cell_2{ + pixel_x = 32; + pixel_y = -32 }, -/obj/structure/machinery/vending/snack{ - density = 0; - pixel_y = 16 +/turf/open/floor/almayer{ + allow_construction = 0 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) +/area/almayer/shipboard/brig/processing) "wRN" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/item/seeds/goldappleseed, @@ -77779,17 +77409,6 @@ "wVb" = ( /turf/closed/wall/almayer/outer, /area/almayer/hull/lower_hull/l_a_s) -"wVw" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/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) "wVy" = ( /obj/structure/window/reinforced{ dir = 8 @@ -77814,11 +77433,22 @@ }, /area/almayer/squads/charlie_delta_shared) "wVz" = ( -/obj/structure/machinery/light/small{ +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/card{ dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_f_p) +/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) "wVB" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -77843,24 +77473,28 @@ /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) "wVV" = ( -/obj/structure/machinery/cryopod{ - 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/cryo) +/area/almayer/shipboard/brig/evidence_storage) "wVW" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/command/cic) "wVY" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/surface/rack, +/obj/item/storage/box/gloves{ + pixel_x = 3; + pixel_y = 3 }, +/obj/item/storage/box/masks, /turf/open/floor/almayer{ - allow_construction = 0 + icon_state = "sterile_green_side" }, -/area/almayer/shipboard/brig/lobby) +/area/almayer/shipboard/brig/surgery) "wWf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -77901,6 +77535,22 @@ icon_state = "blue" }, /area/almayer/living/pilotbunks) +"wWJ" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/port_emb) "wWL" = ( /obj/item/tool/screwdriver, /obj/structure/platform_decoration{ @@ -78020,23 +77670,19 @@ /turf/open/floor/plating, /area/almayer/engineering/ce_room) "wYZ" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/machinery/photocopier{ - anchored = 0 +/obj/structure/machinery/door/airlock/almayer/secure/reinforced{ + name = "\improper Armourer's Workshop"; + req_access = null }, -/obj/structure/sign/poster/io{ - pixel_y = 32; - name = "propaganda poster" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, -/turf/open/floor/wood/ship, -/area/almayer/command/corporateliason) +/area/almayer/hull/upper_hull/u_m_s) "wZa" = ( /turf/open/floor/almayer{ icon_state = "redcorner" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/main_office) "wZv" = ( /obj/structure/prop/invuln{ desc = "An inflated membrane. This one is puncture proof. Wow!"; @@ -78280,22 +77926,20 @@ icon_state = "tcomms" }, /area/almayer/engineering/engine_core) -"xfk" = ( -/obj/structure/surface/rack, -/obj/item/stack/cable_coil, -/obj/item/attachable/flashlight/grip, -/obj/item/ammo_box/magazine/l42a{ - pixel_y = 14 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "xfm" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/living/cafeteria_officer) +"xfw" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/fancy/cigarettes/lucky_strikes, +/obj/item/packageWrap, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "green" + }, +/area/almayer/squads/req) "xfO" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -78364,6 +78008,16 @@ icon_state = "plating" }, /area/almayer/hallways/vehiclehangar) +"xgE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/toolbox/mechanical{ + pixel_x = 4; + pixel_y = -3 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "xgJ" = ( /obj/structure/machinery/cm_vending/sorted/medical/blood, /obj/structure/machinery/light{ @@ -78457,14 +78111,6 @@ }, /turf/open/floor/carpet, /area/almayer/command/cichallway) -"xik" = ( -/obj/structure/machinery/shower{ - dir = 8 - }, -/obj/item/toy/inflatable_duck, -/obj/structure/window/reinforced, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) "xiz" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice12"; @@ -78492,14 +78138,18 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) -"xjt" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/machinery/computer/card{ - dir = 4; - pixel_x = 2 +"xjw" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/engineering/upper_engineering/port) "xjz" = ( /turf/open/floor/almayer{ icon_state = "plating_striped" @@ -78678,28 +78328,6 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull/l_a_p) -"xns" = ( -/obj/structure/machinery/door_control{ - id = "ARES JoeCryo"; - name = "Working Joe Cryogenics Lockdown"; - pixel_x = -24; - pixel_y = -8; - req_one_access_txt = "91;92" - }, -/obj/effect/landmark/late_join/working_joe, -/obj/effect/landmark/start/working_joe, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/airoom) -"xnz" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "red" - }, -/area/almayer/command/lifeboat) "xnI" = ( /obj/effect/landmark/start/requisition, /turf/open/floor/plating/plating_catwalk, @@ -78756,20 +78384,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"xoS" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/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) "xpd" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -78787,23 +78401,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) -"xpi" = ( -/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) "xpo" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -78815,16 +78412,22 @@ /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ - access_modified = 1; - name = "\improper Brig"; - req_access = null; - req_one_access_txt = "1;3" +/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" }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/lobby) +/area/almayer/shipboard/brig/perma) "xpt" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -78908,21 +78511,14 @@ /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) "xro" = ( -/obj/structure/toilet{ - pixel_y = 13 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/area/almayer/shipboard/brig/perma) -"xrq" = ( -/obj/structure/closet/firecloset, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/turf/open/floor/almayer{ - icon_state = "cargo" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/command/lifeboat) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cells) "xrr" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -78937,12 +78533,10 @@ }, /area/almayer/hull/upper_hull/u_a_p) "xrP" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/turf/open/floor/almayer{ + allow_construction = 0 }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/evidence_storage) +/area/almayer/shipboard/brig/main_office) "xsl" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -78973,6 +78567,12 @@ icon_state = "cargo" }, /area/almayer/hallways/vehiclehangar) +"xtg" = ( +/obj/structure/machinery/cm_vending/clothing/staff_officer_armory, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/command/cic) "xtD" = ( /obj/structure/surface/table/almayer, /obj/item/tool/weldpack, @@ -78990,36 +78590,12 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) -"xtQ" = ( -/obj/structure/surface/rack, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0; - pixel_x = -6; - pixel_y = 7 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0; - pixel_x = -6; - pixel_y = -3 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0; - pixel_x = 5; - pixel_y = 9 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0; - pixel_x = 5; - pixel_y = -3 - }, -/obj/structure/noticeboard{ - desc = "The note is haphazardly attached to the cork board by what looks like a bent firing pin. 'The order has come in to perform end of life service checks on all L42A service rifles, any that are defective are to be dis-assembled and packed into a crate and sent to to the cargo hold. L42A service rifles that are in working order after servicing, are to be locked in secure cabinets ready to be off-loaded at Chinook. Scheduled end of life service for the L42A - Complete'"; - pixel_y = 29 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +"xub" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 }, -/area/almayer/hull/upper_hull/u_m_s) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/general_equipment) "xuc" = ( /obj/structure/surface/table/almayer, /obj/item/tool/extinguisher, @@ -79112,18 +78688,23 @@ }, /area/almayer/hallways/aft_hallway) "xvr" = ( -/turf/closed/wall/almayer, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/structure/toilet{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/brig/perma) "xvw" = ( -/obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" }, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/processing) "xvE" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/multi_tile/almayer/marine/charlie{ @@ -79202,17 +78783,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/aft_hallway) -"xxa" = ( -/obj/item/stack/sheet/cardboard{ - amount = 50 - }, -/obj/structure/surface/rack, -/obj/item/packageWrap, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "green" - }, -/area/almayer/squads/req) "xxe" = ( /obj/structure/surface/rack, /obj/item/tool/crowbar, @@ -79364,7 +78934,12 @@ /area/almayer/hallways/hangar) "xyz" = ( /obj/structure/sign/safety/maint{ - pixel_x = -17 + pixel_x = -19; + pixel_y = -6 + }, +/obj/structure/sign/safety/bulkhead_door{ + pixel_x = -19; + pixel_y = 6 }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) @@ -79374,15 +78949,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_s) -"xyL" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/south2) "xyY" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ @@ -79423,12 +78989,13 @@ }, /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) "xAe" = ( @@ -79460,6 +79027,10 @@ icon_state = "green" }, /area/almayer/squads/req) +"xAC" = ( +/obj/structure/surface/rack, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering/upper_engineering/port) "xAI" = ( /obj/structure/platform{ dir = 1 @@ -79520,12 +79091,11 @@ }, /area/almayer/squads/req) "xCd" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = 30 - }, -/turf/open/floor/almayer{ - icon_state = "redcorner" +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, +/turf/open/floor/plating, /area/almayer/shipboard/brig/processing) "xCj" = ( /obj/structure/closet/emcloset, @@ -79560,13 +79130,6 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_m_p) -"xDj" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 2 - }, -/turf/open/floor/almayer, -/area/almayer/hull/upper_hull/u_f_p) "xDn" = ( /turf/open/floor/almayer{ dir = 1; @@ -79608,18 +79171,25 @@ /turf/open/floor/almayer, /area/almayer/living/briefing) "xEc" = ( -/turf/open/floor/almayer{ - dir = 9; - icon_state = "red" +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out" }, -/area/almayer/shipboard/brig/main_office) -"xEe" = ( -/obj/structure/bed, -/obj/structure/machinery/status_display{ - pixel_x = -32 +/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, +/area/almayer/shipboard/brig/execution) +"xEe" = ( /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "red" }, /area/almayer/shipboard/brig/perma) "xEz" = ( @@ -79652,19 +79222,11 @@ unacidable = 1; unslashable = 1 }, -/obj/structure/surface/table/almayer, -/obj/item/storage/box/handcuffs{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/device/flash{ - pixel_y = -8 - }, +/obj/structure/machinery/computer/crew, /turf/open/floor/almayer{ - dir = 10; icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/perma) "xFw" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -79757,11 +79319,16 @@ }, /area/almayer/living/briefing) "xHe" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, /turf/open/floor/almayer{ - icon_state = "red" + dir = 8; + icon_state = "redcorner" }, /area/almayer/shipboard/brig/main_office) "xHp" = ( @@ -79775,13 +79342,6 @@ 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{ @@ -79831,12 +79391,11 @@ }, /area/almayer/medical/lower_medical_medbay) "xIw" = ( -/obj/structure/machinery/brig_cell/cell_2{ - pixel_x = 32 - }, -/turf/open/floor/almayer{ - allow_construction = 0 +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + layer = 1.9 }, +/turf/open/floor/plating, /area/almayer/shipboard/brig/processing) "xIQ" = ( /obj/effect/decal/warning_stripes{ @@ -79864,6 +79423,12 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) +"xJn" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/engineering/upper_engineering/starboard) "xJC" = ( /obj/structure/machinery/door/airlock/almayer/generic/corporate{ name = "Corporate Liaison's Closet" @@ -79887,12 +79452,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"xJT" = ( -/obj/structure/toilet{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) "xKM" = ( /obj/structure/machinery/status_display{ pixel_x = 16; @@ -80009,6 +79568,12 @@ 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" = ( @@ -80082,14 +79647,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) -"xNL" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 2 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/vehiclehangar) "xOL" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -80156,19 +79713,19 @@ }, /area/almayer/medical/containment/cell) "xQD" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = -25 - }, -/obj/item/paper_bin/uscm{ - pixel_y = 7 +/obj/item/stack/sheet/glass/reinforced{ + amount = 50 }, -/obj/item/tool/pen, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "red" +/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 }, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/chief_mp_office) "xQV" = ( /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer/no_build{ @@ -80304,26 +79861,16 @@ }, /area/almayer/shipboard/brig/cic_hallway) "xSA" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/flashlight/lamp{ - layer = 3.1; - pixel_x = 7; - pixel_y = 10 - }, -/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/restrictedarea{ + pixel_y = 32 }, -/obj/structure/sign/safety/intercom{ - pixel_x = -17 +/obj/structure/sign/safety/security{ + pixel_x = 15; + pixel_y = 32 }, +/obj/structure/bed/sofa/south/grey/right, /turf/open/floor/almayer{ - dir = 9; + dir = 1; icon_state = "red" }, /area/almayer/shipboard/brig/lobby) @@ -80367,14 +79914,11 @@ }, /area/almayer/medical/containment) "xTp" = ( -/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; + dir = 9; icon_state = "red" }, /area/almayer/shipboard/brig/processing) @@ -80454,14 +79998,6 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_s) -"xUV" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "xVc" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/machinery/door_control{ @@ -80600,11 +80136,6 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) -"xYe" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/weldingtool, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_m_s) "xYf" = ( /obj/structure/machinery/cm_vending/clothing/sea, /turf/open/floor/almayer{ @@ -80613,30 +80144,24 @@ }, /area/almayer/shipboard/sea_office) "xYj" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 8 +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1 }, -/obj/structure/surface/rack, -/obj/effect/spawner/random/toolbox, -/obj/structure/machinery/computer/working_joe{ - dir = 4; - pixel_x = -17; - pixel_y = 14 +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter" }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "orange" +/obj/structure/machinery/door/poddoor/almayer/locked{ + id = "Cell 6"; + name = "\improper Courtyard Divider" }, -/area/almayer/shipboard/brig/cells) -"xYr" = ( -/obj/structure/machinery/light, -/obj/structure/machinery/cm_vending/gear/commanding_officer{ - pixel_y = 0 +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "test_floor4" }, -/area/almayer/living/commandbunks) +/area/almayer/shipboard/brig/cells) "xYB" = ( /obj/structure/sign/safety/storage{ pixel_x = 8; @@ -80670,6 +80195,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering) +"xZf" = ( +/obj/structure/machinery/light, +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle_ap, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/command/cic) +"xZz" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/faxmachine/uscm/command/capt, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "xZI" = ( /obj/structure/prop/invuln/lattice_prop{ dir = 1; @@ -80747,19 +80284,12 @@ }, /area/almayer/command/airoom) "ybb" = ( -/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, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 4; + icon_state = "plating_striped" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/armory) "ybf" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -80837,8 +80367,23 @@ /area/almayer/squads/req) "ycr" = ( /obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/secure_data, -/turf/open/floor/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" + }, /area/almayer/shipboard/brig/processing) "ycV" = ( /obj/structure/curtain/red, @@ -80863,6 +80408,10 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/port) +"ydr" = ( +/obj/structure/largecrate/supply/weapons/pistols, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_m_s) "ydx" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -80910,20 +80459,6 @@ 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 @@ -80932,6 +80467,17 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) +"yeo" = ( +/obj/structure/machinery/cm_vending/clothing/dress{ + req_access = list(1) + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) +"yev" = ( +/obj/item/device/flashlight/lamp/green, +/obj/structure/surface/table/woodentable/fancy, +/turf/open/floor/carpet, +/area/almayer/living/commandbunks) "yeH" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -80968,25 +80514,26 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_s) "yeR" = ( -/obj/structure/machinery/cm_vending/clothing/senior_officer{ - req_access = null; - req_access_txt = 19; - req_one_access = null - }, +/obj/structure/bed, +/obj/item/bedsheet/red, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/chief_mp_office) -"yff" = ( -/obj/structure/machinery/cm_vending/clothing/dress{ +"yeX" = ( +/obj/structure/machinery/cm_vending/clothing/military_police{ density = 0; pixel_y = 16 }, -/obj/structure/machinery/light{ - dir = 4 +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 }, /turf/open/floor/almayer{ icon_state = "cargo" }, -/area/almayer/command/cic) +/area/almayer/shipboard/brig/general_equipment) "yfm" = ( /obj/effect/landmark/start/marine/delta, /obj/effect/landmark/late_join/delta, @@ -81031,18 +80578,6 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) -"yfG" = ( -/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) "yfS" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -81059,6 +80594,18 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) +"ygs" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Bathroom" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/captain_mess) "ygy" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -81074,6 +80621,16 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) +"ygM" = ( +/obj/structure/sign/safety/ammunition{ + pixel_x = 32; + pixel_y = 7 + }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/medical/upper_medical) "yhI" = ( /turf/open/floor/almayer{ dir = 4; @@ -81195,6 +80752,16 @@ icon_state = "cargo" }, /area/almayer/hull/lower_hull/l_m_s) +"ykD" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/command/lifeboat) "ykF" = ( /obj/structure/machinery/cm_vending/sorted/tech/tool_storage, /turf/open/floor/almayer{ @@ -81245,6 +80812,12 @@ icon_state = "plate" }, /area/almayer/squads/delta) +"ylg" = ( +/obj/structure/machinery/cryopod/right, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/command/airoom) "ylJ" = ( /obj/structure/sign/safety/maint{ pixel_x = 8; @@ -88022,10 +87595,10 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH aaa aaa aac @@ -88221,7 +87794,7 @@ aaa aaa aaa aaa -aaa +bdH aaa aaa aaa @@ -88232,13 +87805,13 @@ aaa aaa aaa aad -cZs -cZs -iZG -iZG -iZG -cZs -cZs +ugs +ugs +ugs +ugs +ugs +ugs +ugs ajZ aaa aaa @@ -88424,7 +87997,7 @@ aaa aaa aaa aaa -aaa +bdH aaa aaa aaa @@ -88435,13 +88008,13 @@ aaf aaf aaf aag -cZs +ugs cWN -dgx -dgx +sEa +buX dgx sdq -cZs +ugs aag aaf aaf @@ -88627,7 +88200,7 @@ aaa aaa aaa aaa -aaa +bdH aaa aaa aaa @@ -88638,18 +88211,18 @@ cZs cZs cZs cZs -cZs +ugs dfp sEa -vBJ +ntm uNl oxn -cZs -xEF -xEF -xEF -xEF -xEF +ugs +ugs +ugs +ugs +ugs +ugs ajZ aaa aaa @@ -88837,22 +88410,22 @@ aac aaf aag cZs -yeR -aTg -kyI -aTg -pdG +naB +naB +naB +naB +mtl vAG dOL jfY -hwS +jfY wly -wIC -dtN +xEc +mtl syM -irr -dAb -xEF +rTt +ePB +ugs aag aaf ajY @@ -89043,19 +88616,19 @@ cZs osJ aTg xvr -bZN -wIC +naB +mtl dWk fYX ush -rTt -vAG -wIC +uca +vrM +swo fGN -kIV -kIV -shw -xEF +ntm +ntm +tGg +ugs xEF xEF ajZ @@ -89242,23 +88815,23 @@ aaf pCi pCi myT -wIC +naB lcW -pbC -xvr +pHp +qfR vCG -wIC -tNF +rRQ tNF -wIC -hzx -wIC -wIC -vBm -vBm -bIi -mnm -kPo +mtl +mtl +mtl +mtl +kDb +mtl +hbG +dpa +qYH +mtl cFX xEF xEF @@ -89445,23 +89018,23 @@ pCi pCi cpf cos -wIC -wIC -wIC -wIC -wIC -wIC -cNY -tak +naB +osJ +eOk +kPo +qvf +tzj +qPD +tXs sip -mLJ -ntm -hND -kif +kjN +vyE hND -mnm -wVz -kIV +mtl +mtl +mtl +mtl +mtl dDQ sGe xEF @@ -89642,35 +89215,35 @@ pCi mUQ rPC wcn -wcn +iOU xhM wcn tng hGD wzx -vBm -paq -uoY -vUL -vez -xys -swo -eRL -eRL -mLJ -bua -vBm -xkd -xkd -xkd -xkd +naB +naB +naB +naB +naB +xEe +qPD +qPD +qPD +qPD +bTw +lnJ +xps +guN +xps +uaq kIV iYi gSs eyd kIV kQz -mnm +wir kIV kIV flP @@ -89851,26 +89424,26 @@ dPY rTV wcn tYB -vBm -qfR -tak -tak +naB +osJ +eOk +kPo bvx -xys -ldu -eRL -eRL -mLJ -eiO +tzj +qPD +qyd +bAM +bAM +rra xFs xkd -teE -xJT xkd xkd xkd -mnm -mnm +xkd +xkd +shw +oIc iqx qFl vUI @@ -90054,22 +89627,22 @@ vBm vBm qmC vBm -vBm +naB ouV -bTw -sjc +pHp +qfR dci rzj -tGg -sjc -sjc -iqn -eRL +qPD +eiO +qPD +qPD +hGa tmy xkd -vWG -lJL -dQp +eiH +aTV +xkd xzu xkd xkd @@ -90241,7 +89814,7 @@ aaa aaa aaa aaa -aaa +bdH bdH bdH aad @@ -90257,22 +89830,22 @@ mqo vBm eRL rag -qqN -lzx -mLJ +naB +osJ +pzc bua -gcT -dSc +naB +naB qre -eRL +fnl eOR +qPD aJz -dXy nHg xkd -xik -bjQ -xkd +rUB +dSn +soa eTo iHG dCe @@ -90443,8 +90016,8 @@ aaa aaa aaa aaa -aaa -aaa +bdH +bdH bdH bdH aad @@ -90459,22 +90032,22 @@ wgi wgi ckS eRL -bua -gcT -gcT -tJy -fnC -tpn -tpn -tpn -ula -tpn -wvT -luw +cNY +naB +naB +naB +naB +naB +naB +sgi +sgi +sgi +oEE +sdF sgi xkd -xkd -xkd +ghX +rAv xkd kmd tUx @@ -90647,7 +90220,7 @@ aaa aaa aaa aaa -aaa +bdH bdH bdH aad @@ -90664,20 +90237,20 @@ vBm pcQ xHe gqW -gqW +tak lCM -ugT -tpn -vrM +geX +tNj +xys kta -vWo -xrP -xTp -pyj +wVz +dtN +egR +ula pwt xkd -uvY -oBq +xkd +xkd xkd rPh iOD @@ -90850,7 +90423,7 @@ aaa aaa aaa aaa -aaa +bdH bdH bdH aad @@ -90865,24 +90438,24 @@ xhE xhE vBm hKq -cdk +giZ soD tdv -szy +tdv wdr -tpn -aeo -sIw -eni xrP -xTp -pyj -hTt -kMH -tUx -iTI -hzJ -cyZ +aeo +wdF +wdF +wdF +wdF +cMl +avz +xkd +uvY +oBq +xkd +nJo jVa jVa tHS @@ -91053,7 +90626,7 @@ aaa aaa aaa aaa -aaa +bdH bdH bdH aad @@ -91068,24 +90641,24 @@ ssD gcT rmv eRL -mLJ -bua -nNQ -gcT -ciF -tpn -vrM -eBW -eOh +eRL +nBo xrP -xTp -pyj -kfN -xkd -qFu -xkd -xkd -qJZ +xrP +xrP +xrP +bZN +wdF +wdF +wdF +wdF +cMl +hTt +kMH +tUx +iTI +rkK +eZH jVa jVa tHS @@ -91256,7 +90829,7 @@ aaa aaa aaa aaa -aaa +bdH bdH bdH aad @@ -91264,29 +90837,29 @@ aag ahE nBc wcn -vBm -vBm -vBm -vBm -vBm -vBm -hZU -mLJ +lrq +lrq +lrq +lrq +lrq +lrq +lrq +fNA fkn -gaJ -gaJ -gaJ -gaJ tpn tpn -ueo +wQk tpn -wCM -pyj -opN +tpn +vez +uUO +qUb +wdF +cMl +lMc +xkd +qFu xkd -uvY -duT xkd vdM jVa @@ -91459,7 +91032,7 @@ aaa aaa aaa aaa -aaa +bdH bdH bdH aad @@ -91467,30 +91040,30 @@ aag pCi mUQ aou -vBm +lrq tJp ybb -tHB +ybb aEk -nSM -ldu -mLJ +vxC +lrq +eRL pYF -gaJ -wVV -wVV +tpn +daj +bRH wVV -gaJ -aOY +tpn +ffV +fDC +qZg wdF -sdF -kNi -pyj -xIw -kVZ -tUx -iTI -nXm +wSm +opN +xkd +uvY +duT +xkd eZH jVa jVa @@ -91662,7 +91235,7 @@ aaa aaa aaa aaa -aaa +bdH bdH bdH aad @@ -91670,34 +91243,34 @@ aag pCi hKi rPC -vBm +lrq sQS -xEc -grl -egR -tak -lzx -mLJ -ugT -fso -vpI -vpI +uqo +uqo +uqo +uqo +tRA +eRL +igt +tpn vpI -cuk -tkV -jFR -oRk -kxM -jSw -vBm -vBm -qof -vBm -vBm +bRH +wVV +tpn +fCg +wdF +wdF +wdF +wSm wRm +dqV tUx -vrx +iTI +paq +eZH tUx +vrx +goD gSV eZH tUx @@ -91873,31 +91446,31 @@ aag ahE nnF rPC -vBm +lrq ikM -pzc +uqo jjM -eRL -eRL -eRL -mLJ -ugT -qvf -vpI -vpI -vpI -qvf -wdF -lMc +rQY +uqo +lrq +sIw +igt +tpn +pdG +cKG +wVV +tpn +eUU +jFR ycr kge kDA -rkL -eZj +jSw +xkd +qof +xkd +xkd efh -mGn -jkS -cyZ thL thL thL @@ -92076,35 +91649,35 @@ aag ahE hUg wcn -vBm -gqW -buX -mLJ -eRL -eRL +lrq +rjw +uqo +uqo +uqo +uqo +vrQ eRL -mLJ pWG -gaJ -eyg -gCI -eyg -gaJ +tpn +tpn +tpn +tpn +tpn heQ -lMc +fuX eOW +wdF cMl -lMc -nxq -ldu -kJK +kfN +xkd +uvY bja -jkS -eZH +xkd +qJZ ohJ thL thL -uAL +aHT liZ rUk jVa @@ -92279,31 +91852,31 @@ aag ahE rPC wcn -vBm +lrq jCa -cFO +lNs lNs srV uzU -nJo +lrq inN -wQk -gaJ -gaJ -gaJ -gaJ -gaJ -tRA -lMc -ffV +vBJ +eZj +grl +vsJ +nXm +kHa +dls +wdF +wdF +wdF cMl -oeB rkL -ldu -eRL -jZL -vBm -qJZ +hZU +tUx +iTI +qau +eZH ohJ thL thL @@ -92483,29 +92056,29 @@ pCi wcn wcn lrq -lrq +bVC +bVC +bVC bVC lrq lrq -lut -eRL -eRL +mMd enz -swn -vOd -uCl -dls +uzx +kHa +jIV +ebz eGr -gbX -rCL -xHM -jxK -hyz -ltX -pbh -rRQ -rRQ -iyq +wdF +wdF +wdF +wdF +kNi +cqM +xkd +qof +xkd +xkd inG omt omt @@ -92685,30 +92258,30 @@ aag pCi rPC rwS -lrq -kTc -uqo -wVw +cQv +fFq +rhD cqn gTx -eRL -eRL +cQv +cQv +nSM igt -swn -daj -qbt +kHa +kHa +wCM exr kHa -luH -lMc -ycr -bju -goD -vBm -vBm -qof -vBm -vBm +xIw +xIw +tbQ +wdF +wSm +kfN +xkd +uvY +uUs +xkd sSm thL thL @@ -92888,31 +92461,31 @@ aag ahE rPC nfI -lrq -omu -uqo -sYB -cqn -ldu -eRL -eRL -cWs +cQv +eTx +dSc +dSc +ajj +mdJ +cQv +ctn +igt swn -dcP -tvA -dQv +vOd +uCl +tHB swn -xTp -lMc -gSi -bju +eeN +rSH +xCd +wdF wSm jox lrV tUx -ntu +iTI nYP -tUx +uLJ thL oXp thL @@ -93091,29 +92664,29 @@ aag ahE rPC heV -lrq -frJ -uqo -ktn -cqn +cQv +yeX +rkh +xub +lut nBb -mdS +cqJ eRL -uJs +igt swn dfO -doj dQv +doj swn -fYn -qZg -iXt +oHY gBi -wSm -opN +iXt +rLN +jxK +lMc +xkd +qFu xkd -nlH -rQY xkd xMQ ezX @@ -93294,31 +92867,31 @@ aag ahE wcn nBc -lrq -vsI -uqo -xoS -lrq -mAT -lrq -cxA +cQv +yeX +rkh +lLN +pGT +pGT +dsw +sjc plZ kHa qPO -qPO wuc qPO +qPO oRZ -wdF +oRk xCd -bqp -wSm -kfN -xkd -qFu +wdF +cMl +opN xkd +uvY +uve xkd -jVa +jvJ ezX prY rUk @@ -93497,38 +93070,38 @@ aag pCi wcn wcn -lrq -mAr -uqo +cQv +yeX +rkh fsT -jnA +ajj fDn -lrq -tqV -nBo -maa +cqJ +eRL +igt swn plI -tqe +dQv +aOY qPO -wvT -luw emp -uUO -wSm +emp +emp +wqu +cMl jZm wmE tUx -ntu +iTI vQN -jVa -rjw -tUx -lnJ -rjw +xro +thL +thL +thL +thL +thL +thL tUx -jVa -oEE xkd kIV hFW @@ -93700,39 +93273,39 @@ aag pCi oCL wcn -lrq -uZY -uqo -uqo -uqo -iOh -lrq +cQv +yeX +rkh +cIK +kyI +nBb +cQv gdo -nBo -jJq +igt swn -dHv -qQM +ltX +dQv +gCI qPO xTp -lMc -jcf -qUb -wSm -jSw +rSH +gbX +hyz +rCL +cqM xkd -nlH -uuq +qFu +xkd +xkd +eni +thL +thL +thL +thL +thL +thL +tUx xkd -naB -naB -pFg -naB -naB -naB -ydU -naB -naB kIV mnm xEF @@ -93903,39 +93476,39 @@ aag pCi rPC aou -lrq -mAr -uqo -uvy -tfO +cQv +pbh +rkh +dSc +ajj fsz -lrq +cQv irJ nBo -pJi swn -jAG -tqe +ntu +dQv +wVY qPO -xTp -lMc -jcf -eUU -wSm -cqM -xkd -xkd +wvT +kLs +luw +eNp +dXy +kfN xkd +uvY +cWs xkd -naB -eoP -fgl -xEe -naB -xEe +xro +tUx +tUx +tUx +tUx +tUx fgl -deb -naB +vwO +xkd lmk kIV xEF @@ -94106,39 +93679,39 @@ pCi pCi wcn tYB -lrq -noo -noo +cQv +isH +dSc noo -lrq -lrq -lrq -fNA -nBo cQv +uFp +cQv +fNA +mGn qPO qPO wuc qPO -wvT -luw +qPO +dcP +poH emp -dGD +jOu wSm lfW -emp -vli -rSH +iqn +tUx +iTI xYj -naB +xro aSS -pHp -poZ -naB +wIC jkV -pHp +jkV +jkV +wIC kOi -naB +wIC xCj kIV xEF @@ -94217,8 +93790,8 @@ poR mGL pNp kcp -wMv -nCR +pNK +bIA alU uDn bKf @@ -94313,35 +93886,35 @@ cQv vcG lYZ olv -dxm +cqJ nMu -uFp -ePB +tak +eRL nBo tsX -xSA -ugs -wVY lEv -iQg -jpQ -tsX -jOu +nwz +ciF +cuk +jnT +ssT +emp +bju wSm -pyj -vsJ -kjN -rvo -oIc -naB -xro -fgl -wvI -naB +jSw +emp +emp +emp +emp +iyq +emp +wIC wvI -fgl -qmX -naB +uJs +cxA +jnA +pbC +wIC lTK mnm kIV @@ -94511,41 +94084,41 @@ aad pCi dSA rPC -cQv -cQv -geX -tFv -pGT -vkM +vxM +vxM +vxM +vxM +vxM +vxM jvc -ajj -ajj +eRL +eRL nBo -xps -jpQ -jpQ -wVY -eOk +tsX +jtm +nwz +mkk +mkk pFa -ctn -wqu -eeN +qNv +jcf +bju cMl -fHS -naB -naB -naB -naB -naB -naB -rkh +oeB +emp +nNQ +rSH +hwS +uvy +qqN +wIC lvZ -naB -fuX -rra -naB -naB -naB +eoP +okM +okM +deb +wIC +wIC mnm kIV xEF @@ -94625,9 +94198,9 @@ bTS lxo qcy kcp -kmk -kmk -mIJ +edM +edM +mcl bLt bXX bKh @@ -94705,7 +94278,7 @@ aaa aaa aaa aaa -aaa +bdH aaa aaa bdH @@ -94714,41 +94287,41 @@ aad pCi wcn rPC -cQv -eaf -bEv +vxM +rZR +ebt tWg rZR -cqJ -isH -vwO -scD -rXC -vyE -nwz +iOh +ldu +eRL +eRL +nBo +tsX +xSA nwz mkk -wir -jnT +mkk +pFa qNv -wqu -eeN +jcf +bju cMW qEy ooR xvw -nBu +tcP tcP lFs -sIY -qyd +vXQ +vkM uDp -tNj uDp -qyd -icX +uDp +szy +pbC xQD -naB +wIC kIV lre xEF @@ -94828,9 +94401,9 @@ oQM aqI aqI kcp -jaK -jxP -xNL +pUl +tXz +rYZ bLu bBB bBB @@ -94917,41 +94490,41 @@ aag pCi mNR wcn -cQv +vxM eaf -bEv +fLn fLn rXd -dvT +iOh qSl -ajj -ukS -wZa -tsX +sjc +scD +rXC +luC ezU dxT jpQ iQg bRm ecq -tsX +emp tkV -pyj -pyj -luC +oRk +tJy +emp elq qmE -luC +tfO uVF -uQm -qPD -qPD -qPD -qPD -qPD +pyj +wIC +sIY +ekg +ekg +poZ bND jaP -naB +wIC kIV rQU xEF @@ -95120,16 +94693,16 @@ aag pCi tCb aou -cQv -eaf -bEv -fLn -avz -dvT -nHV -ajj +vxM +vUL +tFv +tFv +rvo +lCn +mLJ +wZa iKX -cQv +vBm tsX tsX tsX @@ -95137,24 +94710,24 @@ epu oLF tsX tsX -tsX +emp vyi vyi vyi -naB -naB -naB -naB -dqV -mdJ -vXQ -vXQ +emp +emp +emp +emp +kyP +wIC +wIC +sBH uNe -uUs -nqZ -ekg +uNe +wIC +wIC usr -naB +wIC inC mKf xEF @@ -95323,16 +94896,16 @@ aag pCi oCL wcn -cQv -eaf +vxM +jAG bEv -qRo -rXd -dvT -bAM -wZa -cQv -cQv +bEv +bEv +iOh +mLJ +kVZ +vBm +vBm tHr mqg eiK @@ -95347,17 +94920,17 @@ xuZ rCU rEY gxU -naB +emp kyP -qPD -qPD -qPD +pJi +kJK +jnA uQm pIH -naB -nOe +wIC nOe -naB +nlH +wIC bIi fQk xEF @@ -95526,14 +95099,14 @@ aag pCi wcn rPC -cQv +vxM bop jeK mWe -rXd -dvT -ieo -vxC +eBW +iOh +mLJ +eRL ldD ceZ jnD @@ -95550,17 +95123,17 @@ rWs rQt cgT xuc -naB +emp pZV gMf -ekg -ekg -uQm +uDp +uDp +uDp nnz -vrQ +wIC mLI -qyd -vrQ +yeR +wIC mnm sIk xEF @@ -95729,21 +95302,21 @@ aag pCi wcn rPC -cQv -cQv -cQv -cQv -cQv -dvT +vxM +vxM +vxM +vxM +vxM +gaJ ieo -vxC -ldD +xys +vBm vGA hUW dHd vka lnt -uVA +jJq uVA uVA uVA @@ -95753,17 +95326,17 @@ uVA wIQ xWv aQb -naB -naB -mtl -hwQ +emp +emp +wIC +pFg hwQ okM -mtl -mtl -naB -naB -naB +eyg +wIC +wIC +wIC +wIC mnm hPT xEF @@ -95935,12 +95508,12 @@ wcn aFN wcn cXZ -jIV -vxM -gaJ -uzx +vBm +erx +iZG +mKh uue -vxM +vBm iuE uwN vka @@ -95958,17 +95531,17 @@ wIQ mPj omy xpo -mtl +wIC pGG qRT djm hgF -mtl +wIC kIV hUc wNU mnm -sIk +kIV xEF aag aag @@ -96135,15 +95708,15 @@ adG adG gqq iCz -aFN +fHS rPC rPC -kDb -vxM -wVV -qau -mVi -vxM +vBm +vBm +vBm +uRc +nBu +vBm udK mwA lnt @@ -96161,12 +95734,12 @@ mgj wIQ jHh jUY -fbY +wIC qVF -oog +jkS qaJ czB -mtl +wIC mnm kIV wNU @@ -96341,12 +95914,12 @@ akC akC cVJ rPC -jvJ -vxM +vBm +vBm sVy mKh -mVi -vxM +uuq +vBm bmz wSR mMV @@ -96364,14 +95937,14 @@ awz woy laO nRH -fbY -qVF -oog +wIC +hzx +okM kHK wfL -mtl +wIC mnm -dGc +gSi kCi kCi kCi @@ -96544,12 +96117,12 @@ bzz akC cRc rPC -wcn -vxM -eyg +wgi +vBm +cFO giZ gTl -vxM +vBm pZS pEB jUY @@ -96567,12 +96140,12 @@ qwp pZS jHh jUY -fbY -uLJ +wIC +wIC oog -sBH -vfv -mtl +wIC +wIC +wIC mnm dGc kCi @@ -96747,12 +96320,12 @@ aHZ akC oCL rPC -wcn -vxM -vxM -tXs +wgi +vBm +abc +wgi oCX -vxM +vBm vkR wsD jUY @@ -96770,12 +96343,12 @@ qwp vGA uwN uVd -mtl -mtl -qYH -mtl -mtl -mtl +wIC +qQM +wPk +dHv +dkt +wIC kIV kIV kCi @@ -96798,7 +96371,7 @@ aaa aaa aaa aaa -aaa +bdH aaa aaa aaa @@ -96950,12 +96523,12 @@ btv akC dDC rPC -wcn -vxM -wVV -erx -dsw -vxM +wgi +vBm +vfv +wgi +mVi +vBm kfE wsD jUY @@ -96973,12 +96546,12 @@ qwp cDn uwN jUY -mtl +wIC lNF -rkK -cIK -mtl -tzj +wPk +wIC +wIC +wIC kIV bbR kCi @@ -97001,7 +96574,7 @@ aaa aaa aaa aaa -aaa +bdH aaa aaa aaa @@ -97153,12 +96726,12 @@ aHZ akC eKM ake -rPC -vxM +kif +vBm dFC -bRH -bRH -vxM +tvA +fnC +vBm xDn pEB jUY @@ -97176,12 +96749,12 @@ awz gGr jHh sCQ -mtl +wIC pJE wPk hRy -mtl -tzj +wIC +mnm kIV bVT kCi @@ -97357,11 +96930,11 @@ akC akC tRX uzm -vxM -eyg -eyg +vBm +bqp +gcT oWI -vxM +vBm nNv pEB jUY @@ -97379,11 +96952,11 @@ qwp ora laO rKQ -mtl +wIC qHF -fnl -mtl -mtl +wPk +yeR +wIC utZ pUJ pUJ @@ -97559,12 +97132,12 @@ hxG akC fvu qkn -wcn -vxM -vxM -vxM -vxM -vxM +wgi +vBm +vBm +vBm +vBm +vBm xSz pEB jUY @@ -97582,11 +97155,11 @@ qwp pZS jHh vCx -mtl -mtl -mtl -mtl -qFl +wIC +wIC +wIC +wIC +wIC mnm xyz gpe @@ -98060,7 +97633,7 @@ aaa nXP ndx uNL -nDd +eRt soS sgy nsu @@ -98263,9 +97836,9 @@ aaa nXP hJp uNL -gka +lUv bwQ -oNf +gUr uNL aNw kXJ @@ -98607,7 +98180,7 @@ ukU bfP fvv vcK -wGI +wAd tuA tuA tuA @@ -99621,9 +99194,9 @@ vCO vCO vCO jxB -xDj -boc -eXS +wpj +gDq +tJo bGr hnV xEF @@ -99824,9 +99397,9 @@ wmT jhW mWD jxB -gvW -sWs -imJ +hWX +tYv +mRU xuB gpe xEF @@ -99987,7 +99560,7 @@ aad aai aai pCi -pmI +nMM avl avl agj @@ -100029,7 +99602,7 @@ aES aES aES aES -vbP +lDj uEv gpe xEF @@ -100188,20 +99761,20 @@ aaa aaa aad ahE -qKt -dKa -hdb +iuT +nna +svp avl agj agj -oTM -mTc -sLZ -yfG -lQi +aew +bCO +hvH +hvH +hvH kcN -twI -ufL +cod +oqA aic aov wVW @@ -100391,20 +99964,20 @@ aaa aaa aad ahE -ooo -uaX -kfR +afc +npB +umY avl agj -lDD +yeo agc -qfD +bIz agc -kJm -xYr +hvH +lQq kcN cod -ufL +oqA aic aov wVW @@ -100599,16 +100172,16 @@ wBY hJJ qCi agj -crw -wJQ +eBo +agc agc agc -kJm -rbE +ahY +mXj kcN -yff -ufL -aic +kcN +agj +amI aKq luZ alX @@ -100800,16 +100373,16 @@ pCi kwS avl avl -mRp +lIh agj -nCx -tYM -mqb -kDK -jMx +oMM +agc +agc +glU +rDd mXj -kcN -kcN +akk +alb agj aic aKq @@ -101005,14 +100578,14 @@ avl hCo lIh agj -keT +kFk hvH -bVs hvH hvH -aOj -bQl -xpi +ahZ +mXj +akl +alc agj bFA aov @@ -101208,16 +100781,16 @@ avl hMI lFb agj -dyj -fnv -bVs -iPu -dFb mXj -wFJ -kJW +mXj +aoZ +aha +mXj +mXj +akm +mXj agj -aic +aox aoA wVW teY @@ -101402,7 +100975,7 @@ bdH aaa aaa bdH -bdH +aaa aaa aad ahE @@ -101412,13 +100985,13 @@ iDT tDx agj mXj -mXj -lul -mXj -mXj -mXj -mXj -mXj +tZB +hvH +hvH +hvH +adv +hvH +alj agj aic aov @@ -101605,7 +101178,7 @@ bdH bdH bdH aaa -bdH +aaa aaa aad pCi @@ -101614,16 +101187,16 @@ dTt jgM lFb agj -mXj -pjR -jND -aKk -aKk -nCU -faE -mXj +eYC +agc +fNb +eSJ +agc +agc +hvH +alo agj -amI +aic aov wVW wVW @@ -101817,17 +101390,17 @@ avl jpJ lzH agj -qlI -cdB -xjt -coD +uvZ +agc +agc +juN +pxG +agc +ocs agc -ako -tYM -hGB agj aic -acS +aov wVW asQ awG @@ -102020,19 +101593,19 @@ avl llM lGL agj -eBE -hvH -agc -azm -pxG -fOv -agc -agc -agj -aic -sxW +geW +erZ +tMn +iVZ +aiW +aiW +akn +xyk +sBF +amY +vtT wVW -abQ +nww atN cEl sOi @@ -102223,21 +101796,21 @@ avl avl mrc agj -kSH -hvH -nTA -qmZ +cCd agc -aiW -xyk -xyk -mDX -aTl -dLe +agc +nwv +pxG +agc +ako +agc +agj +aic +aov wVW -atx +qyJ qEk -ajm +ksv wVW arP alX @@ -102249,7 +101822,7 @@ hkG wVW fvB qEk -iaa +aGi wVW aKn aKz @@ -102426,19 +101999,19 @@ pCi jTi nRq agj -kVT -hvH +bYd agc -qlp -pxG -tTk +qck +yev agc agc +akp +hGB agj -fXP +aic aov wVW -atx +qyJ qEk ato wVW @@ -102452,7 +102025,7 @@ aEB wVW fvB qEk -iaa +aGi wVW aKn aKz @@ -102629,19 +102202,19 @@ pCi avl myn agj -kNq +mXj +tZB hvH -qck -gVd -agc -tan -kDK -iEz +ahv +aiF +aiF +akr +xZz agj aic aov wVW -ssW +nbr qEk hrm wVW @@ -102655,7 +102228,7 @@ aEC wVW dNZ qEk -mje +xZf wVW aKn aKz @@ -102833,18 +102406,18 @@ cnX lIh agj mXj -fnv -hvH -hvH -iNY -hvH -jhB -mXj +tQM +lue +ahw +aiG +aiG +aks +alu agj aic aoA wVW -atx +qyJ jvX ato wVW @@ -102856,9 +102429,9 @@ alX aIf aED wVW -ryR +xtg jvX -iaa +aGi wVW aKn aKy @@ -103879,7 +103452,7 @@ aJc ecr ecr ecr -ohS +ygs aET nUv aJU @@ -104081,8 +103654,8 @@ cST aTz aUl aET -esC -nsQ +aWA +jgu aET mSi wHp @@ -104280,7 +103853,7 @@ aGV rvA aKE awF -jzE +cST aUw aUm aET @@ -104655,7 +104228,7 @@ awW add add add -stu +juf add add add @@ -104701,7 +104274,7 @@ baw aJU aJU aJU -tBu +hey aJU aJU aJU @@ -105055,7 +104628,7 @@ bdH aaC abs adq -myl +jWH ajI add fsU @@ -105113,7 +104686,7 @@ qys gBW aJU tiW -qgU +pUe pgD tQV aaC @@ -105285,13 +104858,13 @@ umS yjM qbO aqw -hnI +qRL bYe amO wZM aPm awF -nvG +aHk vGI aLp awF @@ -105496,7 +105069,7 @@ ejp awF aHn szU -fGa +aLt awF aRC aUw @@ -105664,7 +105237,7 @@ aaa aaY abs adq -tGj +ckE ajI add fsU @@ -105722,7 +105295,7 @@ qys gBW aJU tiW -bpw +hXD pgD tQV aaY @@ -106076,7 +105649,7 @@ aoC add add add -stu +juf add add add @@ -106122,7 +105695,7 @@ baw aJU aJU aJU -nnX +eyv aJU aJU aJU @@ -106800,7 +106373,7 @@ bsk sxu cBI bkA -eFG +nuI bej arX vSG @@ -106905,7 +106478,7 @@ aiX aiX aiX sHM -kUh +otK aiX aiX aiX @@ -107101,7 +106674,7 @@ awW awW awW fSm -hiy +vCz apl bbL bbL @@ -107304,7 +106877,7 @@ ajf ajf ajf oAO -pIZ +dlN aod qgG amC @@ -107507,7 +107080,7 @@ awW awW awW aSJ -isI +dAi dtM aii mce @@ -109542,7 +109115,7 @@ dtM akU ajC sqf -anp +wQa wjz fnA jZY @@ -109745,7 +109318,7 @@ dtM aii ajC sqf -sOZ +udb oNJ eDo eDo @@ -109948,7 +109521,7 @@ dtM ajt aik sqf -anq +eTh awn xsz jTj @@ -110151,11 +109724,11 @@ dtM aii ajC sqf -anr +vZJ awn tEi -asu -hbI +iWb +ygM sqf ajl vtx @@ -112610,7 +112183,7 @@ kSJ avj cGr awE -qkm +fUn wQv rne guC @@ -113222,7 +112795,7 @@ awE bqy bYj eUR -ucI +gEI nDh bYj xne @@ -115045,12 +114618,12 @@ ajr aii avm awE -wYZ +hfm rne rne fAo awE -bhM +knT wQv bBi awE @@ -115457,7 +115030,7 @@ rne wft awE hpf -qJU +pbl igp awE hoX @@ -115915,7 +115488,7 @@ kxd jgk nsY rSG -rur +wWJ oqS nsY lhu @@ -116320,7 +115893,7 @@ gsg vHq vvY nsY -rNb +pPV bxC jiU nsY @@ -116728,7 +116301,7 @@ wNl nGh fPp lqN -vlO +uoh nsY xCN pOB @@ -117395,7 +116968,7 @@ uVh nsY kzK lFh -jYc +mus pVA mzV pML @@ -117547,7 +117120,7 @@ aLf tRc qEW bdd -uva +gGo mLb wmz vpt @@ -118464,7 +118037,7 @@ abg caF aar aar -lIl +wYZ aar aar ael @@ -118666,10 +118239,10 @@ bWs abg caF aar -vUk +rcW sTB -lUA -tqd +jrV +qmr ael afE agT @@ -118869,9 +118442,9 @@ acO aJs cbN aar -fQY +lDK aap -elM +eXU vFb ael afH @@ -119072,10 +118645,10 @@ pNQ abx hTy aar -thR +pJn aao aao -gDP +erz ael afI agY @@ -119275,10 +118848,10 @@ acP bUE qFQ aar -xtQ +jBY aap aao -sxT +mYX ael afJ agY @@ -119478,10 +119051,10 @@ acG abx caF aar -com +ydr aap aao -sxT +mYX ael afK ahc @@ -119683,7 +119256,7 @@ lCz aar tAV sTB -xfk +uck wKn ael afL @@ -119884,7 +119457,7 @@ acG abx caF aar -lIl +wYZ aar aar aar @@ -120089,8 +119662,8 @@ arJ aar aao aao -wkL -mts +rOZ +dfP adO afM fpR @@ -120290,10 +119863,10 @@ jSY abx hTy aar -hLB +lAj aao aao -laY +xgE adO afN ahh @@ -120493,10 +120066,10 @@ acP bUE qFQ aar -xYe -kZH +jkL +iaE aao -frY +mXa adO afO ahh @@ -120696,10 +120269,10 @@ aJa abg ccf aar -mko +cRg uaZ aap -svC +epK adO jkj ahh @@ -121628,7 +121201,7 @@ rbY gwD bOK bPD -bYa +nSj bPD jOk bNB @@ -121831,7 +121404,7 @@ rbY bEc bKA bCA -bQS +gJs bCA bKA bEc @@ -121909,7 +121482,7 @@ aeA aeC aeC aeC -cVb +tpt aeC aeC aeC @@ -121957,7 +121530,7 @@ lJY vcE vcE vcE -iTd +oDO vcE vcE vcE @@ -122244,7 +121817,7 @@ bmD mYv doP jac -xxa +isS cai bdl bII @@ -122309,7 +121882,7 @@ aag aag abh acx -pMk +adQ ajs aeC wXh @@ -122369,7 +121942,7 @@ eyG kpo vcE kUV -xyL +mvH rRq uOi aag @@ -122511,8 +122084,8 @@ aah aah aah abi -nGY -gyU +acE +adZ ajk aeA asY @@ -122572,8 +122145,8 @@ deg wLu lJY xVS -kPH -knL +fqg +uGa uyC aah aah @@ -122635,7 +122208,7 @@ aYW bzV beB mCo -iwZ +xfw lBF bKA sbM @@ -122650,7 +122223,7 @@ bmD lyk bOR eHa -cmo +opj xAB mCo bJz @@ -122714,8 +122287,8 @@ bdH bdH bdH abi -dEJ -gyU +acT +adZ ajk aeA atp @@ -122775,8 +122348,8 @@ pfH wlF lJY xVS -kPH -qGU +fqg +mIA uyC bdH aaa @@ -122918,7 +122491,7 @@ aaa bdH abh acx -gCB +umR ajs aeC wXh @@ -122978,7 +122551,7 @@ eyG kpo vcE kUV -bxA +pPF rRq uOi bdH @@ -123330,7 +122903,7 @@ amH aeC aeC aeC -cVb +tpt aeC aeC aeC @@ -123378,7 +122951,7 @@ kKR vcE vcE vcE -iTd +oDO vcE vcE vcE @@ -123463,7 +123036,7 @@ bZr bNQ bNQ bNQ -bGz +ohl hMs cbw iEb @@ -123666,7 +123239,7 @@ bZr krN krN krN -oqY +llt can buH iEb @@ -123772,9 +123345,9 @@ alG anG apf oIB -jgr -gGp -dMf +tSF +qyM +jog oIB sFR vuv @@ -123869,7 +123442,7 @@ bZr ibc uly bNN -vbR +fXt pky cbv cbS @@ -123975,9 +123548,9 @@ alG aYD uPI oIB -fXE -kaS -aiQ +hJh +vMC +iUC oIB sFR vuv @@ -124178,9 +123751,9 @@ sUF anG apd oIB -wqr +ufS bZw -xUV +kaJ oIB sFR hPo @@ -124275,7 +123848,7 @@ bZr bKA dyx eYr -bUo +iii uys cbz cbU @@ -124382,8 +123955,8 @@ aYD aTS qgK tEB -uBM -dXo +llD +gGl oIB lBR nVu @@ -124478,7 +124051,7 @@ bmD bKA dyx hGN -pVx +ddN uys ttM iEb @@ -124585,8 +124158,8 @@ anG mPX oIB wKF -hzb -ltU +fOh +diM oIB fbx cFA @@ -124787,9 +124360,9 @@ aSC aZH iAB oIB -phj -vEf -cNK +gqF +imW +qbh oIB fbx cxo @@ -124990,8 +124563,8 @@ rFY ctC gPF oIB -opI -dha +kUb +rJg pxj oIB fbx @@ -127012,8 +126585,8 @@ auu aoT aFm xBe -aIV -qqr +cij +jRZ arH xBe alG @@ -127420,7 +126993,7 @@ anO nFX atv auV -amE +ift xBe alG aDZ @@ -127623,7 +127196,7 @@ atc nFX atv auV -amE +ift xBe alG aYj @@ -128027,8 +127600,8 @@ atq aDr aFu xBe -azp -qJf +rwT +wdv anV xBe alG @@ -131284,7 +130857,7 @@ vuv vuv jWh jWh -sWC +olk jWh jWh jWh @@ -131486,10 +131059,10 @@ vuv nfS emx jWh -duz -hXG -htG -doU +qCg +xjw +pfA +xAC jWh lbB uIv @@ -131689,10 +131262,10 @@ iEs cxo cxo jWh -axR -mIP -tcZ -fWi +uUV +rsW +djN +fnQ jWh lbB cKL @@ -131892,10 +131465,10 @@ vuv xct cxo jWh -vpv -pgw -rmE -fWi +dkS +vba +naQ +fnQ jWh xPZ pcv @@ -132076,7 +131649,7 @@ ptK dmQ psm psm -lDn +qyH arV wZX eky @@ -132090,7 +131663,7 @@ aDQ eky wZX arV -wkA +dtv vuv vuv cxo @@ -132278,8 +131851,8 @@ hWU dmQ aeq psm -xrq -vVu +aNe +hiN arV wZX eky @@ -132293,8 +131866,8 @@ aHe eky wZX arV -oIt -xrq +fXM +aNe vuv ahb cxo @@ -132481,8 +132054,8 @@ rwb dmQ jXY psm -vlk -mKy +atY +qkj aMT svl pzJ @@ -132496,8 +132069,8 @@ qDt pzJ sQO aMT -wNS -vlk +rWF +atY vuv woM nqD @@ -132685,7 +132258,7 @@ dmQ atD psm psm -vjd +vHl aRp jBX akS @@ -132699,7 +132272,7 @@ aHe tKf jBX aRp -quy +edx vuv vuv myC @@ -133081,8 +132654,8 @@ cuC bNM tgK tfb -wuT -lMx +skg +eaX pVZ pVZ pVZ @@ -133114,8 +132687,8 @@ qMu qMu qMu qMu -jFY -qKY +euY +iuw jHL wOK uIv @@ -133284,8 +132857,8 @@ cuC riJ kHY uhM -kdv -lkm +uvk +xJn cuC aag aag @@ -133317,8 +132890,8 @@ aag aag aag bYn -dRs -uAl +tAh +bfe rDb qjV rID @@ -133487,7 +133060,7 @@ cuC cuC umy iKZ -pnL +tiw cuC cuC mNX @@ -133521,7 +133094,7 @@ mNX qOk bYn bYn -cWE +qQL kHS rID bYn @@ -134514,8 +134087,8 @@ xVk xVk aad jbq -kRg -uRs +jXW +jcZ aDO qqu eky @@ -134523,8 +134096,8 @@ aNl eky dFk aDO -nPY -kRg +nzI +jXW jbq ajZ xVk @@ -134717,8 +134290,8 @@ xVk xVk aad jbq -hBL -dID +qtR +jWC eky eky nJu @@ -134726,8 +134299,8 @@ aNl eky eky eky -etn -hBL +aDc +qtR jbq ajZ xVk @@ -134921,7 +134494,7 @@ xVk eJQ aPw aHe -mRQ +dnJ eky eky eky @@ -134929,7 +134502,7 @@ aNl eky eky eky -biJ +hfw aHe aPw eJQ @@ -136748,7 +136321,7 @@ xVk oee aPw aHe -iTe +tqB eky eky atg @@ -136756,7 +136329,7 @@ aBE ouB eky eky -qPX +gwu aHe aPw oee @@ -136950,8 +136523,8 @@ xVk xVk aad jbq -xrq -dID +aNe +jWC eky eky esT @@ -136959,8 +136532,8 @@ nYE orH eky eky -etn -xrq +aDc +aNe jbq ajZ xVk @@ -137153,8 +136726,8 @@ xVk xVk aad jbq -vlk -dID +atY +jWC eky eky bAe @@ -137162,8 +136735,8 @@ aBG sGh eky eky -etn -vlk +aDc +atY jbq ajZ xVk @@ -137356,8 +136929,8 @@ xVk xVk aad aPw -uYd -xnz +qpU +ykD dqj eky xaS @@ -137365,8 +136938,8 @@ ejt mPf eky gUV -neG -uYd +wKS +qpU aPw ajZ xVk @@ -140453,9 +140026,9 @@ lmz lmz lmz daz -ltc -eXk -xns +rzf +bRo +wyv pTt gAe rCi @@ -140656,9 +140229,9 @@ lmz lmz lmz daz -tId -wJB -tJN +czG +ylg +oIY daz daz daz From cf0843a33d9a806972bde9b500a14b3eda74ee1f Mon Sep 17 00:00:00 2001 From: Vyzo Date: Sat, 25 Nov 2023 07:14:25 +0300 Subject: [PATCH 02/10] map fix and cmp locker access --- .../closets/secure/cm_closets.dm | 2 +- maps/map_files/USS_Almayer/USS_Almayer.dmm | 884 ++++++++++++------ 2 files changed, 580 insertions(+), 306 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm index 1edac3a8f324..aaf3f6cc182b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm @@ -180,7 +180,7 @@ GLOBAL_LIST_EMPTY(co_secure_boxes) /obj/structure/closet/secure_closet/warrant_officer name = "chief MP's locker" - req_access = list(ACCESS_MARINE_BRIG) + req_access = list(ACCESS_MARINE_ARMORY) icon_state = "secure_locked_warrant" icon_closed = "secure_unlocked_warrant" icon_locked = "secure_locked_warrant" diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index b5367f0790d8..f5668517605e 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -1098,8 +1098,10 @@ /turf/open/floor/almayer, /area/almayer/shipboard/starboard_missiles) "adv" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 8 +/obj/structure/machinery/light, +/obj/structure/flora/pottedplant{ + pixel_y = 3; + pixel_x = -1 }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) @@ -1330,12 +1332,36 @@ /turf/closed/wall/almayer, /area/almayer/living/starboard_garden) "aew" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/light{ + dir = 8 }, -/obj/structure/closet/secure_closet/bar{ - name = "Success Cabinet"; - req_access_txt = "1" +/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) @@ -2136,16 +2162,12 @@ }, /area/almayer/living/cafeteria_officer) "aha" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/almayer/command/reinforced{ - access_modified = 1; - name = "\improper Commanding Officer's Quarters"; - req_access = null; - req_access_txt = "31" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/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{ @@ -2271,16 +2293,26 @@ }, /area/almayer/hull/upper_hull/u_f_p) "ahv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/surface/table/woodentable/fancy, +/obj/item/folder/black{ + pixel_y = 8 }, -/turf/open/floor/wood/ship, +/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/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 +/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) @@ -2392,41 +2424,16 @@ }, /area/almayer/living/offices/flight) "ahY" = ( -/obj/structure/machinery/light, -/obj/structure/surface/table/woodentable/fancy, -/obj/item/clothing/shoes/laceup{ - desc = "The height of fashion, and they're pre-polished! The name 'Bob' is written on the inside."; - pixel_y = -5 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/obj/effect/landmark/map_item, -/obj/item/device/flashlight/lamp/green, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "ahZ" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/paper_bin/uscm, -/obj/item/tool/pen, -/obj/structure/machinery/door_control{ - id = "ARES StairsLock"; - name = "ARES Exterior Lockdown Override"; - pixel_x = 8; - pixel_y = -24; - req_one_access_txt = "90;91;92" - }, -/obj/structure/machinery/door_control{ - id = "ARES Emergency"; - name = "ARES Emergency Lockdown Override"; - pixel_y = -24; - req_one_access_txt = "91;92" - }, -/obj/structure/machinery/door_control{ - id = "Brig Lockdown Shutters"; - name = "Brig Lockdown Override"; - pixel_x = -8; - pixel_y = -24; - req_access_txt = "1;3" +/obj/structure/machinery/cm_vending/clothing/commanding_officer, +/turf/open/floor/almayer{ + icon_state = "cargo" }, -/turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "aia" = ( /turf/open/floor/almayer{ @@ -2640,11 +2647,16 @@ }, /area/almayer/hull/upper_hull/u_a_s) "aiF" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/wood/ship, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/carpet, /area/almayer/living/commandbunks) "aiG" = ( -/obj/structure/filingcabinet, +/obj/structure/machinery/status_display{ + pixel_x = 32; + pixel_y = 16 + }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "aiH" = ( @@ -2716,7 +2728,12 @@ }, /area/almayer/hull/upper_hull/u_f_s) "aiW" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, /turf/open/floor/carpet, /area/almayer/living/commandbunks) "aiX" = ( @@ -3063,55 +3080,79 @@ }, /area/almayer/shipboard/weapon_room) "akk" = ( -/obj/structure/machinery/door/window/westright{ - dir = 4 - }, -/obj/structure/machinery/shower{ - dir = 4 +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/card{ + dir = 4; + pixel_x = 2 }, -/obj/structure/window/reinforced, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/carpet, /area/almayer/living/commandbunks) "akl" = ( -/obj/structure/machinery/light{ - dir = 1 +/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 = "W"; - pixel_x = -1 + icon_state = "E"; + pixel_x = 1 }, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, /area/almayer/living/commandbunks) "akm" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Bathroom" +/obj/structure/toilet{ + dir = 8; + pixel_y = 8; + layer = 2.9 }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/structure/window{ + pixel_y = -2; + layer = 2.95 }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/living/commandbunks) "akn" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" }, -/turf/open/floor/carpet, -/area/almayer/living/commandbunks) +/area/almayer/command/cichallway) "ako" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/machinery/door/window/westright, +/obj/structure/machinery/shower{ + dir = 8; + layer = 3.10; + plane = -4 }, -/turf/open/floor/carpet, +/obj/item/tool/soap{ + pixel_x = 2; + pixel_y = 7 + }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/living/commandbunks) "akp" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/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) @@ -3123,9 +3164,18 @@ /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "aks" = ( -/obj/structure/surface/table/almayer, -/obj/item/clipboard, -/obj/item/device/binoculars, +/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" = ( @@ -3356,22 +3406,31 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/starboard_garden) "alb" = ( -/obj/structure/toilet{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, -/turf/open/floor/plating/plating_catwalk, +/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 = 4; - pixel_x = 11 + dir = 8; + pixel_x = -12; + pixel_y = 2 }, /obj/structure/mirror{ - pixel_x = 28 + pixel_x = -29 }, /obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 + icon_state = "E"; + pixel_x = 1 }, /turf/open/floor/almayer{ icon_state = "dark_sterile" @@ -3416,11 +3475,14 @@ }, /area/almayer/hallways/aft_hallway) "alj" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper, -/obj/item/device/whistle, -/obj/structure/sign/safety/bathunisex{ - pixel_x = -17 +/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) @@ -3442,11 +3504,21 @@ /turf/open/floor/almayer, /area/almayer/hallways/aft_hallway) "alo" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_18" +/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" }, -/obj/structure/machinery/light, -/turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "alp" = ( /turf/open/floor/almayer{ @@ -3469,9 +3541,12 @@ }, /area/almayer/hallways/aft_hallway) "alu" = ( -/obj/structure/surface/table/almayer, +/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" = ( @@ -4249,14 +4324,24 @@ }, /area/almayer/hallways/aft_hallway) "aox" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 +/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{ - dir = 1; - icon_state = "silver" + icon_state = "cargo" }, -/area/almayer/command/cichallway) +/area/almayer/command/cic) "aoy" = ( /obj/structure/sign/safety/fire_haz{ pixel_x = 8; @@ -4498,8 +4583,10 @@ }, /area/almayer/engineering/upper_engineering) "aoZ" = ( -/obj/structure/sign/prop1, -/turf/closed/wall/almayer/reinforced, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "apa" = ( /obj/structure/surface/rack, @@ -19186,14 +19273,10 @@ }, /area/almayer/living/cryo_cells) "bCO" = ( -/obj/item/tool/kitchen/tray{ - layer = 2.9 - }, -/obj/item/reagent_container/food/snacks/carpmeat{ - layer = 3.3 - }, -/obj/item/reagent_container/food/snacks/carpmeat{ - layer = 3.3 +/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) @@ -20527,7 +20610,7 @@ /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/navigation) "bIz" = ( -/mob/living/simple_animal/cat/Jones{ +/obj/structure/bed/chair/office/dark{ dir = 8 }, /turf/open/floor/carpet, @@ -24129,7 +24212,24 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/aft_hallway) "bYd" = ( -/obj/structure/bookcase/manuals/engineering, +/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" = ( @@ -28011,8 +28111,14 @@ /turf/open/floor/almayer, /area/almayer/living/chapel) "cCd" = ( -/obj/structure/bookcase{ - icon_state = "book-5" +/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) @@ -29842,6 +29948,12 @@ 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; @@ -32777,7 +32889,20 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_umbilical) "erZ" = ( -/obj/structure/pipes/vents/scrubber, +/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" = ( @@ -33208,7 +33333,17 @@ }, /area/almayer/hallways/starboard_hallway) "eBo" = ( -/obj/structure/machinery/cm_vending/gear/commanding_officer, +/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" = ( @@ -33933,14 +34068,9 @@ }, /area/almayer/medical/medical_science) "eSJ" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/transmitter/rotary{ - name = "Captain's Office"; - phone_category = "Offices"; - phone_id = "Captain's Office"; - pixel_y = 6 - }, -/turf/open/floor/carpet, +/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{ @@ -34211,9 +34341,15 @@ }, /area/almayer/command/airoom) "eYC" = ( -/obj/structure/machinery/vending/cigarette, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) +/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 @@ -36058,11 +36194,11 @@ }, /area/almayer/hallways/aft_hallway) "fNb" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/machinery/computer/card{ - dir = 4 +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 }, -/turf/open/floor/carpet, +/turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "fNg" = ( /obj/structure/largecrate/random/barrel/yellow, @@ -36757,25 +36893,9 @@ }, /area/almayer/hallways/stern_hallway) "geW" = ( -/obj/structure/sign/prop1{ - pixel_y = 32 - }, -/obj/item/storage/fancy/cigar, -/obj/item/reagent_container/food/drinks/bottle/sake{ - layer = 3.6; - pixel_x = 9; - pixel_y = 16 - }, -/obj/item/reagent_container/food/drinks/bottle/sake{ - layer = 3.6; - pixel_y = 16 - }, -/obj/item/reagent_container/food/drinks/bottle/sake{ - layer = 3.6; - pixel_x = -9; - pixel_y = 16 +/obj/structure/machinery/photocopier{ + anchored = 0 }, -/obj/structure/surface/table/woodentable/fancy, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "geX" = ( @@ -37094,8 +37214,8 @@ }, /area/almayer/hull/lower_hull/l_m_p) "glU" = ( -/obj/structure/bed/chair/office/dark, -/turf/open/floor/carpet, +/obj/structure/pipes/vents/scrubber, +/turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "gmb" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -40400,8 +40520,12 @@ /turf/open/floor/almayer, /area/almayer/shipboard/brig/perma) "hGB" = ( -/obj/structure/machinery/light, -/turf/open/floor/wood/ship, +/obj/structure/machinery/cm_vending/clothing/dress{ + req_access = list(1) + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, /area/almayer/living/commandbunks) "hGD" = ( /obj/effect/decal/warning_stripes{ @@ -43450,15 +43574,28 @@ /area/almayer/hull/lower_hull/l_f_p) "iVZ" = ( /obj/structure/surface/table/woodentable/fancy, -/obj/item/folder/black, -/obj/item/storage/bible/booze, -/obj/structure/pipes/standard/simple/hidden/supply, +/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; - pixel_x = 18; - req_access_txt = "31" + 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) @@ -44777,9 +44914,9 @@ /area/almayer/living/port_emb) "juN" = ( /obj/structure/surface/table/woodentable/fancy, -/obj/item/paper_bin/uscm, -/obj/item/tool/pen{ - pixel_y = 7 +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_18"; + pixel_y = 12 }, /turf/open/floor/carpet, /area/almayer/living/commandbunks) @@ -46004,6 +46141,16 @@ 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, @@ -46665,6 +46812,25 @@ }, /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 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "kng" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -47487,7 +47653,24 @@ }, /area/almayer/living/pilotbunks) "kFk" = ( -/obj/structure/closet/secure_closet/commander, +/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" = ( @@ -49500,8 +49683,13 @@ }, /area/almayer/shipboard/brig/surgery) "lue" = ( -/obj/structure/surface/table/almayer, -/obj/item/folder/yellow, +/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) "luk" = ( @@ -50707,9 +50895,11 @@ }, /area/almayer/hull/lower_hull/l_f_s) "lQq" = ( -/obj/structure/bed, -/obj/item/bedsheet/hop, -/turf/open/floor/wood/ship, +/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, @@ -52294,6 +52484,12 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"mFb" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "mFq" = ( /obj/structure/machinery/door_control{ dir = 1; @@ -52999,6 +53195,17 @@ 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{ @@ -54416,11 +54623,13 @@ /area/almayer/hull/upper_hull/u_a_s) "nwv" = ( /obj/structure/surface/table/woodentable/fancy, -/obj/item/paper{ - pixel_x = 3; - pixel_y = 3 +/obj/structure/transmitter/rotary{ + name = "Commanding Officer's Office"; + phone_category = "Offices"; + phone_id = "Commanding Officer's Office"; + pixel_y = 8; + pixel_x = 16 }, -/obj/item/tool/lighter/zippo/gold, /turf/open/floor/carpet, /area/almayer/living/commandbunks) "nww" = ( @@ -55814,7 +56023,7 @@ /obj/structure/pipes/vents/pump{ dir = 4 }, -/turf/open/floor/carpet, +/turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "ocB" = ( /obj/effect/decal/warning_stripes{ @@ -56503,8 +56712,7 @@ "oqA" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/uniform_vendors, /turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" + icon_state = "test_floor4" }, /area/almayer/command/cic) "oqD" = ( @@ -57567,10 +57775,24 @@ }, /area/almayer/squads/alpha_bravo_shared) "oMM" = ( -/obj/structure/machinery/light{ - dir = 1 +/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 }, -/obj/structure/machinery/cm_vending/clothing/commanding_officer, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "oMQ" = ( @@ -58578,6 +58800,18 @@ 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; @@ -64181,10 +64415,12 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) "rDd" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/machinery/computer/emails{ - dir = 1; - pixel_y = 2 +/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) @@ -66367,23 +66603,17 @@ }, /area/almayer/engineering/ce_room) "sBF" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/structure/machinery/cm_vending/clothing/dress{ + density = 0; + pixel_y = 16 }, -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/door/airlock/almayer/command/reinforced{ - access_modified = 1; - dir = 1; - id_tag = "CO-Office"; - name = "\improper Commanding Officer's Office"; - req_access = null; - req_access_txt = "31" +/obj/structure/machinery/light{ + dir = 4 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "cargo" }, -/area/almayer/living/commandbunks) +/area/almayer/command/cic) "sBH" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/open{ dir = 4; @@ -69264,8 +69494,7 @@ }, /area/almayer/hallways/aft_hallway) "tMn" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/bed/chair/comfy/beige, +/obj/structure/bed/chair/comfy/blue, /turf/open/floor/carpet, /area/almayer/living/commandbunks) "tMW" = ( @@ -69414,7 +69643,9 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) "tQM" = ( -/obj/structure/safe/co_office, +/obj/structure/machinery/light{ + dir = 4 + }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "tQV" = ( @@ -69839,11 +70070,19 @@ }, /area/almayer/hull/upper_hull/u_a_s) "tZB" = ( -/obj/structure/machinery/light{ - dir = 1 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) +/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 @@ -70211,6 +70450,25 @@ 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 + }, +/obj/item/ashtray/bronze{ + pixel_y = 19; + pixel_x = 4 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/effect/landmark/map_item{ + pixel_y = 3; + pixel_x = -1 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) "ugs" = ( /turf/closed/wall/almayer/outer, /area/almayer/shipboard/brig/execution) @@ -71016,23 +71274,11 @@ }, /area/almayer/shipboard/brig/cells) "uvZ" = ( -/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 = 1; - pixel_y = 16 - }, -/obj/item/reagent_container/food/drinks/bottle/whiskey{ - pixel_x = 9; - pixel_y = 16 - }, -/obj/item/reagent_container/food/drinks/bottle/whiskey{ - pixel_x = -7; - pixel_y = 16 - }, -/obj/item/clothing/mask/cigarette/pipe{ - pixel_y = 5 +/obj/structure/machinery/light{ + dir = 1 }, -/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "uws" = ( @@ -73446,12 +73692,15 @@ }, /area/almayer/hallways/port_hallway) "vtT" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "silver" }, -/turf/open/floor/almayer, /area/almayer/command/cichallway) "vub" = ( /turf/closed/wall/almayer, @@ -74890,6 +75139,15 @@ }, /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" @@ -76039,6 +76297,11 @@ 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) "wqA" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -80203,8 +80466,11 @@ }, /area/almayer/command/cic) "xZz" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/faxmachine/uscm/command/capt, +/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" = ( @@ -80468,14 +80734,22 @@ }, /area/almayer/command/lifeboat) "yeo" = ( -/obj/structure/machinery/cm_vending/clothing/dress{ - req_access = list(1) +/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/item/device/flashlight/lamp/green, /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" = ( @@ -99769,11 +100043,11 @@ agj agj aew bCO -hvH -hvH -hvH +ugb +alj +ahZ kcN -cod +aox oqA aic aov @@ -99973,7 +100247,7 @@ yeo agc bIz agc -hvH +ahY lQq kcN cod @@ -100173,15 +100447,15 @@ hJJ qCi agj eBo -agc +erZ agc agc ahY -mXj -kcN +hGB kcN -agj -amI +sBF +oqA +aic aKq luZ alX @@ -100376,13 +100650,13 @@ avl lIh agj oMM -agc -agc +ocs +mFb glU rDd mXj -akk -alb +kcN +kcN agj aic aKq @@ -100580,10 +100854,10 @@ lIh agj kFk hvH +aoZ hvH hvH -ahZ -mXj +pmO akl alc agj @@ -100781,16 +101055,16 @@ avl hMI lFb agj -mXj -mXj +alu +tQM aoZ aha -mXj +akp mXj akm -mXj +ako agj -aox +aic aoA wVW teY @@ -100985,13 +101259,13 @@ iDT tDx agj mXj -tZB -hvH -hvH -hvH -adv -hvH -alj +mXj +mSI +mXj +mXj +mXj +mXj +mXj agj aic aov @@ -101187,16 +101461,16 @@ dTt jgM lFb agj -eYC -agc +mXj +lue fNb eSJ -agc -agc -hvH -alo +eSJ +alb +kmY +mXj agj -aic +amI aov wVW wVW @@ -101391,16 +101665,16 @@ jpJ lzH agj uvZ -agc -agc +akr +akk juN -pxG agc +vVp ocs -agc +adv agj aic -aov +tZB wVW asQ awG @@ -101594,15 +101868,15 @@ llM lGL agj geW -erZ -tMn +hvH +agc iVZ +pxG aiW -aiW -akn -xyk -sBF -amY +agc +agc +agj +aic vtT wVW nww @@ -101797,16 +102071,16 @@ avl mrc agj cCd -agc -agc +hvH +tMn nwv -pxG -agc -ako agc -agj -aic -aov +jWN +xyk +xyk +alo +wqv +eYC wVW qyJ qEk @@ -102000,15 +102274,15 @@ jTi nRq agj bYd +hvH agc -qck yev +pxG +dml agc agc -akp -hGB agj -aic +akn aov wVW qyJ @@ -102202,13 +102476,13 @@ pCi avl myn agj -mXj -tZB +ahw hvH +qck ahv +agc aiF -aiF -akr +glU xZz agj aic @@ -102407,12 +102681,12 @@ lIh agj mXj tQM -lue -ahw -aiG +hvH +hvH aiG +hvH aks -alu +mXj agj aic aoA From 58ce26053aa65d90aefa66e9c5cc2149a09d6df1 Mon Sep 17 00:00:00 2001 From: Vyzo Date: Sat, 25 Nov 2023 07:52:38 +0300 Subject: [PATCH 03/10] commit --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 1 + 1 file changed, 1 insertion(+) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index f5668517605e..7d4f33506f66 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -50336,6 +50336,7 @@ pixel_x = 7; pixel_y = 10 }, +/obj/item/poster, /turf/open/floor/almayer{ dir = 9; icon_state = "red" From 821afba2872e5e29bf6608713be5fc35e1e6d129 Mon Sep 17 00:00:00 2001 From: Vyzo Date: Sat, 25 Nov 2023 08:46:04 +0300 Subject: [PATCH 04/10] fixes --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 43 +++++++++++++++------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 7d4f33506f66..116d00b9c649 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -45539,6 +45539,15 @@ 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 @@ -64427,17 +64436,24 @@ /area/almayer/living/commandbunks) "rDe" = ( /obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/snacks/kepler_crisps{ +/obj/structure/sign/safety/cryo{ pixel_x = 8; - pixel_y = 4 + pixel_y = 33 }, /obj/item/toy/deck{ pixel_x = -4; - pixel_y = 1 + pixel_y = 10 }, -/obj/structure/sign/safety/cryo{ - pixel_x = 8; - pixel_y = 33 +/obj/item/reagent_container/food/drinks/cans/souto/diet/cherry{ + pixel_x = 9; + pixel_y = 12 + }, +/obj/item/ashtray/plastic{ + pixel_y = -4 + }, +/obj/item/trash/cigbutt{ + pixel_x = 1; + pixel_y = 5 }, /turf/open/floor/almayer{ dir = 6; @@ -72494,14 +72510,15 @@ /area/almayer/hallways/stern_hallway) "uWI" = ( /obj/structure/surface/table/almayer, -/obj/item/ashtray/plastic, -/obj/item/trash/cigbutt{ - pixel_x = 1; +/obj/item/pizzabox/margherita{ pixel_y = 8 }, -/obj/item/reagent_container/food/drinks/cans/souto/diet/cherry{ - pixel_x = -9; - pixel_y = 12 +/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; @@ -104128,7 +104145,7 @@ aGV rvA aKE awF -cST +jLf aUw aUm aET From d517413249ffe02c9ecda139651a339c40957a2a Mon Sep 17 00:00:00 2001 From: Vyzo Date: Sat, 25 Nov 2023 08:46:04 +0300 Subject: [PATCH 05/10] fixes --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 61 +++++++++++++++------- 1 file changed, 42 insertions(+), 19 deletions(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 7d4f33506f66..edcd89add4a1 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -27484,6 +27484,17 @@ }, /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{ @@ -45539,6 +45550,15 @@ 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 @@ -61970,11 +61990,6 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = -28 - }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) "qCo" = ( @@ -64427,17 +64442,24 @@ /area/almayer/living/commandbunks) "rDe" = ( /obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/snacks/kepler_crisps{ +/obj/structure/sign/safety/cryo{ pixel_x = 8; - pixel_y = 4 + pixel_y = 33 }, /obj/item/toy/deck{ pixel_x = -4; - pixel_y = 1 + pixel_y = 10 }, -/obj/structure/sign/safety/cryo{ - pixel_x = 8; - pixel_y = 33 +/obj/item/reagent_container/food/drinks/cans/souto/diet/cherry{ + pixel_x = 9; + pixel_y = 12 + }, +/obj/item/ashtray/plastic{ + pixel_y = -4 + }, +/obj/item/trash/cigbutt{ + pixel_x = 1; + pixel_y = 5 }, /turf/open/floor/almayer{ dir = 6; @@ -72494,14 +72516,15 @@ /area/almayer/hallways/stern_hallway) "uWI" = ( /obj/structure/surface/table/almayer, -/obj/item/ashtray/plastic, -/obj/item/trash/cigbutt{ - pixel_x = 1; +/obj/item/pizzabox/margherita{ pixel_y = 8 }, -/obj/item/reagent_container/food/drinks/cans/souto/diet/cherry{ - pixel_x = -9; - pixel_y = 12 +/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; @@ -100648,7 +100671,7 @@ pCi kwS avl avl -lIh +cpr agj oMM ocs @@ -104128,7 +104151,7 @@ aGV rvA aKE awF -cST +jLf aUw aUm aET From 7c5ff0f3c252e072ce0879e52cbb6db0a539c5af Mon Sep 17 00:00:00 2001 From: ItsVyzo <46250991+ItsVyzo@users.noreply.github.com> Date: Sat, 2 Dec 2023 23:55:20 -0800 Subject: [PATCH 06/10] Update code/game/objects/structures/crates_lockers/closets/secure/security.dm Co-authored-by: harryob --- .../objects/structures/crates_lockers/closets/secure/security.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 150f806b3a4d..03c324e38f83 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -209,6 +209,7 @@ req_one_access = list(ACCESS_MARINE_BRIG, ACCESS_CIVILIAN_BRIG) anchored = TRUE locked = TRUE + /obj/structure/closet/secure_closet/brig/prison_uni/Initialize() . = ..() new /obj/item/clothing/shoes/orange(src) From 5692dc9e7007e187103af4f26c7d196bb86a3d80 Mon Sep 17 00:00:00 2001 From: ItsVyzo <46250991+ItsVyzo@users.noreply.github.com> Date: Sat, 2 Dec 2023 23:55:26 -0800 Subject: [PATCH 07/10] Update code/game/objects/structures/crates_lockers/closets/secure/security.dm Co-authored-by: harryob --- .../objects/structures/crates_lockers/closets/secure/security.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 03c324e38f83..98f7f203a9a3 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -233,6 +233,7 @@ req_one_access = list(ACCESS_MARINE_BRIG, ACCESS_CIVILIAN_BRIG) anchored = TRUE locked = TRUE + /obj/structure/closet/secure_closet/brig/restraints/Initialize() . = ..() new /obj/item/clothing/suit/straight_jacket(src) From f4f0c7fae8559ed3a852bf7b59505e41147f2d5d Mon Sep 17 00:00:00 2001 From: ItsVyzo Date: Sun, 3 Dec 2023 12:08:23 +0300 Subject: [PATCH 08/10] harry feedback --- .../structures/crates_lockers/closets/secure/security.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 98f7f203a9a3..72e61af21922 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -247,9 +247,6 @@ new /obj/item/clothing/glasses/sunglasses/blindfold(src) new /obj/item/clothing/glasses/sunglasses/blindfold(src) -/obj/structure/closet/secure_closet/brig/Initialize() - . = ..() - /obj/structure/closet/secure_closet/brig/Initialize() . = ..() new /obj/item/clothing/under/color/orange(src) From 512e0de63020aab4d29f927021b5474315d5a701 Mon Sep 17 00:00:00 2001 From: ItsVyzo <46250991+ItsVyzo@users.noreply.github.com> Date: Wed, 13 Dec 2023 09:47:09 -0800 Subject: [PATCH 09/10] Update code/game/objects/structures/crates_lockers/closets/secure/security.dm Co-authored-by: harryob --- .../objects/structures/crates_lockers/closets/secure/security.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 72e61af21922..0460349776f8 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -210,6 +210,7 @@ anchored = TRUE locked = TRUE + /obj/structure/closet/secure_closet/brig/prison_uni/Initialize() . = ..() new /obj/item/clothing/shoes/orange(src) From 529d78eefc152c4992a6c76f605c3cedd56aeaa2 Mon Sep 17 00:00:00 2001 From: ItsVyzo <46250991+ItsVyzo@users.noreply.github.com> Date: Wed, 13 Dec 2023 09:47:48 -0800 Subject: [PATCH 10/10] Update code/game/objects/structures/crates_lockers/closets/secure/security.dm Co-authored-by: harryob --- .../objects/structures/crates_lockers/closets/secure/security.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 0460349776f8..c668f299db73 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -235,6 +235,7 @@ anchored = TRUE locked = TRUE + /obj/structure/closet/secure_closet/brig/restraints/Initialize() . = ..() new /obj/item/clothing/suit/straight_jacket(src)