diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index f3074bd4d7d0..8e409cae94ae 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -6628,12 +6628,16 @@ /turf/open/floor/grass, /area/almayer/living/starboard_garden) "avz" = ( -/obj/structure/machinery/light, -/obj/structure/machinery/vending/security, +<<<<<<< HEAD +/obj/structure/closet/secure_closet/brig/prisoner, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/processing) +======= +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cryo) +>>>>>>> master "avB" = ( /turf/open/floor/almayer{ dir = 8; @@ -9582,14 +9586,13 @@ id = "Brig Lockdown Shutters"; name = "\improper Brig Lockdown Shutter" }, -/obj/structure/machinery/door/airlock/almayer/maint{ - access_modified = 1; - dir = 2; - req_one_access = list(2,34,30) - }, +<<<<<<< HEAD +/turf/open/floor/plating/plating_catwalk, +======= /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, +>>>>>>> master /area/almayer/hull/upper_hull/u_f_s) "aFV" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -10380,18 +10383,19 @@ }, /area/almayer/command/cichallway) "aJz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/safety/bulkhead_door{ + pixel_y = -34 }, +<<<<<<< HEAD +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/perma) +======= /turf/open/floor/almayer{ - dir = 4; - icon_state = "redcorner" + icon_state = "plate" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/hull/upper_hull/u_f_p) +>>>>>>> master "aJG" = ( /obj/structure/bed/chair/office/dark{ dir = 8; @@ -11480,15 +11484,19 @@ }, /area/almayer/engineering/upper_engineering) "aOY" = ( -/obj/structure/bed/chair, -/obj/structure/machinery/status_display{ - pixel_y = 30 +<<<<<<< HEAD +/obj/structure/closet/secure_closet/medical2, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" +======= +/obj/structure/machinery/power/apc/almayer{ + dir = 1 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "red" + allow_construction = 0 +>>>>>>> master }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/surgery) "aPa" = ( /obj/structure/machinery/light{ dir = 8 @@ -12291,8 +12299,13 @@ /obj/structure/sink{ pixel_y = 24 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/machinery/power/apc/almayer, +/obj/structure/sign/safety/rewire{ +<<<<<<< HEAD + pixel_y = -32 +======= + pixel_y = -38 +>>>>>>> master }, /area/almayer/shipboard/brig/perma) "aSY" = ( @@ -16699,11 +16712,37 @@ /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) "bqp" = ( +<<<<<<< HEAD +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, /turf/open/floor/almayer{ - dir = 4; - icon_state = "redcorner" + dir = 5; + icon_state = "red" +======= +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + name = "\improper Brig" }, -/area/almayer/shipboard/brig/processing) +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 8 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter"; + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" +>>>>>>> master + }, +/area/almayer/shipboard/brig/main_office) "bqw" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/wood/ship, @@ -17554,12 +17593,23 @@ }, /area/almayer/engineering/engine_core) "buX" = ( -/obj/effect/landmark/crap_item, +<<<<<<< HEAD +/obj/effect/decal/cleanable/blood, /turf/open/floor/almayer{ dir = 1; icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/execution) +======= +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "red" + }, +/area/almayer/shipboard/brig/processing) +>>>>>>> master "bvb" = ( /obj/structure/machinery/light{ dir = 8 @@ -18597,17 +18647,27 @@ }, /area/almayer/shipboard/weapon_room) "bAM" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +<<<<<<< HEAD +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/perma) +======= +/obj/structure/machinery/light{ + dir = 1 }, -/obj/structure/extinguisher_cabinet{ - pixel_y = 26 +/obj/structure/sign/safety/cryo{ + pixel_x = 3; + pixel_y = 25 + }, +/obj/structure/sign/safety/rewire{ + pixel_x = 15; + pixel_y = 25 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "red" + allow_construction = 0 }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/cryo) +>>>>>>> master "bAN" = ( /obj/structure/machinery/light{ dir = 1 @@ -22535,11 +22595,25 @@ /obj/structure/machinery/light{ dir = 4 }, -/obj/structure/bed/chair, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 +<<<<<<< HEAD + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, +======= + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +>>>>>>> master +/obj/structure/surface/table/almayer, +/obj/effect/spawner/random/facepaint, +/obj/effect/spawner/random/facepaint, +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/lobby) "bRr" = ( /obj/structure/machinery/fuelcell_recycler, @@ -22623,8 +22697,15 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_p) "bRH" = ( +/obj/structure/bed/chair{ + dir = 1 + }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cryo) +<<<<<<< HEAD +/area/almayer/shipboard/brig/evidence_storage) +======= +/area/almayer/shipboard/brig/main_office) +>>>>>>> master "bRK" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -22986,11 +23067,16 @@ }, /area/almayer/medical/lower_medical_medbay) "bTw" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 +/obj/structure/sign/safety/bulkhead_door{ + pixel_x = -16 }, +<<<<<<< HEAD /turf/open/floor/almayer, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/perma) +======= +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_p) +>>>>>>> master "bTx" = ( /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) @@ -24400,13 +24486,19 @@ /turf/open/floor/almayer, /area/almayer/hallways/vehiclehangar) "bZN" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "Bathroom" +<<<<<<< HEAD +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/main_office) +======= +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/perma) +>>>>>>> master "bZO" = ( /obj/structure/machinery/light{ dir = 8 @@ -26111,15 +26203,36 @@ }, /area/almayer/lifeboat_pumps/north2) "ciF" = ( -/obj/structure/sign/safety/cryo{ - pixel_x = 8; - pixel_y = -26 +<<<<<<< HEAD +/obj/structure/sign/safety/medical{ + pixel_x = -17; + pixel_y = 6 + }, +/obj/structure/sign/safety/restrictedarea{ + pixel_x = -17; + pixel_y = -9 + }, +/obj/structure/machinery/light{ + dir = 8 +======= +/obj/structure/machinery/door_control{ + id = "perma_lockdown"; + name = "\improper Perma Cells Lockdown"; + pixel_x = -24; + pixel_y = 6; + req_access_txt = "3" +>>>>>>> master }, +/obj/structure/closet/secure_closet/brig/restraints, /turf/open/floor/almayer{ dir = 6; icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +<<<<<<< HEAD +/area/almayer/shipboard/brig/lobby) +======= +/area/almayer/shipboard/brig/perma) +>>>>>>> master "ciN" = ( /turf/open/floor/almayer{ dir = 6; @@ -27366,17 +27479,23 @@ }, /area/almayer/command/airoom) "cqn" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 +<<<<<<< HEAD +/obj/structure/surface/table/almayer, +/obj/structure/machinery/recharger, +/obj/item/tool/hand_labeler{ + pixel_x = -8; + pixel_y = 3 }, /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 2; id = "bot_armory"; name = "\improper Armory Shutters" }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/armory) +======= +/obj/structure/pipes/vents/scrubber, +/turf/open/floor/almayer, +>>>>>>> master +/area/almayer/shipboard/brig/general_equipment) "cqz" = ( /obj/structure/surface/table/almayer, /obj/item/facepaint/black, @@ -27437,11 +27556,12 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +<<<<<<< HEAD +======= "crw" = ( /obj/structure/bed/bedroll{ name = "cat bed"; - desc = "A bed of cotton fabric, purposely made for a cat to comfortably sleep on."; - pixel_y = 0 + desc = "A bed of cotton fabric, purposely made for a cat to comfortably sleep on." }, /mob/living/simple_animal/cat/Jones{ dir = 8 @@ -27452,6 +27572,7 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) +>>>>>>> master "crD" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -27532,7 +27653,11 @@ /area/almayer/squads/bravo) "ctn" = ( /turf/open/floor/almayer{ - icon_state = "redcorner" +<<<<<<< HEAD + dir = 1; +======= +>>>>>>> master + icon_state = "red" }, /area/almayer/shipboard/brig/lobby) "cts" = ( @@ -27578,8 +27703,9 @@ }, /area/almayer/hallways/stern_hallway) "cuk" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +<<<<<<< HEAD +/obj/structure/machinery/power/apc/almayer{ + dir = 8 }, /obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ name = "\improper Cryogenics Bay" @@ -27587,7 +27713,17 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/lobby) +======= +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/shipboard/brig/cic_hallway) +>>>>>>> master "cus" = ( /obj/docking_port/stationary/lifeboat_dock/starboard, /turf/open/floor/almayer_hull{ @@ -27777,7 +27913,16 @@ /turf/open/floor/almayer{ icon_state = "redcorner" }, -/area/almayer/shipboard/brig/execution) +/area/almayer/shipboard/brig/chief_mp_office) +<<<<<<< HEAD +"czG" = ( +/obj/structure/machinery/recharge_station, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/command/airoom) +======= +>>>>>>> master "czJ" = ( /obj/structure/sign/safety/restrictedarea{ pixel_x = 8; @@ -28142,12 +28287,28 @@ }, /area/almayer/hull/upper_hull/u_a_p) "cFO" = ( -/obj/structure/disposalpipe/segment, +<<<<<<< HEAD +/obj/structure/machinery/power/apc/almayer{ + cell_type = /obj/item/cell/hyper; + dir = 1 + }, +/obj/structure/sign/safety/rewire{ + pixel_y = 32 + }, /turf/open/floor/almayer{ dir = 1; - icon_state = "redcorner" + icon_state = "red" +======= +/obj/structure/closet/secure_closet/guncabinet/riot_control, +/obj/item/weapon/shield/riot, +/obj/item/weapon/shield/riot, +/obj/item/weapon/shield/riot, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "plating_striped" +>>>>>>> master }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/armory) "cFP" = ( /obj/structure/sign/safety/outpatient{ pixel_x = -17; @@ -28272,13 +28433,19 @@ }, /area/almayer/hull/lower_hull/l_a_p) "cIK" = ( -/obj/structure/janitorialcart, -/obj/item/tool/mop, -/obj/structure/machinery/light/small, +<<<<<<< HEAD +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/general_equipment) +======= +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ - icon_state = "redcorner" + allow_construction = 0 }, -/area/almayer/shipboard/brig/execution) +/area/almayer/shipboard/brig/processing) +>>>>>>> master "cIU" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -28548,12 +28715,25 @@ /turf/open/floor/almayer, /area/almayer/living/grunt_rnr) "cNY" = ( -/obj/structure/machinery/computer/crew, +<<<<<<< HEAD +/obj/structure/machinery/firealarm{ + pixel_y = -28 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/almayer{ dir = 9; icon_state = "red" +======= +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = 26 }, -/area/almayer/shipboard/brig/main_office) +/turf/open/floor/almayer{ + icon_state = "plating_striped" +>>>>>>> master + }, +/area/almayer/shipboard/brig/armory) "cOi" = ( /obj/effect/landmark/yautja_teleport, /turf/open/floor/almayer{ @@ -29116,11 +29296,39 @@ }, /area/almayer/hallways/starboard_hallway) "daj" = ( -/obj/structure/machinery/iv_drip, +<<<<<<< HEAD +/obj/structure/filingcabinet{ + density = 0; + pixel_x = -8; + pixel_y = 18 + }, +/obj/structure/filingcabinet{ + density = 0; + pixel_x = 8; + pixel_y = 18 + }, +/obj/structure/machinery/power/apc/almayer{ + dir = 8 + }, +/obj/structure/sign/safety/rewire{ + pixel_x = -17; + pixel_y = 8 + }, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/evidence_storage) +======= +/obj/structure/machinery/door/airlock/almayer/security/glass{ + dir = 1; + name = "\improper Cryo Room" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, /turf/open/floor/almayer{ - icon_state = "sterile_green_side" + icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/surgery) +/area/almayer/shipboard/brig/cryo) +>>>>>>> master "daz" = ( /turf/closed/wall/almayer/white/hull, /area/almayer/command/airoom) @@ -29222,7 +29430,12 @@ dir = 8 }, /turf/open/floor/almayer{ - icon_state = "dark_sterile" +<<<<<<< HEAD + icon_state = "test_floor4" +======= + dir = 8; + icon_state = "sterile_green_side" +>>>>>>> master }, /area/almayer/shipboard/brig/surgery) "dcS" = ( @@ -29270,16 +29483,26 @@ icon_state = "plating" }, /area/almayer/engineering/engine_core) -"deb" = ( -/obj/structure/bed, -/obj/structure/machinery/flasher{ - id = "Perma 2"; - pixel_y = -24 - }, +<<<<<<< HEAD +"ddN" = ( +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/squads/req) +"deb" = ( +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/chief_mp_office) +======= +"deb" = ( +/obj/structure/largecrate/random/barrel/blue, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_p) +>>>>>>> master "deg" = ( /obj/structure/platform_decoration{ dir = 1 @@ -29513,16 +29736,42 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/alpha_bravo_shared) -"djm" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +<<<<<<< HEAD +"diM" = ( +/obj/structure/bed/chair{ + dir = 8 }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, +/area/almayer/command/combat_correspondent) +"djm" = ( +/obj/structure/surface/table/almayer, +/obj/effect/landmark/map_item, +/obj/item/folder/red, +======= +"djm" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/recharger, +/obj/structure/sign/safety/terminal{ + pixel_y = 32 + }, +>>>>>>> master +/obj/structure/transmitter/rotary{ + name = "Brig CMP's Office Telephone"; + phone_category = "Offices"; + phone_id = "Brig CMP's Office"; + pixel_x = 15 + }, +<<<<<<< HEAD /turf/open/floor/almayer, -/area/almayer/shipboard/brig/execution) +======= +/turf/open/floor/almayer{ + dir = 9; + icon_state = "red" + }, +>>>>>>> master +/area/almayer/shipboard/brig/chief_mp_office) "djp" = ( /obj/structure/closet/crate, /obj/item/stack/sheet/mineral/plastic{ @@ -29660,9 +29909,17 @@ /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) "dls" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_x = -30 +<<<<<<< HEAD +/obj/structure/sign/safety/medical{ + pixel_x = 16; + pixel_y = 27 }, +/obj/structure/extinguisher_cabinet{ + pixel_y = 26; + pixel_x = -6 + }, +======= +>>>>>>> master /turf/open/floor/almayer{ icon_state = "dark_sterile" }, @@ -29960,27 +30217,27 @@ }, /area/almayer/hallways/aft_hallway) "dqV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +<<<<<<< HEAD +/obj/structure/machinery/door/window/brigdoor/southright{ + id = "Cell 2"; + name = "Cell 2" }, /obj/structure/machinery/vending/coffee, /obj/structure/machinery/light{ dir = 1 }, -/obj/structure/machinery/door_control{ - id = "perma_lockdown"; - name = "\improper Perma Cells Lockdown"; - pixel_y = 24; - req_access_txt = "3" - }, -/obj/structure/sign/safety/coffee{ - pixel_y = 32 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) +======= +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer{ dir = 1; icon_state = "red" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/processing) +>>>>>>> master "drj" = ( /obj/structure/window/reinforced{ dir = 4; @@ -30050,14 +30307,38 @@ }, /area/almayer/hull/upper_hull/u_a_p) "dsw" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 2 +<<<<<<< HEAD +/obj/structure/machinery/door/airlock/almayer/security/glass{ + dir = 1; + name = "\improper Brig Equipment" }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/general_equipment) +"dtv" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/turf/open/floor/almayer, +/area/almayer/command/lifeboat) +======= +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/crew/alt{ + dir = 4 + }, +/obj/structure/transmitter/rotary/no_dnd{ + name = "Brig Cells Telephone"; + phone_category = "Almayer"; + phone_id = "Brig Cells"; + pixel_x = 16 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "red" + }, +/area/almayer/shipboard/brig/processing) +>>>>>>> master "dtH" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -30071,11 +30352,26 @@ }, /area/almayer/hallways/aft_hallway) "dtN" = ( -/obj/structure/closet/emcloset, +<<<<<<< HEAD +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_x = -30 + }, +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 2 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hull/upper_hull/u_f_p) +/area/almayer/shipboard/brig/processing) +======= +/obj/structure/machinery/cm_vending/sorted/medical, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" + }, +/area/almayer/shipboard/brig/surgery) +>>>>>>> master "dtZ" = ( /obj/structure/platform_decoration{ dir = 4 @@ -30213,9 +30509,16 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) +<<<<<<< HEAD +======= "dvT" = ( -/turf/closed/wall/almayer, -/area/almayer/shipboard/brig/general_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) +>>>>>>> master "dwl" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, @@ -30247,13 +30550,16 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/starboard) +<<<<<<< HEAD +======= "dxm" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/structure/bed/chair{ + can_buckle = 0; + dir = 4 }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/general_equipment) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/perma) +>>>>>>> master "dxu" = ( /obj/structure/sink{ dir = 1; @@ -30815,26 +31121,18 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +<<<<<<< HEAD +======= "dGD" = ( -/obj/structure/closet/secure_closet{ - name = "\improper Spare Restraints"; - req_one_access_txt = "3" +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 }, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/glasses/sunglasses/blindfold, -/obj/item/clothing/glasses/sunglasses/blindfold, -/obj/item/clothing/glasses/sunglasses/blindfold, -/obj/item/clothing/glasses/sunglasses/blindfold, -/obj/item/clothing/glasses/sunglasses/blindfold, /turf/open/floor/almayer{ dir = 1; icon_state = "red" }, /area/almayer/shipboard/brig/processing) +>>>>>>> master "dHd" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -30884,19 +31182,22 @@ /turf/open/floor/wood/ship, /area/almayer/living/basketball) "dHv" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/firstaid/toxin{ - pixel_x = 3; - pixel_y = 3 +<<<<<<< HEAD +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "Bathroom"; + dir = 1 + }, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) +======= +/obj/structure/bed/chair/bolted{ + dir = 4 }, -/obj/item/storage/firstaid/adv, -/obj/item/device/defibrillator, -/obj/item/reagent_container/spray/cleaner, /turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" + allow_construction = 0 }, -/area/almayer/shipboard/brig/surgery) +/area/almayer/shipboard/brig/processing) +>>>>>>> master "dHV" = ( /obj/structure/machinery/light{ dir = 1 @@ -31319,13 +31620,25 @@ /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_s) "dSc" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 +<<<<<<< HEAD +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/general_equipment) +"dSn" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/cells) +======= +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/chief_mp_office) +>>>>>>> master "dSp" = ( /obj/structure/machinery/camera/autoname/almayer{ name = "ship-grade camera" @@ -31591,9 +31904,24 @@ }, /area/almayer/medical/lower_medical_medbay) "dXy" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ +<<<<<<< HEAD + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/processing) +======= + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/perma) +>>>>>>> master "dXG" = ( /obj/structure/pipes/vents/scrubber{ dir = 1 @@ -31938,11 +32266,9 @@ }, /area/almayer/living/grunt_rnr) "eeN" = ( -/obj/structure/bed/chair, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, +<<<<<<< HEAD +/obj/structure/bed/chair/bolted, +/turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) "efh" = ( /obj/structure/surface/table/almayer, @@ -31960,28 +32286,28 @@ pixel_y = 2; req_access_txt = "3" }, -/obj/structure/machinery/door_control{ - id = "courtyard window"; - name = "Courtyard Window Shutters"; - pixel_x = -8; - pixel_y = 10; - req_access_txt = "3" +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cells) +======= +/obj/structure/sign/safety/bulkhead_door{ + pixel_x = -16 }, -/obj/structure/machinery/door_control{ - id = "Cell Privacy Shutters"; - name = "Cell Privacy Shutters"; - pixel_x = 2; - pixel_y = 10; - req_access_txt = "3" +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_s) +"efh" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, -/obj/structure/machinery/recharger{ - pixel_x = 6; - pixel_y = -2 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/processing) +>>>>>>> master "efK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -32055,15 +32381,34 @@ }, /area/almayer/hull/upper_hull/u_a_s) "egR" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, +<<<<<<< HEAD +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ dir = 8; icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/processing) +======= +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" + }, +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + dir = 1; + name = "\improper Brig" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "perma_lockdown"; + name = "\improper Perma Lockdown Shutter" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/perma) +>>>>>>> master "egS" = ( /obj/structure/closet, /obj/item/clothing/ears/earmuffs, @@ -32188,11 +32533,17 @@ }, /area/almayer/living/port_emb) "eiO" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "redcorner" +<<<<<<< HEAD +/obj/structure/bed/chair{ + can_buckle = 0; + dir = 4 }, -/area/almayer/shipboard/brig/main_office) +/turf/open/floor/almayer, +======= +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +>>>>>>> master +/area/almayer/shipboard/brig/perma) "eiP" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -32252,11 +32603,15 @@ }, /area/almayer/lifeboat_pumps/south1) "ekg" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 }, -/area/almayer/shipboard/brig/perma) +<<<<<<< HEAD +======= +/turf/open/floor/plating/plating_catwalk, +>>>>>>> master +/area/almayer/shipboard/brig/chief_mp_office) "eko" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/plating/plating_catwalk, @@ -32406,6 +32761,7 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_s) +<<<<<<< HEAD "eni" = ( /obj/structure/surface/table/almayer, /obj/item/prop/magazine/book/spacebeast, @@ -32413,7 +32769,16 @@ dir = 1; icon_state = "red" }, -/area/almayer/shipboard/brig/evidence_storage) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cells) +======= +>>>>>>> master "enx" = ( /obj/structure/pipes/vents/pump, /obj/structure/machinery/status_display{ @@ -32456,15 +32821,19 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) "eoP" = ( -/obj/structure/bed, -/obj/structure/machinery/flasher{ - id = "Perma 1"; - pixel_y = 24 +<<<<<<< HEAD +/obj/structure/bed/chair/comfy/orange{ + dir = 8 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/chief_mp_office) +======= +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = 26 }, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/general_equipment) +>>>>>>> master "eoT" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -32623,18 +32992,47 @@ }, /area/almayer/squads/delta) "erx" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 2 +<<<<<<< HEAD +/obj/structure/toilet{ + pixel_y = 13 }, /obj/effect/decal/warning_stripes{ icon_state = "N"; pixel_y = 1 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "dark_sterile" +======= +/obj/structure/machinery/light{ + dir = 1 }, -/area/almayer/shipboard/brig/cryo) +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/secure_data{ + dir = 4 + }, +/obj/structure/sign/safety/terminal{ + pixel_x = 3; + pixel_y = 27 + }, +/obj/structure/sign/safety/rewire{ + pixel_x = 15; + pixel_y = 27 +>>>>>>> master + }, +/area/almayer/shipboard/brig/main_office) +"erz" = ( +/obj/structure/closet/crate, +/obj/item/ammo_box/magazine/l42a, +/obj/item/ammo_box/magazine/l42a, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +<<<<<<< HEAD +/area/almayer/hull/upper_hull/u_m_s) +======= +/area/almayer/shipboard/brig/processing) +>>>>>>> master "erG" = ( /obj/structure/disposalpipe/junction{ dir = 2; @@ -32957,13 +33355,32 @@ }, /area/almayer/hull/upper_hull/u_f_p) "eyg" = ( -/obj/structure/machinery/cryopod/right{ - pixel_y = 6 +<<<<<<< HEAD +/obj/structure/sign/safety/high_voltage{ + pixel_x = 32; + pixel_y = 7 }, /turf/open/floor/almayer{ icon_state = "cargo" }, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/main_office) +"eyv" = ( +/obj/structure/machinery/sentry_holder/almayer, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/south1) +======= +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/shipboard/brig/main_office) +>>>>>>> master "eyG" = ( /obj/structure/platform, /turf/open/floor/almayer{ @@ -33138,15 +33555,30 @@ }, /area/almayer/squads/charlie_delta_shared) "eBW" = ( -/obj/structure/machinery/firealarm{ - dir = 4; - pixel_x = 24 +<<<<<<< HEAD +/obj/structure/machinery/cryopod/right{ + layer = 3.1; + pixel_y = 13 }, /turf/open/floor/almayer{ dir = 8; icon_state = "red" }, -/area/almayer/shipboard/brig/evidence_storage) +/area/almayer/shipboard/brig/cryo) +======= +/obj/structure/surface/rack, +/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/glasses/sunglasses/blindfold, +/obj/item/clothing/mask/muzzle, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/brig/execution) +>>>>>>> master "eBZ" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/firstaid/fire{ @@ -33661,12 +34093,7 @@ }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) -"eOh" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" - }, -/area/almayer/shipboard/brig/evidence_storage) +<<<<<<< HEAD "eOk" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -33678,7 +34105,23 @@ /turf/open/floor/almayer{ allow_construction = 0 }, +/area/almayer/shipboard/brig/perma) +======= +"eOh" = ( +/obj/structure/bed, +/obj/structure/machinery/flasher{ + id = "Cell 4"; + pixel_x = -24 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/shipboard/brig/cells) +"eOk" = ( +/turf/open/floor/almayer, /area/almayer/shipboard/brig/lobby) +>>>>>>> master "eOr" = ( /obj/structure/bed/chair{ dir = 8 @@ -33736,11 +34179,28 @@ }, /area/almayer/hallways/starboard_hallway) "ePB" = ( +<<<<<<< HEAD +/obj/structure/surface/rack, +/obj/item/storage/firstaid/adv{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/storage/firstaid/regular, /turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" + icon_state = "plate" +======= +/obj/structure/machinery/door/airlock/almayer/security/glass{ + name = "\improper Execution Room" }, -/area/almayer/shipboard/brig/general_equipment) +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" +>>>>>>> master + }, +/area/almayer/shipboard/brig/execution) "ePY" = ( /obj/structure/pipes/vents/pump{ dir = 8; @@ -33841,10 +34301,31 @@ /obj/effect/landmark/crap_item, /turf/open/floor/almayer, /area/almayer/living/briefing) -"eTo" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +<<<<<<< HEAD +"eTh" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 }, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/structure/surface/rack, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/medical/upper_medical) +======= +>>>>>>> master +"eTo" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" }, @@ -33921,8 +34402,9 @@ /turf/open/floor/carpet, /area/almayer/command/corporateliason) "eUU" = ( -/obj/structure/closet/secure_closet/brig{ - name = "Spare Prison Uniforms" +<<<<<<< HEAD +/obj/structure/machinery/atm{ + pixel_y = 32 }, /obj/item/clothing/shoes/orange, /obj/item/clothing/shoes/orange, @@ -33933,9 +34415,15 @@ /obj/item/clothing/under/color/orange, /obj/item/clothing/under/color/orange, /turf/open/floor/almayer{ + allow_construction = 0 +======= +/obj/structure/disposalpipe/junction{ dir = 1; - icon_state = "red" + icon_state = "pipe-j2" +>>>>>>> master }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) "eVj" = ( /obj/structure/bed/chair/office/dark{ @@ -34136,12 +34624,18 @@ }, /area/almayer/hallways/port_hallway) "eZj" = ( -/obj/structure/closet/secure_closet/guncabinet, +<<<<<<< HEAD +/obj/structure/closet/firecloset/full, /turf/open/floor/almayer{ dir = 1; icon_state = "red" +======= +/obj/structure/bed/chair/comfy/black{ + dir = 8 +>>>>>>> master }, -/area/almayer/shipboard/brig/main_office) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/chief_mp_office) "eZz" = ( /obj/structure/sign/safety/water{ pixel_x = 8; @@ -34243,9 +34737,6 @@ }, /area/almayer/living/grunt_rnr) "fbv" = ( -/obj/structure/machinery/light{ - dir = 8 - }, /obj/structure/sign/safety/security{ pixel_x = -17; pixel_y = 6 @@ -34281,26 +34772,17 @@ icon_state = "dark_sterile" }, /area/almayer/medical/upper_medical) +<<<<<<< HEAD +======= "fbY" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 2; - id = "Execution Shutters"; - name = "\improper Privacy Shutters" - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "Brig Lockdown Shutters"; - name = "\improper Brig Lockdown Shutter" - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "perma_lockdown"; - name = "\improper Perma Lockdown Shutter" +/obj/structure/bed/chair/bolted{ + dir = 8 }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 +/turf/open/floor/almayer{ + allow_construction = 0 }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/execution) +/area/almayer/shipboard/brig/processing) +>>>>>>> master "fcf" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -34463,15 +34945,26 @@ }, /area/almayer/command/airoom) "ffV" = ( +<<<<<<< HEAD +/obj/structure/sign/safety/rewire{ + pixel_x = 8; + pixel_y = 32 + }, +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + allow_construction = 0 +======= /obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/crew/alt, -/obj/structure/transmitter/rotary/no_dnd{ - name = "Brig Cells Telephone"; - phone_category = "Almayer"; - phone_id = "Brig Cells"; - pixel_x = 15 +/obj/structure/machinery/computer/sentencing{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" +>>>>>>> master }, -/turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) "fgh" = ( /obj/structure/machinery/light/small{ @@ -34693,25 +35186,27 @@ }, /area/almayer/hull/lower_hull/l_f_s) "fnl" = ( -/obj/structure/surface/rack, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/glasses/sunglasses/blindfold, -/obj/item/clothing/mask/muzzle, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" +<<<<<<< HEAD +/obj/structure/machinery/light{ + dir = 4 }, /turf/open/floor/almayer{ dir = 4; - icon_state = "redcorner" + icon_state = "red" +======= +/obj/structure/surface/table/almayer, +/obj/structure/machinery/recharger, +/obj/item/device/flash, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/area/almayer/shipboard/brig/execution) +/area/almayer/shipboard/brig/general_equipment) "fnv" = ( /obj/structure/machinery/light{ dir = 4 +>>>>>>> master }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) +/area/almayer/shipboard/brig/perma) "fnx" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/door/window/eastright{ @@ -34929,20 +35424,22 @@ icon_state = "red" }, /area/almayer/shipboard/starboard_missiles) +<<<<<<< HEAD +======= "frJ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = 32 +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/firstaid/toxin{ + pixel_x = 3; + pixel_y = 3 }, -/obj/structure/sign/safety/hazard{ - pixel_y = 32 +/obj/item/storage/firstaid/adv, +/obj/item/device/defibrillator, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" }, -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) +/area/almayer/shipboard/brig/surgery) +>>>>>>> master "frM" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -34978,20 +35475,23 @@ icon_state = "plating" }, /area/almayer/hallways/vehiclehangar) +<<<<<<< HEAD +======= "fso" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 + dir = 1 }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ - access_modified = 1; - name = "\improper Cryogenics Bay"; - req_access = null; - req_one_access_txt = "1;3" +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/airlock/almayer/security/glass{ + name = "Brig"; + dir = 2 }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/lobby) +>>>>>>> master "fsp" = ( /obj/structure/barricade/handrail{ dir = 1; @@ -35126,14 +35626,30 @@ }, /area/almayer/engineering/laundry) "fuX" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/poddoor/almayer/locked{ +<<<<<<< HEAD +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/sentencing{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/shipboard/brig/processing) +======= +/obj/structure/machinery/cryopod, +/obj/structure/machinery/light{ dir = 8; - id = "Perma 2L"; - name = "\improper cell shutter" + invisibility = 101 }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/perma) +/obj/structure/machinery/status_display{ + pixel_x = -32 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/shipboard/brig/cryo) +>>>>>>> master "fuY" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -35448,8 +35964,18 @@ /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = -25 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/armory) +/area/almayer/shipboard/brig/general_equipment) +<<<<<<< HEAD +"fDC" = ( +/obj/structure/bed/chair/bolted{ + dir = 8 + }, +/turf/open/floor/almayer{ + allow_construction = 0 + }, +/area/almayer/shipboard/brig/processing) +======= +>>>>>>> master "fDG" = ( /obj/structure/machinery/vending/coffee, /obj/structure/machinery/light{ @@ -35704,8 +36230,10 @@ }, /area/almayer/hull/upper_hull/u_f_s) "fHS" = ( -/obj/structure/sign/safety/rewire{ - pixel_y = -32 +<<<<<<< HEAD +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" }, /obj/structure/machinery/door_control{ id = "perma_lockdown"; @@ -35714,8 +36242,20 @@ pixel_y = -24; req_access_txt = "3" }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/processing) +/area/almayer/hull/upper_hull/u_f_s) +======= +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/machinery/flasher{ + id = "Perma 2"; + pixel_y = 24 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/brig/perma) +>>>>>>> master "fIf" = ( /obj/structure/sign/safety/bulkhead_door{ pixel_x = 8; @@ -35996,14 +36536,24 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) "fNA" = ( -/obj/structure/closet/fireaxecabinet{ - pixel_y = 32 - }, +<<<<<<< HEAD +/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ dir = 1; icon_state = "red" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/main_office) +======= +/obj/structure/machinery/light{ + dir = 8; + invisibility = 101 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/shipboard/brig/processing) +>>>>>>> master "fNC" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /obj/structure/disposalpipe/junction{ @@ -36383,18 +36933,16 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/cichallway) +<<<<<<< HEAD +======= "fYn" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, +/obj/structure/bed/chair/bolted, /turf/open/floor/almayer{ dir = 1; - icon_state = "redcorner" + icon_state = "red" }, /area/almayer/shipboard/brig/processing) +>>>>>>> master "fYG" = ( /turf/open/floor/almayer{ dir = 10; @@ -36551,14 +37099,21 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/command/corporateliason) "gbX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +<<<<<<< HEAD +/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ + name = "Brig" }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 }, -/turf/open/floor/almayer, +/turf/open/floor/almayer{ + icon_state = "test_floor4" +======= +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" +>>>>>>> master + }, /area/almayer/shipboard/brig/processing) "gcc" = ( /obj/structure/disposalpipe/segment{ @@ -36708,20 +37263,52 @@ icon_state = "orangecorner" }, /area/almayer/hallways/stern_hallway) -"geX" = ( -/obj/structure/pipes/vents/scrubber, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; +<<<<<<< HEAD +"geW" = ( +/obj/structure/sign/prop1{ pixel_y = 32 }, /obj/structure/sign/safety/hazard{ pixel_y = 32 }, +/obj/item/reagent_container/food/drinks/bottle/sake{ + layer = 3.6; + pixel_y = 16 + }, +/obj/item/reagent_container/food/drinks/bottle/sake{ + layer = 3.6; + pixel_x = -9; + pixel_y = 16 + }, +/obj/structure/surface/table/woodentable/fancy, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) +"geX" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/box/ids{ + pixel_y = 8; + pixel_x = -6 + }, +/obj/item/device/flash, +/obj/structure/machinery/light{ + dir = 8; + invisibility = 101 +======= +"geX" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/secure_data{ + dir = 4 +>>>>>>> master + }, /turf/open/floor/almayer{ dir = 1; icon_state = "red" }, -/area/almayer/shipboard/brig/general_equipment) +<<<<<<< HEAD +/area/almayer/shipboard/brig/main_office) +======= +/area/almayer/shipboard/brig/chief_mp_office) +>>>>>>> master "gfk" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -37117,8 +37704,9 @@ }, /area/almayer/living/port_emb) "goD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +<<<<<<< HEAD +/obj/structure/machinery/power/apc/almayer{ + dir = 8 }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -37126,7 +37714,14 @@ /turf/open/floor/almayer{ icon_state = "redcorner" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/chief_mp_office) +======= +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/perma) +>>>>>>> master "goL" = ( /turf/open/floor/almayer{ dir = 10; @@ -37190,18 +37785,35 @@ }, /area/almayer/lifeboat_pumps/north1) "gqW" = ( -/obj/structure/surface/table/almayer, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" +<<<<<<< HEAD + }, +======= + }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 8; + icon_state = "red" }, /area/almayer/shipboard/brig/main_office) "grl" = ( -/obj/effect/landmark/crap_item, +/obj/structure/machinery/power/apc/almayer{ + cell_type = /obj/item/cell/hyper; + dir = 1 + }, +>>>>>>> master /turf/open/floor/almayer{ - dir = 8; + dir = 1; icon_state = "red" }, /area/almayer/shipboard/brig/main_office) +"grl" = ( +/obj/structure/sign/safety/medical{ + pixel_x = -17 + }, +/turf/closed/wall/almayer, +/area/almayer/shipboard/brig/surgery) "grG" = ( /obj/structure/sign/safety/restrictedarea{ pixel_x = -17 @@ -37774,9 +38386,7 @@ }, /area/almayer/squads/bravo) "gBi" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ dir = 1; icon_state = "redcorner" @@ -37837,16 +38447,42 @@ }, /area/almayer/lifeboat_pumps/north2) "gCI" = ( +<<<<<<< HEAD /obj/structure/machinery/light{ dir = 4 }, -/obj/structure/machinery/cryopod/right{ - pixel_y = 6 +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/firstaid/toxin{ + pixel_x = 8; + pixel_y = -2 +======= +/obj/structure/machinery/door_control{ + id = "cmp_armory"; + name = "Armory Lockdown"; + req_access_txt = "4"; + pixel_y = 24 + }, +/obj/structure/sign/safety/ammunition{ + pixel_y = 32 + }, +/obj/structure/sign/safety/restrictedarea{ + pixel_x = 15; + pixel_y = 32 +>>>>>>> master }, +/obj/item/storage/firstaid/regular, +/obj/item/reagent_container/spray/cleaner, /turf/open/floor/almayer{ - icon_state = "cargo" +<<<<<<< HEAD + icon_state = "sterile_green_side" }, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/surgery) +======= + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/main_office) +>>>>>>> master "gCP" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/device/flashlight/lamp, @@ -38458,13 +39094,23 @@ }, /area/almayer/hallways/hangar) "gSi" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/cameras/almayer_network, -/obj/item/storage/box/tapes{ - pixel_x = -16 +<<<<<<< HEAD +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/safety/bulkhead_door{ + pixel_y = -34 }, -/turf/open/floor/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_f_p) +======= +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/plating, /area/almayer/shipboard/brig/processing) +>>>>>>> master "gSj" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -38493,11 +39139,6 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) "gSV" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera"; - pixel_y = 6 - }, /obj/structure/sign/safety/biolab{ pixel_x = -17; pixel_y = -8 @@ -38517,12 +39158,28 @@ }, /area/almayer/shipboard/brig/cryo) "gTx" = ( -/obj/structure/machinery/vending/security, +<<<<<<< HEAD +/obj/structure/surface/table/almayer, +/obj/item/storage/toolbox/mechanical/green{ + pixel_y = 8 + }, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/almayer{ dir = 1; icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/general_equipment) +======= +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 21 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/shipboard/brig/chief_mp_office) +>>>>>>> master "gTH" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/skills{ @@ -39097,9 +39754,15 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 26 }, -/obj/structure/sign/safety/cryo{ - pixel_x = 21; - pixel_y = 27 +/obj/structure/machinery/firealarm{ + pixel_y = 28 +<<<<<<< HEAD +======= + }, +/obj/structure/extinguisher_cabinet{ + pixel_y = 28; + pixel_x = -14 +>>>>>>> master }, /turf/open/floor/almayer{ dir = 4; @@ -39860,6 +40523,25 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/chief_mp_office) +"hwS" = ( +<<<<<<< HEAD +/obj/structure/machinery/light{ + dir = 8; + invisibility = 101 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/shipboard/brig/processing) +======= +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/execution) +>>>>>>> master "hxe" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -39954,19 +40636,21 @@ }, /area/almayer/living/offices) "hyz" = ( -/obj/structure/disposalpipe/junction{ - dir = 1 - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 +/obj/structure/disposalpipe/segment{ +<<<<<<< HEAD + dir = 4; + icon_state = "pipe-c" +======= + dir = 4 }, -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer{ allow_construction = 0 +>>>>>>> master }, +/turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) "hyE" = ( /obj/structure/machinery/door/poddoor/almayer/open{ @@ -40014,40 +40698,33 @@ }, /area/almayer/squads/delta) "hzx" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass{ - name = "\improper Chief MP's Office"; - req_access = null; - req_one_access_txt = "1;3" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "CMP Office Shutters"; - name = "\improper Privacy Shutters" +<<<<<<< HEAD +/obj/structure/machinery/keycard_auth{ + pixel_y = 25 +======= +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 8 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/machinery/door/airlock/almayer/security/glass{ + name = "Evidence Room" +>>>>>>> master }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, +<<<<<<< HEAD /area/almayer/shipboard/brig/chief_mp_office) +======= +/area/almayer/shipboard/brig/evidence_storage) "hzJ" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1 - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "courtyard_cells"; - name = "\improper Courtyard Lockdown Shutter" - }, -/obj/structure/machinery/door/poddoor/almayer/locked{ - id = "Cell 1"; - name = "\improper Courtyard Divider" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, -/area/almayer/shipboard/brig/cells) +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/processing) +>>>>>>> master "hzL" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -41357,23 +42034,12 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +<<<<<<< HEAD +======= "icX" = ( -/obj/structure/machinery/brig_cell/perma_2{ - pixel_x = -32; - pixel_y = -4 - }, -/obj/structure/machinery/door_control{ - id = "Perma 2L"; - name = "Perma 2 Lockdown"; - pixel_x = -24; - pixel_y = 12; - req_access_txt = "3" - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/chief_mp_office) +>>>>>>> master "idx" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -41873,12 +42539,22 @@ }, /area/almayer/medical/medical_science) "inN" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 +<<<<<<< HEAD +/obj/structure/transmitter{ + name = "Brig Offices Telephone"; + phone_category = "Almayer"; + phone_id = "Brig Main Offices"; + pixel_y = 32 }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/main_office) +======= +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/general_equipment) +>>>>>>> master "ioj" = ( /obj/structure/largecrate/random/barrel/green, /turf/open/floor/almayer{ @@ -41972,9 +42648,35 @@ /turf/open/floor/almayer, /area/almayer/command/computerlab) "iqn" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/main_office) +<<<<<<< HEAD +/obj/structure/machinery/door/window/brigdoor/southright{ + id = "Cell 6"; + name = "Cell 6" + }, +/obj/structure/sign/safety/six{ + pixel_x = -17 + }, +/turf/open/floor/plating/plating_catwalk, +======= +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter" + }, +/obj/structure/machinery/door/poddoor/almayer/locked{ + id = "Cell 2"; + name = "\improper Courtyard Divider" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +>>>>>>> master +/area/almayer/shipboard/brig/cells) "iqo" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -42081,9 +42783,9 @@ }, /area/almayer/command/airoom) "isH" = ( -/obj/structure/reagent_dispensers/water_cooler/stacks{ - density = 0; - pixel_y = 17 +<<<<<<< HEAD +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = 26 }, /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -42093,6 +42795,11 @@ icon_state = "red" }, /area/almayer/shipboard/brig/general_equipment) +======= +/obj/structure/bed, +/obj/item/bedsheet/red, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) "isI" = ( /obj/structure/sign/nosmoking_2{ pixel_x = 32 @@ -42104,6 +42811,7 @@ icon_state = "test_floor4" }, /area/almayer/lifeboat_pumps/north1) +>>>>>>> master "isN" = ( /obj/structure/sink{ dir = 8; @@ -42382,19 +43090,32 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) "iyq" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 2; - id = "Warden Office Shutters"; - name = "\improper Privacy Shutters" - }, -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, +<<<<<<< HEAD /obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ dir = 1; name = "\improper Warden Office" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 8 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter"; + dir = 4 +======= +/obj/structure/sign/safety/rewire{ + pixel_y = 32 +>>>>>>> master + }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 1; + icon_state = "red" }, /area/almayer/shipboard/brig/main_office) "iyH" = ( @@ -43028,30 +43749,43 @@ }, /area/almayer/hull/lower_hull/l_f_s) "iOh" = ( -/obj/structure/machinery/light/small, -/obj/structure/machinery/status_display{ - pixel_y = -32 +<<<<<<< HEAD +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/armory) +/obj/structure/window/framed/almayer, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/cryo) +======= +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/shipboard/brig/processing) +>>>>>>> master "iOD" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) +<<<<<<< HEAD +"iOU" = ( +/obj/structure/sign/safety/bulkhead_door{ + pixel_x = -16 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_s) +======= "iPu" = ( /obj/structure/machinery/light{ dir = 4 }, -/obj/item/bedsheet/hop{ - pixel_y = 0 - }, -/obj/structure/bed{ - pixel_y = 0 - }, +/obj/item/bedsheet/hop, +/obj/structure/bed, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) +>>>>>>> master "iPv" = ( /obj/structure/bed/chair/comfy, /obj/structure/window/reinforced/ultra, @@ -43604,10 +44338,19 @@ }, /area/almayer/command/airoom) "iZG" = ( -/obj/structure/window/framed/almayer/hull, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/chief_mp_office) +<<<<<<< HEAD +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "Bathroom"; + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/main_office) +======= +/turf/closed/wall/almayer/outer, +/area/almayer/shipboard/brig/execution) +>>>>>>> master "iZH" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = -17 @@ -44315,6 +45058,20 @@ }, /area/almayer/living/briefing) "jkS" = ( +<<<<<<< HEAD +/obj/structure/bed/chair/comfy/black{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/chief_mp_office) +======= +/turf/open/floor/almayer{ + dir = 6; + icon_state = "red" + }, +/area/almayer/shipboard/brig/processing) +>>>>>>> master +"jkV" = ( /obj/structure/window/framed/almayer/hull/hijack_bustable, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ dir = 2; @@ -44464,18 +45221,24 @@ }, /area/almayer/hallways/aft_hallway) "jnA" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, +<<<<<<< HEAD /turf/open/floor/almayer{ dir = 5; icon_state = "plating" }, -/area/almayer/shipboard/brig/armory) +/area/almayer/shipboard/brig/chief_mp_office) +======= +/obj/structure/surface/rack, +/obj/item/storage/firstaid/adv{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/storage/firstaid/regular, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/brig/execution) +>>>>>>> master "jnD" = ( /turf/open/floor/almayer{ dir = 1; @@ -44483,11 +45246,24 @@ }, /area/almayer/shipboard/brig/cic_hallway) "jnT" = ( -/obj/structure/bed/chair, +<<<<<<< HEAD +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, /turf/open/floor/almayer{ - allow_construction = 0 + dir = 1; + icon_state = "redcorner" +======= +/obj/structure/machinery/optable, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_corner" +>>>>>>> master }, -/area/almayer/shipboard/brig/lobby) +/area/almayer/shipboard/brig/surgery) "jnX" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -44562,9 +45338,19 @@ }, /area/almayer/hull/lower_hull/l_f_s) "jpQ" = ( +<<<<<<< HEAD +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +======= +/obj/structure/machinery/power/apc/almayer, +/obj/structure/sign/safety/rewire{ + pixel_y = -38 + }, /turf/open/floor/almayer{ - allow_construction = 0 + icon_state = "red" }, +>>>>>>> master /area/almayer/shipboard/brig/lobby) "jqP" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -44743,11 +45529,27 @@ }, /area/almayer/hull/upper_hull/u_a_p) "jvJ" = ( -/obj/effect/decal/cleanable/dirt, +<<<<<<< HEAD +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/camera/autoname/almayer, +/turf/open/floor/almayer, +======= +/obj/structure/bed, +/obj/structure/machinery/flasher{ + id = "Cell 6"; + pixel_x = -24 + }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 8; + icon_state = "red" }, -/area/almayer/hull/upper_hull/u_f_s) +>>>>>>> master +/area/almayer/shipboard/brig/cells) "jvX" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -44815,16 +45617,19 @@ /turf/open/floor/plating, /area/almayer/living/bridgebunks) "jxK" = ( -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ +<<<<<<< HEAD +/obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/pipes/standard/manifold/hidden/supply, +======= +/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ + dir = 2; + name = "Brig" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ - dir = 1; - icon_state = "red" + icon_state = "test_floor4" }, /area/almayer/shipboard/brig/processing) "jxP" = ( @@ -44832,6 +45637,7 @@ icon_state = "W"; pixel_x = -1 }, +>>>>>>> master /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/vehiclehangar) "jyi" = ( @@ -44903,17 +45709,29 @@ }, /area/almayer/squads/req) "jAG" = ( -/obj/structure/surface/rack, -/obj/item/storage/box/gloves{ - pixel_x = 3; - pixel_y = 3 +<<<<<<< HEAD +/obj/effect/landmark/start/police, +/obj/structure/machinery/power/apc/almayer{ + dir = 1 }, /obj/item/storage/box/masks, /turf/open/floor/almayer{ dir = 1; icon_state = "sterile_green_side" }, -/area/almayer/shipboard/brig/surgery) +/obj/structure/sign/safety/rewire{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cryo) +======= +/obj/structure/machinery/brig_cell/perma_2{ + pixel_x = -32 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/perma) +>>>>>>> master "jAJ" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -45064,10 +45882,20 @@ }, /area/almayer/living/grunt_rnr) "jFR" = ( +/obj/structure/bed/chair/bolted{ +<<<<<<< HEAD + dir = 4 + }, /turf/open/floor/almayer{ - icon_state = "redcorner" + allow_construction = 0 +======= + dir = 1 }, -/area/almayer/shipboard/brig/processing) +/turf/open/floor/almayer{ + icon_state = "plate" +>>>>>>> master + }, +/area/almayer/shipboard/brig/perma) "jFX" = ( /obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/almayer{ @@ -45167,13 +45995,21 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/morgue) "jIV" = ( -/obj/structure/surface/rack, -/obj/item/book/manual/marine_law{ - pixel_x = -3; - pixel_y = 1 +<<<<<<< HEAD +/obj/structure/machinery/iv_drip, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_f_s) +/area/almayer/shipboard/brig/surgery) +======= +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + layer = 1.9 + }, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/general_equipment) +>>>>>>> master "jJe" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -45196,16 +46032,24 @@ }, /area/almayer/living/port_emb) "jJq" = ( -/obj/structure/surface/rack, -/obj/item/storage/firstaid/regular, -/obj/item/storage/firstaid/toxin{ - pixel_x = 8; - pixel_y = -2 +<<<<<<< HEAD +/obj/structure/machinery/power/apc/almayer, +/obj/structure/sign/safety/rewire{ + pixel_y = -32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/armory) +======= +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/cameras/almayer_network{ + dir = 4 }, /turf/open/floor/almayer{ + dir = 8; icon_state = "red" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/chief_mp_office) +>>>>>>> master "jJs" = ( /turf/open/floor/almayer{ icon_state = "green" @@ -45520,16 +46364,23 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/gym) "jOu" = ( -/obj/structure/surface/table/almayer, +<<<<<<< HEAD /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 +======= +/obj/structure/sign/safety/hazard{ + pixel_x = 32; + pixel_y = -8 + }, +/obj/structure/sign/safety/firingrange{ + pixel_x = 32; + pixel_y = 6 +>>>>>>> master }, -/obj/structure/machinery/faxmachine/uscm/brig, /turf/open/floor/almayer{ - dir = 1; - icon_state = "red" + icon_state = "cargo" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/execution) "jOx" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -46022,24 +46873,26 @@ icon_state = "emerald" }, /area/almayer/squads/charlie) +<<<<<<< HEAD +======= "jZL" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/cameras/almayer_network{ - dir = 1 +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 2; + id = "bot_armory"; + name = "\improper Armory Shutters" }, -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/obj/structure/transmitter{ - dir = 1; - name = "Brig Warden's Office Telephone"; - phone_category = "Offices"; - phone_id = "Brig Warden's Office"; - pixel_x = -16 +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + name = "\improper Armory"; + dir = 2 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/main_office) +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/armory) +>>>>>>> master "jZO" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/almayer{ @@ -46325,7 +47178,14 @@ }, /area/almayer/shipboard/brig/cic_hallway) "kfN" = ( -/obj/structure/closet/secure_closet/brig, +<<<<<<< HEAD +======= +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +>>>>>>> master +/obj/structure/closet/secure_closet/brig/prisoner, /turf/open/floor/almayer{ icon_state = "red" }, @@ -46515,12 +47375,19 @@ icon_state = "red" }, /area/almayer/squads/alpha) +<<<<<<< HEAD "kjN" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/surgery) +/obj/structure/closet/secure_closet/brig/restraints, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/shipboard/brig/perma) +======= +>>>>>>> master "kkt" = ( /obj/structure/surface/table/almayer, /obj/item/book/manual/marine_law, @@ -46950,22 +47817,33 @@ /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) "kta" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/cameras/almayer_network{ + dir = 4 + }, +<<<<<<< HEAD /turf/open/floor/almayer{ dir = 4; icon_state = "red" }, -/area/almayer/shipboard/brig/evidence_storage) -"ktn" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 +/area/almayer/shipboard/brig/processing) +======= +/obj/structure/sign/safety/terminal{ + pixel_x = 8; + pixel_y = 32 }, -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle, /turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" + dir = 9; + icon_state = "red" }, -/area/almayer/shipboard/brig/armory) +/area/almayer/shipboard/brig/processing) +"ktn" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/general_equipment) +>>>>>>> master "ktB" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/almayer{ @@ -47121,27 +47999,38 @@ icon_state = "test_floor4" }, /area/almayer/squads/req) +<<<<<<< HEAD +"kyI" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/general_equipment) +======= "kxM" = ( /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 8 }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "redcorner" - }, -/area/almayer/shipboard/brig/processing) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) "kyI" = ( -/obj/structure/machinery/light{ +/obj/structure/toilet{ dir = 8 }, -/obj/structure/sign/safety/bathunisex{ - pixel_x = 32 +/obj/structure/machinery/light/small, +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" }, -/turf/open/floor/wood/ship, /area/almayer/shipboard/brig/chief_mp_office) +>>>>>>> master "kyN" = ( /obj/structure/disposalpipe/segment, /obj/structure/sign/safety/distribution_pipes{ @@ -47153,18 +48042,20 @@ }, /area/almayer/shipboard/navigation) "kyP" = ( -/obj/structure/disposalpipe/segment{ +<<<<<<< HEAD +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/machinery/cm_vending/sorted/marine_food, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, +======= +>>>>>>> master /turf/open/floor/almayer{ - dir = 1; - icon_state = "red" + allow_construction = 0 }, -/area/almayer/shipboard/brig/perma) +<<<<<<< HEAD +/area/almayer/shipboard/brig/processing) +======= +/area/almayer/shipboard/brig/cryo) +>>>>>>> master "kyX" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -47372,10 +48263,27 @@ /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) "kDb" = ( -/obj/structure/surface/rack, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_f_s) +<<<<<<< HEAD +/obj/structure/machinery/door/airlock/almayer/security/glass{ + name = "\improper Execution Room" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/execution) +======= +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/brig/perma) +>>>>>>> master "kDi" = ( /obj/structure/platform{ dir = 8 @@ -47674,9 +48582,25 @@ }, /area/almayer/hull/upper_hull/u_a_p) "kJK" = ( -/obj/structure/bed/chair/comfy/orange, +<<<<<<< HEAD +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_18" + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "red" + }, +/area/almayer/shipboard/brig/chief_mp_office) +======= +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/light{ + dir = 1 + }, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/cells) +>>>>>>> master "kJL" = ( /obj/structure/machinery/constructable_frame{ icon_state = "box_2" @@ -47850,15 +48774,13 @@ }, /area/almayer/engineering/upper_engineering/port) "kNi" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" +<<<<<<< HEAD + allow_construction = 0 +======= + dir = 10; + icon_state = "red" +>>>>>>> master }, /area/almayer/shipboard/brig/processing) "kNk" = ( @@ -47992,12 +48914,26 @@ }, /area/almayer/hallways/aft_hallway) "kPo" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera" +<<<<<<< HEAD +/obj/item/paper_bin/uscm{ + pixel_y = 7 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_f_p) +/obj/item/tool/pen, +/obj/structure/surface/table/reinforced/black, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/brig/perma) +======= +/obj/structure/bed/chair/wood/normal{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/shipboard/brig/execution) +>>>>>>> master "kPx" = ( /obj/structure/surface/table/almayer, /obj/item/device/mass_spectrometer, @@ -48207,16 +49143,30 @@ icon_state = "plating" }, /area/almayer/squads/req) +<<<<<<< HEAD +======= "kTc" = ( -/obj/structure/machinery/light/small{ - dir = 8 +/obj/structure/surface/table/almayer, +/obj/item/storage/box/evidence{ + pixel_x = 7; + pixel_y = 6 }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/obj/item/storage/box/evidence{ + pixel_x = 1; + pixel_y = 1 }, -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) +/obj/structure/sign/safety/security{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/sign/safety/restrictedarea{ + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/brig/general_equipment) +>>>>>>> master "kTq" = ( /obj/structure/largecrate/supply/supplies/mre, /turf/open/floor/almayer{ @@ -49170,12 +50120,26 @@ }, /area/almayer/shipboard/brig/cic_hallway) "lnJ" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" +<<<<<<< HEAD +/obj/structure/sign/safety/maint{ + pixel_x = -17; + pixel_y = -34 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/perma) +======= +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) +/area/almayer/shipboard/brig/processing) +>>>>>>> master "lnP" = ( /obj/structure/machinery/vending/cola, /obj/structure/window/reinforced, @@ -49534,12 +50498,23 @@ /turf/open/floor/almayer{ icon_state = "plate" }, +<<<<<<< HEAD +/area/almayer/shipboard/brig/surgery) +"lue" = ( +/obj/structure/surface/table/almayer, +/obj/item/folder/yellow, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) +======= /area/almayer/command/combat_correspondent) "ltX" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/closed/wall/almayer/reinforced, -/area/almayer/shipboard/brig/main_office) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/processing) +>>>>>>> master "luk" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -49562,12 +50537,19 @@ }, /area/almayer/living/commandbunks) "lut" = ( -/obj/structure/machinery/computer/crew, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" +<<<<<<< HEAD +/obj/structure/pipes/vents/scrubber, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/general_equipment) +======= +/obj/effect/landmark/start/warden, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/area/almayer/shipboard/brig/main_office) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cryo) +>>>>>>> master "luu" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -49581,15 +50563,33 @@ }, /area/almayer/hull/lower_hull/l_m_p) "luw" = ( +<<<<<<< HEAD +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 +======= /obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ +/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/reinforced{ dir = 2; - name = "Brig" + name = "\improper Perma Brig" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "perma_lockdown"; + name = "\improper Perma Lockdown Shutter"; + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 +>>>>>>> master + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/perma) "luz" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -49601,32 +50601,37 @@ }, /area/almayer/hallways/starboard_hallway) "luC" = ( +<<<<<<< HEAD /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "perma_lockdown"; - name = "\improper Perma Lockdown Shutter" +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/airlock/almayer/security/glass{ + name = "Brig"; + dir = 2 +======= +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 24 +>>>>>>> master }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 4; + icon_state = "red" }, -/area/almayer/shipboard/brig/perma) +<<<<<<< HEAD +/area/almayer/shipboard/brig/lobby) +======= +/area/almayer/shipboard/brig/processing) "luH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/atm{ - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "redcorner" +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + layer = 1.9 }, +/turf/open/floor/plating, /area/almayer/shipboard/brig/processing) +>>>>>>> master "luS" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/cardboard{ @@ -49818,12 +50823,26 @@ }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) +<<<<<<< HEAD +======= "lzx" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 2; + id = "cmp_armory"; + name = "\improper Armory Shutters" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + name = "\improper Armory"; + dir = 2 + }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" + icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/armory) +>>>>>>> master "lzA" = ( /obj/structure/machinery/sleep_console{ dir = 8 @@ -50556,26 +51575,22 @@ }, /area/almayer/hallways/stern_hallway) "lNs" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/sign/safety/ammunition{ - pixel_x = 32; - pixel_y = 7 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/machinery/door_control{ - id = "cmp_armory"; - name = "Armory Lockdown"; - pixel_x = 24; - pixel_y = -6; - req_access_txt = "4" - }, +<<<<<<< HEAD +/obj/structure/closet/secure_closet/guncabinet/riot_control, +/obj/item/weapon/shield/riot, +/obj/item/weapon/shield/riot, +/obj/item/weapon/shield/riot, /turf/open/floor/almayer{ dir = 4; icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/armory) +======= +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/lobby) +>>>>>>> master "lNw" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -50601,8 +51616,9 @@ }, /area/almayer/hull/lower_hull/l_m_p) "lNF" = ( -/obj/structure/closet/secure_closet{ - name = "\improper Lethal Injection Locker" +<<<<<<< HEAD +/obj/item/storage/donut_box{ + pixel_y = 8 }, /obj/item/reagent_container/ld50_syringe/choral, /obj/item/reagent_container/ld50_syringe/choral, @@ -50612,7 +51628,17 @@ /turf/open/floor/almayer{ icon_state = "redcorner" }, -/area/almayer/shipboard/brig/execution) +/turf/open/floor/wood/ship, +======= +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/power/apc/almayer, +/turf/open/floor/almayer{ + icon_state = "red" + }, +>>>>>>> master +/area/almayer/shipboard/brig/chief_mp_office) "lOl" = ( /obj/structure/machinery/light{ dir = 8 @@ -50687,14 +51713,15 @@ icon_state = "silver" }, /area/almayer/command/securestorage) +<<<<<<< HEAD +======= "lQi" = ( -/obj/structure/machinery/cm_vending/clothing/commanding_officer{ - pixel_y = 0 - }, +/obj/structure/machinery/cm_vending/clothing/commanding_officer, /turf/open/floor/almayer{ icon_state = "cargo" }, /area/almayer/living/commandbunks) +>>>>>>> master "lQj" = ( /obj/structure/machinery/door_control{ id = "InnerShutter"; @@ -51028,13 +52055,25 @@ icon_state = "test_floor4" }, /area/almayer/medical/hydroponics) +<<<<<<< HEAD +======= "maa" = ( -/obj/structure/closet/emcloset, +/obj/structure/surface/table/almayer, +/obj/item/storage/box/ids{ + pixel_y = 8; + pixel_x = -6 + }, +/obj/item/device/flash, +/obj/structure/machinery/light{ + dir = 8; + invisibility = 101 + }, /turf/open/floor/almayer{ - dir = 10; + dir = 8; icon_state = "red" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/main_office) +>>>>>>> master "maq" = ( /obj/structure/sign/safety/cryo{ pixel_x = 7; @@ -51124,21 +52163,33 @@ }, /area/almayer/squads/alpha) "mdJ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/perma) -"mdS" = ( -/obj/structure/sign/safety/ammunition{ - pixel_x = 32; - pixel_y = 7 - }, +<<<<<<< HEAD +/obj/structure/machinery/vending/security, +/obj/structure/machinery/light, /turf/open/floor/almayer{ dir = 4; icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/general_equipment) +======= +/obj/structure/surface/table/almayer, +/obj/item/folder/red{ + pixel_x = -4 + }, +/obj/item/folder/blue{ + pixel_x = 4 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/evidence_storage) +"mdS" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/processing) +>>>>>>> master "mdW" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/effect/decal/warning_stripes{ @@ -51431,14 +52482,31 @@ /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) "mkk" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/manifold/hidden/supply{ +<<<<<<< HEAD +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/lobby) +======= +/obj/structure/surface/table/almayer, +/obj/item/storage/box/bodybags{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/storage/box/bodybags, +/obj/structure/machinery/light/small{ + dir = 4; + pixel_y = -12 + }, +/obj/structure/machinery/power/apc/almayer{ dir = 4 }, +/obj/structure/sign/safety/rewire{ + pixel_x = 32; + pixel_y = 17 + }, /turf/open/floor/almayer{ - allow_construction = 0 + icon_state = "plate" }, -/area/almayer/shipboard/brig/lobby) +/area/almayer/shipboard/brig/execution) "mko" = ( /obj/item/tool/weldpack{ pixel_y = 15 @@ -51449,6 +52517,7 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_s) +>>>>>>> master "mkx" = ( /obj/structure/machinery/door_control{ id = "cl_shutters 2"; @@ -52151,27 +53220,35 @@ /obj/effect/spawner/random/tool, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) +<<<<<<< HEAD +======= "mAr" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/obj/structure/machinery/cm_vending/clothing/military_police{ + density = 0; + pixel_y = 16 }, -/obj/structure/closet/secure_closet/guncabinet/blue/riot_control, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) -"mAT" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 8; - id = "bot_armory"; - name = "\improper Armory Shutters" +/obj/structure/window/reinforced{ + dir = 4; + health = 80 }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - name = "\improper Armory" +/obj/structure/window/reinforced{ + dir = 8 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "cargo" }, -/area/almayer/shipboard/brig/armory) +/area/almayer/shipboard/brig/general_equipment) +"mAT" = ( +/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) +>>>>>>> master "mAV" = ( /obj/structure/machinery/cryopod, /turf/open/floor/almayer{ @@ -52396,9 +53473,32 @@ /turf/open/floor/almayer, /area/almayer/command/cichallway) "mGn" = ( -/obj/structure/machinery/cm_vending/clothing/military_police_warden, +<<<<<<< HEAD +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ + dir = 2; + name = "Brig"; + req_one_access_txt = "1;3"; + req_access = null + }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" +======= +/obj/structure/surface/table/almayer, +/obj/item/weapon/gun/energy/taser, +/obj/item/weapon/gun/energy/taser{ + pixel_y = 8 + }, +/obj/structure/machinery/recharger, +/turf/open/floor/almayer{ + icon_state = "red" +>>>>>>> master }, /area/almayer/shipboard/brig/main_office) "mGu" = ( @@ -52620,17 +53720,20 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) "mKh" = ( +<<<<<<< HEAD /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/main_office) +======= +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" }, -/area/almayer/shipboard/brig/cryo) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cells) +>>>>>>> master "mKq" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/living/bridgebunks) @@ -53239,6 +54342,12 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower_engineering) "mVi" = ( +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/obj/structure/surface/table/almayer, +/obj/item/storage/donut_box, /turf/open/floor/almayer{ icon_state = "red" }, @@ -53968,11 +55077,24 @@ }, /area/almayer/living/briefing) "nlH" = ( +<<<<<<< HEAD +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) +======= +/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{ - dir = 4; - icon_state = "red" + icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/cells) +/area/almayer/shipboard/brig/processing) +>>>>>>> master "nlW" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/largecrate/random/barrel/green, @@ -54082,12 +55204,20 @@ pixel_x = 32; pixel_y = -8 }, -/obj/structure/sign/safety/firingrange{ - pixel_x = 32; - pixel_y = 4 +<<<<<<< HEAD +/turf/open/floor/almayer{ + icon_state = "red" }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/perma) +======= +/obj/structure/sign/safety/rewire{ + pixel_y = -24; + pixel_x = 12 + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +>>>>>>> master +/area/almayer/shipboard/brig/chief_mp_office) "nnD" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Down4"; @@ -54120,11 +55250,13 @@ }, /area/almayer/squads/req) "noo" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 8; - id = "bot_armory"; - name = "\improper Armory Shutters" +/obj/structure/machinery/power/apc/almayer, +/obj/structure/sign/safety/rewire{ +<<<<<<< HEAD + pixel_y = -32 +======= + pixel_y = -38 +>>>>>>> master }, /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/plating, @@ -54205,16 +55337,15 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north2) +<<<<<<< HEAD +======= "nqZ" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = 30; - pixel_y = -6 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" +/obj/structure/bed/chair/comfy/orange{ + dir = 8 }, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/chief_mp_office) +>>>>>>> master "nrt" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -54330,19 +55461,23 @@ /turf/closed/wall/almayer/reinforced, /area/almayer/command/computerlab) "ntm" = ( -/obj/structure/sign/safety/maint{ +<<<<<<< HEAD +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/execution) +======= +/obj/structure/machinery/power/apc/almayer{ + dir = 8 + }, +/obj/structure/sign/safety/rewire{ pixel_x = -17; - pixel_y = -8 + pixel_y = 17 }, -/obj/structure/machinery/door_control{ - id = "CMP Office Shutters"; - name = "CMP Office Shutters"; - pixel_x = -24; - pixel_y = 8; - req_one_access_txt = "24;31" +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/perma) +>>>>>>> master "ntr" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/item/seeds/goldappleseed, @@ -54363,11 +55498,25 @@ }, /area/almayer/hallways/vehiclehangar) "ntu" = ( -/obj/structure/machinery/light/small{ - dir = 8 +<<<<<<< HEAD +/obj/structure/machinery/cm_vending/sorted/medical, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" + }, +/area/almayer/shipboard/brig/surgery) +======= +/obj/structure/bed, +/obj/structure/machinery/flasher{ + id = "Cell 5"; + pixel_x = -24 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" }, -/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) +>>>>>>> master "ntx" = ( /obj/structure/machinery/door/airlock/almayer/generic{ id = "Alpha_2"; @@ -54514,11 +55663,24 @@ }, /area/almayer/shipboard/port_missiles) "nwz" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, +<<<<<<< HEAD +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 +======= +/obj/structure/sign/safety/restrictedarea{ + pixel_y = 32 + }, +/obj/structure/sign/safety/security{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/bed/sofa/south/grey/right, /turf/open/floor/almayer{ - allow_construction = 0 + dir = 1; + icon_state = "red" +>>>>>>> master }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/lobby) "nwD" = ( /turf/open/floor/almayer{ @@ -54572,20 +55734,15 @@ icon_state = "green" }, /area/almayer/squads/req) +<<<<<<< HEAD +======= "nxq" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - dir = 1; - name = "\improper Warden Office" - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 2; - id = "Warden Office Shutters"; - name = "\improper Privacy Shutters" - }, +/obj/structure/closet/secure_closet/brig/prisoner, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/processing) +>>>>>>> master "nxK" = ( /obj/structure/sign/safety/high_voltage{ pixel_y = -32 @@ -54695,11 +55852,25 @@ }, /area/almayer/squads/alpha_bravo_shared) "nBb" = ( +<<<<<<< HEAD +/obj/structure/machinery/vending/security, /turf/open/floor/almayer{ dir = 5; icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/general_equipment) +======= +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 8 + }, +/obj/structure/machinery/door/airlock/almayer/security/reinforced{ + name = "\improper Chief MP's Bedroom" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/chief_mp_office) +>>>>>>> master "nBc" = ( /obj/structure/largecrate/random, /turf/open/floor/almayer{ @@ -54707,12 +55878,14 @@ }, /area/almayer/hull/upper_hull/u_f_s) "nBo" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, +<<<<<<< HEAD /turf/open/floor/almayer, /area/almayer/shipboard/brig/general_equipment) "nBu" = ( @@ -54728,7 +55901,26 @@ dir = 8; icon_state = "red" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/main_office) +======= +/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ + dir = 2; + name = "Brig"; + req_one_access_txt = "1;3"; + req_access = null + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/main_office) +"nBu" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/processing) +>>>>>>> master "nBw" = ( /turf/open/floor/almayer{ dir = 1; @@ -55078,18 +56270,18 @@ icon_state = "plating_striped" }, /area/almayer/living/cryo_cells) +<<<<<<< HEAD +======= "nHV" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 1 +/obj/structure/closet/secure_closet/personal/cabinet{ + req_access = null }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" +/obj/item/storage/donut_box{ + pixel_y = 8 }, -/area/almayer/shipboard/brig/general_equipment) +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) +>>>>>>> master "nIj" = ( /turf/open/floor/almayer{ icon_state = "green" @@ -55162,10 +56354,28 @@ }, /area/almayer/living/briefing) "nJo" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, +<<<<<<< HEAD +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/light{ + dir = 1 + }, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/cells) +======= +/obj/structure/closet/secure_closet{ + name = "\improper Execution Firearms" + }, +/obj/item/weapon/gun/rifle/m4ra, +/obj/item/weapon/gun/rifle/m4ra, +/obj/item/weapon/gun/rifle/m4ra, +/obj/item/ammo_box/magazine/m4ra, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/brig/execution) +>>>>>>> master "nJs" = ( /obj/structure/largecrate/random/case, /turf/open/floor/almayer{ @@ -55373,8 +56583,12 @@ pixel_x = 24 }, /turf/open/floor/almayer{ - dir = 4; +<<<<<<< HEAD + dir = 9; icon_state = "red" +======= + allow_construction = 0 +>>>>>>> master }, /area/almayer/shipboard/brig/main_office) "nNV" = ( @@ -55405,14 +56619,17 @@ }, /area/almayer/engineering/upper_engineering) "nOe" = ( -/obj/structure/window/framed/almayer/hull/hijack_bustable, -/obj/structure/machinery/door/poddoor/almayer/open{ - dir = 4; - id = "perma_lockdown"; - name = "\improper Perma Lockdown Shutter" +<<<<<<< HEAD +/obj/structure/closet/secure_closet/personal/cabinet{ + req_access = null }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 8 +/obj/item/storage/donut_box{ + pixel_y = 8 +======= +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 +>>>>>>> master }, /turf/open/floor/plating, /area/almayer/shipboard/brig/perma) @@ -55570,12 +56787,27 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/command/telecomms) "nSM" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/taperecorder, +<<<<<<< HEAD +/obj/structure/extinguisher_cabinet{ + pixel_y = 26 + }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "red" +======= +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle, +/obj/structure/machinery/light/small{ + dir = 8 }, -/area/almayer/shipboard/brig/main_office) +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = -30 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "plating_striped" +>>>>>>> master + }, +/area/almayer/shipboard/brig/armory) "nSN" = ( /obj/structure/largecrate/supply/supplies/mre, /turf/open/floor/almayer{ @@ -55750,21 +56982,27 @@ /turf/open/floor/wood/ship, /area/almayer/engineering/ce_room) "nXm" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1 - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "courtyard_cells"; - name = "\improper Courtyard Lockdown Shutter" - }, -/obj/structure/machinery/door/poddoor/almayer/locked{ - id = "Cell 2"; - name = "\improper Courtyard Divider" +<<<<<<< HEAD +/obj/structure/closet/secure_closet/surgical{ + pixel_x = -30 +======= +/obj/structure/surface/table/almayer, +/obj/item/storage/toolbox/mechanical/green{ + pixel_y = 8 +>>>>>>> master }, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/almayer{ - icon_state = "test_floor4" +<<<<<<< HEAD + dir = 8; + icon_state = "sterile_green_corner" }, -/area/almayer/shipboard/brig/cells) +/area/almayer/shipboard/brig/surgery) +======= + icon_state = "plate" + }, +/area/almayer/shipboard/brig/general_equipment) +>>>>>>> master "nXF" = ( /obj/structure/bed/sofa/south/white/right{ pixel_y = 16 @@ -56396,17 +57634,25 @@ }, /area/space) "okM" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass{ - name = "\improper Execution Room" - }, +<<<<<<< HEAD +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/chief_mp_office) +"olk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 8 }, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Bathroom" + }, +======= +/obj/structure/janitorialcart, +/obj/item/tool/mop, +>>>>>>> master /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, /area/almayer/shipboard/brig/execution) "olv" = ( @@ -56478,13 +57724,18 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) +<<<<<<< HEAD +======= "omu" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 }, -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/general_equipment) +>>>>>>> master "omy" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -56605,7 +57856,20 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/processing) +<<<<<<< HEAD +"opj" = ( +/obj/structure/surface/table/almayer, +/obj/effect/spawner/random/powercell, +/obj/effect/spawner/random/tool, +/obj/item/packageWrap, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/squads/req) +======= +>>>>>>> master "opC" = ( /obj/structure/machinery/door/airlock/almayer/command/reinforced{ name = "\improper Combat Information Center" @@ -56639,15 +57903,20 @@ /turf/open/space/basic, /area/space) "opN" = ( -/obj/structure/closet/secure_closet/brig, +<<<<<<< HEAD /obj/structure/machinery/light{ unacidable = 1; unslashable = 1 }, /turf/open/floor/almayer{ icon_state = "red" +======= +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 +>>>>>>> master }, -/area/almayer/shipboard/brig/processing) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/general_equipment) "oqu" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -56845,20 +58114,24 @@ }, /area/almayer/hull/lower_hull/l_a_p) "osJ" = ( -/obj/structure/surface/table/almayer, -/obj/item/folder/white{ - pixel_x = 5; - pixel_y = 5 +<<<<<<< HEAD +/obj/structure/bed, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/obj/item/paper, -/obj/item/handcuffs, -/obj/item/clothing/mask/cigarette/cigar/classic, -/obj/item/coin/silver{ - desc = "A small coin, bearing the falling falcons insignia."; - name = "falling falcons challenge coin" +/area/almayer/shipboard/brig/perma) +======= +/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ + name = "Brig" }, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/processing) +>>>>>>> master "osT" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/prop/ice_colony/hula_girl{ @@ -57040,13 +58313,17 @@ /turf/open/floor/almayer, /area/almayer/living/cafeteria_officer) "oxn" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "red" +<<<<<<< HEAD +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/execution) +======= +/obj/structure/closet/secure_closet/brig/prisoner, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/perma) +>>>>>>> master "oxp" = ( /obj/structure/largecrate/random/case, /turf/open/floor/almayer{ @@ -57495,16 +58772,27 @@ icon_state = "test_floor4" }, /area/almayer/engineering/laundry) +<<<<<<< HEAD +"oHY" = ( +/obj/structure/bed/chair/bolted, +======= "oIc" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 +/obj/structure/machinery/atm{ + pixel_y = 32 }, -/obj/structure/machinery/light/small, +>>>>>>> master /turf/open/floor/almayer{ dir = 6; icon_state = "orange" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/processing) +<<<<<<< HEAD +"oIc" = ( +/obj/structure/largecrate/random/barrel/blue, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_p) +======= +>>>>>>> master "oIn" = ( /obj/structure/bed/chair{ dir = 8; @@ -57964,7 +59252,18 @@ /obj/structure/machinery/light{ dir = 1 }, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, +/obj/structure/bed/chair/bolted, +<<<<<<< HEAD /turf/open/floor/almayer, +======= +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +>>>>>>> master /area/almayer/shipboard/brig/processing) "oSq" = ( /obj/item/device/radio/intercom{ @@ -58144,11 +59443,13 @@ }, /area/almayer/living/starboard_garden) "oWI" = ( -/obj/structure/machinery/cryopod/right{ - pixel_y = 6 - }, +<<<<<<< HEAD /obj/structure/sign/safety/cryo{ pixel_x = 32 +======= +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_21" +>>>>>>> master }, /turf/open/floor/almayer{ icon_state = "cargo" @@ -58265,12 +59566,35 @@ }, /area/almayer/medical/containment) "paq" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/faxmachine/uscm/brig, +<<<<<<< HEAD +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter" + }, +/obj/structure/machinery/door/poddoor/almayer/locked{ + id = "Cell 2"; + name = "\improper Courtyard Divider" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/cells) +======= +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/chief_mp_office) +>>>>>>> master "paI" = ( /obj/structure/sign/safety/debark_lounge{ pixel_x = 15; @@ -58290,16 +59614,35 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/offices) "pbh" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/light{ - dir = 4 +<<<<<<< HEAD +/obj/structure/machinery/cm_vending/clothing/military_police{ + density = 0; + pixel_y = 16 }, /turf/open/floor/almayer{ dir = 5; icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/general_equipment) +"pbl" = ( +/obj/structure/bed, +/obj/item/toy/plush/farwa{ + pixel_x = 5 + }, +/obj/item/clothing/under/redpyjamas, +/obj/item/bedsheet/orange, +/turf/open/floor/wood/ship, +/area/almayer/command/corporateliason) +======= +/obj/structure/machinery/light/small{ + dir = 4 + }, +/obj/structure/sign/safety/bulkhead_door{ + pixel_x = -16 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_p) +>>>>>>> master "pbp" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -58316,10 +59659,23 @@ }, /area/almayer/command/cic) "pbC" = ( -/obj/item/bedsheet/red, -/obj/structure/bed, -/turf/open/floor/wood/ship, +<<<<<<< HEAD +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/chief_mp_office) +======= +/obj/structure/closet/secure_closet/surgical{ + pixel_x = -30 + }, +/obj/structure/machinery/power/apc/almayer, +/obj/structure/sign/safety/rewire{ + pixel_y = -38 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "sterile_green_corner" + }, +/area/almayer/shipboard/brig/surgery) +>>>>>>> master "pbV" = ( /turf/open/floor/almayer{ dir = 1; @@ -58440,9 +59796,11 @@ }, /area/almayer/living/grunt_rnr) "pdG" = ( -/obj/structure/machinery/door/airlock/almayer/security{ - dir = 2; - name = "\improper Chief MP's Bedroom" +<<<<<<< HEAD +/obj/structure/surface/table/almayer, +/obj/item/storage/box/tapes{ + pixel_x = 7; + pixel_y = 6 }, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -58450,7 +59808,16 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/evidence_storage) +======= +/obj/effect/decal/cleanable/blood, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "redcorner" + }, +/area/almayer/shipboard/brig/execution) +>>>>>>> master "pef" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/sign/safety/maint{ @@ -58839,9 +60206,10 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_s) "poZ" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 +<<<<<<< HEAD +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 21 }, /obj/structure/bed/chair/bolted{ dir = 4 @@ -58849,7 +60217,20 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/chief_mp_office) +======= +/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) +>>>>>>> master "ppc" = ( /obj/structure/largecrate/supply/generator, /obj/structure/machinery/light/small{ @@ -59279,6 +60660,7 @@ icon_state = "red" }, /area/almayer/shipboard/weapon_room) +<<<<<<< HEAD "pzc" = ( /obj/structure/pipes/vents/pump, /obj/structure/bed/chair{ @@ -59288,7 +60670,9 @@ dir = 1; icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/perma) +======= +>>>>>>> master "pzG" = ( /obj/docking_port/stationary/emergency_response/port1, /turf/open/floor/almayer{ @@ -59512,6 +60896,7 @@ allow_construction = 0 }, /area/almayer/shipboard/brig/lobby) +<<<<<<< HEAD "pFg" = ( /obj/structure/window/framed/almayer/hull/hijack_bustable, /obj/structure/machinery/door/poddoor/almayer/locked{ @@ -59524,8 +60909,9 @@ id = "courtyard_cells"; name = "\improper Courtyard Lockdown Shutter" }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/chief_mp_office) +======= +>>>>>>> master "pFA" = ( /obj/structure/pipes/standard/simple/visible{ dir = 4 @@ -59691,14 +61077,37 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/lifeboat_pumps/north1) -"pJi" = ( -/obj/structure/closet/firecloset, +/obj/structure/largecrate/random/secure{ + pixel_x = -5 + }, +<<<<<<< HEAD /turf/open/floor/almayer{ dir = 6; icon_state = "red" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/hull/upper_hull/u_m_s) +======= +/area/almayer/lifeboat_pumps/north1) +"pJi" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter" + }, +/obj/structure/machinery/door/poddoor/almayer/locked{ + id = "Cell 1"; + name = "\improper Courtyard Divider" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/cells) +>>>>>>> master "pJD" = ( /obj/structure/pipes/vents/scrubber{ dir = 1 @@ -60527,15 +61936,23 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +<<<<<<< HEAD +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter" }, /obj/effect/landmark/start/warrant, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/cells) +======= +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/main_office) +>>>>>>> master "qaD" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -60579,12 +61996,26 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) +<<<<<<< HEAD +"qbh" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/obj/structure/machinery/light/small, +/turf/open/floor/almayer{ + icon_state = "plate" +======= "qbt" = ( /obj/structure/pipes/vents/pump, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, /turf/open/floor/almayer{ - icon_state = "sterile_green" + dir = 1; + icon_state = "sterile_green_side" +>>>>>>> master }, -/area/almayer/shipboard/brig/surgery) +/area/almayer/command/combat_correspondent) "qbx" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -60842,9 +62273,10 @@ /turf/open/floor/carpet, /area/almayer/living/commandbunks) "qfR" = ( -/obj/structure/machinery/light{ - dir = 1 - }, +<<<<<<< HEAD +======= +/obj/structure/bed, +>>>>>>> master /turf/open/floor/almayer{ dir = 9; icon_state = "red" @@ -61232,16 +62664,16 @@ }, /area/almayer/medical/medical_science) "qmE" = ( -/obj/structure/sign/safety/restrictedarea{ - pixel_x = 32; - pixel_y = -8 +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" +<<<<<<< HEAD }, -/obj/structure/machinery/door_control{ - id = "perma_lockdown"; - name = "\improper Perma Cells Lockdown"; - pixel_x = 24; - pixel_y = 6; - req_access_txt = "3" +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 24 +======= +>>>>>>> master }, /turf/open/floor/almayer{ dir = 4; @@ -61259,14 +62691,15 @@ /obj/structure/machinery/faxmachine/uscm, /turf/open/floor/almayer, /area/almayer/command/computerlab) +<<<<<<< HEAD +======= "qmX" = ( -/obj/structure/toilet{ +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "Bathroom"; dir = 1 }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/shipboard/brig/perma) +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) "qmZ" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/transmitter/rotary{ @@ -61278,6 +62711,7 @@ }, /turf/open/floor/carpet, /area/almayer/living/commandbunks) +>>>>>>> master "qnd" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -61336,14 +62770,19 @@ }, /area/almayer/hull/lower_hull/l_a_s) "qof" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 8; - id = "Warden Office Shutters"; - name = "\improper Privacy Shutters" +/obj/structure/disposalpipe/segment{ + dir = 8 }, +<<<<<<< HEAD /turf/open/floor/plating, -/area/almayer/shipboard/brig/main_office) +======= +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/camera/autoname/almayer, +/turf/open/floor/almayer, +>>>>>>> master +/area/almayer/shipboard/brig/cells) "qom" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/chem_dispenser/soda{ @@ -61432,6 +62871,7 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_medbay) +<<<<<<< HEAD "qqN" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -26 @@ -61440,7 +62880,9 @@ dir = 8; icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/processing) +======= +>>>>>>> master "qqQ" = ( /obj/structure/machinery/cm_vending/sorted/medical/blood{ density = 0; @@ -61613,13 +63055,25 @@ }, /area/almayer/living/grunt_rnr) "qvf" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +<<<<<<< HEAD +/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, +/area/almayer/shipboard/brig/perma) +======= +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "Bathroom"; + dir = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/main_office) +>>>>>>> master "qvC" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -61752,10 +63206,27 @@ }, /area/almayer/medical/containment/cell) "qyd" = ( -/turf/open/floor/almayer{ - allow_construction = 0 +<<<<<<< HEAD +/obj/structure/pipes/vents/pump{ + dir = 1 }, /area/almayer/shipboard/brig/perma) +======= +/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{ + dir = 1; + name = "\improper Warden's Office" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/chief_mp_office) +>>>>>>> master "qyi" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -62132,16 +63603,20 @@ }, /area/almayer/powered) "qHF" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/bodybags{ - pixel_x = 6; - pixel_y = 6 +<<<<<<< HEAD +/obj/structure/machinery/cm_vending/clothing/senior_officer{ + req_access = null; + req_access_txt = 19; + req_one_access = null }, -/obj/item/storage/box/bodybags, +/turf/open/floor/wood/ship, +======= /turf/open/floor/almayer{ - icon_state = "redcorner" + dir = 5; + icon_state = "red" }, -/area/almayer/shipboard/brig/execution) +>>>>>>> master +/area/almayer/shipboard/brig/chief_mp_office) "qHM" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -62480,15 +63955,23 @@ }, /area/almayer/squads/delta) "qNv" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/pen, -/obj/item/paper_bin/uscm{ - pixel_y = 7 +<<<<<<< HEAD +======= +/obj/structure/toilet{ + pixel_y = 13 + }, +/obj/structure/sink{ + dir = 4; + pixel_x = 11 }, +/obj/structure/machinery/light/small{ + dir = 8 + }, +>>>>>>> master /turf/open/floor/almayer{ - icon_state = "red" + icon_state = "dark_sterile" }, -/area/almayer/shipboard/brig/lobby) +/area/almayer/shipboard/brig/main_office) "qNy" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/floor/almayer{ @@ -62606,14 +64089,25 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) +<<<<<<< HEAD +"qQL" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 +======= "qQM" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, /obj/structure/machinery/light{ unacidable = 1; unslashable = 1 +>>>>>>> master + }, +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/firstaid/toxin{ + pixel_x = 8; + pixel_y = -2 }, +/obj/item/storage/firstaid/regular, +/obj/item/reagent_container/spray/cleaner, /turf/open/floor/almayer{ icon_state = "sterile_green_side" }, @@ -62659,14 +64153,25 @@ icon_state = "silvercorner" }, /area/almayer/shipboard/brig/cic_hallway) -"qRo" = ( -/obj/structure/pipes/vents/pump{ - dir = 8 +<<<<<<< HEAD +"qRL" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, /turf/open/floor/almayer{ icon_state = "red" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/living/pilotbunks) +======= +"qRo" = ( +/obj/effect/landmark/start/police, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cryo) +>>>>>>> master "qRT" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -62731,12 +64236,19 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_umbilical) "qUb" = ( +<<<<<<< HEAD /obj/structure/surface/table/almayer, /obj/structure/machinery/recharger, /turf/open/floor/almayer{ dir = 1; icon_state = "red" +======= +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" +>>>>>>> master }, +/turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) "qUh" = ( /obj/structure/sign/safety/distribution_pipes{ @@ -62951,8 +64463,20 @@ }, /area/almayer/command/lifeboat) "qYH" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" +<<<<<<< HEAD +/obj/structure/surface/rack, +/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/glasses/sunglasses/blindfold, +/obj/item/clothing/mask/muzzle, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" +======= +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 +>>>>>>> master }, /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 8 @@ -62963,7 +64487,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/execution) +/area/almayer/shipboard/brig/perma) "qYN" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -63006,10 +64530,18 @@ /turf/open/floor/almayer, /area/almayer/living/briefing) "qZg" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +<<<<<<< HEAD +/obj/structure/surface/table/almayer, +/obj/structure/machinery/recharger, /turf/open/floor/almayer{ - dir = 8; - icon_state = "redcorner" + icon_state = "red" +======= +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/almayer{ + allow_construction = 0 +>>>>>>> master }, /area/almayer/shipboard/brig/processing) "qZH" = ( @@ -63094,15 +64626,17 @@ icon_state = "silvercorner" }, /area/almayer/command/computerlab) +<<<<<<< HEAD +======= "rbE" = ( /obj/structure/machinery/cm_vending/clothing/dress{ - req_access = list(1); - pixel_y = 0 + req_access = list(1) }, /turf/open/floor/almayer{ icon_state = "cargo" }, /area/almayer/living/commandbunks) +>>>>>>> master "rbF" = ( /obj/effect/landmark/late_join, /obj/effect/landmark/ert_spawns/distress_cryo, @@ -63464,11 +64998,26 @@ }, /area/almayer/living/grunt_rnr) "rjw" = ( -/obj/structure/machinery/light{ +<<<<<<< HEAD +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = 26 + }, +/turf/open/floor/almayer{ + icon_state = "plating_striped" + }, +/area/almayer/shipboard/brig/armory) +======= +/obj/structure/machinery/firealarm{ + pixel_y = -28 + }, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/shipboard/brig/main_office) +>>>>>>> master "rjG" = ( /obj/structure/pipes/standard/tank/oxygen, /turf/open/floor/almayer{ @@ -63533,18 +65082,22 @@ }, /area/almayer/engineering/upper_engineering) "rkh" = ( -/obj/structure/machinery/door/poddoor/almayer/locked{ - dir = 8; - id = "Perma 1L"; - name = "\improper cell shutter" - }, -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - name = "\improper Isolation Cell" - }, +<<<<<<< HEAD /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/general_equipment) +======= +/obj/structure/machinery/door/window/brigdoor/southright{ + id = "Cell 6"; + name = "Cell 6" + }, +/obj/structure/sign/safety/six{ + pixel_x = -17 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) +>>>>>>> master "rku" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/tool/wrench{ @@ -63564,11 +65117,35 @@ /turf/open/floor/almayer, /area/almayer/living/gym) "rkK" = ( +<<<<<<< HEAD +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter" + }, +/obj/structure/machinery/door/poddoor/almayer/locked{ + id = "Cell 1"; + name = "\improper Courtyard Divider" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, /turf/open/floor/almayer{ dir = 4; icon_state = "redcorner" }, -/area/almayer/shipboard/brig/execution) +/area/almayer/shipboard/brig/cells) +======= +/obj/structure/machinery/sleep_console{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/shipboard/brig/surgery) +>>>>>>> master "rkL" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -63851,6 +65428,7 @@ icon_state = "plate" }, /area/almayer/squads/delta) +<<<<<<< HEAD "rra" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ dir = 8; @@ -63864,6 +65442,8 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/perma) +======= +>>>>>>> master "rri" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -64069,13 +65649,16 @@ }, /area/almayer/hallways/hangar) "rvo" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, +<<<<<<< HEAD +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cryo) +======= /turf/open/floor/almayer{ - icon_state = "orangecorner" + dir = 9; + icon_state = "red" }, -/area/almayer/shipboard/brig/evidence_storage) +/area/almayer/shipboard/brig/processing) +>>>>>>> master "rvA" = ( /turf/open/floor/almayer, /area/almayer/living/numbertwobunks) @@ -64363,11 +65946,26 @@ }, /area/almayer/squads/req) "rCL" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, +<<<<<<< HEAD +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 +======= +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ - icon_state = "red" + icon_state = "test_floor4" +>>>>>>> master }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) "rCO" = ( /obj/structure/pipes/standard/simple/hidden/supply, @@ -64391,17 +65989,24 @@ /area/almayer/engineering/upper_engineering/port) "rDe" = ( /obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/snacks/kepler_crisps{ +/obj/structure/sign/safety/cryo{ pixel_x = 8; - pixel_y = 4 + pixel_y = 33 }, /obj/item/toy/deck{ pixel_x = -4; - pixel_y = 1 + pixel_y = 10 }, -/obj/structure/sign/safety/cryo{ - pixel_x = 8; - pixel_y = 33 +/obj/item/reagent_container/food/drinks/cans/souto/diet/cherry{ + pixel_x = 9; + pixel_y = 12 + }, +/obj/item/ashtray/plastic{ + pixel_y = -4 + }, +/obj/item/trash/cigbutt{ + pixel_x = 1; + pixel_y = 5 }, /turf/open/floor/almayer{ dir = 6; @@ -65032,16 +66637,36 @@ }, /area/almayer/lifeboat_pumps/south1) "rQY" = ( -/obj/structure/bed, -/obj/structure/machinery/flasher{ - id = "Cell 3"; - pixel_x = 24 +<<<<<<< HEAD +/obj/structure/surface/table/almayer, +/obj/item/storage/box/flashbangs, +/obj/item/storage/box/flashbangs{ + pixel_x = 5; + pixel_y = 9 }, /turf/open/floor/almayer{ dir = 6; icon_state = "red" }, -/area/almayer/shipboard/brig/cells) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/armory) +======= +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = -32 + }, +/obj/structure/sign/safety/hazard{ + pixel_y = -32 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/execution) +>>>>>>> master "rRq" = ( /turf/closed/wall/almayer, /area/almayer/lifeboat_pumps/south2) @@ -65053,13 +66678,22 @@ }, /area/almayer/lifeboat_pumps/south1) "rRQ" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" +<<<<<<< HEAD +/obj/structure/machinery/brig_cell/perma_2{ + pixel_x = -32 }, -/area/almayer/shipboard/brig/main_office) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/perma) +======= +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 8; + id = "Warden Office Shutters"; + name = "\improper Privacy Shutters" + }, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/cells) +>>>>>>> master "rRU" = ( /obj/structure/machinery/light{ dir = 8 @@ -65113,17 +66747,17 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) "rSH" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 8 - }, -/obj/structure/surface/rack, -/obj/effect/spawner/random/tool, -/obj/effect/spawner/random/powercell, +<<<<<<< HEAD /turf/open/floor/almayer{ dir = 8; icon_state = "orange" }, -/area/almayer/shipboard/brig/lobby) +/area/almayer/shipboard/brig/processing) +======= +/obj/structure/closet/secure_closet/warrant_officer, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) +>>>>>>> master "rSK" = ( /obj/structure/machinery/light/small, /turf/open/floor/almayer{ @@ -65137,14 +66771,25 @@ /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) "rTt" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +<<<<<<< HEAD +/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 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/execution) +======= +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" + icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/shipboard/brig/main_office) +>>>>>>> master "rTJ" = ( /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/almayer{ @@ -65267,12 +66912,18 @@ }, /area/almayer/living/gym) "rXC" = ( -/obj/structure/disposalpipe/junction, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 +/obj/effect/landmark/start/warrant, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, +<<<<<<< HEAD /turf/open/floor/almayer, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/main_office) +======= +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cryo) +>>>>>>> master "rXS" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/disposalpipe/segment{ @@ -65468,13 +67119,20 @@ }, /area/space) "scD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_18" }, +<<<<<<< HEAD /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/main_office) +======= +/turf/open/floor/almayer{ + dir = 9; + icon_state = "red" + }, +/area/almayer/shipboard/brig/chief_mp_office) +>>>>>>> master "scH" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -65560,13 +67218,20 @@ }, /area/almayer/squads/delta) "sdF" = ( -/obj/structure/machinery/firealarm{ - dir = 8; - pixel_x = -24 +<<<<<<< HEAD +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/reinforced{ + dir = 2; + name = "\improper Perma Brig" }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "redcorner" + icon_state = "test_floor4" +======= +/obj/structure/surface/table/almayer, +/obj/structure/machinery/recharger, +/turf/open/floor/almayer{ + icon_state = "red" +>>>>>>> master }, /area/almayer/shipboard/brig/processing) "sdO" = ( @@ -65993,12 +67658,20 @@ /turf/open/floor/almayer, /area/almayer/living/gym) "soD" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/landmark/crap_item, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" +/obj/structure/disposalpipe/segment{ + dir = 4 +<<<<<<< HEAD + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +======= + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 }, +>>>>>>> master +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/main_office) "soK" = ( /obj/item/storage/firstaid/fire/empty, @@ -66305,15 +67978,24 @@ /turf/open/floor/plating, /area/almayer/shipboard/brig/surgery) "swo" = ( -/obj/structure/machinery/vending/security, -/obj/structure/machinery/light{ - dir = 1 +<<<<<<< HEAD +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 +======= +/obj/structure/sign/safety/security{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/sign/safety/restrictedarea{ + pixel_y = 32 }, /turf/open/floor/almayer{ dir = 1; icon_state = "red" +>>>>>>> master }, -/area/almayer/shipboard/brig/main_office) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/execution) "swt" = ( /turf/open/floor/almayer{ icon_state = "greencorner" @@ -66453,14 +68135,17 @@ }, /area/almayer/engineering/engine_core) "szy" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" +<<<<<<< HEAD +/obj/structure/pipes/vents/pump{ + dir = 1 }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/chief_mp_office) +======= +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/main_office) +>>>>>>> master "szE" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -66537,14 +68222,27 @@ }, /area/almayer/engineering/ce_room) "sBH" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 +<<<<<<< HEAD +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "CMP Office Shutters"; + name = "\improper Privacy Shutters" }, /obj/structure/machinery/status_display{ pixel_x = 32 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/execution) +/turf/open/floor/plating, +/area/almayer/shipboard/brig/chief_mp_office) +======= +/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, +/area/almayer/shipboard/brig/perma) +>>>>>>> master "sBL" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/structure/machinery/light, @@ -66636,10 +68334,21 @@ }, /area/almayer/squads/delta) "sEa" = ( -/turf/open/floor/almayer{ - icon_state = "redcorner" +<<<<<<< HEAD +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/execution) +======= +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera"; + pixel_y = 6 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) +>>>>>>> master "sEd" = ( /obj/structure/machinery/cryopod/right, /obj/structure/machinery/light{ @@ -66888,10 +68597,31 @@ }, /area/almayer/hull/upper_hull/u_f_p) "sIw" = ( +<<<<<<< HEAD +/obj/structure/machinery/door_control{ + id = "cmp_armory"; + name = "Armory Lockdown"; + req_access_txt = "4"; + pixel_y = 24 + }, +/obj/structure/sign/safety/ammunition{ + pixel_y = 32 + }, +/obj/structure/sign/safety/restrictedarea{ + pixel_x = 15; + pixel_y = 32 + }, /turf/open/floor/almayer{ icon_state = "redfull" }, -/area/almayer/shipboard/brig/evidence_storage) +/area/almayer/shipboard/brig/main_office) +======= +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/execution) +>>>>>>> master "sIx" = ( /obj/effect/landmark/yautja_teleport, /turf/open/floor/plating/plating_catwalk, @@ -66933,25 +68663,19 @@ }, /area/almayer/hull/lower_hull/l_a_p) "sIY" = ( -/obj/structure/machinery/brig_cell/perma_1{ - pixel_x = -32; - pixel_y = 4 - }, -/obj/structure/machinery/door_control{ - id = "Perma 1L"; - name = "Perma 1 Lockdown"; - pixel_x = -24; - pixel_y = -12; - req_access_txt = "3" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, +<<<<<<< HEAD /turf/open/floor/almayer{ dir = 8; icon_state = "redcorner" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/chief_mp_office) +======= +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/processing) +>>>>>>> master "sJC" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray{ @@ -67184,10 +68908,17 @@ }, /area/almayer/command/lifeboat) "sQS" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/stamp{ - pixel_x = 3; - pixel_y = 10 +<<<<<<< HEAD +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ +======= +/obj/structure/machinery/power/apc/almayer{ + cell_type = /obj/item/cell/hyper; + dir = 1 + }, +/obj/structure/sign/safety/rewire{ + pixel_x = -15; +>>>>>>> master + pixel_y = 25 }, /obj/item/device/taperecorder, /turf/open/floor/almayer{ @@ -67436,12 +69167,12 @@ /obj/structure/machinery/power/apc/almayer{ dir = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cryo) -"sWs" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "cargo" +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 +<<<<<<< HEAD +======= }, /area/almayer/hull/upper_hull/u_f_p) "sWC" = ( @@ -67458,7 +69189,34 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/engineering/upper_engineering/port) +/area/almayer/shipboard/brig/main_office) +"sWs" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer{ + icon_state = "cargo" +>>>>>>> master + }, +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/bedsheet/brown{ + layer = 3.1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/shipboard/brig/main_office) "sWW" = ( /obj/structure/machinery/flasher{ alpha = 1; @@ -67579,14 +69337,12 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south2) +<<<<<<< HEAD +======= "sYB" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/general_equipment) +>>>>>>> master "sYC" = ( /obj/structure/machinery/door/airlock/almayer/maint, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -67782,24 +69538,22 @@ }, /area/almayer/hull/lower_hull/l_a_s) "tcP" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, +<<<<<<< HEAD /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "perma_lockdown"; - name = "\improper Perma Lockdown Shutter" - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ - name = "\improper Perma Cells" +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/processing) +======= +/obj/structure/machinery/cryopod/right{ + layer = 3.1; + pixel_y = 13 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "cargo" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/cryo) "tcZ" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -67808,6 +69562,7 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/upper_engineering/port) +>>>>>>> master "tda" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -67837,12 +69592,21 @@ }, /area/almayer/hallways/hangar) "tdv" = ( +<<<<<<< HEAD /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ dir = 8; icon_state = "red" }, /area/almayer/shipboard/brig/main_office) +======= +/obj/structure/closet/secure_closet/brig/prisoner, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "redcorner" + }, +/area/almayer/shipboard/brig/processing) +>>>>>>> master "tdx" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -67987,25 +69751,37 @@ }, /area/almayer/medical/containment/cell) "tfO" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 +<<<<<<< HEAD +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 24 }, /obj/item/storage/box/nade_box/tear_gas, /obj/item/storage/box/nade_box/tear_gas{ pixel_x = 3; pixel_y = 5 }, -/obj/structure/surface/table/almayer, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1; - pixel_y = 1 +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/general_equipment) +======= +/obj/structure/machinery/door_control{ + id = "CMP Office Shutters"; + name = "CMP Office Shutters"; + pixel_y = 32; + req_one_access_txt = "24;31" + }, +/obj/structure/machinery/door_control{ + id = "Brig Lockdown Shutters"; + name = "Brig Lockdown Shutters"; + pixel_y = 24; + req_access_txt = "3" }, /turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" + dir = 1; + icon_state = "red" }, -/area/almayer/shipboard/brig/armory) +/area/almayer/shipboard/brig/chief_mp_office) +>>>>>>> master "tgK" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -68236,10 +70012,19 @@ }, /area/almayer/squads/alpha_bravo_shared) "tkV" = ( -/obj/structure/bed/chair, +<<<<<<< HEAD /turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" + dir = 5; + icon_state = "red" +======= +/obj/structure/surface/table/almayer, +/obj/structure/machinery/faxmachine/uscm/brig, +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/turf/open/floor/almayer{ + allow_construction = 0 +>>>>>>> master }, /area/almayer/shipboard/brig/processing) "tld" = ( @@ -68481,6 +70266,8 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) +<<<<<<< HEAD +======= "tqd" = ( /obj/structure/surface/table/almayer, /obj/item/tool/screwdriver, @@ -68497,13 +70284,12 @@ }, /area/almayer/hull/upper_hull/u_m_s) "tqe" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, +/obj/structure/closet/secure_closet/medical2, /turf/open/floor/almayer{ icon_state = "sterile_green_side" }, /area/almayer/shipboard/brig/surgery) +>>>>>>> master "tqg" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -68547,15 +70333,29 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) +<<<<<<< HEAD +"tqB" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 +======= "tqV" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 26 +/obj/structure/disposalpipe/segment{ + dir = 8 +>>>>>>> master }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/shipboard/brig/general_equipment) +<<<<<<< HEAD +/area/almayer/command/lifeboat) +======= +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/processing) +>>>>>>> master "trb" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, @@ -68767,14 +70567,20 @@ }, /area/almayer/lifeboat_pumps/south1) "tvA" = ( -/obj/structure/machinery/sleep_console{ - dir = 8 +<<<<<<< HEAD +/obj/structure/bed/chair{ + dir = 1 +======= +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer{ - dir = 8; + dir = 9; icon_state = "sterile_green_side" +>>>>>>> master }, -/area/almayer/shipboard/brig/surgery) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/main_office) "tvM" = ( /obj/structure/bed/chair{ dir = 1 @@ -68964,9 +70770,20 @@ }, /area/almayer/hull/upper_hull/u_a_p) "tzj" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_f_p) +<<<<<<< HEAD +/obj/structure/closet/secure_closet/brig/prisoner, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/perma) +======= +/obj/structure/extinguisher_cabinet{ + pixel_y = 26 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/main_office) +>>>>>>> master "tzx" = ( /obj/structure/machinery/cm_vending/sorted/medical/blood, /obj/structure/machinery/light{ @@ -69195,11 +71012,18 @@ }, /area/almayer/command/airoom) "tFv" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 +<<<<<<< HEAD +/turf/open/floor/almayer{ + allow_construction = 0 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/cryo) +======= +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/perma) +>>>>>>> master "tFS" = ( /obj/structure/machinery/computer/supplycomp, /obj/structure/sign/safety/terminal{ @@ -69241,12 +71065,25 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) "tGg" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +<<<<<<< HEAD +/obj/structure/janitorialcart, +/obj/item/tool/mop, /turf/open/floor/almayer{ dir = 1; icon_state = "redcorner" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/execution) +======= +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/vending/snack{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cells) +>>>>>>> master "tGh" = ( /obj/structure/sign/nosmoking_2{ pixel_x = -28 @@ -69329,9 +71166,9 @@ }, /area/almayer/living/briefing) "tHB" = ( -/obj/structure/surface/table/almayer, -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = -30 +<<<<<<< HEAD +/obj/structure/machinery/sleep_console{ + dir = 8 }, /obj/structure/machinery/recharger{ layer = 3.1; @@ -69340,7 +71177,17 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/surgery) +======= +/obj/structure/machinery/keycard_auth{ + pixel_y = 25 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/shipboard/brig/chief_mp_office) +>>>>>>> master "tHS" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -69416,12 +71263,10 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) -"tJp" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/crowbar/red, -/obj/item/clipboard{ - pixel_x = 1; - pixel_y = 4 +<<<<<<< HEAD +"tJo" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 }, /obj/item/storage/box/handcuffs{ pixel_x = 5; @@ -69440,7 +71285,33 @@ dir = 4; icon_state = "redcorner" }, -/area/almayer/shipboard/brig/main_office) +======= +"tJp" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/item/vehicle_clamp, +/obj/item/vehicle_clamp, +/obj/item/vehicle_clamp, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1; + pixel_y = -1 + }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/armory) +"tJy" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer, +>>>>>>> master +/area/almayer/shipboard/brig/processing) "tJz" = ( /obj/structure/machinery/firealarm{ pixel_y = -28 @@ -69551,6 +71422,7 @@ }, /area/almayer/living/briefing) "tNj" = ( +<<<<<<< HEAD /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/sentencing{ dir = 4 @@ -69558,6 +71430,10 @@ /obj/structure/machinery/light{ dir = 8 }, +/obj/item/device/camera_film, +======= +/obj/structure/closet/firecloset/full, +>>>>>>> master /turf/open/floor/almayer{ dir = 8; icon_state = "red" @@ -69702,15 +71578,25 @@ }, /area/almayer/hull/lower_hull/l_m_s) "tRA" = ( -/obj/structure/bed/chair, -/obj/structure/machinery/firealarm{ - pixel_y = 28 +<<<<<<< HEAD +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 2; + id = "cmp_armory"; + name = "\improper Armory Shutters" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" +======= +/obj/structure/sign/safety/medical{ + pixel_x = 16; + pixel_y = 27 }, /turf/open/floor/almayer{ dir = 1; - icon_state = "redcorner" + icon_state = "red" +>>>>>>> master }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/armory) "tRD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -69940,14 +71826,29 @@ }, /area/almayer/squads/req) "tXs" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +<<<<<<< HEAD +/obj/structure/reagent_dispensers/peppertank{ + pixel_x = -30 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/shipboard/brig/cryo) +/area/almayer/shipboard/brig/perma) +"tXz" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/vehiclehangar) +======= +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_s) +>>>>>>> master "tXM" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -70365,15 +72266,19 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) +<<<<<<< HEAD +======= "ueo" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass{ - name = "Evidence Room" +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/sentencing{ + dir = 4 }, -/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 8; + icon_state = "red" }, -/area/almayer/shipboard/brig/evidence_storage) +/area/almayer/shipboard/brig/processing) +>>>>>>> master "ueG" = ( /obj/item/bedsheet/orange, /obj/structure/bed{ @@ -70440,10 +72345,11 @@ icon_state = "cargo" }, /area/almayer/squads/req) -"ufL" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/uniform_vendors, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +<<<<<<< HEAD +"ufS" = ( +/obj/structure/sign/safety/terminal{ + pixel_x = 7; + pixel_y = 29 }, /area/almayer/command/cic) "ugs" = ( @@ -70468,7 +72374,24 @@ dir = 8; icon_state = "red" }, +/area/almayer/command/combat_correspondent) +"ugs" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/shipboard/brig/execution) +======= +"ufL" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer/uniform_vendors, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/command/cic) +"ugs" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/lobby) +>>>>>>> master "ugu" = ( /obj/structure/machinery/cm_vending/sorted/marine_food, /turf/open/floor/almayer, @@ -70634,12 +72557,17 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +<<<<<<< HEAD +======= "ukS" = ( /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 4; + icon_state = "pipe-c" }, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/main_office) +>>>>>>> master "ukU" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -70654,16 +72582,19 @@ /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) "ula" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass{ - name = "Evidence Room" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ +<<<<<<< HEAD +/obj/structure/disposalpipe/junction{ dir = 8 }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/evidence_storage) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/processing) +======= +/turf/closed/wall/almayer, +/area/almayer/shipboard/brig/perma) +>>>>>>> master "uli" = ( /turf/open/floor/grass, /area/almayer/living/starboard_garden) @@ -70945,17 +72876,24 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) "ush" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/cameras/almayer_network{ - dir = 8 - }, -/obj/structure/machinery/light{ - dir = 4 - }, +<<<<<<< HEAD /turf/open/floor/almayer{ allow_construction = 0 }, +/area/almayer/shipboard/brig/execution) +======= +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 2; + id = "CMP Office Shutters"; + name = "\improper Privacy Shutters" + }, +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/plating, /area/almayer/shipboard/brig/chief_mp_office) +>>>>>>> master "usi" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -71078,16 +73016,23 @@ /turf/open/floor/almayer, /area/almayer/squads/bravo) "uuq" = ( -/obj/structure/bed, -/obj/structure/machinery/flasher{ - id = "Cell 4"; - pixel_x = 24 +<<<<<<< HEAD +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 }, /turf/open/floor/almayer{ dir = 6; icon_state = "red" }, -/area/almayer/shipboard/brig/cells) +/area/almayer/shipboard/brig/main_office) +======= +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/perma) +>>>>>>> master "uuu" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -71190,20 +73135,26 @@ }, /area/almayer/squads/bravo) "uvy" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 +<<<<<<< HEAD +/obj/structure/disposalpipe/segment{ + dir = 8 }, /obj/effect/decal/warning_stripes{ icon_state = "W"; pixel_x = -1; pixel_y = 1 }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/processing) +======= +/obj/structure/toilet{ + dir = 8 + }, /turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" + icon_state = "plate" }, -/area/almayer/shipboard/brig/armory) +/area/almayer/shipboard/brig/perma) +>>>>>>> master "uvG" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -71373,19 +73324,18 @@ }, /area/almayer/hull/upper_hull/u_f_s) "uzx" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, +<<<<<<< HEAD +/obj/structure/closet/emcloset/legacy, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/cryo) +======= +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +>>>>>>> master +/area/almayer/shipboard/brig/main_office) "uzy" = ( /obj/item/reagent_container/glass/bucket, /obj/effect/decal/cleanable/blood/oil, @@ -71576,11 +73526,17 @@ }, /area/almayer/living/grunt_rnr) "uCl" = ( -/obj/structure/closet/secure_closet/surgical{ - pixel_x = -30 +<<<<<<< HEAD +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer{ - dir = 4; + dir = 9; +======= +/obj/structure/machinery/iv_drip, +/turf/open/floor/almayer{ + dir = 1; +>>>>>>> master icon_state = "sterile_green_side" }, /area/almayer/shipboard/brig/surgery) @@ -71690,11 +73646,25 @@ }, /area/almayer/medical/lockerroom) "uFp" = ( +<<<<<<< HEAD +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + layer = 1.9 + }, +/area/almayer/shipboard/brig/general_equipment) +======= +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/obj/structure/bed/sofa/south/grey/left, /turf/open/floor/almayer{ - dir = 8; + dir = 1; icon_state = "red" }, -/area/almayer/shipboard/brig/general_equipment) +/area/almayer/shipboard/brig/lobby) +>>>>>>> master "uFt" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -71962,18 +73932,27 @@ /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) "uLJ" = ( -/obj/structure/machinery/light{ - dir = 4; - invisibility = 101 +<<<<<<< HEAD +/obj/structure/disposalpipe/segment{ + dir = 8 }, /obj/structure/sign/safety/ammunition{ pixel_x = 32; pixel_y = -7 }, -/turf/open/floor/almayer{ - icon_state = "cargo" +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) +======= +/obj/structure/sign/safety/maint{ + pixel_x = -17; + pixel_y = -34 }, -/area/almayer/shipboard/brig/execution) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/perma) +>>>>>>> master "uLN" = ( /obj/structure/closet/secure_closet/engineering_welding, /turf/open/floor/almayer{ @@ -72360,13 +74339,35 @@ }, /area/almayer/squads/charlie) "uUs" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 +<<<<<<< HEAD +/obj/structure/bed, +/obj/structure/machinery/flasher{ + id = "Cell 4"; + pixel_x = -24 +======= +/obj/structure/surface/table/almayer, +/obj/item/device/camera{ + pixel_x = 4; + pixel_y = 8 + }, +/obj/item/device/camera_film{ + pixel_x = 4; + pixel_y = -2 +>>>>>>> master }, +/obj/item/device/camera_film, /turf/open/floor/almayer{ - icon_state = "redcorner" +<<<<<<< HEAD + dir = 8; + icon_state = "red" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/cells) +======= + dir = 10; + icon_state = "red" + }, +/area/almayer/shipboard/brig/main_office) +>>>>>>> master "uUt" = ( /obj/structure/surface/table/almayer, /obj/effect/spawner/random/technology_scanner, @@ -72388,12 +74389,14 @@ /turf/open/floor/plating, /area/almayer/engineering/upper_engineering/port) "uUO" = ( +<<<<<<< HEAD /obj/structure/surface/table/almayer, -/obj/structure/machinery/door_control{ - id = "courtyard_cells"; - name = "\improper Courtyard Lockdown Shutters"; - pixel_x = 16; - req_access_txt = "3" +/obj/structure/machinery/computer/sentencing{ + dir = 4 +======= +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = 26 +>>>>>>> master }, /obj/structure/machinery/recharger, /turf/open/floor/almayer{ @@ -72487,14 +74490,15 @@ /area/almayer/hallways/stern_hallway) "uWI" = ( /obj/structure/surface/table/almayer, -/obj/item/ashtray/plastic, -/obj/item/trash/cigbutt{ - pixel_x = 1; +/obj/item/pizzabox/margherita{ pixel_y = 8 }, -/obj/item/reagent_container/food/drinks/cans/souto/diet/cherry{ - pixel_x = -9; - pixel_y = 12 +/obj/item/weapon/pizza_cutter{ + force = 20; + name = "\improper Replica PIZZA TIME"; + desc = "A cheap replica of the fabled PIZZA TIME novelty pizza cutter, this one is not as sharp as the original which legends said could slice any pizza...."; + pixel_x = -6; + pixel_y = 8 }, /turf/open/floor/almayer{ dir = 1; @@ -72609,16 +74613,15 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/hallways/repair_bay) +<<<<<<< HEAD +======= "uZY" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/machinery/light/small{ - dir = 1 +/obj/structure/sign/safety/medical{ + pixel_x = -17 }, -/obj/structure/closet/secure_closet/guncabinet/blue/riot_control, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) +/turf/closed/wall/almayer, +/area/almayer/shipboard/brig/surgery) +>>>>>>> master "uZZ" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Basketball Court" @@ -72727,11 +74730,15 @@ }, /area/almayer/lifeboat_pumps/south2) "vcG" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/recharger, -/obj/item/device/flash, -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 +/obj/structure/machinery/vending/snack, +/obj/structure/machinery/status_display{ + pixel_x = 32 +<<<<<<< HEAD +======= + }, +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" +>>>>>>> master }, /turf/open/floor/almayer{ dir = 9; @@ -72821,13 +74828,25 @@ }, /area/almayer/living/briefing) "vez" = ( +<<<<<<< HEAD +/obj/structure/machinery/light{ + dir = 1 + }, /obj/structure/surface/table/almayer, -/obj/item/device/camera, -/obj/item/device/camera_film, +/obj/structure/machinery/computer/secure_data{ +======= +/obj/structure/bed/chair/comfy/black{ +>>>>>>> master + dir = 4 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/shipboard/brig/main_office) +<<<<<<< HEAD +/area/almayer/shipboard/brig/processing) +======= +/area/almayer/shipboard/brig/chief_mp_office) +>>>>>>> master "vfa" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -72851,17 +74870,19 @@ }, /area/almayer/powered) "vfv" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/obj/structure/machinery/power/apc/almayer{ +<<<<<<< HEAD +/obj/structure/bed/chair{ dir = 4 }, /turf/open/floor/almayer{ dir = 8; icon_state = "redcorner" }, +/area/almayer/shipboard/brig/main_office) +======= +/turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/execution) +>>>>>>> master "vfx" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -73285,22 +75306,15 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +<<<<<<< HEAD +======= "vli" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/structure/machinery/power/apc/almayer/hardened{ - dir = 8 - }, -/obj/structure/surface/rack, -/obj/item/stack/sheet/glass/reinforced{ - amount = 50 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" +/obj/structure/disposalpipe/junction, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 }, -/area/almayer/shipboard/brig/processing) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/main_office) "vlk" = ( /obj/structure/closet/emcloset, /obj/item/clothing/mask/gas, @@ -73309,6 +75323,7 @@ icon_state = "cargo" }, /area/almayer/command/lifeboat) +>>>>>>> master "vln" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -73503,13 +75518,23 @@ /obj/structure/machinery/door/window/tinted{ dir = 2 }, +<<<<<<< HEAD +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating/almayer, +======= /obj/item/clothing/mask/cigarette/weed, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) "vpI" = ( -/obj/effect/landmark/start/police, +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cryo) +>>>>>>> master +/area/almayer/shipboard/brig/evidence_storage) "vpV" = ( /turf/open/floor/almayer{ dir = 10; @@ -73649,6 +75674,7 @@ }, /area/almayer/shipboard/brig/evidence_storage) "vrQ" = ( +<<<<<<< HEAD /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 2; id = "perma_exit"; @@ -73668,7 +75694,18 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/armory) +======= +/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 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/execution) +>>>>>>> master "vrW" = ( /turf/open/floor/almayer{ dir = 8; @@ -73698,16 +75735,7 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"vsI" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/obj/structure/closet/secure_closet/guncabinet/blue/riot_control, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) +<<<<<<< HEAD "vsJ" = ( /obj/structure/machinery/door/airlock/almayer/maint{ access_modified = 1; @@ -73717,10 +75745,15 @@ req_one_access = null; req_one_access_txt = "3;6" }, +/area/almayer/shipboard/brig/surgery) +======= +"vsI" = ( /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 4; + icon_state = "red" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/chief_mp_office) +>>>>>>> master "vsV" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -73936,9 +75969,21 @@ }, /area/almayer/hull/lower_hull/l_f_p) "vwO" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/general_equipment) +<<<<<<< HEAD +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) +======= +/obj/structure/closet/emcloset/legacy, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "red" + }, +/area/almayer/shipboard/brig/main_office) +>>>>>>> master "vwP" = ( /obj/structure/surface/table/almayer, /obj/item/prop/helmetgarb/prescription_bottle{ @@ -73975,10 +76020,25 @@ /turf/open/floor/almayer, /area/almayer/hallways/hangar) "vxC" = ( -/turf/open/floor/almayer{ - icon_state = "red" +<<<<<<< HEAD +/obj/structure/sign/safety/hazard{ + pixel_x = 32; + pixel_y = -8 }, -/area/almayer/shipboard/brig/general_equipment) +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/main_office) +======= +/obj/effect/landmark/start/police, +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cryo) +>>>>>>> master "vxM" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/cryo) @@ -74038,15 +76098,37 @@ }, /area/almayer/medical/lower_medical_lobby) "vyE" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 +<<<<<<< HEAD +/obj/structure/machinery/power/apc/almayer{ + dir = 8 }, /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/lobby) +/area/almayer/shipboard/brig/perma) +======= +/obj/structure/filingcabinet{ + density = 0; + pixel_x = -8; + pixel_y = 18 + }, +/obj/structure/filingcabinet{ + density = 0; + pixel_x = 8; + pixel_y = 18 + }, +/obj/structure/machinery/power/apc/almayer{ + dir = 8 + }, +/obj/structure/sign/safety/rewire{ + pixel_x = -17; + pixel_y = 17 + }, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/evidence_storage) +>>>>>>> master "vyI" = ( /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/port) @@ -74763,14 +76845,25 @@ }, /area/almayer/command/cic) "vOd" = ( -/obj/structure/machinery/optable, -/obj/structure/sign/safety/medical{ - pixel_x = -17 +<<<<<<< HEAD +/obj/structure/machinery/body_scanconsole{ + dir = 8 }, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + dir = 8; + icon_state = "sterile_green_side" +======= +/obj/structure/machinery/vending/security, +/obj/structure/machinery/light, +/obj/structure/machinery/firealarm{ + dir = 8; + pixel_x = -24 }, -/area/almayer/shipboard/brig/surgery) +/turf/open/floor/almayer{ + icon_state = "plate" +>>>>>>> master + }, +/area/almayer/shipboard/brig/general_equipment) "vOh" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, @@ -75128,12 +77221,31 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) "vUL" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/flash, +<<<<<<< HEAD +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/sign/safety/cryo{ + pixel_x = 7; + pixel_y = 25 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/cryo) +======= +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "redcorner" + }, +/area/almayer/shipboard/brig/lobby) +>>>>>>> master "vUU" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -75215,12 +77327,26 @@ icon_state = "redfull" }, /area/almayer/living/offices/flight) +<<<<<<< HEAD +======= "vWo" = ( -/turf/open/floor/almayer{ +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/card{ + dir = 4 + }, +/obj/structure/machinery/computer/secure_data{ dir = 4; - icon_state = "redcorner" + pixel_y = 17 }, -/area/almayer/shipboard/brig/evidence_storage) +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/shipboard/brig/processing) +>>>>>>> master "vWt" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/glass/beaker/large, @@ -75355,11 +77481,22 @@ }, /area/almayer/command/airoom) "vXQ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "CMP Office Shutters"; + name = "\improper Privacy Shutters" }, +<<<<<<< HEAD /turf/open/floor/almayer, -/area/almayer/shipboard/brig/perma) +/area/almayer/shipboard/brig/processing) +======= +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + layer = 1.9 + }, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/chief_mp_office) +>>>>>>> master "vXX" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/tool, @@ -75681,11 +77818,21 @@ }, /area/almayer/medical/medical_science) "wdr" = ( -/obj/structure/machinery/power/apc/almayer, +/obj/structure/pipes/vents/scrubber, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/main_office) +<<<<<<< HEAD +"wdv" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, /turf/open/floor/almayer{ icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/engineering/upper_engineering) +======= +>>>>>>> master "wdz" = ( /obj/effect/landmark/start/marine/engineer/charlie, /obj/effect/landmark/late_join/charlie, @@ -75895,15 +78042,29 @@ /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop) "wir" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" +<<<<<<< HEAD +/obj/structure/sign/safety/bulkhead_door{ + pixel_x = -16 }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer{ - allow_construction = 0 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_p) +======= +/obj/structure/surface/table/almayer, +/obj/item/storage/box/tapes{ + pixel_x = 7; + pixel_y = 6 }, -/area/almayer/shipboard/brig/lobby) +/obj/item/storage/box/tapes{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/storage/box/tapes{ + pixel_x = 1; + pixel_y = 1 + }, +/turf/open/floor/plating/almayer, +/area/almayer/shipboard/brig/evidence_storage) +>>>>>>> master "wiz" = ( /obj/structure/bed/chair{ dir = 4 @@ -76352,11 +78513,24 @@ /turf/open/floor/almayer{ icon_state = "plate" }, +<<<<<<< HEAD +/area/almayer/shipboard/brig/processing) +======= /area/almayer/command/combat_correspondent) "wqu" = ( -/obj/structure/window/framed/almayer, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/lobby) +/obj/structure/surface/table/almayer, +/obj/item/storage/box/flashbangs, +/obj/item/storage/box/flashbangs{ + pixel_x = 5; + pixel_y = 9 + }, +/obj/item/storage/box/flashbangs{ + pixel_x = -8; + pixel_y = 5 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/armory) +>>>>>>> master "wqA" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -76579,17 +78753,24 @@ }, /area/almayer/shipboard/brig/perma) "wvT" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, +<<<<<<< HEAD /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 +======= +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "perma_lockdown"; + name = "\improper Perma Lockdown Shutter"; dir = 4 +>>>>>>> master }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/perma) "wvU" = ( /obj/structure/machinery/recharge_station, /obj/structure/machinery/light{ @@ -76828,8 +79009,10 @@ }, /area/almayer/living/briefing) "wCM" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +<<<<<<< HEAD +/obj/structure/pipes/vents/pump, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -76841,7 +79024,17 @@ dir = 1; icon_state = "red" }, -/area/almayer/shipboard/brig/processing) +/area/almayer/shipboard/brig/surgery) +======= +/obj/structure/reagent_dispensers/peppertank{ + pixel_x = -30 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/shipboard/brig/perma) +>>>>>>> master "wCT" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_AresDown"; @@ -77479,11 +79672,22 @@ }, /area/almayer/lifeboat_pumps/south1) "wPk" = ( +<<<<<<< HEAD +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/chief_mp_office) +======= +/obj/structure/window/reinforced/ultra{ + pixel_y = -12 + }, +/obj/structure/bed/chair/bolted, +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" + icon_state = "plating_striped" }, /area/almayer/shipboard/brig/execution) +>>>>>>> master "wPz" = ( /turf/open/floor/almayer{ icon_state = "mono" @@ -77517,9 +79721,9 @@ }, /area/almayer/hallways/aft_hallway) "wQk" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +<<<<<<< HEAD +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 8 }, /obj/structure/machinery/status_display{ pixel_y = -32 @@ -77531,7 +79735,17 @@ /turf/open/floor/almayer{ icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/evidence_storage) +======= +/obj/structure/machinery/brig_cell/cell_2{ + pixel_x = 32; + pixel_y = -32 + }, +/turf/open/floor/almayer{ + allow_construction = 0 + }, +/area/almayer/shipboard/brig/processing) +>>>>>>> master "wQv" = ( /obj/structure/machinery/light{ dir = 8 @@ -77547,6 +79761,7 @@ icon_state = "orange" }, /area/almayer/hull/upper_hull/u_a_s) +<<<<<<< HEAD "wRm" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -77555,8 +79770,9 @@ density = 0; pixel_y = 16 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) +/area/almayer/shipboard/brig/processing) +======= +>>>>>>> master "wRN" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/item/seeds/goldappleseed, @@ -77771,17 +79987,20 @@ "wVb" = ( /turf/closed/wall/almayer/outer, /area/almayer/hull/lower_hull/l_a_s) +<<<<<<< HEAD +======= "wVw" = ( -/obj/structure/machinery/light/small{ - dir = 8 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/recharger, +/obj/item/tool/hand_labeler{ + pixel_x = -8; + pixel_y = 3 }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 +/turf/open/floor/almayer{ + icon_state = "plate" }, -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun, -/turf/open/floor/plating/almayer, -/area/almayer/shipboard/brig/armory) +/area/almayer/shipboard/brig/general_equipment) +>>>>>>> master "wVy" = ( /obj/structure/window/reinforced{ dir = 8 @@ -77806,11 +80025,46 @@ }, /area/almayer/squads/charlie_delta_shared) "wVz" = ( -/obj/structure/machinery/light/small{ +<<<<<<< HEAD +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/card{ dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_f_p) +/obj/structure/machinery/computer/secure_data{ + dir = 4; + pixel_y = 17 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/sign/safety/terminal{ + pixel_x = -17 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/shipboard/brig/processing) +======= +/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 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/cells) +>>>>>>> master "wVB" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -77835,22 +80089,51 @@ /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) "wVV" = ( -/obj/structure/machinery/cryopod{ - pixel_y = 6 +<<<<<<< HEAD +/obj/structure/closet/secure_closet{ + name = "secure evidence locker"; + req_access_txt = "3" +======= +/obj/structure/bed/chair{ + dir = 4 +>>>>>>> master }, /turf/open/floor/almayer{ - icon_state = "cargo" + dir = 1; + icon_state = "red" }, -/area/almayer/shipboard/brig/cryo) +<<<<<<< HEAD +/area/almayer/shipboard/brig/evidence_storage) +======= +/area/almayer/shipboard/brig/main_office) +>>>>>>> master "wVW" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/command/cic) "wVY" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +<<<<<<< HEAD +/obj/structure/surface/rack, +/obj/item/storage/box/gloves{ + pixel_x = 3; + pixel_y = 3 +======= +/obj/structure/sign/safety/medical{ + pixel_x = -17; + pixel_y = 6 + }, +/obj/structure/sign/safety/restrictedarea{ + pixel_x = -17; + pixel_y = -9 +>>>>>>> master }, +/obj/item/storage/box/masks, /turf/open/floor/almayer{ - allow_construction = 0 +<<<<<<< HEAD + icon_state = "sterile_green_side" +======= + dir = 8; + icon_state = "red" +>>>>>>> master }, /area/almayer/shipboard/brig/lobby) "wWf" = ( @@ -78025,8 +80308,9 @@ /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) "wZa" = ( +/obj/structure/machinery/light, /turf/open/floor/almayer{ - icon_state = "redcorner" + icon_state = "red" }, /area/almayer/shipboard/brig/general_equipment) "wZv" = ( @@ -78748,20 +81032,15 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +<<<<<<< HEAD +======= "xoS" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = -30 - }, -/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 }, -/area/almayer/shipboard/brig/armory) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/general_equipment) +>>>>>>> master "xpd" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -78804,6 +81083,7 @@ }, /area/almayer/shipboard/brig/cic_hallway) "xps" = ( +<<<<<<< HEAD /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 }, @@ -78813,10 +81093,29 @@ req_access = null; req_one_access_txt = "1;3" }, +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + dir = 1; + name = "\improper Brig" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "perma_lockdown"; + name = "\improper Perma Lockdown Shutter" +======= +/obj/structure/surface/rack, +/obj/item/storage/box/gloves{ + pixel_x = 3; + pixel_y = 3 +>>>>>>> master + }, +/obj/item/storage/box/masks, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "sterile_green_side" }, -/area/almayer/shipboard/brig/lobby) +<<<<<<< HEAD +/area/almayer/shipboard/brig/perma) +======= +/area/almayer/shipboard/brig/surgery) +>>>>>>> master "xpt" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -78900,11 +81199,20 @@ /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) "xro" = ( -/obj/structure/toilet{ - pixel_y = 13 +<<<<<<< HEAD +/obj/structure/disposalpipe/segment{ + dir = 8 +======= +/obj/structure/sink{ + dir = 4; + pixel_x = 11 }, /turf/open/floor/almayer{ icon_state = "plate" +>>>>>>> master + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /area/almayer/shipboard/brig/perma) "xrq" = ( @@ -78929,12 +81237,25 @@ }, /area/almayer/hull/upper_hull/u_a_p) "xrP" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer{ +<<<<<<< HEAD +/turf/open/floor/almayer{ + allow_construction = 0 + }, +/area/almayer/shipboard/brig/main_office) +======= +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_x = -30 + }, +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ dir = 2 }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/evidence_storage) +/turf/open/floor/almayer{ + dir = 1; + icon_state = "redcorner" + }, +/area/almayer/shipboard/brig/processing) +>>>>>>> master "xsl" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -79512,13 +81833,19 @@ }, /area/almayer/squads/req) "xCd" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = 30 +<<<<<<< HEAD +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, /turf/open/floor/almayer{ icon_state = "redcorner" }, /area/almayer/shipboard/brig/processing) +======= +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/evidence_storage) +>>>>>>> master "xCj" = ( /obj/structure/closet/emcloset, /turf/open/floor/plating/plating_catwalk, @@ -79599,6 +81926,7 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +<<<<<<< HEAD "xEc" = ( /turf/open/floor/almayer{ dir = 9; @@ -79610,8 +81938,36 @@ /obj/structure/machinery/status_display{ pixel_x = -32 }, +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = -32 +======= +"xEe" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/sentencing{ + dir = 8 + }, +/obj/structure/sign/safety/terminal{ + pixel_x = 32; + pixel_y = -22 +>>>>>>> master + }, +/obj/structure/sign/safety/hazard{ + pixel_y = -32 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/execution) +"xEe" = ( /turf/open/floor/almayer{ - icon_state = "plate" +<<<<<<< HEAD + dir = 1; +======= + dir = 4; +>>>>>>> master + icon_state = "red" }, /area/almayer/shipboard/brig/perma) "xEz" = ( @@ -79767,13 +82123,18 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_p) +<<<<<<< HEAD +======= "xHM" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/sentencing, -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/processing) +/obj/structure/closet/fireaxecabinet{ + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/main_office) +>>>>>>> master "xHW" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -79823,13 +82184,25 @@ }, /area/almayer/medical/lower_medical_medbay) "xIw" = ( -/obj/structure/machinery/brig_cell/cell_2{ - pixel_x = 32 +<<<<<<< HEAD +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + layer = 1.9 }, /turf/open/floor/almayer{ allow_construction = 0 }, /area/almayer/shipboard/brig/processing) +======= +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cells) +>>>>>>> master "xIQ" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -80296,24 +82669,29 @@ }, /area/almayer/shipboard/brig/cic_hallway) "xSA" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/flashlight/lamp{ - layer = 3.1; - pixel_x = 7; - pixel_y = 10 +<<<<<<< HEAD +/obj/structure/sign/safety/restrictedarea{ + pixel_y = 32 + }, +/obj/structure/sign/safety/security{ + pixel_x = 15; + pixel_y = 32 +======= +/obj/structure/sign/safety/intercom{ + pixel_x = -17 }, +/obj/structure/surface/table/almayer, /obj/item/book/manual/marine_law{ pixel_x = -3; pixel_y = 1 }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/obj/structure/sign/safety/intercom{ - pixel_x = -17 +/obj/item/device/flashlight/lamp{ + layer = 3.1; + pixel_x = 7; + pixel_y = 10 +>>>>>>> master }, +/obj/structure/bed/sofa/south/grey/right, /turf/open/floor/almayer{ dir = 9; icon_state = "red" @@ -80359,12 +82737,13 @@ }, /area/almayer/medical/containment) "xTp" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +<<<<<<< HEAD +/obj/structure/machinery/light{ + dir = 1 }, +======= +/obj/structure/bed/chair/bolted, +>>>>>>> master /turf/open/floor/almayer{ dir = 1; icon_state = "red" @@ -80608,12 +82987,10 @@ /obj/structure/machinery/power/apc/almayer{ dir = 8 }, -/obj/structure/surface/rack, -/obj/effect/spawner/random/toolbox, -/obj/structure/machinery/computer/working_joe{ - dir = 4; - pixel_x = -17; - pixel_y = 14 +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter" +<<<<<<< HEAD }, /turf/open/floor/almayer{ dir = 10; @@ -80625,10 +83002,27 @@ /obj/structure/machinery/cm_vending/gear/commanding_officer{ pixel_y = 0 }, +======= + }, +/obj/structure/machinery/door/poddoor/almayer/locked{ + id = "Cell 6"; + name = "\improper Courtyard Divider" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, /turf/open/floor/almayer{ icon_state = "cargo" }, -/area/almayer/living/commandbunks) +/area/almayer/shipboard/brig/cells) +"xYr" = ( +/obj/structure/machinery/light, +/obj/structure/machinery/cm_vending/gear/commanding_officer, +>>>>>>> master +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/cells) "xYB" = ( /obj/structure/sign/safety/storage{ pixel_x = 8; @@ -88224,13 +90618,23 @@ aaa aaa aaa aad -cZs -cZs +<<<<<<< HEAD +ugs +ugs +ugs +ugs +ugs +ugs +ugs +======= iZG iZG iZG -cZs -cZs +iZG +iZG +iZG +iZG +>>>>>>> master ajZ aaa aaa @@ -88427,13 +90831,23 @@ aaf aaf aaf aag -cZs +<<<<<<< HEAD +ugs cWN dgx dgx dgx sdq -cZs +ugs +======= +iZG +cWN +oog +pdG +kPo +sdq +iZG +>>>>>>> master aag aaf aaf @@ -88630,18 +91044,33 @@ cZs cZs cZs cZs -cZs +<<<<<<< HEAD +ugs dfp sEa vBJ uNl oxn -cZs -xEF -xEF -xEF -xEF -xEF +ugs +ugs +ugs +ugs +ugs +ugs +======= +iZG +dfp +oog +vfv +uNl +qaJ +iZG +iZG +iZG +iZG +iZG +iZG +>>>>>>> master ajZ aaa aaa @@ -88829,11 +91258,12 @@ aac aaf aag cZs -yeR -aTg -kyI -aTg -pdG +naB +naB +naB +naB +mtl +<<<<<<< HEAD vAG dOL jfY @@ -88842,9 +91272,22 @@ wly wIC dtN syM -irr -dAb -xEF +rTt +ePB +ugs +======= +wPk +dOL +hwS +hwS +wly +rQY +mtl +syM +vrQ +jnA +iZG +>>>>>>> master aag aaf ajY @@ -89032,21 +91475,34 @@ aad pCi pCi cZs -osJ -aTg +qfR +qYH xvr bZN wIC dWk fYX +<<<<<<< HEAD ush rTt vAG wIC fGN -kIV -kIV -shw +ntm +ntm +tGg +ugs +======= +qVF +qVF +jOu +sIw +fGN +vfv +vfv +okM +iZG +>>>>>>> master xEF xEF xEF @@ -89234,23 +91690,39 @@ aaf pCi pCi myT -wIC +naB +<<<<<<< HEAD lcW pbC xvr vCG -wIC -tNF +rRQ +======= +fHS +pHp +fgl +vCG +jAG +>>>>>>> master tNF -wIC -hzx -wIC -wIC -vBm -vBm -bIi -mnm -kPo +mtl +mtl +mtl +mtl +<<<<<<< HEAD +kDb +mtl +hbG +dpa +qYH +======= +ePB +mtl +nJo +mkk +eBW +>>>>>>> master +mtl cFX xEF xEF @@ -89437,17 +91909,30 @@ pCi pCi cpf cos -wIC -wIC -wIC -wIC -wIC -wIC -cNY -tak +naB +<<<<<<< HEAD +osJ +eOk +kPo +qvf +tzj +qPD +tXs sip -mLJ +kjN +vyE +======= +qfR +jFR +wvI +sBH +oxn +qPD +wCM +sip +ciF ntm +>>>>>>> master hND kif hND @@ -89634,35 +92119,56 @@ pCi mUQ rPC wcn -wcn +<<<<<<< HEAD +iOU +======= +eeN +>>>>>>> master xhM wcn tng hGD wzx -vBm -paq -uoY -vUL -vez -xys -swo -eRL -eRL -mLJ -bua -vBm -xkd -xkd -xkd -xkd +naB +naB +naB +naB +naB +<<<<<<< HEAD +xEe +======= +goD +>>>>>>> master +qPD +qPD +qPD +qPD +<<<<<<< HEAD +bTw +lnJ +xps +guN +xps +uaq +======= +uuq +uLJ +egR +kDb +egR +pbh +>>>>>>> master kIV iYi gSs eyd kIV kQz -mnm +<<<<<<< HEAD +wir +======= +bTw +>>>>>>> master kIV kIV flP @@ -89843,17 +92349,30 @@ dPY rTV wcn tYB -vBm +naB +<<<<<<< HEAD +osJ +eOk +kPo +bvx +tzj +qPD +qyd +bAM +bAM +rra +======= qfR -tak -tak +jFR +wvI bvx -xys -ldu -eRL -eRL -mLJ +oxn +qPD +tFv +bZN +bZN eiO +>>>>>>> master xFs xkd teE @@ -89861,8 +92380,14 @@ xJT xkd xkd xkd -mnm -mnm +xkd +xkd +shw +<<<<<<< HEAD +oIc +======= +deb +>>>>>>> master iqx qFl vUI @@ -90048,8 +92573,9 @@ qmC vBm vBm ouV -bTw -sjc +pHp +<<<<<<< HEAD +qfR dci rzj tGg @@ -90059,9 +92585,23 @@ iqn eRL tmy xkd -vWG -lJL -dQp +eiH +aTV +======= +fgl +dci +rzj +qPD +dxm +qPD +qPD +uQm +tmy +xkd +teE +xJT +>>>>>>> master +xkd xzu xkd xkd @@ -90249,9 +92789,10 @@ mqo vBm eRL rag -qqN -lzx -mLJ +naB +<<<<<<< HEAD +osJ +pzc bua gcT dSc @@ -90262,9 +92803,26 @@ aJz dXy nHg xkd -xik -bjQ +rUB +dSn +soa +======= +qfR +xro +uvy +naB +naB +qre +xEe +eOR +qPD +dXy +nHg xkd +vWG +lJL +dQp +>>>>>>> master eTo iHG dCe @@ -90451,22 +93009,33 @@ wgi wgi ckS eRL -bua -gcT -gcT -tJy -fnC -tpn -tpn -tpn +<<<<<<< HEAD +cNY +======= +rjw +>>>>>>> master +naB +naB +naB +naB +naB +naB +<<<<<<< HEAD +sgi +xkd +ghX +rAv +======= +ula +ula ula -tpn wvT luw -sgi -xkd -xkd +ula xkd +xik +bjQ +>>>>>>> master xkd kmd tUx @@ -90658,14 +93227,25 @@ xHe gqW gqW lCM -ugT -tpn -vrM +<<<<<<< HEAD +geX +tNj +xys +kta +wVz +dtN +egR +ula +======= +maa +uUs +xys kta vWo xrP -xTp -pyj +cIK +lnJ +>>>>>>> master pwt xkd uvY @@ -90859,6 +93439,7 @@ vBm hKq cdk soD +<<<<<<< HEAD tdv szy wdr @@ -90867,14 +93448,32 @@ aeo sIw eni xrP -xTp -pyj -hTt -kMH -tUx -iTI -hzJ -cyZ +======= +szy +szy +wdr +nNQ +>>>>>>> master +aeo +wdF +wdF +wdF +wdF +cMl +<<<<<<< HEAD +avz +======= +tdv +>>>>>>> master +xkd +uvY +oBq +xkd +<<<<<<< HEAD +nJo +======= +kJK +>>>>>>> master jVa jVa tHS @@ -91060,24 +93659,37 @@ ssD gcT rmv eRL -mLJ -bua -nNQ -gcT -ciF -tpn -vrM -eBW -eOh +eRL +<<<<<<< HEAD +nBo xrP -xTp -pyj -kfN -xkd -qFu -xkd -xkd -qJZ +xrP +xrP +xrP +bZN +======= +uJs +nNQ +nNQ +nNQ +nNQ +rTt +>>>>>>> master +wdF +wdF +wdF +wdF +cMl +hTt +kMH +tUx +iTI +<<<<<<< HEAD +rkK +======= +pJi +>>>>>>> master +eZH jVa jVa tHS @@ -91256,14 +93868,15 @@ aag ahE nBc wcn -vBm -vBm -vBm -vBm -vBm -vBm -hZU -mLJ +lrq +lrq +lrq +lrq +lrq +lrq +lrq +<<<<<<< HEAD +fNA fkn gaJ gaJ @@ -91273,9 +93886,25 @@ tpn tpn ueo tpn -wCM -pyj -opN +tpn +vez +uUO +qUb +======= +cxA +fkn +tpn +tpn +hzx +tpn +tpn +erx +ueo +dsw +>>>>>>> master +wdF +cMl +lMc xkd uvY duT @@ -91464,25 +94093,42 @@ tJp ybb tHB aEk +<<<<<<< HEAD +aEk +======= nSM -ldu -mLJ +>>>>>>> master +lrq +eRL pYF -gaJ +tpn +<<<<<<< HEAD +daj +bRH wVV wVV wVV gaJ aOY wdF +wSm +opN +======= +vyE +xCd +vrM +tpn +aOY +fbY sdF -kNi -pyj -xIw -kVZ -tUx -iTI -nXm +wdF +wSm +kfN +>>>>>>> master +xkd +uvY +duT +xkd eZH jVa jVa @@ -91664,32 +94310,52 @@ hKi rPC vBm sQS -xEc -grl -egR -tak -lzx -mLJ -ugT -fso -vpI -vpI +uqo +uqo +uqo +uqo +<<<<<<< HEAD +tRA +eRL +igt +tpn vpI -cuk +bRH +wVV +tpn +fCg +======= +lzx +eRL +igt +tpn +mdJ +xCd +vrM +tpn tkV -jFR -oRk -kxM -jSw -vBm -vBm -qof -vBm -vBm +>>>>>>> master +wdF +wdF +wdF +wSm +<<<<<<< HEAD wRm tUx -vrx +iTI +paq +eZH +======= +wQk +kVZ +>>>>>>> master tUx +iTI +iqn +eZH +tUx +vrx +sEa gSV eZH tUx @@ -91869,27 +94535,49 @@ vBm ikM pzc jjM -eRL -eRL -eRL -mLJ -ugT -qvf -vpI -vpI +<<<<<<< HEAD +rQY +jJq +lrq +sIw +igt +tpn +pdG +cKG +wVV +tpn +eUU +jFR +======= +wqu +uqo +lrq +gCI +igt +tpn +wir vpI -qvf -wdF -lMc +vrM +tpn +oIc +dHv +>>>>>>> master ycr kge kDA -rkL -eZj +jSw +xkd +<<<<<<< HEAD +qof +xkd +xkd efh -mGn -jkS -cyZ +======= +rRQ +xkd +xkd +tGg +>>>>>>> master thL thL thL @@ -92068,10 +94756,21 @@ aag ahE hUg wcn -vBm -gqW -buX -mLJ +lrq +<<<<<<< HEAD +rjw +======= +cNY +>>>>>>> master +uqo +uqo +uqo +uqo +<<<<<<< HEAD +vrQ +======= +jZL +>>>>>>> master eRL eRL eRL @@ -92083,13 +94782,20 @@ gCI eyg gaJ heQ -lMc +<<<<<<< HEAD +fuX eOW cMl -lMc +kfN +======= +ffV +eOW +wdF +cMl nxq -ldu -kJK +>>>>>>> master +xkd +uvY bja jkS eZH @@ -92273,29 +94979,52 @@ rPC wcn vBm jCa -cFO +<<<<<<< HEAD lNs srV uzU nJo inN -wQk -gaJ -gaJ -gaJ -gaJ -gaJ +vBJ +eZj +grl +vsJ +nXm +kHa +dls +======= +cFO +cFO +srV +uzU +lrq +hZU +cWs +tNj +uZY +jnT +pbC +kHa tRA -lMc -ffV +>>>>>>> master +wdF +wdF +wdF cMl oeB rkL -ldu -eRL -jZL -vBm -qJZ +<<<<<<< HEAD +hZU +tUx +iTI +qau +======= +mAT +tUx +iTI +wVz +>>>>>>> master +eZH ohJ thL thL @@ -92479,25 +95208,39 @@ lrq bVC lrq lrq -lut -eRL -eRL +<<<<<<< HEAD +mMd enz -swn -vOd +uzx +kHa +jIV +ebz +======= +xHM +enz +vwO +kHa uCl dls +>>>>>>> master eGr -gbX -rCL -xHM -jxK +wdF +wdF +wdF +wdF +<<<<<<< HEAD +kNi +cqM +xkd +qof +======= hyz -ltX -pbh -rRQ +cqM +xkd rRQ -iyq +>>>>>>> master +xkd +xkd inG omt omt @@ -92677,10 +95420,10 @@ aag pCi rPC rwS -lrq -kTc -uqo -wVw +cQv +<<<<<<< HEAD +fFq +rhD cqn gTx eRL @@ -92691,16 +95434,40 @@ daj qbt exr kHa +xIw +xIw +tbQ +wdF +wSm +kfN +xkd +uvY +uUs +======= +kTc +fnl +wVw +nXm +cQv +cQv +tzj +igt +kHa +kHa +qbt +exr +kHa luH -lMc -ycr -bju -goD -vBm -vBm -qof -vBm -vBm +luH +sgi +wdF +wSm +nxq +xkd +uvY +eOh +>>>>>>> master +xkd sSm thL thL @@ -92880,31 +95647,54 @@ aag ahE rPC nfI -lrq +cQv +<<<<<<< HEAD +eTx +dSc +dSc +ajj +mdJ +cQv +ctn +igt +swn +dcP +tvA +dQv +swn +eeN +wdF +xCd +======= omu -uqo sYB -cqn -ldu -eRL -eRL -cWs +sYB +ajj +vOd +cQv +swo +igt swn dcP tvA -dQv +rkK swn xTp -lMc +gbX gSi -bju +>>>>>>> master +wdF wSm jox lrV tUx ntu nYP -tUx +<<<<<<< HEAD +uLJ +======= +kxM +>>>>>>> master thL oXp thL @@ -93083,13 +95873,21 @@ aag ahE rPC heV -lrq -frJ -uqo +cQv +<<<<<<< HEAD +yeX +rkh +xub +lut +nBb +======= +eaf +bEv ktn cqn -nBb -mdS +rXd +>>>>>>> master +cqJ eRL uJs swn @@ -93101,8 +95899,14 @@ fYn qZg iXt gBi -wSm -opN +<<<<<<< HEAD +iXt +rLN +jxK +======= +ltX +>>>>>>> master +lMc xkd nlH rQY @@ -93286,14 +96090,23 @@ aag ahE wcn nBc -lrq -vsI -uqo +cQv +<<<<<<< HEAD +yeX +rkh +lLN +pGT +pGT +dsw +======= +eaf +bEv xoS -lrq -mAT -lrq -cxA +pGT +pGT +vkM +>>>>>>> master +sjc plZ kHa qPO @@ -93301,7 +96114,8 @@ qPO wuc qPO oRZ -wdF +<<<<<<< HEAD +pyj xCd bqp wSm @@ -93309,8 +96123,19 @@ kfN xkd qFu xkd +jvJ +======= +oRk +gSi +wdF +cMl +kfN xkd -jVa +uvY +ntu +xkd +qof +>>>>>>> master ezX prY rUk @@ -93489,9 +96314,14 @@ aag pCi wcn wcn -lrq -mAr -uqo +cQv +<<<<<<< HEAD +yeX +rkh +======= +eaf +bEv +>>>>>>> master fsT jnA fDn @@ -93501,20 +96331,41 @@ nBo maa swn plI -tqe +dQv +<<<<<<< HEAD +aOY qPO wvT luw emp +emp +emp +wqu +======= +tqe +qPO +emp +emp +emp uUO -wSm +>>>>>>> master +cMl jZm wmE tUx ntu vQN -jVa -rjw +<<<<<<< HEAD +xro +======= +xIw +>>>>>>> master +thL +thL +thL +thL +thL +thL tUx lnJ rjw @@ -93692,39 +96543,65 @@ aag pCi oCL wcn -lrq -uZY -uqo -uqo -uqo -iOh -lrq +cQv +<<<<<<< HEAD +yeX +rkh +cIK +kyI +nBb +======= +eaf +bEv +opN +inN +rXd +>>>>>>> master +cQv gdo nBo jJq swn -dHv -qQM +<<<<<<< HEAD +ltX +dQv +gCI qPO xTp -lMc -jcf +rSH +gbX +hyz +rCL +======= +frJ +dQv +qQM +qPO +buX +gbX +osJ qUb -wSm -jSw +tJy +>>>>>>> master +cqM xkd nlH uuq xkd -naB -naB -pFg -naB -naB -naB -ydU -naB -naB +xkd +<<<<<<< HEAD +eni +======= +poZ +>>>>>>> master +thL +thL +thL +thL +thL +thL +tUx +xkd kIV mnm xEF @@ -93895,10 +96772,11 @@ aag pCi rPC aou -lrq -mAr -uqo -uvy +cQv +<<<<<<< HEAD +pbh +rkh +dSc tfO fsz lrq @@ -93922,12 +96800,46 @@ xkd naB eoP fgl -xEe -naB -xEe -fgl -deb -naB +tUx +tUx +tUx +jVa +vwO +xkd +======= +mAr +bEv +sYB +ajj +fsz +cQv +irJ +uJs +swn +dtN +dQv +xps +qPO +efh +mdS +nlH +eUU +hzJ +nxq +xkd +uvY +jvJ +xkd +xIw +tUx +tUx +tUx +tUx +tUx +mKh +oEE +xkd +>>>>>>> master lmk kIV xEF @@ -94098,7 +97010,10 @@ pCi pCi wcn tYB -lrq +cQv +<<<<<<< HEAD +isH +dSc noo noo noo @@ -94108,21 +97023,49 @@ lrq fNA nBo cQv +uFp +cQv +fNA +mGn +======= +eoP +sYB +noo +cQv +jIV +cQv +cxA +nBo +>>>>>>> master qPO qPO wuc qPO -wvT -luw +qPO +<<<<<<< HEAD +dcP +poH +======= +rCL +jxK +>>>>>>> master emp dGD wSm lfW -emp -vli -rSH +<<<<<<< HEAD +iqn +tUx +iTI xYj -naB +xro +======= +rkh +tUx +iTI +xYj +xIw +>>>>>>> master aSS pHp poZ @@ -94307,33 +97250,58 @@ lYZ olv dxm nMu -uFp -ePB +tak +eRL +<<<<<<< HEAD nBo +======= +uJs +>>>>>>> master tsX xSA ugs wVY lEv -iQg -jpQ -tsX +<<<<<<< HEAD +nwz +ciF +cuk +jnT +qNv +emp jOu +======= +vUL +jpQ +emp +bju +>>>>>>> master wSm -pyj -vsJ -kjN -rvo -oIc -naB -xro -fgl -wvI -naB +jSw +emp +emp +emp +emp +<<<<<<< HEAD +iyq +emp +wIC wvI -fgl -qmX -naB +uJs +cxA +goD +pbC +======= +bqp +emp +wIC +djm +geX +jJq +dgx +icX +>>>>>>> master +wIC lTK mnm kIV @@ -94510,8 +97478,9 @@ tFv pGT vkM jvc -ajj -ajj +eRL +eRL +<<<<<<< HEAD nBo xps jpQ @@ -94519,25 +97488,49 @@ jpQ wVY eOk pFa +qNv +======= +uJs +tsX +uFp +ugs +eOk +eOk +pFa ctn -wqu -eeN +>>>>>>> master +jcf +bju cMl -fHS -naB -naB -naB -naB -naB -naB -rkh +oeB +emp +<<<<<<< HEAD +nNQ +rSH +hwS +uvy +qqN +wIC lvZ -naB -fuX -rra -naB -naB -naB +eoP +okM +okM +deb +======= +rvo +gbX +fNA +tqV +kNi +wIC +lvZ +nqZ +vAG +vAG +ekg +>>>>>>> master +wIC +wIC mnm kIV xEF @@ -94706,9 +97699,10 @@ aad pCi wcn rPC -cQv -eaf -bEv +vxM +rZR +<<<<<<< HEAD +ebt tWg rZR cqJ @@ -94723,22 +97717,50 @@ mkk wir jnT qNv -wqu -eeN +======= +fuX +tWg +rZR +dvT +ldu +eRL +eRL +uJs +tsX +nwz +ugs +eOk +eOk +pFa +ctn +>>>>>>> master +jcf +bju cMW qEy ooR xvw -nBu +<<<<<<< HEAD tcP +tcP +======= +nBu +nBu +>>>>>>> master lFs sIY qyd uDp tNj uDp -qyd +uDp +<<<<<<< HEAD +szy +pbC +======= +dSc icX +>>>>>>> master xQD naB kIV @@ -94909,38 +97931,64 @@ aag pCi mNR wcn -cQv +vxM +<<<<<<< HEAD eaf bEv fLn rXd dvT qSl -ajj +sjc +scD +rXC +luC +======= +rXC +fLn +fLn +lut +dvT +qSl +sjc ukS -wZa -tsX +vli +fso +>>>>>>> master ezU dxT -jpQ +lNs iQg bRm ecq -tsX +emp +<<<<<<< HEAD tkV -pyj -pyj -luC +oRk +tJy +======= +iOh +oRk +jkS +>>>>>>> master +emp elq qmE luC uVF -uQm -qPD -qPD -qPD -qPD -qPD +pyj +wIC +<<<<<<< HEAD +sIY +ekg +ekg +poZ +======= +qHF +vsI +vsI +gTx +>>>>>>> master bND jaP naB @@ -95112,14 +98160,24 @@ aag pCi tCb aou -cQv -eaf -bEv -fLn +vxM +<<<<<<< HEAD +vUL +tFv +tFv +rvo +lCn +mLJ +wZa +======= +bAM +kyP +kyP avz -dvT -nHV -ajj +daj +mLJ +bua +>>>>>>> master iKX cQv tsX @@ -95133,14 +98191,21 @@ tsX vyi vyi vyi -naB -naB -naB -naB +emp +emp +emp +emp +<<<<<<< HEAD +kyP +wIC +wIC +sBH +======= dqV -mdJ -vXQ +wIC +wIC vXQ +>>>>>>> master uNe uUs nqZ @@ -95315,16 +98380,26 @@ aag pCi oCL wcn -cQv -eaf +vxM +<<<<<<< HEAD +jAG +bEv bEv +bEv +iOh +mLJ +kVZ +======= +vxC +qRo +qRo qRo -rXd dvT -bAM +mLJ wZa -cQv -cQv +>>>>>>> master +vBm +vBm tHr mqg eiK @@ -95339,7 +98414,8 @@ xuZ rCU rEY gxU -naB +emp +<<<<<<< HEAD kyP qPD qPD @@ -95348,8 +98424,19 @@ uQm pIH naB nOe +nlH +======= +dqV +ush +scD +dgx +vez +pIH +wIC +nHV nOe -naB +>>>>>>> master +wIC bIi fQk xEF @@ -95522,10 +98609,17 @@ cQv bop jeK mWe -rXd -dvT -ieo +<<<<<<< HEAD +eBW +iOh +mLJ vxC +======= +tcP +dvT +mLJ +eRL +>>>>>>> master ldD ceZ jnD @@ -95551,8 +98645,12 @@ uQm nnz vrQ mLI -qyd -vrQ +<<<<<<< HEAD +yeR +======= +isH +>>>>>>> master +wIC mnm sIk xEF @@ -95735,7 +98833,7 @@ hUW dHd vka lnt -uVA +cuk uVA uVA uVA @@ -95745,17 +98843,25 @@ uVA wIQ xWv aQb -naB -naB -mtl +emp +emp +wIC +<<<<<<< HEAD +pFg hwQ hwQ okM -mtl -mtl -naB -naB -naB +czB +======= +paq +hwQ +vAG +lNF +>>>>>>> master +wIC +wIC +wIC +wIC mnm hPT xEF @@ -95924,13 +99030,19 @@ aag pCi hKi wcn -aFN +tXs wcn cXZ -jIV -vxM -gaJ +vBm +<<<<<<< HEAD +erx +iZG +mKh +======= +qNv +qvf uzx +>>>>>>> master uue vxM iuE @@ -95953,7 +99065,7 @@ xpo mtl pGG qRT -djm +jfY hgF mtl kIV @@ -96130,12 +99242,17 @@ iCz aFN rPC rPC -kDb -vxM -wVV +vBm +vBm +vBm +<<<<<<< HEAD +mKh +nBu +======= qau -mVi -vxM +mGn +>>>>>>> master +vBm udK mwA lnt @@ -96153,10 +99270,16 @@ mgj wIQ jHh jUY -fbY +wIC +<<<<<<< HEAD qVF oog qaJ +======= +tfO +eZj +vBJ +>>>>>>> master czB mtl mnm @@ -96336,9 +99459,14 @@ rPC jvJ vxM sVy +<<<<<<< HEAD mKh +uuq +======= +uzx mVi -vxM +>>>>>>> master +vBm bmz wSR mMV @@ -96356,14 +99484,23 @@ awz woy laO nRH -fbY -qVF -oog +wIC +<<<<<<< HEAD +hzx +okM +======= +tHB +vAG +>>>>>>> master kHK wfL mtl mnm -dGc +<<<<<<< HEAD +gSi +======= +aJz +>>>>>>> master kCi kCi kCi @@ -96536,9 +99673,13 @@ bzz akC cRc rPC -wcn -vxM -eyg +wgi +vBm +<<<<<<< HEAD +cFO +======= +grl +>>>>>>> master giZ gTl vxM @@ -96559,12 +99700,16 @@ qwp pZS jHh jUY -fbY -uLJ +wIC +wIC +<<<<<<< HEAD oog -sBH -vfv -mtl +======= +nBb +>>>>>>> master +wIC +wIC +wIC mnm dGc kCi @@ -96739,10 +99884,14 @@ aHZ akC oCL rPC -wcn -vxM -vxM -tXs +wgi +vBm +<<<<<<< HEAD +abc +======= +iyq +>>>>>>> master +wgi oCX vxM vkR @@ -96762,12 +99911,19 @@ qwp vGA uwN uVd -mtl -mtl -qYH -mtl -mtl -mtl +wIC +<<<<<<< HEAD +qQM +wPk +dHv +dkt +======= +rSH +aTg +qmX +kyI +>>>>>>> master +wIC kIV kIV kCi @@ -96942,12 +100098,18 @@ btv akC dDC rPC -wcn -vxM +wgi +vBm +<<<<<<< HEAD +vfv +wgi +mVi +======= wVV -erx -dsw -vxM +wgi +ugT +>>>>>>> master +vBm kfE wsD jUY @@ -96965,12 +100127,17 @@ qwp cDn uwN jUY -mtl +wIC +<<<<<<< HEAD lNF -rkK -cIK -mtl -tzj +wPk +======= +lcW +aTg +>>>>>>> master +wIC +wIC +wIC kIV bbR kCi @@ -97148,9 +100315,13 @@ ake rPC vxM dFC +<<<<<<< HEAD +tvA +======= bRH -bRH -vxM +>>>>>>> master +fnC +vBm xDn pEB jUY @@ -97170,7 +100341,7 @@ jHh sCQ mtl pJE -wPk +aTg hRy mtl tzj @@ -97349,9 +100520,13 @@ akC akC tRX uzm -vxM -eyg +vBm +<<<<<<< HEAD +bqp +======= +>>>>>>> master eyg +gcT oWI vxM nNv @@ -97371,11 +100546,17 @@ qwp ora laO rKQ -mtl +wIC +<<<<<<< HEAD qHF -fnl -mtl -mtl +wPk +yeR +======= +yeR +aTg +isH +>>>>>>> master +wIC utZ pUJ pUJ diff --git a/tgui/packages/tgui/interfaces/DropshipFlightControl.tsx b/tgui/packages/tgui/interfaces/DropshipFlightControl.tsx index bbb7fea96d2c..1b4d1340c9f1 100644 --- a/tgui/packages/tgui/interfaces/DropshipFlightControl.tsx +++ b/tgui/packages/tgui/interfaces/DropshipFlightControl.tsx @@ -44,10 +44,14 @@ const DropshipDoorControl = (_, context) => {