From 9c6ba072592a7eade92738c04b4211be7bff1e8c Mon Sep 17 00:00:00 2001 From: KandJX <83637364+YegorKandziuba@users.noreply.github.com> Date: Sat, 28 Oct 2023 18:57:15 +0300 Subject: [PATCH] Fix new map (#1238) --- maps/sierra/areas/z4_sierra_deck1.dm | 13 + maps/sierra/areas/z5_sierra_bridge.dm | 4 +- maps/sierra/z1-z5_sierra.dmm | 2463 ++++++++++++++++--------- 3 files changed, 1609 insertions(+), 871 deletions(-) diff --git a/maps/sierra/areas/z4_sierra_deck1.dm b/maps/sierra/areas/z4_sierra_deck1.dm index d3c7cbf0273ae..d99c1ec1a0117 100644 --- a/maps/sierra/areas/z4_sierra_deck1.dm +++ b/maps/sierra/areas/z4_sierra_deck1.dm @@ -256,6 +256,19 @@ icon_state = "detective" req_access = list(list(access_forensics_lockers, access_security)) +/area/security/sierra/brig + name = "First Deck - Security - Brig" + icon_state = "brig" + req_access = list(access_security) + area_flags = AREA_FLAG_RAD_SHIELDED + +/area/security/sierra/prison + name = "First Deck - Security - Prison Wing" + icon_state = "sec_prison" + req_access = list(access_security) + area_flags = AREA_FLAG_RAD_SHIELDED + + /area/security/range name = "First Deck - Security - Cadets" icon_state = "security" diff --git a/maps/sierra/areas/z5_sierra_bridge.dm b/maps/sierra/areas/z5_sierra_bridge.dm index 172f6ece41a57..ec0fd7dfed432 100644 --- a/maps/sierra/areas/z5_sierra_bridge.dm +++ b/maps/sierra/areas/z5_sierra_bridge.dm @@ -49,7 +49,7 @@ name = "Bridge - Command - Captain's Recreation Facility" icon_state = "heads_cap" sound_env = PLAIN - req_access = list() + req_access = list("ACCESS_BRIDGE") /area/bridge name = "Bridge Deck - Bridge" @@ -181,7 +181,7 @@ // Solars -/area/maintenance/bridge_port +/area/maintenance/solar/bridge_port name = "Bridge - Solar - Port" icon_state = "SolarcontrolP" diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm index a2895c58d58f0..64ff535ee328d 100644 --- a/maps/sierra/z1-z5_sierra.dmm +++ b/maps/sierra/z1-z5_sierra.dmm @@ -90,7 +90,7 @@ dir = 5 }, /turf/simulated/floor/tiled/white, -/area/security/prison) +/area/security/sierra/prison) "aaU" = ( /obj/machinery/firealarm{ pixel_y = 24 @@ -688,12 +688,16 @@ /obj/floor_decal/industrial/warning{ dir = 9 }, +/obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller{ + id_tag = "engine_atmos_airlock"; + name = "Engine Room Airlock Controlls"; + pixel_y = 24; + req_access = list("ACCESS_ENGINE_EQUIP") + }, /obj/structure/catwalk, -/obj/machinery/dummy_airlock_controller{ - id_tag = "engine_airlock"; - name = "Airlock Remote Terminal"; - pixel_y = 20; - icon_state = "airlock_control_off" +/obj/structure/hygiene/drain, +/obj/structure/hygiene/shower{ + dir = 4 }, /turf/simulated/floor/plating, /area/engineering/engine_room) @@ -801,7 +805,7 @@ dir = 9 }, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "afQ" = ( /obj/structure/disposalpipe/segment, /obj/structure/table/steel, @@ -859,7 +863,7 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/security/prison) +/area/security/sierra/prison) "agA" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -1292,15 +1296,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/catwalk_plated, /obj/structure/cable/green{ d1 = 1; d2 = 8; icon_state = "1-8" }, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, /turf/simulated/floor/plating, /area/hallway/primary/firstdeck/aft) "akf" = ( @@ -1499,7 +1504,7 @@ pixel_y = 24 }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "alJ" = ( /turf/simulated/wall/prepainted, /area/hallway/primary/firstdeck/center) @@ -1818,6 +1823,9 @@ }, /obj/machinery/computer/shuttle_control/lift/medical, /obj/floor_decal/industrial/outline/yellow, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/dark/monotile, /area/medical/morgue) "anr" = ( @@ -2586,6 +2594,13 @@ "atC" = ( /obj/structure/closet/firecloset, /obj/floor_decal/industrial/hatch/yellow, +/obj/machinery/embedded_controller/radio/airlock/access_controller{ + id_tag = "virology_access"; + name = "Virology Lab Access Console"; + req_access = list("ACCESS_VIRO"); + dir = 4; + pixel_x = -24 + }, /turf/simulated/floor/tiled/white/monotile, /area/medical/virology) "atF" = ( @@ -2776,7 +2791,7 @@ dir = 4 }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "auU" = ( /obj/wallframe_spawn/reinforced, /obj/machinery/door/firedoor, @@ -3238,6 +3253,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark/monotile, /area/medical/sleeper) "ayj" = ( @@ -3599,7 +3615,7 @@ }, /obj/structure/hygiene/drain, /turf/simulated/floor/tiled/freezer, -/area/security/prison) +/area/security/sierra/prison) "aAY" = ( /obj/floor_decal/corner/red/border{ dir = 9 @@ -4458,7 +4474,7 @@ dir = 1 }, /turf/simulated/floor/wood/walnut, -/area/security/prison) +/area/security/sierra/prison) "aGH" = ( /obj/structure/table/woodentable/walnut, /obj/machinery/light/small{ @@ -4483,6 +4499,9 @@ pixel_x = 22; dir = 8 }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/quartermaster/office) "aGP" = ( @@ -5103,6 +5122,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark/monotile, /area/medical/sleeper) "aLU" = ( @@ -5179,6 +5199,7 @@ /obj/structure/bed/chair/padded/red{ dir = 1 }, +/obj/item/modular_computer/laptop/preset/custom_loadout, /turf/simulated/floor/tiled/steel_grid, /area/crew_quarters/heads/office/hos) "aML" = ( @@ -5406,7 +5427,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood/walnut, -/area/security/prison) +/area/security/sierra/prison) "aPv" = ( /obj/floor_decal/corner/paleblue/border{ dir = 4 @@ -5797,7 +5818,7 @@ req_access = list("ACCESS_SECURITY") }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "aRD" = ( /obj/floor_decal/corner/black/mono, /obj/floor_decal/corner/green/border{ @@ -5881,6 +5902,12 @@ /obj/floor_decal/spline/fancy/black/corner{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "aSg" = ( @@ -6118,6 +6145,9 @@ }, /obj/floor_decal/techfloor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, /turf/simulated/floor/tiled/techfloor/grid, @@ -6167,19 +6197,13 @@ /turf/simulated/floor/plating, /area/maintenance/thirddeck/forestarboard) "aUt" = ( -/obj/item/reagent_containers/food/snacks/egg/lizard{ - color = "black" - }, -/obj/structure/table/rack, -/obj/item/bedsheet, -/obj/item/reagent_containers/food/snacks/egg/lizard, -/obj/item/reagent_containers/food/snacks/egg/lizard{ - color = "black" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/structure/railing/mapped, -/obj/structure/railing/mapped{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/firstdeck/forestarboard) "aUy" = ( @@ -6189,7 +6213,7 @@ pixel_y = 24 }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "aUF" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -6258,6 +6282,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/item/device/radio/intercom{ + pixel_y = 26 + }, +/obj/machinery/button/alternate/door/bolts{ + dir = 1; + id_tag = "toilet_eng_1"; + name = "Lock"; + pixel_y = -24 + }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/head/deck3) "aVb" = ( @@ -6548,6 +6581,9 @@ on = 1; pixel_x = -25 }, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/office/cmo/cobed) "aXh" = ( @@ -7514,13 +7550,11 @@ d2 = 2; icon_state = "1-2" }, -/obj/catwalk_plated, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/catwalk_plated, /turf/simulated/floor/plating, /area/quartermaster/hangar) "bfL" = ( @@ -7531,7 +7565,7 @@ }, /obj/structure/closet/emcloset, /turf/simulated/floor/plating, -/area/maintenance/bridge_port) +/area/maintenance/solar/bridge_port) "bfR" = ( /obj/structure/railing/mapped{ dir = 8 @@ -7567,6 +7601,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/hallway/infirmary) "bgh" = ( @@ -8395,7 +8432,7 @@ dir = 8 }, /obj/structure/disposalpipe/trunk{ - dir = 8 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -8626,11 +8663,11 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/dummy_airlock_controller{ +/obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller{ id_tag = "engine_airlock"; - name = "Airlock Remote Terminal"; - pixel_y = 20; - icon_state = "airlock_control_off" + name = "Engine Room Airlock Controlls"; + pixel_y = 24; + req_access = list("ACCESS_ENGINE_EQUIP") }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -8689,9 +8726,6 @@ /area/hallway/primary/thirddeck/central_stairwell) "bqr" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass/civilian{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -8700,6 +8734,9 @@ dir = 4; id_tag = "lockdown3_3" }, +/obj/machinery/door/airlock/glass/civilian{ + dir = 4 + }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/fourthdeck/center) "bqs" = ( @@ -8878,11 +8915,11 @@ d2 = 2; icon_state = "1-2" }, -/obj/catwalk_plated, /obj/machinery/light/spot{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/catwalk_plated, /turf/simulated/floor/plating, /area/quartermaster/hangar) "bqW" = ( @@ -9047,6 +9084,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/embedded_controller/radio/airlock/access_controller{ + id_tag = "toxin_lab_access"; + name = "Toxin Lab Access Console"; + pixel_y = 24; + req_access = list("ACCESS_TOX_STORAGE") + }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/toxins) "bsH" = ( @@ -9557,7 +9600,7 @@ }, /obj/paint_stripe/red, /turf/simulated/wall/r_wall/prepainted, -/area/security/brig) +/area/security/sierra/brig) "bwv" = ( /turf/simulated/wall/prepainted, /area/hallway/primary/thirddeck/fore) @@ -9757,11 +9800,6 @@ /area/quartermaster/hangar_atmos) "bxZ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -9805,7 +9843,7 @@ /obj/floor_decal/industrial/outline/yellow, /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/monotile, -/area/hallway/primary/firstdeck/fore) +/area/security/brig) "byA" = ( /obj/structure/cable{ d1 = 1; @@ -10059,16 +10097,12 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ name = "Security Maintenance"; - req_access = newlist(); - dir = 4 + req_access = list("ACCESS_SEC_DOORS"); + dir = 4; + autoset_access = 0 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/plating, /area/maintenance/firstdeck/forestarboard) @@ -10742,6 +10776,9 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/light/spot{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/bridge/hallway) "bFR" = ( @@ -10797,7 +10834,7 @@ }, /obj/structure/catwalk, /turf/simulated/floor/plating, -/area/maintenance/bridge_port) +/area/maintenance/solar/bridge_port) "bGt" = ( /obj/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -11184,6 +11221,11 @@ /obj/machinery/recharger, /turf/simulated/floor/tiled/techfloor/grid, /area/turret_protected/ai_cyborg_upload) +"bJC" = ( +/obj/floor_decal/techfloor, +/obj/machinery/light/small, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/firstdeck/aftport) "bJI" = ( /obj/machinery/atmospherics/pipe/simple/visible/fuel{ dir = 10 @@ -11801,6 +11843,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark/monotile, /area/medical/staging) "bOZ" = ( @@ -12113,6 +12156,13 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/embedded_controller/radio/airlock/access_controller{ + id_tag = "xenobotany_access_maintaince"; + name = "Xenobotany Lab Access Console"; + req_access = list("ACCESS_XENOBIO","ACCESS_RESEARCH"); + dir = 4; + pixel_x = -24 + }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora) "bRb" = ( @@ -12243,7 +12293,7 @@ dir = 6 }, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "bRV" = ( /obj/machinery/telecomms/bus/preset_three, /obj/machinery/light{ @@ -12317,6 +12367,13 @@ /obj/floor_decal/corner/purple/bordercorner{ dir = 4 }, +/obj/machinery/embedded_controller/radio/airlock/access_controller{ + id_tag = "xenobotany_access"; + name = "Xenobotany Lab Access Console"; + req_access = list("ACCESS_XENOBIO","ACCESS_RESEARCH"); + dir = 8; + pixel_x = 24 + }, /turf/simulated/floor/tiled/white, /area/rnd/xenobiology/xenoflora) "bSJ" = ( @@ -12384,15 +12441,6 @@ /obj/floor_decal/borderfloor{ dir = 1 }, -/obj/machinery/power/apc/high{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, /obj/floor_decal/corner/lime/border{ dir = 1 }, @@ -12930,12 +12978,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/aft) -"bXK" = ( -/obj/machinery/light/spot{ - dir = 1 - }, -/turf/simulated/wall/prepainted, -/area/crew_quarters/heads/captain/beach) "bXN" = ( /obj/paint/hull, /turf/simulated/wall/ocp_wall, @@ -13287,6 +13329,10 @@ }, /obj/structure/table/rack, /obj/random/maintenance, +/obj/structure/sign/warning/pods/west{ + pixel_x = 32; + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/firstdeck/centralport) "cav" = ( @@ -13332,7 +13378,10 @@ id_tag = "Biohazard"; name = "Biohazard Shutter" }, -/obj/machinery/door/airlock/external/bolted/cycling, +/obj/machinery/door/airlock/external/bolted/cycling{ + id_tag = "toxin_lab_access_outer"; + name = "Toxin Lab Access" + }, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -13371,7 +13420,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "cbu" = ( /obj/structure/bed/chair/shuttle/black{ dir = 8 @@ -13434,9 +13483,6 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/tcommsat/computer) "cbR" = ( -/obj/machinery/alarm{ - pixel_y = 24 - }, /obj/floor_decal/steeldecal/steel_decals4{ dir = 6 }, @@ -13458,6 +13504,18 @@ /obj/floor_decal/corner/lime/bordercorner2{ dir = 4 }, +/obj/structure/sign/directions/security{ + pixel_y = 24; + dir = 8 + }, +/obj/structure/sign/directions/infirmary{ + dir = 4; + pixel_y = 31 + }, +/obj/structure/sign/directions/science{ + pixel_y = 38; + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/center) "cbV" = ( @@ -13596,6 +13654,10 @@ /obj/machinery/light/spot{ dir = 1 }, +/obj/structure/sign/warning/nosmoking_1{ + desc = "A warning sign which reads 'NO SMOKING'. Someone has scratched a variety of crude words in gutter across the entire sign."; + pixel_y = 24 + }, /turf/simulated/floor/tiled/white/monotile, /area/medical/surgery) "cdn" = ( @@ -13603,7 +13665,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/freezer, -/area/security/prison) +/area/security/sierra/prison) "cdt" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -13872,6 +13934,16 @@ }, /obj/floor_decal/borderfloor, /obj/floor_decal/corner/green/border, +/obj/structure/sign/directions/engineering{ + dir = 1; + pixel_y = -8; + pixel_x = 32 + }, +/obj/structure/sign/directions/supply{ + dir = 1; + pixel_y = -1; + pixel_x = 32 + }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/aft_stairwell) "cfM" = ( @@ -14281,7 +14353,7 @@ dir = 8 }, /turf/simulated/floor/tiled/techfloor, -/area/security/brig) +/area/security/sierra/brig) "cjn" = ( /obj/floor_decal/steeldecal/steel_decals4{ dir = 5 @@ -14353,9 +14425,19 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenobiology/level1) "ckl" = ( -/obj/machinery/status_display, -/turf/simulated/wall/prepainted, -/area/hallway/primary/fourthdeck/aft_stairwell) +/obj/structure/filingcabinet/chestdrawer, +/obj/item/folder/blue, +/obj/item/folder/blue, +/obj/item/folder/nt, +/obj/item/folder/nt, +/obj/item/folder/red, +/obj/item/folder/yellow, +/obj/item/folder, +/obj/floor_decal/borderfloor, +/obj/floor_decal/corner/blue/border, +/obj/machinery/light, +/turf/simulated/floor/tiled/steel_grid, +/area/crew_quarters/heads/office/hop) "ckm" = ( /obj/structure/cable/green{ d1 = 2; @@ -15311,6 +15393,9 @@ /obj/floor_decal/corner/green/bordercorner2{ dir = 10 }, +/obj/structure/sign/botany{ + pixel_x = -32 + }, /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/center) "ctu" = ( @@ -16524,7 +16609,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/fore) +/area/security/brig) "cBP" = ( /obj/machinery/photocopier, /obj/floor_decal/industrial/outline/yellow, @@ -16578,11 +16663,11 @@ /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, -/obj/machinery/dummy_airlock_controller{ - id_tag = "engine_airlock"; - name = "Airlock Remote Terminal"; - pixel_y = 20; - icon_state = "airlock_control_off" +/obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller{ + id_tag = "engine_atmos_airlock"; + name = "Engine Room Airlock Controlls"; + pixel_y = 24; + req_access = list("ACCESS_ENGINE_EQUIP") }, /turf/simulated/floor/tiled/techfloor, /area/engineering/engine_room) @@ -17316,6 +17401,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark/monotile, /area/medical/staging) "cHP" = ( @@ -17687,7 +17775,7 @@ pixel_y = 24 }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "cKF" = ( /obj/machinery/computer/ship/sensors, /turf/simulated/floor/plating, @@ -17969,8 +18057,7 @@ /area/crew_quarters/dungeon_master_lounge) "cMo" = ( /obj/floor_decal/industrial/warning/cee{ - dir = 1; - icon_state = "warningcee" + dir = 1 }, /obj/machinery/atmospherics/unary/vent_pump/high_volume/airlock{ dir = 8; @@ -18179,6 +18266,7 @@ }, /obj/machinery/disposal, /obj/floor_decal/industrial/hatch/yellow, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/tiled/dark/monotile, /area/hallway/infirmary) "cOm" = ( @@ -18285,6 +18373,10 @@ dir = 10 }, /obj/structure/catwalk, +/obj/structure/hygiene/drain, +/obj/structure/hygiene/shower{ + dir = 4 + }, /turf/simulated/floor/plating, /area/engineering/engine_room) "cOY" = ( @@ -18460,6 +18552,10 @@ }, /obj/structure/closet/emcloset, /obj/floor_decal/industrial/outline/yellow, +/obj/structure/sign/directions/engineering{ + dir = 8; + pixel_y = 24 + }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/thirddeck/center) "cQn" = ( @@ -18677,7 +18773,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/fore) +/area/security/brig) "cRY" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, @@ -19651,6 +19747,10 @@ /obj/floor_decal/corner/yellow/border{ dir = 1 }, +/obj/structure/sign/directions/engineering{ + dir = 8; + pixel_y = 24 + }, /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/aft_stairwell) "cZO" = ( @@ -19915,7 +20015,7 @@ }, /obj/machinery/lapvend, /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/fore) +/area/security/brig) "daT" = ( /obj/floor_decal/techfloor{ dir = 8 @@ -20345,7 +20445,7 @@ dir = 4 }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "deI" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/structure/window/reinforced{ @@ -20366,7 +20466,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "deM" = ( /obj/structure/bed/chair/shuttle{ dir = 8 @@ -20941,7 +21041,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/techfloor, -/area/security/brig) +/area/security/sierra/brig) "diZ" = ( /obj/machinery/door/window/brigdoor/southright{ id = "Cell 3"; @@ -20965,7 +21065,7 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel_ridged, -/area/security/brig) +/area/security/sierra/brig) "djg" = ( /obj/floor_decal/corner/black/bordercorner{ dir = 4 @@ -20992,9 +21092,6 @@ /obj/machinery/computer/modular/preset/civilian{ dir = 8 }, -/obj/machinery/light{ - dir = 4 - }, /turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/sleep/cryo/firstdeck) "djw" = ( @@ -21064,7 +21161,7 @@ "djR" = ( /obj/paint_stripe/red, /turf/simulated/wall/r_wall/prepainted, -/area/security/brig) +/area/security/sierra/brig) "djU" = ( /obj/structure/cable/green{ d1 = 1; @@ -21176,6 +21273,12 @@ /turf/simulated/wall/r_wall/hull, /area/maintenance/firstdeck/forestarboard) "dkS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "dkV" = ( @@ -21285,17 +21388,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor, /area/tcommsat/computer) -"dmd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/forestarboard) "dme" = ( /obj/machinery/telecomms/bus/preset_four, /turf/simulated/floor/bluegrid, @@ -21852,7 +21944,6 @@ /obj/floor_decal/corner/black/mono, /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/airlock/command{ - id_tag = "iaadoorright"; name = "Internal Affairs Agent Dorm"; secured_wires = 1 }, @@ -22128,7 +22219,7 @@ /area/engineering/gravitaional_generator) "dsP" = ( /turf/simulated/wall/r_wall/hull, -/area/security/prison) +/area/security/sierra/prison) "dsW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -22474,6 +22565,13 @@ /obj/floor_decal/corner/purple/bordercorner2, /obj/floor_decal/corner/purple/bordercorner, /obj/structure/closet/secure_closet/hydroponics_sierra, +/obj/machinery/embedded_controller/radio/airlock/access_controller{ + id_tag = "xenobotany_access_maintaince"; + name = "Xenobotany Lab Access Console"; + pixel_y = -24; + req_access = list("ACCESS_XENOBIO","ACCESS_RESEARCH"); + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/rnd/xenobiology/xenoflora) "duQ" = ( @@ -22626,6 +22724,10 @@ dir = 1 }, /obj/floor_decal/corner/paleblue/border, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -24 + }, /turf/simulated/floor/tiled/dark/monotile, /area/medical/surgery) "dwq" = ( @@ -22819,7 +22921,7 @@ pixel_y = -24 }, /turf/simulated/floor/tiled/techfloor, -/area/security/brig) +/area/security/sierra/brig) "dxq" = ( /obj/floor_decal/chapel, /turf/simulated/floor/tiled/dark/monotile, @@ -23111,7 +23213,7 @@ name = "Floor mounted flash" }, /turf/simulated/floor/tiled/freezer, -/area/security/prison) +/area/security/sierra/prison) "dzt" = ( /obj/floor_decal/industrial/outline/yellow, /obj/structure/disposalpipe/segment, @@ -23278,6 +23380,12 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/lino, /area/maintenance/firstdeck/forestarboard) +"dAy" = ( +/obj/structure/bed/chair/office/light{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/seconddeck/forestarboard) "dAE" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 9 @@ -24091,7 +24199,7 @@ }, /obj/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/prison) "dGY" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -24221,11 +24329,11 @@ /turf/simulated/floor/tiled, /area/crew_quarters/dungeon_master_lounge) "dIb" = ( -/obj/machinery/dummy_airlock_controller{ +/obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller{ id_tag = "engine_airlock"; - name = "Airlock Remote Terminal"; - pixel_y = 20; - icon_state = "airlock_control_off" + name = "Engine Room Airlock Controlls"; + pixel_y = 24; + req_access = list("ACCESS_ENGINE_EQUIP") }, /obj/machinery/airlock_sensor{ id_tag = "engine_airlock_sensor"; @@ -24338,9 +24446,6 @@ dir = 4 }, /obj/machinery/light/spot, -/obj/machinery/status_display{ - pixel_y = -32 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -24488,7 +24593,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/security/brig) +/area/security/sierra/brig) "dJE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 4 @@ -24499,7 +24604,7 @@ "dJF" = ( /obj/paint_stripe/red, /turf/simulated/wall/prepainted, -/area/security/prison) +/area/security/sierra/prison) "dJO" = ( /obj/structure/window/reinforced{ dir = 8 @@ -24579,7 +24684,7 @@ name = "Infirmary Entry Shutters" }, /obj/machinery/door/airlock/medical{ - name = "Staging" + name = "Hospital Back Room" }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/dark/monotile, @@ -24692,7 +24797,10 @@ "dLU" = ( /obj/machinery/door/firedoor, /obj/floor_decal/industrial/hatch/yellow, -/obj/machinery/door/airlock/external/bolted/cycling, +/obj/machinery/door/airlock/external/bolted/cycling{ + id_tag = "xenobotany_access_maintaince_outer"; + name = "Xenobotany Lab Access" + }, /obj/machinery/door/blast/regular/open{ dir = 2; id_tag = "Biohazard"; @@ -24925,27 +25033,10 @@ /turf/simulated/floor/plating, /area/maintenance/seconddeck/starboard) "dNr" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/seconddeck/center) +/obj/structure/railing/mapped, +/obj/structure/bed/sofa/r/blue, +/turf/simulated/floor/plating, +/area/maintenance/bridgedeck/starboard) "dNs" = ( /obj/catwalk_plated, /obj/structure/cable/green{ @@ -25015,6 +25106,9 @@ /obj/item/reagent_containers/food/drinks/glass2/wine, /obj/item/reagent_containers/food/drinks/bottle/tadmorwine, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/wood/walnut, /area/crew_quarters/heads/office/hop/cobed) "dNX" = ( @@ -25039,7 +25133,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/security/brig) +/area/security/prison) "dOc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/wall/r_wall/hull{ @@ -25297,7 +25391,7 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled/monotile, -/area/security/prison) +/area/security/sierra/prison) "dQp" = ( /obj/wallframe_spawn/reinforced/titanium, /obj/machinery/door/blast/regular/open{ @@ -25715,16 +25809,13 @@ /turf/simulated/floor/plating, /area/maintenance/seconddeck/aftport) "dTA" = ( -/obj/wallframe_spawn/reinforced_phoron, /obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/blast/regular/open{ id_tag = "misclab"; name = "Test Chamber Blast Doors"; dir = 4 }, +/obj/wallframe_spawn/reinforced_phoron, /turf/simulated/floor/plating, /area/rnd/containment) "dTD" = ( @@ -26172,6 +26263,16 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/central_stairwell) +"dWy" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/reinforced, +/area/rnd/containment) "dWA" = ( /obj/machinery/papershredder, /obj/machinery/computer/guestpass{ @@ -26330,6 +26431,13 @@ /obj/structure/largecrate, /turf/simulated/floor/plating, /area/maintenance/bridgedeck/starboard) +"dYl" = ( +/obj/structure/sign/directions/supply{ + dir = 8; + pixel_y = -24 + }, +/turf/simulated/open, +/area/hallway/primary/thirddeck/central_stairwell) "dYn" = ( /obj/structure/cable/yellow{ d2 = 2; @@ -26623,7 +26731,7 @@ dir = 9 }, /turf/simulated/floor/tiled/freezer, -/area/security/prison) +/area/security/sierra/prison) "eaO" = ( /obj/structure/hygiene/shower{ pixel_y = 15 @@ -26705,6 +26813,9 @@ dir = 8 }, /obj/structure/table/steel_reinforced, +/obj/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/substation/bridgedeck) "ebt" = ( @@ -26748,7 +26859,7 @@ dir = 10 }, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "ebG" = ( /obj/floor_decal/corner/paleblue/border, /obj/floor_decal/corner/paleblue/border{ @@ -26765,7 +26876,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/catwalk_plated, /obj/structure/sign/warning/nosmoking_1{ dir = 1; pixel_y = -32 @@ -26775,6 +26885,10 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 + }, +/obj/catwalk_plated, /turf/simulated/floor/plating, /area/quartermaster/hangar) "ece" = ( @@ -26914,7 +27028,7 @@ /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel_ridged, -/area/security/brig) +/area/security/sierra/brig) "ecL" = ( /turf/simulated/floor/tiled/techfloor, /area/maintenance/firstdeck/aftport) @@ -26972,7 +27086,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/security/brig) +/area/security/prison) "edi" = ( /obj/floor_decal/industrial/outline/blue, /obj/structure/cable/green{ @@ -27165,11 +27279,11 @@ /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 5 }, -/obj/machinery/dummy_airlock_controller{ - id_tag = "engine_airlock"; - name = "Airlock Remote Terminal"; +/obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller{ + id_tag = "engine_atmos_airlock"; + name = "Engine Room Airlock Controlls"; pixel_y = -24; - icon_state = "airlock_control_off"; + req_access = list("ACCESS_ENGINE_EQUIP"); dir = 1 }, /obj/floor_decal/techfloor{ @@ -27757,7 +27871,7 @@ name = "Security Department Lockdown" }, /turf/simulated/floor/plating, -/area/security/prison) +/area/security/sierra/brig) "ejp" = ( /obj/structure/bed/sofa/l/black{ dir = 1 @@ -27874,6 +27988,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark/monotile, /area/medical/sleeper) "eke" = ( @@ -27965,6 +28080,7 @@ /obj/machinery/light{ dir = 1 }, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/tiled/white/monotile, /area/medical/infirmreception) "ekZ" = ( @@ -28158,7 +28274,9 @@ "emO" = ( /obj/structure/bed/padded, /obj/item/bedsheet/brown, -/obj/structure/curtain/open/bed, +/obj/structure/curtain/open/bed{ + anchored = 1 + }, /obj/floor_decal/borderfloor{ dir = 9 }, @@ -28175,7 +28293,7 @@ dir = 1 }, /turf/simulated/floor/tiled/dark, -/area/security/prison) +/area/security/sierra/prison) "emS" = ( /obj/structure/disposalpipe/up{ dir = 4 @@ -28225,7 +28343,7 @@ pixel_y = 24 }, /turf/simulated/floor/tiled/dark, -/area/security/prison) +/area/security/sierra/prison) "enc" = ( /obj/structure/cable/green{ d1 = 4; @@ -29018,7 +29136,10 @@ /turf/simulated/floor/plating, /area/maintenance/thirddeck/forestarboard) "esl" = ( -/obj/machinery/door/airlock/external/bolted/cycling, +/obj/machinery/door/airlock/external/bolted/cycling{ + id_tag = "xenobotany_access_maintaince_inner"; + name = "Xenobotany Lab Access" + }, /obj/floor_decal/industrial/hatch/yellow, /obj/structure/cable/green{ d1 = 1; @@ -29103,10 +29224,11 @@ }, /area/space) "etl" = ( -/obj/structure/ladder, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/catwalk, -/turf/simulated/open, -/area/space) +/turf/simulated/floor/plating, +/area/maintenance/firstdeck/forestarboard) "etw" = ( /obj/machinery/computer/ship/sensors{ dir = 4 @@ -29295,6 +29417,7 @@ /obj/item/frame/air_alarm{ pixel_y = -16 }, +/obj/machinery/light/small, /turf/simulated/floor/wood/yew, /area/crew_quarters/heads/office/ce/cobed) "evv" = ( @@ -29371,7 +29494,7 @@ }, /obj/paint_stripe/red, /turf/simulated/wall/r_wall/prepainted, -/area/security/brig) +/area/security/sierra/brig) "evG" = ( /obj/random/closet, /obj/random/maintenance, @@ -29429,7 +29552,7 @@ name = "Floor mounted flash" }, /turf/simulated/floor/tiled/dark, -/area/security/prison) +/area/security/sierra/prison) "ewl" = ( /obj/structure/reagent_dispensers/fueltank, /obj/floor_decal/industrial/outline/grey, @@ -29486,6 +29609,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/hallway/infirmary) "ewQ" = ( @@ -29762,6 +29888,17 @@ }, /turf/simulated/floor/reinforced, /area/engineering/atmos/bridge) +"eyQ" = ( +/obj/structure/sign/directions/engineering{ + dir = 4; + pixel_y = 31 + }, +/obj/structure/sign/directions/supply{ + dir = 4; + pixel_y = 24 + }, +/turf/simulated/open, +/area/hallway/primary/seconddeck/central_stairwell) "eyY" = ( /obj/machinery/atmospherics/pipe/simple/visible/fuel{ dir = 4 @@ -30309,7 +30446,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/monotile, -/area/security/brig) +/area/security/sierra/brig) "eDe" = ( /obj/floor_decal/borderfloorblack{ dir = 8 @@ -31446,8 +31583,8 @@ }, /area/space) "eLH" = ( -/obj/structure/catwalk, /obj/structure/ladder, +/obj/structure/lattice, /turf/simulated/open, /area/space) "eLV" = ( @@ -32179,6 +32316,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/hallway/infirmary) "eRP" = ( @@ -32325,7 +32465,10 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engineering_monitoring) "eSL" = ( -/obj/machinery/door/airlock/external/bolted/cycling, +/obj/machinery/door/airlock/external/bolted/cycling{ + id_tag = "toxin_lab_access_inner"; + name = "Toxin Lab Access" + }, /obj/floor_decal/industrial/hatch/yellow, /obj/structure/cable/green{ d1 = 1; @@ -32426,6 +32569,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/hallway/infirmary) "eTK" = ( @@ -32438,6 +32585,12 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/wood/walnut, /area/crew_quarters/bar/cobed) "eTL" = ( @@ -32893,6 +33046,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark/monotile, /area/medical/staging) "eYf" = ( @@ -33030,7 +33186,7 @@ name = "Floor mounted flash" }, /turf/simulated/floor/wood/walnut, -/area/security/prison) +/area/security/sierra/prison) "eYU" = ( /obj/machinery/atmospherics/binary/circulator{ anchored = 1 @@ -33587,7 +33743,7 @@ }, /obj/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/bridge_port) +/area/maintenance/solar/bridge_port) "fdF" = ( /obj/structure/cable/green{ d1 = 4; @@ -33684,6 +33840,9 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/hallway/infirmary) "fea" = ( @@ -33927,7 +34086,7 @@ pixel_y = -29 }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "ffN" = ( /obj/floor_decal/industrial/hatch/yellow, /obj/structure/cable{ @@ -35334,8 +35493,7 @@ }, /obj/machinery/portable_atmospherics/powered/scrubber, /obj/floor_decal/industrial/warning/cee{ - dir = 1; - icon_state = "warningcee" + dir = 1 }, /turf/simulated/floor/plating, /area/maintenance/thirddeck/aftstarboard) @@ -35553,6 +35711,10 @@ dir = 4; icon_state = "pipe-j2" }, +/obj/structure/sign/warning/pods/east{ + dir = 1; + pixel_y = -32 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/firstdeck/centralport) "ftk" = ( @@ -36007,7 +36169,9 @@ /obj/floor_decal/borderfloor{ dir = 6 }, -/obj/structure/closet/hydrant, +/obj/structure/closet/hydrant{ + pixel_x = 28 + }, /obj/floor_decal/corner/red/border{ dir = 6 }, @@ -36184,7 +36348,7 @@ name = "Floor mounted flash" }, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "fyg" = ( /obj/floor_decal/corner/red/diagonal, /obj/decal/cleanable/dirt, @@ -36681,19 +36845,10 @@ /turf/simulated/floor/tiled/monotile, /area/quartermaster/hangar) "fCW" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel_grid, -/area/maintenance/firstdeck/forestarboard) +/obj/structure/table/woodentable_reinforced/ebony, +/obj/item/modular_computer/laptop/preset/custom_loadout, +/turf/simulated/floor/carpet/red, +/area/crew_quarters/heads/office/hos) "fDd" = ( /obj/structure/cable/green{ d1 = 4; @@ -37010,7 +37165,7 @@ dir = 4 }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "fFi" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Second Deck Substation Bypass" @@ -37167,10 +37322,10 @@ /area/maintenance/firstdeck/aftstarboard) "fGt" = ( /obj/structure/ladder, -/obj/structure/catwalk, /obj/machinery/light/small{ dir = 4 }, +/obj/structure/lattice, /turf/simulated/open, /area/maintenance/firstdeck/aftport) "fGv" = ( @@ -37350,7 +37505,7 @@ id_tag = "prison_lobby_window" }, /turf/simulated/floor/plating, -/area/security/brig) +/area/security/sierra/brig) "fHU" = ( /obj/machinery/computer/modular/preset/security, /obj/floor_decal/corner/red/half{ @@ -37574,7 +37729,7 @@ dir = 1 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/bridge_port) +/area/maintenance/solar/bridge_port) "fIW" = ( /obj/machinery/atmospherics/pipe/simple/visible/black, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -37636,7 +37791,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "fJr" = ( /turf/simulated/wall/prepainted, /area/maintenance/compactor) @@ -37778,22 +37933,8 @@ /turf/simulated/floor/plating, /area/hallway/primary/bridgedeck/aft) "fKB" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/catwalk_plated, -/obj/machinery/button/blast_door{ - dir = 4; - id_tag = "mine_warehouse"; - name = "Storage Door Control"; - pixel_x = -24; - pixel_y = -6; - req_access = list(list("ACCESS_XENOARCH","ACCESS_EL")) - }, -/turf/simulated/floor/plating, -/area/quartermaster/hangar) +/turf/simulated/wall/r_wall/hull, +/area/maintenance/solar/bridge_port) "fKC" = ( /obj/structure/closet/shipping_wall/filled{ pixel_x = -32 @@ -38329,7 +38470,7 @@ /area/medical/surgery) "fOi" = ( /turf/simulated/wall/prepainted, -/area/security/prison) +/area/security/sierra/prison) "fOj" = ( /turf/simulated/wall/r_wall/prepainted, /area/crew_quarters/galley/freezer) @@ -38898,7 +39039,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "fSx" = ( /obj/structure/railing/mapped{ dir = 8 @@ -39245,6 +39386,9 @@ dir = 8 }, /obj/structure/closet/emcloset/anchored, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/sleep/cryo/firstdeck) "fVM" = ( @@ -39538,7 +39682,7 @@ dir = 8 }, /obj/structure/disposalpipe/trunk{ - dir = 4 + dir = 1 }, /turf/simulated/floor/reinforced, /area/rnd/containment) @@ -39755,7 +39899,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/white, -/area/security/prison) +/area/security/sierra/prison) "gat" = ( /obj/floor_decal/corner/paleblue/bordercorner, /obj/floor_decal/corner/paleblue/bordercorner{ @@ -39766,6 +39910,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark/monotile, /area/medical/staging) "gav" = ( @@ -39875,7 +40020,7 @@ name = "Prison Lobby Windows Shutters" }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "gaP" = ( /obj/floor_decal/industrial/warning{ dir = 8 @@ -40392,6 +40537,9 @@ /area/engineering/engine_room) "gfV" = ( /obj/structure/table/rack, +/obj/structure/sign/directions/med{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/white, /area/medical/maintenance_equipstorage) "ggb" = ( @@ -40641,7 +40789,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -40715,7 +40863,6 @@ /obj/item/folder/nt/rd, /obj/item/folder/nt/rd, /obj/item/folder/nt/rd, -/obj/machinery/light/small, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -41348,6 +41495,10 @@ /obj/machinery/door/firedoor{ dir = 4 }, +/obj/machinery/holosign/surgery{ + dir = 4; + id_tag = "surgery1" + }, /turf/simulated/floor/tiled/dark/monotile, /area/medical/surgery) "gos" = ( @@ -43694,7 +43845,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/fore) +/area/security/brig) "gHI" = ( /obj/structure/undies_wardrobe, /obj/machinery/alarm{ @@ -44148,7 +44299,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/prison) "gLt" = ( /turf/simulated/wall/r_wall/hull, /area/security/sierra/hallway/port) @@ -44452,7 +44603,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/white, -/area/security/prison) +/area/security/sierra/prison) "gOx" = ( /obj/structure/hygiene/shower{ dir = 4; @@ -44532,6 +44683,14 @@ /obj/floor_decal/corner/paleblue/border{ dir = 1 }, +/obj/structure/sign/directions/security{ + pixel_y = 24; + dir = 8 + }, +/obj/structure/sign/directions/bridge{ + pixel_y = 31; + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/center) "gPh" = ( @@ -44716,6 +44875,9 @@ }, /obj/structure/table/steel, /obj/item/wrench, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/quartermaster/shuttlefuel) "gQn" = ( @@ -44739,6 +44901,9 @@ }, /obj/structure/closet/emcloset, /obj/floor_decal/industrial/outline/yellow, +/obj/structure/sign/deck/third{ + pixel_y = 24 + }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/thirddeck/center) "gQr" = ( @@ -45623,7 +45788,7 @@ dir = 4 }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "gWF" = ( /obj/structure/cable/green{ d1 = 1; @@ -45892,6 +46057,7 @@ on = 1; pixel_x = -25 }, +/obj/machinery/light/small, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/office/rd/cobed) "gYM" = ( @@ -46534,6 +46700,12 @@ icon_state = "4-8" }, /obj/structure/catwalk, +/obj/machinery/button/blast_door{ + id_tag = "firingspace"; + name = "Firing Range Shields"; + req_access = list("ACCESS_SEC_DOORS"); + pixel_y = 24 + }, /turf/simulated/floor/plating, /area/maintenance/firstdeck/forestarboard) "hdq" = ( @@ -46636,7 +46808,7 @@ pixel_x = -24 }, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "hes" = ( /obj/floor_decal/borderfloorblack/corner{ dir = 1 @@ -46655,7 +46827,7 @@ /area/bridge/meeting_room) "heG" = ( /turf/simulated/wall/prepainted, -/area/security/brig) +/area/security/sierra/brig) "heJ" = ( /obj/structure/railing/mapped{ dir = 8 @@ -46694,13 +46866,18 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/firstdeck/aftstarboard) "heV" = ( -/obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/firstdeck/forestarboard) "heX" = ( @@ -46965,7 +47142,7 @@ }, /obj/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/prison) "hhq" = ( /obj/machinery/light/spot{ dir = 4 @@ -47264,6 +47441,7 @@ /obj/floor_decal/corner/yellow/half{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/quartermaster/office) "hjK" = ( @@ -47641,6 +47819,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark/monotile, /area/medical/sleeper) "hmZ" = ( @@ -47863,7 +48042,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "hpa" = ( /obj/floor_decal/corner/purple/border{ dir = 6 @@ -48213,7 +48392,7 @@ dir = 6 }, /turf/simulated/floor/tiled/freezer, -/area/security/prison) +/area/security/sierra/prison) "hsw" = ( /turf/simulated/wall/prepainted, /area/maintenance/seconddeck/emergency) @@ -48557,7 +48736,17 @@ dir = 1 }, /obj/floor_decal/corner/paleblue/border, -/obj/machinery/alarm{ +/obj/machinery/light_switch{ + pixel_x = 8; + pixel_y = 24 + }, +/obj/machinery/button/holosign{ + id_tag = "sierra_surgery2"; + pixel_y = 24 + }, +/obj/machinery/button/windowtint{ + id = "sierra_surgery2"; + pixel_x = -8; pixel_y = 24 }, /turf/simulated/floor/tiled/dark/monotile, @@ -49198,7 +49387,8 @@ /obj/floor_decal/corner/green/mono, /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/airlock/multi_tile/virology{ - locked = 1 + locked = 1; + id_tag = "virology_access_inner" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/taperoll/engineering/applied, @@ -49248,7 +49438,6 @@ /obj/floor_decal/corner/black/mono, /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/airlock/command{ - id_tag = "iaadoorright"; name = "Internal Affairs Agent Dorm"; secured_wires = 1 }, @@ -49443,7 +49632,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "hCw" = ( /obj/floor_decal/spline/fancy/wood{ dir = 4 @@ -49870,7 +50059,7 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled/white, -/area/security/prison) +/area/security/sierra/prison) "hGf" = ( /obj/structure/cable/green{ d1 = 4; @@ -49911,7 +50100,8 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/tcommsat/chamber) "hGr" = ( -/obj/machinery/firealarm{ +/obj/structure/sign/directions/supply{ + dir = 4; pixel_y = 24 }, /obj/floor_decal/borderfloor{ @@ -50487,6 +50677,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/center) "hKA" = ( @@ -50513,9 +50708,6 @@ /area/maintenance/fourthdeck/aft) "hKK" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass/civilian{ - dir = 4 - }, /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/blast/regular/lockdown{ dir = 4; @@ -50524,6 +50716,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/airlock/glass/civilian{ + dir = 4 + }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/fourthdeck/center) "hKN" = ( @@ -50957,7 +51152,10 @@ dir = 9 }, /obj/machinery/photocopier, -/obj/machinery/alarm, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -24 + }, /obj/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/office/rd) @@ -51224,6 +51422,15 @@ /obj/floor_decal/corner/red/bordercorner2{ dir = 1 }, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 24 + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/fore) "hSc" = ( @@ -51253,6 +51460,12 @@ /obj/floor_decal/industrial/warning/corner{ dir = 1 }, +/obj/machinery/embedded_controller/radio/airlock/access_controller{ + id_tag = "xenobotany_access_maintaince"; + name = "Xenobotany Lab Access Console"; + pixel_y = 24; + req_access = list("ACCESS_XENOBIO","ACCESS_RESEARCH") + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/seconddeck/port) "hSq" = ( @@ -51537,7 +51750,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/security/sierra/hallway/port) "hUG" = ( -/obj/structure/bed/chair/pew/up{ +/obj/structure/bed/sofa/l/teal{ dir = 4 }, /obj/machinery/alarm{ @@ -51567,7 +51780,10 @@ /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) "hUX" = ( -/obj/machinery/door/airlock/civilian, +/obj/machinery/door/airlock/civilian{ + id_tag = "toilet_eng_1"; + name = "Toilet" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -51933,15 +52149,14 @@ }, /area/engineering/engine_room) "hXT" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, /obj/machinery/alarm{ dir = 1; pixel_y = -24 }, -/obj/machinery/portable_atmospherics/canister/hydrogen, /obj/floor_decal/industrial/outline/grey, +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/quartermaster/shuttlefuel) "hXU" = ( @@ -52200,13 +52415,30 @@ /turf/simulated/floor/tiled/dark, /area/vacant/mess) "iaT" = ( -/obj/wallframe_spawn/reinforced_phoron, -/obj/machinery/door/firedoor, +/obj/floor_decal/industrial/hatch/yellow, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/airlock/multi_tile/glass/engineering{ + dir = 8; + name = "Hallway" + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/plating, -/area/rnd/containment) +/turf/simulated/floor/tiled/monotile, +/area/hallway/primary/thirddeck/center) "iaX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 10 @@ -52863,19 +53095,19 @@ /obj/machinery/light/led/small{ dir = 1 }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/floor_decal/spline/fancy/black{ + dir = 1 + }, /obj/structure/table/steel_reinforced, /obj/machinery/vending/wallbartender{ pixel_y = 30 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/item/storage/bar_fruit_jar{ - pixel_x = 4; - pixel_y = 12 +/obj/item/reagent_containers/glass/beaker/large{ + pixel_y = 6 }, -/obj/floor_decal/spline/fancy/black{ - dir = 1 +/obj/machinery/reagentgrinder/juicer{ + pixel_y = 8 }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) @@ -54523,6 +54755,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark/monotile, /area/medical/staging) "itQ" = ( @@ -54916,6 +55152,10 @@ /obj/floor_decal/techfloor/orange{ dir = 4 }, +/obj/structure/sign/directions/supply{ + dir = 4; + pixel_y = 24 + }, /turf/simulated/floor/tiled/techfloor, /area/hallway/primary/fourthdeck/central_stairwell) "ixu" = ( @@ -54961,10 +55201,10 @@ /obj/floor_decal/corner/red/border{ dir = 4 }, -/obj/structure/closet/hydrant, +/obj/structure/closet/firecloset, /obj/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/fore) +/area/security/brig) "ixM" = ( /obj/floor_decal/borderfloor/corner, /obj/floor_decal/corner/red/bordercorner, @@ -55074,7 +55314,7 @@ /obj/structure/railing/mapped{ dir = 4 }, -/obj/structure/catwalk, +/obj/structure/lattice, /turf/simulated/open, /area/maintenance/seconddeck/foreport) "iyA" = ( @@ -55271,6 +55511,18 @@ "izz" = ( /obj/floor_decal/borderfloor, /obj/floor_decal/industrial/danger, +/obj/structure/sign/directions/security{ + pixel_y = -24; + pixel_x = 32 + }, +/obj/structure/sign/directions/infirmary{ + pixel_y = -31; + pixel_x = 32 + }, +/obj/structure/sign/directions/science{ + pixel_y = -38; + pixel_x = 32 + }, /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/aft_stairwell) "izE" = ( @@ -55517,9 +55769,6 @@ /obj/floor_decal/corner/lightgrey/border{ dir = 5 }, -/obj/machinery/light_switch{ - pixel_y = 24 - }, /turf/simulated/floor/tiled, /area/crew_quarters/docking) "iCf" = ( @@ -55585,6 +55834,9 @@ /obj/floor_decal/corner/lightgrey/bordercorner2{ dir = 8 }, +/obj/structure/sign/botany{ + pixel_x = -32 + }, /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/center) "iDj" = ( @@ -55916,7 +56168,7 @@ dir = 5 }, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "iGi" = ( /obj/machinery/pointdefense_control{ initial_id_tag = "sierra_main_pd" @@ -56359,6 +56611,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/aft) "iIE" = ( @@ -56793,7 +57046,7 @@ pixel_y = 13 }, /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/fore) +/area/security/brig) "iMx" = ( /obj/floor_decal/borderfloor/corner{ dir = 4 @@ -57085,6 +57338,9 @@ /obj/machinery/cell_charger, /obj/item/cell/high, /obj/random/powercell, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/quartermaster/shuttlefuel) "iOj" = ( @@ -57173,6 +57429,15 @@ /obj/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled, /area/assembly/office) +"iOE" = ( +/obj/floor_decal/borderfloor, +/obj/floor_decal/corner/lime/border, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/fourthdeck/center) "iOH" = ( /obj/structure/lattice, /obj/structure/disposalpipe/down, @@ -57313,6 +57578,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark/monotile, /area/medical/office) "iPW" = ( @@ -57543,7 +57811,15 @@ dir = 1 }, /obj/floor_decal/industrial/hatch/grey, -/obj/structure/curtain/open/shower/security, +/obj/structure/curtain/open/shower/security{ + name = "bar curtain" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/bar) "iQX" = ( @@ -58410,6 +58686,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/machinery/embedded_controller/radio/airlock/access_controller{ + id_tag = "xenobotany_access"; + name = "Xenobotany Lab Access Console"; + req_access = list("ACCESS_XENOBIO","ACCESS_RESEARCH"); + dir = 4; + pixel_x = -24 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "iYa" = ( @@ -58602,17 +58885,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/engineering/engine_eva) -"iZZ" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/forestarboard) "jac" = ( /obj/structure/cable/cyan{ d1 = 2; @@ -59153,7 +59425,9 @@ /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/medical, +/obj/machinery/door/airlock/glass/medical{ + name = "Patient Ward" + }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/dark/monotile, /area/medical/wardhallway) @@ -59164,7 +59438,7 @@ pixel_y = -24 }, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/bridge_port) +/area/maintenance/solar/bridge_port) "jfh" = ( /obj/floor_decal/steeldecal/steel_decals4{ dir = 1 @@ -60083,7 +60357,7 @@ dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/security/prison) +/area/security/sierra/prison) "jlt" = ( /obj/structure/cable/green{ d1 = 4; @@ -60504,7 +60778,7 @@ pixel_x = -24 }, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "jpF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 10 @@ -60788,6 +61062,11 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/adjutants/cobed) +"jse" = ( +/obj/structure/catwalk, +/obj/random/junk, +/turf/simulated/floor/plating, +/area/maintenance/firstdeck/forestarboard) "jsg" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -60986,7 +61265,9 @@ /obj/floor_decal/spline/fancy/black{ dir = 1 }, -/turf/simulated/floor/wood/bamboo, +/turf/simulated/floor/wood/bamboo{ + name = "stairs" + }, /area/crew_quarters/garden_room) "jtx" = ( /obj/floor_decal/techfloor{ @@ -62067,7 +62348,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "jDs" = ( /obj/machinery/alarm{ pixel_y = 24 @@ -62249,7 +62530,7 @@ /area/crew_quarters/galley) "jET" = ( /turf/simulated/wall/r_wall/hull, -/area/security/brig) +/area/security/sierra/brig) "jFo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/catwalk_plated, @@ -62321,7 +62602,7 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/freezer, -/area/security/prison) +/area/security/sierra/prison) "jFK" = ( /obj/structure/bed/chair/padded/red{ dir = 4 @@ -62609,12 +62890,12 @@ /area/shuttle/escape_pod/escape_pod5/station) "jHY" = ( /obj/structure/ladder, -/obj/structure/catwalk, /obj/structure/cable{ d1 = 32; d2 = 2; icon_state = "32-2" }, +/obj/structure/lattice, /turf/simulated/open, /area/maintenance/firstdeck/centralstarboard) "jIa" = ( @@ -62689,7 +62970,7 @@ pixel_y = 32 }, /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/fore) +/area/security/brig) "jIQ" = ( /obj/structure/cable/green{ d1 = 1; @@ -62986,7 +63267,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "jLt" = ( /turf/simulated/wall/r_wall/prepainted, /area/engineering/fuelbay) @@ -63078,7 +63359,6 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/command{ - id_tag = "iaadoorright"; name = "Internal Affairs Agent"; secured_wires = 1 }, @@ -63157,7 +63437,7 @@ dir = 8 }, /obj/machinery/conveyor{ - dir = 4; + dir = 8; id = "packageSort1" }, /obj/floor_decal/industrial/hatch/yellow, @@ -64027,7 +64307,7 @@ icon_state = "2-8" }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "jTy" = ( /obj/landmark{ name = "JoinLateCryo" @@ -64190,7 +64470,7 @@ dir = 10 }, /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/fore) +/area/security/brig) "jUA" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -64323,6 +64603,7 @@ /obj/machinery/hologram/holopad, /obj/floor_decal/industrial/outline/yellow, /obj/floor_decal/industrial/outline/yellow, +/obj/structure/sign/botany, /turf/simulated/floor/tiled/white/monotile, /area/medical/sleeper) "jVp" = ( @@ -64419,7 +64700,7 @@ /obj/machinery/disposal, /obj/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "jVH" = ( /obj/structure/cable/green{ d1 = 4; @@ -64452,6 +64733,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/hallway/infirmary) "jVO" = ( @@ -64578,8 +64860,8 @@ /area/maintenance/firstdeck/aftstarboard) "jWM" = ( /obj/machinery/conveyor{ - dir = 6; - id = "packageSort1" + id = "packageSort1"; + dir = 1 }, /turf/simulated/floor/plating, /area/quartermaster/office/post) @@ -64851,7 +65133,9 @@ id_tag = "infimary_hall_lockdown"; name = "Infirmary Entry Shutters" }, -/obj/machinery/door/airlock/medical, +/obj/machinery/door/airlock/medical{ + name = "Medical Smoke Room" + }, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -64859,6 +65143,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark/monotile, /area/medical/office) "jZa" = ( @@ -65627,8 +65912,9 @@ /area/hallway/primary/bridgedeck/center) "kek" = ( /obj/machinery/door/airlock/highsecurity{ - id_tag = 0; - name = "Unused Chamber" + name = "Unused Chamber"; + autoset_access = 0; + req_access = list("ACCESS_SEC_DOORS") }, /obj/structure/barricade, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -66786,7 +67072,6 @@ /area/vacant/cargo) "knS" = ( /obj/machinery/door/airlock/command{ - id_tag = "iaadoorright"; name = "Internal Affairs Agent"; secured_wires = 1 }, @@ -67204,6 +67489,10 @@ /obj/floor_decal/corner/paleblue/border{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/hallway/infirmary) "krn" = ( @@ -67563,7 +67852,7 @@ /obj/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/portables_connector, /turf/simulated/floor/plating, -/area/maintenance/bridge_port) +/area/maintenance/solar/bridge_port) "kut" = ( /obj/machinery/atmospherics/pipe/zpipe/up/cyan{ dir = 8 @@ -67810,27 +68099,19 @@ /turf/simulated/floor/tiled/monotile, /area/exploration_shuttle/cockpit) "kvz" = ( -/obj/floor_decal/corner/red/bordercorner{ - dir = 1 - }, -/obj/floor_decal/corner/red/bordercorner{ - dir = 4 - }, /obj/machinery/light/led/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/floor_decal/spline/fancy/black/corner{ dir = 4 }, /obj/floor_decal/spline/fancy/black/corner{ dir = 1 }, +/obj/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/machinery/jukebox/custom_tape/old, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "kvF" = ( @@ -68193,6 +68474,10 @@ /turf/simulated/floor/plating, /area/maintenance/fourthdeck/foreport) "kyj" = ( +/obj/structure/sign/directions/bridge{ + pixel_y = -13; + pixel_x = 32 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/primary/seconddeck/aft_stairwell) "kyp" = ( @@ -68600,6 +68885,9 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/reinforced, /area/rnd/containment) "kBc" = ( @@ -68877,7 +69165,7 @@ "kCZ" = ( /obj/structure/bed/chair/padded/green, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "kDb" = ( /obj/structure/table/woodentable, /obj/item/stack/cable_coil, @@ -69086,7 +69374,7 @@ icon_state = "1-4" }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "kFC" = ( /obj/machinery/atmospherics/pipe/simple/visible/green, /obj/machinery/atmospherics/binary/pump{ @@ -70019,7 +70307,7 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/fore) +/area/security/brig) "kMb" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden, /obj/floor_decal/techfloor{ @@ -70479,7 +70767,7 @@ "kPk" = ( /obj/paint_stripe/red, /turf/simulated/wall/r_wall/hull, -/area/security/prison) +/area/security/sierra/prison) "kPn" = ( /obj/paint/red, /obj/paint_stripe/white, @@ -70510,7 +70798,7 @@ /area/exploration_shuttle/power) "kPx" = ( /turf/simulated/floor/wood/walnut, -/area/security/prison) +/area/security/sierra/prison) "kPB" = ( /turf/simulated/floor/tiled, /area/maintenance/seconddeck/aftstarboard) @@ -70700,6 +70988,15 @@ /obj/floor_decal/corner/lime/bordercorner2{ dir = 4 }, +/obj/machinery/power/apc/high{ + dir = 1; + name = "north bump"; + pixel_y = 24 + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/center) "kQN" = ( @@ -70748,7 +71045,8 @@ }, /obj/machinery/button/windowtint{ pixel_y = 22; - id = "briefing_windows" + id = "briefing_windows"; + range = 12 }, /turf/simulated/floor/tiled/dark, /area/bridge/marine_room) @@ -70909,7 +71207,7 @@ name = "Security Department Lockdown" }, /turf/simulated/floor/plating, -/area/security/prison) +/area/security/sierra/brig) "kSu" = ( /obj/item/stool/padded, /turf/simulated/floor/grass, @@ -71301,7 +71599,7 @@ pixel_x = 24 }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "kWq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -71632,6 +71930,9 @@ /obj/structure/railing/mapped, /obj/structure/table/rack, /obj/random/maintenance, +/obj/structure/railing/mapped{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/firstdeck/forestarboard) "kYW" = ( @@ -72087,14 +72388,6 @@ dir = 4 }, /obj/floor_decal/industrial/hatch/yellow, -/obj/machinery/button/blast_door{ - dir = 4; - id_tag = "mine_warehouse"; - name = "Storage Door Control"; - pixel_x = -24; - pixel_y = -6; - req_access = list(list("ACCESS_MINING","ACCESS_XENOARCH","ACCESS_EL")) - }, /turf/simulated/floor/tiled/techfloor/grid, /area/quartermaster/hangar_atmos) "ldQ" = ( @@ -72231,7 +72524,7 @@ name = "prisoners fork" }, /turf/simulated/floor/tiled/freezer, -/area/security/prison) +/area/security/sierra/prison) "leD" = ( /obj/floor_decal/corner/blue/diagonal{ dir = 4 @@ -72277,6 +72570,13 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/item/storage/mirror{ + pixel_x = 24; + pixel_y = 1 + }, +/obj/machinery/firealarm{ + pixel_y = 24 + }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/head/deck3) "leM" = ( @@ -72528,6 +72828,13 @@ /obj/floor_decal/industrial/warning/corner{ dir = 8 }, +/obj/machinery/embedded_controller/radio/airlock/access_controller{ + dir = 1; + id_tag = "toxin_lab_access"; + name = "Toxin Lab Access Console"; + pixel_y = -20; + req_access = list("ACCESS_TOX_STORAGE") + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/seconddeck/port) "lgB" = ( @@ -72660,7 +72967,7 @@ /obj/structure/table/steel_reinforced, /obj/machinery/recharger, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "lif" = ( /obj/structure/cable/green{ d1 = 1; @@ -73083,7 +73390,7 @@ /obj/floor_decal/corner/red/bordercorner2, /obj/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/fore) +/area/security/brig) "llb" = ( /obj/structure/table/standard, /obj/machinery/reagentgrinder/juicer, @@ -73827,18 +74134,19 @@ /obj/structure/shotgun_rack{ pixel_y = 29 }, -/obj/structure/table/steel_reinforced, -/obj/machinery/reagent_temperature, /obj/floor_decal/spline/fancy/black{ dir = 1 }, +/obj/structure/table/steel_reinforced, +/obj/machinery/chemical_dispenser/bar_alc/full{ + pixel_y = 8 + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "lrw" = ( /obj/structure/catwalk, /obj/floor_decal/industrial/warning/cee{ - dir = 1; - icon_state = "warningcee" + dir = 1 }, /obj/machinery/atmospherics/unary/vent_pump/high_volume/airlock{ dir = 8; @@ -74096,7 +74404,7 @@ pixel_y = 26 }, /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/fore) +/area/security/brig) "lty" = ( /obj/floor_decal/techfloor{ dir = 6 @@ -74153,7 +74461,7 @@ pixel_y = 26 }, /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/fore) +/area/security/brig) "ltU" = ( /obj/structure/cable/green{ d1 = 4; @@ -74664,6 +74972,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark/monotile, /area/medical/infirmreception) "lxl" = ( @@ -74912,7 +75224,7 @@ name = "Security Department Lockdown" }, /turf/simulated/floor/plating, -/area/security/prison) +/area/security/sierra/brig) "lzz" = ( /obj/floor_decal/corner/yellow, /turf/simulated/floor/tiled/steel_grid, @@ -75337,7 +75649,7 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel_ridged, -/area/security/brig) +/area/security/sierra/brig) "lCm" = ( /obj/floor_decal/corner/red{ dir = 1 @@ -75731,7 +76043,7 @@ icon_state = "pipe-c" }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "lFg" = ( /obj/structure/bed/chair/comfy/blue{ dir = 8 @@ -75771,6 +76083,9 @@ /obj/floor_decal/corner/darkblue/bordercorner2{ dir = 1 }, +/obj/structure/sign/deck/bridge{ + pixel_y = 24 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/center) "lFj" = ( @@ -76031,7 +76346,7 @@ /turf/simulated/floor/tiled/dark/monotile, /area/security/opscheck) "lGQ" = ( -/obj/structure/bed/chair/office/light{ +/obj/machinery/floodlight{ dir = 4 }, /turf/simulated/floor/plating, @@ -76360,6 +76675,9 @@ /obj/floor_decal/corner/purple/bordercorner2{ dir = 5 }, +/obj/machinery/status_display{ + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/hallway/primary/fourthdeck/aft) "lJx" = ( @@ -77002,6 +77320,9 @@ }, /obj/structure/closet/secure_closet/hop2, /obj/item/book/manual/nt_sop, +/obj/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/office/hop/cobed) "lOd" = ( @@ -77891,7 +78212,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/fore) +/area/security/brig) "lWO" = ( /obj/structure/table/standard, /obj/floor_decal/techfloor{ @@ -78361,6 +78682,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white/monotile, /area/hallway/infirmary) "mbh" = ( @@ -78374,7 +78696,9 @@ /area/rnd/xenobiology/level2) "mbk" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/hatch/maintenance, +/obj/machinery/door/airlock/hatch/maintenance{ + name = "Tech Storage" + }, /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -78683,14 +79007,13 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "mdB" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/firstdeck/forestarboard) "mdD" = ( @@ -79267,8 +79590,13 @@ d2 = 8; icon_state = "2-8" }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/prison) "mhN" = ( /obj/machinery/constructable_frame/machine_frame, /turf/simulated/floor/wood/yew, @@ -79715,7 +80043,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/fore) +/area/security/brig) "mmy" = ( /obj/floor_decal/borderfloorblack{ dir = 10 @@ -79732,6 +80060,13 @@ }, /obj/machinery/recharge_station, /obj/machinery/alarm{ + dir = 4; + pixel_x = -24 + }, +/obj/machinery/embedded_controller/radio/airlock/access_controller{ + id_tag = "virology_access"; + name = "Virology Lab Access Console"; + req_access = list("ACCESS_VIRO"); dir = 1; pixel_y = -24 }, @@ -80229,7 +80564,7 @@ dir = 8 }, /turf/simulated/floor/tiled/freezer, -/area/security/prison) +/area/security/sierra/prison) "mqx" = ( /obj/structure/railing/mapped{ dir = 4 @@ -80505,9 +80840,7 @@ /turf/simulated/floor/tiled/dark/monotile, /area/security/nuke_storage) "msN" = ( -/obj/wallframe_spawn/reinforced/polarized/no_grille{ - id = "pathfinder_office" - }, +/obj/wallframe_spawn/reinforced/titanium, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/exploration_shuttle/cargo_l) @@ -80609,7 +80942,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/security/brig) +/area/security/prison) "mtP" = ( /obj/structure/closet/crate, /obj/decal/cleanable/dirt, @@ -80915,6 +81248,10 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/structure/sign/directions/bridge{ + pixel_y = 24; + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/primary/bridgedeck/central_stairwell) "mwf" = ( @@ -81146,6 +81483,13 @@ "mxO" = ( /obj/machinery/recharge_station, /obj/floor_decal/industrial/outline/yellow, +/obj/machinery/embedded_controller/radio/airlock/access_controller{ + id_tag = "xenobotany_access"; + name = "Xenobotany Lab Access Console"; + req_access = list("ACCESS_XENOBIO","ACCESS_RESEARCH"); + dir = 4; + pixel_x = -24 + }, /turf/simulated/floor/tiled/steel_grid, /area/assembly/chargebay) "mxP" = ( @@ -81661,6 +82005,10 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/item/storage/mirror{ + pixel_x = 24; + pixel_y = 1 + }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/head/deck3) "mBm" = ( @@ -82170,7 +82518,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "mFj" = ( /obj/machinery/door/window/southleft{ name = "HoP's Desk"; @@ -82628,7 +82976,9 @@ "mJw" = ( /obj/structure/bed/padded, /obj/item/bedsheet/brown, -/obj/structure/curtain/open/bed, +/obj/structure/curtain/open/bed{ + anchored = 1 + }, /obj/floor_decal/borderfloor{ dir = 10 }, @@ -82645,7 +82995,7 @@ dir = 9 }, /turf/simulated/floor/tiled/dark, -/area/security/prison) +/area/security/sierra/prison) "mJy" = ( /obj/structure/filingcabinet{ pixel_x = -6 @@ -82958,6 +83308,14 @@ /area/hydroponics) "mMx" = ( /obj/structure/stairs/west, +/obj/structure/sign/directions/security{ + pixel_y = 24; + dir = 8 + }, +/obj/structure/sign/directions/infirmary{ + pixel_y = 31; + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/central_stairwell) "mMA" = ( @@ -82981,7 +83339,7 @@ pixel_x = 32 }, /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/fore) +/area/security/brig) "mMJ" = ( /obj/structure/railing/mapped{ dir = 1 @@ -83206,7 +83564,7 @@ pixel_x = 24 }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "mOf" = ( /turf/simulated/wall/r_wall/prepainted, /area/crew_quarters/galley/backroom) @@ -83431,7 +83789,7 @@ RCon_tag = "Solar - Bridge Port" }, /turf/simulated/floor/plating, -/area/maintenance/bridge_port) +/area/maintenance/solar/bridge_port) "mQg" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -84428,7 +84786,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/maintenance/bridge_port) +/area/maintenance/solar/bridge_port) "mYP" = ( /obj/machinery/door/firedoor, /obj/floor_decal/industrial/hatch/yellow, @@ -84670,12 +85028,7 @@ /area/rnd/storage) "nai" = ( /obj/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/binary/pump/high_power/on{ - dir = 4; - name = "CO2 Supply"; - target_pressure = 10000 - }, -/obj/structure/closet/hydrant, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled/monotile, /area/quartermaster/hangar) "nam" = ( @@ -85360,7 +85713,7 @@ dir = 10 }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "ngm" = ( /obj/floor_decal/industrial/hatch/yellow, /obj/structure/cable/yellow{ @@ -85370,6 +85723,23 @@ }, /turf/simulated/floor, /area/solar/bridge_starboard) +"ngE" = ( +/obj/floor_decal/borderfloor{ + dir = 1 + }, +/obj/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/structure/sign/directions/science{ + pixel_y = 24; + dir = 4 + }, +/obj/structure/sign/directions/infirmary{ + dir = 4; + pixel_y = 31 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/firstdeck/center) "ngG" = ( /obj/floor_decal/borderfloor, /obj/floor_decal/corner/yellow/border, @@ -85601,7 +85971,7 @@ /area/vacant/storage) "niF" = ( /obj/machinery/conveyor{ - dir = 4; + dir = 8; id = "packageSort1" }, /turf/simulated/floor/plating, @@ -85844,8 +86214,11 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) "nkB" = ( -/obj/machinery/media/music_writer{ - pixel_y = 60 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) @@ -86144,6 +86517,9 @@ pixel_x = -32 }, /obj/floor_decal/industrial/outline/yellow, +/obj/structure/sign/directions/med{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/white/monotile, /area/medical/sleeper) "nlX" = ( @@ -86198,23 +86574,12 @@ /area/maintenance/thirddeck/starboard) "nmN" = ( /obj/structure/ladder, -/obj/structure/catwalk, /obj/structure/railing/mapped{ dir = 4 }, +/obj/structure/lattice, /turf/simulated/open, /area/space) -"nmP" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/forestarboard) "nmS" = ( /obj/machinery/atmospherics/unary/vent_pump/tank{ dir = 8; @@ -86387,7 +86752,7 @@ dir = 8 }, /turf/simulated/wall/r_wall/hull, -/area/maintenance/bridge_port) +/area/maintenance/solar/bridge_port) "nop" = ( /obj/shuttle_landmark/ninja/deck2, /turf/space, @@ -86442,7 +86807,7 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/security/prison) +/area/security/sierra/prison) "noM" = ( /turf/simulated/wall/prepainted, /area/medical/office) @@ -87051,6 +87416,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark/monotile, /area/medical/sleeper) "nsm" = ( @@ -87070,7 +87436,7 @@ dir = 1 }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "nsB" = ( /obj/floor_decal/borderfloor{ dir = 1 @@ -87162,7 +87528,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "ntv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -87226,7 +87592,7 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, -/area/security/brig) +/area/security/sierra/brig) "ntW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -87335,10 +87701,14 @@ /turf/simulated/floor/tiled/dark/monotile, /area/medical/sleeper) "nuJ" = ( -/obj/structure/railing/mapped, -/obj/structure/largecrate, -/obj/random/maintenance, -/turf/simulated/floor/plating, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/firstdeck/forestarboard) "nuQ" = ( /obj/structure/cable/green{ @@ -87599,11 +87969,6 @@ "nwt" = ( /obj/structure/table/woodentable/walnut, /obj/random/action_figure, -/obj/machinery/button/windowtint{ - id = "iaaright"; - pixel_x = -5; - pixel_y = 24 - }, /obj/item/device/radio/intercom{ dir = 4; pixel_x = -24 @@ -87756,8 +88121,8 @@ }, /area/space) "nxM" = ( -/obj/structure/catwalk, /obj/structure/ladder, +/obj/structure/lattice, /turf/simulated/open, /area/maintenance/thirddeck/port) "nxN" = ( @@ -87839,7 +88204,7 @@ /area/crew_quarters/docking) "nyu" = ( /obj/machinery/conveyor{ - dir = 4; + dir = 8; id = "packageSort1" }, /obj/structure/plasticflaps/airtight, @@ -88006,13 +88371,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/button/blast_door{ - dir = 4; - id_tag = "bsa_door2"; - name = "Obstruction Field Disperser Blast Door"; - pixel_x = -24; - req_access = list("ACCESS_GUN") - }, /obj/floor_decal/steeldecal/steel_decals4{ dir = 1 }, @@ -88355,7 +88713,7 @@ /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel_ridged, -/area/security/brig) +/area/security/sierra/brig) "nDi" = ( /obj/structure/table/rack, /obj/structure/railing/mapped, @@ -88624,9 +88982,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/button/blast_door{ - pixel_y = 32 - }, /turf/simulated/floor/tiled/steel_grid, /area/security/sierra/hallway/aft) "nFK" = ( @@ -88873,6 +89228,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark/monotile, /area/medical/backstorage) "nHI" = ( @@ -89043,7 +89399,7 @@ dir = 4 }, /turf/simulated/floor/tiled/monotile, -/area/security/brig) +/area/security/sierra/brig) "nIB" = ( /turf/simulated/wall/r_wall/hull, /area/maintenance/firstdeck/forestarboard) @@ -89238,7 +89594,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /obj/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/prison) "nKq" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 9 @@ -89548,7 +89904,7 @@ dir = 4 }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "nNm" = ( /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/safe_room) @@ -89675,6 +90031,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark/monotile, /area/medical/staging) "nOy" = ( @@ -89815,6 +90172,9 @@ /obj/floor_decal/corner/darkblue/border{ dir = 5 }, +/obj/item/storage/secure/safe{ + pixel_y = 28 + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/captain) "nPA" = ( @@ -89844,8 +90204,8 @@ /turf/simulated/floor/tiled/dark, /area/security/sierra/interrogation/second) "nPW" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, /turf/simulated/floor/tiled/techfloor/grid, /area/quartermaster/shuttlefuel) @@ -90095,7 +90455,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/white, -/area/security/prison) +/area/security/sierra/prison) "nSV" = ( /obj/structure/cable/green{ d1 = 4; @@ -90307,11 +90667,12 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" }, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/firstdeck/forestarboard) @@ -90331,7 +90692,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/fore) +/area/security/brig) "nUA" = ( /obj/machinery/light/spot{ dir = 1 @@ -90754,7 +91115,7 @@ /area/storage/eva) "nZF" = ( /obj/structure/ladder, -/obj/structure/catwalk, +/obj/structure/lattice, /turf/simulated/open, /area/maintenance/seconddeck/port) "nZH" = ( @@ -90938,6 +91299,9 @@ dir = 8 }, /obj/floor_decal/industrial/outline/yellow, +/obj/structure/sign/directions/med{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) "oaI" = ( @@ -90999,6 +91363,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/hallway/infirmary) "obm" = ( @@ -91036,6 +91403,24 @@ }, /turf/simulated/floor/plating, /area/maintenance/thirddeck/port) +"obE" = ( +/obj/floor_decal/borderfloor{ + dir = 1 + }, +/obj/floor_decal/corner/lime/border{ + dir = 1 + }, +/obj/floor_decal/borderfloor/corner2{ + dir = 4 + }, +/obj/floor_decal/corner/lime/bordercorner2{ + dir = 4 + }, +/obj/structure/sign/deck/first{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/firstdeck/center) "obG" = ( /obj/structure/cable/green{ d1 = 2; @@ -91137,6 +91522,10 @@ "oct" = ( /obj/floor_decal/corner/black, /obj/floor_decal/corner/paleblue/bordercorner, +/obj/structure/sign/warning/nosmoking_2{ + pixel_x = 32; + pixel_y = -32 + }, /turf/simulated/floor/tiled/white, /area/hallway/infirmary) "ocu" = ( @@ -91453,7 +91842,9 @@ dir = 4 }, /obj/floor_decal/industrial/hatch/yellow, -/obj/machinery/door/airlock/science, +/obj/machinery/door/airlock/science{ + name = "Explorer Prep" + }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -91698,7 +92089,7 @@ dir = 4 }, /turf/simulated/floor/wood/walnut, -/area/security/prison) +/area/security/sierra/prison) "ogC" = ( /turf/simulated/wall/prepainted, /area/vacant/mess) @@ -92087,6 +92478,13 @@ icon_state = "1-2" }, /obj/structure/barricade, +/obj/machinery/embedded_controller/radio/airlock/access_controller{ + id_tag = "virology_access"; + name = "Virology Lab Access Console"; + req_access = list("ACCESS_VIRO"); + dir = 4; + pixel_x = -24 + }, /turf/simulated/floor/tiled/white, /area/maintenance/seconddeck/starboard) "ojM" = ( @@ -92234,22 +92632,15 @@ /turf/simulated/floor/tiled, /area/crew_quarters/docking) "okp" = ( -/obj/floor_decal/borderfloor{ - dir = 8 - }, -/obj/machinery/light/spot{ - dir = 8 - }, -/obj/floor_decal/industrial/danger{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/hangar) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/starboard) "okr" = ( /obj/random/trash, /obj/structure/window/basic, @@ -92259,6 +92650,9 @@ "oku" = ( /obj/structure/table/reinforced, /obj/floor_decal/industrial/outline/yellow, +/obj/machinery/light/spot{ + dir = 1 + }, /turf/simulated/floor/tiled/white/monotile, /area/medical/surgery) "okx" = ( @@ -92576,7 +92970,7 @@ dir = 8 }, /turf/simulated/floor/wood/walnut, -/area/security/prison) +/area/security/sierra/prison) "omZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -93184,10 +93578,12 @@ /obj/structure/closet/emcloset, /obj/item/tank/air, /obj/item/wrench, -/obj/item/ladder_mobile, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/substation/bridgedeck) "oqU" = ( @@ -93213,7 +93609,7 @@ id = "Cell 1" }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "orf" = ( /obj/machinery/atmospherics/omni/filter{ tag_east = 2; @@ -93445,7 +93841,7 @@ pixel_y = -29 }, /turf/simulated/floor/wood/walnut, -/area/security/prison) +/area/security/sierra/prison) "otU" = ( /obj/structure/table/rack, /obj/random/maintenance, @@ -93622,14 +94018,9 @@ /turf/simulated/floor/tiled/techfloor, /area/storage/eva) "ove" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/firstdeck/forestarboard) "ovl" = ( @@ -93759,7 +94150,7 @@ /obj/floor_decal/borderfloor{ dir = 5 }, -/obj/structure/closet/hydrant, +/obj/structure/closet/firecloset, /obj/floor_decal/corner/red/border{ dir = 5 }, @@ -93778,6 +94169,9 @@ dir = 4; pixel_x = -22 }, +/obj/machinery/light/spot{ + dir = 1 + }, /turf/simulated/floor/tiled/white/monotile, /area/medical/surgery) "owI" = ( @@ -93814,6 +94208,20 @@ /obj/random/toolbox, /turf/simulated/floor/plating, /area/maintenance/firstdeck/centralport) +"oxa" = ( +/obj/floor_decal/borderfloorblack, +/obj/floor_decal/corner/darkblue/border, +/obj/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/floor_decal/corner/darkblue/bordercorner2{ + dir = 9 + }, +/obj/floor_decal/borderfloorblack/corner2, +/obj/floor_decal/corner/darkblue/bordercorner2, +/obj/machinery/light/spot, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "oxc" = ( /obj/structure/cable{ d1 = 1; @@ -94400,7 +94808,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood/walnut, -/area/security/prison) +/area/security/sierra/prison) "oCi" = ( /obj/shuttle_landmark/skipjack/deck5, /turf/space, @@ -94501,7 +94909,7 @@ dir = 1 }, /turf/simulated/floor/wood/walnut, -/area/security/prison) +/area/security/sierra/prison) "oDb" = ( /obj/floor_decal/corner/paleblue/border{ dir = 9 @@ -94787,7 +95195,7 @@ /area/security/sierra/forensic/lab) "oEN" = ( /obj/machinery/conveyor{ - dir = 4; + dir = 8; id = "packageSort1" }, /obj/structure/sign/warning/moving_parts{ @@ -95274,6 +95682,14 @@ /area/medical/surgery/second) "oIi" = ( /obj/structure/stairs/east, +/obj/structure/sign/directions/bridge{ + pixel_y = -24; + dir = 4 + }, +/obj/structure/sign/directions/science{ + dir = 4; + pixel_y = -31 + }, /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/central_stairwell) "oIo" = ( @@ -95335,6 +95751,11 @@ /obj/floor_decal/industrial/warning, /turf/simulated/floor/tiled/steel_grid, /area/rnd/xenobiology/level1) +"oIG" = ( +/obj/structure/railing/mapped, +/obj/structure/bed/sofa/l/blue, +/turf/simulated/floor/plating, +/area/maintenance/bridgedeck/starboard) "oIZ" = ( /obj/structure/railing/mapped{ dir = 8 @@ -95780,6 +96201,9 @@ }, /obj/structure/dogbed, /mob/living/simple_animal/passive/corgi/Ian, +/obj/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/carpet/blue2, /area/crew_quarters/heads/office/hop/cobed) "oNi" = ( @@ -95862,7 +96286,7 @@ /area/crew_quarters/sleep/cryo/south) "oNN" = ( /turf/simulated/wall/prepainted, -/area/maintenance/bridge_port) +/area/maintenance/solar/bridge_port) "oNQ" = ( /obj/floor_decal/techfloor/orange, /obj/floor_decal/techfloor{ @@ -96146,7 +96570,7 @@ id = "Cell 3" }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "oPF" = ( /obj/machinery/alarm{ pixel_y = 24 @@ -96294,6 +96718,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark/monotile, /area/medical/morgue/autopsy) "oQJ" = ( @@ -96366,6 +96791,18 @@ /obj/floor_decal/industrial/danger{ dir = 1 }, +/obj/structure/sign/directions/security{ + pixel_y = -24; + dir = 1 + }, +/obj/structure/sign/directions/infirmary{ + pixel_y = -31; + dir = 1 + }, +/obj/structure/sign/directions/science{ + pixel_y = -38; + dir = 1 + }, /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/aft_stairwell) "oRw" = ( @@ -96537,7 +96974,7 @@ /area/bridge/adjutants/cobed) "oTt" = ( /obj/structure/ladder, -/obj/structure/catwalk, +/obj/structure/lattice, /turf/simulated/open, /area/maintenance/thirddeck/foreport) "oTB" = ( @@ -96684,6 +97121,10 @@ }, /obj/floor_decal/borderfloor, /obj/floor_decal/corner/yellow/border, +/obj/structure/sign/directions/supply{ + dir = 1; + pixel_y = -24 + }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/thirddeck/aft_stairwell) "oUl" = ( @@ -96797,7 +97238,7 @@ icon_state = "1-4" }, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "oUS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -97123,7 +97564,7 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/fore) +/area/security/brig) "oXL" = ( /obj/structure/lattice, /obj/structure/rubble, @@ -97339,6 +97780,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark/monotile, /area/medical/staging) "oZu" = ( @@ -97458,6 +97902,9 @@ /obj/paint/dark_gunmetal, /turf/simulated/wall/r_titanium, /area/exploration_shuttle/cargo_l) +"pag" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/vacant/utility) "pah" = ( /obj/machinery/light, /obj/floor_decal/techfloor, @@ -97530,6 +97977,14 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/visible/black, +/obj/machinery/button/blast_door{ + desc = "A remote control-switch for the engine thruster blast doors."; + id_tag = "ThrusterVents"; + name = "Thruster Blast Door control"; + req_access = list("ACCESS_ENGINE_EQUIP"); + pixel_x = -24; + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/engineering/engine_room) "pbf" = ( @@ -97807,7 +98262,7 @@ pixel_x = 24 }, /turf/simulated/floor/tiled/white, -/area/security/prison) +/area/security/sierra/prison) "pdu" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -98192,7 +98647,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "pfh" = ( /obj/structure/sign/warning/compressed_gas, /turf/simulated/wall/ocp_wall{ @@ -98689,7 +99144,7 @@ }, /obj/structure/bed/chair/padded/red, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "piK" = ( /obj/floor_decal/corner/grey/diagonal, /obj/structure/bed/chair/padded/purple, @@ -98946,7 +99401,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "pkC" = ( /obj/structure/window/reinforced/polarized{ dir = 8; @@ -99365,6 +99820,11 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/structure/sign/warning/nosmoking_1{ + dir = 4; + icon_state = "nosmoking"; + pixel_x = -32 + }, /turf/simulated/floor/tiled/white/monotile, /area/medical/sleeper) "pnD" = ( @@ -100422,7 +100882,7 @@ /obj/floor_decal/borderfloor/full, /obj/floor_decal/industrial/hatch/orange, /turf/simulated/floor/tiled/techfloor, -/area/security/brig) +/area/security/sierra/brig) "pva" = ( /obj/floor_decal/borderfloor{ dir = 1 @@ -101199,7 +101659,7 @@ dir = 5 }, /turf/simulated/floor/wood/walnut, -/area/security/prison) +/area/security/sierra/prison) "pCc" = ( /obj/floor_decal/techfloor/corner{ dir = 8 @@ -101229,7 +101689,7 @@ /obj/floor_decal/industrial/warning/full, /obj/machinery/embedded_controller/radio/airlock/access_controller{ id_tag = "auxair"; - name = "First Deck Port Nacelle Access"; + name = "Auxiliary Air Storage Exterior Access Console"; req_access = list("ACCESS_ENGINEERING"); dir = 8; pixel_x = 24 @@ -101409,7 +101869,7 @@ id_tag = "prison_lobby_window" }, /turf/simulated/floor/plating, -/area/security/brig) +/area/security/sierra/brig) "pDN" = ( /obj/structure/closet/wardrobe/medic_sierra, /obj/item/device/synthesized_instrument/violin, @@ -101465,7 +101925,7 @@ }, /obj/structure/bed/chair/padded/red, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "pEp" = ( /obj/floor_decal/industrial/warning{ dir = 5 @@ -101576,7 +102036,7 @@ pixel_x = 24 }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "pFu" = ( /obj/structure/closet/l3closet/scientist, /obj/structure/catwalk, @@ -102025,7 +102485,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/fore) +/area/security/brig) "pIW" = ( /obj/structure/cable/cyan{ d1 = 4; @@ -102100,9 +102560,9 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" }, /turf/simulated/floor/tiled/dark/monotile, /area/medical/sleeper) @@ -102111,6 +102571,9 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/command{ + name = "Briefing Room" + }, /turf/simulated/floor/tiled/dark/monotile, /area/bridge/marine_room) "pJG" = ( @@ -102336,6 +102799,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark/monotile, /area/medical/sleeper) "pLq" = ( @@ -102456,6 +102920,10 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/techfloor, /area/medical/backstorage) "pLR" = ( @@ -102637,7 +103105,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/security/brig) +/area/security/sierra/brig) "pNV" = ( /obj/structure/railing/mapped{ dir = 1 @@ -102901,6 +103369,10 @@ }, /obj/structure/railing/mapped, /obj/random/closet, +/obj/structure/sign/warning/pods/east{ + dir = 8; + pixel_x = 32 + }, /turf/simulated/floor/plating, /area/maintenance/firstdeck/centralport) "pQs" = ( @@ -103022,8 +103494,16 @@ /obj/machinery/light/spot{ dir = 4 }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -24 + }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/prison) "pRi" = ( /turf/simulated/wall/prepainted, /area/hydroponics) @@ -103327,6 +103807,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/hallway/infirmary) "pUh" = ( @@ -103634,7 +104117,7 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, -/area/security/brig) +/area/security/sierra/brig) "pWo" = ( /obj/floor_decal/techfloor{ dir = 4 @@ -103734,7 +104217,7 @@ id_tag = "prison_lobby_window" }, /turf/simulated/floor/plating, -/area/security/brig) +/area/security/sierra/brig) "pXI" = ( /obj/fluid_mapped, /obj/item/bananapeel, @@ -103903,7 +104386,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "pYM" = ( /obj/shuttle_landmark/escape_pod/start/pod7, /obj/wallframe_spawn/reinforced/titanium, @@ -104437,7 +104920,7 @@ "qcm" = ( /obj/machinery/embedded_controller/radio/airlock/access_controller{ id_tag = "auxair"; - name = "First Deck Port Nacelle Access"; + name = "Auxiliary Air Storage Exterior Access Console"; req_access = list("ACCESS_ENGINEERING"); pixel_y = 24 }, @@ -104670,7 +105153,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/techfloor, -/area/security/brig) +/area/security/sierra/brig) "qek" = ( /obj/floor_decal/borderfloorblack{ dir = 1 @@ -105007,7 +105490,7 @@ /area/security/opscheck) "qgs" = ( /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "qgy" = ( /obj/machinery/light, /obj/floor_decal/industrial/warning, @@ -105044,6 +105527,7 @@ "qgW" = ( /obj/machinery/hologram/holopad, /obj/floor_decal/industrial/outline/yellow, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white/monotile, /area/hallway/infirmary) "qhg" = ( @@ -105273,6 +105757,14 @@ /turf/simulated/floor/plating, /area/security/sierra/hallway/aft) "qiK" = ( +/obj/structure/sign/directions/bridge{ + pixel_y = 24; + dir = 8 + }, +/obj/structure/sign/directions/science{ + dir = 8; + pixel_y = 31 + }, /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/central_stairwell) "qiT" = ( @@ -105345,6 +105837,7 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/machinery/light/spot, /turf/simulated/floor/wood/walnut, /area/crew_quarters/heads/captain/beach) "qjC" = ( @@ -105461,18 +105954,13 @@ /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) "qkx" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/firstdeck/forestarboard) "qkA" = ( @@ -105589,7 +106077,7 @@ dir = 9 }, /turf/simulated/floor/tiled/dark, -/area/security/prison) +/area/security/sierra/prison) "qms" = ( /obj/structure/cable{ d1 = 4; @@ -106233,7 +106721,6 @@ /turf/simulated/floor/plating, /area/crew_quarters/dungeon_master_lounge) "qse" = ( -/obj/machinery/vending/boozeomat, /obj/machinery/light/led/small{ dir = 1 }, @@ -106252,6 +106739,10 @@ /obj/floor_decal/spline/fancy/black{ dir = 9 }, +/obj/structure/table/steel_reinforced, +/obj/machinery/chemical_dispenser/bar_soft/full{ + pixel_y = 8 + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "qsg" = ( @@ -106795,7 +107286,7 @@ dir = 4 }, /turf/simulated/floor/wood/walnut, -/area/security/prison) +/area/security/sierra/prison) "qwA" = ( /obj/floor_decal/industrial/warning/corner{ dir = 4 @@ -107239,6 +107730,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark/monotile, /area/medical/office) "qAW" = ( @@ -107277,7 +107772,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/fore) +/area/security/brig) "qBa" = ( /obj/floor_decal/borderfloorblack, /obj/floor_decal/corner/darkblue/border, @@ -107691,9 +108186,7 @@ /turf/space, /area/space) "qEm" = ( -/obj/machinery/door/airlock/hatch/maintenance{ - dir = 4 - }, +/obj/machinery/door/airlock/glass/maintenance, /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/firedoor{ dir = 4 @@ -108853,11 +109346,11 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, /turf/simulated/floor/wood/walnut, /area/crew_quarters/bar/cobed) @@ -109032,20 +109525,19 @@ /turf/simulated/floor/tiled/steel_grid, /area/security/sierra/hallway/aft) "qOC" = ( -/obj/structure/table/steel_reinforced, +/obj/machinery/vending/boozeomat, /obj/machinery/light/led/small{ dir = 1 }, -/obj/machinery/chemical_dispenser/bar_soft/full{ - pixel_y = 8; - dir = 8 - }, /obj/floor_decal/corner/red/border{ dir = 5 }, /obj/floor_decal/spline/fancy/black{ dir = 5 }, +/obj/machinery/firealarm{ + pixel_y = 24 + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "qOG" = ( @@ -109164,7 +109656,7 @@ /area/crew_quarters/sleep/cryo/south) "qPx" = ( /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/fore) +/area/security/brig) "qPz" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8 @@ -109273,7 +109765,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/medical{ - name = "Staging" + name = "Hospital Back Room" }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/dark/monotile, @@ -109300,7 +109792,7 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/fore) +/area/security/brig) "qQL" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -109782,7 +110274,8 @@ /obj/floor_decal/corner/green/mono, /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/airlock/multi_tile/virology{ - locked = 1 + locked = 1; + id_tag = "virology_access_outer" }, /obj/item/taperoll/engineering/applied, /obj/structure/cable/green{ @@ -109827,7 +110320,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/steel_ridged, -/area/maintenance/bridge_port) +/area/maintenance/solar/bridge_port) "qVc" = ( /obj/floor_decal/industrial/warning{ dir = 4 @@ -109913,10 +110406,13 @@ dir = 10 }, /obj/machinery/light/led/small, -/obj/machinery/jukebox/custom_tape/old, /obj/floor_decal/spline/fancy/black{ dir = 10 }, +/obj/structure/closet/shipping_wall/filled{ + pixel_x = -32 + }, +/obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "qVG" = ( @@ -110010,6 +110506,14 @@ /turf/simulated/floor/tiled/steel_grid, /area/security/sierra/hallway/port) "qWk" = ( +/obj/structure/sign/directions/security{ + pixel_y = -24; + dir = 4 + }, +/obj/structure/sign/directions/infirmary{ + pixel_y = -31; + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/central_stairwell) "qWn" = ( @@ -110174,6 +110678,10 @@ "qXB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -24 + }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/head/deck3) "qXM" = ( @@ -110392,7 +110900,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood/walnut, -/area/security/prison) +/area/security/sierra/prison) "qZg" = ( /obj/floor_decal/borderfloorblack/corner{ dir = 1 @@ -110627,7 +111135,7 @@ pixel_y = 24 }, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "rav" = ( /obj/structure/cable/green{ d1 = 4; @@ -110755,20 +111263,21 @@ /turf/simulated/wall/r_titanium, /area/shuttle/escape_pod/escape_pod2/station) "rbz" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/door/window/brigdoor/southright{ + autoset_access = 0; + dir = 8; + name = "Test Chamber"; + req_access = list("ACCESS_TOXINS") }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/floor_decal/industrial/warning/fulltile, +/obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/forestarboard) +/turf/simulated/floor/reinforced, +/area/rnd/containment) "rbD" = ( /obj/structure/railing/mapped{ dir = 1 @@ -111968,7 +112477,7 @@ }, /obj/structure/catwalk, /turf/simulated/floor/plating, -/area/maintenance/bridge_port) +/area/maintenance/solar/bridge_port) "rkp" = ( /turf/simulated/wall/r_wall/prepainted, /area/quartermaster/storage) @@ -112314,6 +112823,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, /turf/simulated/floor/tiled/dark/monotile, /area/medical/staging) "roq" = ( @@ -112572,6 +113084,10 @@ /obj/floor_decal/corner/yellow/bordercorner2{ dir = 4 }, +/obj/structure/sign/directions/supply{ + dir = 8; + pixel_y = 24 + }, /turf/simulated/floor/tiled, /area/hallway/primary/fourthdeck/aft_stairwell) "rqr" = ( @@ -112644,7 +113160,7 @@ dir = 8 }, /turf/simulated/floor/tiled/freezer, -/area/security/prison) +/area/security/sierra/prison) "rrc" = ( /obj/floor_decal/corner/lime/border{ dir = 4 @@ -113863,16 +114379,11 @@ /turf/simulated/floor/plating, /area/hallway/primary/seconddeck/center) "rAi" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/structure/railing/mapped, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/firstdeck/forestarboard) +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "rAj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -113965,7 +114476,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "rAR" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -113981,7 +114492,9 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass/medical, +/obj/machinery/door/airlock/glass/medical{ + name = "Hospital" + }, /turf/simulated/floor/tiled/dark/monotile, /area/medical/wardhallway) "rAX" = ( @@ -114027,15 +114540,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/quartermaster/storage) -"rBp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/forestarboard) "rBx" = ( /obj/floor_decal/industrial/outline/yellow, /obj/machinery/field_generator, @@ -114094,7 +114598,7 @@ /obj/item/paper_bin, /obj/item/pen, /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/fore) +/area/security/brig) "rBO" = ( /obj/floor_decal/borderfloor{ dir = 1 @@ -114953,6 +115457,16 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/aft) +"rJu" = ( +/obj/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/structure/sign/warning/nosmoking_1{ + desc = "A warning sign which reads 'NO SMOKING'. Someone has scratched a variety of crude words in gutter across the entire sign."; + pixel_y = 32 + }, +/turf/simulated/floor/tiled/dark/monotile, +/area/medical/staging) "rJx" = ( /obj/floor_decal/industrial/hatch/yellow, /obj/structure/cable{ @@ -115353,7 +115867,7 @@ /obj/structure/railing/mapped{ dir = 8 }, -/obj/structure/catwalk, +/obj/structure/lattice, /turf/simulated/open, /area/maintenance/firstdeck/aftport) "rMB" = ( @@ -115384,7 +115898,7 @@ }, /obj/structure/catwalk, /turf/simulated/floor/plating, -/area/maintenance/bridge_port) +/area/maintenance/solar/bridge_port) "rMW" = ( /obj/structure/cable{ d1 = 4; @@ -115633,7 +116147,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/fore) +/area/security/brig) "rOG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -115655,6 +116169,11 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) +"rOW" = ( +/obj/structure/railing/mapped, +/obj/structure/bed/sofa/m/blue, +/turf/simulated/floor/plating, +/area/maintenance/bridgedeck/starboard) "rOZ" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -115685,19 +116204,8 @@ /turf/simulated/wall/prepainted, /area/maintenance/solar/bridge_starboard) "rPn" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/floor_decal/industrial/hatch/yellow, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/firstdeck/forestarboard) "rPq" = ( @@ -115933,6 +116441,10 @@ d2 = 8; icon_state = "0-8" }, +/obj/structure/sign/directions/engineering{ + dir = 1; + pixel_y = 24 + }, /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/central_stairwell) "rRl" = ( @@ -116004,7 +116516,7 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/security/prison) +/area/security/sierra/prison) "rRL" = ( /obj/floor_decal/borderfloor{ dir = 1 @@ -116353,13 +116865,18 @@ /area/chapel/mortuary) "rUv" = ( /obj/floor_decal/industrial/hatch/yellow, -/obj/machinery/door/airlock/glass/medical, +/obj/machinery/door/airlock/glass/medical{ + name = "Medical Restroom" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark/monotile, /area/medical/office) "rUB" = ( @@ -116512,7 +117029,8 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/multi_tile/glass/engineering{ - dir = 8 + dir = 8; + name = "Engineer Bay" }, /obj/machinery/door/firedoor{ dir = 4 @@ -117741,7 +118259,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/fore) +/area/security/brig) "seA" = ( /obj/floor_decal/techfloor{ dir = 4 @@ -118169,11 +118687,6 @@ /obj/floor_decal/corner/red/border{ dir = 4 }, -/obj/structure/table/steel_reinforced, -/obj/machinery/chemical_dispenser/bar_alc/full{ - pixel_y = 8; - dir = 8 - }, /obj/floor_decal/spline/fancy/black{ dir = 4 }, @@ -118221,8 +118734,22 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/research) +"shX" = ( +/obj/structure/sign/directions/engineering{ + pixel_x = -32; + pixel_y = -1 + }, +/obj/structure/sign/directions/supply{ + pixel_y = -8; + pixel_x = -32 + }, +/turf/simulated/open, +/area/hallway/primary/seconddeck/aft_stairwell) "shZ" = ( -/obj/machinery/door/airlock/external/bolted/cycling, +/obj/machinery/door/airlock/external/bolted/cycling{ + name = "Xenobotany Lab Access"; + id_tag = "xenobotany_access_inner" + }, /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -118349,7 +118876,9 @@ /area/shuttle/petrov/test_room) "sju" = ( /obj/floor_decal/industrial/hatch/yellow, -/obj/machinery/door/airlock/civilian, +/obj/machinery/door/airlock/civilian{ + name = "Restroom" + }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/head/deck3) @@ -118966,8 +119495,7 @@ "soN" = ( /obj/structure/catwalk, /obj/floor_decal/industrial/warning/cee{ - dir = 1; - icon_state = "warningcee" + dir = 1 }, /obj/machinery/atmospherics/unary/vent_pump/high_volume/airlock{ dir = 4; @@ -119112,7 +119640,7 @@ pixel_y = -27 }, /turf/simulated/floor/wood/walnut, -/area/security/prison) +/area/security/sierra/prison) "spV" = ( /obj/floor_decal/industrial/loading, /obj/machinery/door/firedoor, @@ -119360,7 +119888,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "srL" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 @@ -119923,7 +120451,7 @@ "swy" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "swA" = ( /obj/machinery/door/firedoor, /obj/floor_decal/corner/paleblue/mono, @@ -120154,7 +120682,7 @@ dir = 9 }, /turf/simulated/floor/wood/walnut, -/area/security/prison) +/area/security/sierra/prison) "syd" = ( /obj/floor_decal/steeldecal/steel_decals6{ dir = 10 @@ -120854,7 +121382,7 @@ id_tag = "prison_lobby_window" }, /turf/simulated/floor/plating, -/area/security/brig) +/area/security/sierra/brig) "sDn" = ( /obj/floor_decal/corner/purple/border{ dir = 8 @@ -120963,11 +121491,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/glass/science{ - name = "Expedition Prep"; - req_access = newlist() - }, /obj/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/airlock/glass/mining{ + name = "Cargo Prep" + }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/suplocker_room) "sDI" = ( @@ -121054,6 +121581,12 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/newscaster{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/head/deck3) "sEj" = ( @@ -121231,7 +121764,7 @@ /obj/structure/table/marble, /obj/item/book/manual/chef_recipes, /turf/simulated/floor/tiled/white, -/area/security/prison) +/area/security/sierra/prison) "sFg" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -121261,7 +121794,7 @@ id = "Cell 2" }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "sFz" = ( /obj/floor_decal/industrial/danger{ dir = 5 @@ -121449,7 +121982,7 @@ }, /obj/item/storage/box/detergent, /turf/simulated/floor/tiled/freezer, -/area/security/prison) +/area/security/sierra/prison) "sGZ" = ( /obj/floor_decal/techfloor/orange{ dir = 8 @@ -121597,7 +122130,7 @@ dir = 8 }, /turf/simulated/floor/tiled/freezer, -/area/security/prison) +/area/security/sierra/prison) "sIh" = ( /obj/wallframe_spawn/reinforced, /obj/machinery/door/firedoor, @@ -121738,7 +122271,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "sID" = ( /obj/structure/bed/sofa/m/teal{ dir = 6 @@ -121994,6 +122527,10 @@ /obj/machinery/door/firedoor{ dir = 4 }, +/obj/machinery/holosign/surgery{ + dir = 4; + id_tag = "sierra_surgery2" + }, /turf/simulated/floor/tiled/dark/monotile, /area/medical/surgery/second) "sKJ" = ( @@ -122139,6 +122676,10 @@ /obj/item/pizzabox/vegetable{ pixel_y = 12 }, +/obj/structure/sign/warning/smoking{ + dir = 8; + pixel_x = 33 + }, /turf/simulated/floor/tiled/white/monotile, /area/medical/office) "sLI" = ( @@ -122227,7 +122768,7 @@ icon_state = "1-4" }, /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/fore) +/area/security/brig) "sMj" = ( /obj/floor_decal/corner/black/full, /obj/machinery/firealarm{ @@ -122707,16 +123248,17 @@ }, /obj/machinery/light/led/small, /obj/structure/table/steel_reinforced, -/obj/machinery/chemical_dispenser/bar_coffee/full{ - pixel_y = 8; - dir = 8 - }, /obj/floor_decal/corner/red/border{ dir = 6 }, /obj/floor_decal/spline/fancy/black{ dir = 6 }, +/obj/machinery/reagent_temperature, +/obj/item/storage/bar_fruit_jar{ + pixel_x = 4; + pixel_y = 12 + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "sPT" = ( @@ -123030,17 +123572,15 @@ dir = 1 }, /obj/structure/table/steel_reinforced, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/floor_decal/spline/fancy/black{ + dir = 1 }, -/obj/machinery/reagentgrinder/juicer{ +/obj/machinery/chemical_dispenser/bar_coffee/full{ pixel_y = 8 }, -/obj/item/reagent_containers/glass/beaker/large{ - pixel_y = 6 - }, -/obj/floor_decal/spline/fancy/black{ - dir = 1 +/obj/machinery/alarm{ + pixel_y = 24 }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) @@ -123935,6 +124475,10 @@ d2 = 8; icon_state = "2-8" }, +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" + }, /turf/simulated/floor/tiled/dark/monotile, /area/medical/sleeper) "sZd" = ( @@ -123982,6 +124526,10 @@ "sZq" = ( /obj/machinery/vending/snack, /obj/floor_decal/industrial/outline/yellow, +/obj/structure/sign/warning/smoking{ + dir = 8; + pixel_x = 33 + }, /turf/simulated/floor/tiled/white/monotile, /area/medical/office) "sZs" = ( @@ -123995,7 +124543,10 @@ "sZx" = ( /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/external/bolted/cycling, +/obj/machinery/door/airlock/external/bolted/cycling{ + name = "Xenobotany Lab Access"; + id_tag = "xenobotany_access_outer" + }, /obj/machinery/door/blast/regular/open{ dir = 4; id_tag = "Biohazard"; @@ -124519,6 +125070,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/hallway/infirmary) "tee" = ( @@ -124612,7 +125164,8 @@ }, /obj/machinery/door/airlock/multi_tile/medical{ dir = 8; - door_color = "#4c535b" + door_color = "#4c535b"; + name = "Morgue" }, /turf/simulated/floor/tiled/dark/monotile, /area/medical/morgue/autopsy) @@ -125193,6 +125746,9 @@ /obj/structure/railing/mapped{ dir = 8 }, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/firstdeck/aftport) "tli" = ( @@ -125725,7 +126281,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/fore) +/area/security/brig) "tpf" = ( /obj/machinery/atmospherics/pipe/manifold/visible, /obj/floor_decal/techfloor{ @@ -125806,7 +126362,9 @@ /turf/simulated/floor/plating, /area/hallway/primary/seconddeck/center) "tpL" = ( -/turf/simulated/floor/wood/bamboo, +/turf/simulated/floor/wood/bamboo{ + name = "stairs" + }, /area/crew_quarters/garden_room) "tqd" = ( /obj/structure/disposalpipe/segment{ @@ -126623,6 +127181,9 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/medical/backstorage) "twZ" = ( +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/head/deck3) "txb" = ( @@ -126716,7 +127277,7 @@ req_access = list("ACCESS_SECURITY") }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "txv" = ( /obj/structure/hygiene/sink{ dir = 1; @@ -127581,7 +128142,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass/medical, +/obj/machinery/door/airlock/glass/medical{ + name = "Hospital" + }, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -127998,6 +128561,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/junction, /turf/simulated/floor/tiled/white, /area/hallway/infirmary) "tHE" = ( @@ -128218,6 +128782,12 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/wood/walnut, /area/crew_quarters/bar/cobed) "tIz" = ( @@ -128529,6 +129099,16 @@ "tMb" = ( /turf/simulated/wall/r_wall/prepainted, /area/medical/sleeper) +"tMe" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/maintenance/firstdeck/forestarboard) "tMh" = ( /turf/simulated/floor/reinforced, /area/shuttle/petrov/cell2) @@ -128583,7 +129163,7 @@ }, /obj/item/reagent_containers/glass/beaker/insulated, /turf/simulated/floor/tiled/white, -/area/security/prison) +/area/security/sierra/prison) "tMH" = ( /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/firedoor, @@ -129112,8 +129692,7 @@ /area/engineering/auxpower) "tQG" = ( /obj/floor_decal/industrial/warning/cee{ - dir = 1; - icon_state = "warningcee" + dir = 1 }, /obj/machinery/atmospherics/unary/vent_pump/high_volume/airlock{ dir = 4; @@ -129708,7 +130287,7 @@ /obj/machinery/embedded_controller/radio/airlock/access_controller{ dir = 1; id_tag = "auxair"; - name = "First Deck Port Nacelle Access"; + name = "Auxiliary Air Storage Exterior Access Console"; pixel_y = -20; req_access = list("ACCESS_ENGINEERING") }, @@ -130262,7 +130841,7 @@ name = "Security Department Lockdown" }, /turf/simulated/floor/plating, -/area/security/brig) +/area/security/prison) "tZj" = ( /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/firedoor, @@ -130529,15 +131108,9 @@ }, /area/space) "ubj" = ( -/obj/structure/catwalk, /obj/structure/table/steel{ flipped = 1 }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, @@ -130876,7 +131449,7 @@ "udP" = ( /obj/paint_stripe/red, /turf/simulated/wall/r_wall/prepainted, -/area/security/prison) +/area/security/sierra/prison) "udR" = ( /obj/machinery/light/small{ dir = 4 @@ -131213,7 +131786,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "uiv" = ( /obj/structure/closet/l3closet/security, /obj/machinery/power/apc{ @@ -131232,8 +131805,8 @@ /area/security/sierra/suits) "uiA" = ( /obj/machinery/conveyor{ - dir = 1; - id = "packageSort1" + id = "packageSort1"; + dir = 1 }, /obj/structure/plasticflaps/airtight, /turf/simulated/floor/plating, @@ -131266,7 +131839,7 @@ /obj/structure/table/standard, /obj/machinery/light/spot, /turf/simulated/floor/wood/walnut, -/area/security/prison) +/area/security/sierra/prison) "uiJ" = ( /obj/floor_decal/steeldecal/steel_decals_central6{ dir = 8 @@ -132218,12 +132791,13 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/catwalk_plated, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/catwalk_plated, /turf/simulated/floor/plating, /area/quartermaster/hangar) "uqr" = ( @@ -132444,8 +133018,9 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ name = "Security Maintenance"; - req_access = newlist(); - dir = 4 + req_access = list("ACCESS_SEC_DOORS"); + dir = 4; + autoset_access = 0 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -132719,6 +133294,13 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, +/obj/machinery/embedded_controller/radio/airlock/access_controller{ + dir = 4; + id_tag = "toxin_lab_access"; + name = "Toxin Lab Access Console"; + req_access = list("ACCESS_TOX_STORAGE"); + pixel_x = -24 + }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/toxins) "uuA" = ( @@ -132981,7 +133563,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "uxa" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 @@ -133516,16 +134098,22 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark/monotile, /area/medical/sleeper) "uBD" = ( -/obj/floor_decal/industrial/hatch/yellow, -/obj/machinery/door/airlock/maintenance, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/bar) +/obj/machinery/door/airlock/civilian{ + id_tag = "toilet_eng_2"; + name = "Toilet" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/head/deck3) "uBE" = ( /obj/structure/cable{ d1 = 4; @@ -133892,10 +134480,14 @@ dir = 9 }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "uEl" = ( /obj/machinery/bodyscanner, /obj/floor_decal/industrial/outline/yellow, +/obj/structure/sign/warning/nosmoking_1{ + dir = 8; + pixel_x = 32 + }, /turf/simulated/floor/tiled/white/monotile, /area/medical/staging) "uEn" = ( @@ -134426,7 +135018,7 @@ /turf/simulated/floor/tiled/white, /area/shuttle/petrov/airlock) "uIu" = ( -/obj/structure/bed/chair/pew/down{ +/obj/structure/bed/sofa/r/teal{ dir = 4 }, /turf/simulated/floor/tiled/white/monotile, @@ -135341,12 +135933,10 @@ icon_state = "0-2" }, /obj/floor_decal/industrial/outline/grey, -/obj/machinery/atmospherics/portables_connector{ - dir = 8 - }, /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/portable_atmospherics/canister/hydrogen, /turf/simulated/floor/tiled/techfloor/grid, /area/quartermaster/shuttlefuel) "uPo" = ( @@ -135713,7 +136303,9 @@ /obj/floor_decal/spline/fancy/black{ dir = 1 }, -/turf/simulated/floor/wood/bamboo, +/turf/simulated/floor/wood/bamboo{ + name = "stairs" + }, /area/crew_quarters/garden_room) "uSS" = ( /obj/machinery/door/blast/regular{ @@ -136200,7 +136792,7 @@ track = 1 }, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/bridge_port) +/area/maintenance/solar/bridge_port) "uXp" = ( /turf/simulated/floor/reinforced, /area/rnd/containment) @@ -136260,7 +136852,7 @@ dir = 8 }, /turf/simulated/wall/prepainted, -/area/maintenance/bridge_port) +/area/maintenance/solar/bridge_port) "uXX" = ( /obj/structure/cable{ d1 = 1; @@ -136484,10 +137076,17 @@ /turf/simulated/wall/r_wall/prepainted, /area/hallway/primary/firstdeck/center) "uZC" = ( -/obj/wallframe_spawn/reinforced_phoron, -/obj/machinery/door/firedoor, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/catwalk_plated, +/obj/machinery/light/spot{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/rnd/containment) +/area/quartermaster/hangar) "uZH" = ( /obj/structure/table/standard, /obj/item/scalpel/basic, @@ -137293,6 +137892,19 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) +"veV" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/floor_decal/borderfloor{ + dir = 1 + }, +/obj/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/item/device/radio/intercom{ + pixel_y = 26 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/firstdeck/aft) "veY" = ( /obj/structure/cable/green{ d1 = 4; @@ -137441,7 +138053,7 @@ dir = 8 }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/prison) "vfY" = ( /obj/structure/closet/wardrobe/virology_white, /obj/floor_decal/industrial/outline/yellow, @@ -137678,9 +138290,6 @@ /obj/item/folder/white, /obj/item/folder/white, /obj/item/folder/white, -/obj/machinery/light/small{ - dir = 1 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/wood/maple, /area/crew_quarters/heads/office/cmo/cobed) @@ -138523,7 +139132,7 @@ dir = 8 }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/sierra/brig) "vog" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -138852,8 +139461,15 @@ /turf/simulated/floor/tiled/techfloor, /area/security/sierra/armory/lobby) "vqR" = ( -/obj/structure/closet/emcloset, /obj/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/binary/pump/high_power/on{ + dir = 4; + name = "CO2 Supply"; + target_pressure = 10000 + }, +/obj/structure/closet/hydrant{ + pixel_y = -28 + }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/hangar) "vrd" = ( @@ -139046,7 +139662,7 @@ }, /obj/structure/bookcase/manuals/security, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "vsB" = ( /obj/machinery/door/firedoor{ dir = 4 @@ -139499,7 +140115,7 @@ }, /obj/structure/fitness/weightlifter, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "vwa" = ( /obj/structure/ladder/up, /obj/floor_decal/industrial/hatch/yellow, @@ -139671,8 +140287,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" }, /obj/floor_decal/corner/yellow/half{ dir = 4 @@ -139736,7 +140353,7 @@ }, /obj/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/bridge_port) +/area/maintenance/solar/bridge_port) "vxZ" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ controlled = 0; @@ -139787,6 +140404,9 @@ /obj/floor_decal/corner/lime/bordercorner2{ dir = 1 }, +/obj/structure/sign/deck/fourth{ + pixel_y = 24 + }, /turf/simulated/floor/tiled, /area/hallway/primary/fourthdeck/center) "vyf" = ( @@ -139833,15 +140453,23 @@ /turf/simulated/floor/tiled/steel_ridged, /area/tcommsat/storage) "vyy" = ( -/obj/machinery/button/blast_door{ - desc = "A remote control-switch for the engine thruster blast doors."; - id_tag = "ThrusterVents"; - name = "Thruster Blast Door control"; - pixel_y = 21; - req_access = list("ACCESS_ENGINE_EQUIP") +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, -/turf/simulated/wall/r_wall/prepainted, -/area/engineering/engine_room) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/item/device/radio/intercom{ + pixel_y = 26 + }, +/obj/machinery/button/alternate/door/bolts{ + dir = 1; + id_tag = "toilet_eng_2"; + name = "Lock"; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/head/deck3) "vyz" = ( /obj/machinery/door/airlock/vault/bolted{ name = "AI Core External Access" @@ -140388,7 +141016,7 @@ }, /obj/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/monotile, -/area/security/prison) +/area/security/sierra/prison) "vDa" = ( /obj/machinery/suit_cycler/engineering, /obj/floor_decal/borderfloor{ @@ -140867,6 +141495,10 @@ /obj/machinery/atmospherics/binary/pump{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/containment) "vGn" = ( @@ -140876,6 +141508,10 @@ /turf/simulated/floor/reinforced, /area/thruster/d3starboard) "vGv" = ( +/obj/structure/sign/directions/bridge{ + pixel_y = 24; + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/central_stairwell) "vGI" = ( @@ -141055,7 +141691,7 @@ dir = 10 }, /turf/simulated/floor/tiled/white, -/area/security/prison) +/area/security/sierra/prison) "vIq" = ( /obj/structure/cable{ d1 = 1; @@ -141469,21 +142105,23 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark, /area/medical/morgue/autopsy) "vMR" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/item/reagent_containers/food/snacks/egg/lizard{ + color = "black" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/structure/table/rack, +/obj/item/bedsheet, +/obj/item/reagent_containers/food/snacks/egg/lizard, +/obj/item/reagent_containers/food/snacks/egg/lizard{ + color = "black" }, +/obj/structure/railing/mapped, /turf/simulated/floor/plating, /area/maintenance/firstdeck/forestarboard) "vMS" = ( @@ -142358,7 +142996,8 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/multi_tile/glass/engineering{ - dir = 8 + dir = 8; + name = "Hallway" }, /obj/machinery/door/firedoor{ dir = 4 @@ -142744,18 +143383,18 @@ /turf/simulated/floor/tiled/techfloor, /area/turret_protected/ai_cyborg_station) "vWo" = ( -/obj/machinery/atmospherics/pipe/zpipe/up/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/zpipe/up/supply, +/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers, /obj/structure/cable{ d1 = 16; d2 = 0; icon_state = "16-0" }, -/obj/structure/cable, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/railing/mapped, /turf/simulated/floor/reinforced, /area/maintenance/firstdeck/forestarboard) "vWr" = ( @@ -143042,6 +143681,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/holosign/surgery{ + dir = 8; + id_tag = "surgery1" + }, /turf/simulated/floor/tiled/dark/monotile, /area/medical/surgery) "vXn" = ( @@ -143108,15 +143751,19 @@ /turf/simulated/floor/bluegrid, /area/engineering/bluespace/chamber) "vXR" = ( +/obj/machinery/door/airlock/highsecurity{ + id_tag = "capt_safe_room"; + locked = 1 + }, +/obj/machinery/door/firedoor, +/obj/item/airlock_brace{ + req_access = list("ACCESS_CAPTAIN") + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/floor_decal/industrial/hatch/yellow, -/obj/machinery/door/firedoor{ - dir = 4 - }, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/substation/bridgedeck) "vXT" = ( @@ -143203,7 +143850,7 @@ "vYu" = ( /obj/structure/disposalpipe/segment, /turf/simulated/wall/r_wall/hull, -/area/security/prison) +/area/security/sierra/prison) "vYz" = ( /obj/structure/cable/green{ d1 = 4; @@ -143246,6 +143893,7 @@ d2 = 4; icon_state = "2-4" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/hallway/infirmary) "vYV" = ( @@ -143350,7 +143998,7 @@ pixel_x = 32 }, /turf/simulated/floor/tiled/freezer, -/area/security/prison) +/area/security/sierra/prison) "vZF" = ( /obj/floor_decal/industrial/warning/corner, /obj/floor_decal/industrial/warning/corner{ @@ -143601,6 +144249,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark/monotile, /area/medical/office) "wbr" = ( @@ -144081,6 +144730,9 @@ }, /obj/structure/dogbed, /mob/living/simple_animal/passive/cat/fluff/Runtime, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/carpet/blue3, /area/crew_quarters/heads/office/cmo/cobed) "wfu" = ( @@ -144331,14 +144983,14 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) "whx" = ( -/obj/structure/railing/mapped{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/structure/table/rack, -/obj/random/maintenance, -/obj/structure/railing/mapped, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/forestarboard) +/obj/machinery/media/music_writer{ + pixel_y = 60 + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "whD" = ( /obj/structure/bed/chair/padded/blue, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -144576,19 +145228,18 @@ /turf/simulated/floor/tiled/steel_grid, /area/security/sierra/forensic) "wjm" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/firstdeck/forestarboard) "wjq" = ( /obj/structure/cable/green{ @@ -144811,6 +145462,11 @@ "wlE" = ( /obj/machinery/papershredder, /obj/floor_decal/industrial/outline/yellow, +/obj/structure/sign/warning/nosmoking_1{ + dir = 4; + icon_state = "nosmoking"; + pixel_x = -32 + }, /turf/simulated/floor/tiled/white/monotile, /area/medical/infirmreception) "wlJ" = ( @@ -145401,16 +146057,6 @@ }, /turf/simulated/floor/grass, /area/crew_quarters/garden_room) -"wqA" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/thirddeck/starboard) "wqC" = ( /obj/item/device/flashlight/lamp/floodlamp/green, /obj/item/device/flashlight/lamp/floodlamp/green, @@ -145617,7 +146263,7 @@ }, /obj/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/dark/monotile, -/area/security/prison) +/area/security/sierra/prison) "wsS" = ( /obj/floor_decal/borderfloor{ dir = 1 @@ -145758,6 +146404,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/hallway/infirmary) "wtU" = ( @@ -145853,6 +146500,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/machinery/light/small, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/office/ce/cobed) "wuG" = ( @@ -146062,7 +146710,7 @@ icon_state = "1-8" }, /turf/simulated/floor/tiled/white, -/area/security/prison) +/area/security/sierra/prison) "wvT" = ( /obj/floor_decal/borderfloor{ dir = 5 @@ -146131,7 +146779,7 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/security/prison) +/area/security/sierra/prison) "wwr" = ( /obj/structure/bed, /obj/structure/cable/cyan{ @@ -146221,7 +146869,8 @@ /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/airlock/multi_tile/glass/engineering{ req_access = newlist(); - dir = 8 + dir = 8; + name = "Engineering EVA Storage" }, /obj/machinery/door/firedoor{ dir = 4 @@ -146290,7 +146939,7 @@ icon_state = "2-8" }, /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/fore) +/area/security/brig) "wyb" = ( /obj/floor_decal/spline/fancy/black{ dir = 6 @@ -146622,6 +147271,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark/monotile, /area/medical/staging) "wBb" = ( @@ -146929,7 +147581,9 @@ /obj/floor_decal/stairs{ dir = 4 }, -/turf/simulated/floor/wood/bamboo, +/turf/simulated/floor/wood/bamboo{ + name = "stairs" + }, /area/crew_quarters/garden_room) "wEy" = ( /obj/floor_decal/borderfloorblack{ @@ -146966,7 +147620,7 @@ }, /obj/machinery/button/alternate/door/bolts{ id_tag = "selfddoor"; - name = "Self Destruct Airlock Bolt Control"; + name = "Delta Code Airlock Bolt Control"; pixel_y = -32; req_access = list("ACCESS_VAULT") }, @@ -147228,8 +147882,8 @@ /obj/floor_decal/corner/paleblue/bordercorner2{ dir = 1 }, -/obj/item/device/radio/intercom{ - pixel_y = 26 +/obj/structure/sign/chemistry{ + pixel_y = 24 }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/aft) @@ -147381,7 +148035,7 @@ pixel_x = 11 }, /obj/item/storage/mirror{ - pixel_x = 40; + pixel_x = 24; pixel_y = 1 }, /obj/structure/handrail{ @@ -147819,6 +148473,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/machinery/alarm{ + pixel_y = 24 + }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/thirddeck) "wOe" = ( @@ -147893,7 +148550,7 @@ /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel_ridged, -/area/security/brig) +/area/security/sierra/brig) "wOz" = ( /obj/structure/cable/green, /obj/machinery/door/blast/regular/open{ @@ -148517,7 +149174,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, -/area/security/prison) +/area/security/sierra/prison) "wUp" = ( /obj/machinery/recharge_station, /obj/floor_decal/industrial/outline/yellow, @@ -148783,6 +149440,20 @@ /obj/random/storage, /turf/simulated/floor/plating, /area/maintenance/thirddeck/foreport) +"wWp" = ( +/obj/floor_decal/borderfloor{ + dir = 8 + }, +/obj/floor_decal/corner/lime/border{ + dir = 8 + }, +/obj/structure/sign/directions/janitor{ + dir = 1; + pixel_x = -32; + pixel_y = -10 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/seconddeck/center) "wWr" = ( /obj/floor_decal/borderfloor, /obj/floor_decal/corner/green/border, @@ -149174,6 +149845,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/hallway/infirmary) "wZI" = ( @@ -149362,6 +150036,7 @@ response_harm = "kicks"; response_help = "pets" }, +/obj/machinery/light/small, /turf/simulated/floor/carpet/purple, /area/crew_quarters/heads/office/rd/cobed) "xbp" = ( @@ -149680,7 +150355,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "xdi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -149899,7 +150574,7 @@ /area/maintenance/thirddeck/port) "xfi" = ( /turf/simulated/wall/r_wall/prepainted, -/area/security/prison) +/area/security/sierra/prison) "xft" = ( /obj/floor_decal/borderfloor/corner{ dir = 8 @@ -150202,7 +150877,7 @@ /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/airlock/hatch/maintenance, /turf/simulated/floor/tiled/techfloor/grid, -/area/hallway/primary/firstdeck/fore) +/area/maintenance/firstdeck/forestarboard) "xhU" = ( /obj/structure/cable/green{ d1 = 2; @@ -150600,7 +151275,7 @@ dir = 8 }, /turf/simulated/wall/prepainted, -/area/maintenance/bridge_port) +/area/maintenance/solar/bridge_port) "xkv" = ( /obj/structure/cable/cyan{ d1 = 4; @@ -150719,7 +151394,7 @@ /area/maintenance/fourthdeck/forestarboard) "xls" = ( /obj/structure/ladder, -/obj/structure/catwalk, +/obj/structure/lattice, /turf/simulated/open, /area/maintenance/firstdeck/centralport) "xlz" = ( @@ -151347,7 +152022,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/freezer, -/area/security/prison) +/area/security/sierra/prison) "xrm" = ( /obj/structure/dogbed, /mob/living/simple_animal/friendly/koala/samorey, @@ -151567,7 +152242,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/fore) +/area/security/brig) "xsC" = ( /obj/machinery/alarm{ dir = 4; @@ -151749,6 +152424,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/holosign/surgery{ + dir = 8; + id_tag = "sierra_surgery2" + }, /turf/simulated/floor/tiled/dark/monotile, /area/medical/surgery/second) "xuf" = ( @@ -151779,6 +152458,11 @@ dir = 1 }, /obj/floor_decal/industrial/outline/yellow, +/obj/structure/sign/warning/nosmoking_1{ + dir = 4; + icon_state = "nosmoking"; + pixel_x = -32 + }, /turf/simulated/floor/tiled/white/monotile, /area/medical/sleeper) "xuz" = ( @@ -151848,7 +152532,7 @@ }, /obj/structure/hygiene/drain, /turf/simulated/floor/tiled/freezer, -/area/security/prison) +/area/security/sierra/prison) "xvB" = ( /obj/machinery/light/spot{ dir = 1 @@ -152237,7 +152921,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/engineering/engineering_monitoring) "xyq" = ( -/obj/structure/table/steel_reinforced, +/obj/structure/wall_frame/standard, /obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ density = 0; @@ -152254,13 +152938,17 @@ }, /obj/machinery/door/window/southleft{ dir = 4; - name = "Security Checkpoint" + name = "Security Checkpoint"; + autoset_access = 0 }, /obj/machinery/door/window/brigdoor/northleft{ dir = 8; name = "Security Checkpoint" }, /obj/machinery/door/firedoor, +/obj/structure/table/wallf{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/security/opscheck) "xyt" = ( @@ -152546,7 +153234,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/security/prison) +/area/security/sierra/prison) "xBh" = ( /obj/floor_decal/techfloor{ dir = 4 @@ -152932,6 +153620,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/hallway/infirmary) "xEd" = ( @@ -153052,6 +153743,17 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/actor/stage) +"xEM" = ( +/obj/structure/sign/directions/supply{ + dir = 8; + pixel_y = -31 + }, +/obj/structure/sign/directions/engineering{ + dir = 8; + pixel_y = -24 + }, +/turf/simulated/open, +/area/hallway/primary/firstdeck/central_stairwell) "xEQ" = ( /obj/floor_decal/borderfloorblack, /obj/floor_decal/corner/purple/border, @@ -153556,7 +154258,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/steel_grid, -/area/security/brig) +/area/security/prison) "xIV" = ( /obj/machinery/door/firedoor, /obj/structure/cable/green{ @@ -153887,6 +154589,12 @@ }, /turf/simulated/floor/plating, /area/hallway/primary/firstdeck/center) +"xLy" = ( +/obj/structure/sign/warning/pods/south{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/firstdeck/aftport) "xLz" = ( /obj/floor_decal/industrial/outline/grey, /obj/machinery/suit_storage_unit, @@ -154115,15 +154823,27 @@ /turf/simulated/wall/r_wall/hull, /area/space) "xNg" = ( -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24 - }, /obj/machinery/hologram/holopad, /obj/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 8; + pixel_y = -24 + }, +/obj/machinery/button/holosign{ + dir = 1; + id_tag = "surgery1"; + pixel_y = -24 + }, +/obj/machinery/button/windowtint{ + dir = 1; + id = "sierra_surgery1"; + pixel_x = -8; + pixel_y = -24 + }, /turf/simulated/floor/tiled/dark/monotile, /area/medical/surgery) "xNk" = ( @@ -154789,7 +155509,7 @@ }, /obj/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/bridge_port) +/area/maintenance/solar/bridge_port) "xSo" = ( /obj/floor_decal/borderfloorblack{ dir = 10 @@ -155691,7 +156411,7 @@ dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/security/prison) +/area/security/sierra/prison) "xZC" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -155818,7 +156538,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/wallframe_spawn/no_grille, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, @@ -155826,12 +156545,11 @@ dir = 4; id_tag = "lockdown3_3" }, +/obj/wallframe_spawn/no_grille, /turf/simulated/floor/plating, /area/hallway/primary/fourthdeck/center) "yas" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small, /obj/structure/closet/cabinet, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -155977,6 +156695,10 @@ dir = 4; pixel_x = -22 }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -24 + }, /turf/simulated/floor/tiled/white/monotile, /area/medical/surgery/second) "ybR" = ( @@ -156078,9 +156800,6 @@ /turf/simulated/floor/tiled, /area/crew_quarters/dungeon_master_lounge) "ycs" = ( -/obj/machinery/alarm{ - pixel_y = 24 - }, /obj/floor_decal/borderfloor{ dir = 1 }, @@ -156102,6 +156821,9 @@ /obj/floor_decal/corner/lime/bordercorner2{ dir = 1 }, +/obj/structure/sign/deck/second{ + pixel_y = 24 + }, /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/center) "ycv" = ( @@ -156336,7 +157058,7 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel_ridged, -/area/security/brig) +/area/security/sierra/brig) "ydX" = ( /obj/floor_decal/spline/fancy/wood{ dir = 10 @@ -156714,6 +157436,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark/monotile, /area/medical/sleeper) "ygt" = ( @@ -156773,9 +157496,6 @@ /obj/structure/bed/chair/padded/blue{ dir = 4 }, -/obj/item/modular_computer/telescreen/preset/medical{ - pixel_y = 32 - }, /obj/machinery/rotating_alarm/security_alarm{ pixel_y = 13 }, @@ -156785,6 +157505,9 @@ /obj/floor_decal/techfloor/orange/corner{ dir = 4 }, +/obj/structure/sign/warning/pods/south{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/safe_room) "ygP" = ( @@ -157224,8 +157947,10 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/head) "ylw" = ( -/turf/simulated/wall/r_wall/hull, -/area/maintenance/bridge_port) +/obj/structure/catwalk, +/obj/structure/rubble, +/turf/simulated/floor/plating, +/area/maintenance/firstdeck/forestarboard) "ylx" = ( /obj/structure/closet/emcloset, /obj/item/clothing/head/kitty/fake, @@ -172128,7 +172853,7 @@ hWB pmO jJh oPv -ivW +iOE iVN pYx sJI @@ -177179,7 +177904,7 @@ eLV lJv kyB lMB -ckl +qzf rqp sHs gxk @@ -177567,7 +178292,7 @@ kFJ rdv rdv rdv -fKB +rdv rdv rdv pCR @@ -178171,8 +178896,8 @@ soQ nvR aNt pmj -sEG xDs +sEG rlJ rLn rZt @@ -181004,7 +181729,7 @@ vAP vAP vAP vAP -okp +vAP vAP vAP vAP @@ -181207,7 +181932,7 @@ dRi rdv rdv ayY -rdv +uZC rdv rdv alN @@ -181639,9 +182364,9 @@ wLT seP aUN lQb -wWd -ikr cwe +ikr +wWd bCU mhx jLm @@ -212533,7 +213258,7 @@ kMJ osP qiK qan -vIw +dYl dtd gPE gPE @@ -212933,7 +213658,7 @@ ftw ftw cRq aYR -rVO +iaT dtd rRf fwu @@ -213317,7 +214042,7 @@ lPg mgK vOy oTo -wqA +okp oeM qNl tIu @@ -213544,7 +214269,7 @@ xCQ mgx aUX mgx -aUX +vyy mgx gPE cGH @@ -213746,7 +214471,7 @@ keb mgx hUX mgx -hUX +uBD mgx gPE mtR @@ -214529,10 +215254,10 @@ lPg mgK fxm oTo -wqA -uBD +qpN +rPv kvz -dkS +whx uMe mbf tFG @@ -214734,7 +215459,7 @@ oTo qpN rPv ifL -dkS +rAi jBT mbf tFG @@ -225446,7 +226171,7 @@ hvp cfi cfi cfi -vyy +cfi vDT wZg vxa @@ -243223,7 +243948,7 @@ wJN rtT rtT idA -etl +eLH xxf dJe wff @@ -245646,7 +246371,7 @@ lTE qMX bAw tXe -etl +eLH fMJ fMJ cOm @@ -250688,7 +251413,7 @@ fMJ aJb wcs aJb -mOZ +dAy mOZ vMg aJb @@ -252730,7 +253455,7 @@ awR aXo mAV ewS -tvF +eyQ rwU qWk eln @@ -253131,7 +253856,7 @@ avi avi hRu bTK -dNr +fND npU ewS tvF @@ -257175,7 +257900,7 @@ xPa lsk hOF kRm -mUk +shX mUk kte xjV @@ -257770,7 +258495,7 @@ lPl bSx mNg laG -eII +wWp eII fPJ xws @@ -286042,7 +286767,7 @@ rtT rtT rtT idA -etl +eLH biw nIB nIB @@ -287476,7 +288201,7 @@ pAw apQ otl pLy -mPm +fCW oCI tta rFL @@ -289267,12 +289992,12 @@ bsZ lqC jeX qNt -rBp -flz +aUt +hZo duz vmq -flz -rBp +hZo +aUt duz flz oWv @@ -289470,15 +290195,15 @@ mui hPR hLf mdB -iZZ -iZZ +etl +etl ubj -iZZ +etl ove -iZZ -nmP +etl +etl bAt -dmd +etl bxZ nwQ akx @@ -289873,7 +290598,7 @@ nIB bsZ dLj eqZ -rbz +hZo oWv myN tKy @@ -290075,7 +290800,7 @@ nIB bsZ gXp duz -rbz +hZo oWv jkg qtP @@ -290277,7 +291002,7 @@ nIB bsZ bsZ krN -rbz +hZo oWv mUc ohs @@ -290285,7 +291010,7 @@ elJ hZy maZ oWv -whx +oKJ hZo qkx jEJ @@ -290479,18 +291204,18 @@ nIB nIB bsZ wVI -fCW +duz +oWv oWv bsZ bsZ bsZ bsZ -oWv -oWv +bsZ kYH heV wjm -dmd +tMe iIk soZ iJK @@ -290681,14 +291406,14 @@ nIB nIB bsZ flB -vMR -iZZ -dSW -rAi -vWo +hZo +jse +ylw bsZ -rpP -oWv +vWo +nuJ +nuJ +dSW nuJ nUv uGv @@ -290889,8 +291614,8 @@ bsZ bsZ bsZ bsZ -ocv -dDh +bsZ +pag dDh dBq dDh @@ -291087,11 +291812,11 @@ nIB nIB nIB oWv -bfG -flz -flz -vnm +vMR +ocv +rpP plU +vnm dDh rIu vDY @@ -291100,7 +291825,7 @@ vBp eRz nUh tge -pZP +oWv rOx jUv tpb @@ -291290,7 +292015,7 @@ nIB nIB oWv nww -aUt +bfG qBY gzA qqh @@ -291302,7 +292027,7 @@ dDh eRz hZo iau -pZP +oWv ltu qPx qPx @@ -291316,7 +292041,7 @@ diT cjl qei aRB -udP +djR rau oUL fJk @@ -291504,7 +292229,7 @@ dDh eRz hZo rho -pZP +oWv iMu qPx byr @@ -291518,7 +292243,7 @@ pNR djR dJA eDb -udP +djR noH nSH vIj @@ -291706,7 +292431,7 @@ vBp pge aKG hZo -pZP +oWv daS mmx qPx @@ -292110,7 +292835,7 @@ kZK fzb oOL gyQ -pZP +oWv jIH wxY oXK @@ -292312,7 +293037,7 @@ mOK iWs eRz mzu -pZP +oWv ltP ixK pIT @@ -293335,7 +294060,7 @@ dhl uQt vGv aLU -diR +xEM aWk ljL gAu @@ -293531,7 +294256,7 @@ dEB dEB dEB kTh -hKe +obE mAC bqO tTe @@ -295357,7 +296082,7 @@ oJs oJs dfI xYw -xYw +dWy fYI oJs oJs @@ -295557,10 +296282,10 @@ daE alJ oJs oJs -uZC -eXv +oJs eXv -iaT +rbz +oJs oJs oJs oAD @@ -297387,7 +298112,7 @@ bnQ bnQ bnQ jVT -ecL +xLy ecL ecL ihX @@ -298177,7 +298902,7 @@ iUf vut ePs coP -kgs +ngE gGx thx uYL @@ -300020,7 +300745,7 @@ cNo jJA ecL ecL -fwh +bJC wop wop abk @@ -300997,7 +301722,7 @@ wjj wjj gor oxG -hAB +rJu twx kmZ gSC @@ -301005,7 +301730,7 @@ eDM lxg cWt sfH -iFx +veV sXI hlc nbG @@ -328284,7 +329009,7 @@ rVa wJP dwT iah -qfv +oxa sPt qOH uqC @@ -329683,7 +330408,7 @@ sPM bHS wGh qjy -bXK +twd dBh thi xgB @@ -331725,7 +332450,7 @@ udF eNz jCW jCW -jGi +ckl hVv pKC cQR @@ -334724,7 +335449,7 @@ uYw uYw nzF nzF -fnn +oIG qrJ vcd iIA @@ -334926,7 +335651,7 @@ uYw uYw nzF nzF -fnn +rOW qrJ vcd vcd @@ -335128,7 +335853,7 @@ uYw uYw nzF nzF -fnn +dNr qrJ kyg fWa @@ -337182,9 +337907,9 @@ oNN xkl qVa uXR -ylw -ylw -ylw +fKB +fKB +fKB uYw uYw uYw @@ -337384,8 +338109,8 @@ oNN mQf rMF bfL -ylw -ylw +fKB +fKB uYw uYw uYw @@ -337586,8 +338311,8 @@ oNN mYM bGa jfg -ylw -ylw +fKB +fKB uYw uYw uYw @@ -337788,8 +338513,8 @@ oNN ktT rkh uXm -ylw -ylw +fKB +fKB uYw uYw uYw @@ -337986,12 +338711,12 @@ iWV iWV iWV iWV -ylw -ylw +fKB +fKB vxY noj -ylw -ylw +fKB +fKB bQm uYw uYw @@ -338188,11 +338913,11 @@ iWV iWV iWV iWV -ylw -ylw +fKB +fKB fIQ -ylw -ylw +fKB +fKB jkS bQm uYw @@ -338391,9 +339116,9 @@ tng uYw uYw uYw -ylw +fKB xSm -ylw +fKB bQm uYw uYw @@ -338593,9 +339318,9 @@ uYw uYw uYw uYw -ylw +fKB fdC -ylw +fKB eQC eQC eQC