diff --git a/code/__DEFINES/objects.dm b/code/__DEFINES/objects.dm index a49d775a7878..33b6c3d1af88 100644 --- a/code/__DEFINES/objects.dm +++ b/code/__DEFINES/objects.dm @@ -234,3 +234,11 @@ GLOBAL_LIST_INIT(RESTRICTED_CAMERA_NETWORKS, list( //Those networks can only be /// How many fields maximum are allowed on papers #define PAPER_MAX_FIELDS 51 + +// Filing cabinet defines +#define FILING_CABINET_NORMAL "filingcabinet" +#define FILING_CABINET_CHEST "chestdrawer" +#define FILING_CABINET_TALL "tallcabinet" +#define FILING_CABINET_NORMAL_DOUBLE "filingcabinet_double" +#define FILING_CABINET_CHEST_DOUBLE "chestdrawer_double" +#define FILING_CABINET_TALL_DOUBLE "tallcabinet_double" diff --git a/code/game/area/almayer.dm b/code/game/area/almayer.dm index 23a06949e107..7d6362d8d5b2 100644 --- a/code/game/area/almayer.dm +++ b/code/game/area/almayer.dm @@ -228,9 +228,6 @@ /area/almayer/shipboard/brig/armory name = "\improper Brig Armory" -/area/almayer/shipboard/brig/mp_bunks - name = "\improper Brig MP Bunks" - /area/almayer/shipboard/brig/starboard_hallway name = "\improper Brig Starboard Hallway" @@ -246,12 +243,24 @@ /area/almayer/shipboard/brig/interrogation name = "\improper Brig Interrogation Room" +/area/almayer/shipboard/brig/visitation + name = "\improper Brig Visitation" + +/area/almayer/shipboard/brig/visitation_waiting + name = "\improper Brig Visitation Waiting Room" + +/area/almayer/shipboard/brig/yard + name = "\improper Brig Yard" + /area/almayer/shipboard/brig/general_equipment name = "\improper Brig General Equipment" /area/almayer/shipboard/brig/evidence_storage name = "\improper Brig Evidence Storage" +/area/almayer/shipboard/brig/lower + name = "\improper Brig Lower Level" + /area/almayer/shipboard/brig/execution name = "\improper Brig Execution Room" diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index fafa6beaf960..5e58c055bc3c 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -129,6 +129,8 @@ anchored = TRUE density = TRUE throwpass = 1 + + var/enable_shimmy = TRUE var/side = "" var/id = "" @@ -175,9 +177,13 @@ return ..() +/obj/structure/holohoop/noshimmy + enable_shimmy = FALSE + /obj/structure/holohoop/Initialize(mapload, ...) . = ..() - AddComponent(/datum/component/shimmy_around, east_offset = -15, west_offset = -15, north_offset = 15, south_offset = 15) + if (enable_shimmy) + AddComponent(/datum/component/shimmy_around, east_offset = -15, west_offset = -15, north_offset = 15, south_offset = 15) /obj/structure/machinery/readybutton name = "Ready Declaration Device" diff --git a/code/game/machinery/computer/camera_console.dm b/code/game/machinery/computer/camera_console.dm index fd0f93a4cd27..716d4dce1ee4 100644 --- a/code/game/machinery/computer/camera_console.dm +++ b/code/game/machinery/computer/camera_console.dm @@ -218,6 +218,17 @@ broadcastingcamera = null return ..() +/obj/structure/machinery/computer/cameras/wooden_tv/broadcast/wheeled + name = "Mobile Television Set" + desc = "An old TV hooked up to a video cassette recorder, bolted onto what appears to be an old roller bed. Only the finest for our Military Police force.\n\nIt could be used to keep perma prisoners entertained." + icon_state = "tv_mobile" + layer = WINDOW_LAYER + + anchored = FALSE + drag_delay = 0 + deconstructible = FALSE + density = TRUE + /obj/structure/machinery/computer/cameras/wooden_tv/broadcast/ui_state(mob/user) return GLOB.in_view diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm index b68f44a0a00b..6500d265898f 100644 --- a/code/game/machinery/vending/vending_types.dm +++ b/code/game/machinery/vending/vending_types.dm @@ -600,6 +600,19 @@ products = list(/obj/item/tool/kitchen/tray = 8,/obj/item/tool/kitchen/utensil/fork = 6,/obj/item/tool/kitchen/knife = 3,/obj/item/reagent_container/food/drinks/drinkingglass = 8,/obj/item/clothing/suit/chef/classic = 2,/obj/item/reagent_container/food/condiment/saltshaker = 4,/obj/item/reagent_container/food/condiment/peppermill = 4,/obj/item/reagent_container/food/condiment/enzyme = 1,/obj/item/reagent_container/food/condiment = 8) contraband = list(/obj/item/tool/kitchen/utensil/spoon = 2,/obj/item/tool/kitchen/utensil/knife = 2,/obj/item/tool/kitchen/rollingpin = 2, /obj/item/tool/kitchen/knife/butcher = 2) +/obj/structure/machinery/vending/dinnerware/prison + products = list( + /obj/item/tool/kitchen/tray = 8, + /obj/item/tool/kitchen/utensil/fork/plastic = 6, + /obj/item/tool/kitchen/utensil/knife/plastic = 3, + /obj/item/reagent_container/food/drinks/sillycup = 8, + /obj/item/clothing/suit/chef/classic = 2, + /obj/item/reagent_container/food/condiment/saltshaker = 4, + /obj/item/reagent_container/food/condiment/peppermill = 4, + /obj/item/reagent_container/food/condiment/enzyme = 1, + /obj/item/reagent_container/food/condiment = 8, + ) + /obj/structure/machinery/vending/dinnerware/yautja name = "dinnerplate dispenser" desc = "A kitchen and restaurant equipment vendor." diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm index e5f472260823..f597ed611621 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm @@ -420,6 +420,74 @@ list("M44 Magnum Sharpshooter Stock", 1.5, /obj/item/attachable/stock/revolver, VENDOR_ITEM_REGULAR) ) +/obj/structure/machinery/cm_vending/sorted/attachments/mp_extended + name = "\improper SecTech General Utility Vendor" + desc = "An automated supply rack for all your military policing needs. This one is special-made so you don't have to mingle with the masses." + req_access = list(ACCESS_MARINE_BRIG) + icon_state = "req_ammo" + vend_dir = WEST + vend_flags = VEND_CLUTTER_PROTECTION | VEND_LIMITED_INVENTORY | VEND_TO_HAND + + listed_products = list( + list("ATTACHMENTS", -1, null, null), + list("Extended Barrel", 1, /obj/item/attachable/extended_barrel, VENDOR_ITEM_REGULAR), + list("Suppressor", 3, /obj/item/attachable/suppressor, VENDOR_ITEM_REGULAR), + list("Suppressor, Compact", 3, /obj/item/attachable/suppressor/sleek, VENDOR_ITEM_REGULAR), + list("S5 Red-Dot Sight", 3, /obj/item/attachable/reddot, VENDOR_ITEM_REGULAR), + list("S5-Micro Dot Sight", 3, /obj/item/attachable/reddot/small, VENDOR_ITEM_RECOMMENDED), + list("S6 Reflex Sight", 3, /obj/item/attachable/reflex, VENDOR_ITEM_REGULAR), + list("S4 2x Telescopic Mini-Scope", 3, /obj/item/attachable/scope/mini, VENDOR_ITEM_REGULAR), + list("Burst Fire Assembly", 3, /obj/item/attachable/burstfire_assembly, VENDOR_ITEM_REGULAR), + list("Gyroscopic Stabilizer", 2, /obj/item/attachable/gyro, VENDOR_ITEM_REGULAR), + list("Laser Sight", 3, /obj/item/attachable/lasersight, VENDOR_ITEM_RECOMMENDED), + list("Underbarrel Flashlight Grip", 6, /obj/item/attachable/flashlight/grip, VENDOR_ITEM_REGULAR), + + list("BELTS", -1, null, null), + list("M276 Pattern Shotgun Shell Loading Rig", 8, /obj/item/storage/belt/shotgun, VENDOR_ITEM_REGULAR), + list("M276 Pattern General Pistol Holster Rig", 8, /obj/item/storage/belt/gun/m4a3, VENDOR_ITEM_REGULAR), + list("M276 Pattern General Revolver Holster Rig", 8, /obj/item/storage/belt/gun/m44, VENDOR_ITEM_REGULAR), + list("M276 G8-A General Utility Pouch", 8, /obj/item/storage/backpack/general_belt, VENDOR_ITEM_RECOMMENDED), + + list("POUCHES", -1, null, null), + list("Small Document Pouch", 8, /obj/item/storage/pouch/document/small, VENDOR_ITEM_REGULAR), + list("Magazine Pouch", 8, /obj/item/storage/pouch/magazine, VENDOR_ITEM_REGULAR), + list("Shotgun Shell Pouch", 8, /obj/item/storage/pouch/shotgun, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 8, /obj/item/storage/pouch/general/medium, VENDOR_ITEM_REGULAR), + list("Pistol Magazine Pouch", 8, /obj/item/storage/pouch/magazine/pistol, VENDOR_ITEM_REGULAR), + + list("STANDARD EQUIPMENT", -1, null, null, null), + list("Marine Combat Boots", 8, /obj/item/clothing/shoes/marine, VENDOR_ITEM_REGULAR), + list("Marine Brown Combat Boots", 8, /obj/item/clothing/shoes/marine/brown, VENDOR_ITEM_REGULAR), + list("Marine Grey Combat Boots", 8, /obj/item/clothing/shoes/marine/grey, VENDOR_ITEM_REGULAR), + list("Marine Combat Gloves", 8, /obj/item/clothing/gloves/marine, VENDOR_ITEM_REGULAR), + list("Marine Brown Combat Gloves", 8, /obj/item/clothing/gloves/marine/brown, VENDOR_ITEM_REGULAR), + list("Marine Black Combat Gloves", 8, /obj/item/clothing/gloves/marine/black, VENDOR_ITEM_REGULAR), + list("Marine Grey Combat Gloves", 8, /obj/item/clothing/gloves/marine/grey, VENDOR_ITEM_REGULAR), + list("Marine Fingerless Combat Gloves", 8, /obj/item/clothing/gloves/marine/fingerless, VENDOR_ITEM_REGULAR), + + list("MISCELLANEOUS", -1, null, null, null), + list("Ballistic goggles", 8, /obj/item/clothing/glasses/mgoggles, VENDOR_ITEM_REGULAR), + list("M1A1 Ballistic goggles", 8, /obj/item/clothing/glasses/mgoggles/v2, VENDOR_ITEM_REGULAR), + list("Prescription ballistic goggles", 8, /obj/item/clothing/glasses/mgoggles/prescription, VENDOR_ITEM_REGULAR), + list("Marine RPG glasses", 8, /obj/item/clothing/glasses/regular, VENDOR_ITEM_REGULAR), + list("M5 Integrated Gas Mask", 8, /obj/item/prop/helmetgarb/helmet_gasmask, VENDOR_ITEM_REGULAR), + list("M10 Helmet Netting", 8, /obj/item/clothing/accessory/helmet/cover/netting, VENDOR_ITEM_REGULAR), + list("M10 Helmet Rain Cover", 8, /obj/item/clothing/accessory/helmet/cover/raincover, VENDOR_ITEM_REGULAR), + list("Firearm Lubricant", 8, /obj/item/prop/helmetgarb/gunoil, VENDOR_ITEM_REGULAR), + list("Attachable Dogtags", 8, /obj/item/clothing/accessory/dogtags, VENDOR_ITEM_REGULAR), + list("USCM Flair", 8, /obj/item/prop/helmetgarb/flair_uscm, VENDOR_ITEM_REGULAR), + list("Falling Falcons Shoulder Patch", 8, /obj/item/clothing/accessory/patch/falcon, VENDOR_ITEM_REGULAR), + list("Falling Falcons UA Shoulder Patch", 8, /obj/item/clothing/accessory/patch/falconalt, VENDOR_ITEM_REGULAR), + list("USCM Large Chest Patch", 8, /obj/item/clothing/accessory/patch/uscmlarge, VENDOR_ITEM_REGULAR), + list("USCM Shoulder Patch", 8, /obj/item/clothing/accessory/patch/uscmpatch, VENDOR_ITEM_REGULAR), + list("United Americas Shoulder patch", 8, /obj/item/clothing/accessory/patch/ua, VENDOR_ITEM_REGULAR), + list("United Americas Flag Shoulder patch", 8, /obj/item/clothing/accessory/patch/uasquare, VENDOR_ITEM_REGULAR), + ) + +// Don't have the MP attachment vendor scale with pop size +/obj/structure/machinery/cm_vending/sorted/attachments/mp_extended/populate_product_list(scale) + return + //------------ESSENTIAL SETS--------------- /obj/effect/essentials_set/random/uscm_light_armor spawned_gear_list = list( diff --git a/code/game/objects/items/reagent_containers/food/drinks.dm b/code/game/objects/items/reagent_containers/food/drinks.dm index 17f49f5403c9..e4f641bb16fb 100644 --- a/code/game/objects/items/reagent_containers/food/drinks.dm +++ b/code/game/objects/items/reagent_containers/food/drinks.dm @@ -250,7 +250,7 @@ icon_state = "water_cup_e" item_state = "water_cup_e" possible_transfer_amounts = null - volume = 10 + volume = 30 center_of_mass = "x=16;y=12" /obj/item/reagent_container/food/drinks/sillycup/Initialize() diff --git a/code/game/objects/items/reagent_containers/food/fish_snacks.dm b/code/game/objects/items/reagent_containers/food/fish_snacks.dm index d67daeee8e66..08d2e5a6f901 100644 --- a/code/game/objects/items/reagent_containers/food/fish_snacks.dm +++ b/code/game/objects/items/reagent_containers/food/fish_snacks.dm @@ -52,7 +52,7 @@ if(!guttable) to_chat(user, SPAN_WARNING("[src] cannot be gutted.")) return - if(W.sharp == IS_SHARP_ITEM_ACCURATE || W.sharp == IS_SHARP_ITEM_BIG) + if(W.sharp) user.visible_message("[user] cuts [src] open and cleans it.", "You gut [src].") playsound(loc, 'sound/effects/blobattack.ogg', 25, 1) var/gut_loot = roll(total_length / 2 - min_length) diff --git a/code/game/objects/items/reagent_containers/food/snacks.dm b/code/game/objects/items/reagent_containers/food/snacks.dm index aa17c2576a60..e3c84d8d5eb5 100644 --- a/code/game/objects/items/reagent_containers/food/snacks.dm +++ b/code/game/objects/items/reagent_containers/food/snacks.dm @@ -163,7 +163,8 @@ if(istype(W,/obj/item/storage)) ..() // -> item/attackby() - if(istype(W,/obj/item/tool/kitchen/utensil)) + // No longer scoop up food with knife utensils, instead try to actually cut with them + if(istype(W,/obj/item/tool/kitchen/utensil) && !istype(W,/obj/item/tool/kitchen/utensil/knife)) var/obj/item/tool/kitchen/utensil/U = W @@ -196,7 +197,7 @@ return 0 var/inaccurate = 0 - if(W.sharp == IS_SHARP_ITEM_BIG) + if(W.sharp == IS_SHARP_ITEM_BIG || W.sharp == IS_SHARP_ITEM_SIMPLE) inaccurate = 1 else if(W.sharp != IS_SHARP_ITEM_ACCURATE) return 1 diff --git a/code/game/objects/items/reagent_containers/food/snacks/meat.dm b/code/game/objects/items/reagent_containers/food/snacks/meat.dm index b1fb715ea65b..fc5b212f59a7 100644 --- a/code/game/objects/items/reagent_containers/food/snacks/meat.dm +++ b/code/game/objects/items/reagent_containers/food/snacks/meat.dm @@ -14,7 +14,7 @@ name = made_from_player + name /obj/item/reagent_container/food/snacks/meat/attackby(obj/item/W as obj, mob/user as mob) - if(W.sharp == IS_SHARP_ITEM_ACCURATE || W.sharp == IS_SHARP_ITEM_BIG) + if(W.sharp) var/turf/T = get_turf(src) var/cutlet_amt = roll(1,4) for(var/i in 1 to cutlet_amt) diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 41a1136cd4d6..17c1fdc4a65e 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -86,9 +86,9 @@ GLOBAL_LIST_INIT(phoron_recipes, list ( \ GLOBAL_LIST_INIT(plastic_recipes, list ( \ new/datum/stack_recipe("plastic crate", /obj/structure/closet/crate/plastic, 10, one_per_turf = ONE_TYPE_PER_TURF, on_floor = 1), \ new/datum/stack_recipe("plastic ashtray", /obj/item/ashtray/plastic, 2, one_per_turf = ONE_TYPE_PER_TURF, on_floor = 1), \ - new/datum/stack_recipe("plastic fork", /obj/item/tool/kitchen/utensil/pfork, 1, on_floor = 1), \ - new/datum/stack_recipe("plastic spoon", /obj/item/tool/kitchen/utensil/pspoon, 1, on_floor = 1), \ - new/datum/stack_recipe("plastic knife", /obj/item/tool/kitchen/utensil/pknife, 1, on_floor = 1), \ + new/datum/stack_recipe("plastic fork", /obj/item/tool/kitchen/utensil/fork/plastic, 1, on_floor = 1), \ + new/datum/stack_recipe("plastic spoon", /obj/item/tool/kitchen/utensil/spoon/plastic, 1, on_floor = 1), \ + new/datum/stack_recipe("plastic knife", /obj/item/tool/kitchen/utensil/knife/plastic, 1, on_floor = 1), \ )) GLOBAL_LIST_INIT(iron_recipes, list ( \ diff --git a/code/game/objects/items/storage/mre.dm b/code/game/objects/items/storage/mre.dm index 46a25ed78eaf..c4a19190223a 100644 --- a/code/game/objects/items/storage/mre.dm +++ b/code/game/objects/items/storage/mre.dm @@ -329,7 +329,7 @@ AddElement(/datum/element/corp_label/norcomm) /obj/item/storage/box/mre/upp/choose_utencil() - new /obj/item/tool/kitchen/utensil/pspoon(src) + new /obj/item/tool/kitchen/utensil/spoon/plastic(src) /obj/item/storage/box/mre/upp/choose_drink() new /obj/item/reagent_container/food/drinks/cans/waterbottle/upp(src) diff --git a/code/game/objects/items/tools/kitchen_tools.dm b/code/game/objects/items/tools/kitchen_tools.dm index 908ee7259af7..8de71074a9d8 100644 --- a/code/game/objects/items/tools/kitchen_tools.dm +++ b/code/game/objects/items/tools/kitchen_tools.dm @@ -78,7 +78,7 @@ icon_state = "fork" item_state = "fork" -/obj/item/tool/kitchen/utensil/pfork +/obj/item/tool/kitchen/utensil/fork/plastic name = "plastic fork" desc = "Yay, no washing up to do." icon_state = "pfork" @@ -91,7 +91,7 @@ item_state = "spoon" attack_verb = list("attacked", "poked") -/obj/item/tool/kitchen/utensil/pspoon +/obj/item/tool/kitchen/utensil/spoon/plastic name = "plastic spoon" desc = "It's a plastic spoon. How dull." icon_state = "pspoon" @@ -130,7 +130,7 @@ if(.) playsound(loc, 'sound/weapons/bladeslice.ogg', 25, 1, 5) -/obj/item/tool/kitchen/utensil/pknife +/obj/item/tool/kitchen/utensil/knife/plastic name = "plastic knife" desc = "The bluntest of blades." icon_state = "pknife" @@ -139,13 +139,8 @@ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/knives_righthand.dmi' ) item_state = "pknife" - force = 10 - throwforce = 10 - -/obj/item/tool/kitchen/utensil/pknife/attack(target as mob, mob/living/user as mob) - . = ..() - if(.) - playsound(loc, 'sound/weapons/bladeslice.ogg', 25, 1, 5) + sharp = IS_SHARP_ITEM_SIMPLE + edge = FALSE /* * Kitchen knives diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm index 487ffd546d8e..3ac9f47d1e21 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm @@ -37,6 +37,17 @@ new /obj/item/weapon/gun/rifle/m4ra(src) new /obj/item/ammo_box/magazine/m4ra(src) +// 2 m42a cabinet are in brig armory (m41a guns and 12 mags) +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_mk2_rifle + +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_mk2_rifle/Initialize() + . = ..() + new /obj/item/weapon/gun/rifle/m41a(src) + new /obj/item/weapon/gun/rifle/m41a(src) + new /obj/item/weapon/gun/rifle/m41a(src) + new /obj/item/weapon/gun/rifle/m41a(src) + new /obj/item/ammo_box/magazine(src) + // EXECUTION CHAMBER might add that here need to ask first... will reskin if asked. diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index 0bc092f4356e..1e04bf60ae88 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -1232,7 +1232,6 @@ max_storage_space = 5 can_hold = list( /obj/item/tool/kitchen/utensil/knife, - /obj/item/tool/kitchen/utensil/pknife, /obj/item/tool/kitchen/knife, /obj/item/attachable/bayonet, /obj/item/weapon/throwing_knife, diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index 0abc4f9866dc..46d897a91315 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -17,6 +17,9 @@ density = TRUE anchored = TRUE wrenchable = TRUE + + // Initial cabinet type variable added, because initial(icon_state) does not work as intended for objects changed in map prefabs + var/list/cabinet_type = FILING_CABINET_NORMAL var/list/allowed_types = list(/obj/item/paper, /obj/item/folder, /obj/item/clipboard, /obj/item/photo, /obj/item/paper_bundle, /obj/item/pamphlet) /obj/structure/filingcabinet/proc/dump_contents() @@ -33,21 +36,26 @@ /obj/structure/filingcabinet/double name = "filing cabinets" desc = "Two large cabinets with drawers." - icon_state = "filingcabinet_double" + icon_state = FILING_CABINET_NORMAL_DOUBLE + cabinet_type = FILING_CABINET_NORMAL_DOUBLE /obj/structure/filingcabinet/chestdrawer name = "chest drawer" - icon_state = "chestdrawer" + icon_state = FILING_CABINET_CHEST + cabinet_type = FILING_CABINET_CHEST /obj/structure/filingcabinet/chestdrawer/double name = "chest drawers" - icon_state = "chestdrawer_double" + icon_state = FILING_CABINET_CHEST_DOUBLE + cabinet_type = FILING_CABINET_CHEST_DOUBLE /obj/structure/filingcabinet/filingcabinet //not changing the path to avoid unecessary map issues, but please don't name stuff like this in the future -Pete - icon_state = "tallcabinet" + icon_state = FILING_CABINET_TALL + cabinet_type = FILING_CABINET_TALL /obj/structure/filingcabinet/filingcabinet/double - icon_state = "tallcabinet_double" + icon_state = FILING_CABINET_TALL_DOUBLE + cabinet_type = FILING_CABINET_TALL_DOUBLE /obj/structure/filingcabinet/Initialize() . = ..() @@ -99,7 +107,7 @@ icon_state = "[initial(icon_state)]-open" addtimer(CALLBACK(src, "reset_icon"),0.5 SECONDS) /obj/structure/filingcabinet/proc/reset_icon() - icon_state = initial(icon_state) + icon_state = cabinet_type /* Automated Research Sorting Cabinet*/ diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 023dcb6772fd..a24f24e055ff 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -565,6 +565,7 @@ /obj/item/paper/almayer_storage name = "Almayer Emergency Storage Note" info = "Hey Garry, I got the boys to move most of the emergency supplies down into the ASRS hold just like ya' asked.
Next time you're around Chinook I'll buy you a beer ok?" + /obj/item/paper/Toxin name = "Chemical Information" info = "Known Onboard Toxins:
\n\tGrade A Semi-Liquid Phoron:
\n\t\tHighly poisonous. You cannot sustain concentrations above 15 units.
\n\t\tA gas mask fails to filter phoron after 50 units.
\n\t\tWill attempt to diffuse like a gas.
\n\t\tFiltered by scrubbers.
\n\t\tThere is a bottled version which is very different
\n\t\t\tfrom the version found in canisters!
\n
\n\t\tWARNING: Highly Flammable. Keep away from heat sources
\n\t\texcept in a enclosed fire area!
\n\t\tWARNING: It is a crime to use this without authorization.
\nKnown Onboard Anti-Toxin:
\n\tAnti-Toxin Type 01P: Works against Grade A Phoron.
\n\t\tBest if injected directly into bloodstream.
\n\t\tA full injection is in every regular Med-Kit.
\n\t\tSpecial toxin Kits hold around 7.
\n
\nKnown Onboard Chemicals (other):
\n\tRejuvenation T#001:
\n\t\tEven 1 unit injected directly into the bloodstream
\n\t\t\twill cure paralysis and sleep phoron.
\n\t\tIf administered to a dying patient it will prevent
\n\t\t\tfurther damage for about units*3 seconds.
\n\t\t\tit will not cure them or allow them to be cured.
\n\t\tIt can be administered to a non-dying patient
\n\t\t\tbut the chemicals disappear just as fast.
\n\tSoporific T#054:
\n\t\t5 units will induce precisely 1 minute of sleep.
\n\t\t\tThe effect are cumulative.
\n\t\tWARNING: It is a crime to use this without authorization!" diff --git a/code/modules/paperwork/prefab_papers.dm b/code/modules/paperwork/prefab_papers.dm index 1c965a816918..dd618b5044f4 100644 --- a/code/modules/paperwork/prefab_papers.dm +++ b/code/modules/paperwork/prefab_papers.dm @@ -73,44 +73,95 @@ GLOBAL_REFERENCE_LIST_INDEXED(prefab_papers, /obj/item/paper/prefab, document_ti /obj/structure/filingcabinet/documentation/military_police available_categories = list(PAPER_CATEGORY_MP) +/obj/structure/filingcabinet/documentation/military_police/chestdrawer + icon_state = FILING_CABINET_CHEST + cabinet_type = FILING_CABINET_CHEST + /obj/structure/filingcabinet/documentation/uscm available_categories = list(PAPER_CATEGORY_USCM) +/obj/structure/filingcabinet/documentation/uscm/chestdrawer + icon_state = FILING_CABINET_CHEST + cabinet_type = FILING_CABINET_CHEST + /obj/structure/filingcabinet/documentation/uscm_mp icon_state = "chestdrawer" available_categories = list(PAPER_CATEGORY_USCM, PAPER_CATEGORY_MP) +/obj/structure/filingcabinet/documentation/uscm_mp/chestdrawer + icon_state = FILING_CABINET_CHEST + cabinet_type = FILING_CABINET_CHEST + /obj/structure/filingcabinet/documentation/liaison available_categories = list(PAPER_CATEGORY_LIAISON) remaining_documents = 45 //CL likely using more of these than most people. +/obj/structure/filingcabinet/documentation/liasion/chestdrawer + icon_state = FILING_CABINET_CHEST + cabinet_type = FILING_CABINET_CHEST + /obj/structure/filingcabinet/documentation/highcom remaining_documents = 60 +/obj/structure/filingcabinet/documentation/highcom/chestdrawer + icon_state = FILING_CABINET_CHEST + cabinet_type = FILING_CABINET_CHEST + /obj/structure/filingcabinet/documentation/highcom/wy available_categories = list(PAPER_CATEGORY_WEYYU_HC) +/obj/structure/filingcabinet/documentation/highcom/wy/chestdrawer + icon_state = FILING_CABINET_CHEST + cabinet_type = FILING_CABINET_CHEST + /obj/structure/filingcabinet/documentation/highcom/uscm available_categories = list(PAPER_CATEGORY_USCM_HC) +/obj/structure/filingcabinet/documentation/highcom/uscm/chestdrawer + icon_state = FILING_CABINET_CHEST + cabinet_type = FILING_CABINET_CHEST + /obj/structure/filingcabinet/documentation/highcom/provost available_categories = list(PAPER_CATEGORY_PROVOST) +/obj/structure/filingcabinet/documentation/highcom/provost/chestdrawer + icon_state = FILING_CABINET_CHEST + cabinet_type = FILING_CABINET_CHEST + /obj/structure/filingcabinet/documentation/highcom/upp available_categories = list(PAPER_CATEGORY_UPP_HC) +/obj/structure/filingcabinet/documentation/highcom/upp/chestdrawer + icon_state = FILING_CABINET_CHEST + cabinet_type = FILING_CABINET_CHEST + /obj/structure/filingcabinet/documentation/highcom/twe available_categories = list(PAPER_CATEGORY_TWE_HC) +/obj/structure/filingcabinet/documentation/highcom/twe/chestdrawer + icon_state = FILING_CABINET_CHEST + cabinet_type = FILING_CABINET_CHEST + /obj/structure/filingcabinet/documentation/highcom/cmb available_categories = list(PAPER_CATEGORY_CMB_HC) +/obj/structure/filingcabinet/documentation/highcom/cmb/chestdrawer + icon_state = FILING_CABINET_CHEST + cabinet_type = FILING_CABINET_CHEST + /obj/structure/filingcabinet/documentation/highcom/press available_categories = list(PAPER_CATEGORY_PRESS_HC) +/obj/structure/filingcabinet/documentation/highcom/press/chestdrawer + icon_state = FILING_CABINET_CHEST + cabinet_type = FILING_CABINET_CHEST + /obj/structure/filingcabinet/documentation/highcom/clf available_categories = list(PAPER_CATEGORY_CLF_HC) +/obj/structure/filingcabinet/documentation/highcom/clf/chestdrawer + icon_state = FILING_CABINET_CHEST + cabinet_type = FILING_CABINET_CHEST //######################################## //######################################## diff --git a/code/modules/shuttle/dropship_hijack.dm b/code/modules/shuttle/dropship_hijack.dm index 92d95b794bfc..ff6a603a5ee2 100644 --- a/code/modules/shuttle/dropship_hijack.dm +++ b/code/modules/shuttle/dropship_hijack.dm @@ -173,7 +173,6 @@ var/list/turfs = list() switch(ship_section) if("Upper deck Foreship") - turfs += get_area_turfs(/area/almayer/shipboard/brig/armory) turfs += get_area_turfs(/area/almayer/shipboard/brig/cells) turfs += get_area_turfs(/area/almayer/shipboard/brig/cic_hallway) turfs += get_area_turfs(/area/almayer/shipboard/brig/cryo) @@ -184,8 +183,9 @@ turfs += get_area_turfs(/area/almayer/shipboard/brig/perma) turfs += get_area_turfs(/area/almayer/shipboard/brig/processing) turfs += get_area_turfs(/area/almayer/shipboard/brig/medical) - turfs += get_area_turfs(/area/almayer/shipboard/brig/mp_bunks) turfs += get_area_turfs(/area/almayer/shipboard/brig/chief_mp_office) + turfs += get_area_turfs(/area/almayer/shipboard/brig/visitation) + turfs += get_area_turfs(/area/almayer/shipboard/brig/visitation_waiting) turfs += get_area_turfs(/area/almayer/command/cichallway) turfs += get_area_turfs(/area/almayer/command/cic) if("Upper deck Midship") diff --git a/icons/obj/structures/machinery/computer.dmi b/icons/obj/structures/machinery/computer.dmi index 80b4f0bc6004..5d557ac8dc28 100644 Binary files a/icons/obj/structures/machinery/computer.dmi and b/icons/obj/structures/machinery/computer.dmi differ diff --git a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm index c7fbde4f328d..1b8da8315358 100644 --- a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm +++ b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm @@ -4631,7 +4631,7 @@ /turf/open/floor/prison/darkpurplefull2, /area/fiorina/station/research_cells/east) "doe" = ( -/obj/item/tool/kitchen/utensil/pspoon, +/obj/item/tool/kitchen/utensil/spoon/plastic, /turf/open/space/basic, /area/fiorina/oob) "doq" = ( @@ -25145,7 +25145,7 @@ /turf/open/floor/prison/blue/west, /area/fiorina/station/civres_blue) "thV" = ( -/obj/item/tool/kitchen/utensil/pfork, +/obj/item/tool/kitchen/utensil/fork/plastic, /turf/open/floor/prison/blue/east, /area/fiorina/station/power_ring) "tii" = ( @@ -27278,7 +27278,7 @@ /turf/open/floor/prison/floor_plate, /area/fiorina/lz/near_lzII) "uSX" = ( -/obj/item/tool/kitchen/utensil/pknife, +/obj/item/tool/kitchen/utensil/knife/plastic, /turf/open/floor/prison, /area/fiorina/station/power_ring) "uTb" = ( @@ -30900,7 +30900,7 @@ /turf/open/floor/prison/whitegreen/north, /area/fiorina/station/central_ring) "xTf" = ( -/obj/item/tool/kitchen/utensil/pspoon, +/obj/item/tool/kitchen/utensil/spoon/plastic, /turf/open/floor/prison/blue/east, /area/fiorina/station/power_ring) "xTD" = ( diff --git a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm index 274c77037d2b..7ad8c6ebc11d 100644 --- a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm +++ b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm @@ -8587,7 +8587,7 @@ /area/shiva/interior/colony/research_hab) "dBK" = ( /obj/structure/surface/table, -/obj/item/tool/kitchen/utensil/pfork{ +/obj/item/tool/kitchen/utensil/fork/plastic{ pixel_x = -4; pixel_y = 10 }, @@ -12997,7 +12997,7 @@ /area/shiva/interior/colony/n_admin) "jhR" = ( /obj/structure/surface/table/woodentable, -/obj/item/tool/kitchen/utensil/pknife{ +/obj/item/tool/kitchen/utensil/knife/plastic{ pixel_x = 12; pixel_y = 7 }, diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm index 07f80df38b01..0c9a535b9c31 100644 --- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm +++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @@ -46695,7 +46695,7 @@ /turf/open/asphalt/cement/cement3, /area/lv522/outdoors/colony_streets/north_east_street) "xTJ" = ( -/obj/item/tool/kitchen/utensil/pknife{ +/obj/item/tool/kitchen/utensil/knife/plastic{ pixel_x = -9 }, /obj/structure/pipes/standard/manifold/hidden/green, diff --git a/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm b/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm index 384bf5f01cf6..7df58f307845 100644 --- a/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm +++ b/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm @@ -45070,7 +45070,7 @@ layer = 2 }, /obj/structure/surface/table/almayer, -/obj/item/tool/kitchen/utensil/pfork{ +/obj/item/tool/kitchen/utensil/fork/plastic{ pixel_x = -16; pixel_y = 1 }, @@ -67427,10 +67427,10 @@ dir = 1; layer = 2 }, -/obj/item/tool/kitchen/utensil/pspoon{ +/obj/item/tool/kitchen/utensil/spoon/plastic{ pixel_y = 1 }, -/obj/item/tool/kitchen/utensil/pknife{ +/obj/item/tool/kitchen/utensil/knife/plastic{ pixel_x = 8; pixel_y = -1 }, @@ -73396,7 +73396,7 @@ /turf/open/auto_turf/hybrisa_auto_turf/layer2, /area/lv759/outdoors/caveplateau) "jZG" = ( -/obj/item/tool/kitchen/utensil/pfork, +/obj/item/tool/kitchen/utensil/fork/plastic, /obj/structure/pipes/standard/simple/hidden/dark{ dir = 4 }, @@ -95916,8 +95916,8 @@ /turf/open/hybrisa/street/roadlines4, /area/lv759/outdoors/colony_streets/north_east_street) "nri" = ( -/obj/item/tool/kitchen/utensil/pknife, -/obj/item/tool/kitchen/utensil/pspoon, +/obj/item/tool/kitchen/utensil/knife/plastic, +/obj/item/tool/kitchen/utensil/spoon/plastic, /obj/structure/surface/table/almayer{ color = "#848484" }, @@ -99148,7 +99148,7 @@ name = "\improper UA Prepared Meal (cornbread)"; pixel_y = 9 }, -/obj/item/tool/kitchen/utensil/pknife, +/obj/item/tool/kitchen/utensil/knife/plastic, /obj/structure/surface/table/almayer{ color = "#848484" }, @@ -118023,7 +118023,7 @@ /area/lv759/indoors/bar/entertainment) "qII" = ( /obj/item/trash/tray, -/obj/item/tool/kitchen/utensil/pfork, +/obj/item/tool/kitchen/utensil/fork/plastic, /obj/structure/surface/table/almayer{ color = "#848484" }, diff --git a/maps/map_files/LV759_Hybrisa_Prospera/standalone/twe_airbase.dmm b/maps/map_files/LV759_Hybrisa_Prospera/standalone/twe_airbase.dmm index a74b1391df25..1d2f65598c12 100644 --- a/maps/map_files/LV759_Hybrisa_Prospera/standalone/twe_airbase.dmm +++ b/maps/map_files/LV759_Hybrisa_Prospera/standalone/twe_airbase.dmm @@ -2290,7 +2290,7 @@ /area/lv759/outdoors/colony_streets/north_west_street) "ui" = ( /obj/structure/surface/table/reinforced/black, -/obj/item/tool/kitchen/utensil/pfork, +/obj/item/tool/kitchen/utensil/fork/plastic, /obj/item/reagent_container/food/drinks/coffeecup/uscm{ pixel_x = 9; name = "TWE coffee mug"; diff --git a/maps/map_files/LV759_Hybrisa_Prospera/standalone/twe_airbase_survivors.dmm b/maps/map_files/LV759_Hybrisa_Prospera/standalone/twe_airbase_survivors.dmm index 4e032b8a196a..1772f2e02435 100644 --- a/maps/map_files/LV759_Hybrisa_Prospera/standalone/twe_airbase_survivors.dmm +++ b/maps/map_files/LV759_Hybrisa_Prospera/standalone/twe_airbase_survivors.dmm @@ -1732,7 +1732,7 @@ /turf/open/floor/prison/darkpurple2/north, /area/lv759/indoors/twe_souter_outpost/dorm) "mu" = ( -/obj/item/tool/kitchen/utensil/pfork, +/obj/item/tool/kitchen/utensil/fork/plastic, /turf/open/floor/almayer, /area/lv759/indoors/twe_souter_outpost/hallway) "mv" = ( diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm index 24ffbadf4664..25e152e09233 100644 --- a/maps/map_files/New_Varadero/New_Varadero.dmm +++ b/maps/map_files/New_Varadero/New_Varadero.dmm @@ -9241,7 +9241,7 @@ /obj/item/device/cassette_tape/pop3{ pixel_y = 7 }, -/obj/item/tool/kitchen/utensil/pfork{ +/obj/item/tool/kitchen/utensil/fork/plastic{ pixel_x = -6; pixel_y = 7 }, @@ -18190,7 +18190,7 @@ "oMa" = ( /obj/structure/surface/table, /obj/item/storage/pill_bottle/packet/bicaridine, -/obj/item/tool/kitchen/utensil/pknife{ +/obj/item/tool/kitchen/utensil/knife/plastic{ pixel_x = 9; pixel_y = 2 }, @@ -29545,7 +29545,7 @@ pixel_x = -9; pixel_y = 7 }, -/obj/item/tool/kitchen/utensil/pknife{ +/obj/item/tool/kitchen/utensil/knife/plastic{ pixel_x = 12; pixel_y = 7 }, diff --git a/maps/map_files/New_Varadero/sprinkles/33.LibraryIntoRestaraunt.dmm b/maps/map_files/New_Varadero/sprinkles/33.LibraryIntoRestaraunt.dmm index e60fdde091cb..2e306cbf68ec 100644 --- a/maps/map_files/New_Varadero/sprinkles/33.LibraryIntoRestaraunt.dmm +++ b/maps/map_files/New_Varadero/sprinkles/33.LibraryIntoRestaraunt.dmm @@ -339,11 +339,11 @@ "BL" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/trash/ceramic_plate, -/obj/item/tool/kitchen/utensil/pknife{ +/obj/item/tool/kitchen/utensil/knife/plastic{ pixel_x = 9; pixel_y = 5 }, -/obj/item/tool/kitchen/utensil/pfork{ +/obj/item/tool/kitchen/utensil/fork/plastic{ pixel_x = -9; pixel_y = 5 }, @@ -363,7 +363,7 @@ /area/varadero/interior/library/restaraunt) "Dh" = ( /obj/structure/surface/table/woodentable/fancy, -/obj/item/tool/kitchen/utensil/pspoon{ +/obj/item/tool/kitchen/utensil/spoon/plastic{ pixel_y = 5; pixel_x = 8 }, diff --git a/maps/map_files/New_Varadero/standalone/landingzone_varadero_uscm_lz1.dmm b/maps/map_files/New_Varadero/standalone/landingzone_varadero_uscm_lz1.dmm index ffc9f8a0811d..27f4a4e2209e 100644 --- a/maps/map_files/New_Varadero/standalone/landingzone_varadero_uscm_lz1.dmm +++ b/maps/map_files/New_Varadero/standalone/landingzone_varadero_uscm_lz1.dmm @@ -4496,7 +4496,7 @@ "Mp" = ( /obj/structure/surface/table, /obj/item/storage/pill_bottle/packet/bicaridine, -/obj/item/tool/kitchen/utensil/pknife{ +/obj/item/tool/kitchen/utensil/knife/plastic{ pixel_x = 9; pixel_y = 2 }, diff --git a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm index 16663126686e..3922dc6c05ac 100644 --- a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm +++ b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm @@ -1339,7 +1339,7 @@ pixel_x = 8; pixel_y = 6 }, -/obj/item/tool/kitchen/utensil/pfork, +/obj/item/tool/kitchen/utensil/fork/plastic, /obj/item/device/flashlight/lamp, /turf/open/floor/strata/red1, /area/strata/interior/research) @@ -3295,7 +3295,7 @@ /obj/structure/surface/table/reinforced/prison{ color = "#98a3ab" }, -/obj/item/tool/kitchen/utensil/pspoon{ +/obj/item/tool/kitchen/utensil/spoon/plastic{ pixel_x = -11; pixel_y = 5 }, @@ -4872,7 +4872,7 @@ pixel_x = -5; pixel_y = -8 }, -/obj/item/tool/kitchen/utensil/pfork{ +/obj/item/tool/kitchen/utensil/fork/plastic{ pixel_x = 7; pixel_y = -5 }, @@ -11558,7 +11558,7 @@ /obj/structure/surface/table/reinforced/prison{ color = "#98a3ab" }, -/obj/item/tool/kitchen/utensil/pfork{ +/obj/item/tool/kitchen/utensil/fork/plastic{ pixel_x = 6; pixel_y = 2 }, @@ -11999,7 +11999,7 @@ /obj/effect/decal/cleanable/blood{ icon_state = "xgib2" }, -/obj/item/tool/kitchen/utensil/pknife, +/obj/item/tool/kitchen/utensil/knife/plastic, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/strata/white_cyan1, /area/strata/interior/mining_outpost) @@ -12360,7 +12360,7 @@ color = "#98a3ab" }, /obj/item/pizzabox/mushroom, -/obj/item/tool/kitchen/utensil/pspoon{ +/obj/item/tool/kitchen/utensil/spoon/plastic{ pixel_x = -5; pixel_y = -18 }, diff --git a/maps/map_files/Sorokyne_Strata/standalone/landingzone_sorokyne_upp_lz1.dmm b/maps/map_files/Sorokyne_Strata/standalone/landingzone_sorokyne_upp_lz1.dmm index bbd4a0a42041..2345fe1f6a10 100644 --- a/maps/map_files/Sorokyne_Strata/standalone/landingzone_sorokyne_upp_lz1.dmm +++ b/maps/map_files/Sorokyne_Strata/standalone/landingzone_sorokyne_upp_lz1.dmm @@ -875,7 +875,7 @@ pixel_x = 8; pixel_y = 6 }, -/obj/item/tool/kitchen/utensil/pfork, +/obj/item/tool/kitchen/utensil/fork/plastic, /obj/item/device/flashlight/lamp, /turf/open/floor/strata/red1, /area/strata/interior/research) diff --git a/maps/map_files/Sorokyne_Strata/standalone/landingzone_sorokyne_uscm_lz1.dmm b/maps/map_files/Sorokyne_Strata/standalone/landingzone_sorokyne_uscm_lz1.dmm index 030322e1c745..57db7ee4d14a 100644 --- a/maps/map_files/Sorokyne_Strata/standalone/landingzone_sorokyne_uscm_lz1.dmm +++ b/maps/map_files/Sorokyne_Strata/standalone/landingzone_sorokyne_uscm_lz1.dmm @@ -136,7 +136,7 @@ color = "#98a3ab" }, /obj/item/pizzabox/mushroom, -/obj/item/tool/kitchen/utensil/pspoon{ +/obj/item/tool/kitchen/utensil/spoon/plastic{ pixel_x = -5; pixel_y = -18 }, @@ -1034,7 +1034,7 @@ /obj/structure/surface/table/reinforced/prison{ color = "#98a3ab" }, -/obj/item/tool/kitchen/utensil/pfork{ +/obj/item/tool/kitchen/utensil/fork/plastic{ pixel_x = 6; pixel_y = 2 }, @@ -2023,7 +2023,7 @@ /turf/open/asphalt/cement/cement9, /area/strata/interior/landing_zones/lz1) "JC" = ( -/obj/item/tool/kitchen/utensil/pknife, +/obj/item/tool/kitchen/utensil/knife/plastic, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/strata/white_cyan1, /area/strata/interior/mining_outpost) diff --git a/maps/map_files/Tyrargo_Rift/Tyrargo_Rift.dmm b/maps/map_files/Tyrargo_Rift/Tyrargo_Rift.dmm index cf030992a157..3af9ced46517 100644 --- a/maps/map_files/Tyrargo_Rift/Tyrargo_Rift.dmm +++ b/maps/map_files/Tyrargo_Rift/Tyrargo_Rift.dmm @@ -12311,7 +12311,7 @@ /area/tyrargo/landing_zone_2/road) "aEZ" = ( /obj/structure/surface/table/reinforced/black, -/obj/item/tool/kitchen/utensil/pfork, +/obj/item/tool/kitchen/utensil/fork/plastic, /obj/effect/landmark/objective_landmark/science, /turf/open/floor/almayer/blackfull/west, /area/tyrargo/indoors/security/ground) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index a239d4c3c79c..cc718533cbda 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -193,33 +193,12 @@ /turf/open/floor/almayer/red/north, /area/almayer/shipboard/brig/processing) "aaB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/item/device/radio/listening_bug/radio_linked/fax/uscm_pvst{ - nametag = "Brig 2" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/processing) +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/yard) "aaC" = ( /obj/structure/lattice, /turf/open/space/basic, /area/space) -"aaD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/item/device/radio/listening_bug/radio_linked/fax/uscm_pvst{ - nametag = "Brig 1" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/processing) "aaE" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/almayer/plating_striped/south, @@ -322,20 +301,14 @@ /turf/open/floor/almayer/dark_sterile, /area/almayer/living/starboard_emb) "aaP" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ - dir = 2; - name = "\improper Brig Armoury"; - req_access = null; - req_one_access_txt = "1;3" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 2; + pixel_x = -1 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/starboard_hallway) +/turf/open/floor/almayer/redcorner/north, +/area/almayer/shipboard/brig) "aaQ" = ( /obj/structure/toilet{ pixel_y = 16 @@ -374,10 +347,7 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/starboard_emb) "aaT" = ( -/obj/item/device/radio/listening_bug/radio_linked/fax/uscm_pvst{ - nametag = "Brig Perma" - }, -/turf/closed/wall/almayer/reinforced, +/turf/open/floor/almayer/redcorner/east, /area/almayer/shipboard/brig/perma) "aaU" = ( /obj/structure/machinery/shower{ @@ -394,11 +364,11 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/starboard_emb) "aaV" = ( -/obj/item/device/radio/listening_bug/radio_linked/fax/uscm_pvst{ - nametag = "Interrogation" +/obj/structure/toilet{ + dir = 1 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/interrogation) +/area/almayer/shipboard/brig/chief_mp_office) "aaW" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/almayer, @@ -1257,14 +1227,9 @@ /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/north1) "ade" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/sign/calendar{ - pixel_y = 30 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/yard) "adf" = ( /obj/structure/surface/rack, /obj/item/storage/belt/medical/lifesaver/full, @@ -4005,8 +3970,12 @@ /turf/open_space, /area/almayer/medical/containment) "ajj" = ( -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/general_equipment) +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/obj/structure/window/framed/almayer, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/processing) "ajk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -4396,6 +4365,10 @@ "akw" = ( /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/upper_medical) +"akx" = ( +/obj/structure/largecrate/random/barrel/true_random, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/maintenance/pb) "aky" = ( /obj/structure/sign/safety/ladder{ pixel_x = 32; @@ -4558,6 +4531,22 @@ "ala" = ( /turf/open/floor/almayer/flooredgesmooth2/east, /area/almayer/squads/charlie_delta_shared) +"alb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/obj/structure/prop/invuln/lattice_prop{ + dir = 1; + icon_state = "lattice3"; + pixel_x = 16 + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/maintenance/pb) "alc" = ( /obj/structure/window/reinforced/toughened{ dir = 8; @@ -4571,6 +4560,26 @@ "ald" = ( /turf/open/floor/almayer/red, /area/almayer/shipboard/weapon_room) +"ale" = ( +/obj/structure/surface/table/almayer, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/item/storage/bible{ + pixel_x = -7 + }, +/obj/item/device/megaphone{ + pixel_x = 3; + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/glasses/sunglasses/blindfold{ + pixel_x = 4; + pixel_y = -3 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/execution) "alf" = ( /turf/open_space, /area/almayer/stair_clone/upper/port_fore) @@ -4625,14 +4634,30 @@ /turf/open/floor/almayer/plate, /area/almayer/engineering/lower/workshop/hangar) "alp" = ( -/obj/structure/machinery/firealarm{ - pixel_y = -28 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/door_control{ + id = "Cell Privacy Shutters"; + name = "Cell Privacy Shutters"; + pixel_x = 6; + pixel_y = 9; + req_access = list(3) }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/machinery/door_control{ + id = "Brig Lockdown Shutters"; + name = "Brig Lockdown Shutters"; + pixel_x = 6; + pixel_y = 2; + req_access_txt = "3" }, -/turf/open/floor/almayer/red, -/area/almayer/shipboard/brig/starboard_hallway) +/obj/structure/machinery/door_control{ + id = "perma_lockdown_1"; + name = "\improper Perma Cells Lockdown"; + pixel_x = 6; + pixel_y = -5; + req_access_txt = "3" + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig) "alq" = ( /obj/structure/sign/safety/hazard{ desc = "A sign that warns of a hazardous environment nearby"; @@ -4715,6 +4740,15 @@ }, /turf/open/floor/almayer/sterile_green_side, /area/almayer/medical/upper_medical) +"alE" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/machinery/power/apc/almayer/south, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/execution) "alF" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -5327,6 +5361,18 @@ /obj/structure/platform_decoration/metal/almayer/east, /turf/open/floor/almayer/mono, /area/almayer/medical/upper_medical) +"anr" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/execution) "ans" = ( /turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/upper_medical) @@ -5671,6 +5717,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plating, /area/almayer/hallways/upper/fore_hallway) +"aoq" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/execution) "aor" = ( /obj/structure/curtain/open/medical{ pixel_x = -1 @@ -6676,6 +6729,11 @@ /obj/structure/surface/table/almayer, /turf/open/floor/almayer/blue, /area/almayer/living/offices/flight) +"aqP" = ( +/obj/structure/janitorialcart, +/obj/item/tool/mop, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/execution) "aqQ" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = -12 @@ -6700,6 +6758,14 @@ }, /turf/open/floor/almayer/plating_striped/north, /area/almayer/shipboard/panic) +"aqS" = ( +/obj/structure/reagent_dispensers/tank/water, +/obj/structure/sign/safety/water{ + pixel_x = -9; + pixel_y = -25 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/execution) "aqT" = ( /obj/structure/machinery/door/airlock/almayer/secure{ name = "\improper Saferoom Office"; @@ -7374,6 +7440,16 @@ }, /turf/open/floor/almayer/silver/northwest, /area/almayer/hallways/lower/repair_bay) +"asu" = ( +/obj/structure/surface/rack, +/obj/item/storage/firstaid/adv{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/storage/firstaid/regular, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/cargo/no_build, +/area/almayer/shipboard/brig/execution_storage) "asv" = ( /obj/structure/flora/pottedplant/random{ pixel_y = 5; @@ -7976,6 +8052,11 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering) +"auv" = ( +/obj/structure/barricade/handrail/no_vault, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/no_build, +/area/almayer/shipboard/brig/execution) "auw" = ( /obj/structure/window/reinforced/tinted{ dir = 4 @@ -8192,6 +8273,11 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/s_bow) +"ava" = ( +/obj/structure/barricade/handrail/no_vault, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/cargo, +/area/almayer/shipboard/brig/execution) "avb" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -8410,6 +8496,10 @@ /obj/structure/platform/metal/almayer_smooth/north, /turf/open_space, /area/almayer/medical/containment) +"avG" = ( +/obj/structure/barricade/handrail/no_vault, +/turf/open/floor/almayer/cargo, +/area/almayer/shipboard/brig/execution) "avH" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -9005,6 +9095,14 @@ }, /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/upper_medical) +"axn" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 + }, +/turf/open/floor/almayer/no_build, +/area/almayer/shipboard/brig/execution) "axo" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -9455,6 +9553,9 @@ /obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/orange/north, /area/almayer/maint/upper/mess) +"ayF" = ( +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/execution) "ayG" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -9513,6 +9614,15 @@ }, /turf/open/floor/almayer/green/east, /area/almayer/hallways/upper/fore_hallway) +"ayO" = ( +/obj/structure/machinery/door/airlock/almayer/security/reinforced{ + name = "\improper Execution Preparation" + }, +/turf/open/floor/almayer/no_build/test_floor4, +/area/almayer/shipboard/brig/execution) +"ayP" = ( +/turf/open/floor/almayer/cargo_arrow/west, +/area/almayer/shipboard/brig/execution_storage) "ayQ" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /obj/structure/disposalpipe/junction{ @@ -9547,6 +9657,36 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/orange/north, /area/almayer/engineering/upper_engineering) +"ayW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/safety/medical{ + pixel_y = -25 + }, +/obj/structure/machinery/power/apc/almayer/east, +/obj/structure/sign/safety/rewire{ + pixel_x = 15; + pixel_y = -25 + }, +/turf/open/floor/almayer/no_build, +/area/almayer/shipboard/brig/execution_storage) +"ayX" = ( +/obj/structure/machinery/door/airlock/almayer/security/reinforced{ + dir = 2; + name = "\improper Brig Maintenance" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" + }, +/obj/item/device/motion_sensor/mp{ + alert_message = "ALERT: Unauthorized movement detected in Execution Preperation Maintenance Hatch!"; + pixel_x = 8; + pixel_y = -8; + area_based = 0; + anchored = 1 + }, +/turf/open/floor/almayer/no_build/test_floor4, +/area/almayer/shipboard/brig/execution_storage) "ayY" = ( /obj/structure/sign/safety/maint{ pixel_x = 8; @@ -10346,6 +10486,18 @@ }, /turf/open/floor/almayer/cargo, /area/almayer/medical/upper_medical) +"aBe" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice4"; + pixel_x = -16; + pixel_y = 16 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = 16 + }, +/turf/open/floor/almayer/no_build, +/area/almayer/shipboard/brig/execution) "aBf" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/no_build, @@ -10896,6 +11048,13 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/silver/north, /area/almayer/command/computerlab) +"aCw" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = 16 + }, +/turf/open/floor/almayer/no_build, +/area/almayer/shipboard/brig/execution) "aCx" = ( /obj/structure/dartboard{ pixel_y = 27; @@ -10967,6 +11126,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/fore_hallway) +"aCF" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_y = -1; + pixel_x = 1 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = 16 + }, +/turf/open/floor/almayer/no_build, +/area/almayer/shipboard/brig/execution) "aCG" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/command/securestorage) @@ -11202,9 +11373,12 @@ /turf/open/floor/almayer/orange, /area/almayer/engineering/upper_engineering) "aDt" = ( -/obj/structure/machinery/cm_vending/clothing/military_police_warden, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/warden_office) +/obj/structure/machinery/status_display{ + pixel_x = 32 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/visitation) "aDu" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -11241,13 +11415,13 @@ /turf/open/floor/almayer/flooredgesmooth2/north, /area/almayer/command/lifeboat) "aDy" = ( -/obj/structure/disposalpipe/segment{ +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/almayer/flooredgesmooth2/west, +/turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) "aDz" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -11343,9 +11517,6 @@ }, /turf/open/floor/almayer/silver/east, /area/almayer/command/cic) -"aDL" = ( -/turf/open/floor/almayer/flooredgesmooth2/west, -/area/almayer/shipboard/brig/cic_hallway) "aDM" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/faxmachine/uscm/almayer/command{ @@ -11587,6 +11758,22 @@ }, /turf/open/floor/almayer/orange/north, /area/almayer/engineering/lower) +"aEp" = ( +/obj/structure/window/reinforced/ultra{ + dir = 8 + }, +/obj/structure/window/reinforced/ultra, +/obj/structure/bed/chair/bolted{ + dir = 8; + pixel_y = 16; + buckling_y = 16 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = 16 + }, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/shipboard/brig/execution) "aEq" = ( /obj/structure/pipes/vents/pump/on{ dir = 4 @@ -11798,6 +11985,24 @@ "aET" = ( /turf/closed/wall/almayer, /area/almayer/living/captain_mess) +"aEU" = ( +/obj/structure/window/reinforced/ultra, +/obj/structure/bed/chair/bolted{ + dir = 8; + pixel_y = 16; + buckling_y = 16 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice8"; + pixel_x = 16; + pixel_y = 16 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = 16 + }, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/shipboard/brig/execution) "aEV" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -11852,6 +12057,22 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/lower/vehiclehangar) +"aFa" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice4"; + pixel_x = -16; + pixel_y = 16 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = 16 + }, +/turf/open/floor/almayer/no_build, +/area/almayer/shipboard/brig/execution_storage) "aFb" = ( /obj/structure/sign/prop2{ pixel_y = 30; @@ -12151,10 +12372,10 @@ pixel_y = 7; pixel_x = 12 }, -/obj/item/tool/kitchen/utensil/pfork{ +/obj/item/tool/kitchen/utensil/fork/plastic{ pixel_x = -3 }, -/obj/item/tool/kitchen/utensil/pspoon{ +/obj/item/tool/kitchen/utensil/spoon/plastic{ pixel_x = -12 }, /turf/open/floor/almayer/silver/southeast, @@ -12461,6 +12682,18 @@ }, /turf/open/floor/almayer/red/northeast, /area/almayer/lifeboat_pumps/north1) +"aGQ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 2; + pixel_x = -1 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = 16 + }, +/turf/open/floor/almayer/no_build, +/area/almayer/shipboard/brig/execution_storage) "aGR" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F" @@ -13213,19 +13446,12 @@ /turf/open/floor/almayer/plating, /area/almayer/engineering/lower/workshop) "aIY" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/firstaid/toxin{ - pixel_x = 8; - pixel_y = -2 +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 }, -/obj/item/storage/firstaid/regular, -/obj/item/reagent_container/spray/cleaner, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/shipboard/brig/medical) +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/processing) "aIZ" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -13405,6 +13631,14 @@ /obj/structure/surface/rack, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/sp) +"aJD" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 2; + pixel_x = 2 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/shipboard/brig/execution) "aJE" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -14264,6 +14498,13 @@ /obj/effect/spawner/random/toolbox, /turf/open/floor/almayer/red, /area/almayer/shipboard/weapon_room) +"aLZ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer/no_build, +/area/almayer/shipboard/brig/execution) "aMa" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -14316,6 +14557,14 @@ "aMf" = ( /turf/open/floor/almayer/test_floor4, /area/almayer/maint/hull/upper/u_f_s) +"aMg" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -2; + pixel_y = 2 + }, +/turf/open/floor/almayer/no_build, +/area/almayer/shipboard/brig/execution) "aMh" = ( /turf/open_space, /area/almayer/middeck/maintenance/bow) @@ -14674,6 +14923,17 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/paft) +"aNr" = ( +/obj/structure/window/reinforced/ultra{ + dir = 8 + }, +/obj/structure/bed/chair/bolted{ + dir = 8; + pixel_y = 16; + buckling_y = 16 + }, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/shipboard/brig/execution) "aNs" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -14871,8 +15131,14 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/sp) "aNW" = ( -/turf/open/floor/almayer/redcorner, -/area/almayer/shipboard/brig/starboard_hallway) +/obj/structure/machinery/light{ + pixel_x = 16 + }, +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/almayer/red/southeast, +/area/almayer/shipboard/brig) "aNX" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -14908,11 +15174,6 @@ icon_state = "W"; layer = 3.3 }, -/obj/structure/prop/invuln/lattice_prop{ - dir = 1; - icon_state = "lattice3"; - pixel_x = 16 - }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/pb) "aOa" = ( @@ -14940,6 +15201,14 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/sb) +"aOd" = ( +/obj/structure/bed/chair/bolted{ + dir = 8; + pixel_y = 16; + buckling_y = 16 + }, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/shipboard/brig/execution) "aOe" = ( /turf/open/floor/almayer/test_floor4, /area/almayer/medical/medical_science) @@ -15375,6 +15644,11 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/squads/alpha) +"aPp" = ( +/obj/structure/morgue, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/execution_storage) "aPq" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/heavy_cable/cable_vertical, @@ -15477,9 +15751,9 @@ /obj/structure/machinery/photocopier{ pixel_y = 12 }, -/obj/structure/filingcabinet/documentation/uscm_mp{ +/obj/structure/filingcabinet/documentation/uscm_mp/chestdrawer{ pixel_x = 8; - icon_state = "chestdrawer" + name = "documents cabinet" }, /turf/open/floor/almayer/plate, /area/almayer/command/cic) @@ -16108,6 +16382,14 @@ /obj/effect/spawner/random/toolbox, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/sp) +"aRd" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5; + pixel_x = -1 + }, +/turf/open/floor/almayer/no_build, +/area/almayer/shipboard/brig/execution_storage) "aRe" = ( /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/maintenance/sp) @@ -16347,6 +16629,19 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/pb) +"aRJ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 2 + }, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/no_build, +/area/almayer/shipboard/brig/execution) "aRK" = ( /obj/structure/ladder/multiz, /turf/open/floor/almayer/plating, @@ -16613,6 +16908,9 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/pb) +"aSs" = ( +/turf/open/floor/almayer/no_build, +/area/almayer/shipboard/brig/execution) "aSt" = ( /turf/open/floor/almayer/bluefull, /area/almayer/living/captain_mess) @@ -17550,6 +17848,14 @@ /obj/effect/decal/heavy_cable/cable_vertical, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/briefing) +"aUH" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3; + pixel_x = -2 + }, +/turf/open/floor/almayer/no_build, +/area/almayer/shipboard/brig/execution) "aUI" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -17610,6 +17916,25 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/medical) +"aUP" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/obj/structure/bed/chair/bolted{ + dir = 8; + pixel_y = 16; + buckling_y = 16 + }, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/shipboard/brig/execution) +"aUQ" = ( +/obj/structure/morgue, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/execution_storage) "aUR" = ( /obj/structure/reagent_dispensers/tank/fuel/custom, /turf/open/floor/almayer/flooredge/southeast, @@ -17687,6 +18012,17 @@ /obj/effect/decal/heavy_cable/cable_vertical, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/maintenance/saft) +"aVb" = ( +/obj/structure/closet/secure_closet{ + name = "\improper Execution Firearms" + }, +/obj/item/weapon/gun/rifle/m4ra, +/obj/item/weapon/gun/rifle/m4ra, +/obj/item/weapon/gun/rifle/m4ra, +/obj/item/ammo_box/magazine/m4ra, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/execution_storage) "aVc" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/prop/invuln/lattice_prop{ @@ -17733,6 +18069,19 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/medical/containment) +"aVj" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 2 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/no_build, +/area/almayer/shipboard/brig/execution) +"aVk" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/redcorner/east, +/area/almayer/shipboard/brig/execution) "aVl" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -17748,9 +18097,12 @@ /turf/open/floor/almayer/sterile_green_side/southeast, /area/almayer/medical/containment) "aVm" = ( -/obj/structure/closet/firecloset/full, -/turf/open/floor/almayer/cargo, -/area/almayer/shipboard/brig/starboard_hallway) +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera"; + dir = 8 + }, +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig) "aVn" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F"; @@ -17781,6 +18133,10 @@ /obj/structure/machinery/portable_atmospherics/canister/empty, /turf/open/floor/engine, /area/almayer/engineering/airmix) +"aVp" = ( +/obj/structure/bed/chair/wood/normal, +/turf/open/floor/almayer/no_build, +/area/almayer/shipboard/brig/execution) "aVq" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -17836,6 +18192,15 @@ /obj/structure/surface/table/almayer, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/pb) +"aVv" = ( +/turf/open/floor/almayer/redcorner/north, +/area/almayer/shipboard/brig/execution) +"aVw" = ( +/obj/structure/window/reinforced/ultra{ + dir = 8 + }, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/shipboard/brig/execution) "aVx" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F" @@ -17849,6 +18214,9 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/engineer) +"aVy" = ( +/turf/open/floor/almayer/plating/northeast, +/area/almayer/shipboard/brig/execution) "aVz" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -17896,6 +18264,14 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/engineer) +"aVE" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/no_build, +/area/almayer/shipboard/brig/execution_storage) "aVF" = ( /obj/structure/machinery/light, /turf/open/floor/almayer/orange, @@ -17903,6 +18279,17 @@ "aVG" = ( /turf/open/floor/almayer/silver/southwest, /area/almayer/command/cichallway) +"aVH" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + layer = 2.5; + pixel_x = -1 + }, +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/turf/open/floor/almayer/no_build, +/area/almayer/shipboard/brig/execution_storage) "aVI" = ( /obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/no_build, @@ -18034,6 +18421,18 @@ /obj/item/tool/weldingtool/simple, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/medical) +"aVU" = ( +/obj/structure/machinery/vending/cigarette/koorlander{ + pixel_y = 16; + density = 0; + pixel_x = 2; + can_block_movement = 0 + }, +/obj/structure/sign/safety/refridgeration{ + pixel_x = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/execution_storage) "aVV" = ( /obj/structure/bed/chair/office/dark, /obj/effect/decal/cleanable/dirt, @@ -18059,6 +18458,9 @@ /obj/structure/ladder/multiz, /turf/open/floor/almayer/plating, /area/almayer/middeck/maintenance/pb) +"aVZ" = ( +/turf/closed/wall/almayer/reinforced/temphull, +/area/almayer/shipboard/brig/execution) "aWa" = ( /obj/structure/machinery/light/red{ dir = 4; @@ -18136,25 +18538,13 @@ /turf/open_space, /area/almayer/middeck/maintenance/sp) "aWg" = ( -/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" - }, -/obj/structure/sign/calendar/ua{ - pixel_y = 27; - pixel_x = 19; - layer = 2.9 +/obj/structure/bed/chair, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, -/turf/open/floor/almayer/red/north, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer/silver/north, +/area/almayer/shipboard/brig/visitation_waiting) "aWh" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/almayer/no_build/plating, @@ -18442,6 +18832,13 @@ }, /turf/open/floor/almayer/sterile_green_side/north, /area/almayer/medical/containment) +"aWS" = ( +/obj/structure/machinery/door/airlock/almayer/generic/glass{ + dir = 2; + name = "\improper Execution Observation" + }, +/turf/open/floor/almayer/no_build/test_floor4, +/area/almayer/shipboard/brig/execution) "aWT" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -20323,16 +20720,6 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/medical) -"bbi" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - dir = 1; - name = "\improper Brig" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/medical) "bbj" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -20397,6 +20784,13 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/briefing) +"bbo" = ( +/obj/structure/machinery/door/airlock/almayer/security/reinforced{ + dir = 2; + name = "\improper Execution Preparation" + }, +/turf/open/floor/almayer/no_build/test_floor4, +/area/almayer/shipboard/brig/execution_storage) "bbp" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -20854,6 +21248,9 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/medical) +"bcl" = ( +/turf/closed/wall/almayer/outer/internal, +/area/almayer/shipboard/brig/execution_storage) "bcm" = ( /turf/closed/wall/almayer, /area/almayer/hallways/hangar) @@ -20880,6 +21277,14 @@ /obj/structure/prop/almayer/hangar_stencil, /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) +"bcq" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/shipboard/brig/lower) +"bcr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/largecrate/supply, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/shipboard/brig/lower) "bcs" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/rack, @@ -21514,6 +21919,11 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/req) +"bdT" = ( +/obj/structure/largecrate/random/barrel/true_random, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/shipboard/brig/lower) "bdU" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -21777,6 +22187,11 @@ /obj/effect/decal/heavy_cable/cable_horizontal, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/medical) +"beC" = ( +/obj/structure/closet/firecloset, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/cargo/no_build, +/area/almayer/shipboard/brig/lower) "beD" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -21835,6 +22250,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/no_build/plate, /area/almayer/shipboard/navigation) +"beJ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/red/southwest, +/area/almayer/shipboard/brig/lower) "beK" = ( /obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ dir = 1 @@ -22251,6 +22670,9 @@ }, /turf/open/floor/almayer/no_build/test_floor4, /area/almayer/medical/containment) +"bfO" = ( +/turf/open/floor/almayer/no_build, +/area/almayer/shipboard/brig/lower) "bfP" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -22359,6 +22781,13 @@ }, /turf/open/floor/almayer/no_build/test_floor4, /area/almayer/medical/containment) +"bgb" = ( +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = -25 + }, +/turf/open/floor/almayer/red/south, +/area/almayer/shipboard/brig/lower) "bgc" = ( /obj/structure/pipes/vents/scrubber/no_boom{ welded = 1; @@ -22391,25 +22820,34 @@ /area/almayer/middeck/req) "bgh" = ( /obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1; - pixel_x = 1 + icon_state = "W"; + layer = 2.5; + pixel_x = -1 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/shipboard/navigation) +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = 16 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/execution_storage) "bgi" = ( /obj/structure/machinery/light/red{ dir = 4; light_color = "#BB3F3F" }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/shipboard/navigation) +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice8"; + pixel_x = 16; + pixel_y = 16 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = 16 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/execution_storage) "bgj" = ( /obj/structure/machinery/landinglight{ dir = 8 @@ -22434,16 +22872,12 @@ /area/almayer/middeck/maintenance/aft) "bgn" = ( /obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice12"; - pixel_y = 16 + icon_state = "W"; + layer = 2.5; + pixel_x = -1 }, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/shipboard/navigation) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/execution_storage) "bgo" = ( /obj/structure/platform/metal/almayer/east, /turf/open/floor/almayer/no_build, @@ -22462,13 +22896,21 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/engineer) "bgr" = ( -/obj/effect/decal/heavy_cable/cable_horizontal, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice12"; - pixel_y = 16 +/obj/structure/closet/secure_closet{ + name = "\improper Lethal Injection Locker" }, -/turf/open/floor/plating/plating_catwalk/no_build, -/area/almayer/shipboard/navigation) +/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, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/box/bodybags, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/execution_storage) "bgs" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -22541,6 +22983,17 @@ }, /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/containment) +"bgy" = ( +/obj/structure/sign/safety/restrictedarea{ + pixel_y = -8; + pixel_x = 32 + }, +/obj/structure/sign/safety/security{ + pixel_x = 32; + pixel_y = 7 + }, +/turf/open/floor/almayer/no_build, +/area/almayer/shipboard/brig/lower) "bgz" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -22632,14 +23085,6 @@ /obj/structure/surface/rack, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/aft) -"bgG" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/shipboard/navigation) "bgH" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -22696,6 +23141,9 @@ }, /turf/open/floor/almayer/orange/northeast, /area/almayer/hallways/upper/midship_hallway) +"bgN" = ( +/turf/closed/wall/almayer/outer/internal, +/area/almayer/shipboard/brig/lower) "bgO" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -22721,12 +23169,17 @@ /area/almayer/squads/req) "bgS" = ( /obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 + icon_state = "W"; + layer = 2.5; + pixel_x = -1 }, -/obj/structure/largecrate/random/barrel/true_random, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/shipboard/navigation) +/obj/structure/machinery/cm_vending/sorted/boozeomat{ + pixel_x = 11; + pixel_y = 17; + can_block_movement = 0 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/execution_storage) "bgT" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -22756,6 +23209,11 @@ }, /turf/open/floor/almayer/plate, /area/almayer/squads/charlie) +"bgX" = ( +/obj/structure/platform/metal/almayer_smooth/east, +/obj/structure/stairs, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/shipboard/brig/lower) "bgY" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -22782,24 +23240,6 @@ }, /turf/open/floor/almayer/flooredge/east, /area/almayer/medical/containment) -"bha" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/largecrate/random/barrel/true_random, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice12"; - pixel_y = 16 - }, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/shipboard/navigation) "bhb" = ( /turf/open/floor/almayer/sterile_green_side, /area/almayer/medical/containment) @@ -22811,6 +23251,14 @@ /obj/structure/platform/metal/almayer_smooth/north, /turf/open/floor/almayer, /area/almayer/medical/containment) +"bhd" = ( +/obj/effect/decal/heavy_cable/node_s_w_e, +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/maintenance/sb) "bhe" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F"; @@ -22859,22 +23307,6 @@ }, /turf/open/floor/almayer/plating_striped/south, /area/almayer/shipboard/port_point_defense) -"bhk" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice12"; - pixel_y = 16 - }, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/shipboard/navigation) "bhl" = ( /obj/structure/largecrate/random/barrel/true_random, /obj/effect/decal/heavy_cable/cable_vertical, @@ -22908,6 +23340,18 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/sb) +"bho" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/obj/structure/closet/secure_closet{ + name = "secure evidence locker"; + req_access_txt = "3" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/lower) "bhp" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -22979,15 +23423,16 @@ /obj/effect/spawner/random/tool, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_p) -"bhz" = ( -/obj/structure/largecrate/random/barrel/true_random, -/obj/effect/decal/heavy_cable/node_n_w, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk/no_build, -/area/almayer/middeck/maintenance/sb) "bhA" = ( /turf/open/floor/almayer/test_floor4, /area/almayer/medical/containment) +"bhB" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/lower) "bhC" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/barricade/handrail/no_vault{ @@ -23001,14 +23446,10 @@ /turf/open/floor/almayer/no_build/test_floor4, /area/almayer/middeck/medical) "bhE" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/largecrate/random/barrel/true_random, +/obj/structure/platform/metal/almayer_smooth/west, +/obj/structure/stairs, /turf/open/floor/almayer/no_build/plate, -/area/almayer/shipboard/navigation) +/area/almayer/shipboard/brig/lower) "bhF" = ( /turf/closed/wall/almayer/research/containment/wall/divide{ remote_id = "W_Containment_Cell_Umbilical_2" @@ -23084,6 +23525,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/no_build/plate, /area/almayer/shipboard/navigation) +"bhO" = ( +/obj/structure/closet/emcloset, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/cargo/no_build, +/area/almayer/shipboard/brig/lower) "bhP" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -23107,11 +23553,14 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/maintenance/sb) "bhR" = ( -/obj/structure/largecrate/random/barrel/true_random, -/obj/effect/decal/heavy_cable/cable_horizontal, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk/no_build, -/area/almayer/middeck/maintenance/sb) +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/obj/structure/machinery/power/apc/almayer/east, +/obj/structure/machinery/photocopier, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/lower) "bhS" = ( /obj/structure/platform/metal/almayer/east, /obj/structure/surface/table/almayer, @@ -23171,18 +23620,13 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/saft) +"bhZ" = ( +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/lower) "bia" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/maintenance/sb) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/lower) "bib" = ( /obj/structure/surface/table/almayer, /obj/item/storage/firstaid/regular{ @@ -23191,15 +23635,9 @@ /obj/item/storage/firstaid/regular/empty, /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/medical) -"bic" = ( -/obj/effect/decal/heavy_cable/cable_horizontal, -/obj/effect/decal/cleanable/dirt, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice12"; - pixel_y = 16 - }, -/turf/open/floor/plating/plating_catwalk/no_build, -/area/almayer/shipboard/navigation) +"bid" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/lower) "bie" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/iv_drip{ @@ -23252,6 +23690,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/medical) +"bij" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/computer/working_joe{ + dir = 8; + pixel_x = 17; + can_block_movement = 0 + }, +/turf/open/floor/almayer/no_build, +/area/almayer/shipboard/brig/lower) "bik" = ( /obj/structure/ladder/multiz, /obj/structure/sign/safety/ladder{ @@ -23307,25 +23754,12 @@ /turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/chemistry) "bir" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/shipboard/navigation) +/obj/structure/platform_decoration/metal/almayer_smooth/north, +/turf/open/floor/almayer/red/southwest, +/area/almayer/shipboard/brig/lower) "bis" = ( -/obj/structure/machinery/light/red{ - dir = 4; - light_color = "#BB3F3F" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/shipboard/navigation) +/turf/open/floor/almayer/red/southeast, +/area/almayer/shipboard/brig/lower) "bit" = ( /obj/structure/machinery/camera/autoname/almayer/containment, /obj/effect/decal/warning_stripes{ @@ -23440,6 +23874,11 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/saft) +"biE" = ( +/obj/structure/platform/metal/almayer_smooth/west, +/obj/structure/stairs/multiz/up, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/shipboard/brig/lower) "biF" = ( /obj/structure/machinery/door_control{ id = "or02"; @@ -23539,23 +23978,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/sb) -"biO" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 3.3 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/prop/invuln/lattice_prop{ - dir = 1; - icon_state = "lattice3"; - pixel_x = 16 - }, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/maintenance/sb) "biP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -23586,6 +24008,9 @@ pixel_x = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F" + }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/sb) "biT" = ( @@ -23792,25 +24217,11 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/sf) "bjk" = ( -/obj/structure/machinery/door_control{ - id = "perma_lockdown_2"; - name = "Maint Lockdown Shutters"; - pixel_y = -20; - req_one_access_txt = "24;31"; - pixel_x = 9 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/sign/safety/bulkhead_door{ - pixel_y = -39; - pixel_x = 2 - }, -/obj/structure/sign/safety/maint{ - pixel_y = -25; - pixel_x = 2 +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" }, -/turf/open/floor/almayer, +/turf/open/floor/almayer/red/south, /area/almayer/shipboard/brig/perma) "bjl" = ( /obj/effect/decal/cleanable/dirt, @@ -23842,7 +24253,6 @@ light_color = "#BB3F3F"; dir = 1 }, -/obj/structure/largecrate/random/barrel/true_random, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/sb) "bjo" = ( @@ -24037,20 +24447,6 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/sb) -"bjI" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/surface/rack, -/obj/structure/prop/invuln/lattice_prop{ - dir = 1; - icon_state = "lattice3"; - pixel_x = 16 - }, -/turf/open/floor/almayer/no_build/plate, -/area/almayer/middeck/maintenance/sb) "bjJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -24109,12 +24505,13 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/sb) "bjQ" = ( -/obj/structure/machinery/shower{ - dir = 8 +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal8"; + pixel_x = -2; + pixel_y = -4 }, -/obj/structure/window/reinforced, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/almayer/plating, +/area/almayer/shipboard/brig/yard) "bjR" = ( /obj/structure/cargo_container/armat/right, /turf/open/floor/almayer, @@ -24519,6 +24916,11 @@ }, /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/maintenance/sp) +"bkM" = ( +/obj/structure/platform/metal/almayer_smooth/east, +/obj/structure/stairs/multiz/up, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/shipboard/brig/lower) "bkN" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -24769,15 +25171,12 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/pb) "bli" = ( -/obj/structure/machinery/door/window/brigdoor/southright{ - id = "Cell 6"; - name = "Cell 6" - }, -/obj/structure/sign/safety/six{ - pixel_x = -17 +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 24 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/processing) "blj" = ( /obj/structure/surface/table/almayer, /obj/item/tool/hand_labeler, @@ -25291,6 +25690,15 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/engineer) +"bmn" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/obj/structure/largecrate/random/barrel/true_random, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/maintenance/sb) "bmo" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -25882,6 +26290,20 @@ }, /turf/open/floor/almayer/cargo_arrow/west, /area/almayer/squads/bravo) +"bnC" = ( +/obj/structure/prop/invuln/lattice_prop{ + dir = 1; + icon_state = "lattice3"; + pixel_x = 16 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/obj/structure/largecrate/random/barrel/true_random, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/maintenance/sb) "bnD" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/almayer, @@ -25893,6 +26315,11 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/medical) +"bnE" = ( +/obj/structure/largecrate/random/barrel/true_random, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/maintenance/sb) "bnF" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/filingcabinet{ @@ -26246,6 +26673,14 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/pilotbunks) +"bot" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/maintenance/sb) "bou" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/heavy_cable/cable_vertical, @@ -26314,6 +26749,14 @@ }, /turf/open/floor/almayer/mono, /area/almayer/squads/req) +"boC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet{ + name = "secure evidence locker"; + req_access_txt = "3" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/lower) "boD" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -26925,6 +27368,21 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/sp) +"bqa" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/surface/table/reinforced/prison, +/obj/item/paper_bin/uscm{ + pixel_y = 6; + pixel_x = 4 + }, +/obj/item/tool/pen{ + pixel_x = 3; + pixel_y = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/lower) "bqb" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -27437,15 +27895,15 @@ /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "bra" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/almayer/red, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/power/apc/almayer/south, +/turf/open/floor/almayer/silvercorner/south, +/area/almayer/shipboard/brig/visitation_waiting) "brb" = ( /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer, @@ -27511,6 +27969,23 @@ }, /turf/open/floor/almayer/test_floor5, /area/almayer/squads/req) +"brk" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_x = -30 + }, +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/lower) +"brl" = ( +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 32; + pixel_y = -8 + }, +/obj/structure/sign/safety/stairs{ + pixel_x = 32; + pixel_y = 7 + }, +/turf/open/floor/almayer/no_build, +/area/almayer/shipboard/brig/lower) "brm" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/photocopier{ @@ -27991,12 +28466,8 @@ /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/req) "bsp" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/almayer/red/south, +/area/almayer/shipboard/brig) "bsq" = ( /obj/structure/surface/table/almayer, /obj/effect/spawner/random/powercell, @@ -28160,12 +28631,13 @@ /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/req) "bsF" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 }, -/turf/open/floor/almayer/red, -/area/almayer/shipboard/brig/mp_bunks) +/obj/structure/platform/metal/almayer_smooth, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cryo) "bsG" = ( /obj/structure/machinery/disposal{ density = 0; @@ -28399,6 +28871,12 @@ /obj/structure/machinery/light, /turf/open/floor/almayer/silver/southwest, /area/almayer/command/computerlab) +"btj" = ( +/turf/closed/wall/almayer/outer/internal, +/area/almayer/shipboard/brig/armory) +"btk" = ( +/turf/closed/wall/almayer/reinforced/temphull, +/area/almayer/shipboard/brig/armory) "btl" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light/red{ @@ -28863,6 +29341,13 @@ /obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/sterile_green_side/north, /area/almayer/medical/operating_room_one) +"buk" = ( +/turf/closed/wall/almayer/reinforced/temphull, +/area/almayer/middeck/maintenance/sb) +"bul" = ( +/obj/structure/ladder/multiz, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/lower) "bum" = ( /obj/effect/decal/heavy_cable/cable_vertical, /obj/structure/prop/invuln/lattice_prop{ @@ -28877,6 +29362,11 @@ }, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/engineer) +"bun" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/lower) "buo" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -29357,6 +29847,10 @@ /obj/structure/largecrate/random/secure, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/maintenance/sp) +"bvk" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/shipboard/brig/lower) "bvl" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -29391,6 +29885,12 @@ }, /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/req) +"bvp" = ( +/obj/structure/machinery/door/airlock/almayer/security/reinforced{ + name = "\improper Evidence Storage" + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/shipboard/brig/lower) "bvq" = ( /obj/effect/decal/warning_stripes{ icon_state = "door_warning2"; @@ -29459,12 +29959,26 @@ }, /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/req) +"bvy" = ( +/obj/structure/platform_decoration/metal/almayer_smooth/east{ + pixel_y = 10; + layer = 3.01 + }, +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/lower) "bvz" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 }, /turf/open/floor/almayer/dark_sterile2, /area/almayer/medical/operating_room_one) +"bvA" = ( +/obj/structure/platform_decoration/metal/almayer_smooth{ + pixel_x = 4; + layer = 3.01 + }, +/turf/open/floor/almayer/no_build, +/area/almayer/shipboard/brig/lower) "bvB" = ( /obj/structure/machinery/shower{ dir = 8; @@ -29515,14 +30029,9 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/medical) "bvH" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/recharger, -/obj/item/tool/hand_labeler{ - pixel_x = -8; - pixel_y = 3 - }, -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/general_equipment) +/obj/structure/surface/rack, +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/processing) "bvI" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -29834,6 +30343,14 @@ }, /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/medical) +"bwy" = ( +/obj/structure/stairs{ + dir = 8; + icon_state = "ramptop" + }, +/obj/structure/platform/metal/almayer_smooth, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/shipboard/brig/lower) "bwz" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/prop/invuln/lifeboat_hatch_placeholder{ @@ -30265,13 +30782,19 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/paft) "bxE" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_y = -1; + pixel_x = -1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/obj/structure/machinery/light, -/turf/open/floor/almayer/red, -/area/almayer/shipboard/brig/starboard_hallway) +/turf/open/floor/almayer/redcorner/west, +/area/almayer/shipboard/brig/processing) "bxF" = ( /turf/open/floor/almayer/no_build/plate, /area/almayer/middeck/maintenance/aft) @@ -30600,10 +31123,28 @@ }, /turf/open/floor/almayer/sterile_green_side/southeast, /area/almayer/medical/containment) +"byq" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 2 + }, +/obj/structure/sign/safety/stairs{ + pixel_y = -25 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/armory) "byr" = ( /obj/structure/largecrate/random/barrel/green, /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) +"bys" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/turf/open/floor/almayer/red/south, +/area/almayer/shipboard/brig/armory) "byt" = ( /obj/structure/surface/rack, /obj/item/tool/crowbar, @@ -32119,12 +32660,6 @@ /obj/structure/largecrate/random/barrel/true_random, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/underdeck/hangar) -"bBU" = ( -/obj/structure/sign/safety/security{ - pixel_x = 32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/s_bow) "bBV" = ( /obj/effect/decal/heavy_cable/cable_horizontal, /obj/effect/decal/cleanable/dirt, @@ -33320,8 +33855,15 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/maintenance/paft) "bEv" = ( -/turf/open/floor/almayer/cargo_arrow/north, -/area/almayer/shipboard/brig/general_equipment) +/obj/structure/machinery/light{ + dir = 4; + invisibility = 101 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/processing) "bEw" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -33943,6 +34485,19 @@ /obj/structure/largecrate/random/barrel/true_random, /turf/open/floor/almayer/no_build/plating, /area/almayer/middeck/medical) +"bGk" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice1"; + pixel_x = 16; + pixel_y = -16 + }, +/obj/structure/prop/invuln/lattice_prop{ + dir = 1; + icon_state = "lattice3"; + pixel_x = 16 + }, +/turf/open/floor/almayer/red/south, +/area/almayer/shipboard/brig/armory) "bGl" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/largecrate/random/barrel/true_random, @@ -34014,6 +34569,22 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +"bGv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/transmitter{ + dir = 8; + pixel_x = 15; + pixel_y = -5; + phone_category = "MP Dept."; + phone_id = "Brig Armory"; + name = "Armory Telephone" + }, +/obj/structure/sign/safety/commline_connection{ + pixel_x = 14; + pixel_y = -26 + }, +/turf/open/floor/almayer/red/southeast, +/area/almayer/shipboard/brig/armory) "bGw" = ( /obj/structure/bed/chair{ dir = 4 @@ -34214,6 +34785,11 @@ }, /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/middeck/medical) +"bGW" = ( +/obj/structure/machinery/light/small, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_mk2_rifle, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/armory) "bGX" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -34374,12 +34950,14 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/port_point_defense) "bHu" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 +/obj/structure/surface/table/almayer, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_21"; + pixel_y = 11 }, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/warden_office) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/red/south, +/area/almayer/shipboard/brig/visitation) "bHv" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -35557,15 +36135,6 @@ /obj/effect/decal/heavy_cable/cable_horizontal, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/starboard_point_defense) -"bKI" = ( -/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/starboard_hallway) "bKJ" = ( /obj/effect/decal/heavy_cable/cable_vertical, /turf/open/floor/plating/plating_catwalk, @@ -35916,19 +36485,13 @@ }, /turf/open/floor/almayer/orange, /area/almayer/engineering/lower) -"bLF" = ( -/obj/structure/machinery/door/poddoor/almayer/open{ - dir = 4; - id = "Brig Lockdown Shutters"; - name = "\improper Brig Lockdown Shutter" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - closeOtherId = "brigmaint_n"; - name = "\improper Brig" - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/starboard_hallway) +"bLG" = ( +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun, +/obj/item/vehicle_clamp, +/obj/item/vehicle_clamp, +/obj/item/vehicle_clamp, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/armory) "bLH" = ( /turf/open/floor/almayer/red/west, /area/almayer/shipboard/weapon_room) @@ -35971,6 +36534,20 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"bLM" = ( +/obj/structure/prop/invuln/lattice_prop{ + dir = 1; + icon_state = "lattice3"; + pixel_x = 20 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice1"; + pixel_x = 20; + pixel_y = -16 + }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/armory) "bLN" = ( /obj/structure/machinery/cryopod{ pixel_y = 6 @@ -36351,12 +36928,6 @@ }, /turf/open/floor/almayer/green, /area/almayer/hallways/upper/fore_hallway) -"bMN" = ( -/obj/structure/machinery/camera/autoname/almayer/brig{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) "bMO" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/prop/almayer/CICmap, @@ -36368,6 +36939,14 @@ }, /turf/open/floor/almayer/no_build, /area/almayer/shipboard/navigation) +"bMQ" = ( +/obj/structure/closet/secure_closet/guncabinet/riot_control, +/obj/item/weapon/shield/riot, +/obj/item/weapon/shield/riot, +/obj/item/weapon/shield/riot, +/obj/item/weapon/shield/riot, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/armory) "bMR" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -36590,12 +37169,6 @@ }, /turf/open/floor/prison/kitchen, /area/almayer/living/grunt_rnr) -"bNx" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer/silver/north, -/area/almayer/shipboard/brig/cic_hallway) "bNy" = ( /obj/structure/sign/safety/life_support{ pixel_y = 25 @@ -37196,6 +37769,11 @@ /obj/structure/ob_ammo/ob_fuel, /turf/open/floor/almayer/red/north, /area/almayer/shipboard/weapon_room) +"bPi" = ( +/obj/structure/closet/bombclosetsecurity, +/obj/structure/machinery/light/small, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/armory) "bPj" = ( /obj/structure/sign/safety/conference_room{ pixel_x = 7; @@ -37380,15 +37958,12 @@ /turf/open/floor/almayer/plate, /area/almayer/shipboard/weapon_room) "bPH" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/floor/almayer/red/northeast, -/area/almayer/shipboard/brig/processing) +/obj/structure/machinery/iv_drip, +/turf/open/floor/almayer/sterile_green_corner/east, +/area/almayer/shipboard/brig/medical) "bPI" = ( /obj/structure/disposalpipe/down/almayer{ dir = 1; @@ -37544,22 +38119,15 @@ /turf/open/floor/almayer/silver/northwest/no_build, /area/almayer/medical/containment/cell/cl) "bQc" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1 - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "courtyard_cells"; - name = "\improper Courtyard Lockdown Shutter" - }, -/obj/structure/machinery/door/poddoor/almayer/locked{ - id = "Cell 6"; - name = "\improper Courtyard Divider" +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; + dir = 4 }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/structure/pipes/vents/scrubber{ + dir = 1 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/interrogation) "bQd" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/wy_intranet/liaison{ @@ -38455,6 +39023,19 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) +"bRZ" = ( +/obj/effect/decal/heavy_cable/cable_horizontal, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/maintenance/sb) "bSa" = ( /obj/structure/target, /turf/open/floor/almayer/plating_striped/east, @@ -38824,6 +39405,19 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_m_p) +"bST" = ( +/obj/structure/platform/metal/almayer_smooth/north, +/obj/effect/decal/cleanable/dirt, +/obj/structure/platform/metal/almayer_smooth/west, +/obj/structure/flora/pottedplant, +/obj/structure/platform_decoration/metal/almayer_smooth/northwest{ + layer = 3.1 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer/red/northwest, +/area/almayer/shipboard/brig/lower) "bSU" = ( /obj/structure/machinery/computer/cameras/wooden_tv/broadcast{ dir = 4; @@ -39427,6 +40021,14 @@ }, /turf/open/floor/almayer/plate, /area/almayer/command/corporateliaison) +"bUm" = ( +/obj/structure/platform/metal/almayer_smooth/north, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig/lower) "bUn" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -39549,6 +40151,10 @@ }, /turf/open/floor/almayer/blue, /area/almayer/hallways/upper/midship_hallway) +"bUB" = ( +/obj/structure/platform/metal/almayer_smooth/north, +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig/lower) "bUC" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -39566,6 +40172,14 @@ /obj/structure/closet/firecloset, /turf/open/floor/almayer/cargo, /area/almayer/hallways/upper/midship_hallway) +"bUF" = ( +/obj/structure/stairs{ + dir = 8; + icon_state = "ramptop" + }, +/obj/structure/platform/metal/almayer_smooth/north, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/shipboard/brig/lower) "bUG" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -39701,6 +40315,14 @@ "bVd" = ( /turf/open/floor/almayer/plate, /area/almayer/shipboard/port_point_defense) +"bVe" = ( +/obj/structure/stairs{ + dir = 8; + icon_state = "ramptop" + }, +/obj/structure/platform/metal/stair_cut/almayer_smooth_right, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/shipboard/brig/lower) "bVf" = ( /obj/structure/machinery/landinglight/delaythree{ dir = 4 @@ -39839,6 +40461,13 @@ }, /turf/open/floor/almayer/plating/northeast, /area/almayer/shipboard/starboard_point_defense) +"bVE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer/red/northwest, +/area/almayer/shipboard/brig/lower) "bVF" = ( /obj/structure/machinery/landinglight/delaytwo{ dir = 1 @@ -40343,9 +40972,12 @@ /turf/open/floor/almayer/research/containment/floor2/west, /area/almayer/medical/containment/cell) "bWQ" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/warden_office) +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/visitation) "bWR" = ( /obj/structure/pipes/vents/pump/no_boom{ name = "Secure Reinforced Air Vent"; @@ -42254,9 +42886,14 @@ /obj/structure/filingcabinet, /turf/open/floor/almayer/cargo, /area/almayer/squads/req) +"caj" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/red/northeast, +/area/almayer/shipboard/brig/lower) "cak" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/evidence_storage) +/obj/structure/machinery/brig_cell/cell_4, +/turf/closed/wall/almayer/reinforced, +/area/almayer/shipboard/brig/cells) "cal" = ( /turf/open/floor/almayer/green/southeast, /area/almayer/squads/req) @@ -45473,6 +46110,24 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/upper/starboard) +"chc" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 2 + }, +/obj/structure/machinery/door_control{ + pixel_x = -7; + pixel_y = 26; + name = "Maintenance Shutters"; + id = "brigstairs"; + req_access = list(3) + }, +/obj/structure/sign/safety/airlock{ + pixel_y = 36 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/armory) "chd" = ( /obj/structure/machinery/vending/cigarette/koorlander{ pixel_x = 1 @@ -46249,6 +46904,75 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/powered) +"ciU" = ( +/turf/open/floor/almayer/no_build, +/area/almayer/shipboard/brig/armory) +"ciV" = ( +/obj/structure/prop/invuln/lattice_prop{ + dir = 1; + icon_state = "lattice3"; + pixel_x = 16 + }, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/shipboard/brig/armory) +"ciW" = ( +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/armory) +"ciX" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + name = "\improper Armory" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "bot_armory"; + name = "\improper Armory Shutters" + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/armory) +"ciY" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/armory) +"ciZ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/prop/invuln/lattice_prop{ + dir = 1; + icon_state = "lattice3"; + pixel_x = 20 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/armory) +"cja" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/armory) +"cjb" = ( +/obj/effect/decal/heavy_cable/node_s_e, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/maintenance/sb) "cjc" = ( /obj/effect/landmark/start/marine/alpha, /obj/effect/landmark/late_join/alpha, @@ -46258,6 +46982,16 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer/emerald, /area/almayer/squads/charlie) +"cje" = ( +/obj/effect/decal/heavy_cable/cable_vertical, +/obj/structure/prop/invuln/lattice_prop{ + dir = 1; + icon_state = "lattice3"; + pixel_x = 16 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/maintenance/sb) "cjf" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -46277,23 +47011,229 @@ }, /turf/open/floor/almayer/emerald, /area/almayer/squads/charlie) +"cjh" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/turf/closed/wall/almayer/reinforced, +/area/almayer/shipboard/brig/lower) +"cji" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/device/motion_sensor/mp{ + alert_message = "ALERT: Unauthorized movement detected in Middeck Security Stairwell Entrance!"; + pixel_x = 8; + anchored = 1; + pixel_y = 8; + area_based = 0 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" + }, +/obj/structure/machinery/door/airlock/almayer/security/reinforced{ + dir = 2; + name = "\improper Brig Maintenance" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + name = "\improper Brig Stairwell Shutters"; + id = "brigstairs" + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/shipboard/brig/lower) +"cjj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light/small{ + dir = 8; + pixel_y = 12 + }, +/obj/structure/reagent_dispensers/water_cooler/stacks{ + density = 0; + pixel_x = -11; + pixel_y = -1 + }, +/turf/open/floor/almayer/no_build, +/area/almayer/shipboard/brig/armory) "cjk" = ( -/obj/structure/bed, -/obj/structure/machinery/flasher{ - id = "Cell 6"; - pixel_x = -24 +/obj/structure/filingcabinet{ + density = 0; + pixel_x = -8; + pixel_y = 18 }, -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/cells) +/obj/structure/filingcabinet{ + density = 0; + pixel_x = 8; + pixel_y = 18 + }, +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig/interrogation) +"cjl" = ( +/obj/structure/sign/safety/restrictedarea{ + pixel_y = -8; + pixel_x = 32 + }, +/obj/structure/sign/safety/ammunition{ + pixel_y = -8; + pixel_x = 47 + }, +/obj/structure/machinery/door_control{ + id = "firearm_storage_armory"; + name = "Armory Lockdown"; + pixel_y = 8; + req_access_txt = "4"; + pixel_x = 23 + }, +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/armory) "cjm" = ( /obj/structure/surface/rack, /obj/item/tool/wet_sign, /obj/item/tool/wet_sign, /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_a_p) +"cjn" = ( +/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/structure/prop/invuln/lattice_prop{ + dir = 1; + icon_state = "lattice3"; + pixel_x = 20 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/armory) +"cjo" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/motiondetector, +/obj/item/device/motiondetector, +/obj/item/device/motiondetector, +/obj/item/device/motiondetector, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/armory) +"cjp" = ( +/obj/structure/machinery/vending/security/riot, +/obj/structure/sign/safety/hazard{ + pixel_y = 6; + pixel_x = 32 + }, +/obj/structure/sign/safety/ammunition{ + pixel_x = 32; + pixel_y = -8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/armory) +"cjq" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/prop/invuln/lattice_prop{ + dir = 1; + icon_state = "lattice3"; + pixel_x = 16 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/maintenance/sb) +"cjr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/maintenance/sb) +"cjs" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/maintenance/sb) "cjt" = ( /turf/open/floor/almayer/orange, /area/almayer/engineering/lower) +"cju" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/prop/invuln/lattice_prop{ + dir = 1; + icon_state = "lattice3"; + pixel_x = 16 + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/maintenance/sb) +"cjv" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F" + }, +/turf/open/floor/almayer/no_build/plate, +/area/almayer/middeck/maintenance/sb) +"cjw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/rack, +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig/armory) +"cjx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25; + pixel_x = -5 + }, +/obj/structure/prop/invuln/lattice_prop{ + dir = 1; + icon_state = "lattice3"; + pixel_x = 16 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice2"; + pixel_x = 16; + pixel_y = 16 + }, +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig/armory) +"cjy" = ( +/turf/open/floor/almayer/red/northeast, +/area/almayer/shipboard/brig/armory) +"cjz" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + name = "\improper Armory" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "firearm_storage_armory"; + name = "\improper Armory Shutters" + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/armory) "cjA" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -46301,6 +47241,18 @@ }, /turf/open/floor/almayer/plate, /area/almayer/squads/charlie) +"cjB" = ( +/obj/structure/machinery/power/apc/almayer/east, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/armory) "cjC" = ( /obj/structure/machinery/vending/cola{ density = 0; @@ -46309,6 +47261,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, /area/almayer/squads/charlie) +"cjD" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_mk2_rifle, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/armory) "cjE" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -46327,11 +47286,224 @@ }, /turf/open/floor/almayer/emerald/east, /area/almayer/squads/charlie) +"cjF" = ( +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/obj/structure/prop/invuln/lattice_prop{ + dir = 1; + icon_state = "lattice3"; + pixel_x = 20 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice2"; + pixel_x = 20; + pixel_y = 16 + }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/armory) +"cjG" = ( +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, +/obj/structure/sign/safety/rewire{ + pixel_x = 32; + pixel_y = -8 + }, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/item/vehicle_clamp, +/obj/item/vehicle_clamp, +/obj/item/vehicle_clamp, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/armory) +"cjH" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/closed/wall/almayer/reinforced/temphull, +/area/almayer/shipboard/brig/armory) +"cjI" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/closed/wall/almayer/reinforced/temphull, +/area/almayer/shipboard/brig/armory) +"cjJ" = ( +/obj/effect/decal/heavy_cable/cable_vertical, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk/no_build, +/area/almayer/middeck/maintenance/sb) +"cjK" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/shipboard/brig/visitation) +"cjL" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/shipboard/brig/yard) +"cjM" = ( +/obj/structure/window/framed/almayer/hull, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "brigyardprivacy"; + name = "\improper Privacy Shutters"; + dir = 2 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter" + }, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/yard) +"cjN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/window/reinforced/tinted{ + dir = 4 + }, +/obj/structure/toilet{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/yard) +"cjO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/window/reinforced/tinted{ + dir = 4 + }, +/obj/structure/machinery/shower{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/yard) +"cjP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/shower{ + dir = 1 + }, +/obj/item/toy/inflatable_duck, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/yard) +"cjQ" = ( +/obj/structure/machinery/vending/coffee{ + pixel_x = 3; + wires = 13 + }, +/obj/structure/machinery/vending/snack{ + pixel_x = -18; + pixel_y = 1; + wires = 13 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/yard) +"cjR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/reagent_dispensers/tank/water, +/obj/structure/sign/safety/water{ + pixel_x = -17; + pixel_y = 7 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/yard) +"cjS" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/yard) +"cjT" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + id = "Delta_1"; + name = "\improper Bathroom" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/yard) +"cjU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer/dark_sterile, +/area/almayer/shipboard/brig/yard) +"cjV" = ( +/obj/structure/window/reinforced/toughened{ + dir = 8 + }, +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "visitationshutter"; + name = "\improper Visitation Shutters"; + closed_layer = 3.4; + layer = 3.4 + }, +/turf/open/floor/almayer/red/south, +/area/almayer/shipboard/brig/visitation) "cjW" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/sterile_green_side/northwest, /area/almayer/medical/lower_medical_medbay) +"cjX" = ( +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/yard) +"cjY" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/kitchen/utensil/fork/plastic, +/obj/item/tool/kitchen/utensil/fork/plastic, +/obj/item/tool/kitchen/utensil/knife/plastic{ + pixel_x = 7 + }, +/obj/item/tool/kitchen/utensil/knife/plastic{ + pixel_x = 7 + }, +/obj/item/tool/kitchen/utensil/spoon/plastic{ + pixel_x = -8 + }, +/obj/item/tool/kitchen/utensil/spoon/plastic{ + pixel_x = -8 + }, +/turf/open/floor/prison/kitchen, +/area/almayer/shipboard/brig/yard) +"cjZ" = ( +/obj/structure/pipes/vents/scrubber, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/yard) +"cka" = ( +/obj/structure/sign/safety/bathunisex{ + pixel_x = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/yard) +"ckb" = ( +/obj/structure/window/reinforced/toughened{ + dir = 8 + }, +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "visitationshutter"; + name = "\improper Visitation Shutters"; + closed_layer = 3.4; + layer = 3.4 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/visitation) +"ckc" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/visitation) "ckd" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -46347,6 +47519,17 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_a_p) +"ckf" = ( +/obj/structure/machinery/light{ + dir = 4; + invisibility = 101 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/visitation) +"ckg" = ( +/turf/closed/wall/almayer, +/area/almayer/shipboard/brig/visitation_waiting) "ckh" = ( /obj/structure/disposalpipe/junction{ dir = 4 @@ -46356,6 +47539,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/starboard_fore_hallway) +"cki" = ( +/obj/structure/desertdam/decals/road_edge{ + pixel_x = 2 + }, +/obj/structure/desertdam/decals/road_edge{ + pixel_x = 2; + pixel_y = 6 + }, +/turf/open/floor/almayer/plating, +/area/almayer/shipboard/brig/yard) "ckj" = ( /obj/structure/surface/table/almayer, /obj/item/stack/nanopaste{ @@ -46364,13 +47557,284 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/p_stern) +"ckk" = ( +/turf/open/floor/almayer/plating, +/area/almayer/shipboard/brig/yard) +"ckl" = ( +/obj/structure/surface/table/almayer, +/obj/item/trash/raisins{ + pixel_x = 7 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/door_control{ + id = "brigyardprivacy"; + name = "Privacy Shutters"; + pixel_x = -4; + pixel_y = 8 + }, +/turf/open/floor/prison/kitchen, +/area/almayer/shipboard/brig/yard) +"ckm" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/reagentgrinder{ + pixel_y = 8; + pixel_x = -7 + }, +/obj/item/reagent_container/spray/cleaner{ + pixel_x = -8; + pixel_y = 18 + }, +/turf/open/floor/prison/kitchen, +/area/almayer/shipboard/brig/yard) +"ckn" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/yard) +"cko" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 2; + pixel_x = 2 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/yard) +"ckp" = ( +/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/shipboard/brig/yard) +"ckq" = ( +/obj/structure/machinery/vending/cola, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/silver/south, +/area/almayer/shipboard/brig/visitation_waiting) "ckr" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk, /turf/open/floor/almayer/plate, /area/almayer/squads/delta) +"cks" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/redcorner, +/area/almayer/shipboard/brig/yard) +"ckt" = ( +/turf/open/floor/almayer/red/southeast, +/area/almayer/shipboard/brig/yard) +"cku" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/yard) +"ckv" = ( +/obj/structure/sign/calendar{ + pixel_y = 30 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/yard) +"ckw" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 2 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/yard) +"ckx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/yard) +"cky" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/cryopod{ + layer = 3.1; + pixel_y = 13; + dir = 1 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/shipboard/brig/yard) +"ckz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/disposal, +/obj/structure/machinery/door_control{ + pixel_x = 25; + pixel_y = -8; + name = "Visitation Access"; + id = "visitationaccess"; + req_access = list(3) + }, +/obj/structure/disposalpipe/trunk, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/yard) +"ckA" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/visitation) +"ckB" = ( +/obj/structure/machinery/status_display{ + pixel_y = -30 + }, +/obj/structure/machinery/light, +/turf/open/floor/almayer/silver/south, +/area/almayer/shipboard/brig/visitation_waiting) +"ckC" = ( +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 8 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" + }, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/visitation_waiting) +"ckD" = ( +/obj/structure/desertdam/decals/road_edge{ + pixel_x = -12 + }, +/obj/structure/machinery/light{ + dir = 8; + pixel_y = -16 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plating, +/area/almayer/shipboard/brig/yard) +"ckE" = ( +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/yard) +"ckF" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/yard) +"ckG" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/yard) +"ckH" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/yard) +"ckI" = ( +/obj/structure/transmitter/no_dnd{ + pixel_x = -5; + pixel_y = 28; + phone_category = "MP Dept."; + phone_id = "Brig Yard"; + name = "Brig Yard Telephone" + }, +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/sign/safety/commline_connection{ + pixel_x = 16; + pixel_y = 28 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/yard) +"ckJ" = ( +/obj/structure/machinery/door/airlock/almayer/security/reinforced{ + dir = 2; + name = "\improper Interrogation"; + closeOtherId = "briginterrogation" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter" + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/interrogation) +"ckK" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + name = "\improper Visitation Observation"; + dir = 2; + closeOtherId = "visitation" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/visitation) +"ckL" = ( +/obj/structure/window/framed/almayer, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/visitation) +"ckM" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/door/window/brigdoor/southright, +/obj/structure/machinery/door_control{ + id = "Brig Lockdown Shutters"; + name = "Brig Lockdown Shutters"; + pixel_x = 4; + pixel_y = 9; + req_access_txt = "3" + }, +/obj/structure/machinery/door_control{ + id = "visitationdoor"; + name = "Visitation Door Control"; + pixel_x = -6; + pixel_y = 9; + req_access_txt = "3"; + normaldoorcontrol = 1 + }, +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/visitation) +"ckN" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/visitation_waiting) +"ckO" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/visitation_waiting) "ckP" = ( /obj/structure/surface/table/almayer, +/obj/structure/machinery/light{ + dir = 4 + }, /turf/open/floor/almayer/silver/east, /area/almayer/shipboard/brig/cic_hallway) "ckQ" = ( @@ -46384,6 +47848,28 @@ }, /turf/open/floor/almayer/plate, /area/almayer/squads/delta) +"ckS" = ( +/obj/structure/bookcase{ + opacity = 0 + }, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/marine_law, +/obj/item/book/manual/rank, +/obj/item/book/manual/engineering_hacking, +/obj/structure/machinery/vending/cigarette/koorlander, +/turf/open/floor/almayer/silver/east, +/area/almayer/shipboard/brig/visitation_waiting) +"ckT" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/yard) +"ckU" = ( +/turf/open/floor/almayer/redcorner/east, +/area/almayer/shipboard/brig/yard) +"ckV" = ( +/obj/structure/machinery/camera/autoname/almayer/brig, +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig/yard) "ckW" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, @@ -46391,6 +47877,10 @@ "ckX" = ( /turf/open/floor/almayer/blue/north, /area/almayer/squads/delta) +"ckY" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/red/southwest, +/area/almayer/shipboard/brig/interrogation) "ckZ" = ( /obj/structure/machinery/light{ dir = 8 @@ -46401,9 +47891,57 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/engineering/lower/engine_core) +"cla" = ( +/obj/structure/surface/table/almayer, +/obj/item/clipboard{ + pixel_x = 7 + }, +/obj/item/tool/pen{ + pixel_x = 7 + }, +/obj/item/device/taperecorder{ + pixel_x = -6 + }, +/obj/item/device/taperecorder{ + pixel_x = -6 + }, +/turf/open/floor/almayer/red/south, +/area/almayer/shipboard/brig/interrogation) +"clb" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/yard) +"clc" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/yard) +"cld" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + name = "\improper Yard Observation Bubble"; + dir = 2; + closeOtherId = "brigobservation" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/cells) "cle" = ( /turf/open/floor/almayer/sterile_green_side/east, /area/almayer/medical/lower_medical_lobby) +"clf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/almayer/red/southwest, +/area/almayer/shipboard/brig/interrogation) "clg" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/delta) @@ -46492,6 +48030,12 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/squads/delta) +"clq" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/almayer/redcorner/west, +/area/almayer/shipboard/brig/interrogation) "clr" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -46505,9 +48049,112 @@ "cls" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/port_point_defense) +"clt" = ( +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "interrogationshutters"; + name = "\improper Interrogation Shutters"; + dir = 4 + }, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/interrogation) +"clu" = ( +/obj/structure/bed/chair/bolted{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/interrogation) +"clv" = ( +/obj/structure/machinery/door/airlock/almayer/security/reinforced{ + name = "\improper Interrogation Observation"; + closeOtherId = "interrogationobservation" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + layer = 1.9 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/interrogation) "clw" = ( /turf/open/floor/almayer/aicore/glowing/no_build/ai_floor3, /area/almayer/command/airoom) +"clx" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/almayer/red/northwest, +/area/almayer/shipboard/brig/visitation) +"cly" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/filingcabinet{ + density = 0; + pixel_x = -8; + pixel_y = 18 + }, +/obj/structure/filingcabinet{ + density = 0; + pixel_x = 8; + pixel_y = 18 + }, +/obj/item/folder, +/obj/item/folder, +/obj/item/clipboard, +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig/visitation) +"clz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk, +/obj/structure/machinery/camera/autoname/almayer, +/turf/open/floor/almayer/red/northeast, +/area/almayer/shipboard/brig/visitation) +"clA" = ( +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" + }, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/visitation_waiting) +"clB" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Brig Visitation Waiting" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/visitation_waiting) +"clC" = ( +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/visitation_waiting) +"clD" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + dir = 1; + name = "\improper Brig Maintenance"; + closeOtherId = "permaport" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/maint/hull/upper/p_bow) "clE" = ( /obj/structure/machinery/door/airlock/almayer/marine/delta/medic, /turf/open/floor/almayer/test_floor4, @@ -46547,6 +48194,34 @@ /obj/structure/machinery/cm_vending/clothing/leader/delta, /turf/open/floor/almayer/plate, /area/almayer/squads/delta) +"clO" = ( +/obj/structure/window/framed/almayer/hull, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "observationshutters"; + name = "\improper Observation Shutters"; + dir = 2 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter" + }, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/cells) +"clP" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/interrogation) +"clQ" = ( +/obj/structure/bed/chair/bolted{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/interrogation) +"clR" = ( +/obj/structure/machinery/power/apc/almayer/east, +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/interrogation) "clS" = ( /obj/structure/machinery/cm_vending/gear/spec, /obj/structure/sign/safety/hazard{ @@ -46562,6 +48237,11 @@ /obj/structure/machinery/cm_vending/gear/leader, /turf/open/floor/almayer/plate, /area/almayer/squads/delta) +"clU" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cic_hallway) "clV" = ( /obj/structure/machinery/computer/arcade, /turf/open/floor/almayer/green/northwest, @@ -46589,6 +48269,101 @@ /obj/structure/machinery/cm_vending/gear/engi, /turf/open/floor/almayer/plate, /area/almayer/squads/delta) +"cma" = ( +/obj/structure/window/framed/almayer/hull, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "observationshutters"; + name = "\improper Observation Shutters"; + dir = 4 + }, +/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/cells) +"cmb" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/door_control{ + id = "Cell Privacy Shutters"; + name = "Cell Privacy Shutters"; + pixel_x = 6; + pixel_y = 12; + req_access = list(3) + }, +/obj/structure/machinery/door_control{ + id = "observationshutters"; + name = "Yard Observation Shutters"; + pixel_x = -6; + pixel_y = 12; + req_access = list(3) + }, +/obj/structure/machinery/door_control{ + id = "Brig Lockdown Shutters"; + name = "Brig Lockdown Shutters"; + pixel_x = 6; + pixel_y = 5; + req_access_txt = "3" + }, +/obj/structure/machinery/door_control{ + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutters"; + pixel_x = -6; + req_access_txt = "3"; + pixel_y = 5 + }, +/obj/structure/transmitter/rotary{ + name = "Brig Wardens's Office Telephone"; + phone_category = "MP Dept."; + phone_id = "Brig Warden's Office"; + pixel_x = 6; + pixel_y = -3 + }, +/obj/structure/sign/safety/commline_connection{ + pixel_x = 13; + pixel_y = -26 + }, +/obj/item/trash/hotdog{ + pixel_x = -13; + pixel_y = -2 + }, +/turf/open/floor/almayer/red/southwest, +/area/almayer/shipboard/brig/cells) +"cmc" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_10"; + pixel_y = 3; + pixel_x = -2 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/redcorner/west, +/area/almayer/shipboard/brig/cells) +"cmd" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/device/taperecorder{ + pixel_x = 7; + pixel_y = 7 + }, +/obj/item/paper_bin/uscm{ + pixel_x = -7; + pixel_y = 6 + }, +/obj/item/tool/pen{ + pixel_x = -9; + pixel_y = 3 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/door_control{ + pixel_x = 7; + pixel_y = -5; + name = "Interrogation Shutters"; + id = "interrogationshutters"; + req_access = list(3) + }, +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/interrogation) "cme" = ( /obj/structure/largecrate/random/barrel/red, /obj/structure/prop/invuln/overhead_pipe{ @@ -46633,9 +48408,98 @@ }, /turf/open/floor/almayer/no_build, /area/almayer/underdeck/vehicle) +"cmg" = ( +/obj/structure/bed/chair/bolted{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/interrogation) +"cmh" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cic_hallway) +"cmi" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal5"; + pixel_x = -16; + pixel_y = 16 + }, +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal6"; + pixel_x = 16; + pixel_y = 16 + }, +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal7"; + pixel_x = 16; + pixel_y = -16 + }, +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal8"; + pixel_x = -16; + pixel_y = -16 + }, +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal3"; + pixel_x = 9 + }, +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal3"; + pixel_x = -6 + }, +/turf/open/floor/almayer/plating, +/area/almayer/shipboard/brig/yard) +"cmj" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/computer/secure_data{ + dir = 4; + pixel_y = 10 + }, +/obj/structure/machinery/computer/cameras/almayer_brig{ + desc = "Used to access the various cameras in the security brig."; + dir = 4; + name = "brig cameras console"; + pixel_y = -11 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cells) +"cmk" = ( +/obj/structure/bed/chair/comfy/orange{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/cells) "cml" = ( /turf/open/floor/almayer/plating_striped/north, /area/almayer/shipboard/port_point_defense) +"cmm" = ( +/obj/structure/machinery/light{ + dir = 4; + invisibility = 101 + }, +/obj/structure/machinery/status_display{ + pixel_x = 32 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) +"cmn" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig/interrogation) "cmo" = ( /obj/structure/surface/table/almayer, /obj/effect/spawner/random/powercell, @@ -46643,19 +48507,105 @@ /obj/item/packageWrap, /turf/open/floor/almayer/green/west, /area/almayer/squads/req) +"cmp" = ( +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/turf/open/floor/almayer/red/northeast, +/area/almayer/shipboard/brig/interrogation) +"cmq" = ( +/obj/structure/machinery/optable, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer/sterile_green_side/west, +/area/almayer/shipboard/brig/medical) "cmr" = ( /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_s) +"cms" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 + }, +/obj/structure/machinery/body_scanconsole{ + dir = 8 + }, +/turf/open/floor/almayer/sterile_green_side/east, +/area/almayer/shipboard/brig/medical) +"cmt" = ( +/obj/structure/noticeboard{ + pixel_y = 32 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/perma) +"cmu" = ( +/obj/structure/desertdam/decals/road_edge{ + pixel_x = 2; + pixel_y = -6 + }, +/obj/structure/desertdam/decals/road_edge{ + pixel_x = 2; + pixel_y = 23 + }, +/turf/open/floor/almayer/plating, +/area/almayer/shipboard/brig/yard) "cmv" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_x = -30 +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/yard) +"cmw" = ( +/obj/structure/desertdam/decals/road_edge{ + pixel_x = 16 }, -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plating, +/area/almayer/shipboard/brig/yard) +"cmx" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/computer/working_joe{ + pixel_y = 16 + }, +/obj/structure/machinery/recharger, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cells) +"cmy" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/cells) +"cmz" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera"; + dir = 8 + }, +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/cells) +"cmA" = ( +/obj/structure/machinery/door/airlock/almayer/security/reinforced{ + dir = 2; + name = "\improper Interrogation"; + closeOtherId = "briginterrogation"; + id = "briginterrogation" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 }, -/turf/open/floor/almayer/redcorner/north, -/area/almayer/shipboard/brig/processing) +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/interrogation) +"cmB" = ( +/obj/structure/machinery/door/airlock/almayer/security/reinforced{ + dir = 2; + name = "\improper Visitation Observation"; + closeOtherId = "interrogationobservation" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/interrogation) "cmC" = ( /obj/structure/machinery/door/airlock/almayer/secure/pod/reinforced{ name = "\improper Evacuation Airlock SL-1"; @@ -46663,6 +48613,111 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/powered) +"cmD" = ( +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "brigmedprivacyshutters"; + name = "\improper Privacy Shutters"; + dir = 4 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" + }, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/medical) +"cmE" = ( +/obj/structure/machinery/door/airlock/almayer/security/reinforced{ + dir = 2; + name = "\improper Brig Storage" + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/perma) +"cmF" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal3"; + pixel_y = 16 + }, +/obj/structure/desertdam/decals/road_edge{ + pixel_x = -12 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/trash/uscm_mre, +/turf/open/floor/almayer/plating, +/area/almayer/shipboard/brig/yard) +"cmG" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal3"; + pixel_y = 16 + }, +/obj/structure/desertdam/decals/road_edge{ + pixel_x = 2 + }, +/turf/open/floor/almayer/plating, +/area/almayer/shipboard/brig/yard) +"cmH" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal3"; + pixel_y = 16 + }, +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal6"; + pixel_x = 16; + pixel_y = 16 + }, +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal5"; + pixel_x = -16; + pixel_y = 16 + }, +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal8"; + pixel_x = -16; + pixel_y = -16 + }, +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal7"; + pixel_x = 16; + pixel_y = -16 + }, +/obj/structure/holohoop{ + density = 0; + pixel_y = 24; + layer = 4.4; + id = "prisonbball"; + side = "left"; + enable_shimmy = 0 + }, +/turf/open/floor/almayer/plating, +/area/almayer/shipboard/brig/yard) +"cmI" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal3"; + pixel_y = 16 + }, +/obj/structure/desertdam/decals/road_edge{ + pixel_x = 2 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plating, +/area/almayer/shipboard/brig/yard) +"cmJ" = ( +/obj/structure/surface/rack, +/obj/item/storage/toolbox/mechanical/green, +/obj/item/stack/sheet/glass/reinforced{ + amount = 50 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/power/apc/almayer/north, +/obj/structure/sign/safety/rewire{ + pixel_x = -18; + pixel_y = 6 + }, +/obj/item/device/multitool, +/turf/open/floor/almayer/red/northwest, +/area/almayer/shipboard/brig/cells) "cmK" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -46679,12 +48734,48 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/starboard_midship_hallway) "cmM" = ( -/turf/closed/wall/almayer, -/area/almayer/shipboard/brig/medical) +/turf/open/floor/almayer/redcorner/east, +/area/almayer/shipboard/brig) "cmN" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_a_p) +"cmO" = ( +/obj/structure/closet/secure_closet/cmdcabinet/comms_mp{ + pixel_y = 24 + }, +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig/cells) +"cmP" = ( +/obj/structure/machinery/door/airlock/almayer/security/reinforced{ + name = "\improper Brig Observation"; + closeOtherId = "brigobservation" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + layer = 1.9 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/cells) +"cmQ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/sign/safety/security{ + pixel_x = 15; + pixel_y = -25 + }, +/turf/open/floor/almayer/red/southwest, +/area/almayer/shipboard/brig/processing) +"cmR" = ( +/obj/structure/machinery/light, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/almayer/red/south, +/area/almayer/shipboard/brig/processing) "cmS" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -46694,10 +48785,67 @@ }, /turf/open/floor/almayer/silver/west, /area/almayer/hallways/upper/fore_hallway) +"cmT" = ( +/obj/structure/sign/safety/security{ + pixel_x = 15; + pixel_y = -25 + }, +/turf/open/floor/almayer/red/south, +/area/almayer/shipboard/brig/processing) +"cmU" = ( +/obj/structure/medical_supply_link, +/obj/structure/machinery/cm_vending/sorted/medical/blood, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" + }, +/turf/open/floor/almayer/sterile_green_side/west, +/area/almayer/shipboard/brig/medical) "cmV" = ( /obj/effect/landmark/yautja_teleport, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_a_p) +"cmW" = ( +/obj/structure/bed/roller/hospital_empty/bigrollerempty3, +/turf/open/floor/almayer/sterile_green_side/east, +/area/almayer/shipboard/brig/medical) +"cmX" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/yard) +"cmY" = ( +/obj/structure/machinery/light/small, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) +"cmZ" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/processing) +"cna" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/processing) +"cnb" = ( +/obj/structure/sign/safety/medical{ + pixel_x = 32; + pixel_y = -8 + }, +/turf/open/floor/almayer/redcorner/east, +/area/almayer/shipboard/brig/processing) +"cnc" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_17"; + pixel_x = -6; + pixel_y = 21 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/sign/safety/restrictedarea{ + pixel_x = -17; + pixel_y = -8 + }, +/turf/open/floor/almayer/sterile_green_corner/north, +/area/almayer/shipboard/brig/medical) "cnd" = ( /obj/structure/machinery/door/airlock/almayer/secure/pod/reinforced{ name = "\improper Evacuation Airlock PL-1"; @@ -46705,12 +48853,123 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/powered) +"cne" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/spray/cleaner{ + pixel_x = -7; + pixel_y = 12 + }, +/obj/item/storage/box/masks{ + pixel_x = 7 + }, +/obj/item/storage/box/gloves{ + pixel_x = 7; + pixel_y = 8 + }, +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/obj/structure/machinery/power/apc/almayer/north, +/obj/structure/machinery/door_control{ + id = "brigmedprivacyshutters"; + name = "Privacy Shutters"; + pixel_x = -7; + pixel_y = -2 + }, +/turf/open/floor/almayer/sterile_green_corner, +/area/almayer/shipboard/brig/medical) +"cnf" = ( +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/perma) +"cng" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/perma) +"cnh" = ( +/obj/structure/bed/chair/comfy/orange{ + dir = 4 + }, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/yard) +"cni" = ( +/obj/structure/bed, +/obj/item/bedsheet/brown, +/obj/structure/machinery/flasher{ + id = "Cell 1"; + pixel_x = -24 + }, +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig/cells) +"cnj" = ( +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig/cells) +"cnk" = ( +/obj/structure/machinery/brig_cell/cell_1, +/turf/closed/wall/almayer/reinforced, +/area/almayer/shipboard/brig/cells) +"cnl" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/processing) "cnm" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/upper/u_a_p) +"cnn" = ( +/obj/structure/filingcabinet/documentation/military_police{ + pixel_y = 16; + density = 0; + pixel_x = 8 + }, +/obj/structure/filingcabinet/chestdrawer{ + pixel_y = 16; + pixel_x = -8; + density = 0 + }, +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig/processing) +"cno" = ( +/obj/structure/machinery/door/airlock/almayer/medical/glass{ + closeOtherId = "brigmed"; + name = "\improper Brig Medbay"; + req_access = null; + req_one_access = null; + req_one_access_txt = "20;3"; + dir = 2; + id = "brigmedpublic" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "brigmedprivacyshutters"; + name = "\improper Privacy Shutters"; + dir = 2 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/medical) +"cnp" = ( +/obj/item/device/radio/listening_bug/radio_linked/fax/uscm_pvst{ + nametag = "Brig Perma" + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/perma) "cnq" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -46728,6 +48987,38 @@ /obj/structure/bed/chair, /turf/open/floor/almayer/sterile_green_side/north, /area/almayer/medical/lower_medical_medbay) +"cns" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/perma) +"cnt" = ( +/obj/structure/machinery/door/airlock/almayer/security/reinforced{ + name = "\improper Brig Yard" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "perma_lockdown"; + name = "\improper Perma Lockdown Shutter" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/perma) "cnu" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -46735,6 +49026,76 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/prison/kitchen, /area/almayer/living/grunt_rnr) +"cnv" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/yard) +"cnw" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/lobby) +"cnx" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_x = 23 + }, +/turf/open/floor/almayer/silver/southeast, +/area/almayer/shipboard/brig/lobby) +"cny" = ( +/obj/structure/machinery/computer/arcade, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/yard) +"cnz" = ( +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig/yard) +"cnA" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/almayer/red/northeast, +/area/almayer/shipboard/brig/yard) +"cnB" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/poddoor/almayer/locked{ + id = "Cell 2"; + name = "\improper Courtyard Divider"; + dir = 4 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/almayer/generic, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/cells) +"cnC" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/processing) +"cnD" = ( +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/processing) "cnE" = ( /obj/structure/filingcabinet{ pixel_x = -8; @@ -46752,6 +49113,18 @@ }, /turf/open/floor/almayer/silver/north, /area/almayer/command/computerlab) +"cnF" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/lobby) +"cnG" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/perma) "cnH" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -46767,6 +49140,40 @@ }, /turf/open/floor/almayer/orange/east, /area/almayer/hallways/lower/port_umbilical) +"cnJ" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/sentencing{ + dir = 8; + pixel_y = 2 + }, +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/perma) +"cnK" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/poddoor/almayer/locked{ + id = "Cell 5"; + name = "\improper Courtyard Divider" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter" + }, +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/cells) +"cnL" = ( +/obj/structure/bed, +/obj/item/bedsheet/brown, +/obj/structure/machinery/flasher{ + id = "Cell 2"; + pixel_x = -24 + }, +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig/cells) "cnM" = ( /obj/structure/window/reinforced{ dir = 4; @@ -46794,6 +49201,35 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/starboard_emb) +"cnN" = ( +/obj/structure/machinery/brig_cell/cell_2, +/turf/closed/wall/almayer/reinforced, +/area/almayer/shipboard/brig/cells) +"cnO" = ( +/obj/structure/toilet{ + pixel_y = 8; + pixel_x = -10 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/camera/autoname/almayer/brig, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/perma) +"cnP" = ( +/obj/structure/machinery/brig_cell/perma_1, +/turf/closed/wall/almayer/reinforced, +/area/almayer/shipboard/brig/perma) +"cnQ" = ( +/obj/structure/machinery/light{ + dir = 4; + invisibility = 00 + }, +/obj/structure/closet/secure_closet/brig, +/obj/structure/sign/safety/rewire{ + pixel_x = 33; + pixel_y = 6 + }, +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/perma) "cnR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/firealarm{ @@ -46810,6 +49246,58 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/command/computerlab) +"cnT" = ( +/obj/structure/bed, +/obj/item/bedsheet/brown, +/obj/structure/machinery/flasher{ + id = "Cell 6"; + pixel_x = -24 + }, +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/cells) +"cnU" = ( +/obj/structure/bed, +/obj/item/bedsheet/brown, +/obj/structure/machinery/flasher{ + id = "Cell 3"; + pixel_x = -24 + }, +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/cells) +"cnV" = ( +/obj/structure/closet/secure_closet/brig, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 2 + }, +/obj/structure/sign/safety/two{ + pixel_x = -17 + }, +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/processing) +"cnW" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/processing) +"cnX" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/door_control{ + id = "briglobbyprivacyshutters"; + name = "Privacy Shutters"; + pixel_x = 8; + pixel_y = 31; + req_access = list(3) + }, +/obj/structure/machinery/recharger{ + pixel_y = 3 + }, +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/processing) +"cnY" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/shipboard/brig/warden_office) "cnZ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/crew/alt{ @@ -46839,6 +49327,23 @@ }, /turf/open/floor/almayer/sterile_green_corner/east, /area/almayer/medical/upper_medical) +"cob" = ( +/obj/structure/window/framed/almayer/hull, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "Cell Privacy Shutters"; + name = "\improper Cell Privacy Shutters" + }, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/processing) +"coc" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5; + pixel_x = -1 + }, +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/processing) "cod" = ( /obj/structure/machinery/cm_vending/clothing/dress{ density = 0; @@ -46846,18 +49351,79 @@ }, /turf/open/floor/almayer/cargo, /area/almayer/command/cic) +"coe" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/lobby) +"cof" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/lobby) "cog" = ( /obj/structure/surface/table/almayer, /obj/item/tool/hand_labeler, /obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/emerald/east, /area/almayer/squads/charlie) +"coh" = ( +/obj/structure/bookcase, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/paperwork, +/obj/item/book/manual/detective, +/obj/item/book/manual/marine_law, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/warden_office) +"coi" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + closeOtherId = "brigwarden"; + name = "\improper Warden's Office" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "wardenprivacy"; + name = "\improper Privacy Shutters"; + dir = 4 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/warden_office) "coj" = ( /obj/structure/machinery/power/apc/almayer/south, /obj/structure/surface/table/almayer, /obj/item/tool/hand_labeler, /turf/open/floor/almayer/blue/east, /area/almayer/squads/delta) +"cok" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 4; + pixel_x = 19; + dir = 4 + }, +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/perma) +"col" = ( +/obj/structure/machinery/door/window/brigdoor/southright{ + id = "Cell 6"; + name = "Cell 6" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) +"com" = ( +/obj/structure/machinery/door/window/brigdoor/southright{ + id = "Cell 4"; + name = "Cell 4" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) +"con" = ( +/obj/structure/machinery/brig_cell/cell_3, +/turf/closed/wall/almayer/reinforced, +/area/almayer/shipboard/brig/cells) "coo" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -46887,24 +49453,88 @@ /obj/effect/landmark/start/tank_crew, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/tankerbunks) -"cov" = ( -/obj/structure/machinery/cm_vending/sorted/marine_food, +"coq" = ( +/turf/open/floor/almayer/cargo, +/area/almayer/shipboard/brig/processing) +"cor" = ( +/obj/structure/machinery/vending/cigarette/koorlander, +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/processing) +"cos" = ( +/obj/structure/machinery/light{ + dir = 1 + }, /obj/structure/sign/safety/security{ - pixel_x = 32; - pixel_y = -8 + pixel_x = 15; + pixel_y = 25 }, /obj/structure/sign/safety/restrictedarea{ - pixel_x = 32; - pixel_y = 7 + pixel_y = 25 }, -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/general_equipment) +/turf/open/floor/almayer/silver/north, +/area/almayer/shipboard/brig/lobby) +"cot" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/lobby) +"cou" = ( +/obj/structure/machinery/cm_vending/clothing/military_police_warden{ + pixel_x = -30; + can_block_movement = 0 + }, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/warden_office) +"cow" = ( +/obj/structure/machinery/door_control{ + pixel_x = 25; + pixel_y = -8; + name = "Warden's Quarters"; + id = "wardenprivacy"; + req_access = list(3) + }, +/obj/structure/bed/chair/comfy/beige{ + dir = 1 + }, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/warden_office) +"cox" = ( +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/perma) +"coy" = ( +/obj/structure/closet/secure_closet/brig, +/obj/structure/sign/safety/six{ + pixel_x = 15; + pixel_y = -27 + }, +/turf/open/floor/almayer/red/southwest, +/area/almayer/shipboard/brig) +"coz" = ( +/turf/open/floor/almayer, +/area/almayer/shipboard/brig) +"coA" = ( +/obj/structure/closet/secure_closet/brig, +/obj/structure/sign/safety/four{ + pixel_y = -27; + pixel_x = 15 + }, +/turf/open/floor/almayer/red/south, +/area/almayer/shipboard/brig) "coB" = ( /obj/structure/bed/chair{ dir = 4 }, /turf/open/floor/almayer/plate, /area/almayer/squads/alpha_bravo_shared) +"coC" = ( +/obj/structure/machinery/atm{ + pixel_x = -25; + pixel_y = 6 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/processing) "coD" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/flora/pottedplant{ @@ -46913,6 +49543,155 @@ }, /turf/open/floor/carpet, /area/almayer/living/commandbunks) +"coE" = ( +/obj/item/bedsheet/red, +/obj/structure/bed, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/sign/calendar/ua{ + pixel_y = 27 + }, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/warden_office) +"coF" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/sign/safety/maint{ + pixel_x = 14; + pixel_y = 26 + }, +/turf/open/floor/almayer/red/northwest, +/area/almayer/shipboard/brig/perma) +"coG" = ( +/obj/structure/machinery/door/airlock/almayer/security/reinforced{ + name = "\improper Permanent Confinement" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 8 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "perma_lockdown"; + name = "\improper Perma Lockdown Shutter" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/perma) +"coH" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig) +"coI" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig) +"coJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/status_display{ + pixel_x = -32 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/processing) +"coK" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/crew/alt{ + pixel_x = -18 + }, +/obj/item/prop/tableflag/uscm{ + layer = 3.03; + pixel_x = -4; + pixel_y = 5 + }, +/obj/item/prop/tableflag/uscm2{ + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/processing) +"coL" = ( +/turf/open/floor/almayer/cargo_arrow, +/area/almayer/shipboard/brig/processing) +"coM" = ( +/turf/open/floor/almayer/redcorner/south, +/area/almayer/shipboard/brig/processing) +"coN" = ( +/obj/structure/machinery/firealarm{ + dir = 1; + pixel_y = -25 + }, +/turf/open/floor/almayer/red/south, +/area/almayer/shipboard/brig/processing) +"coO" = ( +/turf/open/floor/almayer/red/southwest, +/area/almayer/shipboard/brig) +"coP" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/shipboard/brig) +"coQ" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + layer = 1.9; + dir = 2 + }, +/obj/structure/machinery/door/airlock/almayer/security/reinforced{ + dir = 2; + name = "\improper Brig Maintenance"; + closeOtherId = "permastarboard" + }, +/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/item/device/motion_sensor/mp{ + alert_message = "ALERT: Unauthorized movement detected in Starboard Perma Cells Maintenance Hatch!"; + pixel_x = 8; + pixel_y = 8; + anchored = 1; + area_based = 0 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/perma) +"coR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/almayer/red/northwest, +/area/almayer/shipboard/brig) +"coS" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig) "coT" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -46922,6 +49701,65 @@ /obj/item/storage/firstaid/regular, /turf/open/floor/almayer/plate, /area/almayer/shipboard/starboard_point_defense) +"coU" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ + dir = 2; + name = "\improper Offices and Secondary Cells" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + layer = 1.9 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/processing) +"coV" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer/red/south, +/area/almayer/shipboard/brig/processing) +"coW" = ( +/obj/structure/pipes/standard/manifold/fourway/hidden/supply, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/processing) +"coX" = ( +/obj/structure/machinery/status_display{ + pixel_y = 31; + pixel_x = -1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer/red/northwest, +/area/almayer/shipboard/brig) +"coY" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig) "coZ" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -46933,6 +49771,80 @@ }, /turf/open/floor/almayer/flooredge, /area/almayer/medical/medical_science) +"cpa" = ( +/obj/structure/bed/sofa/south/grey/left, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, +/turf/open/floor/almayer/silver/north, +/area/almayer/shipboard/brig/cic_hallway) +"cpb" = ( +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig) +"cpc" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig) +"cpd" = ( +/obj/structure/machinery/door_control{ + id = "cmpprivacy"; + name = "Privacy Shutters"; + pixel_x = -7; + pixel_y = 26; + req_access = list(3, 24) + }, +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig) +"cpe" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/storage/firstaid/regular{ + pixel_y = -1; + pixel_x = -1 + }, +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera"; + dir = 8 + }, +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/processing) +"cpf" = ( +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "briglobbyprivacyshutters"; + name = "\improper Privacy Shutters"; + dir = 2 + }, +/turf/open/floor/plating, +/area/almayer/shipboard/brig) +"cpg" = ( +/obj/structure/window/framed/almayer/hull, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" + }, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/cryo) +"cph" = ( +/obj/structure/largecrate/random/barrel/green, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/s_bow) +"cpi" = ( +/obj/structure/surface/table/almayer, +/obj/structure/sign/safety/terminal{ + pixel_x = -18 + }, +/obj/item/storage/box/ids{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/structure/machinery/recharger{ + pixel_y = -9; + pixel_x = -2 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig) "cpj" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/ashtray/glass, @@ -46952,16 +49864,215 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/port_point_defense) +"cpl" = ( +/obj/structure/bed/chair/comfy, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig) +"cpm" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_27"; + layer = 3.1; + pixel_x = 6; + pixel_y = 15 + }, +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera"; + dir = 8; + pixel_y = 9 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig) +"cpn" = ( +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "cmpprivacy"; + name = "\improper Privacy Shutters"; + dir = 2 + }, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/chief_mp_office) +"cpo" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + dir = 1; + name = "\improper CMP's Office"; + req_access = list(3,24) + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "cmpprivacy"; + name = "\improper Privacy Shutters"; + dir = 2 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/chief_mp_office) "cpp" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/almayer, /area/almayer/living/offices) +"cpq" = ( +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk, +/obj/structure/sign/safety/security{ + pixel_x = -17; + pixel_y = 6 + }, +/obj/structure/sign/safety/restrictedarea{ + pixel_y = -8; + pixel_x = -17 + }, +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/processing) +"cpr" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/processing) +"cps" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/processing) +"cpt" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/processing) +"cpu" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/red/southwest, +/area/almayer/shipboard/brig) +"cpv" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/red/south, +/area/almayer/shipboard/brig) +"cpw" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer/red/south, +/area/almayer/shipboard/brig) +"cpx" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/power/apc/almayer/north, +/obj/structure/machinery/computer/cameras/almayer_brig{ + desc = "Used to access the various cameras in the security brig."; + dir = 4; + name = "brig cameras console" + }, +/obj/structure/machinery/computer/cameras/almayer_network{ + dir = 4; + pixel_y = -16 + }, +/obj/item/reagent_container/food/drinks/coffeecup{ + pixel_x = 7; + pixel_y = -25 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig) +"cpy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig) "cpz" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_s) +"cpA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/faxmachine/uscm/almayer/brig{ + sub_name = "Secondary Cells"; + pixel_y = 23; + can_block_movement = 0 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig) +"cpB" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) +"cpC" = ( +/obj/structure/machinery/cm_vending/sorted/marine_food, +/turf/open/floor/almayer/red/northwest, +/area/almayer/shipboard/brig/processing) +"cpD" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig/processing) +"cpE" = ( +/obj/structure/stairs{ + dir = 4; + icon_state = "ramptop" + }, +/obj/structure/platform/metal/stair_cut/almayer_smooth_left, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig) +"cpF" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 2 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = 16 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cryo) +"cpG" = ( +/obj/structure/machinery/faxmachine/uscm/almayer/brig/chief{ + pixel_y = 19; + pixel_x = -2; + can_block_movement = 0 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) +"cpH" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/carpet, +/area/almayer/shipboard/brig/chief_mp_office) +"cpI" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8; + layer = 3.25 + }, +/turf/open/floor/carpet, +/area/almayer/shipboard/brig/chief_mp_office) "cpJ" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -46983,16 +50094,217 @@ /obj/structure/window/framed/almayer/hull/hijack_bustable, /turf/open/floor/plating, /area/almayer/squads/req) +"cpL" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + dir = 1; + name = "\improper Holding Cell" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/processing) +"cpM" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/shipboard/brig/evidence_storage) +"cpN" = ( +/obj/structure/machinery/door/airlock/almayer/security/reinforced{ + dir = 2; + name = "\improper Evidence Storage" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/evidence_storage) +"cpO" = ( +/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) "cpP" = ( /obj/structure/blocker/fuelpump, /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/north1) +"cpQ" = ( +/obj/structure/window/framed/almayer/hull, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/general_equipment) +"cpR" = ( +/obj/structure/stairs/multiz/down, +/obj/structure/platform/metal/almayer_smooth/east, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig) +"cpS" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/computer/emails{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/almayer/shipboard/brig/chief_mp_office) +"cpT" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/processing) +"cpU" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/evidence_storage) +"cpV" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/toolbox/emergency{ + pixel_y = 6 + }, +/obj/item/storage/toolbox/mechanical/green, +/turf/open/floor/almayer/red/southwest, +/area/almayer/shipboard/brig/general_equipment) +"cpW" = ( +/obj/structure/machinery/door/airlock/almayer/security/reinforced{ + name = "\improper Chief MP's Bedroom"; + req_access = list(3,24) + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/chief_mp_office) +"cpX" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/carpet, +/area/almayer/shipboard/brig/chief_mp_office) +"cpY" = ( +/obj/structure/bed/chair/comfy, +/turf/open/floor/carpet, +/area/almayer/shipboard/brig/chief_mp_office) +"cpZ" = ( +/obj/structure/machinery/computer/secure_data{ + dir = 8; + pixel_x = 16; + pixel_y = 10 + }, +/obj/structure/machinery/computer/cameras/almayer_network{ + dir = 8; + pixel_y = -4; + pixel_x = 16 + }, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) +"cqa" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/evidence_storage) +"cqb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/pen{ + pixel_x = -8; + pixel_y = 9 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/shipboard/brig/evidence_storage) +"cqc" = ( +/obj/item/folder/black_random{ + pixel_y = 6 + }, +/obj/item/folder/red{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/item/tool/pen, +/obj/item/tool/pen{ + pixel_x = -12 + }, +/obj/item/tool/pen{ + pixel_x = -8 + }, +/obj/item/tool/pen{ + pixel_x = -4 + }, +/obj/item/tool/pen{ + pixel_x = 4 + }, +/obj/item/tool/pen{ + pixel_x = 8 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/general_equipment) "cqd" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" }, /turf/open/floor/almayer/orangecorner/north, /area/almayer/hallways/lower/starboard_umbilical) +"cqe" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/general_equipment) +"cqf" = ( +/obj/structure/largecrate/random/barrel/red, +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/s_bow) +"cqg" = ( +/obj/structure/machinery/cm_vending/clothing/senior_officer, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) +"cqh" = ( +/obj/structure/filingcabinet/security{ + can_block_movement = 0; + density = 0; + pixel_x = -8; + pixel_y = 13 + }, +/obj/structure/filingcabinet/documentation/military_police{ + pixel_y = 13; + density = 0; + pixel_x = 8 + }, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) +"cqi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet{ + name = "secure evidence locker"; + req_access_txt = "3" + }, +/obj/item/device/black_market_hacking_device, +/turf/open/floor/almayer/cargo, +/area/almayer/shipboard/brig/evidence_storage) +"cqj" = ( +/obj/structure/machinery/cm_vending/sorted/attachments/mp_extended, +/turf/open/floor/almayer/red/northwest, +/area/almayer/shipboard/brig/general_equipment) +"cqk" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/obj/structure/pipes/vents/pump, +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig/general_equipment) +"cql" = ( +/obj/structure/window/framed/almayer/hull, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "briglobbyprivacyshutters"; + name = "\improper Privacy Shutters"; + dir = 2 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" + }, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/processing) "cqm" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/folder/white{ @@ -47004,10 +50316,37 @@ }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) +"cqn" = ( +/obj/structure/machinery/cm_vending/clothing/military_police{ + pixel_y = 30; + can_block_movement = 0 + }, +/turf/open/floor/almayer/cargo_arrow/north, +/area/almayer/shipboard/brig/general_equipment) +"cqo" = ( +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/s_bow) "cqp" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_f_s) +"cqq" = ( +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/s_bow) +"cqr" = ( +/obj/structure/machinery/power/apc/almayer/north, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/s_bow) "cqz" = ( /obj/structure/bed/chair{ dir = 4 @@ -47022,18 +50361,16 @@ /turf/open/floor/almayer, /area/almayer/maint/hull/lower/l_m_s) "cqJ" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/window/framed/almayer, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/general_equipment) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/processing) "cqM" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 }, -/turf/open/floor/almayer/red, +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/processing) "cqQ" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -47089,11 +50426,12 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/stern) "csy" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 +/obj/structure/pipes/standard/manifold/fourway/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/warden_office) +/area/almayer/shipboard/brig/visitation) "csI" = ( /turf/open/floor/almayer/red/west, /area/almayer/lifeboat_pumps/south1) @@ -47179,15 +50517,11 @@ /turf/open/floor/almayer/silver, /area/almayer/hallways/lower/repair_bay) "ctT" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass{ - dir = 1; - name = "\improper Cryogenics Bay" - }, /obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 + dir = 2 }, /turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/general_equipment) "cuq" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -47244,18 +50578,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/hangar) -"cvH" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) "cvI" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -47288,9 +50610,6 @@ }, /turf/open/floor/almayer/plating_striped/south, /area/almayer/underdeck/req) -"cwC" = ( -/turf/open/floor/almayer/red/east, -/area/almayer/shipboard/brig/starboard_hallway) "cwS" = ( /obj/structure/blocker/invisible_wall, /turf/open/floor/almayer/aicore/no_build, @@ -47324,13 +50643,6 @@ /obj/structure/barricade/handrail, /turf/open/floor/almayer/test_floor5, /area/almayer/hallways/lower/port_midship_hallway) -"cyc" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/pipes/vents/pump, -/turf/open/floor/almayer/red/north, -/area/almayer/shipboard/brig/starboard_hallway) "cyf" = ( /obj/structure/platform/metal/almayer/north, /obj/item/tool/mop, @@ -47377,12 +50689,6 @@ }, /turf/open/floor/plating, /area/almayer/maint/lower/constr) -"cyZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) "czN" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -47405,14 +50711,6 @@ /obj/structure/machinery/power/apc/almayer/south, /turf/open/floor/almayer/no_build, /area/almayer/stair_clone/lower/starboard_fore) -"cAy" = ( -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/armory) "cAF" = ( /obj/effect/decal/medical_decals{ icon_state = "docdecal2"; @@ -47421,8 +50719,8 @@ /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/lower_medical_lobby) "cAR" = ( -/turf/closed/wall/almayer/reinforced, -/area/almayer/shipboard/brig/mp_bunks) +/turf/closed/wall/almayer/outer/internal, +/area/almayer/shipboard/brig/cryo) "cBb" = ( /obj/structure/machinery/light{ dir = 1 @@ -47460,12 +50758,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/cargo_arrow, /area/almayer/squads/alpha) -"cBw" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/general_equipment) "cBC" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -47564,10 +50856,9 @@ /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "cDN" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, +/obj/structure/flora/pottedplant, +/obj/structure/machinery/power/apc/almayer/north, +/turf/open/floor/almayer/silver/northwest, /area/almayer/shipboard/brig/lobby) "cDP" = ( /turf/open/floor/almayer/silvercorner/north, @@ -47662,12 +50953,6 @@ }, /turf/open/floor/almayer/red, /area/almayer/command/lifeboat) -"cFC" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer/red/northwest, -/area/almayer/shipboard/brig/processing) "cGd" = ( /turf/closed/wall/almayer, /area/almayer/maint/hull/upper/u_m_s) @@ -47842,11 +51127,10 @@ /turf/open/floor/plating, /area/almayer/maint/lower/constr) "cKJ" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/almayer/red/east, -/area/almayer/shipboard/brig/interrogation) +/obj/structure/bed, +/obj/item/bedsheet/red, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/chief_mp_office) "cKL" = ( /turf/open/floor/almayer/orangecorner/west, /area/almayer/engineering/upper_engineering/port) @@ -47924,14 +51208,11 @@ /turf/open/floor/almayer/no_build, /area/almayer/underdeck/req) "cMl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/bed/chair/comfy/orange{ + dir = 8 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/processing) +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/yard) "cMx" = ( /turf/closed/wall/almayer, /area/almayer/maint/upper/u_a_s) @@ -47968,15 +51249,8 @@ /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) "cMW" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/processing) +/turf/open/floor/almayer/sterile_green_side/north, +/area/almayer/shipboard/brig/medical) "cNe" = ( /obj/structure/largecrate/random/case/small, /obj/effect/decal/cleanable/dirt, @@ -48011,9 +51285,19 @@ /turf/open/floor/almayer/dark_sterile, /area/almayer/shipboard/brig/medical) "cNJ" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/almayer/red, -/area/almayer/shipboard/brig/mp_bunks) +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/obj/structure/platform/metal/almayer_smooth{ + layer = 2.8 + }, +/obj/structure/platform_decoration/metal/almayer_smooth/east{ + layer = 3.01; + pixel_y = 9 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cryo) "cNK" = ( /obj/structure/platform/metal/stair_cut/platform_right, /obj/structure/stairs/perspective{ @@ -48141,14 +51425,21 @@ /turf/open/floor/almayer/silver/north, /area/almayer/hallways/upper/midship_hallway) "cQG" = ( -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/starboard_hallway) +/obj/structure/machinery/door/window/brigdoor/southright{ + id = "Cell 5"; + name = "Cell 5" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) "cQL" = ( -/obj/structure/disposalpipe/segment{ +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/junction{ dir = 4; - icon_state = "pipe-c" + icon_state = "pipe-y" }, -/turf/open/floor/almayer, +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/lobby) "cQW" = ( /obj/effect/decal/warning_stripes{ @@ -48261,9 +51552,11 @@ /turf/open/floor/almayer/cargo, /area/almayer/squads/req) "cTy" = ( -/obj/structure/closet/secure_closet/medical2, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/shipboard/brig/medical) +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/processing) "cTC" = ( /obj/structure/machinery/vending/walkman, /turf/open/floor/almayer/green/southwest, @@ -48422,20 +51715,8 @@ /turf/open/floor/almayer/orange/northeast, /area/almayer/engineering/upper_engineering/port) "cXi" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, -/obj/structure/sign/safety/water{ - pixel_x = -17; - pixel_y = -8 - }, -/obj/structure/sign/safety/waterhazard{ - pixel_x = -17; - pixel_y = 6 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) +/turf/closed/wall/almayer, +/area/almayer/shipboard/brig/yard) "cXm" = ( /obj/structure/largecrate/supply/supplies/mre, /turf/open/floor/almayer/plate, @@ -48491,16 +51772,10 @@ /turf/open/floor/almayer/sterile_green_side, /area/almayer/medical/containment) "cXD" = ( -/obj/structure/surface/rack, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/glasses/sunglasses/blindfold, -/obj/item/clothing/mask/muzzle, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/reagent_dispensers/tank/water, /turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/execution_storage) +/area/almayer/shipboard/brig/perma) "cXF" = ( /obj/structure/bookcase{ opacity = 0 @@ -48514,12 +51789,6 @@ "cXR" = ( /turf/open/floor/almayer/greencorner, /area/almayer/squads/req) -"cXV" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/mp_bunks) "cXX" = ( /obj/structure/disposalpipe/segment, /obj/structure/sign/safety/distribution_pipes{ @@ -48702,19 +51971,22 @@ /turf/open/floor/almayer/plating_striped/north, /area/almayer/engineering/upper_engineering/port) "dbs" = ( -/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{ - closeOtherId = "brigmaint_s"; - dir = 1; - name = "\improper Brig Maintenance" +/obj/item/device/motion_sensor/mp{ + alert_message = "ALERT: Unauthorized movement detected in Port Perma Cells Maintenance Hatch!"; + pixel_x = 8; + pixel_y = -8; + anchored = 1; + area_based = 0 }, /obj/structure/machinery/door/poddoor/almayer/open{ - id = "perma_lockdown_2"; + id = "perma_lockdown"; name = "\improper Perma Lockdown Shutter" }, +/obj/structure/machinery/door/airlock/almayer/security/reinforced{ + dir = 2; + name = "\improper Brig Maintenance"; + closeOtherId = "permaport" + }, /turf/open/floor/almayer/test_floor4, /area/almayer/shipboard/brig/perma) "dbw" = ( @@ -48770,9 +52042,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_umbilical) -"dcy" = ( -/turf/open/floor/almayer/red/north, -/area/almayer/shipboard/brig/perma) "dcR" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/fore_hallway) @@ -48796,9 +52065,18 @@ /turf/open/floor/almayer/cargo, /area/almayer/engineering/lower/engine_core) "ddj" = ( -/obj/structure/bed/chair/bolted, -/turf/open/floor/almayer/red/northwest, -/area/almayer/shipboard/brig/interrogation) +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/sink{ + pixel_y = 20 + }, +/obj/structure/mirror{ + pixel_x = -1; + pixel_y = 32 + }, +/turf/open/floor/almayer/dark_sterile, +/area/almayer/shipboard/brig/chief_mp_office) "ddk" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer/redfull, @@ -48857,8 +52135,10 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_s) "deH" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/warden_office) +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/vents/scrubber, +/turf/open/floor/almayer/red/south, +/area/almayer/shipboard/brig/visitation) "deT" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -48885,11 +52165,11 @@ /turf/open/floor/almayer/plate, /area/almayer/engineering/upper_engineering/starboard) "dfk" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/pipes/vents/pump{ + dir = 1 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/yard) "dfA" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -48915,13 +52195,31 @@ /turf/open/floor/almayer/plate, /area/almayer/living/gym) "dgx" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_18"; - pixel_y = 13 +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/window, +/obj/structure/machinery/door_control{ + pixel_x = 6; + pixel_y = 9; + name = "Visitation Shutters"; + id = "visitationshutter"; + req_access = list(3) }, -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/structure/machinery/door_control{ + pixel_x = -4; + pixel_y = 9; + name = "Visitation Access"; + id = "visitationaccess"; + req_access = list(3) + }, +/obj/structure/machinery/door_control{ + pixel_x = 16; + pixel_y = 9; + name = "Visitation Privacy"; + id = "visitationprivacy"; + req_access = list(3) + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/visitation) "dgE" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -48946,16 +52244,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/combat_correspondent) -"dhd" = ( -/obj/structure/window/reinforced/ultra{ - pixel_y = -12 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/bed/chair/bolted, -/turf/open/floor/almayer/plating_striped, -/area/almayer/shipboard/brig/execution) "dhj" = ( /obj/structure/pipes/vents/pump/on{ dir = 4 @@ -49118,14 +52406,8 @@ /turf/open/floor/almayer/silver/northeast, /area/almayer/command/cichallway) "dmr" = ( -/obj/structure/transmitter{ - name = "Brig Offices Telephone"; - phone_category = "MP Dept."; - phone_id = "Brig Main Offices"; - pixel_y = 32 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/shipboard/brig/starboard_hallway) +/turf/open/floor/almayer/red/northeast, +/area/almayer/shipboard/brig) "dmv" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -49169,23 +52451,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) -"dmZ" = ( -/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/test_floor4, -/area/almayer/shipboard/brig/cells) "dnh" = ( /obj/structure/surface/rack, /obj/item/book/manual/orbital_cannon_manual, @@ -49402,10 +52667,6 @@ /obj/structure/platform/metal/almayer/west, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"dsA" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/almayer/redcorner/west, -/area/almayer/shipboard/brig/execution) "dsF" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -49473,14 +52734,6 @@ /obj/structure/closet/secure_closet/personal, /turf/open/floor/almayer/orange/north, /area/almayer/engineering/upper_engineering/port) -"duT" = ( -/obj/structure/bed, -/obj/structure/machinery/flasher{ - id = "Cell 2"; - pixel_x = -24 - }, -/turf/open/floor/almayer/red/southwest, -/area/almayer/shipboard/brig/cells) "duV" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -49584,18 +52837,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/orange/northeast, /area/almayer/engineering/lower/workshop/hangar) -"dya" = ( -/obj/structure/machinery/door/poddoor/almayer/locked{ - dir = 2; - id = "Perma 2"; - name = "\improper cell shutter" - }, -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - dir = 2; - name = "\improper Isolation Cell" - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/perma) "dyb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -49685,14 +52926,29 @@ /turf/open/floor/almayer/aicore/no_build/ai_floor2, /area/almayer/command/airoom) "dzG" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = 26 +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/box/evidence{ + pixel_x = 9; + pixel_y = -16 }, -/obj/structure/reagent_dispensers/forensictank{ - pixel_y = 41 +/obj/item/storage/box/tapes{ + pixel_x = 9; + pixel_y = 6 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/general_equipment) +/obj/item/storage/box/tapes{ + pixel_x = 9 + }, +/obj/item/folder/red{ + pixel_x = -7; + pixel_y = 6 + }, +/obj/item/folder/blue{ + pixel_x = -7 + }, +/obj/item/tool/hand_labeler, +/turf/open/floor/almayer/cargo, +/area/almayer/shipboard/brig/evidence_storage) "dzX" = ( /obj/structure/sign/safety/water{ pixel_x = -17 @@ -49813,29 +53069,23 @@ /turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/operating_room_two) "dBS" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 2.5 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 +/obj/structure/surface/table/reinforced/black, +/obj/item/paper_bin/uscm{ + pixel_y = 7 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/execution) +/obj/item/tool/pen, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/perma) "dCe" = ( -/obj/structure/machinery/cryopod{ - pixel_y = 6 - }, -/obj/structure/sign/safety/coffee{ - pixel_x = -17; - pixel_y = -8 +/obj/structure/desertdam/decals/road_edge{ + pixel_x = -12 }, -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/camera/autoname/almayer/brig{ + dir = 4 }, -/turf/open/floor/almayer/cargo, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/almayer/plating, +/area/almayer/shipboard/brig/yard) "dCh" = ( /obj/structure/machinery/door/airlock/almayer/security{ dir = 2; @@ -49989,12 +53239,10 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/engineering/upper_engineering/port) "dEG" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 +/obj/structure/sign/safety/security{ + pixel_x = -18 }, -/obj/structure/closet/secure_closet/brig, -/turf/open/floor/almayer/red, +/turf/open/floor/almayer/red/west, /area/almayer/shipboard/brig/processing) "dEJ" = ( /obj/structure/closet/firecloset, @@ -50023,25 +53271,24 @@ /turf/open/floor/almayer/redfull, /area/almayer/living/briefing) "dEX" = ( -/obj/structure/machinery/light{ - dir = 1 +/obj/structure/machinery/status_display{ + pixel_y = 30 }, -/obj/structure/closet/bombclosetsecurity, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/armory) +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_29"; + pixel_y = 3; + pixel_x = 5 + }, +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) "dFk" = ( /turf/open/floor/almayer/redcorner/west, /area/almayer/command/lifeboat) -"dFl" = ( -/obj/structure/sign/safety/security{ - pixel_x = 15; - pixel_y = 25 - }, -/obj/structure/sign/safety/restrictedarea{ - pixel_y = 25 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/shipboard/brig/starboard_hallway) "dFF" = ( /obj/structure/machinery/light{ dir = 4 @@ -50100,14 +53347,19 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/auxiliary_officer_office) "dGT" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 +/obj/structure/machinery/door/airlock/almayer/security/glass{ + name = "\improper Cryogenics Bay" }, -/obj/structure/surface/table/almayer, -/obj/item/storage/donut_box, -/turf/open/floor/almayer/red, -/area/almayer/shipboard/brig/mp_bunks) +/obj/structure/platform_decoration/metal/almayer_smooth/north{ + layer = 3.01; + pixel_x = -5 + }, +/obj/structure/platform_decoration/metal/almayer_smooth{ + layer = 3.01; + pixel_x = 5 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/cryo) "dGU" = ( /obj/structure/sign/poster/propaganda{ pixel_x = -27 @@ -50230,8 +53482,12 @@ /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "dJJ" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = 16 + }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/execution_storage) +/area/almayer/shipboard/brig/perma) "dJO" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -50478,30 +53734,6 @@ /obj/item/paper_bin/uscm, /turf/open/floor/almayer/plate, /area/almayer/engineering/lower/workshop) -"dPT" = ( -/obj/structure/machinery/brig_cell/cell_2{ - pixel_x = 32; - pixel_y = -32 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/processing) -"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/test_floor4, -/area/almayer/shipboard/brig/cells) "dQA" = ( /obj/structure/pipes/standard/simple/visible{ dir = 4 @@ -50520,18 +53752,8 @@ /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_midship_hallway) "dRj" = ( -/obj/structure/toilet{ - pixel_y = 13 - }, -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/structure/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/shipboard/brig/mp_bunks) +/turf/open_space, +/area/almayer/shipboard/brig) "dRs" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer/cargo, @@ -50543,17 +53765,15 @@ /turf/open/floor/almayer/red/southwest, /area/almayer/squads/alpha) "dRA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 }, -/obj/structure/machinery/status_display{ - pixel_y = -32 +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-y" }, -/turf/open/floor/almayer/red, -/area/almayer/shipboard/brig/starboard_hallway) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig) "dRD" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/airlock/almayer/security{ @@ -50841,19 +54061,12 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_f_p) "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 +/obj/structure/bed/chair/bolted, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 }, -/turf/open/floor/almayer/cargo, -/area/almayer/shipboard/brig/general_equipment) +/turf/open/floor/almayer/red/northeast, +/area/almayer/shipboard/brig/processing) "ean" = ( /obj/structure/machinery/chem_storage/medbay{ pixel_x = -2 @@ -50896,10 +54109,6 @@ /obj/structure/platform_decoration/metal/almayer/east, /turf/open/floor/almayer, /area/almayer/living/chapel) -"ebd" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) "ebf" = ( /obj/structure/closet/crate/freezer{ desc = "A freezer crate. There is a note attached, it reads: Do not open, property of Pvt. Mendoza." @@ -51129,12 +54338,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_a_s) -"efT" = ( -/obj/structure/machinery/atm{ - pixel_y = 32 - }, -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/processing) "efV" = ( /obj/structure/disposalpipe/junction{ dir = 4; @@ -51180,9 +54383,6 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"ehl" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/interrogation) "ehm" = ( /obj/structure/sign/safety/maint{ pixel_x = 32; @@ -51242,16 +54442,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/starboard_emb) -"ehX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/shipboard/brig/processing) "eim" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -51378,19 +54568,33 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/living/starboard_garden) "ekZ" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/secure_data{ +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + name = "\improper Brig Visitation"; + req_access = list() + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + layer = 1.9 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; - pixel_y = 10 + id = "visitationaccess"; + name = "\improper Visitation Shutters"; + closed_layer = 3.4; + layer = 3.4 }, -/obj/structure/machinery/computer/cameras/almayer_brig{ - desc = "Used to access the various cameras in the security brig."; +/obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; - name = "brig cameras console"; - pixel_y = -11 + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter" }, -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/warden_office) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/yard) "elf" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -51417,19 +54621,6 @@ dir = 1 }, /area/almayer/medical/containment/cell) -"elV" = ( -/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{ - dir = 2; - name = "\improper Execution Equipment" - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/execution_storage) "elY" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F" @@ -51933,13 +55124,12 @@ /turf/open/floor/almayer, /area/almayer/living/gym) "evR" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/toolbox/mechanical/green{ - pixel_y = 8 +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 }, -/obj/item/storage/toolbox/mechanical, -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/general_equipment) +/turf/open/floor/plating, +/area/almayer/shipboard/brig/processing) "evX" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -51961,15 +55151,8 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) "ewI" = ( -/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/test_floor4, -/area/almayer/shipboard/brig/execution) +/turf/open/floor/almayer/red/southwest, +/area/almayer/shipboard/brig/perma) "ewO" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -52037,8 +55220,14 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/req) "eyD" = ( -/turf/closed/wall/almayer/reinforced, -/area/almayer/shipboard/brig/starboard_hallway) +/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ + closeOtherId = "briglobby"; + dir = 2; + name = "\improper Brig Lobby" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig) "eyM" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/almayer/plate, @@ -52057,17 +55246,16 @@ /turf/open/floor/almayer/orange, /area/almayer/hallways/hangar) "eyV" = ( -/obj/structure/reagent_dispensers/tank/water, -/obj/structure/sign/safety/water{ - pixel_x = -17; - pixel_y = -8 +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal3"; + pixel_y = -12 }, -/obj/structure/sign/safety/waterhazard{ - pixel_x = -17; - pixel_y = 6 +/obj/structure/desertdam/decals/road_edge{ + pixel_x = -12 }, -/turf/open/floor/almayer/green/southwest, -/area/almayer/shipboard/brig/cells) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plating, +/area/almayer/shipboard/brig/yard) "ezq" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal8"; @@ -52115,9 +55303,8 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) "ezX" = ( -/obj/structure/bed/chair/wood/normal, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/almayer/red/south, +/area/almayer/shipboard/brig/yard) "eAg" = ( /obj/structure/flora/pottedplant{ desc = "It is made of Fiberbush(tm). It contains asbestos."; @@ -52213,10 +55400,6 @@ /obj/structure/platform_decoration/metal/almayer/west, /turf/open/floor/almayer/red/north, /area/almayer/lifeboat_pumps/north1) -"eBx" = ( -/obj/structure/closet/emcloset/legacy, -/turf/open/floor/almayer/cargo, -/area/almayer/shipboard/brig/starboard_hallway) "eBE" = ( /obj/structure/machinery/photocopier{ anchored = 0 @@ -52273,12 +55456,17 @@ /turf/open/floor/almayer/cargo, /area/almayer/engineering/lower/engine_core) "eCI" = ( -/obj/structure/window/reinforced/ultra{ - pixel_y = -12 +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + dir = 8; + name = "\improper Isolation Cell" }, -/obj/structure/bed/chair/bolted, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/shipboard/brig/execution) +/obj/structure/machinery/door/poddoor/almayer/locked{ + dir = 4; + id = "Perma 1"; + name = "\improper cell shutter" + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/perma) "eDe" = ( /obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/almayer/test_floor4, @@ -52305,11 +55493,15 @@ /area/almayer/maint/hull/upper/u_m_s) "eDt" = ( /obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/cameras/almayer_network{ - dir = 8 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer/red/southeast, -/area/almayer/shipboard/brig/processing) +/obj/item/toy/deck/uno{ + pixel_x = 1; + pixel_y = 5 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/yard) "eDu" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_x = -24 @@ -52517,7 +55709,7 @@ /turf/open/floor/almayer/blue/north, /area/almayer/squads/delta) "eIN" = ( -/obj/item/tool/kitchen/utensil/pfork, +/obj/item/tool/kitchen/utensil/fork/plastic, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/p_stern) "eIO" = ( @@ -52672,11 +55864,21 @@ /turf/open/floor/almayer/no_build/plating, /area/almayer/underdeck/req) "eLX" = ( -/obj/structure/bed/chair{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 }, -/turf/open/floor/almayer/red/north, -/area/almayer/shipboard/brig/mp_bunks) +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 2 + }, +/obj/structure/platform/metal/almayer_smooth/north, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cryo) "eMb" = ( /obj/structure/platform/metal/almayer/west, /turf/open/floor/plating/plating_catwalk, @@ -52700,12 +55902,15 @@ /turf/open/floor/almayer/blue/west, /area/almayer/hallways/lower/port_midship_hallway) "eMJ" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, /obj/structure/machinery/computer/crew, -/turf/open/floor/almayer/red, +/obj/structure/machinery/firealarm{ + pixel_y = -28 + }, +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = -5; + pixel_x = 31 + }, +/turf/open/floor/almayer/red/southeast, /area/almayer/shipboard/brig/perma) "eMP" = ( /obj/structure/machinery/door/poddoor/almayer/open{ @@ -52745,11 +55950,11 @@ /turf/open/floor/almayer/green/north, /area/almayer/hallways/lower/starboard_midship_hallway) "eNR" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/structure/closet/secure_closet/brig, +/obj/structure/sign/safety/one{ + pixel_x = -17 }, -/turf/open/floor/plating, +/turf/open/floor/almayer/red/west, /area/almayer/shipboard/brig/processing) "eOx" = ( /obj/item/device/radio/intercom{ @@ -53122,24 +56327,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/chapel) -"eVR" = ( -/obj/structure/filingcabinet{ - density = 0; - pixel_x = -8; - pixel_y = 18 - }, -/obj/structure/machinery/power/apc/almayer/west, -/obj/structure/sign/safety/rewire{ - pixel_x = -17; - pixel_y = 17 - }, -/obj/structure/filingcabinet/documentation/military_police{ - pixel_y = 18; - density = 0; - pixel_x = 8 - }, -/turf/open/floor/almayer/cargo, -/area/almayer/shipboard/brig/evidence_storage) "eVT" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/door_control{ @@ -53351,17 +56538,12 @@ /turf/closed/wall/almayer, /area/almayer/maint/hull/upper/p_stern) "eZo" = ( -/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 - }, -/turf/open/floor/plating/plating_catwalk, +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/rack, +/obj/item/reagent_container/glass/bucket/janibucket, +/obj/item/tool/mop, +/obj/item/tool/soap, +/turf/open/floor/almayer/red/southwest, /area/almayer/shipboard/brig/cells) "eZC" = ( /turf/open/floor/almayer/plate, @@ -53392,12 +56574,15 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_aft_hallway) "fag" = ( -/obj/effect/decal/cleanable/blood, -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/bed/chair/bolted{ dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/execution) +/obj/structure/machinery/flasher{ + id = "Perma 2"; + pixel_y = 24 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/perma) "fai" = ( /obj/structure/largecrate/random, /turf/open/floor/almayer/no_build/plate, @@ -53496,13 +56681,14 @@ /turf/open/floor/prison/kitchen, /area/almayer/living/grunt_rnr) "fbr" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ - closeOtherId = "briglobby"; - dir = 2; - name = "\improper Brig Lobby" - }, +/obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer/test_floor4, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "briglobbyprivacyshutters"; + name = "\improper Privacy Shutters"; + dir = 4 + }, +/turf/open/floor/plating, /area/almayer/shipboard/brig/processing) "fbC" = ( /obj/structure/closet/toolcloset, @@ -53602,8 +56788,16 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_f_s) "feb" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/shipboard/brig/execution) +/obj/structure/toilet{ + dir = 1; + pixel_x = -10 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/camera/autoname/almayer/brig{ + dir = 1 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/perma) "feo" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -53641,8 +56835,14 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/underdeck) "ffg" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating/plating_catwalk, +/obj/structure/machinery/status_display{ + pixel_x = 32 + }, +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor/almayer/red/east, /area/almayer/shipboard/brig/perma) "ffq" = ( /obj/structure/surface/table/almayer, @@ -53699,11 +56899,9 @@ /turf/open/floor/almayer/green/north, /area/almayer/squads/req) "fgt" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/sterile_green_side/northwest, -/area/almayer/shipboard/brig/medical) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/processing) "fgy" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -53736,23 +56934,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) -"fgR" = ( -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "Brig Lockdown Shutters"; - name = "\improper Brig Lockdown Shutter" - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "courtyard_cells"; - name = "\improper Courtyard Lockdown Shutter" - }, -/obj/structure/window/framed/almayer/hull/hijack_bustable, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 2; - id = "courtyard window"; - name = "\improper Privacy Shutters" - }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/cells) "fgU" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -54096,12 +57277,13 @@ /turf/open/floor/almayer/plate, /area/almayer/engineering/lower/workshop) "fqQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 }, -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/starboard_hallway) +/obj/structure/pipes/vents/scrubber, +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig) "fqU" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -54140,38 +57322,18 @@ /turf/open/floor/almayer/sterile_green_side/east, /area/almayer/medical/lower_medical_medbay) "frt" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/door_control{ - id = "courtyard_cells"; - name = "\improper Courtyard Lockdown Shutters"; - pixel_x = 6; - req_access_txt = "3" - }, -/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" + pixel_x = -25; + pixel_y = -8; + name = "Visitation Access"; + id = "visitationaccess"; + req_access = list(3) }, -/obj/structure/machinery/computer/working_joe{ - pixel_y = 16 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 }, -/turf/open/floor/almayer/red/north, -/area/almayer/shipboard/brig/warden_office) +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/visitation) "frF" = ( /obj/structure/pipes/vents/scrubber{ dir = 8 @@ -54250,12 +57412,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/orange/east, /area/almayer/hallways/lower/port_umbilical) -"fuY" = ( -/obj/structure/bed/chair/bolted{ - dir = 1 - }, -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/interrogation) "fva" = ( /obj/structure/machinery/light{ dir = 1 @@ -54299,8 +57455,9 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_a_p) "fvA" = ( -/obj/structure/closet/secure_closet/brig, -/turf/open/floor/almayer, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/redcorner/north, /area/almayer/shipboard/brig/perma) "fvB" = ( /obj/structure/closet/secure_closet/staff_officer/armory/m4a1, @@ -54355,12 +57512,30 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie_delta_shared) "fxJ" = ( -/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/plating/plating_catwalk, -/area/almayer/shipboard/brig/armory) +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/tool/stamp/hos{ + pixel_y = 7; + pixel_x = -8; + name = "Chief MP's rubber stamp" + }, +/obj/item/clipboard{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/reagent_container/food/drinks/coffeecup/uscm{ + pixel_x = -9; + pixel_y = -1 + }, +/obj/structure/machinery/keycard_auth{ + pixel_y = 10; + pixel_x = 25 + }, +/obj/structure/sign/safety/terminal{ + pixel_x = 32; + pixel_y = -3 + }, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) "fya" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -54377,23 +57552,21 @@ /turf/open/floor/almayer/no_build/test_floor4, /area/almayer/underdeck/req) "fyp" = ( -/obj/structure/machinery/cryopod{ - layer = 3.1; - pixel_y = 13 +/obj/structure/surface/table/reinforced/prison, +/obj/item/clothing/head/beret/marine/mp{ + pixel_x = 5 }, -/turf/open/floor/almayer/cargo, -/area/almayer/shipboard/brig/cryo) +/obj/item/storage/box/evidence{ + pixel_x = -5; + pixel_y = 8 + }, +/turf/open/floor/almayer/red/south, +/area/almayer/shipboard/brig/general_equipment) "fyD" = ( /obj/structure/machinery/light, /obj/structure/ladder/multiz, /turf/open/floor/almayer/plating, /area/almayer/living/briefing) -"fyI" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = -25 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/warden_office) "fyT" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -54469,9 +57642,15 @@ /turf/open/floor/almayer/plate, /area/almayer/living/offices/flight) "fAr" = ( -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/armory) +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) "fBo" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F"; @@ -54823,18 +58002,12 @@ /turf/open/floor/plating, /area/almayer/living/cryo_cells) "fJT" = ( -/obj/structure/surface/rack, -/obj/item/reagent_container/glass/bucket{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/reagent_container/glass/bucket{ - pixel_x = -4 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 }, -/obj/item/seeds/wheatseed, -/obj/item/seeds/wheatseed, -/turf/open/floor/almayer/green/southeast, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/almayer/red/southwest, +/area/almayer/shipboard/brig/yard) "fJV" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/largecrate/random/barrel/true_random, @@ -54847,11 +58020,11 @@ /turf/open/floor/almayer/aicore/no_build/ai_floor2, /area/almayer/command/airoom) "fKi" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 4 +/obj/structure/bed/chair{ + dir = 8 }, -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/visitation) "fKt" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /obj/structure/prop/dam/crane{ @@ -54867,22 +58040,12 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) "fKw" = ( -/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 5"; - name = "\improper Courtyard Divider" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/item/device/radio/listening_bug/radio_linked/fax/uscm_pvst{ + nametag = "Interrogation" }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/cells) +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/interrogation) "fKT" = ( /obj/structure/machinery/vending/coffee, /obj/structure/sign/safety/coffee{ @@ -54970,10 +58133,11 @@ /turf/open/floor/almayer/plate, /area/almayer/engineering/lower) "fLF" = ( -/obj/structure/machinery/brig_cell/perma_2{ - pixel_x = -32 +/obj/structure/filingcabinet/documentation/military_police{ + pixel_y = 24; + density = 0 }, -/turf/open/floor/almayer, +/turf/open/floor/almayer/red/northwest, /area/almayer/shipboard/brig/perma) "fMe" = ( /obj/structure/surface/table/almayer, @@ -55237,15 +58401,6 @@ }, /turf/open/floor/almayer, /area/almayer/command/lifeboat) -"fRS" = ( -/obj/effect/landmark/start/warden, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/landmark/late_join/warden, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cryo) "fSl" = ( /obj/structure/machinery/line_nexter{ id = "line2"; @@ -55277,12 +58432,13 @@ /turf/open/floor/almayer, /area/almayer/hallways/hangar) "fTt" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/machinery/door/window/brigdoor/southright{ + id = "Cell 1"; + name = "Cell 1"; + dir = 8 }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/processing) +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/cells) "fTF" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 2; @@ -55506,13 +58662,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/stern) -"fZX" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 2.5 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/execution) "fZZ" = ( /obj/effect/landmark/start/marine/medic/bravo, /obj/effect/landmark/late_join/bravo, @@ -55528,8 +58677,8 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/living/briefing) "gaJ" = ( -/turf/closed/wall/almayer, -/area/almayer/shipboard/brig/cryo) +/turf/closed/wall/almayer/outer/internal, +/area/almayer/shipboard/brig/general_equipment) "gaQ" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -55593,9 +58742,6 @@ }, /turf/open/floor/almayer/orange/north, /area/almayer/engineering/upper_engineering/starboard) -"gbw" = ( -/turf/open/floor/almayer/red/northeast, -/area/almayer/shipboard/brig/processing) "gbQ" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F" @@ -55631,12 +58777,16 @@ /turf/open/floor/almayer/red/north, /area/almayer/hallways/hangar) "gdG" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 +/obj/structure/machinery/cryopod{ + dir = 1 }, -/turf/open/floor/almayer/red/northeast, -/area/almayer/shipboard/brig/mp_bunks) +/obj/structure/platform/metal/almayer_smooth/north, +/obj/structure/platform/metal/almayer_smooth/east, +/obj/structure/platform_decoration/metal/almayer_smooth/northeast{ + layer = 3.01 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/shipboard/brig/cryo) "gdJ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -55668,16 +58818,6 @@ "geu" = ( /turf/open/floor/almayer/flooredge/west, /area/almayer/hallways/upper/fore_hallway) -"gfd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/power/apc/almayer/south, -/turf/open/floor/almayer/red, -/area/almayer/shipboard/brig/starboard_hallway) "gfq" = ( /obj/structure/closet/secure_closet/fridge/groceries, /turf/open/floor/almayer/plate, @@ -55747,13 +58887,6 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/engineering/airmix) -"ggS" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/bed/chair/bolted, -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/perma) "ggX" = ( /obj/structure/cargo_container/uscm/mid, /turf/open/floor/almayer/no_build, @@ -55784,12 +58917,6 @@ "ghF" = ( /turf/open/floor/almayer, /area/almayer/hallways/lower/vehiclehangar) -"gii" = ( -/obj/structure/bed/chair/bolted{ - dir = 8 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/shipboard/brig/interrogation) "gio" = ( /obj/structure/closet/emcloset, /obj/structure/sign/safety/restrictedarea{ @@ -55922,14 +59049,21 @@ /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) "glG" = ( -/obj/structure/surface/rack, -/obj/item/storage/box/gloves{ - pixel_x = 3; - pixel_y = 3 +/obj/structure/surface/table/almayer, +/obj/item/device/flashlight/lamp{ + layer = 3.1; + pixel_x = 6; + pixel_y = 10 }, -/obj/item/storage/box/masks, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/shipboard/brig/medical) +/obj/item/book/manual/marine_law{ + pixel_x = -4; + pixel_y = 1 + }, +/obj/structure/machinery/recharger{ + pixel_y = -16 + }, +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/processing) "glH" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ dir = 2; @@ -55942,10 +59076,11 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/engineering/lower/workshop) "glP" = ( +/obj/structure/machinery/light/small, +/obj/effect/decal/cleanable/dirt, /obj/structure/janitorialcart, -/obj/item/tool/mop, /turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/execution_storage) +/area/almayer/shipboard/brig/perma) "glT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/largecrate/random/barrel/true_random, @@ -56320,12 +59455,10 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_f_s) "gtU" = ( -/obj/structure/machinery/power/apc/almayer/west, -/obj/structure/sign/safety/rewire{ - pixel_x = -17; - pixel_y = 17 +/obj/structure/pipes/vents/pump{ + dir = 4 }, -/turf/open/floor/almayer/red/west, +/turf/open/floor/almayer, /area/almayer/shipboard/brig/perma) "guo" = ( /obj/effect/decal/warning_stripes{ @@ -56410,11 +59543,8 @@ /turf/open/floor/almayer/blue/north, /area/almayer/hallways/upper/fore_hallway) "gwj" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/turf/open/floor/almayer/red, -/area/almayer/shipboard/brig/processing) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/visitation) "gwn" = ( /obj/structure/machinery/ares/processor/bioscan, /turf/open/floor/almayer/no_build/test_floor4, @@ -56423,6 +59553,10 @@ /obj/effect/decal/warning_stripes{ icon_state = "SE-out" }, +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; + dir = 1 + }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/p_bow) "gww" = ( @@ -56495,12 +59629,6 @@ "gxn" = ( /turf/open/floor/almayer/red/west, /area/almayer/hallways/upper/starboard) -"gxt" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - name = "\improper Warden's Office" - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/warden_office) "gxI" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/maint/hull/upper/s_bow) @@ -56540,8 +59668,10 @@ /turf/open/floor/wood/ship, /area/almayer/living/numbertwobunks) "gym" = ( -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/mp_bunks) +/obj/structure/machinery/cryopod, +/obj/structure/platform/metal/almayer_smooth/west, +/turf/open/floor/almayer/cargo, +/area/almayer/shipboard/brig/cryo) "gyw" = ( /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/port_aft_hallway) @@ -56766,18 +59896,11 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/stair_clone/lower/port_fore) "gDt" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/crew/alt{ +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/transmitter/rotary/no_dnd{ - name = "Brig Cells Telephone"; - phone_category = "MP Dept."; - phone_id = "Brig Cells"; - pixel_x = 16 - }, -/turf/open/floor/almayer/red/southwest, -/area/almayer/shipboard/brig/processing) +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/yard) "gDH" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -56938,10 +60061,6 @@ /obj/structure/machinery/door/airlock/almayer/marine/delta/tl, /turf/open/floor/almayer/test_floor4, /area/almayer/squads/delta) -"gHt" = ( -/obj/structure/bed/chair/bolted, -/turf/open/floor/almayer/red/northwest, -/area/almayer/shipboard/brig/processing) "gHZ" = ( /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/hangar) @@ -56983,27 +60102,25 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/engineering/upper_engineering/port) "gIO" = ( -/obj/structure/bed/chair/bolted{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/interrogation) -"gIU" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/tapes{ - pixel_x = 7; - pixel_y = 6 +/obj/structure/surface/table/woodentable/fancy, +/obj/item/device/flashlight/lamp{ + pixel_x = 3; + pixel_y = 1 }, -/obj/item/storage/box/tapes{ - pixel_x = -6; - pixel_y = 6 +/obj/item/coin/silver{ + desc = "A small coin, bearing the falling falcons insignia."; + name = "falling falcons challenge coin" }, -/obj/item/storage/box/tapes{ - pixel_x = 1; - pixel_y = 1 +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/chief_mp_office) +"gIU" = ( +/obj/structure/closet/secure_closet/brig, +/obj/structure/sign/safety/three{ + pixel_x = 15; + pixel_y = -27 }, -/turf/open/floor/almayer/cargo, -/area/almayer/shipboard/brig/evidence_storage) +/turf/open/floor/almayer/red/south, +/area/almayer/shipboard/brig) "gJf" = ( /obj/structure/bed/sofa/south/grey/left{ pixel_y = 12 @@ -57035,20 +60152,6 @@ }, /turf/open/floor/almayer/green/west, /area/almayer/hallways/upper/fore_hallway) -"gJE" = ( -/obj/structure/machinery/door_control{ - id = "Interrogation Shutters"; - name = "\improper Shutters"; - pixel_x = 24; - pixel_y = 12; - req_access_txt = "3" - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, -/turf/open/floor/almayer/red/northeast, -/area/almayer/shipboard/brig/interrogation) "gJF" = ( /turf/closed/wall/almayer/outer, /area/almayer/maint/hull/upper/s_stern) @@ -57255,7 +60358,6 @@ /obj/structure/sign/safety/maint{ pixel_x = -17 }, -/obj/structure/machinery/power/apc/almayer/south, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/s_bow) "gNo" = ( @@ -57474,11 +60576,23 @@ /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_s) "gSz" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 +/obj/structure/machinery/cryopod, +/obj/structure/platform/metal/almayer_smooth/west, +/obj/structure/sign/safety/stairs{ + pixel_y = -7; + pixel_x = -17 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/mp_bunks) +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = 16 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice4"; + pixel_x = -16; + pixel_y = 16 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/shipboard/brig/cryo) "gSH" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/almayer/plate, @@ -57537,13 +60651,6 @@ /obj/structure/machinery/portable_atmospherics/hydroponics, /turf/open/floor/almayer/green, /area/almayer/living/grunt_rnr) -"gUg" = ( -/obj/structure/machinery/vending/coffee, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/general_equipment) "gUi" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -57750,12 +60857,6 @@ /obj/item/paper_bin/uscm, /turf/open/floor/almayer/no_build/plate, /area/almayer/living/offices/flight) -"gYx" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/shipboard/brig/starboard_hallway) "gYU" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F"; @@ -57861,14 +60962,6 @@ /obj/item/storage/fancy/cigar/tarbacktube, /turf/open/floor/carpet, /area/almayer/living/pilotbunks) -"haY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/redcorner, -/area/almayer/shipboard/brig/starboard_hallway) "hbl" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -57969,16 +61062,6 @@ "hdP" = ( /turf/open/floor/almayer/red/southwest, /area/almayer/hallways/upper/aft_hallway) -"hdQ" = ( -/obj/structure/closet/secure_closet{ - name = "\improper Execution Firearms" - }, -/obj/item/weapon/gun/rifle/m4ra, -/obj/item/weapon/gun/rifle/m4ra, -/obj/item/weapon/gun/rifle/m4ra, -/obj/item/ammo_box/magazine/m4ra, -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/execution_storage) "hdT" = ( /turf/open/floor/almayer/plating_striped/north, /area/almayer/underdeck/req) @@ -57993,23 +61076,16 @@ /turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/medical_science) "heo" = ( -/obj/structure/machinery/power/apc/almayer/north{ - cell_type = /obj/item/cell/hyper - }, -/obj/structure/sign/safety/rewire{ - pixel_x = -15; - pixel_y = 25 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 2 +/obj/structure/machinery/power/apc/almayer/north, +/obj/structure/machinery/photocopier{ + anchored = 0 }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -2 +/obj/structure/sign/calendar/ua{ + pixel_x = -27 }, -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/armory) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) "heK" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1; @@ -58238,11 +61314,11 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/living/grunt_rnr) "hjM" = ( -/obj/structure/bed/chair/bolted{ - dir = 8 - }, -/turf/open/floor/almayer/redcorner/east, -/area/almayer/shipboard/brig/processing) +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/vents/scrubber, +/obj/structure/machinery/camera/autoname/almayer/brig, +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig/yard) "hjQ" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -58293,22 +61369,18 @@ /area/almayer/command/cic) "hkH" = ( /obj/structure/surface/table/almayer, -/obj/structure/machinery/recharger, -/obj/structure/machinery/door_control{ - id = "courtyard_cells"; - name = "\improper Courtyard Lockdown Shutters"; - pixel_x = 16; - req_access_txt = "3" +/obj/item/paper_bin/uscm{ + pixel_y = 7; + pixel_x = -3 }, -/obj/structure/machinery/door_control{ - id = "Brig Lockdown Shutters"; - name = "Brig Lockdown Shutters"; - pixel_x = 16; - pixel_y = 8; - req_access_txt = "3" +/obj/item/tool/pen{ + pixel_x = -4 }, -/turf/open/floor/almayer/red, -/area/almayer/shipboard/brig/processing) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/yard) "hkX" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/device/flashlight/lamp/green{ @@ -58356,20 +61428,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/engineering/lower) -"hlI" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/recharger, -/obj/structure/transmitter/rotary{ - name = "Brig Wardens's Office Telephone"; - phone_category = "MP Dept."; - phone_id = "Brig Warden's Office"; - pixel_x = 15 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer/red/northwest, -/area/almayer/shipboard/brig/warden_office) "hlT" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -58470,17 +61528,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) -"hmZ" = ( -/obj/structure/largecrate/random/barrel/white, -/obj/structure/sign/safety/security{ - pixel_x = 15; - pixel_y = 25 - }, -/obj/structure/sign/safety/restrictedarea{ - pixel_y = 25 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/p_bow) "hng" = ( /obj/structure/machinery/photocopier{ layer = 2.9; @@ -58499,19 +61546,6 @@ /obj/structure/surface/table/woodentable/poor, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_a_p) -"hnE" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/ids{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/device/flash, -/obj/structure/machinery/light{ - dir = 8; - invisibility = 101 - }, -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/starboard_hallway) "hoc" = ( /obj/structure/machinery/door/poddoor/railing{ dir = 2; @@ -58529,21 +61563,19 @@ /turf/open/floor/almayer/no_build, /area/almayer/underdeck/vehicle) "hoK" = ( -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/starboard_hallway) +/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ + dir = 2; + name = "\improper Brig Equipment" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig) "hoT" = ( /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_m_s) -"hoW" = ( -/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/sterile_green_side/north, -/area/almayer/shipboard/brig/medical) "hpk" = ( /obj/structure/sign/safety/maint{ pixel_x = 8; @@ -58658,12 +61690,27 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_s) "hsj" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + name = "\improper Brig Visitation"; + id = "visitationdoor"; + id_tag = "visitationdoor" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 8 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "visitationprivacy"; + name = "\improper Privacy Shutters" + }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/machinery/power/apc/almayer/south, -/turf/open/floor/almayer/red, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/visitation) "hsr" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/starboard) @@ -58951,14 +61998,6 @@ }, /turf/open/floor/almayer/silver/north, /area/almayer/hallways/upper/midship_hallway) -"hyV" = ( -/obj/structure/machinery/power/apc/almayer/east, -/obj/structure/sign/safety/rewire{ - pixel_x = 32; - pixel_y = 24 - }, -/turf/open/floor/almayer/red/east, -/area/almayer/shipboard/brig/interrogation) "hza" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -58993,14 +62032,15 @@ /turf/open/floor/almayer/cargo, /area/almayer/squads/delta) "hzG" = ( +/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, -/area/almayer/shipboard/brig/starboard_hallway) +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig) "hzN" = ( /turf/open/floor/almayer/blue/southeast, /area/almayer/command/cicconference) @@ -59012,10 +62052,6 @@ /obj/structure/platform/metal/almayer/west, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) -"hAf" = ( -/obj/structure/machinery/iv_drip, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/shipboard/brig/medical) "hAh" = ( /turf/closed/wall/almayer/outer, /area/almayer/hallways/lower/port_umbilical) @@ -59101,11 +62137,9 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) "hCV" = ( -/obj/structure/toilet{ - dir = 8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/perma) +/obj/structure/machinery/brig_cell/cell_6, +/turf/closed/wall/almayer/reinforced, +/area/almayer/shipboard/brig/cells) "hCY" = ( /obj/structure/platform/metal/almayer/north, /turf/open/floor/almayer, @@ -59469,11 +62503,23 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/engineering/lower/engine_core) "hNY" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + name = "\improper Visitation Observation"; + closeOtherId = "visitation" }, -/turf/open/floor/almayer/red/north, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 8 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "visitationprivacy"; + name = "\improper Privacy Shutters" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/visitation) "hOd" = ( /turf/open/floor/almayer/blue/north, /area/almayer/hallways/upper/fore_hallway) @@ -59615,8 +62661,13 @@ /turf/open/floor/wood/ship, /area/almayer/living/numbertwobunks) "hRu" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice4"; + pixel_x = 16; + pixel_y = -16 + }, /turf/closed/wall/almayer/outer, -/area/almayer/shipboard/brig/execution_storage) +/area/almayer/shipboard/brig/perma) "hRw" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -59718,13 +62769,6 @@ }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) -"hTt" = ( -/obj/structure/machinery/brig_cell/cell_1{ - pixel_x = 32; - pixel_y = -32 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/processing) "hTF" = ( /obj/structure/machinery/suit_storage_unit/compression_suit/uscm{ isopen = 1; @@ -59778,11 +62822,42 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_m_s) "hUh" = ( -/obj/structure/machinery/medical_pod/bodyscanner{ - dir = 8 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/secure_data{ + dir = 8; + pixel_y = -9 }, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/shipboard/brig/medical) +/obj/structure/machinery/computer/sentencing{ + dir = 8; + pixel_y = -24 + }, +/obj/structure/machinery/computer/cameras/almayer_network{ + dir = 8; + pixel_y = -43 + }, +/obj/structure/machinery/door_control{ + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutters"; + pixel_x = -2; + req_access_txt = "3"; + pixel_y = 9 + }, +/obj/structure/machinery/door_control{ + id = "Brig Lockdown Shutters"; + name = "Brig Lockdown Shutters"; + pixel_x = -2; + pixel_y = 16; + req_access_txt = "3" + }, +/obj/structure/machinery/door_control{ + id = "Cell Privacy Shutters"; + name = "Cell Privacy Shutters"; + pixel_x = -2; + pixel_y = 23; + req_access = list(3) + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/processing) "hUk" = ( /turf/open/floor/almayer/orange/southwest, /area/almayer/engineering/lower/engine_core) @@ -59810,23 +62885,18 @@ /turf/open/floor/almayer/plate, /area/almayer/living/starboard_emb) "hUU" = ( -/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/prop/invuln/lattice_prop{ + icon_state = "lattice8"; + pixel_x = 16; + pixel_y = 16 }, -/obj/structure/machinery/power/apc/almayer/east, -/obj/structure/sign/safety/rewire{ - pixel_x = 32; - pixel_y = 17 +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = 16 }, +/obj/structure/machinery/computer/cameras/wooden_tv/broadcast/wheeled, /turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/execution_storage) +/area/almayer/shipboard/brig/perma) "hUW" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -59932,11 +63002,11 @@ pixel_x = 5; pixel_y = 2 }, -/obj/item/tool/kitchen/utensil/pfork{ +/obj/item/tool/kitchen/utensil/fork/plastic{ pixel_x = -8; pixel_y = 7 }, -/obj/item/tool/kitchen/utensil/pfork{ +/obj/item/tool/kitchen/utensil/fork/plastic{ pixel_x = -7; pixel_y = 8 }, @@ -59955,9 +63025,6 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 }, -/obj/structure/machinery/light{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, @@ -60068,14 +63135,6 @@ }, /turf/open/floor/almayer/red/northwest, /area/almayer/hallways/upper/starboard) -"hZJ" = ( -/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/test_floor4, -/area/almayer/shipboard/brig/processing) "hZN" = ( /obj/structure/bed/roller/hospital_empty/bigrollerempty{ dir = 4 @@ -60181,15 +63240,12 @@ /turf/open/floor/almayer/orange/west, /area/almayer/hallways/hangar) "icM" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/vending/snack{ - density = 0; - pixel_y = 16 +/obj/structure/machinery/light{ + dir = 4; + invisibility = 00 }, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) +/area/almayer/shipboard/brig/yard) "icQ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -60199,10 +63255,6 @@ }, /turf/open/floor/almayer/blue/east, /area/almayer/hallways/upper/fore_hallway) -"icZ" = ( -/obj/structure/closet/secure_closet/brig, -/turf/open/floor/almayer/redcorner/west, -/area/almayer/shipboard/brig/processing) "idx" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -60344,11 +63396,12 @@ /turf/open/floor/almayer/red/north, /area/almayer/lifeboat_pumps/north1) "ifz" = ( -/obj/structure/machinery/keycard_auth{ - pixel_x = 25 +/obj/structure/window/reinforced/toughened{ + dir = 4 }, -/turf/open/floor/almayer/red/east, -/area/almayer/shipboard/brig/warden_office) +/obj/structure/surface/table/reinforced/almayer_B, +/turf/open/floor/almayer/red/south, +/area/almayer/shipboard/brig/visitation) "ifW" = ( /obj/structure/largecrate/random, /obj/structure/largecrate/random{ @@ -60699,12 +63752,20 @@ /turf/closed/wall/almayer, /area/almayer/command/securestorage) "ioV" = ( -/obj/structure/machinery/power/apc/almayer/south, -/obj/structure/sign/safety/rewire{ - pixel_y = -38 +/obj/effect/decal/cleanable/dirt, +/obj/structure/filingcabinet{ + pixel_x = 8; + pixel_y = 19; + can_block_movement = 0 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/general_equipment) +/obj/structure/machinery/power/apc/almayer/east, +/obj/structure/filingcabinet/documentation/uscm_mp{ + pixel_x = -8; + pixel_y = 19; + can_block_movement = 0 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/shipboard/brig/evidence_storage) "ipa" = ( /obj/effect/decal/cleanable/generic, /obj/effect/decal/warning_stripes{ @@ -60790,12 +63851,11 @@ /turf/open/floor/almayer/orange/east, /area/almayer/engineering/upper_engineering/port) "iqR" = ( -/obj/structure/sign/safety/cryo{ - pixel_x = -16 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 }, -/obj/structure/machinery/cryopod, -/turf/open/floor/almayer/cargo, -/area/almayer/shipboard/brig/cryo) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/general_equipment) "irr" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/clothing/accessory/device/whistle{ @@ -60987,18 +64047,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/squads/req) -"iwV" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 8; - id = "bot_armory"; - name = "\improper Armory Shutters" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 8 - }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/armory) "iwW" = ( /obj/structure/bed/chair/comfy/beige, /turf/open/floor/carpet, @@ -61127,8 +64175,11 @@ /turf/open/floor/almayer/plate, /area/almayer/living/offices/cryo) "iAg" = ( -/turf/open/floor/almayer/redcorner/east, -/area/almayer/shipboard/brig/mp_bunks) +/obj/effect/landmark/start/police, +/obj/effect/landmark/late_join/police, +/obj/structure/platform_decoration/metal/almayer_smooth/west, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cryo) "iAw" = ( /obj/item/tool/warning_cone{ pixel_x = -12 @@ -61156,13 +64207,16 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_a_s) "iBl" = ( -/obj/structure/machinery/power/apc/almayer/east, -/obj/structure/sign/safety/rewire{ - pixel_x = 7; - pixel_y = -25 +/obj/structure/machinery/vending/cigarette/koorlander{ + pixel_x = 17; + can_block_movement = 0 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/turf/open/floor/almayer/red/southeast, +/area/almayer/shipboard/brig/interrogation) "iBu" = ( /obj/structure/sign/safety/storage{ pixel_x = -17 @@ -61287,13 +64341,13 @@ /turf/open/floor/almayer/plate, /area/almayer/engineering/lower/engine_core) "iEx" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = 26 +/obj/item/device/radio/listening_bug/radio_linked/fax/uscm_pvst{ + nametag = "Foyer 1" }, -/obj/structure/reagent_dispensers/forensictank{ - pixel_y = 41 +/obj/structure/pipes/vents/scrubber{ + dir = 4 }, -/turf/open/floor/almayer/red/north, +/turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) "iEz" = ( /obj/structure/machinery/light, @@ -61313,9 +64367,11 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/starboard_midship_hallway) "iFc" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/cells) +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/yard) "iFn" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer/plate, @@ -61346,11 +64402,9 @@ /turf/open/floor/almayer, /area/almayer/living/offices) "iFK" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/shipboard/brig/starboard_hallway) +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig) "iFM" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -61394,11 +64448,16 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/notunnel) "iHG" = ( -/obj/structure/machinery/cryopod{ - pixel_y = 6 +/obj/structure/desertdam/decals/road_edge{ + pixel_x = -12 }, -/turf/open/floor/almayer/cargo, -/area/almayer/shipboard/brig/cells) +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/scoreboard_button{ + id = "prisonbball"; + pixel_x = -22 + }, +/turf/open/floor/almayer/plating, +/area/almayer/shipboard/brig/yard) "iHY" = ( /obj/structure/cargo_container/hybrisa/containersextended/greenright{ pixel_y = 9 @@ -61631,14 +64690,14 @@ /turf/open/floor/almayer/sterile_green_corner, /area/almayer/medical/operating_room_two) "iNh" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ - name = "\improper Brig Cells" +/obj/structure/bed, +/obj/item/bedsheet/brown, +/obj/structure/machinery/flasher{ + id = "Cell 5"; + pixel_x = -24 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/starboard_hallway) +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/cells) "iNk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -61698,11 +64757,29 @@ /turf/open/floor/almayer, /area/almayer/hallways/lower/port_midship_hallway) "iOD" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" +/obj/item/toy/beach_ball/holoball, +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal5"; + pixel_x = -16; + pixel_y = 16 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal6"; + pixel_x = 16; + pixel_y = 16 + }, +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal7"; + pixel_x = 16; + pixel_y = -16 + }, +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal8"; + pixel_x = -16; + pixel_y = -16 + }, +/turf/open/floor/almayer/plating, +/area/almayer/shipboard/brig/yard) "iOX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -61767,15 +64844,14 @@ /turf/open/floor/almayer/cargo, /area/almayer/squads/alpha) "iQd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/bed/chair/comfy/orange{ dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/perma) +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/yard) "iQi" = ( /obj/structure/disposalpipe/junction, /obj/structure/pipes/standard/simple/hidden/supply, @@ -61824,22 +64900,14 @@ /turf/open/floor/almayer/emerald/northwest, /area/almayer/living/port_emb) "iQB" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/card{ - dir = 4; - layer = 3.2; - pixel_y = 4 - }, /obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/machinery/computer/secure_data{ - dir = 4; - layer = 2.99; - pixel_y = 23 + dir = 1; + pixel_x = 16 }, -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/processing) +/obj/structure/pipes/vents/pump, +/obj/structure/machinery/computer/arcade, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/yard) "iQJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -61864,14 +64932,16 @@ /turf/open/floor/almayer/plating_striped/south, /area/almayer/underdeck/req) "iRp" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 8; - id = "Interrogation Shutters"; - name = "\improper Privacy Shutters" +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + layer = 2.5 }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/interrogation) +/obj/structure/machinery/door/airlock/almayer/generic{ + id = "Delta_1"; + name = "\improper Bathroom" + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/chief_mp_office) "iRy" = ( /obj/structure/pipes/vents/pump/on, /turf/open/floor/almayer, @@ -62012,8 +65082,9 @@ /turf/open/floor/almayer/red/north, /area/almayer/command/lifeboat) "iTl" = ( -/turf/open/floor/almayer/red/southwest, -/area/almayer/shipboard/brig/processing) +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/visitation) "iTq" = ( /obj/structure/curtain/red, /turf/open/floor/plating/plating_catwalk, @@ -62090,13 +65161,6 @@ }, /turf/open/floor/almayer/orange, /area/almayer/engineering/lower) -"iUG" = ( -/obj/structure/closet/secure_closet/surgical{ - pixel_x = -30 - }, -/obj/structure/machinery/power/apc/almayer/south, -/turf/open/floor/almayer/sterile_green_corner/west, -/area/almayer/shipboard/brig/medical) "iUJ" = ( /obj/structure/platform/metal/almayer/north, /obj/structure/largecrate/random/case, @@ -62110,19 +65174,15 @@ /turf/open/floor/almayer/orange/west, /area/almayer/engineering/upper_engineering/starboard) "iUX" = ( -/obj/structure/filingcabinet{ - density = 0; - pixel_x = -8; - pixel_y = 18 - }, -/obj/structure/filingcabinet{ - density = 0; - pixel_x = 8; - pixel_y = 18 +/obj/item/book/manual/marine_law, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/detective, +/obj/structure/bookcase, +/obj/structure/machinery/light{ + dir = 1 }, -/obj/item/device/taperecorder, -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/interrogation) +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) "iVd" = ( /obj/structure/platform/metal/almayer, /obj/effect/decal/cleanable/dirt, @@ -62154,18 +65214,6 @@ }, /turf/open/floor/almayer/cargo, /area/almayer/engineering/starboard_atmos) -"iVD" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - closeOtherId = "brigmaint_n"; - dir = 1; - name = "\improper Brig" - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "Brig Lockdown Shutters"; - name = "\improper Brig Lockdown Shutter" - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/maint/hull/upper/s_bow) "iVG" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F"; @@ -62174,14 +65222,6 @@ /obj/structure/closet/firecloset, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/p_bow) -"iVP" = ( -/obj/structure/sign/safety/restrictedarea{ - pixel_x = -17; - pixel_y = 7 - }, -/obj/structure/machinery/cm_vending/sorted/marine_food, -/turf/open/floor/almayer/red/southwest, -/area/almayer/shipboard/brig/processing) "iWa" = ( /obj/structure/sign/safety/water{ pixel_x = 8; @@ -62366,10 +65406,8 @@ /turf/open/floor/almayer, /area/almayer/command/lifeboat) "iZU" = ( -/obj/effect/decal/cleanable/blood/oil/streak, -/obj/structure/disposalpipe/segment, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/prison/kitchen, +/area/almayer/shipboard/brig/yard) "iZV" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/carpet, @@ -62515,9 +65553,24 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/weapon_room) "jcf" = ( -/obj/structure/window/framed/almayer, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/processing) +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_x = -28 + }, +/obj/structure/sign/safety/intercom{ + pixel_y = -25 + }, +/obj/structure/sign/safety/medical{ + pixel_x = 15; + pixel_y = -25 + }, +/turf/open/floor/almayer/silver/southwest, +/area/almayer/shipboard/brig/lobby) "jcu" = ( /turf/open/floor/almayer/no_build, /area/almayer/maint/hull/lower/stairs) @@ -62624,11 +65677,16 @@ /turf/open/floor/almayer/red/southeast, /area/almayer/living/cryo_cells) "jeR" = ( -/obj/structure/machinery/light{ - dir = 4 +/obj/structure/machinery/door_control{ + pixel_x = -25; + pixel_y = -8; + name = "Warden's Quarters"; + id = "wardenprivacy"; + req_access = list(3) }, -/obj/structure/bed/chair/bolted, -/turf/open/floor/almayer/plate, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/red/west, /area/almayer/shipboard/brig/perma) "jfS" = ( /obj/structure/prop/invuln/overhead_pipe{ @@ -62638,17 +65696,20 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_p) "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"; +/obj/structure/transmitter/no_dnd{ + dir = 4; + pixel_x = -17; phone_category = "MP Dept."; - phone_id = "Brig CMP's Office"; - pixel_x = 15 + phone_id = "Visitation Waiting Room"; + name = "Visitation Waiting Room Telephone"; + pixel_y = 10 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/structure/sign/safety/commline_connection{ + pixel_x = -17; + pixel_y = -7 + }, +/turf/open/floor/almayer/silver/west, +/area/almayer/shipboard/brig/visitation_waiting) "jfZ" = ( /obj/structure/target{ name = "punching bag" @@ -62723,35 +65784,16 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/maint/hull/lower/l_m_s) "jgR" = ( -/obj/structure/sign/safety/rewire{ - pixel_y = 25 - }, -/obj/item/bedsheet/brown{ - layer = 3.1 - }, -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 - }, -/obj/structure/bed{ - can_buckle = 0 - }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 - }, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 - }, -/obj/item/bedsheet/brown{ - pixel_y = 13 +/obj/effect/landmark/start/warden, +/obj/effect/landmark/late_join/warden, +/obj/structure/platform/metal/almayer_smooth/north, +/obj/structure/platform/metal/almayer_smooth/east, +/obj/structure/platform_decoration/metal/almayer_smooth/northeast{ + layer = 3.01 }, -/turf/open/floor/almayer/red/northeast, -/area/almayer/shipboard/brig/mp_bunks) +/obj/structure/machinery/camera/autoname/almayer, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cryo) "jgW" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -62797,21 +65839,15 @@ /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) "jhI" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/secure_data{ - dir = 4; - layer = 2.99; - pixel_y = 19 - }, -/obj/structure/machinery/computer/cameras/almayer_brig{ - desc = "Used to access the various cameras in the security brig."; +/obj/structure/machinery/computer/cameras/wooden_tv/broadcast{ dir = 4; - layer = 2.99; - name = "brig cameras console"; - pixel_y = 5 + layer = 3.2; + pixel_x = -20; + pixel_y = 1; + name = "Wall-Mounted Television Set" }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer/silver/west, +/area/almayer/shipboard/brig/visitation_waiting) "jhK" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/almayer/plate, @@ -62844,13 +65880,17 @@ /turf/open/floor/almayer/cargo, /area/almayer/living/bridgebunks) "jic" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/surface/table/almayer, +/obj/item/device/binoculars{ + pixel_y = -8; + pixel_x = -6 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/item/desk_bell{ + anchored = 1; + pixel_x = 5; + pixel_y = 9 }, -/turf/open/floor/almayer/redcorner/north, +/turf/open/floor/almayer/silver/west, /area/almayer/shipboard/brig/lobby) "jiM" = ( /obj/structure/disposalpipe/segment{ @@ -62987,16 +66027,18 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/lower/port_fore_hallway) "jlE" = ( -/obj/structure/machinery/light{ - dir = 1 +/obj/effect/landmark/start/police, +/obj/effect/landmark/late_join/police, +/obj/structure/platform/metal/almayer_smooth/north, +/obj/structure/sign/safety/cryo{ + pixel_y = 24 }, -/obj/structure/surface/table/almayer, -/obj/item/toy/deck/uno, -/obj/item/toy/deck{ - pixel_x = -9 +/obj/structure/sign/safety/security{ + pixel_y = 24; + pixel_x = 15 }, -/turf/open/floor/almayer/red/north, -/area/almayer/shipboard/brig/mp_bunks) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cryo) "jlN" = ( /obj/structure/platform_decoration/metal/almayer_smooth/east, /turf/open/floor/almayer/no_build/plate, @@ -63232,11 +66274,9 @@ /turf/open/floor/almayer/no_build/test_floor4, /area/almayer/command/airoom) "jqY" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/execution) +/obj/structure/machinery/brig_cell/perma_2, +/turf/closed/wall/almayer/reinforced, +/area/almayer/shipboard/brig/perma) "jqZ" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -63455,11 +66495,9 @@ /turf/open/floor/almayer/sterile_green_side/north, /area/almayer/medical/operating_room_four) "jvc" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/mp_bunks) +/obj/structure/platform_decoration/metal/almayer_smooth/east, +/turf/open/floor/almayer/red/northwest, +/area/almayer/shipboard/brig) "jvp" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -63495,7 +66533,7 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_s) "jvB" = ( -/obj/structure/closet/firecloset, +/obj/structure/largecrate/random, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/s_bow) "jvD" = ( @@ -63518,10 +66556,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) -"jvP" = ( -/obj/structure/machinery/power/apc/almayer/north, -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/cryo) "jvX" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -63553,9 +66587,15 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_f_p) "jwr" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer/red, -/area/almayer/shipboard/brig/starboard_hallway) +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 + }, +/obj/structure/sign/safety/stairs{ + pixel_y = -25 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig) "jwB" = ( /obj/structure/stairs{ icon_state = "ramptop" @@ -63624,8 +66664,9 @@ /turf/open/floor/almayer/orange/east, /area/almayer/hallways/lower/starboard_aft_hallway) "jyb" = ( -/turf/open/floor/almayer/red/southeast, -/area/almayer/shipboard/brig/processing) +/obj/structure/bed/roller/hospital_empty/bigrollerempty2, +/turf/open/floor/almayer/sterile_green_side/east, +/area/almayer/shipboard/brig/medical) "jyE" = ( /obj/structure/machinery/light, /turf/open/floor/wood/ship, @@ -63637,24 +66678,12 @@ /turf/open/floor/almayer/cargo, /area/almayer/hallways/hangar) "jyY" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "Brig Lockdown Shutters"; - name = "\improper Brig Lockdown Shutter" - }, -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - closeOtherId = "brigmaint_s"; - dir = 1; - name = "\improper Brig Maintenance" - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "perma_lockdown_2"; - name = "\improper Perma Lockdown Shutter" +/obj/structure/machinery/light/red{ + light_color = "#BB3F3F"; + dir = 4 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/p_bow) "jyZ" = ( /obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/almayer/no_build/test_floor4, @@ -63761,9 +66790,9 @@ /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/lower_medical_medbay) "jCX" = ( -/obj/structure/pipes/vents/scrubber, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/starboard_hallway) +/obj/structure/machinery/brig_cell/cell_5, +/turf/closed/wall/almayer/reinforced, +/area/almayer/shipboard/brig/cells) "jDk" = ( /obj/structure/machinery/light_construct{ dir = 4 @@ -63806,22 +66835,19 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_a_s) "jES" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/chief_mp_office) -"jEV" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper_bin{ - pixel_x = -7 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 }, -/obj/item/tool/pen, -/obj/item/tool/pen{ - pixel_y = 3 +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-y" }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/visitation_waiting) +"jEV" = ( +/obj/structure/platform/metal/almayer_smooth, /turf/open/floor/almayer/red/southwest, -/area/almayer/shipboard/brig/mp_bunks) +/area/almayer/shipboard/brig) "jFt" = ( /obj/structure/platform/metal/almayer_smooth/north, /obj/structure/platform/metal/almayer_smooth/west, @@ -63943,10 +66969,16 @@ /turf/open/floor/almayer/plate, /area/almayer/living/captain_mess) "jIT" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/faxmachine/uscm/almayer/brig/chief, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/machinery/firealarm{ + pixel_y = -24; + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/silver/south, +/area/almayer/shipboard/brig/visitation_waiting) "jIV" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -64223,11 +67255,8 @@ /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) "jPS" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/visitation) "jPU" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F"; @@ -64301,12 +67330,19 @@ /turf/open/floor/almayer/emerald/northwest, /area/almayer/squads/charlie) "jSw" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + closeOtherId = "brigmed"; + name = "\improper Brig Medical"; + id = "brigmedprivate" }, -/turf/open/floor/almayer/red, -/area/almayer/shipboard/brig/processing) +/obj/structure/machinery/door/firedoor/border_only/almayer{ + layer = 1.9 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/medical) "jSy" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -64395,10 +67431,13 @@ /turf/open/floor/almayer/emerald/north, /area/almayer/squads/charlie_delta_shared) "jTU" = ( -/obj/structure/bed, -/obj/item/bedsheet/red, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/warden_office) +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/almayer/red/southeast, +/area/almayer/shipboard/brig/visitation) "jUb" = ( /turf/open/floor/wood/ship, /area/almayer/living/bridgebunks) @@ -64452,8 +67491,13 @@ /turf/open/floor/almayer/silver, /area/almayer/shipboard/brig/cic_hallway) "jVa" = ( -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) +/obj/structure/machinery/vending/cola{ + pixel_x = -6; + pixel_y = 1; + wires = 13 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/yard) "jVg" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -64541,23 +67585,18 @@ /turf/open/floor/almayer/plate, /area/almayer/living/offices/cryo) "jXc" = ( -/obj/structure/sign/safety/maint{ - pixel_x = -17 - }, -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 4 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/sentencing{ + dir = 1; + pixel_y = -4 }, -/turf/open/floor/almayer/red/southwest, -/area/almayer/shipboard/brig/starboard_hallway) -"jXd" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/obj/structure/disposalpipe/junction{ +/obj/structure/machinery/computer/secure_data{ dir = 1; - icon_state = "pipe-y" + pixel_y = -4; + pixel_x = 20 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/processing) +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig) "jXf" = ( /obj/structure/bed/roller/hospital_empty/bigrollerempty3, /obj/structure/machinery/light{ @@ -64789,12 +67828,12 @@ /turf/open/floor/almayer/silver/west, /area/almayer/hallways/upper/midship_hallway) "kaQ" = ( -/obj/structure/disposalpipe/junction, -/obj/structure/pipes/standard/manifold/hidden/supply{ +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ dir = 4 }, -/turf/open/floor/almayer/red/east, -/area/almayer/shipboard/brig/starboard_hallway) +/turf/open/floor/almayer/red/northeast, +/area/almayer/shipboard/brig) "kbc" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -64932,15 +67971,13 @@ /turf/open/floor/almayer/plating_striped/south, /area/almayer/underdeck/req) "keG" = ( -/obj/structure/machinery/door/airlock/almayer/security{ - dir = 2; - name = "\improper Interrogation Observation" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/status_display{ + pixel_y = 30 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/interrogation) +/obj/structure/machinery/photocopier, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig) "keO" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "ARES StairsUpper"; @@ -64970,13 +68007,6 @@ }, /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_p) -"kfE" = ( -/obj/structure/bed/sofa/south/grey/right, -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 - }, -/turf/open/floor/almayer/silver/north, -/area/almayer/shipboard/brig/cic_hallway) "kfI" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -65135,12 +68165,12 @@ /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "kjk" = ( -/obj/structure/machinery/cryopod/right, -/obj/structure/sign/safety/cryo{ - pixel_x = 32 +/obj/structure/machinery/light{ + dir = 4 }, -/turf/open/floor/almayer/cargo, -/area/almayer/shipboard/brig/cryo) +/obj/structure/machinery/vending/security, +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/general_equipment) "kjw" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -65193,17 +68223,13 @@ /turf/open/floor/almayer/greenfull, /area/almayer/living/offices) "kkv" = ( -/obj/structure/toilet{ - dir = 8 - }, -/obj/structure/machinery/light/small, -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 }, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/silver/southeast, +/area/almayer/shipboard/brig/visitation_waiting) "kkx" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer/mono, @@ -65258,15 +68284,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_f_s) -"kmd" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) "kmp" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -65420,12 +68437,11 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_p) "kqd" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, -/turf/open/floor/almayer/red, -/area/almayer/shipboard/brig/mp_bunks) +/obj/effect/landmark/start/warrant, +/obj/effect/landmark/late_join/chief_police, +/obj/structure/platform/metal/almayer_smooth, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cryo) "kqm" = ( /obj/structure/platform/metal/almayer/west{ layer = 2.9 @@ -65469,18 +68485,6 @@ /obj/item/storage/box/drinkingglasses, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_s) -"kqC" = ( -/obj/structure/machinery/light/red{ - light_color = "#BB3F3F"; - dir = 4 - }, -/obj/structure/largecrate/random/barrel/green, -/obj/structure/sign/safety/maint{ - pixel_x = 15; - pixel_y = 25 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/s_bow) "kqK" = ( /obj/structure/machinery/conveyor{ dir = 8; @@ -65507,13 +68511,15 @@ /turf/open/floor/almayer/plate, /area/almayer/living/gym) "kry" = ( -/obj/structure/machinery/flasher{ - id = "Perma 1"; - pixel_y = 24 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/machinery/camera/autoname/almayer/brig, -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/perma) +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig) "krA" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -65539,10 +68545,12 @@ /turf/open/floor/almayer/plating/northeast, /area/almayer/squads/req) "krO" = ( -/obj/structure/machinery/cm_vending/sorted/medical, -/obj/structure/medical_supply_link, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/shipboard/brig/medical) +/obj/structure/machinery/light{ + dir = 4; + invisibility = 101 + }, +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/processing) "krS" = ( /obj/structure/machinery/camera/autoname/almayer{ name = "ship-grade camera" @@ -65578,19 +68586,12 @@ }, /turf/open/floor/almayer/green/north, /area/almayer/squads/req) -"ksg" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +"ksm" = ( +/obj/item/device/radio/listening_bug/radio_linked/fax/uscm_pvst{ + nametag = "Foyer 2" }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) -"ksm" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/starboard_hallway) "ksp" = ( /obj/structure/machinery/cryopod/right{ pixel_y = 6 @@ -65646,16 +68647,14 @@ /turf/open/floor/almayer/greencorner/east, /area/almayer/living/grunt_rnr) "kui" = ( -/obj/structure/sign/safety/hazard{ - pixel_y = 32 - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = 32 +/obj/structure/sign/prop2{ + pixel_y = 30; + pixel_x = -1 }, -/obj/structure/machinery/vending/security/riot, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/armory) +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) "kuk" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -65673,9 +68672,11 @@ /turf/open/floor/almayer/emeraldcorner/east, /area/almayer/living/briefing) "kuJ" = ( -/obj/structure/pipes/vents/scrubber, -/turf/open/floor/almayer/red/north, -/area/almayer/shipboard/brig/processing) +/obj/structure/bed/chair/wood/normal{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/yard) "kuK" = ( /obj/structure/machinery/power/apc/almayer/north, /obj/effect/decal/cleanable/dirt, @@ -65722,16 +68723,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/engineering/upper_engineering) -"kvL" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/cameras/almayer_network{ - dir = 4 - }, -/obj/structure/sign/safety/terminal{ - pixel_x = -17 - }, -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/warden_office) "kvU" = ( /obj/structure/surface/table/almayer, /turf/open/floor/plating/plating_catwalk, @@ -65819,8 +68810,21 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/squads/req) "kxP" = ( -/turf/open/floor/almayer/red/east, -/area/almayer/shipboard/brig/mp_bunks) +/obj/structure/machinery/cryopod{ + dir = 1 + }, +/obj/structure/platform/metal/almayer_smooth/east, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = 16 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice8"; + pixel_x = 16; + pixel_y = 16 + }, +/turf/open/floor/almayer/cargo, +/area/almayer/shipboard/brig/cryo) "kya" = ( /obj/structure/prop/invuln/overhead_pipe{ dir = 4; @@ -65915,12 +68919,17 @@ /turf/open/floor/almayer/plate, /area/almayer/command/computerlab) "kzr" = ( -/obj/structure/sign/safety/hazard{ - pixel_x = 32; - pixel_y = -8 +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + dir = 8; + name = "\improper Isolation Cell" }, -/turf/open/floor/almayer/cargo, -/area/almayer/shipboard/brig/execution) +/obj/structure/machinery/door/poddoor/almayer/locked{ + dir = 4; + id = "Perma 2"; + name = "\improper cell shutter" + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/perma) "kzs" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -66004,9 +69013,12 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_a_s) "kAL" = ( -/obj/structure/closet/secure_closet/brig, -/turf/open/floor/almayer/red, -/area/almayer/shipboard/brig/processing) +/obj/structure/machinery/vending/walkman{ + wires = 13 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/cargo, +/area/almayer/shipboard/brig/yard) "kBo" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -66067,11 +69079,23 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_a_s) "kCY" = ( -/obj/structure/machinery/sleep_console{ - dir = 8 +/obj/structure/surface/table/almayer, +/obj/item/paper_bin/uscm{ + pixel_y = 7; + pixel_x = -4 }, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/shipboard/brig/medical) +/obj/item/tool/pen{ + pixel_x = -5 + }, +/obj/structure/transmitter/rotary{ + name = "Brig Reception Telephone"; + phone_category = "MP Dept."; + phone_id = "Brig Reception"; + pixel_x = 9; + pixel_y = 6 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/processing) "kDd" = ( /obj/structure/sign/safety/water{ pixel_x = 8; @@ -66123,16 +69147,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) -"kEc" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/item/vehicle_clamp, -/obj/item/vehicle_clamp, -/obj/item/vehicle_clamp, -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/armory) "kEg" = ( /obj/structure/surface/table/almayer, /obj/item/toy/deck{ @@ -66155,13 +69169,6 @@ "kEp" = ( /turf/open/floor/almayer/plating_stripedcorner/west, /area/almayer/medical/upper_medical) -"kEq" = ( -/obj/structure/machinery/door/window/ultra{ - dir = 8; - req_access_txt = "3" - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/perma) "kEs" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp{ @@ -66228,15 +69235,13 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_f_p) "kGu" = ( -/obj/structure/machinery/cryopod{ - layer = 3.1; - pixel_y = 13 - }, -/obj/structure/machinery/status_display{ - pixel_x = -32 +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 }, -/turf/open/floor/almayer/cargo, -/area/almayer/shipboard/brig/cryo) +/obj/structure/pipes/vents/scrubber, +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig/general_equipment) "kGw" = ( /obj/structure/machinery/light, /turf/open/floor/almayer/plate, @@ -66269,18 +69274,12 @@ /turf/open/floor/almayer/green/southeast, /area/almayer/living/grunt_rnr) "kHo" = ( -/obj/item/device/camera{ - pixel_x = 4; - pixel_y = 8 - }, -/obj/structure/surface/table/almayer, -/obj/item/device/camera_film{ - pixel_x = 4; - pixel_y = -2 +/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/item/device/camera_film, -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/starboard_hallway) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig) "kHS" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 @@ -66488,15 +69487,16 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_s) "kMH" = ( -/obj/structure/machinery/door/window/brigdoor/southright{ - id = "Cell 1"; - name = "Cell 1" +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal3"; + pixel_y = 16 }, -/obj/structure/sign/safety/one{ - pixel_x = -17 +/obj/structure/desertdam/decals/road_edge{ + pixel_x = 16 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plating, +/area/almayer/shipboard/brig/yard) "kMK" = ( /obj/structure/prop/invuln{ desc = "An inflated membrane. This one is puncture proof. Wow!"; @@ -66798,12 +69798,12 @@ /turf/open/floor/almayer/plating/northeast, /area/almayer/squads/req) "kTp" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/card{ + pixel_x = -3 }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/medical) +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/processing) "kTv" = ( /obj/structure/machinery/disposal{ pixel_x = -6; @@ -66827,12 +69827,17 @@ /turf/open/floor/almayer/orangecorner, /area/almayer/engineering/ce_room) "kUg" = ( -/obj/structure/machinery/firealarm{ - dir = 4; - pixel_x = 21 +/obj/structure/window/reinforced/toughened{ + dir = 4 }, -/turf/open/floor/almayer/red/east, -/area/almayer/shipboard/brig/warden_office) +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/device/camera{ + pixel_x = 4; + pixel_y = 8 + }, +/obj/item/device/camera_film, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/visitation) "kUo" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, @@ -66853,7 +69858,7 @@ pixel_y = 10 }, /obj/structure/surface/table/almayer, -/obj/item/tool/kitchen/utensil/pfork{ +/obj/item/tool/kitchen/utensil/fork/plastic{ pixel_x = 9; pixel_y = 8 }, @@ -66884,16 +69889,6 @@ /obj/structure/bed/chair/comfy/black, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) -"kVZ" = ( -/obj/structure/machinery/door/window/brigdoor/southright{ - id = "Cell 2"; - name = "Cell 2" - }, -/obj/structure/sign/safety/two{ - pixel_x = -17 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) "kWk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -66981,11 +69976,11 @@ /turf/open/floor/almayer/no_build/plating, /area/almayer/underdeck/req) "kXt" = ( -/obj/structure/closet/fireaxecabinet{ - pixel_y = 32 +/obj/structure/machinery/door/firedoor/border_only/almayer{ + layer = 1.9 }, -/turf/open/floor/almayer/red/north, -/area/almayer/shipboard/brig/starboard_hallway) +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/processing) "kXu" = ( /turf/open/floor/almayer/silver/west, /area/almayer/command/computerlab) @@ -67039,12 +70034,6 @@ "kYL" = ( /turf/open/floor/almayer/plating_stripedcorner/west, /area/almayer/engineering/lower/engine_core) -"kYU" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/shipboard/brig/starboard_hallway) "kYV" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -67149,16 +70138,9 @@ /turf/open/floor/almayer/cargo, /area/almayer/squads/charlie) "lbs" = ( -/obj/structure/sign/safety/biolab{ - pixel_x = -17; - pixel_y = -8 - }, -/obj/structure/sign/safety/hvac_old{ - pixel_x = -17; - pixel_y = 6 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) +/obj/structure/bed/chair/comfy/beige, +/turf/open/floor/almayer/red/south, +/area/almayer/shipboard/brig/yard) "lbB" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 @@ -67215,15 +70197,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"lcW" = ( -/obj/item/storage/donut_box{ - pixel_y = 8 - }, -/obj/structure/closet/secure_closet/personal/cabinet{ - req_access = null - }, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/chief_mp_office) "ldb" = ( /obj/structure/machinery/light{ dir = 1 @@ -67475,14 +70448,30 @@ /area/almayer/medical/medical_science) "liZ" = ( /obj/structure/surface/table/almayer, -/obj/item/toy/deck, -/obj/item/toy/dice/d20, -/obj/item/toy/deck/uno, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/item/tool/kitchen/tray{ + pixel_y = 3 }, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/cells) +/obj/item/tool/kitchen/tray{ + pixel_y = 3 + }, +/obj/item/tool/kitchen/tray{ + pixel_y = 3 + }, +/obj/item/tool/kitchen/tray{ + pixel_y = 6 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_container/food/snacks/sliceable/bread{ + pixel_y = 6 + }, +/obj/item/reagent_container/food/snacks/sliceable/bread{ + pixel_y = 6 + }, +/obj/item/reagent_container/food/snacks/sliceable/bread{ + pixel_y = 6 + }, +/turf/open/floor/prison/kitchen, +/area/almayer/shipboard/brig/yard) "ljf" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/drinks/cans/waterbottle, @@ -67524,15 +70513,10 @@ /turf/open/floor/plating, /area/almayer/medical/lower_medical_medbay) "ljS" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" - }, -/obj/structure/sign/safety/bathunisex{ - pixel_x = 8; - pixel_y = 25 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/basketball, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/yard) "ljW" = ( /obj/structure/machinery/light{ dir = 1 @@ -67649,16 +70633,13 @@ /turf/open/floor/almayer/orange, /area/almayer/engineering/upper_engineering/port) "lnh" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/almayer/security/glass{ - dir = 8; - name = "\improper Chief MP's Office" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer/redcorner/east, +/area/almayer/shipboard/brig/visitation) "lnm" = ( /turf/open/floor/almayer/orangecorner, /area/almayer/living/briefing) @@ -67995,16 +70976,11 @@ /turf/open/floor/almayer/emerald/northeast, /area/almayer/squads/charlie) "ltO" = ( -/obj/structure/closet/secure_closet{ - name = "\improper Lethal Injection Locker" - }, -/obj/item/reagent_container/ld50_syringe/choral, -/obj/item/reagent_container/ld50_syringe/choral, -/obj/item/reagent_container/ld50_syringe/choral, -/obj/item/reagent_container/ld50_syringe/choral, -/obj/item/reagent_container/ld50_syringe/choral, +/obj/structure/closet/secure_closet/brig/restraints, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb, /turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/execution_storage) +/area/almayer/shipboard/brig/perma) "ltU" = ( /obj/structure/platform_decoration/metal/almayer/west, /turf/open/floor/almayer/plate, @@ -68173,10 +71149,17 @@ /turf/closed/wall/almayer/outer, /area/almayer/maint/hull/lower/l_m_p) "lze" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_29"; + pixel_y = 3; + pixel_x = 5 }, -/turf/open/floor/almayer/red/north, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera"; + dir = 8 + }, +/turf/open/floor/almayer/red/northeast, /area/almayer/shipboard/brig/processing) "lzq" = ( /obj/structure/disposalpipe/segment{ @@ -68366,10 +71349,15 @@ /turf/open/floor/almayer/orangecorner/north, /area/almayer/engineering/upper_engineering) "lEv" = ( -/obj/structure/machinery/light{ - dir = 8 +/obj/structure/bookcase{ + opacity = 0 }, -/turf/open/floor/almayer/red/west, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/marine_law, +/obj/item/book/manual/rank, +/obj/item/book/manual/engineering_hacking, +/obj/structure/machinery/vending/cigarette/koorlander, +/turf/open/floor/almayer/silver/west, /area/almayer/shipboard/brig/lobby) "lEG" = ( /obj/structure/prop/hybrisa/factory/conveyor_belt{ @@ -68579,17 +71567,6 @@ }, /turf/open/floor/almayer/cargo, /area/almayer/living/offices/cryo) -"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/dark_sterile, -/area/almayer/shipboard/brig/cells) "lJM" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer/plate, @@ -68655,8 +71632,8 @@ /turf/open/floor/almayer/plating/northeast, /area/almayer/shipboard/stern_point_defense) "lMc" = ( -/turf/open/floor/almayer/red, -/area/almayer/shipboard/brig/processing) +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/yard) "lMp" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -68916,13 +71893,10 @@ /turf/open/floor/almayer/redcorner/north, /area/almayer/living/briefing) "lSs" = ( -/obj/structure/bed, -/obj/structure/machinery/flasher{ - id = "Cell 5"; - pixel_x = -24 - }, -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/cells) +/obj/structure/bed/chair/bolted, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/red/northwest, +/area/almayer/shipboard/brig/interrogation) "lSJ" = ( /turf/open/floor/almayer/plating_striped/west, /area/almayer/stair_clone/lower/starboard_aft) @@ -69060,13 +72034,12 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_a_p) "lXb" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 21 }, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/almayer/red/southeast, /area/almayer/shipboard/brig/cells) "lXl" = ( /turf/open/floor/almayer/blue/north, @@ -69192,13 +72165,9 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/maint/lower/cryo_cells) "may" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21"; - pixel_y = 16 - }, -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer/red/northwest, -/area/almayer/shipboard/brig/starboard_hallway) +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig) "maI" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -69246,9 +72215,6 @@ /obj/docking_port/stationary/escape_pod/north, /turf/open/floor/plating, /area/almayer/maint/hull/lower/l_m_p) -"mcp" = ( -/turf/open/floor/almayer/redcorner/north, -/area/almayer/shipboard/brig/starboard_hallway) "mcL" = ( /obj/structure/machinery/vending/snack, /obj/structure/sign/safety/maint{ @@ -69292,11 +72258,14 @@ /turf/open/floor/almayer/aicore/glowing/no_build, /area/almayer/command/airoom) "mea" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21" +/obj/structure/machinery/cryopod{ + dir = 1 }, -/turf/open/floor/almayer/red/southeast, -/area/almayer/shipboard/brig/mp_bunks) +/obj/structure/platform/metal/almayer_smooth, +/obj/structure/platform/metal/almayer_smooth/east, +/obj/structure/platform_decoration/metal/almayer_smooth/southeast, +/turf/open/floor/almayer/cargo, +/area/almayer/shipboard/brig/cryo) "mem" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F"; @@ -69503,13 +72472,12 @@ /turf/open/floor/plating, /area/almayer/maint/upper/u_f_s) "miy" = ( -/obj/structure/machinery/optable, -/obj/structure/sign/safety/medical{ - pixel_x = 8; - pixel_y = 25 +/obj/structure/machinery/door/window/brigdoor/southright{ + id = "Cell 3"; + name = "Cell 3" }, -/turf/open/floor/almayer/sterile_green_corner/north, -/area/almayer/shipboard/brig/medical) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) "miE" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -69536,9 +72504,16 @@ /turf/open/floor/plating, /area/almayer/maint/upper/u_f_s) "mjt" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/processing) +/obj/structure/machinery/door/window/brigdoor/southright{ + id = "Cell 2"; + name = "Cell 2"; + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/cells) "mjy" = ( /obj/structure/machinery/conveyor_switch{ id = "lower_garbage" @@ -69780,8 +72755,9 @@ /turf/open/floor/grass, /area/almayer/living/starboard_garden) "moB" = ( -/turf/closed/wall/almayer, -/area/almayer/shipboard/brig/cells) +/obj/structure/janitorialcart, +/turf/open/floor/almayer/red/southeast, +/area/almayer/shipboard/brig/yard) "moI" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -70180,37 +73156,14 @@ /turf/open/floor/almayer/test_floor5, /area/almayer/squads/req) "myP" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/sentencing{ - dir = 4 - }, -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/processing) -"mza" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 2; - id = "bot_armory"; - name = "\improper Armory Shutters" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - dir = 2; - name = "\improper Armory" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 2; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -2; - pixel_y = 1 +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/vending/cigarette/koorlander{ + pixel_y = 16; + density = 0; + wires = 13 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/armory) +/turf/open/floor/almayer/red/northwest, +/area/almayer/shipboard/brig/yard) "mzg" = ( /turf/open/floor/almayer/emerald, /area/almayer/squads/charlie) @@ -70286,12 +73239,6 @@ /obj/structure/machinery/cryopod, /turf/open/floor/almayer/cargo, /area/almayer/squads/delta) -"mAY" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/shipboard/brig/starboard_hallway) "mBa" = ( /obj/structure/machinery/light{ dir = 4 @@ -70329,12 +73276,9 @@ /turf/open/floor/almayer/sterile_green_corner/north, /area/almayer/medical/operating_room_one) "mBx" = ( -/obj/structure/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, -/turf/open/floor/almayer/red/east, -/area/almayer/shipboard/brig/processing) +/obj/structure/machinery/medical_pod/sleeper, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/medical) "mBO" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer/orangefull, @@ -70375,12 +73319,6 @@ /obj/structure/machinery/power/apc/almayer/south, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/upper/u_f_p) -"mCL" = ( -/obj/structure/machinery/light/red{ - light_color = "#BB3F3F" - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/s_bow) "mCR" = ( /obj/structure/machinery{ density = 1; @@ -70518,16 +73456,6 @@ }, /turf/open/floor/almayer/aicore/no_build/ai_silver/east, /area/almayer/command/airoom) -"mFc" = ( -/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/test_floor4, -/area/almayer/shipboard/brig/processing) "mFi" = ( /obj/structure/platform/metal/almayer/east, /turf/open/floor/almayer/plating_striped/west, @@ -70589,10 +73517,6 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"mHb" = ( -/obj/structure/machinery/power/apc/almayer/north, -/turf/open/floor/almayer/red/east, -/area/almayer/shipboard/brig/processing) "mHo" = ( /obj/structure/machinery/washing_machine, /obj/structure/machinery/washing_machine{ @@ -70625,14 +73549,12 @@ /turf/open/floor/almayer, /area/almayer/living/gym) "mHz" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/machinery/light/small{ - dir = 1 +/obj/structure/machinery/power/apc/almayer/north, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer/red/northeast, +/area/almayer/shipboard/brig/visitation) "mHF" = ( /obj/structure/surface/rack, /obj/item/clothing/head/headband/red{ @@ -70939,10 +73861,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/starboard_fore_hallway) -"mNK" = ( -/obj/structure/closet/secure_closet/brig/restraints, -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/perma) "mNX" = ( /turf/open/floor/almayer_hull/outerhull_dir/east, /area/space/almayer/lifeboat_dock) @@ -71464,15 +74382,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/vehiclehangar) -"mZQ" = ( -/obj/structure/machinery/vending/security, -/obj/structure/machinery/light, -/obj/structure/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/general_equipment) "naa" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -71490,18 +74399,17 @@ /turf/open/floor/almayer/plating_striped/south, /area/almayer/engineering/lower/engine_core) "nah" = ( -/obj/structure/machinery/status_display{ - pixel_x = 32 +/obj/structure/bed/chair{ + dir = 8 }, -/obj/structure/surface/table/almayer, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" +/obj/structure/machinery/light{ + dir = 4; + invisibility = 101 }, -/obj/item/desk_bell{ - anchored = 1 +/obj/structure/sign/prop3{ + pixel_x = 28 }, -/turf/open/floor/almayer/red/southeast, +/turf/open/floor/almayer/silver/east, /area/almayer/shipboard/brig/lobby) "naj" = ( /obj/structure/machinery/door_control{ @@ -71581,20 +74489,26 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/fore_hallway) "ncf" = ( -/obj/structure/machinery/cryopod/right{ - layer = 3.1; - pixel_y = 13 - }, -/obj/structure/machinery/status_display{ - pixel_x = 32 +/obj/structure/machinery/vending/security, +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera"; + dir = 8 }, -/turf/open/floor/almayer/cargo, -/area/almayer/shipboard/brig/cryo) +/turf/open/floor/almayer/red/northeast, +/area/almayer/shipboard/brig/general_equipment) "nci" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/starboard_aft_hallway) "ncl" = ( -/turf/open/floor/almayer/red, +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/obj/structure/bed/chair/comfy{ + buckling_y = 2; + dir = 8; + pixel_y = 2 + }, +/turf/open/floor/almayer/silvercorner/west, /area/almayer/shipboard/brig/lobby) "ncp" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom{ @@ -71771,18 +74685,6 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/req) -"ngr" = ( -/obj/structure/sign/safety/intercom{ - pixel_x = -17 - }, -/obj/structure/bed/sofa/south/grey/left, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/turf/open/floor/almayer/red/northwest, -/area/almayer/shipboard/brig/lobby) "ngA" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -71866,32 +74768,11 @@ /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_midship_hallway) "nhG" = ( -/obj/item/newspaper{ - name = "character sheet" - }, -/obj/item/device/cassette_tape/heavymetal{ - pixel_x = 5; - pixel_y = 7 - }, -/obj/item/toy/dice, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, -/obj/structure/machinery/door_control{ - id = "courtyard window"; - name = "Privacy Shutters"; - pixel_x = -8; - pixel_y = -6; - req_access_txt = "3" - }, -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) +/obj/structure/closet/secure_closet/fridge/meat/stock, +/obj/structure/machinery/light, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison/kitchen, +/area/almayer/shipboard/brig/yard) "nhN" = ( /obj/structure/sign/safety/autoopenclose{ pixel_x = 7; @@ -72090,11 +74971,13 @@ /turf/open/floor/almayer/red/north, /area/almayer/shipboard/starboard_missiles) "nkF" = ( -/obj/structure/bed/chair/bolted{ - dir = 4 +/obj/structure/machinery/light{ + dir = 1; + pixel_x = 16 }, -/turf/open/floor/almayer/redcorner/north, -/area/almayer/shipboard/brig/processing) +/obj/structure/bed/chair/wood/normal, +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig/yard) "nkH" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -72125,18 +75008,6 @@ /obj/structure/cargo_container/uscm/chinook/left, /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/req) -"nkX" = ( -/obj/structure/surface/table/almayer, -/obj/structure/sign/safety/terminal{ - pixel_x = 8; - pixel_y = 32 - }, -/obj/structure/machinery/computer/cameras/almayer/ares{ - dir = 4; - pixel_y = 5 - }, -/turf/open/floor/almayer/red/northwest, -/area/almayer/shipboard/brig/processing) "nlq" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plating_striped/south, @@ -72149,13 +75020,6 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/req) -"nlz" = ( -/obj/structure/machinery/brig_cell/cell_3{ - pixel_x = 32; - pixel_y = -32 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/processing) "nlB" = ( /turf/open/floor/almayer/cargo_arrow/north, /area/almayer/living/briefing) @@ -72327,26 +75191,16 @@ /turf/open/floor/almayer/cargo, /area/almayer/hallways/lower/starboard_midship_hallway) "npO" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/lobby) "nqe" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 2 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -2 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/armory) +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) "nqx" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -72489,14 +75343,10 @@ /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north2) "nux" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/poddoor/almayer/open{ - dir = 4; - id = "perma_lockdown_1"; - name = "\improper Perma Lockdown Shutter" - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/perma) +/obj/structure/surface/table/gamblingtable, +/obj/item/toy/deck, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/yard) "nuA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -72520,21 +75370,19 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) "nuZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" }, -/turf/open/floor/almayer/red, -/area/almayer/shipboard/brig/starboard_hallway) +/turf/open/floor/almayer/red/south, +/area/almayer/shipboard/brig/processing) "nve" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -72724,15 +75572,12 @@ /turf/open/floor/almayer, /area/almayer/squads/req) "nzT" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ - closeOtherId = "brignorth"; - name = "\improper Brig Lobby" - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/starboard_hallway) +/turf/open/floor/almayer/red/south, +/area/almayer/shipboard/brig) "nAd" = ( /obj/structure/machinery/power/apc/almayer/hardened/east, /turf/open/floor/almayer, @@ -72874,8 +75719,19 @@ /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "nCD" = ( -/turf/open/floor/almayer/red, -/area/almayer/shipboard/brig/mp_bunks) +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 + }, +/obj/structure/platform/metal/almayer_smooth, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cryo) "nCM" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/almayer/plate, @@ -73255,10 +76111,14 @@ /turf/open/floor/almayer/bluefull, /area/almayer/living/briefing) "nNg" = ( -/obj/structure/bed, -/obj/item/bedsheet/red, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/emails{ + dir = 8; + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/silver/southeast, +/area/almayer/shipboard/brig/visitation_waiting) "nNt" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -73267,6 +76127,9 @@ /turf/open/floor/almayer/red/north, /area/almayer/shipboard/port_missiles) "nNv" = ( +/obj/structure/machinery/light{ + dir = 1 + }, /obj/structure/machinery/vending/cigarette/koorlander{ density = 0; pixel_y = 16 @@ -73340,8 +76203,14 @@ /turf/open/floor/almayer/no_build/plating, /area/almayer/underdeck/req) "nOC" = ( -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/execution) +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/poddoor/almayer/locked{ + dir = 4; + id = "Perma 1"; + name = "\improper cell shutter" + }, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/perma) "nPa" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -73349,13 +76218,6 @@ /obj/structure/largecrate/random/case, /turf/open/floor/almayer/red/northeast, /area/almayer/lifeboat_pumps/south1) -"nPb" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - layer = 2.5 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/execution) "nPf" = ( /obj/structure/stairs/multiz/down{ dir = 4 @@ -73503,14 +76365,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_a_s) -"nSu" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 2.5 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/execution) "nSG" = ( /obj/structure/machinery/door/airlock/almayer/engineering/glass{ name = "\improper Telecommunications Storage" @@ -73646,23 +76500,6 @@ }, /turf/open/floor/almayer/green, /area/almayer/living/grunt_rnr) -"nUj" = ( -/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/test_floor4, -/area/almayer/shipboard/brig/cells) "nUm" = ( /obj/structure/bed/chair/comfy/beige, /obj/item/reagent_container/glass/bucket{ @@ -73712,21 +76549,12 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/living/briefing) "nVm" = ( -/obj/structure/machinery/door_control{ - id = "firearm_storage_armory"; - name = "Armory Lockdown"; - pixel_y = 24; - req_access_txt = "4"; - pixel_x = 7 - }, -/obj/structure/sign/safety/ammunition{ - pixel_y = 25 - }, -/obj/structure/sign/safety/restrictedarea{ - pixel_y = 39 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 }, -/turf/open/floor/almayer/red/north, -/area/almayer/shipboard/brig/starboard_hallway) +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig) "nVn" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -73771,8 +76599,22 @@ /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_midship_hallway) "nVR" = ( -/turf/closed/wall/almayer, -/area/almayer/shipboard/brig/perma) +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/poddoor/almayer/locked{ + id = "Cell 6"; + name = "\improper Courtyard Divider" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter" + }, +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/cells) "nVX" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{ id_tag = "Boat2-D1"; @@ -73793,11 +76635,9 @@ /turf/open/floor/wood/ship, /area/almayer/engineering/ce_room) "nWS" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/shipboard/brig/medical) +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/processing) "nXo" = ( /obj/item/storage/box/donkpockets, /obj/structure/surface/rack, @@ -73856,14 +76696,11 @@ /turf/open/floor/almayer/cargo_arrow/west, /area/almayer/squads/bravo) "nYd" = ( -/obj/structure/bed/chair/wood/normal{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/cells) +/obj/structure/surface/table/almayer, +/obj/item/tool/kitchen/rollingpin, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison/kitchen, +/area/almayer/shipboard/brig/yard) "nYi" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, @@ -74169,8 +77006,11 @@ /turf/open/floor/almayer/cargo, /area/almayer/engineering/lower/engine_core) "oeB" = ( -/turf/open/floor/almayer/redcorner/west, -/area/almayer/shipboard/brig/processing) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/sterile_green_side/west, +/area/almayer/shipboard/brig/medical) "oeH" = ( /obj/structure/bed/chair{ dir = 8 @@ -74251,17 +77091,6 @@ /obj/structure/machinery/cryopod, /turf/open/floor/almayer/cargo, /area/almayer/squads/charlie) -"ohu" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - dir = 1; - name = "\improper Brig Maintenance" - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "Brig Lockdown Shutters"; - name = "\improper Brig Lockdown Shutter" - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/maint/hull/upper/p_bow) "ohA" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -74305,9 +77134,16 @@ /turf/open/floor/plating, /area/almayer/maint/lower/constr) "ohJ" = ( -/obj/structure/machinery/computer/arcade, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/cells) +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/cameras/wooden_tv/broadcast{ + pixel_y = 29; + pixel_x = 4 + }, +/obj/item/trash/sosjerky{ + pixel_y = 7 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/yard) "ohL" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -74358,27 +77194,6 @@ /obj/structure/surface/table/reinforced/almayer_B, /turf/open/floor/almayer/redfull, /area/almayer/shipboard/port_missiles) -"oix" = ( -/obj/structure/machinery/power/apc/almayer/south, -/obj/structure/sign/safety/rewire{ - pixel_y = -38 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/warden_office) -"oiz" = ( -/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/airlock/almayer/security/glass/reinforced{ - closeOtherId = "brigwarden"; - dir = 1; - name = "\improper Warden's Office" - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/warden_office) "oiL" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -74671,10 +77486,9 @@ /turf/open/floor/almayer/sterile_green, /area/almayer/medical/lower_medical_lobby) "omt" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/cells) +/obj/structure/machinery/power/apc/almayer/north, +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig/yard) "omy" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -74735,11 +77549,15 @@ /turf/open/floor/almayer/blue/northeast, /area/almayer/living/pilotbunks) "oog" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/obj/structure/bed/chair/bolted{ + dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/execution) +/obj/structure/machinery/flasher{ + id = "Perma 1"; + pixel_y = -24 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/perma) "ooh" = ( /obj/structure/sign/safety/restrictedarea{ pixel_x = 14; @@ -74794,9 +77612,8 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/gym) "opF" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/almayer/red/east, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/visitation_waiting) "opH" = ( /obj/structure/machinery/light, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -75023,12 +77840,10 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/req) "otp" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/shipboard/brig/medical) +/obj/structure/machinery/photocopier, +/obj/structure/machinery/power/apc/almayer/south, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/processing) "otq" = ( /obj/structure/machinery/line_nexter{ dir = 1; @@ -75224,11 +78039,24 @@ /turf/open/floor/almayer/green/west, /area/almayer/hallways/upper/fore_hallway) "oyC" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/hybrisa/coffee_machine{ + pixel_x = -7 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/starboard_hallway) +/obj/item/reagent_container/food/drinks/coffeecup{ + pixel_x = 7; + pixel_y = 6 + }, +/obj/item/reagent_container/food/drinks/coffeecup{ + pixel_x = 7; + pixel_y = 2 + }, +/obj/item/reagent_container/food/drinks/coffeecup{ + pixel_x = 7; + pixel_y = -2 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig) "oyG" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -75350,13 +78178,13 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_a_p) "oBq" = ( -/obj/structure/bed, -/obj/structure/machinery/flasher{ - id = "Cell 1"; - pixel_x = -24 +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal7"; + pixel_x = 2; + pixel_y = -4 }, -/turf/open/floor/almayer/red/southwest, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/almayer/plating, +/area/almayer/shipboard/brig/yard) "oBr" = ( /turf/closed/wall/almayer, /area/almayer/maint/hull/lower/l_a_s) @@ -75448,12 +78276,16 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/living/port_emb) "oDy" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 1 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/processing) +/obj/structure/machinery/sleep_console{ + dir = 8 + }, +/turf/open/floor/almayer/sterile_green_corner/east, +/area/almayer/shipboard/brig/medical) "oDE" = ( /obj/structure/surface/rack, /obj/item/reagent_container/spray/cleaner{ @@ -75525,12 +78357,19 @@ /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) "oEE" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 +/obj/structure/sink{ + pixel_y = 20 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) +/obj/structure/mirror{ + pixel_x = -1; + pixel_y = 32 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/item/tool/soap, +/turf/open/floor/almayer/dark_sterile, +/area/almayer/shipboard/brig/yard) "oEX" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -75577,12 +78416,6 @@ }, /turf/open/floor/almayer/orange/east, /area/almayer/hallways/lower/port_aft_hallway) -"oGj" = ( -/obj/structure/sign/safety/bulkhead_door{ - pixel_x = -16 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/s_bow) "oGm" = ( /turf/open/floor/almayer/orange/east, /area/almayer/hallways/lower/starboard_umbilical) @@ -75780,8 +78613,14 @@ /turf/closed/wall/almayer, /area/almayer/engineering/lower/workshop) "oJm" = ( +/obj/structure/reagent_dispensers/forensictank{ + pixel_y = 40 + }, +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = 25 + }, /turf/open/floor/almayer/red/north, -/area/almayer/shipboard/brig/starboard_hallway) +/area/almayer/shipboard/brig) "oJp" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -75848,21 +78687,21 @@ /area/almayer/maint/hull/upper/p_bow) "oLF" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ + dir = 2; + name = "\improper Brig Lobby"; + req_access = null + }, /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; id = "Brig Lockdown Shutters"; name = "\improper Brig Lockdown Shutter" }, -/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 = "\improper Brig Lobby"; - req_access = null +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/open/floor/almayer/test_floor4, /area/almayer/shipboard/brig/lobby) @@ -76220,13 +79059,10 @@ /turf/open/floor/almayer/plate, /area/almayer/squads/alpha) "oSC" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/firealarm{ - dir = 4; - pixel_x = 21 +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/almayer/test_floor4, /area/almayer/shipboard/brig/lobby) "oSG" = ( /obj/structure/surface/table/almayer, @@ -76331,20 +79167,10 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_p) "oVf" = ( -/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/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/general_equipment) +/obj/structure/bed/chair/bolted, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/red/northwest, +/area/almayer/shipboard/brig/processing) "oVk" = ( /obj/structure/machinery/light{ dir = 1 @@ -76407,11 +79233,19 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/starboard_fore_hallway) "oWK" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 }, -/turf/open/floor/almayer/red/north, -/area/almayer/shipboard/brig/starboard_hallway) +/obj/structure/sign/safety/restrictedarea{ + pixel_y = 25 + }, +/obj/structure/sign/safety/security{ + pixel_x = 15; + pixel_y = 25 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig) "oWN" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -76428,9 +79262,9 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) "oXp" = ( -/obj/effect/decal/cleanable/ash, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/cells) +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/red/northeast, +/area/almayer/shipboard/brig/yard) "oXJ" = ( /obj/structure/machinery/suit_storage_unit/compression_suit/uscm, /turf/open/floor/almayer/plate, @@ -76574,20 +79408,15 @@ /turf/open/floor/almayer/sterile_green_corner/west, /area/almayer/medical/medical_science) "pas" = ( -/obj/structure/machinery/cryopod/right, -/obj/structure/sign/safety/cryo{ - pixel_x = 3; - pixel_y = 25 - }, -/obj/structure/sign/safety/rewire{ - pixel_x = 15; - pixel_y = 25 - }, -/obj/structure/machinery/light{ - dir = 4 +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/donut_box, +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 24 }, -/turf/open/floor/almayer/cargo, -/area/almayer/shipboard/brig/cryo) +/obj/structure/machinery/power/apc/almayer/north, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/general_equipment) "pax" = ( /obj/structure/stairs/multiz/up, /turf/open/floor/almayer/aicore/no_build, @@ -76609,33 +79438,6 @@ "paL" = ( /turf/open/floor/almayer/uscm/directional/north, /area/almayer/command/cic) -"pbm" = ( -/obj/item/bedsheet/brown{ - pixel_y = 13 - }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 - }, -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 - }, -/obj/structure/bed{ - can_buckle = 0 - }, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 - }, -/obj/item/bedsheet/brown{ - layer = 3.1 - }, -/turf/open/floor/almayer/red/northwest, -/area/almayer/shipboard/brig/mp_bunks) "pbo" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/almayer/plate, @@ -76730,12 +79532,16 @@ /turf/open/floor/almayer/no_build/test_floor4, /area/almayer/underdeck/req) "pdT" = ( -/obj/structure/pipes/vents/pump, -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 +/obj/structure/machinery/firealarm{ + dir = 8; + pixel_x = -20; + pixel_y = 18 }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/shipboard/brig/medical) +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/processing) "pek" = ( /turf/closed/wall/almayer, /area/almayer/maint/hull/upper/s_bow) @@ -76747,15 +79553,12 @@ /turf/open/floor/almayer/cargo, /area/almayer/maint/hull/upper/u_f_s) "peO" = ( -/obj/structure/sign/safety/medical{ - pixel_x = -17; - pixel_y = 6 - }, -/obj/structure/sign/safety/restrictedarea{ - pixel_x = -17; - pixel_y = -9 +/obj/structure/reagent_dispensers/water_cooler/stacks{ + density = 0; + pixel_x = -11; + pixel_y = -1 }, -/turf/open/floor/almayer/red/west, +/turf/open/floor/almayer/silver/west, /area/almayer/shipboard/brig/lobby) "pfa" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -76773,16 +79576,8 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/engineering/upper_engineering/starboard) "pfd" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "Brig Lockdown Shutters"; - name = "\improper Brig Lockdown Shutter" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/starboard_hallway) +/turf/closed/wall/almayer/outer/internal, +/area/almayer/shipboard/brig) "pfq" = ( /obj/structure/platform/metal/almayer/north, /obj/structure/platform/metal/almayer/west, @@ -76860,14 +79655,15 @@ /turf/open/floor/almayer/orange, /area/almayer/engineering/lower) "pgP" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/structure/bed/chair/bolted{ + dir = 1 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/machinery/light/small{ + dir = 8; + pixel_y = 16 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/interrogation) "pgZ" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F"; @@ -76906,16 +79702,6 @@ }, /turf/open/floor/almayer/plating_striped/west, /area/almayer/shipboard/panic) -"phN" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/processing) "pij" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -76930,13 +79716,10 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/stern) "piK" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/poddoor/almayer/locked{ - dir = 2; - id = "Perma 1"; - name = "\improper cell shutter" - }, -/turf/open/floor/plating, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/power/apc/almayer/east, +/obj/structure/closet/secure_closet/brig, +/turf/open/floor/almayer/red/northeast, /area/almayer/shipboard/brig/perma) "piQ" = ( /obj/structure/machinery/status_display{ @@ -77094,16 +79877,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/lower/vehiclehangar) -"pns" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) "pnL" = ( /obj/structure/machinery/constructable_frame{ icon_state = "box_2" @@ -77195,15 +79968,6 @@ }, /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/lower_medical_medbay) -"pqF" = ( -/obj/structure/surface/table/almayer, -/obj/item/ashtray/plastic, -/obj/item/trash/cigbutt/cigarbutt, -/obj/item/trash/cigbutt, -/obj/item/trash/cigbutt, -/obj/item/trash/cigbutt, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/cells) "pqK" = ( /obj/structure/machinery/cryopod, /turf/open/floor/almayer/cargo, @@ -77291,13 +80055,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/command/cicconference) -"prY" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray, -/obj/item/tool/kitchen/utensil/pknife, -/obj/item/tool/kitchen/utensil/pfork, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/cells) "psk" = ( /obj/structure/machinery/camera/autoname/almayer{ name = "ship-grade camera" @@ -77336,16 +80093,6 @@ /obj/structure/machinery/light, /turf/open/floor/almayer/plate, /area/almayer/squads/charlie_delta_shared) -"ptq" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 - }, -/obj/structure/bed/chair/bolted, -/turf/open/floor/almayer/red/northeast, -/area/almayer/shipboard/brig/processing) "ptK" = ( /turf/closed/wall/almayer, /area/almayer/engineering/upper_engineering/starboard) @@ -77713,11 +80460,10 @@ /turf/open/floor/almayer/no_build/plating, /area/almayer/stair_clone/upper/starboard_fore) "pDW" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer/red/southeast, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/structure/machinery/vending/coffee, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/silver/south, +/area/almayer/shipboard/brig/visitation_waiting) "pEl" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -77842,14 +80588,40 @@ /turf/open/floor/almayer/bluecorner, /area/almayer/living/basketball) "pId" = ( -/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/reinforced/almayer_B, +/obj/item/paper_bin/uscm{ + pixel_x = 11; + pixel_y = 4; + layer = 3.1 }, -/obj/structure/surface/table/almayer, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/armory) +/obj/item/tool/pen{ + pixel_x = 9; + layer = 3.2 + }, +/obj/structure/transmitter/rotary{ + name = "Brig CMP's Office Telephone"; + phone_category = "MP Dept."; + phone_id = "Brig CMP's Office"; + pixel_x = -3; + pixel_y = -1 + }, +/obj/structure/machinery/door_control{ + id = "cmpprivacy"; + name = "Privacy Shutters"; + pixel_x = -5; + pixel_y = 11; + req_access = list(3, 24) + }, +/obj/structure/machinery/door_control{ + id = "Brig Lockdown Shutters"; + name = "Brig Lockdown Shutters"; + pixel_x = 6; + pixel_y = 11; + req_access_txt = "3" + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/carpet, +/area/almayer/shipboard/brig/chief_mp_office) "pIo" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -77972,14 +80744,17 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_m_s) "pKU" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/platform/metal/almayer_smooth/east, +/obj/structure/sign/safety/cryo{ + pixel_x = 32; + pixel_y = -7 }, -/obj/structure/machinery/firealarm{ - pixel_y = 28 +/obj/structure/sign/safety/security{ + pixel_y = 7; + pixel_x = 32 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/mp_bunks) +/turf/open/floor/almayer/red/northeast, +/area/almayer/shipboard/brig) "pKW" = ( /obj/structure/machinery/door/poddoor/almayer/open{ id = "Hangar Lockdown"; @@ -78205,9 +80980,14 @@ /turf/open/floor/plating, /area/almayer/living/offices/cryo) "pQr" = ( -/obj/structure/bed, -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/perma) +/obj/structure/surface/table/woodentable/fancy, +/obj/item/device/flashlight/lamp{ + pixel_x = 3; + pixel_y = 1 + }, +/obj/structure/machinery/power/apc/almayer/north, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/warden_office) "pQy" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -78234,11 +81014,15 @@ /turf/open/floor/almayer/plate, /area/almayer/squads/charlie_delta_shared) "pQI" = ( -/obj/structure/machinery/power/apc/almayer/north{ - cell_type = /obj/item/cell/hyper +/obj/structure/machinery/cryopod, +/obj/structure/platform/metal/almayer_smooth/north, +/obj/structure/platform/metal/almayer_smooth/west, +/obj/structure/platform_decoration/metal/almayer_smooth/northwest{ + layer = 3.01 }, -/turf/open/floor/almayer/red/north, -/area/almayer/shipboard/brig/mp_bunks) +/obj/structure/machinery/power/apc/almayer/north, +/turf/open/floor/almayer/cargo, +/area/almayer/shipboard/brig/cryo) "pQN" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/franks, @@ -78433,15 +81217,22 @@ /turf/open/floor/almayer/silver/northeast, /area/almayer/living/briefing) "pUD" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/faxmachine/uscm/almayer/brig{ - sub_name = "Processing" +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/obj/structure/machinery/status_display{ - pixel_y = 30 +/obj/structure/machinery/door/poddoor/almayer/locked{ + id = "Cell 4"; + name = "\improper Courtyard Divider" }, -/turf/open/floor/almayer/redfull, -/area/almayer/shipboard/brig/processing) +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter" + }, +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/cells) "pVh" = ( /obj/structure/largecrate/random/barrel/blue, /obj/structure/machinery/light/red{ @@ -78509,30 +81300,12 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_f_s) "pWr" = ( -/obj/structure/surface/rack, -/obj/item/tool/minihoe{ - pixel_x = -4; - pixel_y = -1 - }, -/obj/item/tool/minihoe{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/tool/minihoe{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/item/reagent_container/glass/fertilizer/ez, -/obj/item/reagent_container/glass/fertilizer/ez, -/obj/item/reagent_container/glass/fertilizer/ez, -/obj/item/reagent_container/glass/fertilizer/ez, -/obj/item/tool/plantspray/weeds, -/obj/item/tool/plantspray/weeds, -/obj/structure/sign/safety/hvac_old{ - pixel_y = -26 +/obj/structure/window/reinforced{ + dir = 1; + layer = 3 }, -/turf/open/floor/almayer/green, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/yard) "pWw" = ( /obj/structure/surface/rack, /obj/item/tool/weldingtool, @@ -79114,8 +81887,9 @@ /turf/open/floor/almayer/cargo, /area/almayer/command/computerlab) "qjK" = ( -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/mp_bunks) +/obj/structure/window/framed/almayer/hull, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/cryo) "qjL" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -79342,23 +82116,10 @@ /obj/structure/bed/chair/office/dark, /turf/open/floor/almayer/plate, /area/almayer/command/computerlab) -"qmR" = ( -/obj/structure/window/reinforced/ultra{ - pixel_y = -12 - }, -/obj/structure/bed/chair/bolted, -/turf/open/floor/almayer/plating_striped, -/area/almayer/shipboard/brig/execution) "qmU" = ( -/obj/item/vehicle_clamp, -/obj/item/vehicle_clamp, -/obj/item/vehicle_clamp, -/obj/structure/machinery/light/small{ - dir = 4 - }, -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/armory) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) "qmW" = ( /obj/structure/machinery/light, /turf/open/floor/almayer/blue, @@ -79654,11 +82415,12 @@ /turf/open/floor/almayer/no_build, /area/almayer/underdeck/vehicle) "quj" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/general_equipment) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/processing) "quq" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -79671,9 +82433,9 @@ /area/almayer/living/briefing) "quJ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 + dir = 9 }, -/turf/open/floor/almayer, +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/perma) "quS" = ( /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, @@ -79728,22 +82490,6 @@ /obj/structure/machinery/power/apc/almayer/east, /turf/open/floor/plating, /area/almayer/living/starboard_emb) -"qvE" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" - }, -/turf/open/floor/almayer/red, -/area/almayer/shipboard/brig/starboard_hallway) "qvF" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -79820,21 +82566,11 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_f_s) "qxe" = ( -/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 3"; - name = "\improper Courtyard Divider" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/computer/cameras/almayer_network{ + dir = 4 }, -/turf/open/floor/almayer/test_floor4, +/turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) "qxm" = ( /obj/effect/decal/warning_stripes{ @@ -79857,16 +82593,9 @@ /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south2) "qxr" = ( -/obj/structure/machinery/cryopod/right{ - layer = 3.1; - pixel_y = 13 - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, -/turf/open/floor/almayer/cargo, -/area/almayer/shipboard/brig/cryo) +/obj/structure/machinery/vending/security, +/turf/open/floor/almayer/red/southeast, +/area/almayer/shipboard/brig/general_equipment) "qxv" = ( /obj/structure/machinery/light/red{ dir = 4; @@ -80079,25 +82808,19 @@ /turf/open/floor/almayer, /area/almayer/living/briefing) "qCo" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal3"; + pixel_y = -12 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) +/obj/structure/desertdam/decals/road_edge{ + pixel_x = 16 + }, +/turf/open/floor/almayer/plating, +/area/almayer/shipboard/brig/yard) "qCy" = ( /obj/effect/landmark/start/captain, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/bridgebunks) -"qCA" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, -/obj/structure/sign/safety/rewire{ - pixel_y = -38 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/execution) "qCG" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -80114,20 +82837,10 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/maint/hull/lower/l_m_s) "qCU" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/sentencing{ - dir = 8; - pixel_y = 6 - }, -/obj/structure/sign/safety/terminal{ - pixel_x = 32; - pixel_y = -22 - }, -/turf/open/floor/almayer/red/east, -/area/almayer/shipboard/brig/perma) +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/yard) "qDq" = ( /obj/effect/landmark/start/marine/bravo, /obj/effect/landmark/late_join/bravo, @@ -80207,12 +82920,11 @@ /turf/open/floor/almayer/silver/east, /area/almayer/shipboard/brig/cic_hallway) "qEy" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/pipes/vents/scrubber{ dir = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/processing) +/turf/open/floor/almayer/dark_sterile, +/area/almayer/shipboard/brig/medical) "qEz" = ( /obj/structure/machinery/door_control{ id = "laddersouthwest"; @@ -80232,14 +82944,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/port_fore_hallway) -"qEA" = ( -/obj/structure/bed, -/obj/structure/machinery/flasher{ - id = "Cell 4"; - pixel_x = -24 - }, -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/cells) "qEL" = ( /obj/structure/surface/table/almayer, /obj/structure/largecrate/random/case/small{ @@ -80258,12 +82962,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/lower/port_fore_hallway) -"qFi" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/chief_mp_office) "qFu" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -80273,13 +82971,6 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/brig/cells) -"qFE" = ( -/obj/structure/machinery/brig_cell/cell_5{ - pixel_x = 32; - pixel_y = -32 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/processing) "qFG" = ( /obj/structure/window/framed/almayer, /turf/open/floor/almayer/plate, @@ -80297,15 +82988,16 @@ }, /turf/open/floor/almayer/bluefull, /area/almayer/squads/delta) -"qFX" = ( -/turf/closed/wall/almayer, -/area/almayer/shipboard/brig/mp_bunks) "qGc" = ( /turf/open/floor/almayer/red/north, /area/almayer/squads/alpha_bravo_shared) "qGf" = ( -/obj/structure/machinery/power/apc/almayer/south, -/turf/open/floor/almayer/red, +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/emails{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/silver/southwest, /area/almayer/shipboard/brig/lobby) "qGw" = ( /turf/open/floor/almayer/plating_striped/south, @@ -80414,12 +83106,9 @@ /turf/open/floor/plating/almayer/no_build, /area/almayer/stair_clone/lower/starboard_aft) "qJo" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/almayer/red/southeast, -/area/almayer/shipboard/brig/perma) +/obj/structure/window/reinforced, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/yard) "qJx" = ( /obj/structure/machinery/vending/cola, /turf/open/floor/almayer/plate, @@ -80459,15 +83148,6 @@ }, /turf/open/floor/almayer/orange, /area/almayer/living/starboard_emb) -"qJZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) "qKb" = ( /obj/structure/surface/table/almayer, /obj/item/storage/box/lights/tubes{ @@ -80556,23 +83236,17 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) "qLt" = ( -/obj/structure/surface/rack, -/obj/item/tool/wirecutters/clippers, -/obj/item/tool/minihoe{ - pixel_x = -4; - pixel_y = 1 +/obj/structure/window/reinforced{ + dir = 1; + layer = 3 }, -/obj/item/reagent_container/glass/fertilizer/ez, -/obj/item/reagent_container/glass/fertilizer/ez, -/obj/item/reagent_container/glass/fertilizer/ez, -/obj/item/tool/plantspray/weeds, -/obj/item/tool/plantspray/weeds, -/obj/item/tool/minihoe{ - pixel_x = -4; - pixel_y = -4 +/obj/structure/reagent_dispensers/water_cooler/stacks{ + density = 0; + pixel_x = -11; + pixel_y = -1 }, -/turf/open/floor/almayer/green/southwest, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/yard) "qLH" = ( /obj/structure/bed/chair{ buckling_y = 6; @@ -80933,11 +83607,18 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_f_p) "qTQ" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = -25 + }, /obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 + dir = 9 }, -/turf/open/floor/almayer/red, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer/silver/south, +/area/almayer/shipboard/brig/visitation_waiting) "qTY" = ( /obj/structure/machinery/gibber, /turf/open/floor/plating/plating_catwalk, @@ -80973,12 +83654,13 @@ /turf/open/floor/almayer/cargo_arrow/north, /area/almayer/squads/charlie_delta_shared) "qUz" = ( -/obj/structure/machinery/light{ - dir = 8; - invisibility = 101 +/obj/structure/surface/table/reinforced/prison, +/obj/structure/closet/secure_closet/surgical{ + pixel_x = -30 }, -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/processing) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_corner/west, +/area/almayer/shipboard/brig/medical) "qUK" = ( /turf/open/floor/almayer/blue, /area/almayer/hallways/upper/fore_hallway) @@ -81022,9 +83704,6 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/upper/mess) -"qVF" = ( -/turf/open/floor/almayer/cargo, -/area/almayer/shipboard/brig/execution) "qVS" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/almayer/plating_striped/west, @@ -81108,12 +83787,6 @@ }, /turf/open/floor/almayer/bluefull, /area/almayer/living/briefing) -"qXE" = ( -/obj/structure/machinery/brig_cell/perma_1{ - pixel_x = 32 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/perma) "qXO" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/snacks/mre_pack/xmas3{ @@ -81209,26 +83882,25 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_p) "qZA" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig/visitation) "qZF" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/cameras/almayer_network{ - dir = 8; - pixel_y = 6 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/machinery/door_control{ - id = "perma_lockdown_1"; - name = "\improper Perma Cells Lockdown"; - pixel_x = -8; - pixel_y = -4; - req_access_txt = "3" +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, -/turf/open/floor/almayer/red/east, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/yard) "qZH" = ( /obj/structure/surface/table/almayer, /obj/item/paper{ @@ -81353,15 +84025,13 @@ /turf/open/floor/almayer/cargo_arrow/west, /area/almayer/squads/charlie) "rbK" = ( -/obj/structure/bed/chair/wood/normal{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 +/obj/structure/bed, +/obj/structure/machinery/light/small{ + dir = 8 }, -/turf/open/floor/almayer/cargo, -/area/almayer/shipboard/brig/execution) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/perma) "rbY" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -81434,26 +84104,13 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/command/cic) "rdA" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer, +/turf/open/floor/almayer/red/south, /area/almayer/shipboard/brig/perma) "rdI" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/technology_scanner, /turf/open/floor/almayer/orange/southeast, /area/almayer/engineering/upper_engineering) -"rdM" = ( -/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/plate, -/area/almayer/shipboard/brig/general_equipment) "rdN" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F"; @@ -81557,13 +84214,18 @@ /turf/open/floor/almayer/dark_sterile, /area/almayer/living/port_emb) "rfY" = ( -/obj/structure/machinery/cryopod, -/obj/structure/machinery/light{ - dir = 8; - invisibility = 101 +/obj/structure/machinery/cm_vending/clothing/military_police{ + pixel_y = 30; + can_block_movement = 0 }, -/turf/open/floor/almayer/cargo, -/area/almayer/shipboard/brig/cryo) +/obj/structure/window/reinforced/toughened{ + dir = 4 + }, +/obj/structure/machinery/status_display{ + pixel_x = -32 + }, +/turf/open/floor/almayer/cargo_arrow/north, +/area/almayer/shipboard/brig/general_equipment) "rgt" = ( /turf/closed/wall/almayer, /area/almayer/hallways/lower/port_umbilical) @@ -81736,22 +84398,21 @@ /turf/open/floor/almayer, /area/almayer/living/gym) "rkV" = ( -/obj/structure/window/framed/almayer/hull/hijack_bustable, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "Warden Office Shutters"; - name = "\improper Privacy Shutters" +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, -/obj/structure/machinery/door/poddoor/almayer/open{ - dir = 4; - id = "courtyard_cells"; - name = "\improper Courtyard Lockdown Shutter" +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 2; + pixel_x = -1 }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/warden_office) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/yard) "rlc" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -81812,11 +84473,9 @@ /turf/open/floor/almayer/orangecorner, /area/almayer/engineering/upper_engineering/starboard) "rmk" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 26 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/shipboard/brig/starboard_hallway) +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/redcorner/north, +/area/almayer/shipboard/brig/processing) "rmo" = ( /obj/structure/pipes/standard/cap/hidden{ dir = 4 @@ -81824,11 +84483,14 @@ /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/south2) "rmx" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/recharger, -/obj/item/device/flash, -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/general_equipment) +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/processing) "rmz" = ( /obj/structure/sign/safety/conference_room{ pixel_x = 14; @@ -82028,19 +84690,6 @@ /obj/structure/machinery/light, /turf/open/floor/almayer, /area/almayer/hallways/lower/vehiclehangar) -"rqS" = ( -/obj/structure/surface/table/almayer, -/obj/item/folder/red{ - pixel_x = -4 - }, -/obj/item/folder/blue{ - pixel_x = 4 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer/cargo, -/area/almayer/shipboard/brig/evidence_storage) "rrh" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "Under Construction Shutters"; @@ -82062,14 +84711,10 @@ /turf/open/floor/almayer/red/north, /area/almayer/squads/alpha) "rrz" = ( -/obj/structure/sign/safety/four{ - pixel_x = -17 - }, -/obj/structure/machinery/door/window/brigdoor/southright{ - id = "Cell 4"; - name = "Cell 4" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 }, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/almayer/red/northeast, /area/almayer/shipboard/brig/cells) "rrB" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/reinforced{ @@ -82099,11 +84744,10 @@ pixel_x = 8; pixel_y = 16 }, -/obj/structure/filingcabinet/documentation/uscm{ +/obj/structure/filingcabinet/documentation/uscm/chestdrawer{ + pixel_x = -8; pixel_y = 16; - density = 0; - icon_state = "chestdrawer"; - pixel_x = -8 + name = "documents cabinet" }, /turf/open/floor/almayer/green/north, /area/almayer/living/offices) @@ -82283,16 +84927,6 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer/emerald, /area/almayer/squads/charlie) -"rwe" = ( -/obj/structure/machinery/light/red{ - light_color = "#BB3F3F"; - dir = 4 - }, -/obj/structure/sign/safety/bulkhead_door{ - pixel_x = -16 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/p_bow) "rwj" = ( /turf/open/floor/almayer/orange/east, /area/almayer/hallways/lower/starboard_midship_hallway) @@ -82601,9 +85235,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_fore_hallway) -"rDQ" = ( -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/cryo) "rDR" = ( /obj/structure/machinery/vending/coffee, /obj/item/toy/bikehorn/rubberducky{ @@ -82707,12 +85338,9 @@ /turf/open/floor/almayer/silver/west, /area/almayer/shipboard/brig/cic_hallway) "rFg" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1; - name = "Bathroom" - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/silvercorner/south, +/area/almayer/shipboard/brig/visitation_waiting) "rFy" = ( /turf/open/floor/almayer/orangecorner/north, /area/almayer/engineering/upper_engineering/starboard) @@ -82892,12 +85520,9 @@ /turf/open/floor/almayer/orange/southwest, /area/almayer/engineering/upper_engineering/port) "rJj" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, -/turf/open/floor/almayer/red/east, -/area/almayer/shipboard/brig/processing) +/obj/structure/machinery/medical_pod/bodyscanner, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/medical) "rJu" = ( /turf/open/floor/almayer/orange/north, /area/almayer/living/briefing) @@ -82946,6 +85571,7 @@ /area/almayer/living/grunt_rnr) "rKQ" = ( /obj/structure/pipes/vents/scrubber, +/obj/structure/machinery/light, /turf/open/floor/almayer/silver, /area/almayer/shipboard/brig/cic_hallway) "rLk" = ( @@ -83166,8 +85792,13 @@ /turf/open/floor/almayer/plate, /area/almayer/squads/delta) "rPF" = ( -/turf/open/floor/almayer/red, -/area/almayer/shipboard/brig/starboard_hallway) +/obj/structure/stairs{ + dir = 4; + icon_state = "ramptop" + }, +/obj/structure/platform/metal/almayer_smooth, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig) "rPO" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/franks{ @@ -83196,14 +85827,13 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/engineering/lower) "rQc" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/junction{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_y = -1; + pixel_x = 1 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/processing) +/turf/open/floor/almayer/sterile_green_side/southeast, +/area/almayer/shipboard/brig/medical) "rQf" = ( /obj/structure/platform/metal/almayer, /obj/structure/largecrate/random{ @@ -83434,11 +86064,13 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/stair_clone/upper/port_aft) "rUk" = ( -/obj/structure/bed/chair/wood/normal{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_y = -1; + pixel_x = -1 }, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/prison/kitchen, +/area/almayer/shipboard/brig/yard) "rUy" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -83495,17 +86127,23 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck) "rWn" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - layer = 1.9 +/obj/structure/window/reinforced/toughened{ + dir = 8 }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/window, +/obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; - id = "CMP Office Shutters"; - name = "\improper Privacy Shutters" + id = "visitationshutter"; + name = "\improper Visitation Shutters"; + closed_layer = 3.4; + layer = 3.4 }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/visitation) "rWs" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -83538,9 +86176,19 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) "rXd" = ( -/obj/structure/machinery/vending/security, -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/general_equipment) +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = 26 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = 39 + }, +/obj/structure/sign/safety/security{ + pixel_y = 39; + pixel_x = 1 + }, +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig/processing) "rXj" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -83568,22 +86216,10 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/living/gym) "rXE" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = -25 - }, -/obj/structure/sign/safety/hazard{ - pixel_y = -25 - }, -/obj/structure/machinery/power/apc/almayer/west, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/execution) +/obj/structure/bed, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/perma) "rXF" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -83743,14 +86379,13 @@ /turf/closed/wall/almayer/aicore/hull, /area/almayer/powered/agent) "sbP" = ( -/obj/effect/landmark/start/police, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 2.5 +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_29"; + pixel_y = 3; + pixel_x = 5 }, -/obj/effect/landmark/late_join/police, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cryo) +/turf/open/floor/almayer/red/south, +/area/almayer/shipboard/brig/general_equipment) "sbZ" = ( /obj/structure/machinery/suit_storage_unit/compression_suit/uscm, /obj/structure/sign/safety/hazard{ @@ -83937,9 +86572,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/squads/req) -"sgi" = ( -/turf/closed/wall/almayer, -/area/almayer/shipboard/brig/processing) "sgj" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/crew/alt{ @@ -83984,14 +86616,6 @@ }, /turf/open/floor/almayer/bluefull, /area/almayer/living/briefing) -"sgE" = ( -/obj/structure/bed, -/obj/structure/machinery/flasher{ - id = "Cell 3"; - pixel_x = -24 - }, -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/cells) "sgH" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -84197,13 +86821,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower/workshop) -"slf" = ( -/obj/structure/machinery/brig_cell/cell_6{ - pixel_x = 32; - pixel_y = -32 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/processing) "slo" = ( /obj/structure/sign/safety/maint{ pixel_x = 8; @@ -84222,8 +86839,10 @@ /turf/open/floor/almayer/cargo, /area/almayer/engineering/lower/engine_core) "slF" = ( -/turf/open/floor/almayer/red/northwest, -/area/almayer/shipboard/brig/processing) +/obj/structure/medical_supply_link, +/obj/structure/machinery/cm_vending/sorted/medical, +/turf/open/floor/almayer/sterile_green_side/west, +/area/almayer/shipboard/brig/medical) "slL" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -84370,12 +86989,22 @@ /turf/open/floor/plating/plating_catwalk/no_build, /area/almayer/underdeck/hangar) "snX" = ( -/obj/structure/sign/safety/medical{ - pixel_x = 16; - pixel_y = 25 +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/turf/open/floor/almayer/red/northwest, -/area/almayer/shipboard/brig/processing) +/obj/structure/machinery/door/poddoor/almayer/locked{ + id = "Cell 3"; + name = "\improper Courtyard Divider" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter" + }, +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/cells) "soq" = ( /obj/effect/decal/cleanable/generic, /obj/effect/decal/warning_stripes{ @@ -84484,13 +87113,6 @@ "sqg" = ( /turf/closed/wall/almayer, /area/almayer/engineering/lower) -"sql" = ( -/obj/structure/machinery/light/red{ - light_color = "#BB3F3F"; - dir = 4 - }, -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/perma) "sqo" = ( /obj/structure/bed/chair{ dir = 8 @@ -84498,10 +87120,38 @@ /turf/open/floor/almayer/orange/east, /area/almayer/engineering/upper_engineering) "sqW" = ( -/obj/structure/machinery/portable_atmospherics/hydroponics, -/obj/item/seeds/tomatoseed, -/turf/open/floor/almayer/green/north, -/area/almayer/shipboard/brig/cells) +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal5"; + pixel_x = -16; + pixel_y = 16 + }, +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal6"; + pixel_x = 16; + pixel_y = 16 + }, +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal7"; + pixel_x = 16; + pixel_y = -16 + }, +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal8"; + pixel_x = -16; + pixel_y = -16 + }, +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal3"; + pixel_x = 6; + pixel_y = 4 + }, +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal3"; + pixel_x = -9; + pixel_y = 4 + }, +/turf/open/floor/almayer/plating, +/area/almayer/shipboard/brig/yard) "srh" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -84545,15 +87195,6 @@ /obj/structure/machinery/light, /turf/open/floor/almayer/no_build, /area/almayer/stair_clone/lower/starboard_fore) -"srT" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 8 - }, -/obj/structure/machinery/door/airlock/almayer/security/glass{ - name = "Evidence Room" - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/evidence_storage) "ssk" = ( /obj/structure/surface/rack, /obj/item/prop{ @@ -84619,17 +87260,6 @@ /obj/structure/platform/metal/almayer, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_a_p) -"stO" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/faxmachine/uscm/almayer/brig{ - sub_name = "Permanent Confinement" - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/turf/open/floor/almayer/red, -/area/almayer/shipboard/brig/perma) "stP" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F" @@ -84901,16 +87531,6 @@ /obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/almayer/test_floor4, /area/almayer/living/offices/cryo) -"szG" = ( -/obj/item/stack/sheet/glass/reinforced{ - amount = 50 - }, -/obj/effect/spawner/random/toolbox, -/obj/effect/spawner/random/powercell, -/obj/effect/spawner/random/powercell, -/obj/structure/surface/rack, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/warden_office) "szM" = ( /obj/structure/flora/pottedplant{ desc = "It is made of Fiberbush(tm). It contains asbestos."; @@ -84975,12 +87595,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_p) -"sBg" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/general_equipment) "sBK" = ( /obj/item/storage/box/guncase/m2c{ layer = 5.3 @@ -84993,14 +87607,12 @@ /turf/open/floor/almayer/green, /area/almayer/living/grunt_rnr) "sBQ" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ - closeOtherId = "briglobby"; - name = "\improper Brig Cells" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 +/obj/structure/machinery/light{ + dir = 4; + invisibility = 101 }, -/turf/open/floor/almayer/test_floor4, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) "sBY" = ( /obj/item/tool/wet_sign, @@ -85189,33 +87801,29 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/stern) "sEZ" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = 26 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 2 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -2 - }, -/obj/structure/reagent_dispensers/forensictank{ - pixel_y = 41 +/obj/item/book/manual/marine_law, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/detective, +/obj/structure/bookcase{ + pixel_y = 16; + layer = 3.1; + density = 0; + opacity = 0 }, -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/armory) +/obj/item/book/manual/barman_recipes, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) "sFf" = ( /turf/open/floor/almayer/cargo, /area/almayer/shipboard/starboard_missiles) "sFu" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper_bin/uscm{ - pixel_y = 7 +/obj/structure/closet/secure_closet/brig, +/obj/structure/sign/safety/five{ + pixel_x = 15; + pixel_y = -27 }, -/obj/item/tool/pen, -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/starboard_hallway) +/turf/open/floor/almayer/red/south, +/area/almayer/shipboard/brig) "sGh" = ( /turf/open/floor/almayer/uscm/directional, /area/almayer/command/lifeboat) @@ -85377,13 +87985,6 @@ }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) -"sLk" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera" - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/s_bow) "sLx" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -85391,13 +87992,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_f_p) -"sLA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/processing) "sLX" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -85705,15 +88299,14 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/starboard_aft_hallway) "sUs" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 +/obj/structure/closet/secure_closet/fridge/dry/stock, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/safety/fridge{ + pixel_x = 32; + pixel_y = 7 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/prison/kitchen, +/area/almayer/shipboard/brig/yard) "sUE" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/clock{ @@ -85744,10 +88337,13 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/fore_hallway) "sVc" = ( -/obj/structure/machinery/portable_atmospherics/hydroponics, -/obj/item/seeds/orangeseed, -/turf/open/floor/almayer/green/north, -/area/almayer/shipboard/brig/cells) +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal6"; + pixel_x = 2; + pixel_y = 4 + }, +/turf/open/floor/almayer/plating, +/area/almayer/shipboard/brig/yard) "sVv" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/red/north, @@ -85832,23 +88428,16 @@ }, /turf/open/floor/almayer/green/north, /area/almayer/hallways/lower/port_midship_hallway) -"sXQ" = ( -/obj/structure/machinery/portable_atmospherics/hydroponics, -/obj/item/seeds/appleseed, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer/green/northeast, -/area/almayer/shipboard/brig/cells) "sYh" = ( /turf/open/floor/almayer/sterile_green_side/north, /area/almayer/medical/lower_medical_medbay) "sYl" = ( -/obj/structure/machinery/body_scanconsole{ - dir = 8 +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/comfy{ + dir = 4 }, -/turf/open/floor/almayer/sterile_green_side/west, -/area/almayer/shipboard/brig/medical) +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/processing) "sYr" = ( /obj/structure/machinery/door/airlock/almayer/maint, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -85971,24 +88560,9 @@ /turf/open/floor/almayer, /area/almayer/living/port_emb) "tau" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/reinforced{ - dir = 2; - name = "\improper Brig Permanent Confinement" - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - dir = 4; - id = "perma_lockdown_1"; - name = "\improper Perma Lockdown Shutter" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/perma) +/obj/structure/surface/table/gamblingtable, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/yard) "taw" = ( /turf/closed/wall/almayer, /area/almayer/maint/hull/upper/u_a_s) @@ -86076,17 +88650,6 @@ }, /turf/open/floor/almayer/orange/west, /area/almayer/engineering/lower/engine_core) -"tdy" = ( -/obj/structure/bed/sofa/south/grey/right, -/obj/structure/sign/safety/restrictedarea{ - pixel_y = 25 - }, -/obj/structure/sign/safety/security{ - pixel_x = 15; - pixel_y = 25 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/shipboard/brig/lobby) "tdE" = ( /obj/structure/window/reinforced{ dir = 8 @@ -86165,14 +88728,18 @@ /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) "teE" = ( -/obj/structure/machinery/light{ - dir = 8 +/obj/structure/bed/chair{ + can_buckle = 0; + dir = 4; + pixel_x = 1; + pixel_y = 3 }, -/obj/structure/toilet{ - dir = 4 +/obj/structure/machinery/scoreboard{ + id = "prisonbball"; + pixel_y = 30 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/yard) "teY" = ( /obj/structure/machinery/light{ dir = 1 @@ -86194,17 +88761,28 @@ /turf/open/floor/almayer/orange/west, /area/almayer/engineering/upper_engineering/starboard) "tff" = ( -/turf/open/floor/almayer/red/north, +/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ + closeOtherId = "briglobby"; + name = "\improper Brig Lobby" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/open/floor/almayer/test_floor4, /area/almayer/shipboard/brig/lobby) "tfE" = ( +/obj/effect/decal/cleanable/dirt, /obj/structure/surface/rack, -/obj/item/storage/firstaid/adv{ - pixel_x = 6; - pixel_y = 6 +/obj/item/storage/toolbox/mechanical/green, +/obj/item/stack/sheet/glass/reinforced{ + amount = 50 }, -/obj/item/storage/firstaid/regular, /turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/execution_storage) +/area/almayer/shipboard/brig/perma) "tfF" = ( /turf/open/floor/almayer/orange/southeast, /area/almayer/hallways/upper/midship_hallway) @@ -86221,17 +88799,8 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_a_p) "tfZ" = ( -/obj/structure/reagent_dispensers/water_cooler/stacks{ - density = 0; - pixel_x = -7; - pixel_y = 17 - }, -/obj/structure/sign/safety/cryo{ - pixel_x = 12; - pixel_y = 25 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/shipboard/brig/starboard_hallway) +/turf/open/floor/almayer/red/northwest, +/area/almayer/shipboard/brig) "tge" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -86272,8 +88841,13 @@ /turf/open/floor/almayer, /area/almayer/hallways/lower/port_midship_hallway) "tgJ" = ( -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/warden_office) +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 8; + invisibility = 101 + }, +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/visitation) "tgK" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 @@ -86300,19 +88874,6 @@ }, /turf/open/floor/almayer/orange/north, /area/almayer/engineering/lower/engine_core) -"thq" = ( -/obj/structure/machinery/vending/cola{ - 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) "thv" = ( /turf/open/floor/almayer/orange, /area/almayer/command/telecomms) @@ -86327,8 +88888,12 @@ /turf/open/floor/almayer/cargo_arrow/north, /area/almayer/squads/alpha_bravo_shared) "thL" = ( -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/cells) +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/turf/open/floor/prison/kitchen, +/area/almayer/shipboard/brig/yard) "thP" = ( /turf/open/floor/almayer/sterile_green_side/southwest, /area/almayer/medical/lower_medical_medbay) @@ -86373,22 +88938,9 @@ /turf/open/floor/plating, /area/almayer/squads/req) "tiF" = ( -/obj/structure/machinery/keycard_auth{ - pixel_y = 27; - pixel_x = 8 - }, -/obj/structure/filingcabinet/documentation/military_police{ - pixel_y = 16; - density = 0; - pixel_x = 8; - icon_state = "chestdrawer" - }, -/obj/structure/sign/safety/terminal{ - pixel_x = 32; - pixel_y = -8 - }, -/turf/open/floor/almayer/red/northeast, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/structure/bed/chair, +/turf/open/floor/almayer/silver/north, +/area/almayer/shipboard/brig/visitation_waiting) "tiK" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/almayer/orange, @@ -86524,12 +89076,15 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/fore_hallway) "tlk" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - layer = 1.9 +/obj/structure/sign/safety/restrictedarea{ + pixel_y = 25 }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/general_equipment) +/obj/structure/sign/safety/security{ + pixel_x = 15; + pixel_y = 25 + }, +/turf/open/floor/almayer/red/northeast, +/area/almayer/shipboard/brig/processing) "tln" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -86541,21 +89096,11 @@ /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "tlp" = ( -/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 4"; - name = "\improper Courtyard Divider" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/structure/machinery/keycard_auth{ + pixel_x = 25 }, -/turf/open/floor/almayer/test_floor4, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) "tlA" = ( /obj/structure/machinery/disposal{ @@ -86600,15 +89145,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/port_midship_hallway) -"tmH" = ( -/obj/structure/pipes/vents/pump, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera"; - pixel_y = 6 - }, -/turf/open/floor/almayer/redcorner/north, -/area/almayer/shipboard/brig/execution) "tmQ" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F"; @@ -86682,11 +89218,13 @@ /turf/open/floor/almayer, /area/almayer/living/offices) "tov" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/microwave{ + pixel_y = 6; + pixel_x = 4 }, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/prison/kitchen, +/area/almayer/shipboard/brig/yard) "toD" = ( /obj/structure/largecrate/supply/generator, /obj/item/reagent_container/food/drinks/bottle/whiskey{ @@ -86738,8 +89276,14 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) "tpn" = ( -/turf/closed/wall/almayer, -/area/almayer/shipboard/brig/evidence_storage) +/obj/structure/bed, +/obj/item/bedsheet/brown, +/obj/structure/machinery/flasher{ + id = "Cell 4"; + pixel_x = -24 + }, +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/cells) "tpB" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -86931,17 +89475,15 @@ /obj/structure/largecrate/random/barrel/green, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_p) -"tuk" = ( -/obj/structure/machinery/computer/crew, -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/general_equipment) "tul" = ( -/obj/structure/machinery/firealarm{ - dir = 8; - pixel_x = -24 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 }, -/obj/structure/closet/secure_closet/brig/prison_uni, -/turf/open/floor/almayer/red/west, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/perma) "tuo" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, @@ -87023,13 +89565,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_a_s) -"tvJ" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/open/floor/almayer/red/southeast, -/area/almayer/shipboard/brig/starboard_hallway) "tvM" = ( /obj/structure/bed/chair{ dir = 1 @@ -87171,12 +89706,12 @@ /turf/open/floor/almayer/plating_striped/northeast, /area/almayer/underdeck/req) "tzd" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - layer = 1.9 +/obj/structure/machinery/light/small, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/processing) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) "tzr" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -87297,15 +89832,14 @@ /turf/open/floor/almayer/no_build/plating, /area/almayer/underdeck/req) "tBP" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/fancy/cigarettes/lucky_strikes, -/obj/item/tool/lighter, -/obj/item/clothing/glasses/sunglasses/blindfold, -/obj/structure/machinery/light/small{ - dir = 8 +/obj/structure/closet/secure_closet/brig/prison_uni, +/obj/effect/decal/cleanable/dirt, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = 16 }, /turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/execution_storage) +/area/almayer/shipboard/brig/perma) "tBY" = ( /obj/structure/flora/pottedplant/random{ pixel_y = 14 @@ -87337,21 +89871,14 @@ /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) "tCH" = ( -/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{ - closeOtherId = "brignorth"; - dir = 2; - name = "\improper Brig Armoury"; - req_access = null; - req_one_access_txt = "1;3" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/starboard_hallway) +/turf/open/floor/almayer/redcorner/east, +/area/almayer/shipboard/brig/processing) "tCI" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/largecrate/random, @@ -87577,10 +90104,6 @@ /obj/structure/machinery/light, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/starboard_aft_hallway) -"tHS" = ( -/obj/structure/window/framed/almayer, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/cells) "tIa" = ( /obj/structure/platform_decoration/metal/almayer/east, /turf/open/floor/almayer, @@ -87709,31 +90232,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/squads/alpha) -"tLa" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -2; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 2; - pixel_y = 1 - }, -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - dir = 2; - name = "\improper Armory" - }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 2; - id = "firearm_storage_armory"; - name = "\improper Armory Shutters" - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/armory) "tLc" = ( /obj/structure/surface/rack, /obj/item/storage/bag/plants{ @@ -87900,14 +90398,15 @@ /turf/open/floor/almayer, /area/almayer/living/briefing) "tQi" = ( -/obj/effect/landmark/start/warrant, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +/obj/structure/machinery/cm_vending/clothing/military_police{ + pixel_y = 30; + can_block_movement = 0 }, -/obj/effect/landmark/late_join/chief_police, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cryo) +/obj/structure/window/reinforced/toughened{ + dir = 4 + }, +/turf/open/floor/almayer/cargo_arrow/north, +/area/almayer/shipboard/brig/general_equipment) "tQV" = ( /turf/closed/wall/almayer/outer, /area/almayer/lifeboat_pumps/south1) @@ -88014,10 +90513,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_a_s) -"tTO" = ( -/obj/structure/machinery/photocopier, -/turf/open/floor/almayer/red/southwest, -/area/almayer/shipboard/brig/starboard_hallway) "tTZ" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -88040,14 +90535,9 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) "tUK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/red, -/area/almayer/shipboard/brig/starboard_hallway) +/obj/structure/pipes/vents/pump, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig) "tUN" = ( /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ access_modified = 1; @@ -88370,17 +90860,10 @@ /turf/open/floor/almayer/plating, /area/almayer/living/basketball) "uaU" = ( -/obj/structure/surface/table/almayer, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21"; - layer = 3.1; - pixel_y = 11 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/cells) +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/fridge/dry/stock, +/turf/open/floor/prison/kitchen, +/area/almayer/shipboard/brig/yard) "uaV" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment{ @@ -88670,15 +91153,6 @@ /obj/structure/machinery/cm_vending/sorted/marine_food, /turf/open/floor/almayer, /area/almayer/living/briefing) -"ugw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/redcorner, -/area/almayer/shipboard/brig/starboard_hallway) "ugJ" = ( /obj/structure/largecrate/random/case/small, /obj/structure/largecrate/random/mini/small_case{ @@ -88726,8 +91200,30 @@ /turf/open/floor/almayer/red/northeast, /area/almayer/lifeboat_pumps/north1) "uhA" = ( -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/starboard_hallway) +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5; + pixel_x = -1 + }, +/obj/structure/filingcabinet/documentation/military_police/chestdrawer{ + pixel_x = 8; + pixel_y = 16; + name = "documents cabinet"; + can_block_movement = 0 + }, +/obj/structure/transmitter/no_dnd{ + pixel_y = 24; + pixel_x = -8; + phone_category = "MP Dept."; + name = "Brig Cells Telephone"; + phone_id = "Brig Cells" + }, +/obj/structure/sign/safety/commline_connection{ + pixel_x = 15; + pixel_y = 29 + }, +/turf/open/floor/almayer/red/northwest, +/area/almayer/shipboard/brig) "uhE" = ( /obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle, /turf/open/floor/plating/plating_catwalk, @@ -88901,23 +91397,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/auxiliary_officer_office) -"umW" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/structure/machinery/vending/cigarette/free{ - pixel_y = 16; - density = 0 - }, -/obj/structure/machinery/vending/cigarette/koorlander{ - pixel_y = 16; - density = 0 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) "unh" = ( /obj/structure/surface/table/almayer, /obj/item/storage/firstaid/o2, @@ -88928,14 +91407,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/shipboard/port_point_defense) -"uns" = ( -/obj/structure/machinery/portable_atmospherics/hydroponics, -/obj/item/seeds/carrotseed, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer/green/northwest, -/area/almayer/shipboard/brig/cells) "unx" = ( /obj/structure/pipes/standard/simple/visible{ dir = 4 @@ -89214,9 +91685,6 @@ /obj/structure/machinery/cm_vending/clothing/medical_crew/researcher, /turf/open/floor/almayer/mono, /area/almayer/medical/medical_science) -"utZ" = ( -/turf/open/floor/almayer/redcorner/east, -/area/almayer/shipboard/brig/processing) "uuj" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray{ @@ -89242,12 +91710,6 @@ }, /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/south2) -"uun" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/starboard_hallway) "uuu" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -89417,13 +91879,9 @@ /turf/open/floor/almayer/plate, /area/almayer/medical/medical_science) "uxa" = ( -/obj/structure/bed/chair/wood/normal{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/cells) +/obj/structure/machinery/vending/dinnerware/prison, +/turf/open/floor/prison/kitchen, +/area/almayer/shipboard/brig/yard) "uxb" = ( /obj/structure/closet/firecloset, /turf/open/floor/plating/plating_catwalk, @@ -89581,12 +92039,6 @@ }, /turf/open/floor/almayer/orangecorner/east, /area/almayer/engineering/lower/engine_core) -"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) "uAP" = ( /obj/structure/sign/safety/autoopenclose{ pixel_x = 7; @@ -89800,16 +92252,6 @@ /obj/structure/closet/secure_closet/engineering_electrical, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/s_bow) -"uFq" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/lobby) "uFv" = ( /obj/structure/platform/metal/almayer, /turf/open/floor/almayer/plating_stripedcorner/west, @@ -89844,10 +92286,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/medical/morgue) -"uGN" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/general_equipment) "uGQ" = ( /obj/structure/machinery/suit_storage_unit/compression_suit/uscm, /turf/open/floor/almayer/plate, @@ -90041,11 +92479,6 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/vehicle) -"uLE" = ( -/obj/structure/machinery/cm_vending/sorted/medical/blood, -/obj/structure/medical_supply_link, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/shipboard/brig/medical) "uLG" = ( /obj/structure/closet/crate/freezer{ desc = "A freezer crate. Someone has written 'open on christmas' in marker on the top." @@ -90227,12 +92660,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_aft_hallway) -"uQm" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/perma) "uQo" = ( /obj/structure/machinery/disposal, /obj/item/reagent_container/food/drinks/cans/beer{ @@ -90389,12 +92816,12 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_m_s) "uTs" = ( +/obj/structure/machinery/door/airlock/almayer/maint/reinforced, /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; id = "Brig Lockdown Shutters"; name = "\improper Brig Lockdown Shutter" }, -/obj/structure/machinery/door/airlock/almayer/maint/reinforced, /turf/open/floor/almayer/test_floor4, /area/almayer/maint/hull/upper/p_bow) "uTv" = ( @@ -90469,16 +92896,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/shipboard/starboard_point_defense) -"uUu" = ( -/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/red/northeast, -/area/almayer/shipboard/brig/perma) "uUy" = ( /obj/structure/platform_decoration/metal/almayer/west, /turf/open/floor/plating/plating_catwalk, @@ -90527,7 +92944,11 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower/workshop) "uVd" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ +/obj/structure/sign/safety/reception{ + pixel_x = 15; + pixel_y = -25 + }, +/obj/structure/sign/safety/distribution_pipes{ pixel_y = -25 }, /turf/open/floor/almayer/silver, @@ -90560,11 +92981,11 @@ /turf/open/floor/almayer/plating_striped/west, /area/almayer/living/cryo_cells) "uVV" = ( -/obj/structure/machinery/light{ +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/interrogation) "uWc" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer/emeraldfull, @@ -90638,19 +93059,17 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_f_p) "uXu" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "Interrogation Shutters"; - name = "\improper Privacy Shutters" - }, -/obj/structure/machinery/door/airlock/almayer/security{ - dir = 2; - name = "\improper Interrogation" +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/comfy{ + buckling_y = 2; + dir = 8; + pixel_y = 2 }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 +/obj/structure/machinery/firealarm{ + pixel_y = 28 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/interrogation) +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig) "uXy" = ( /obj/structure/window/framed/almayer/hull/hijack_bustable, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -90779,8 +93198,14 @@ /turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/operating_room_one) "vaS" = ( +/obj/effect/landmark/start/police, +/obj/effect/landmark/late_join/police, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = 16 + }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/mp_bunks) +/area/almayer/shipboard/brig/cryo) "vaV" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -90801,27 +93226,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) -"vbo" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - closeOtherId = "brigcells"; - name = "\improper Brig Prisoner Yard" - }, -/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{ - dir = 4; - id = "courtyard_cells"; - name = "\improper Courtyard Lockdown Shutter" - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/processing) "vbB" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south1) @@ -90878,10 +93282,9 @@ /turf/open/floor/almayer/plating/northeast, /area/almayer/hallways/lower/vehiclehangar) "vcm" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = -30 - }, -/turf/open/floor/almayer/red/west, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/perma) "vcu" = ( /obj/effect/landmark/start/engineering, @@ -90905,16 +93308,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_f_s) -"vdl" = ( -/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/plating_striped, -/area/almayer/shipboard/brig/execution) "vdL" = ( /obj/structure/sign/safety/reception{ pixel_x = -17; @@ -90926,16 +93319,6 @@ }, /turf/open/floor/almayer/silver/west, /area/almayer/command/cichallway) -"vdM" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/vending/coffee{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) "vdO" = ( /obj/structure/machinery/chem_dispenser/research{ pixel_y = 2; @@ -91032,10 +93415,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_f_s) -"vgi" = ( -/obj/structure/pipes/vents/scrubber, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/general_equipment) "vgn" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, @@ -91120,7 +93499,11 @@ /turf/open/floor/almayer/blue/northeast, /area/almayer/living/offices/flight) "vhA" = ( -/obj/structure/largecrate/random/barrel/red, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" + }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/p_bow) "vhR" = ( @@ -91243,11 +93626,8 @@ /turf/open/floor/almayer/plating_striped/south, /area/almayer/shipboard/port_missiles) "vjB" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/starboard_hallway) +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig) "vjC" = ( /obj/structure/disposalpipe/trunk{ dir = 8 @@ -91304,28 +93684,16 @@ /obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/almayer/test_floor4, /area/almayer/underdeck/hangar) -"vky" = ( -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "Brig Lockdown Shutters"; - name = "\improper Brig Lockdown Shutter" - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/maint/hull/upper/p_bow) "vkE" = ( /obj/structure/platform_decoration/metal/almayer/west, /turf/open/floor/almayer, /area/almayer/living/chapel) "vkM" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass{ - dir = 1; - name = "\improper Brig Equipment" - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/general_equipment) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/processing) "vkO" = ( /obj/structure/bed, /obj/structure/bed{ @@ -91351,8 +93719,8 @@ /turf/open/floor/carpet, /area/almayer/living/pilotbunks) "vkR" = ( -/obj/structure/machinery/power/apc/almayer/north, /obj/structure/bed/sofa/south/grey, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/silver/north, /area/almayer/shipboard/brig/cic_hallway) "vlj" = ( @@ -91378,14 +93746,11 @@ /turf/open/floor/almayer/redfull, /area/almayer/shipboard/port_missiles) "vlM" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 +/obj/structure/desertdam/decals/road_edge{ + pixel_x = -12 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/almayer/plating, +/area/almayer/shipboard/brig/yard) "vlO" = ( /obj/structure/window/reinforced{ dir = 4; @@ -91585,17 +93950,6 @@ /obj/structure/machinery/light, /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) -"vqc" = ( -/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/test_floor4, -/area/almayer/shipboard/brig/processing) "vqz" = ( /obj/structure/machinery/light{ dir = 4 @@ -91663,13 +94017,6 @@ "vra" = ( /turf/closed/wall/almayer, /area/almayer/squads/charlie_delta_shared) -"vrx" = ( -/obj/structure/machinery/status_display{ - pixel_x = -32; - pixel_y = -32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) "vrI" = ( /obj/structure/machinery/cryopod{ pixel_y = 13; @@ -91779,11 +94126,8 @@ /turf/open/floor/almayer/dark_sterile2, /area/almayer/medical/upper_medical) "vtG" = ( -/obj/structure/toilet{ - dir = 4 - }, -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/warden_office) "vub" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/sea_office) @@ -91972,17 +94316,25 @@ /turf/open/floor/almayer, /area/almayer/engineering/lower) "vxG" = ( -/obj/structure/bed/chair/comfy/black{ +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/almayer/red/southwest, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/visitation) "vxK" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, +/obj/structure/machinery/light/small{ + dir = 1; + pixel_x = -16 }, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/visitation) "vxM" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/cryo) @@ -92027,18 +94379,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_m_s) -"vyi" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/poddoor/almayer/open{ - dir = 4; - id = "Brig Lockdown Shutters"; - name = "\improper Brig Lockdown Shutter" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 8 - }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/processing) "vyk" = ( /obj/structure/cargo_container/uscm/right{ pixel_y = 5 @@ -92102,15 +94442,20 @@ /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_midship_hallway) "vzj" = ( -/obj/structure/machinery/door/airlock/almayer/security/reinforced{ - name = "\improper Chief MP's Bedroom" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/chief_mp_office) -"vzk" = ( -/obj/structure/disposalpipe/segment, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/visitation_waiting) +"vzk" = ( +/obj/structure/surface/table/gamblingtable, +/obj/item/ashtray/plastic, +/obj/item/trash/cigbutt/cigarbutt, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/yard) "vzp" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/emails{ @@ -92123,22 +94468,22 @@ /turf/open/floor/almayer/flooredge/north, /area/almayer/command/corporateliaison) "vzy" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/crew/alt{ + dir = 1; + pixel_y = -4; + pixel_x = 5 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/item/prop/tableflag/uscm{ + layer = 3.03; + pixel_x = -11; + pixel_y = -4 }, -/turf/open/floor/almayer/redcorner/west, -/area/almayer/shipboard/brig/starboard_hallway) +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig) "vzz" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/glass{ - name = "\improper Hydroponics Garden"; - dir = 1 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/yard) "vzB" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F" @@ -92165,15 +94510,16 @@ /turf/open/floor/almayer/plate, /area/almayer/living/grunt_rnr) "vAg" = ( -/obj/structure/largecrate/random/barrel/blue, -/obj/structure/sign/safety/restrictedarea{ - pixel_y = -25 +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + dir = 1; + name = "\improper Brig Maintenance"; + closeOtherId = "permastarboard" }, -/obj/structure/sign/safety/security{ - pixel_x = 15; - pixel_y = -25 +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "perma_lockdown"; + name = "\improper Perma Lockdown Shutter" }, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/s_bow) "vAq" = ( /obj/structure/bed/chair{ @@ -92199,8 +94545,14 @@ /turf/open/floor/almayer/cargo, /area/almayer/squads/alpha) "vAG" = ( -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/visitation_waiting) "vAH" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -92221,15 +94573,10 @@ /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_s) "vBJ" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/pen, -/obj/item/clothing/accessory/device/whistle, -/obj/item/device/megaphone, -/obj/item/paper_bin/uscm{ - pixel_y = 7 - }, -/turf/open/floor/almayer/no_build, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/visitation_waiting) "vBU" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -92276,11 +94623,12 @@ /turf/open/floor/almayer/silver, /area/almayer/shipboard/brig/cic_hallway) "vCy" = ( -/obj/structure/machinery/camera/autoname/almayer/brig{ - dir = 4 +/obj/structure/desertdam/decals/road_edge{ + pixel_x = -12 }, -/turf/open/floor/almayer/green/west, -/area/almayer/shipboard/brig/cells) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plating, +/area/almayer/shipboard/brig/yard) "vCE" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/plating/plating_catwalk, @@ -92441,8 +94789,14 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_f_p) "vGn" = ( -/turf/open/floor/almayer/red/north, -/area/almayer/shipboard/brig/interrogation) +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/almayer/dark_sterile, +/area/almayer/shipboard/brig/chief_mp_office) "vGz" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -92608,8 +94962,16 @@ /turf/open/floor/almayer/red/northeast, /area/almayer/hallways/upper/starboard) "vJc" = ( -/turf/open/floor/almayer/red/east, -/area/almayer/shipboard/brig/warden_office) +/obj/structure/window/reinforced/toughened{ + dir = 4 + }, +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/window, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/visitation) "vJg" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plating_striped/west, @@ -92646,28 +95008,18 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) -"vKr" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - closeOtherId = "brigcells"; - dir = 1; - name = "\improper Brig Prison Yard And Offices" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/processing) "vKB" = ( -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle, -/obj/structure/machinery/light/small{ - dir = 8 +/obj/structure/coatrack{ + pixel_x = -5; + pixel_y = 9 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/armory) +/obj/item/clothing/head/beret/marine/mp/cmp{ + pixel_x = -7; + pixel_y = 22 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) "vKI" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F"; @@ -92755,17 +95107,13 @@ /turf/open/floor/almayer/silver/east, /area/almayer/command/cichallway) "vMJ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/almayer/security/glass{ - name = "\improper Brig Breakroom" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - layer = 1.9 +/obj/structure/stairs{ + dir = 4; + icon_state = "ramptop" }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/mp_bunks) +/obj/structure/platform/metal/almayer_smooth/north, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig) "vMM" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, @@ -92804,16 +95152,6 @@ }, /turf/open/floor/carpet, /area/almayer/living/intel) -"vNp" = ( -/obj/structure/sign/safety/three{ - pixel_x = -17 - }, -/obj/structure/machinery/door/window/brigdoor/southright{ - id = "Cell 3"; - name = "Cell 3" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) "vND" = ( /obj/structure/bed/chair{ dir = 8; @@ -92825,13 +95163,8 @@ /turf/open/floor/almayer, /area/almayer/squads/charlie) "vNT" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/starboard_hallway) +/turf/open/floor/almayer/red/southeast, +/area/almayer/shipboard/brig) "vNW" = ( /turf/open/floor/almayer/uscm/directional/northwest, /area/almayer/command/cic) @@ -92840,14 +95173,18 @@ /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north2) "vOu" = ( -/obj/structure/surface/table/almayer, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser{ - pixel_y = 8 +/obj/structure/platform/metal/almayer_smooth, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" }, -/obj/structure/machinery/recharger, -/turf/open/floor/almayer/red, -/area/almayer/shipboard/brig/mp_bunks) +/obj/structure/platform_decoration/metal/almayer_smooth/west{ + pixel_y = 9; + layer = 3.01 + }, +/turf/open/floor/almayer/red/southeast, +/area/almayer/shipboard/brig) "vOw" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/toolbox, @@ -92894,13 +95231,9 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/port_midship_hallway) "vPf" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/poddoor/almayer/locked{ - dir = 2; - id = "Perma 2"; - name = "\improper cell shutter" - }, -/turf/open/floor/plating, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer/red/west, /area/almayer/shipboard/brig/perma) "vPm" = ( /obj/item/stack/cable_coil, @@ -93146,11 +95479,14 @@ /turf/open/floor/almayer/red/southeast, /area/almayer/hallways/upper/port) "vUI" = ( -/obj/structure/bed/chair/comfy/orange{ - dir = 8 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/warden_office) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/visitation) "vUJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -93164,9 +95500,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_a_p) -"vUP" = ( -/turf/closed/wall/almayer/reinforced, -/area/almayer/shipboard/brig/cic_hallway) "vVb" = ( /obj/structure/machinery/cm_vending/gear/tl{ density = 0; @@ -93272,25 +95605,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/dark_sterile, -/area/almayer/shipboard/brig/cells) "vWJ" = ( /obj/structure/machinery/landinglight/delaytwo{ dir = 4 @@ -93358,25 +95672,16 @@ /turf/open/floor/almayer, /area/almayer/hallways/lower/vehiclehangar) "vYi" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - closeOtherId = "brigwarden"; - 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/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/obj/structure/machinery/door/poddoor/almayer/open{ - dir = 4; - id = "courtyard_cells"; - name = "\improper Courtyard Lockdown Shutter" +/obj/structure/machinery/light/small{ + dir = 1 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/warden_office) +/obj/item/toy/beach_ball, +/turf/open/floor/almayer/dark_sterile, +/area/almayer/shipboard/brig/yard) "vYm" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, @@ -93684,14 +95989,12 @@ /turf/open/floor/almayer/cargo, /area/almayer/engineering/lower/engine_core) "wee" = ( -/obj/effect/landmark/start/police, /obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 + icon_state = "N"; + pixel_y = 2 }, -/obj/effect/landmark/late_join/police, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cryo) +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig/general_equipment) "wer" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/cargo_arrow, @@ -93841,14 +96144,11 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/upper/u_a_s) "whQ" = ( -/obj/structure/closet/secure_closet/personal/cabinet{ - req_access = null - }, -/obj/item/storage/donut_box{ - pixel_y = 8 +/obj/structure/pipes/vents/pump{ + dir = 1 }, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/warden_office) +/turf/open/floor/almayer/redcorner/west, +/area/almayer/shipboard/brig/visitation) "wid" = ( /turf/closed/wall/almayer/outer, /area/almayer/maint/hull/lower/p_bow) @@ -93996,10 +96296,6 @@ }, /turf/open/floor/almayer/orange/northeast, /area/almayer/maint/upper/mess) -"wjY" = ( -/obj/structure/closet/secure_closet/warrant_officer, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/chief_mp_office) "wka" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/sriracha{ @@ -94063,23 +96359,14 @@ /turf/open/floor/almayer/red, /area/almayer/lifeboat_pumps/north2) "wlg" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/door_control{ - id = "Interrogation Shutters"; - name = "\improper Shutters"; - pixel_x = -6; - pixel_y = -6; - req_access_txt = "3" - }, -/obj/item/device/taperecorder{ - pixel_x = 3; - pixel_y = 3 +/obj/structure/machinery/shower{ + dir = 1 }, -/obj/structure/machinery/light/small{ - dir = 8 +/obj/structure/window/reinforced/tinted{ + dir = 4 }, -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/interrogation) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/chief_mp_office) "wlh" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -94208,14 +96495,6 @@ /obj/structure/window/framed/almayer/aicore/hull, /turf/open/floor/plating, /area/almayer/command/airoom) -"wnw" = ( -/obj/structure/machinery/flasher{ - id = "Perma 2"; - pixel_y = 24 - }, -/obj/structure/machinery/camera/autoname/almayer/brig, -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/perma) "wnL" = ( /obj/item/stack/tile/carpet{ amount = 12 @@ -94389,24 +96668,17 @@ /turf/open_space, /area/almayer/medical/containment) "wsh" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/perma) -"wsl" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/lobby) -"wsq" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/machinery/light{ + dir = 4; + invisibility = 00 }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/faxmachine/uscm/almayer/brig{ + sub_name = "Permanent Confinement"; + pixel_y = 2 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/processing) +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/perma) "wsw" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F"; @@ -94469,36 +96741,11 @@ }, /turf/open/floor/almayer/cargo_arrow/north, /area/almayer/squads/delta) -"wtM" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) "wtY" = ( -/obj/structure/surface/table/almayer, -/obj/item/folder/white{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/paper, -/obj/item/restraint/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/machinery/light{ - dir = 1 - }, -/obj/item/tool/stamp/hos{ - pixel_y = 7; - pixel_x = -8; - name = "Chief MP's rubber stamp" - }, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/visitation_waiting) "wub" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -94617,24 +96864,14 @@ /turf/open/floor/almayer/no_build/plating, /area/almayer/underdeck/req) "wvE" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/cameras/almayer_network{ - dir = 4; - pixel_y = 1 - }, -/obj/structure/machinery/light{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/almayer/red/north, -/area/almayer/shipboard/brig/chief_mp_office) -"wvI" = ( -/obj/item/paper_bin/uscm{ - pixel_y = 7 +/obj/structure/sign/safety/security{ + pixel_y = 25 }, -/obj/item/tool/pen, -/obj/structure/surface/table/reinforced/black, -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/almayer/silvercorner/east, +/area/almayer/shipboard/brig/visitation_waiting) "wvU" = ( /obj/structure/surface/rack, /obj/item/reagent_container/spray/cleaner{ @@ -94740,11 +96977,16 @@ /turf/open/floor/almayer/flooredgesmooth2/south, /area/almayer/hallways/lower/starboard_aft_hallway) "wxF" = ( -/obj/structure/closet/secure_closet/cmdcabinet/comms_mp{ - pixel_y = 24 +/obj/structure/window/reinforced/toughened{ + dir = 4 }, -/turf/open/floor/almayer/red/northeast, -/area/almayer/shipboard/brig/warden_office) +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/paper_bin/uscm{ + pixel_y = 7 + }, +/obj/item/tool/pen, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/visitation) "wxU" = ( /obj/item/ashtray/bronze{ pixel_x = 7; @@ -94908,21 +97150,16 @@ /turf/closed/wall/almayer/outer/internal, /area/almayer/maint/hull/lower/stairs) "wDs" = ( -/obj/structure/machinery/seed_extractor, -/obj/structure/sign/safety/terminal{ - pixel_x = -6; - pixel_y = -26 - }, -/obj/structure/sign/safety/high_voltage{ - pixel_x = 7; - pixel_y = -26 +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal3"; + pixel_y = -12 }, -/obj/structure/sign/safety/hazard{ - pixel_x = 20; - pixel_y = -26 +/obj/structure/desertdam/decals/road_edge{ + pixel_x = 2 }, -/turf/open/floor/almayer/green, -/area/almayer/shipboard/brig/cells) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plating, +/area/almayer/shipboard/brig/yard) "wDy" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -94933,15 +97170,11 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/command/computerlab) "wDC" = ( -/obj/structure/machinery/door/window/brigdoor/southright{ - id = "Cell 5"; - name = "Cell 5" - }, -/obj/structure/sign/safety/five{ - pixel_x = -17 +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/processing) "wDG" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -95062,9 +97295,6 @@ "wFp" = ( /turf/open/floor/almayer/no_build, /area/almayer/underdeck/req) -"wFs" = ( -/turf/closed/wall/almayer, -/area/almayer/shipboard/brig/starboard_hallway) "wFz" = ( /obj/item/prop{ desc = "Predecessor to the M56 the M38 was known for its extreme reliability in the field. This particular M38D is fondly remembered for its stalwart defence of the hangar bay during the Arcturian commando raid of the USS Almayer on Io."; @@ -95238,12 +97468,16 @@ /turf/open/floor/almayer/sterile_green_side/east, /area/almayer/medical/operating_room_four) "wJh" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ + closeOtherId = "briglobby"; + name = "\improper Brig Equipment" + }, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 }, -/obj/structure/window/framed/almayer, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/cryo) +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/general_equipment) "wJo" = ( /obj/structure/flora/bush/ausbushes/lavendergrass{ name = "fake lavendergrass"; @@ -95332,15 +97566,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/command/combat_correspondent) -"wKJ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) "wKL" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -95404,20 +97629,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/upper/fore_hallway) -"wLF" = ( -/obj/structure/machinery/door/airlock/almayer/medical/glass{ - closeOtherId = "brigmed"; - name = "\improper Brig Medbay"; - req_access = null; - req_one_access = null; - req_one_access_txt = "20;3" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/medical) "wLG" = ( /obj/item/bedsheet/blue{ layer = 3.2 @@ -95460,17 +97671,14 @@ /turf/closed/wall/almayer/white/hull, /area/almayer/medical/hydroponics) "wLS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/almayer/red, -/area/almayer/shipboard/brig/starboard_hallway) +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig) "wMl" = ( /obj/structure/sign/safety/two{ pixel_x = 32; @@ -95548,9 +97756,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/req) -"wNt" = ( -/turf/open/floor/almayer/redcorner/north, -/area/almayer/shipboard/brig/processing) "wNz" = ( /turf/open/floor/almayer/plating_striped/east, /area/almayer/stair_clone/lower/starboard_aft) @@ -95668,14 +97873,40 @@ /turf/open/floor/almayer, /area/almayer/command/lifeboat) "wRN" = ( -/obj/structure/machinery/portable_atmospherics/hydroponics, -/obj/item/seeds/goldappleseed, -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal3"; + pixel_y = -12 }, -/turf/open/floor/almayer/green, -/area/almayer/shipboard/brig/cells) +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal5"; + pixel_x = -16; + pixel_y = 16 + }, +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal6"; + pixel_x = 16; + pixel_y = 16 + }, +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal7"; + pixel_x = 16; + pixel_y = -16 + }, +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal8"; + pixel_x = -16; + pixel_y = -16 + }, +/obj/structure/holohoop/noshimmy{ + id = "prisonbball"; + side = "right"; + can_block_movement = 0; + dir = 1; + layer = 1; + pixel_y = -13 + }, +/turf/open/floor/almayer/plating, +/area/almayer/shipboard/brig/yard) "wRO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -95698,24 +97929,29 @@ /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "wSm" = ( -/obj/structure/disposalpipe/segment{ +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/poddoor/almayer/locked{ + id = "Cell 1"; + name = "\improper Courtyard Divider"; dir = 4 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter" }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/processing) +/obj/structure/machinery/door/airlock/almayer/generic, +/turf/open/floor/almayer/test_floor4, +/area/almayer/shipboard/brig/cells) "wSn" = ( /turf/open/floor/almayer/dark_sterile, /area/almayer/engineering/laundry) "wSu" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/lobby) @@ -95853,12 +98089,9 @@ /turf/open/floor/almayer/plate, /area/almayer/living/grunt_rnr) "wVh" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/warden_office) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/red/southwest, +/area/almayer/shipboard/brig/visitation) "wVt" = ( /obj/structure/ladder/multiz, /turf/open/floor/almayer/plate, @@ -95986,12 +98219,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_a_p) -"wXz" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/starboard_hallway) "wXH" = ( /obj/structure/bed/chair{ dir = 1 @@ -96058,8 +98285,30 @@ /turf/open/floor/almayer_hull/outerhull_dir/east, /area/almayer/engineering/upper_engineering/port) "wZL" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/almayer, +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/secure_data{ + dir = 8; + pixel_y = 13; + layer = 3 + }, +/obj/structure/machinery/door_control{ + id = "Brig Lockdown Shutters"; + name = "Brig Lockdown Shutters"; + pixel_x = 6; + pixel_y = 1; + req_access_txt = "3" + }, +/obj/structure/machinery/door_control{ + id = "perma_lockdown"; + name = "\improper Perma Cells Lockdown"; + pixel_x = -5; + pixel_y = 1; + req_access_txt = "3" + }, +/obj/structure/sign/safety/terminal{ + pixel_x = 33 + }, +/turf/open/floor/almayer/red/east, /area/almayer/shipboard/brig/perma) "wZX" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom{ @@ -96110,7 +98359,7 @@ /area/almayer/maint/hull/upper/p_bow) "xaC" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/tool/kitchen/utensil/pfork{ +/obj/item/tool/kitchen/utensil/fork/plastic{ pixel_x = -6; pixel_y = 5 }, @@ -96130,27 +98379,14 @@ /turf/open/floor/almayer/no_build/plate, /area/almayer/underdeck/vehicle) "xaM" = ( -/obj/structure/surface/table/almayer, -/obj/item/newspaper{ - name = "character sheet"; - pixel_x = -6 - }, -/obj/item/newspaper{ - name = "character sheet"; - pixel_x = 4; - pixel_y = 8 - }, -/obj/item/toy/dice/d20, -/obj/item/toy/crayon/blue{ - pixel_x = -7; - pixel_y = 7 - }, -/obj/item/paper_bin/uscm{ - pixel_y = 7 +/obj/structure/closet/secure_closet/fridge/groceries/stock, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5; + pixel_x = -1 }, -/obj/item/tool/pen, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/prison/kitchen, +/area/almayer/shipboard/brig/yard) "xaN" = ( /obj/structure/surface/table/almayer, /obj/item/tool/kitchen/knife, @@ -96220,12 +98456,14 @@ /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) "xdJ" = ( -/obj/structure/machinery/light{ +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/poddoor/almayer/locked{ dir = 4; - invisibility = 101 + id = "Perma 2"; + name = "\improper cell shutter" }, -/turf/open/floor/almayer/cargo, -/area/almayer/shipboard/brig/execution) +/turf/open/floor/plating, +/area/almayer/shipboard/brig/perma) "xdP" = ( /obj/structure/surface/table/almayer, /obj/item/trash/uscm_mre, @@ -96429,13 +98667,6 @@ }, /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/south1) -"xhx" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) "xhO" = ( /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_a_p) @@ -96444,9 +98675,14 @@ /turf/open/floor/almayer/plate, /area/almayer/squads/bravo) "xhU" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/starboard_hallway) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig) "xhW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -96461,13 +98697,15 @@ /turf/open/floor/carpet, /area/almayer/command/cicconference) "xik" = ( -/obj/structure/machinery/shower{ - dir = 8 +/obj/structure/desertdam/decals/road_edge{ + pixel_x = 2 }, -/obj/item/toy/inflatable_duck, -/obj/structure/window/reinforced, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) +/obj/structure/desertdam/decals/road_edge{ + pixel_x = 2; + pixel_y = -6 + }, +/turf/open/floor/almayer/plating, +/area/almayer/shipboard/brig/yard) "xiH" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/almayer/plate, @@ -96525,26 +98763,6 @@ }, /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/north1) -"xjF" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/surface/table/almayer, -/obj/structure/sign/safety/terminal{ - pixel_x = 3; - pixel_y = 27 - }, -/obj/structure/sign/safety/rewire{ - pixel_x = 15; - pixel_y = 27 - }, -/obj/structure/machinery/computer/cameras/almayer_brig{ - desc = "Used to access the various cameras in the security brig."; - dir = 4; - name = "brig cameras console" - }, -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/processing) "xjK" = ( /obj/structure/sign/safety/hazard{ pixel_y = 25 @@ -96752,11 +98970,16 @@ /turf/open/floor/almayer/blue/east, /area/almayer/hallways/lower/port_midship_hallway) "xpw" = ( -/obj/structure/machinery/medical_pod/sleeper{ - dir = 8 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/faxmachine/uscm/almayer/brig{ + sub_name = "Processing"; + pixel_x = -4 }, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/shipboard/brig/medical) +/obj/structure/sign/safety/terminal{ + pixel_y = -25 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/processing) "xpL" = ( /obj/structure/machinery/light/red{ light_color = "#BB3F3F"; @@ -96859,14 +99082,13 @@ /area/almayer/command/lifeboat) "xrt" = ( /obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 + dir = 4 }, -/obj/structure/sign/safety/rewire{ - pixel_x = 12; - pixel_y = -24 +/obj/structure/disposalpipe/junction{ + dir = 4 }, -/turf/open/floor/almayer/red, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer/red/east, +/area/almayer/shipboard/brig/visitation) "xry" = ( /obj/structure/window/reinforced/toughened{ dir = 4; @@ -97004,12 +99226,9 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/squads/charlie) "xvQ" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/sentencing{ - dir = 8 - }, -/turf/open/floor/almayer/red/east, -/area/almayer/shipboard/brig/processing) +/obj/structure/bed/chair/wood/normal, +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig/yard) "xvX" = ( /obj/structure/machinery/cm_vending/gear/leader, /turf/open/floor/almayer/plate, @@ -97522,10 +99741,13 @@ /turf/open/floor/almayer/plate, /area/almayer/living/gym) "xGh" = ( -/obj/structure/machinery/portable_atmospherics/hydroponics, -/obj/item/seeds/goldappleseed, -/turf/open/floor/almayer/green/north, -/area/almayer/shipboard/brig/cells) +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal5"; + pixel_x = -2; + pixel_y = 4 + }, +/turf/open/floor/almayer/plating, +/area/almayer/shipboard/brig/yard) "xGo" = ( /obj/structure/machinery/autolathe, /turf/open/floor/almayer/cargo, @@ -97638,27 +99860,6 @@ }, /turf/open/floor/almayer/cargo, /area/almayer/medical/lower_medical_medbay) -"xIq" = ( -/obj/structure/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/evidence_storage) -"xIu" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/secure_data{ - dir = 8 - }, -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -14; - pixel_y = 28 - }, -/turf/open/floor/almayer/red/east, -/area/almayer/shipboard/brig/processing) "xIz" = ( /obj/structure/surface/rack, /obj/structure/surface/rack{ @@ -97681,28 +99882,25 @@ /turf/open/floor/almayer, /area/almayer/living/offices/cryo) "xIW" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/surface/table/almayer, -/obj/item/book/manual/marine_law{ - pixel_x = -3; - pixel_y = 1 +/obj/structure/bed/chair{ + dir = 8 }, -/obj/item/device/flashlight/lamp{ - layer = 3.1; - pixel_x = 7; - pixel_y = 10 +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera"; + dir = 8 }, -/obj/item/poster, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/almayer/silver/east, /area/almayer/shipboard/brig/lobby) "xJe" = ( -/turf/open/floor/almayer/greencorner/west, -/area/almayer/shipboard/brig/cells) +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal3"; + pixel_y = -12 + }, +/obj/structure/desertdam/decals/road_edge{ + pixel_x = 2 + }, +/turf/open/floor/almayer/plating, +/area/almayer/shipboard/brig/yard) "xJh" = ( /obj/structure/surface/table/almayer, /obj/item/storage/toolbox/mechanical, @@ -97727,11 +99925,18 @@ /turf/open/floor/almayer, /area/almayer/hallways/hangar) "xJT" = ( -/obj/structure/toilet{ - dir = 4 +/obj/structure/bed/chair{ + can_buckle = 0; + dir = 4; + pixel_x = 1; + pixel_y = 3 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) +/obj/structure/machinery/light{ + dir = 8; + pixel_y = -16 + }, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/yard) "xJV" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/cell_charger, @@ -97794,19 +99999,19 @@ /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "xLl" = ( -/obj/structure/machinery/cm_vending/clothing/military_police{ - density = 0; - pixel_y = 16 - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 8 +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light/small{ + dir = 1 }, -/turf/open/floor/almayer/cargo, -/area/almayer/shipboard/brig/general_equipment) +/obj/structure/ladder/multiz, +/obj/structure/ladder/multiz, +/obj/structure/ladder/multiz, +/obj/structure/ladder/multiz, +/obj/structure/ladder/multiz, +/obj/structure/ladder/multiz, +/obj/structure/ladder/multiz, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/evidence_storage) "xLn" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer/plate, @@ -98187,7 +100392,6 @@ /turf/open/floor/almayer/red/east, /area/almayer/hallways/lower/starboard_midship_hallway) "xSz" = ( -/obj/structure/surface/table/almayer, /obj/structure/machinery/status_display{ pixel_y = 30 }, @@ -98231,10 +100435,9 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/p_stern) "xTH" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/recharger, -/turf/open/floor/almayer/red, -/area/almayer/shipboard/brig/processing) +/obj/structure/pipes/standard/manifold/fourway/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/yard) "xTR" = ( /obj/structure/machinery/door_control{ dir = 1; @@ -98404,18 +100607,6 @@ "xXh" = ( /turf/closed/wall/almayer/research/containment/wall/west, /area/almayer/medical/containment/cell) -"xXj" = ( -/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{ - dir = 2; - name = "\improper Isolation Cell" - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/perma) "xXk" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -98608,12 +100799,14 @@ /turf/open/floor/plating, /area/almayer/maint/lower/constr) "ybz" = ( -/obj/structure/machinery/brig_cell/cell_4{ - pixel_x = 32; - pixel_y = -32 +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 2; + id = "Cell Privacy Shutters"; + name = "\improper Cell Privacy Shutters" }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/processing) +/turf/open/floor/plating, +/area/almayer/shipboard/brig/cells) "ybP" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -98644,11 +100837,11 @@ /turf/open/floor/plating, /area/almayer/maint/hull/lower/l_m_s) "ycm" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 +/obj/structure/desertdam/decals/road_edge{ + pixel_x = 16 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/almayer/plating, +/area/almayer/shipboard/brig/yard) "ycx" = ( /obj/structure/bed/chair/comfy/delta{ dir = 8 @@ -98782,13 +100975,12 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) "yeR" = ( -/obj/structure/machinery/cm_vending/clothing/senior_officer{ - req_access = null; - req_access_txt = 19; - req_one_access = null +/obj/structure/reagent_dispensers/water_cooler/stacks{ + density = 0; + pixel_y = 16 }, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer/silver/northeast, +/area/almayer/shipboard/brig/visitation_waiting) "yff" = ( /obj/structure/machinery/cm_vending/clothing/dress{ density = 0; @@ -98879,12 +101071,6 @@ /obj/item/fuel_cell, /turf/open/floor/almayer/cargo, /area/almayer/engineering/lower/engine_core) -"yhg" = ( -/obj/structure/machinery/camera/autoname/almayer/brig{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) "yht" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -98911,12 +101097,10 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_s) "yhV" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1; - name = "Bathroom" - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/shipboard/brig/mp_bunks) +/obj/structure/stairs/multiz/down, +/obj/structure/platform/metal/almayer_smooth/west, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig) "yhZ" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -99001,15 +101185,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/stern) -"yjG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/lobby) "yjM" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -136705,7 +138880,7 @@ aad nBJ avo auZ -bTW +eQR aiX aiX aiX @@ -136911,7 +139086,7 @@ aad nBJ avs eQR -eQR +bTW aiX aqv bKP @@ -166681,7 +168856,7 @@ aaa aaa bdH bdH -bdH +byx byx bhL bhp @@ -166708,10 +168883,10 @@ aSg aMk bbR bwT -aQe +aWs aNZ bwN -bdH +bwN bdH bdH aaa @@ -166784,8 +168959,8 @@ aaa aaa bdH bdH -bdH byx +bmn aJS bhr byj @@ -166813,10 +168988,10 @@ aMp bwT aZb aQf +akx bwN bdH bdH -bdH aaa aaa aaa @@ -166887,8 +169062,8 @@ aaa aaa bdH bdH -bdH byx +bnC bhs bhs byj @@ -166916,10 +169091,10 @@ bbT bwT aZb aQf +akx bwN bdH bdH -bdH aaa aaa aaa @@ -166987,11 +169162,11 @@ aaa aaa aaa aaa -aaa -bdH -bdH byx byx +byx +byx +bnE bhm bhm byj @@ -167017,13 +169192,13 @@ aMs aMs aMs bwT -aZo -aWs +alb +aQe +bwT +bwN +bwN bwN bwN -bdH -bdH -aaa aaa aaa aaa @@ -167089,14 +169264,14 @@ aaa aaa aaa aaa -aaa -aaa -bdH -bdH byx -aJh -bhr -bhr +byx +cjb +bRZ +aOf +bot +bhd +bhQ byj aMh aMh @@ -167123,11 +169298,11 @@ bwT aZb aZb bwT +bFV +bFV +bFV +bwN bwN -bdH -bdH -bdH -bdH bdH bdH aaa @@ -167192,22 +169367,22 @@ aaa aaa bdH bdH -bdH -bdH -bdH byx -byx -aJh -bhr -aJS -alU -alU -alU -alU -alU -alU -alU -alU +cjq +cje +bcq +bcq +bcq +bcq +bcq +mtl +mtl +mtl +mtl +mtl +mtl +mtl +mtl alU alU syg @@ -167226,11 +169401,11 @@ bwT aZb aZb bwT +bFV +bFV +bFV +bFV bwN -bwN -bdH -bdH -bdH bdH bdH aaa @@ -167296,21 +169471,21 @@ aaa bdH byx byx -byx -byx -byx -aJh -aJh -bhL -bhp -alU -bFY -bFY -bFY -bFY -bFY -bFY -alU +cjr +aJS +bcq +bul +boC +bho +bcr +aVZ +aVj +aRJ +aJD +aBe +auv +ale +mtl azA grG bLs @@ -167330,9 +169505,9 @@ aRD bay bwT bwT -bwN -bwN -bwN +bwT +bwT +bwT bwN bwN bdH @@ -167399,21 +169574,21 @@ aaa bdH byx aJT -biR -biK -aOf -bil +cjs +bje +bcq +bun bia -bhQ -aTU -alU -bFY -bFY -bFY -bFY -bFY -bFY -alU +bhB +bdT +aVZ +aVk +jNT +aLZ +aCw +ava +alE +mtl bGS azA bLs @@ -167502,21 +169677,21 @@ aaa bdH byx aJV -biR -biK -aOf -bil -bia +cjs +bje +bcq +bid +bqa bhR -bhz -alU -bFY -bFY -bFY -bFY -bFY -bFY -alU +bdT +aVZ +aVp +aSs +aLZ +aCw +avG +anr +mtl alU alU iTW @@ -167606,20 +169781,20 @@ bdH byx biN biS -biL -aJh -aJh -aJh -aJh -aJh -alU -bFY -bFY -bFY -bFY -bFY -bFY -alU +bcq +bcq +bvk +bcq +bcq +bcq +aVZ +aVv +jNT +aLZ +aCw +avG +aoq +mtl alU ayw ayw @@ -167709,20 +169884,20 @@ bdH byx bhs biM -biM -aJh -bGf -bGf -bGf -bGf -bFY -bFY -bFY -bFY -bFY -bFY -bFY -alU +bcq +bcq +bvp +bcq +bhO +beC +aVZ +aUH +aUH +aMg +aCF +axn +aoq +mtl ayw ayw byh @@ -167812,20 +169987,20 @@ bdH byx bja biT -biN -aJh -bGf -bGf -bGf -bGf -bFY -bFY -bFY -bFY -bFY -bFY -bFY -alU +bcq +bST +bvy +brk +bhZ +beJ +mtl +aVw +aNr +aNr +aEp +ayF +aqP +mtl bGS byh aNk @@ -167914,21 +170089,21 @@ aaa bdH byx biU -biU -aJS -aJh -bGf -bGf -bGf -bGf -bFY -bFY -bFY -bFY -bFY -bFY -bFY -alU +bhr +bcq +bUm +bid +bid +bid +bfO +aWS +aVy +aUP +aOd +aEU +ayF +aqS +mtl aIw aNp aNn @@ -168017,21 +170192,21 @@ aaa bdH byx biW -biW -biO -aJh -bGf -bGf -bGf -bGf -bFY -bFY -bFY -bFY -bFY -bFY -bFY -alU +cju +bcq +bUB +bvA +brl +bid +bgb +mtl +mtl +mtl +mtl +mtl +ayO +mtl +mtl aIw aNp aNo @@ -168119,22 +170294,22 @@ aaa aaa bdH byx -bje -biU bhr -aJh -bGf -bGf -bGf -bGf -bFY -bFY -bFY -bFY -bFY -bFY -bFY -alU +bhr +bcq +bUF +bwy +bgN +bij +bgy +bbo +aVE +aUQ +aPp +aFa +ayP +asu +xyN aIw aNp aNo @@ -168223,21 +170398,21 @@ aaa bdH byx bjn -aJW -aJW -alU -alU -alU -alU -alU -alU -alU -alU -alU -alU -alU -alU -alU +cjv +cjh +bVe +bwy +bgN +bgN +bgN +bcl +aVH +aRd +aRd +aGQ +ayW +xyN +xyN pQz alU alU @@ -168327,19 +170502,19 @@ byx byx biK biK -aJQ -alU +bcq +bVE bir -bgn bhE +biE bhE -bha +bcl bgS -bgG +bgn bgn bgh -alU -alU +xyN +xyN byh aIE aIw @@ -168430,18 +170605,18 @@ bjP biK biK biK -biK -aMR +cji +caj bis -bic -aYG -aYG -bhk -aYG -aYO +bgX +bkM +bgX +bcl +aVU +aVb bgr bgi -bef +ayX azA bhN aIF @@ -168531,20 +170706,20 @@ byx aJh bjV aJh -aJh -aJh -aJh -alU -alU -alU -alU -alU -alU -alU -alU -alU -alU -alU +lrq +lrq +lrq +chc +byq +btj +bgN +bgN +bcl +xyN +xyN +xyN +xyN +xyN azA bhN aIF @@ -168634,12 +170809,12 @@ byx bkn bjX bjG -aJh -bGf -bGf -bGf -bGf -aJh +lrq +cjw +cjj +ciU +bys +lrq azJ azJ azJ @@ -168737,12 +170912,12 @@ byx bkq bhs bjH -aJh -bGf -bGf -bGf -bGf -aJh +lrq +cjx +ciV +ciV +bGk +lrq azJ azJ azJ @@ -168837,15 +171012,15 @@ bdH bdH bdH byx -bkt -aJS +bkU +cjJ biR -aJh -bGf -bGf -bGf -bGf -aJh +lrq +cjy +cjl +ciW +bGv +lrq aJF aDe aDe @@ -168942,13 +171117,13 @@ bdH byx bkv aJS -biR -aJh -bGf -bGf -bGf -bGf -aJh +cjH +btk +cjz +btk +ciX +btk +btk aFG aLq acL @@ -169045,13 +171220,13 @@ bdH byx bkw biM -bjI -aJh -bGf -bGf -bGf -bGf -aJh +cjH +cjD +ciY +uqo +ciY +bGW +btk acL aBf aBf @@ -169148,13 +171323,13 @@ bdH byx bkx aJS -bjL -aJh -bGf -bGf -bGf -bGf -aJh +cjH +uhE +ciY +qMD +ciY +bLG +btk aBf aBf and @@ -169251,13 +171426,13 @@ bdH byx bkC bjY -bjN -aJh -bGf -bGf -bGf -bGf -aJh +cjI +cjF +ciZ +cjn +ciZ +bLM +btk bjc aLn aJp @@ -169354,13 +171529,13 @@ bdH byx aJh bkc -aJh -aJh -bGf -bGf -bGf -bGf -aJh +btk +chv +ciY +cjo +ciY +bMQ +btk baA bhv aJo @@ -169457,13 +171632,13 @@ bdH byx bkD biL -aJh -bGf -bGf -bGf -bGf -bGf -aJh +btk +chv +ciY +uqo +cja +bMQ +btk baA bhv aJo @@ -169560,13 +171735,13 @@ bdH byx bkI aJS -aJh -bGf -bGf -bGf -bGf -bGf -aJh +btk +cjG +cjB +cjp +ciY +bPi +btk baA bhv aJo @@ -169663,13 +171838,13 @@ bdH byx bkw biM -aJh -bGf -bGf -bGf -bGf -bGf -aJh +buk +buk +buk +buk +buk +buk +buk baA anS aJo @@ -195326,17 +197501,17 @@ aaa aaa aaa aaa -aaa -aad -feb -feb -feb -feb -feb -feb -feb -ajZ -aaa +aac +aag +hPI +hPI +hPI +hPI +hPI +hPI +hPI +aag +ajY aaa aaa aaa @@ -195429,20 +197604,20 @@ aac aaf aaf aaf -aaf aag -feb -qmR -oog -dsA +cnY +hPI +rib rbK -tmH -feb +naB +rbK +rib +hPI +hPI aag aaf aaf aaf -aaf ajY aaa aaa @@ -195529,23 +197704,23 @@ aaa aaa aaa aad -hPI -hPI -hPI -hPI -hPI -feb -dhd +cnY +cnY +cnY +cnY +cnY +cnO +pHp oog -jNT +naB fag -qCA +pHp feb +hPI hRu -hRu -hRu -hRu -hRu +hPI +hPI +hPI ajZ aaa aaa @@ -195632,23 +197807,23 @@ aaa aac aaf aag -hPI -naB -naB -naB +cnY +coE +cou +coh +cHk +rXE +fgl +dBS naB -mtl -vdl -nPb -fZX dBS -nSu +fgl rXE -xyN +naB ltO tBP tfE -hRu +hPI aag aaf ajY @@ -195735,23 +197910,23 @@ aaa aad uDg uDg -hPI +cnY pQr -rib +cow vtG -naB -mtl +cHk +cnP eCI nOC -qVF +naB xdJ kzr jqY -elV -dJJ +naB +cmt dJJ glP -hRu +hPI xiV xiV ajZ @@ -195838,23 +198013,23 @@ aaf uDg uDg jvB -naB -wnw -pHp -fgl -dya +cHk +cHk +cHk +coi +cHk fLF -kEq -mtl -mtl -mtl -mtl +qPD +cnf +cnf +cnf +qPD ewI -xyN -hdQ +cmE +fgl hUU cXD -xyN +naB gxm xiV xiV @@ -195939,25 +198114,25 @@ uDg uDg uDg uDg -gkr -mCL +cph +jvB naB -pQr +coF jeR -wvI +cnG vPf fvA -qPD +cnG vcm tul -mNK +qPD gtU bjk -xyN -xyN -xyN -xyN -xyN +naB +naB +naB +naB +naB dJy pdp xiV @@ -196036,36 +198211,36 @@ aaa aad uDg cth +cth +cqf +gxI gkr xkc -oGj -iVD xkc -sLk -xkc -xkc -naB -naB -naB -naB +gkr +gkr +coQ +cns +cox +cok aaT -dcy -qPD -qPD qPD +sPF qPD +cnp +cng quJ rdA dbs -sql +pdp jyY -rwe pdp +clD oDh oDh pdp pdp -ohu +pdp iUh pdp pdp @@ -196140,36 +198315,36 @@ aag uDg gkr xkc -gkr +xkc vAg -gxI -kqC -bBU +cYo +gkr +gkr xkc -eeA +coP +naB +coG +naB naB -pQr -ggS -wvI piK -fvA -qPD +cnQ +cnJ wZL -ffg +cns ffg wsh eMJ -xkd -xkd -xkd -xkd -xkd -xkd +naB +cjL +cjL +cjL +cjL +cjL lRt tsE iVG -hmA -hmZ +pdp +aCA oDh oDh pdp @@ -196243,37 +198418,37 @@ uDg uDg gkr xkc -hvd -hvd -hvd -hvd -hvd -bLF -eyD -naB +wIC +wIC +wIC +wIC +coP +coP +coP +coR kry -pHp -fgl -xXj -qXE -qPD -sPF -qPD -qPD -uQm -stO -xkd +coy +naB +naB +naB +naB +naB +cnt +naB +naB +naB +naB teE xJT -xkd ljS -xkd -xkd -xkd -xkd -xkd -xkd -xkd +ljS +cjL +cjL +cjL +cjL +cjL +cjL +cjL pdp oDh xiV @@ -196346,37 +198521,37 @@ uDg pOp gkr cth -hvd +wIC ddj wlg -fuY -hvd -cQG +wIC +cpx +cpi jXc -naB -pQr +coS +coH bsp hCV -naB -naB -uUu +uvY +cnT +xkd qCU qZF -qPD +cnh iQd qJo -xkd -vWG -lJL -dQp +cmF +vlM +vlM +vlM vlM iHG dCe -moB -uns +ckD +vCy vCy eyV -xkd +cjL mkF oDh pdp @@ -196449,37 +198624,37 @@ uDg lDT xkc xyZ -hvd +wIC vGn aaV -ehl +wIC uXu -cQG +cpl alp -naB -naB -naB -naB -naB -naB -nVR -nVR +coS +coH +coz +col +tUx +iTI nVR +ckE +ckn nux tau -nVR -xkd +qJo +cmG xik bjQ -xkd -kmd -tUx -ebd -tHS +ckk +ckk +ckk +ckk +ckk xGh -jVa +cki wDs -xkd +cjL oHf oDh pdp @@ -196549,41 +198724,41 @@ bdH aad aag uDg -xkc -gkr -hvd -hvd -iRp -iRp +cqq +cqo +wIC +wIC iRp -hvd -cyc +wIC +wIC +cpy +cpb vzy fqQ kHo sFu -hnE -tTO -wFs -nkX -iQB -cmv -vzk -phN -iVP -xkd xkd +qFu xkd xkd -umW -iOD +iQB +cmv +vzk +tau +qJo +cmH +ckk +cmi +ckk +ckk iOD -tHS +ckk +ckk sqW -tUx +ckk wRN -xkd -xkd +cjL +cjL pdp oDh xiV @@ -196654,39 +198829,39 @@ aag lrE xkc gkr -hvd +wIC iUX -gii -gIO +aTg gIO -hvd -gYx +wIC +cpA +cpb oyC -bKI -xhU +coS xhU +bsp jCX -cQG +uvY iNh -pyj -pyj -pyj -pyj -cMl -icZ xkd -uvY +cny +ckn +cMl +cMl +qJo +cmI +cmu oBq -xkd -wKJ -jVa -jVa -tHS +ckk +ckk +ckk +ckk +ckk sVc -tUx +cki xJe qLt -xkd +cjM pdp oDh cPj @@ -196757,39 +198932,39 @@ aag lrE gkr xkc -hvd -iUX -gJE +wIC +cqg +aTg cKJ -hyV +wIC keG +cpm +cpb +coS +coH +coz cQG -cQG -ugw -cwC -cwC -cQG -cwC -uun -oRk -oRk -oRk -utZ -aaB -hTt -kMH tUx iTI -dmZ -eZH -jVa -jVa -tHS -xGh +cnK +ckE +ckn +aaB +aaB +qJo +kMH +cmw +ycm +ycm +ycm +ycm +ycm +ycm +ycm ycm qCo pWr -xkd +cjM aGa oDh cPj @@ -196860,39 +199035,39 @@ aag lrE vDh xkc -lrq -lrq -lrq -lrq -lrq -lrq -lrq +wIC +cqh +aTg +wIC +wIC +wIC +wIC uhA aaP -tpn -tpn -srT -tpn -tpn -xjF -myP -gDt -bju -cMl -lMc +coH +coA xkd qFu xkd xkd -vdM -jVa -wtM -moB -sXQ -cyZ -jVa +myP +gDt +lMc +lMc +lMc +cjX +cjX +cjX +ckE +cjX +cjX +cjX +ckE +cjX +cjX +cjX fJT -xkd +cjM rfB pdp cPj @@ -196963,39 +199138,39 @@ aag uDg cth qsp -lrq -kEc -chv -cAy -uhE +wIC +wIC +cpW +wIC +cpG vKB -lrq +cpn vjB tUK -tpn -eVR +kHo +bsp cak -vrM +uvY tpn -mHb +xkd hjM xTH -bju -wSm -dEG -xkd -uvY -duT -xkd +ckT +ckT ade -jVa -jVa -moB -moB +ckT +ckT +ckT +ckT +ade +ckT +ckT +ckF +cks dfk vzz moB -xkd +cjL gNZ pdp xiV @@ -197066,39 +199241,39 @@ aag uDg cUl gkr -lrq +wIC heo +aTg +aTg nqe -nqe -nqe -nqe -tLa -cQG -gfd -tpn -rqS -cak -vrM -tpn -pUD -bju -pyj -pyj -wSm -dPT -kVZ +aTg +wIC +cpc +coz +xhU +coz +com tUx iTI -nUj -eZH -tUx -vrx -yhg +pUD +cnz +ckn +ckE +ckE +ckE +ckE +ckE +ckE +ckE +ckE +ckE +ckE +ckn lbs -eZH -tUx +ckl +cjY cXi -xkd +cjL ttB pdp xiV @@ -197169,39 +199344,39 @@ aag lrE vOM gkr -lrq +wIC kui -uqo +cpX pId -qMD -uqo -lrq +cpH +cpB +cpo nVm dRA -tpn +coI gIU -xIq -vrM -tpn -efT -nkF -hkH -kuJ -sLA -jSw xkd qFu xkd xkd +nkF +hkH +kuJ +ckE +ckE icM -thL -thL -thL -thL +ckE +ckE +ckE +icM +clb +ckE +ckG +lbs nYd thL jVa -fgR +cjM nEc oDh cPj @@ -197272,39 +199447,39 @@ aag lrE etN xkc -lrq +wIC sEZ -nqe -nqe -nqe -nqe -mza -cQG -qvE -tpn -tpn -tpn -tpn -tpn -xIu +cpY +cpS +cpI +aTg +wIC +cpd +coH +coz +bsp +con +uvY +cnU +xkd xvQ eDt -bju -cMl +kuJ +ckE kAL xkd -uvY -sgE +cma +cma +cma xkd -qJZ ohJ -thL -thL -uAL +ckE +ckG +lbs liZ -rUk -jVa -fgR +thL +cjQ +cjM azg gKv cPj @@ -197375,39 +199550,39 @@ aag lrE gkr xkc -lrq +wIC dEX -fxJ +cpZ fxJ fAr qmU -lrq +cpn dmr wLS aVm cmM miy -iUG -cmM -snX -oIh -oIh -wNt -cMl -nlz -vNp tUx iTI +snX +cnA +cnv +vzz +cmX +xkd +xkd +cmx +cmj qxe -eZH -ohJ -thL -thL +clO +clc +ckU +ckG ezX uaU rUk xaM -fgR +cjM hIG pdp cPj @@ -197478,39 +199653,39 @@ aag uDg xkc xkc -lrq -iwV -iwV -iwV -iwV -lrq -lrq +wIC +wIC +wIC +wIC +wIC +wIC +wIC kXt -wLS -eBx -cmM -hAf -cNI -bbi -pyj -pyj -pyj -pyj +coU +emp +emp +emp +cob +xkd +xkd +cnB +xkd +xkd wSm -cqM xkd -qFu +cmJ +cmy +cmk +cmb xkd xkd -pns -omt -omt -omt omt +ckn +ezX uxa iZU nhG -xkd +cjL oDh uqg xiV @@ -197581,39 +199756,39 @@ aag uDg gkr old -cQv +emp oVf rmx bvH evR -cQv -cQv +cpC +cpq rmk nuZ -cmM -cmM +coJ +coC pdT otp -cmM -tzd +xkd +cnL tzd -sgi -aaA -wSm -kAL xkd -uvY -qEA +cni +cmY xkd +cmO +tUx +eZH +cmc eZo -thL -thL -thL -thL +xkd +ckV +ckn +ezX tov -thL +iZU sUs -xkd +cjL gNZ pdp xiV @@ -197684,39 +199859,39 @@ aag lrE gkr wJC -cQv -cBw -kde -kde +cql +neC +cqJ +pyj ajj -mZQ -cQv -dFl -tUK +bju +pyj +pyj +coV kTp sYl fgt kCY -kTp -gHt -oIh -eNR -bju -wSm ybz -rrz +cnj +eZH +ybz +cnj tUx -iTI +ybz +rrz +cmz +cmm tlp lXb -thL +cld oXp -thL -thL -tov -thL -xhx -fgR +ckH +ckt +ckm +iZU +cXi +cjL oDh pdp cPj @@ -197787,41 +199962,41 @@ aag lrE gkr wMF -cQv -eaf -bEv +cql +neC +cqJ quj -vgi +emp rXd -cqJ -oJm -tUK -kTp +pyj +pyj +coV +coK hUh nWS xpw -kTp -neC +xkd +cnN mjt -vqc -edo -fTt -lMc xkd -qFu +cnk +fTt xkd +cmP xkd -thq -ezX -pqF -rUk -thL +hvd +hvd +hvd +hvd +hvd +ckI +cku iFc -thL -tUx -fgR +cjZ +cjR +cjM pdp -hIG +oDh cPj aag ajZ @@ -197890,41 +200065,41 @@ aag lrE xkc vDh -cQv +emp eaf bEv -lEe -pGT -pGT +cpT +cpL +edo vkM ksm bxE -cmM -oeZ -wLF -oeZ -oeZ -ptq -oRk +coc +coc +coc +coc +cnV +oIh +jPP eNR -bju -aaD +oIh +pyj dEG -xkd -uvY +cmQ +hvd lSs -xkd +cmd pgP -ezX -prY -rUk -thL -thL -thL -tUx -fgR +clf +hvd +hvd +ckv +ckn +cka +cjS +cjM pdp -aCA +oDh cPj aag okD @@ -197993,40 +200168,40 @@ aag uDg xkc xkc -cQv -eaf -bEv -vyH -ajj -rXd +cpM +cpM +cpM +cpM +cpM +aaA cqJ -oJm -tUK -kTp -uLE -nWS +pyj +tXc +coL +coq +coq cTy -oeZ -emp -emp -emp +pyj +pyj +jPP +pyj iEx -cMl -qFE +cmZ +pyj wDC -tUx -iTI +cmA +cmn fKw -pgP -thL -thL -thL -thL -thL -thL -tUx -xkd -pdp +clP +clq +ckY +ckJ +ckw +cko +cjL +cjT +cjL +hmA vhA xiV aag @@ -198094,42 +200269,42 @@ bdH aad aag uDg -gkr +cqr xkc -cQv -eaf -bEv -sBg -uGN -rXd -cQv -mAY -tUK -kTp -hoW -nWS +cpM +cqi +vrM +vrM +cpM +cpD +cpr +edo +coW +cnW +mTN +mTN aIY -oeZ -cFC -oIh +cnW +mTN +cnC sBQ -pyj -tXc +cnl +cna cqM -xkd -qFu -xkd -xkd -cvH -thL -thL -thL -thL -thL -thL -tUx -xkd -pdp +cmR +hvd +clt +clt +clt +clt +hvd +hvd +ckx +ckp +cjL +cjU +cjN +hmA oDh xiV aag @@ -198199,40 +200374,40 @@ uDg uDg qqQ qsp -cQv +cpM xLl -bEv -kde -ajj -tuk -cQv -kYU -tUK -kTp +cqa +cpU +cpN +edo +cps +pyj +tXc +coM krO -nWS +cor glG -oeZ -ehX -mTN -hZJ -mTN -jXd -kAL -xkd -uvY +cnX +oRk +cnD +emp +cnn +pyj +jPP +cmT +hvd cjk -xkd -pgP -tUx -tUx -bMN -tUx -tUx -jVa +cmg +clQ +clu +cla +hvd +cky +ckp +cjL oEE -xkd -gNZ +cjO +hmA gwo xiV xiV @@ -198302,40 +200477,40 @@ uDg rAC wzy eeA -cQv +cpM dzG -kde +cqb ioV -cQv +cpM tlk -cQv -uhA +cpt +cpe tCH -oeZ -oeZ -wLF -oeZ -oeZ -mFc +coN +emp +fbr +fbr +fbr +fbr fbr emp lze -wSm -slf +cnb +jPP bli -tUx -iTI +cmB +cmp bQc -pgP +clR uVV iBl -cHk -rkV +hvd +ckz rkV -cHk +cjL vYi -cHk -pRs +cjP +hmA fCg oLj xiV @@ -198405,40 +200580,40 @@ uDg rAC wzy krG -cQv -rdM -gUg -cov -cqJ +cpM +cpM +cpM +cpM +cpM may hoK -mcp +coP hzG eyD -ngr +tsX cDN peO lEv jic qGf -emp -bju -wSm +tsX +oeZ +oeZ jSw -emp -emp -emp -emp -vbo -emp -emp -cHk -hlI +oeZ +hvd +hvd +hvd +hvd +clv +hvd +hvd +cjL ekZ -kvL -oix -cHk -uxb +cjL +cjL +cjL +hmA bAL bAI xiV @@ -198507,41 +200682,41 @@ aad uDg fHb aDC -vxM -vxM -vxM -vxM -vxM -vxM +cQv +cQv +cqj +cqc +cpV +cpO tfZ -cQG -cQG -hzG -eyD -tdy -cDN +cpu +coP +coX +coO +tsX +cos +coe oFY oFY -yjG ncl jcf -bju -cMl +oeZ +cnc oeB -emp +cmU slF -oIh +cmq qUz -ksg -oIh +cjK +clx iTl -cHk +ckK frt vUI tgJ wVh -cHk -cHk +cjK +pRs hZw swx xiV @@ -198610,41 +200785,41 @@ aad uDg xkc gkr -vxM +cQv rfY kGu iqR fyp -wJh +cQv oJm -cQG -cQG -hzG +cpv +cpf +coY nzT tff -cDN -oFY +cot +cof cQL npO -ncl -jcf -bju +cnF +cnw +cno cMW qEy -vKr +cNI rQc +cms oDy -oDy -wsq +cjK vxK gwj -oiz -csy +cjK +ckA csy bWQ deH -szG -cHk +cjK +uxb pdp kIf xiV @@ -198713,41 +200888,41 @@ aag uDg kac xkc -vxM +cQv tQi wee -wee -fRS +lEe +pGT wJh iFK -ksm -haY +cpw +cpf kaQ vNT oSC -uFq -wsl +oFY +oFY wSu xIW nah -emp -gbw -oRk +cnx +oeZ +cne jyb -emp +cmW bPH rJj mBx -utZ -pyj -jPP -cHk +cjK +cly +gwj +ckL wxF vJc kUg ifz -fyI -cHk +cjK +dJy pdp ome xiV @@ -198816,42 +200991,42 @@ aag uDg fco qsp -vxM -jvP -rDQ -rDQ -rDQ +cQv +tQi +wee +vyH +kde ctT -wXz +coz aNW -tvJ -eyD -eyD +coP +coP +coP tsX tsX epu oLF tsX tsX -emp -vyi -vyi -vyi -emp -emp -emp -emp -emp -wIC +tsX +oeZ +oeZ +cmD +cmD +cmD +oeZ +oeZ +cjK +clz lnh -wIC +cjK +ckb rWn -rWn -cHk -cHk -gxt -cHk -dJy +ckb +cjV +cjK +cjK +pdp aCA xiV aag @@ -198919,20 +201094,20 @@ aag uDg lDT xkc -vxM -sbP -sbP -sbP +cQv +cqn +cqk +cqe sbP -wJh +cQv oWK jwr -eyD -eyD +coP +coP tHr mqg udR -aDL +vka aDy nVq xuZ @@ -198944,16 +201119,16 @@ xuZ rEY gxU giR -vUP -wIC +cjK +cjK qZA dgx fKi vxG -wIC +ckc whQ bHu -cHk +cjK oLf hIG xiV @@ -199022,13 +201197,13 @@ aag uDg xkc gkr -vxM +cQv pas ncf kjk qxr -wJh -oWK +cpQ +cpE rPF pfd ceZ @@ -199048,15 +201223,15 @@ cgT xuc gXx wdh -wIC +cjK mHz -jPS +ckM jPS xrt -wIC +ckf aDt jTU -cHk +cjK oDh xas xiV @@ -199125,15 +201300,15 @@ aag uDg xkc gkr -vxM -vxM -vxM -vxM -vxM +cQv +cQv +cQv +gaJ +gaJ gaJ vMJ -qFX -cAR +rPF +pfd vGA hUW dHd @@ -199151,15 +201326,15 @@ xWv aQb vka jUY -wIC +cjK hNY -qFi -vAG +cjK +cjK hsj -wIC -cHk -cHk -cHk +cjK +cjK +cjK +cjK oDh nEc xiV @@ -199231,12 +201406,12 @@ xkc ode xkc gNg -cAR +pfd dRj yhV jvc jEV -cAR +pfd iuE uwN vka @@ -199254,15 +201429,15 @@ wIQ mPj omy sCQ -wIC +ckg wvE jhI jfY bra -wIC +ckg eQm rXQ -vky +pdp oDh pdp xiV @@ -199334,12 +201509,12 @@ cYo ode gkr gkr -cAR -cAR -cAR +pfd +dRj +cpR pKU vOu -cAR +pfd udK mwA lnt @@ -199357,15 +201532,15 @@ mgj wIQ jHh jUY -wIC +clA aWg jES vBJ qTQ -wIC +ckg oDh pdp -vky +pdp pdp paJ tuA @@ -199438,9 +201613,9 @@ akC uvp gkr cAR -pbm qjK -jvc +qjK +cAR dGT cAR bmz @@ -199460,12 +201635,12 @@ aAs woy laO nRH -wIC +clA tiF vAG opF pDW -wIC +ckg oDh lhj kCi @@ -199546,7 +201721,7 @@ gym gSz cNJ cAR -pZS +cpa pEB jUY aAs @@ -199563,12 +201738,12 @@ qwp pZS jHh jUY -wIC -wIC +clA +tiF vzj -wIC -wIC -wIC +opF +ckq +ckg oDh nYi kCi @@ -199666,12 +201841,12 @@ qwp vGA uwN uVd -wIC -wjY -aTg +ckg +tiF +ckN rFg kkv -wIC +ckg pdp pdp kCi @@ -199749,10 +201924,10 @@ gkr cAR cAR eLX -vaS +cpF nCD -cAR -kfE +cpg +vGA wsD jUY qwp @@ -199768,13 +201943,13 @@ pbW qwp cDn uwN -jUY -wIC -lcW -aTg -wIC -wIC -wIC +vka +clB +opF +vAG +ckB +ckg +ckg pdp iEa kCi @@ -199852,10 +202027,10 @@ lgk hMM cAR jlE -cXV +vaS kqd -cAR -bNx +cpg +xDn pEB bNv aAs @@ -199870,13 +202045,13 @@ qyo fqc aAs gGr -jHh -sCQ -wIC +cmh +clU +clC wtY -aTg +ckO jIT -wIC +ckg aCA pdp pdp @@ -199975,11 +202150,11 @@ qwp ora laO rKQ -wIC +ckg yeR -aTg +ckS nNg -wIC +ckg pjz uTs pjz @@ -200060,7 +202235,7 @@ cAR cAR cAR cAR -cAR +vxM xSz pEB jUY @@ -200078,11 +202253,11 @@ qwp pZS jHh vCx -wIC -wIC -wIC -wIC -wIC +ckg +ckC +ckC +ckC +ckg hrI ioM xCy diff --git a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm index d55e8db92767..f6fcef556f0a 100644 --- a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm +++ b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm @@ -263,7 +263,7 @@ pixel_x = 7; pixel_y = 7 }, -/obj/item/tool/kitchen/utensil/pfork{ +/obj/item/tool/kitchen/utensil/fork/plastic{ pixel_x = -6; pixel_y = 5 }, diff --git a/maps/map_files/White_Antre_Research_Facility/White_Antre_Research_Facility.dmm b/maps/map_files/White_Antre_Research_Facility/White_Antre_Research_Facility.dmm index 7704c7b28f8f..f2272b4384c8 100644 --- a/maps/map_files/White_Antre_Research_Facility/White_Antre_Research_Facility.dmm +++ b/maps/map_files/White_Antre_Research_Facility/White_Antre_Research_Facility.dmm @@ -1771,8 +1771,8 @@ /turf/open/floor/hybrisa/tile/tilewhitecheckered, /area/white_antre/indoors/upper_level/canteen) "aex" = ( -/obj/item/tool/kitchen/utensil/pknife, -/obj/item/tool/kitchen/utensil/pspoon, +/obj/item/tool/kitchen/utensil/knife/plastic, +/obj/item/tool/kitchen/utensil/spoon/plastic, /obj/structure/surface/table/almayer{ color = "#EBD9B7" }, @@ -1884,7 +1884,7 @@ /turf/open/floor/hybrisa/tile/tilewhitecheckered, /area/white_antre/indoors/upper_level/canteen) "aeJ" = ( -/obj/item/tool/kitchen/utensil/pfork, +/obj/item/tool/kitchen/utensil/fork/plastic, /turf/open/floor/hybrisa/tile/tilewhitecheckered, /area/white_antre/indoors/upper_level/canteen) "aeK" = ( @@ -1915,7 +1915,7 @@ name = "\improper UA Prepared Meal (cornbread)"; pixel_y = 9 }, -/obj/item/tool/kitchen/utensil/pknife, +/obj/item/tool/kitchen/utensil/knife/plastic, /obj/structure/surface/table/almayer{ color = "#EBD9B7" }, @@ -1992,10 +1992,10 @@ dir = 1; layer = 2 }, -/obj/item/tool/kitchen/utensil/pspoon{ +/obj/item/tool/kitchen/utensil/spoon/plastic{ pixel_y = 1 }, -/obj/item/tool/kitchen/utensil/pknife{ +/obj/item/tool/kitchen/utensil/knife/plastic{ pixel_x = 8; pixel_y = -1 }, @@ -32962,7 +32962,7 @@ color = "#EBD9B7" }, /obj/effect/decal/cleanable/dirt, -/obj/item/tool/kitchen/utensil/pspoon, +/obj/item/tool/kitchen/utensil/spoon/plastic, /obj/structure/prop/hybrisa/misc/machinery/screens/redalert{ light_color = "#FF0000"; light_on = 1; diff --git a/maps/templates/lazy_templates/fax_responder_base.dmm b/maps/templates/lazy_templates/fax_responder_base.dmm index 17f097cae9da..9b0c0b215078 100644 --- a/maps/templates/lazy_templates/fax_responder_base.dmm +++ b/maps/templates/lazy_templates/fax_responder_base.dmm @@ -1419,7 +1419,7 @@ /obj/item/reagent_container/food/snacks/sliceable/chocolatecake{ pixel_y = 12 }, -/obj/item/tool/kitchen/utensil/pknife{ +/obj/item/tool/kitchen/utensil/knife/plastic{ pixel_x = -12; pixel_y = 2 }, diff --git a/maps/templates/lazy_templates/pizza_ert_station.dmm b/maps/templates/lazy_templates/pizza_ert_station.dmm index e59b575cb299..c86a7eb3efde 100644 --- a/maps/templates/lazy_templates/pizza_ert_station.dmm +++ b/maps/templates/lazy_templates/pizza_ert_station.dmm @@ -3450,11 +3450,11 @@ pixel_y = 28; pixel_x = 16 }, -/obj/item/tool/kitchen/utensil/pknife{ +/obj/item/tool/kitchen/utensil/knife/plastic{ pixel_x = 13; pixel_y = 1 }, -/obj/item/tool/kitchen/utensil/pfork{ +/obj/item/tool/kitchen/utensil/fork/plastic{ pixel_x = -5; pixel_y = 5 }, @@ -3873,10 +3873,10 @@ /area/adminlevel/ert_station/pizza_station) "Yj" = ( /obj/structure/surface/table/reinforced/cloth, -/obj/item/tool/kitchen/utensil/pknife{ +/obj/item/tool/kitchen/utensil/knife/plastic{ pixel_x = -6 }, -/obj/item/tool/kitchen/utensil/pfork{ +/obj/item/tool/kitchen/utensil/fork/plastic{ pixel_y = 3; pixel_x = -3 }, diff --git a/maps/tents/tent_mess.dmm b/maps/tents/tent_mess.dmm index dc47f9767b6d..be7129b609cd 100644 --- a/maps/tents/tent_mess.dmm +++ b/maps/tents/tent_mess.dmm @@ -26,12 +26,12 @@ }, /obj/structure/blocker/tent, /obj/structure/surface/rack, -/obj/item/tool/kitchen/utensil/pspoon, -/obj/item/tool/kitchen/utensil/pspoon, -/obj/item/tool/kitchen/utensil/pspoon, -/obj/item/tool/kitchen/utensil/pfork, -/obj/item/tool/kitchen/utensil/pfork, -/obj/item/tool/kitchen/utensil/pfork, +/obj/item/tool/kitchen/utensil/spoon/plastic, +/obj/item/tool/kitchen/utensil/spoon/plastic, +/obj/item/tool/kitchen/utensil/spoon/plastic, +/obj/item/tool/kitchen/utensil/fork/plastic, +/obj/item/tool/kitchen/utensil/fork/plastic, +/obj/item/tool/kitchen/utensil/fork/plastic, /obj/item/tool/kitchen/rollingpin, /obj/item/tool/kitchen/knife, /turf/template_noop, diff --git a/tools/UpdatePaths/Scripts/12159-plastic-utensils.txt b/tools/UpdatePaths/Scripts/12159-plastic-utensils.txt new file mode 100644 index 000000000000..358ed4ea6215 --- /dev/null +++ b/tools/UpdatePaths/Scripts/12159-plastic-utensils.txt @@ -0,0 +1,3 @@ +/obj/item/tool/kitchen/utensil/pknife : /obj/item/tool/kitchen/utensil/knife/plastic{@OLD} +/obj/item/tool/kitchen/utensil/pfork : /obj/item/tool/kitchen/utensil/fork/plastic{@OLD} +/obj/item/tool/kitchen/utensil/pspoon : /obj/item/tool/kitchen/utensil/spoon/plastic{@OLD} \ No newline at end of file