From 1e817a13cc23a825c8a2ca8f611bb8b7006a3c6e Mon Sep 17 00:00:00 2001 From: FabianK3 <21039694+FabianK3@users.noreply.github.com> Date: Mon, 14 Oct 2024 12:34:38 +0200 Subject: [PATCH] Engineering lobby revision (#19996) ### Introduction This PR has the focus to revise the engineering lobby layout. This is a revision to the first PR that has been closed to address different issues. (https://github.com/Aurorastation/Aurora.3/pull/19945). ### What changed? - Updated engineering lobby layout and adjacent areas. - Added a notice board to the lobby. - Moved the engineering first aid locker into the lobby. ### Preview ![image](https://github.com/user-attachments/assets/39e1fe15-e628-4124-9299-7d65b71169fb) ![image](https://github.com/user-attachments/assets/6fb7da16-fd45-44f7-891a-15c8ceeca6e5) ![image](https://github.com/user-attachments/assets/2f3ac054-026d-42f4-ad44-4a392e15bc5b) --- .../fabiank3-engineering-lobby-revision.yml | 8 + maps/sccv_horizon/sccv_horizon.dmm | 825 ++++++++++-------- 2 files changed, 466 insertions(+), 367 deletions(-) create mode 100644 html/changelogs/fabiank3-engineering-lobby-revision.yml diff --git a/html/changelogs/fabiank3-engineering-lobby-revision.yml b/html/changelogs/fabiank3-engineering-lobby-revision.yml new file mode 100644 index 00000000000..1eaa2c91576 --- /dev/null +++ b/html/changelogs/fabiank3-engineering-lobby-revision.yml @@ -0,0 +1,8 @@ +author: FabianK3 + +delete-after: True + +changes: + - rscadd: "Updated engineering lobby layout and adjacent areas." + - rscadd: "Added a notice board to the engineering lobby." + - qol: "Moved engineering first aid locker into the lobby. Remember that." diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index b4df7f10d33..642bd34f543 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -2987,17 +2987,16 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_engineering{ - dir = 1; - name = "Engineering Hallway"; - req_access = list(10) - }, /obj/machinery/door/firedoor, /obj/effect/map_effect/door_helper/unres{ dir = 1 }, +/obj/machinery/door/airlock/engineering{ + name = "Engineering Lobby"; + req_one_access = list(10) + }, /turf/simulated/floor/tiled/full, -/area/hallway/engineering) +/area/engineering/lobby) "aue" = ( /obj/machinery/recharge_station, /obj/machinery/light/small{ @@ -13103,7 +13102,6 @@ /obj/effect/floor_decal/corner_wide/yellow{ dir = 8 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/hallway/engineering) "bRQ" = ( @@ -15186,19 +15184,21 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/corner_wide/yellow{ + dir = 5 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 8 }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_engineering{ - dir = 4; - name = "Engineering Front Desk"; - req_access = list(10) +/obj/structure/closet/walllocker/medical{ + pixel_y = 32 }, -/turf/simulated/floor/tiled/full, +/obj/effect/floor_decal/industrial/outline/medical, +/obj/item/storage/firstaid/regular, +/turf/simulated/floor/tiled, /area/engineering/lobby) "chw" = ( /obj/effect/floor_decal/carpet{ @@ -17824,20 +17824,17 @@ /turf/simulated/floor/holofloor/tiled, /area/horizon/holodeck/source_emptycourt) "cCI" = ( -/obj/structure/disposalpipe/segment{ - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/effect/floor_decal/corner/yellow{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/lobby) @@ -19193,6 +19190,7 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 8 }, +/obj/machinery/alarm/west, /turf/simulated/floor/tiled, /area/engineering/lobby) "cOx" = ( @@ -22535,16 +22533,11 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "dog" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/corner/yellow{ - dir = 9 +/obj/effect/floor_decal/corner/dark_green{ + dir = 10 }, -/obj/machinery/ringer_button{ - id = "engie_ringer"; - pixel_x = -21; - pixel_y = -21 +/obj/machinery/status_display{ + pixel_y = -32 }, /turf/simulated/floor/tiled, /area/engineering/lobby) @@ -22969,7 +22962,7 @@ /area/maintenance/wing/port/far) "dqO" = ( /obj/effect/floor_decal/corner/dark_green/full, -/obj/structure/extinguisher_cabinet/south, +/obj/machinery/firealarm/south, /turf/simulated/floor/tiled, /area/engineering/lobby) "dqR" = ( @@ -23593,9 +23586,13 @@ /area/horizon/security/investigators_office) "duH" = ( /obj/machinery/light, -/obj/structure/closet/firecloset, -/obj/effect/floor_decal/industrial/outline/firefighting_closet, -/turf/simulated/floor/tiled/dark/full, +/obj/effect/floor_decal/corner/dark_green{ + dir = 10 + }, +/obj/structure/bed/stool/chair{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/engineering/lobby) "duI" = ( /obj/machinery/button/remote/blast_door{ @@ -25933,22 +25930,26 @@ /turf/simulated/floor/grass, /area/horizon/hydroponics/lower) "dMU" = ( -/obj/effect/floor_decal/corner_wide/yellow{ - dir = 6 - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/corner_wide/yellow{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled, -/area/hallway/engineering) +/area/engineering/lobby) "dMV" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; @@ -29540,6 +29541,8 @@ /obj/effect/floor_decal/corner/yellow{ dir = 10 }, +/obj/item/modular_computer/console/preset/engineering, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/engineering/lobby) "eoG" = ( @@ -29639,18 +29642,22 @@ /turf/simulated/floor/tiled, /area/horizon/crew_quarters/fitness/changing) "epH" = ( -/obj/structure/table/standard, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/corner/yellow{ + dir = 5 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal/small/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/machinery/power/apc/north, /obj/structure/cable/green{ - icon_state = "0-8" + icon_state = "4-8" }, -/obj/effect/floor_decal/corner/yellow{ - dir = 5 +/obj/machinery/light{ + dir = 1 }, -/obj/item/storage/bag/circuits/basic, /turf/simulated/floor/tiled, /area/engineering/lobby) "epT" = ( @@ -32955,12 +32962,17 @@ /turf/simulated/floor, /area/bridge/meeting_room) "eQG" = ( -/obj/effect/floor_decal/corner_wide/yellow{ - dir = 9 +/obj/machinery/door/firedoor, +/obj/effect/map_effect/door_helper/unres{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/hallway/engineering) +/obj/machinery/door/airlock/glass_engineering{ + dir = 1; + name = "Engineering Hallway"; + req_access = list(10) + }, +/turf/simulated/floor/tiled/full, +/area/engineering/lobby) "eQH" = ( /obj/effect/floor_decal/corner/dark_blue/full, /obj/machinery/light{ @@ -33480,14 +33492,7 @@ /turf/simulated/open, /area/horizon/hallway/deck_three/primary/central) "eUO" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/floor_decal/corner/yellow{ - dir = 9 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/modular_computer/console/preset/engineering{ +/obj/structure/bed/stool/chair/office/dark{ dir = 4 }, /turf/simulated/floor/tiled, @@ -37212,7 +37217,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/random/pottedplant, /obj/effect/floor_decal/corner/dark_green{ dir = 6 }, @@ -37470,17 +37474,15 @@ /turf/space/transit/east, /area/template_noop) "fzM" = ( -/obj/structure/table/standard, -/obj/machinery/cell_charger{ - pixel_y = 4 +/obj/effect/floor_decal/corner_wide/yellow{ + dir = 10 }, -/obj/machinery/alarm/west, -/obj/machinery/requests_console/south{ - department = "Engineering"; - departmentType = 1; - name = "Engineering RC" +/obj/item/modular_computer/console/preset/engineering, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/camera/network/engineering{ + c_tag = "Engineering - Lobby"; + dir = 1 }, -/obj/effect/floor_decal/corner/yellow/full, /turf/simulated/floor/tiled, /area/engineering/lobby) "fzO" = ( @@ -38998,9 +39000,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/floor_decal/corner/yellow/diagonal, +/obj/effect/floor_decal/corner_wide/yellow/full, /turf/simulated/floor/tiled, -/area/hallway/engineering) +/area/engineering/lobby) "fLG" = ( /obj/effect/landmark{ name = "Revenant" @@ -39068,6 +39070,9 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/engineering) "fLZ" = ( @@ -39252,17 +39257,16 @@ /turf/simulated/floor/shuttle/black, /area/shuttle/distress) "fNq" = ( -/obj/machinery/door/airlock/glass_engineering{ - dir = 1; - name = "Engineering Hallway"; - req_access = list(10) - }, /obj/machinery/door/firedoor, /obj/effect/map_effect/door_helper/unres{ dir = 1 }, +/obj/machinery/door/airlock/engineering{ + name = "Engineering Lobby"; + req_one_access = list(10) + }, /turf/simulated/floor/tiled/full, -/area/hallway/engineering) +/area/engineering/lobby) "fNt" = ( /obj/structure/shuttle_part/scc/research{ icon_state = "12,26"; @@ -40917,7 +40921,6 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 5 }, -/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/engineering/lobby) "fZH" = ( @@ -44577,13 +44580,14 @@ /obj/structure/disposalpipe/segment{ icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/full, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, /area/hallway/engineering) "gCb" = ( /obj/machinery/door/airlock/centcom{ @@ -45607,9 +45611,17 @@ /turf/simulated/floor/tiled/dark, /area/storage/eva) "gJz" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/space_heater, -/turf/simulated/floor/tiled/dark/full, +/obj/effect/floor_decal/corner/dark_green/full, +/obj/structure/table/standard, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 1 + }, +/obj/item/pen{ + pixel_x = 2; + pixel_y = 3 + }, +/turf/simulated/floor/tiled, /area/engineering/lobby) "gJB" = ( /obj/structure/disposalpipe/segment{ @@ -47660,12 +47672,12 @@ }, /area/antag/mercenary) "gYC" = ( -/obj/machinery/status_display{ - pixel_y = -32 - }, /obj/effect/floor_decal/corner/dark_green{ dir = 10 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/engineering/lobby) "gYL" = ( @@ -47884,8 +47896,11 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/full, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, /area/hallway/engineering) "haX" = ( /obj/structure/cable/green{ @@ -49343,12 +49358,14 @@ /turf/unsimulated/floor/plating, /area/centcom/specops) "hnx" = ( -/obj/structure/table/standard, -/obj/item/storage/slide_projector, -/obj/machinery/light, /obj/effect/floor_decal/corner/yellow{ dir = 10 }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/computer/security/engineering{ + name = "Drone Monitoring Cameras" + }, +/obj/machinery/light, /turf/simulated/floor/tiled, /area/engineering/lobby) "hnK" = ( @@ -49449,17 +49466,20 @@ /turf/simulated/floor/carpet/rubber, /area/server) "hoS" = ( -/obj/effect/floor_decal/corner_wide/yellow{ - dir = 6 - }, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/alarm/east, -/turf/simulated/floor/tiled, -/area/hallway/engineering) +/obj/machinery/door/firedoor, +/obj/effect/map_effect/door_helper/unres{ + dir = 1 + }, +/obj/machinery/door/airlock/glass_engineering{ + dir = 1; + name = "Engineering Hallway"; + req_access = list(10) + }, +/turf/simulated/floor/tiled/full, +/area/engineering/lobby) "hoT" = ( /obj/structure/bed/stool/chair/padded/blue{ dir = 4 @@ -49668,13 +49688,16 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads/hop/xo) "hpZ" = ( -/obj/machinery/disposal/small/north, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, /obj/effect/floor_decal/corner/yellow{ dir = 10 }, +/obj/structure/table/standard, +/obj/machinery/button/remote/blast_door{ + id = "shutters_deck2_eng_frontdesk"; + name = "remote shutter control"; + pixel_y = -1; + pixel_x = -6 + }, /turf/simulated/floor/tiled, /area/engineering/lobby) "hqa" = ( @@ -51471,13 +51494,9 @@ }, /area/centcom/bar) "hEo" = ( -/obj/structure/bed/stool/chair{ - dir = 8 - }, -/obj/effect/floor_decal/corner/dark_green{ - dir = 6 - }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/outline/emergency_closet, +/obj/structure/closet/emcloset, +/turf/simulated/floor/tiled/dark/full, /area/engineering/lobby) "hEp" = ( /turf/unsimulated/floor{ @@ -51946,14 +51965,12 @@ /turf/simulated/floor/carpet, /area/lawoffice/representative_two) "hHV" = ( -/obj/effect/floor_decal/corner_wide/yellow{ - dir = 6 - }, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/corner_wide/yellow/full{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/engineering) "hHY" = ( @@ -53979,13 +53996,18 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction/flipped{ name = "CE Office"; sortType = "CE Office" }, -/turf/simulated/floor/tiled/full, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, /area/hallway/engineering) "hYg" = ( /obj/effect/floor_decal/corner/red/diagonal, @@ -55154,15 +55176,24 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port) "ihT" = ( -/obj/effect/floor_decal/corner_wide/yellow{ - dir = 6 +/obj/machinery/door/blast/shutters/open{ + dir = 2; + id = "shutters_deck2_eng_frontdesk"; + name = "Engineering Front Desk Shutter" }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/desk/northleft{ + req_access = list(10); + name = "Engineering Front Desk Internal" }, -/obj/item/device/radio/intercom/east, -/turf/simulated/floor/tiled, -/area/hallway/engineering) +/obj/machinery/ringer_button{ + id = "engie_ringer"; + pixel_x = -9; + pixel_y = -9 + }, +/turf/simulated/floor/tiled/dark/full, +/area/engineering/lobby) "ihW" = ( /obj/structure/closet/emcloset, /obj/effect/floor_decal/industrial/outline/emergency_closet, @@ -57287,9 +57318,11 @@ /turf/simulated/floor/exoplanet/barren/raskara, /area/centcom/shared_dream) "iyM" = ( -/obj/effect/floor_decal/corner/yellow/diagonal, -/turf/simulated/floor/tiled, -/area/hallway/engineering) +/obj/item/device/radio/intercom/west, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/space_heater, +/turf/simulated/floor/tiled/dark/full, +/area/engineering/lobby) "iyU" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 5 @@ -59506,11 +59539,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/closet/walllocker/medical{ - pixel_y = 32 - }, -/obj/effect/floor_decal/industrial/outline/medical, -/obj/item/storage/firstaid/regular, /obj/structure/platform_deco{ dir = 8 }, @@ -64542,11 +64570,11 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/effect/floor_decal/corner_wide/yellow/full{ - dir = 4 +/obj/effect/floor_decal/corner_wide/yellow{ + dir = 10 }, /turf/simulated/floor/tiled, -/area/hallway/engineering) +/area/engineering/lobby) "jzl" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 10 @@ -66125,10 +66153,14 @@ /turf/simulated/floor/grass, /area/centcom/spawning) "jLD" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/portable_atmospherics/powered/scrubber, -/turf/simulated/floor/tiled/dark/full, -/area/hallway/engineering) +/obj/effect/floor_decal/corner/yellow{ + dir = 10 + }, +/obj/structure/bed/stool/chair/office/dark{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/lobby) "jLO" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 5 @@ -72257,8 +72289,8 @@ /turf/simulated/floor/tiled, /area/hangar/intrepid) "kEw" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/portable_atmospherics/powered/pump/filled, +/obj/effect/floor_decal/industrial/outline/firefighting_closet, +/obj/structure/closet/firecloset, /turf/simulated/floor/tiled/dark/full, /area/hallway/engineering) "kEJ" = ( @@ -72422,9 +72454,6 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 10 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /turf/simulated/floor/tiled, /area/engineering/lobby) "kGp" = ( @@ -73027,6 +73056,15 @@ }, /turf/simulated/floor/reinforced/airmix, /area/engineering/atmos/air) +"kKA" = ( +/obj/effect/floor_decal/corner/dark_green/full{ + dir = 4 + }, +/obj/structure/bed/stool/chair{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/engineering/lobby) "kKL" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/corner/dark_blue{ @@ -76209,20 +76247,9 @@ /turf/simulated/floor/tiled/dark, /area/horizon/bar/backroom) "lkP" = ( -/obj/structure/table/standard, /obj/effect/floor_decal/corner/yellow{ dir = 6 }, -/obj/machinery/button/remote/blast_door{ - id = "shutters_deck2_eng_frontdesk"; - name = "remote shutter control"; - pixel_x = 6; - pixel_y = -2 - }, -/obj/random/pottedplant_small{ - pixel_x = 3; - pixel_y = 11 - }, /turf/simulated/floor/tiled, /area/engineering/lobby) "llb" = ( @@ -76715,6 +76742,11 @@ /obj/effect/map_effect/window_spawner/full/reinforced/firedoor, /turf/simulated/floor/tiled/dark/full, /area/medical/reception) +"lpU" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/portable_atmospherics/powered/pump/filled, +/turf/simulated/floor/tiled/dark/full, +/area/engineering/lobby) "lpV" = ( /obj/machinery/atmospherics/binary/pump{ dir = 4; @@ -77521,10 +77553,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/engineering/lobby) @@ -81248,12 +81282,12 @@ /turf/simulated/floor/reinforced/airless, /area/horizon/exterior) "lYT" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, /obj/machinery/door/blast/shutters/open{ dir = 2; id = "shutters_deck2_eng_frontdesk"; name = "Engineering Front Desk Shutter" }, +/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, /turf/simulated/floor/tiled/dark/full, /area/engineering/lobby) "lYV" = ( @@ -83875,8 +83909,20 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/bridge/controlroom) "msN" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, /area/engineering/lobby) "msQ" = ( /obj/structure/table/stone/marble, @@ -87965,13 +88011,11 @@ }, /area/centcom/shared_dream) "naz" = ( -/obj/item/modular_computer/console/preset/engineering{ - dir = 1 - }, /obj/effect/floor_decal/corner/yellow/full{ dir = 4 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/table/standard, +/obj/item/storage/slide_projector, /turf/simulated/floor/tiled, /area/engineering/lobby) "naK" = ( @@ -89451,15 +89495,12 @@ /turf/simulated/floor/tiled/dark, /area/medical/gen_treatment) "nmA" = ( -/obj/structure/closet/emcloset, -/obj/effect/floor_decal/corner/dark_green{ - dir = 6 - }, -/obj/effect/floor_decal/industrial/outline/emergency_closet, /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/portable_atmospherics/powered/scrubber, +/turf/simulated/floor/tiled/dark/full, /area/engineering/lobby) "nmF" = ( /obj/effect/floor_decal/corner/dark_blue/full, @@ -89659,6 +89700,15 @@ /obj/machinery/firealarm/east, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/dissection) +"noC" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/corner/yellow{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/engineering/lobby) "noF" = ( /turf/unsimulated/floor{ icon_state = "wood" @@ -91040,16 +91090,15 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/corner_wide/yellow{ + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/firealarm/north, -/obj/effect/floor_decal/corner/yellow/full{ dir = 8 }, +/obj/structure/noticeboard{ + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/engineering/lobby) "nyL" = ( @@ -91183,14 +91232,9 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port) "nAb" = ( -/obj/structure/bed/stool/chair{ - dir = 8 - }, -/obj/machinery/alarm/east, -/obj/effect/floor_decal/corner/dark_green{ - dir = 6 - }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/outline/firefighting_closet, +/obj/structure/closet/firecloset, +/turf/simulated/floor/tiled/dark/full, /area/engineering/lobby) "nAf" = ( /obj/structure/lattice/catwalk/indoor/grate, @@ -91642,15 +91686,24 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction/flipped{ name = "Engineering"; sortType = "Engineering" }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, -/area/hallway/engineering) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/corner_wide/yellow{ + dir = 5 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/engineering/lobby) "nDy" = ( /obj/structure/reagent_dispensers/coolanttank, /obj/machinery/firealarm/west, @@ -97844,11 +97897,13 @@ /turf/simulated/floor/tiled, /area/horizon/security/warden) "oAv" = ( -/obj/machinery/door/firedoor, /obj/effect/floor_decal/corner/dark_green{ dir = 10 }, /obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/firedoor{ + dir = 4 + }, /turf/simulated/floor/tiled/full, /area/engineering/lobby) "oAy" = ( @@ -98263,8 +98318,10 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner_wide/yellow{ + dir = 10 + }, +/turf/simulated/floor/tiled, /area/hallway/engineering) "oCY" = ( /turf/simulated/floor/plating, @@ -103317,20 +103374,10 @@ /turf/simulated/floor/plating, /area/shuttle/skipjack) "pqw" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/effect/floor_decal/corner_wide/yellow{ + dir = 9 }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled, /area/engineering/lobby) "pqK" = ( /obj/structure/flora/ausbushes/fullgrass, @@ -111675,6 +111722,7 @@ dir = 8 }, /obj/random/pottedplant, +/obj/machinery/alarm/east, /turf/simulated/floor/wood, /area/hallway/engineering) "qBX" = ( @@ -112883,11 +112931,14 @@ /turf/simulated/floor/plating, /area/maintenance/security_port) "qJZ" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, +/turf/simulated/floor/tiled/dark/full, /area/engineering/lobby) "qKd" = ( /obj/structure/platform/ledge, @@ -116052,16 +116103,14 @@ /turf/unsimulated/floor, /area/antag/burglar) "rhX" = ( -/obj/structure/bed/stool/chair{ - dir = 8 +/obj/effect/floor_decal/corner/dark_green{ + dir = 6 }, +/obj/random/pottedplant, /obj/machinery/camera/network/engineering{ c_tag = "Engineering - Hallway 1"; dir = 8 }, -/obj/effect/floor_decal/corner/dark_green{ - dir = 6 - }, /turf/simulated/floor/tiled, /area/engineering/lobby) "ric" = ( @@ -116729,13 +116778,8 @@ }, /area/centcom/specops) "rol" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering{ - dir = 1; - name = "Engineering Front Desk"; - req_access = list(10) - }, -/turf/simulated/floor/tiled/full, +/obj/structure/table/standard, +/turf/simulated/floor/tiled, /area/engineering/lobby) "ros" = ( /obj/structure/table/standard, @@ -117875,6 +117919,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/engineering) "rwv" = ( @@ -122504,7 +122551,8 @@ /obj/effect/floor_decal/corner/yellow{ dir = 6 }, -/obj/structure/bed/stool/chair/office/dark{ +/obj/structure/table/standard, +/obj/machinery/light{ dir = 4 }, /turf/simulated/floor/tiled, @@ -123463,7 +123511,8 @@ /obj/structure/disposalpipe/sortjunction/untagged/flipped{ dir = 4 }, -/turf/simulated/floor/tiled/full, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, /area/hallway/engineering) "srw" = ( /obj/machinery/atmospherics/pipe/manifold/visible/purple{ @@ -125481,6 +125530,10 @@ /obj/structure/railing/mapped, /turf/simulated/floor/tiled, /area/hallway/primary/central_one) +"sGf" = ( +/obj/effect/floor_decal/corner_wide/yellow/full, +/turf/simulated/floor/tiled, +/area/hallway/engineering) "sGo" = ( /obj/effect/floor_decal/spline/plain/corner, /turf/simulated/floor/lino/diamond, @@ -126293,15 +126346,16 @@ /turf/simulated/floor/grass, /area/horizon/hydroponics/garden) "sMD" = ( -/obj/machinery/computer/security/engineering{ - name = "Drone Monitoring Cameras" - }, /obj/effect/floor_decal/corner/yellow{ dir = 5 }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/light{ - dir = 1 +/obj/machinery/power/apc/north, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/structure/table/standard, +/obj/item/storage/bag/circuits/basic{ + pixel_y = 6 }, /turf/simulated/floor/tiled, /area/engineering/lobby) @@ -128501,6 +128555,16 @@ icon_state = "white" }, /area/centcom/legion) +"tdZ" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/engineering/lobby) "teb" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -129248,13 +129312,13 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 8 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/tiled, @@ -129798,6 +129862,15 @@ /obj/structure/table/wood, /turf/simulated/floor/holofloor/lino, /area/horizon/holodeck/source_meetinghall) +"tpD" = ( +/obj/effect/floor_decal/corner/dark_green{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/engineering/lobby) "tpF" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -130601,7 +130674,7 @@ }, /obj/structure/sign/directions/prop{ dir = 4; - pixel_y = 24 + pixel_y = 34 }, /turf/simulated/floor/tiled, /area/engineering/lobby) @@ -131416,10 +131489,12 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/door/firedoor, /obj/effect/floor_decal/corner/dark_green{ dir = 5 }, +/obj/machinery/door/firedoor{ + dir = 4 + }, /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/full, /area/engineering/lobby) @@ -132979,6 +133054,21 @@ /obj/effect/floor_decal/industrial/outline/security, /turf/simulated/floor/tiled/white, /area/horizon/security/autopsy_laboratory) +"tNd" = ( +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73); + dir = 4 + }, +/obj/effect/map_effect/door_helper/unres{ + dir = 8 + }, +/obj/machinery/door/airlock/engineering{ + dir = 4; + name = "Engineering Lobby"; + req_one_access = list(10) + }, +/turf/simulated/floor/tiled/full, +/area/engineering/lobby) "tNi" = ( /obj/structure/shuttle_part/scc_space_ship{ icon_state = "d3-6" @@ -133000,7 +133090,9 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 4 + }, /turf/simulated/floor/tiled/full, /area/engineering/lobby) "tNp" = ( @@ -133374,17 +133466,12 @@ }, /area/centcom/holding) "tPZ" = ( -/obj/structure/table/reinforced, /obj/machinery/door/blast/shutters/open{ dir = 4; id = "shutters_deck2_eng_frontdesk"; name = "Engineering Front Desk Shutter" }, -/obj/machinery/door/window/desk/westleft{ - name = "Engineering Front Desk Internal"; - req_access = list(10) - }, -/obj/machinery/door/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, /turf/simulated/floor/tiled/dark/full, /area/engineering/lobby) "tQl" = ( @@ -136107,10 +136194,21 @@ /turf/simulated/floor/airless, /area/engineering/atmos) "ukr" = ( -/obj/structure/closet/firecloset, -/obj/effect/floor_decal/industrial/outline/firefighting_closet, -/turf/simulated/floor/tiled/dark/full, -/area/hallway/engineering) +/obj/effect/floor_decal/corner_wide/yellow/full{ + dir = 8 + }, +/obj/structure/table/standard, +/obj/machinery/recharger{ + pixel_y = -1; + pixel_x = -8 + }, +/obj/machinery/cell_charger{ + pixel_y = 13; + pixel_x = -2 + }, +/obj/machinery/firealarm/north, +/turf/simulated/floor/tiled, +/area/engineering/lobby) "ukv" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -136118,18 +136216,18 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/newscaster/north, -/obj/machinery/camera/network/engineering{ - c_tag = "Engineering - Lobby" - }, /obj/effect/floor_decal/corner/yellow{ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 8 + }, +/obj/machinery/ringer/north{ + department = "Engineering"; + id = "engie_ringer"; + pixel_y = 30; + req_access = null; + req_one_access = list(11,24) }, /turf/simulated/floor/tiled, /area/engineering/lobby) @@ -137887,16 +137985,10 @@ /area/centcom/holding) "uwX" = ( /obj/effect/floor_decal/corner_wide/yellow{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/tiled, -/area/hallway/engineering) +/area/engineering/lobby) "uxb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -141370,8 +141462,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/map_effect/window_spawner/full/reinforced/firedoor, +/obj/machinery/door/blast/shutters/open{ + dir = 2; + id = "shutters_deck2_eng_frontdesk"; + name = "Engineering Front Desk Shutter" + }, /turf/simulated/floor/tiled/dark/full, -/area/hallway/engineering) +/area/engineering/lobby) "uYF" = ( /obj/structure/platform{ dir = 8 @@ -144760,8 +144857,26 @@ /turf/simulated/floor/tiled/dark, /area/horizon/crew_quarters/lounge/bar) "vxp" = ( -/obj/structure/bed/stool/chair/office/dark{ - dir = 1 +/obj/effect/floor_decal/corner_wide/yellow{ + dir = 10 + }, +/obj/structure/table/standard, +/obj/machinery/requests_console/south{ + department = "Engineering"; + departmentType = 1; + name = "Engineering Lobby RC" + }, +/obj/item/paper_bin{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/folder/yellow{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/pen{ + pixel_x = 5; + pixel_y = 9 }, /turf/simulated/floor/tiled, /area/engineering/lobby) @@ -147240,6 +147355,13 @@ }, /turf/simulated/floor/tiled, /area/horizon/security/brig) +"vSx" = ( +/obj/effect/floor_decal/corner/dark_green{ + dir = 10 + }, +/obj/machinery/alarm/south, +/turf/simulated/floor/tiled, +/area/engineering/lobby) "vSF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -150322,6 +150444,7 @@ pixel_x = -4; pixel_y = 4 }, +/obj/machinery/newscaster/north, /turf/simulated/floor/tiled, /area/engineering/lobby) "wpo" = ( @@ -152963,28 +153086,14 @@ /turf/simulated/wall, /area/engineering/atmos/storage) "wHp" = ( -/obj/structure/table/standard, -/obj/item/device/radio/intercom/north, /obj/effect/floor_decal/corner/yellow/full{ dir = 1 }, -/obj/item/paper_bin{ - pixel_x = 4; - pixel_y = 8 - }, -/obj/item/pen{ - pixel_x = 5; - pixel_y = 9 - }, -/obj/item/folder/yellow{ - pixel_x = -7; - pixel_y = 8 - }, -/obj/item/folder/yellow{ - pixel_x = -7; - pixel_y = 8 +/obj/machinery/alarm/north, +/obj/structure/table/standard, +/obj/item/storage/box/fancy/crayons/chalkbox{ + pixel_y = 5 }, -/obj/item/storage/box/fancy/crayons/chalkbox, /turf/simulated/floor/tiled, /area/engineering/lobby) "wHq" = ( @@ -153952,7 +154061,7 @@ }, /area/centcom/legion) "wOj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, /turf/simulated/floor/tiled, @@ -155569,20 +155678,13 @@ /turf/simulated/floor/wood, /area/horizon/bar) "wZy" = ( -/obj/structure/table/standard, -/obj/machinery/recharger, -/obj/effect/floor_decal/corner/yellow{ - dir = 9 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/machinery/ringer/north{ - department = "Engineering"; - dir = 8; - id = "engie_ringer"; - pixel_x = -10; - pixel_y = 0; - req_access = null; - req_one_access = list(11,24) +/obj/effect/floor_decal/corner/dark_green{ + dir = 9 }, +/obj/structure/extinguisher_cabinet/west, /turf/simulated/floor/tiled, /area/engineering/lobby) "wZI" = ( @@ -159148,17 +159250,11 @@ }, /area/horizon/kitchen/freezer) "xzc" = ( -/obj/effect/floor_decal/corner_wide/yellow{ - dir = 6 - }, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/light{ - dir = 4 - }, /turf/simulated/floor/tiled, -/area/hallway/engineering) +/area/engineering/lobby) "xzd" = ( /obj/structure/table/stone/marble, /obj/machinery/firealarm/west, @@ -159574,7 +159670,7 @@ /obj/machinery/requests_console/south{ department = "Engineering"; departmentType = 1; - name = "Engineering RC" + name = "Engineering Breakroom RC" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -161839,9 +161935,7 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/wing/starboard) "xSp" = ( -/obj/structure/bed/stool/chair/office/dark{ - dir = 8 - }, +/obj/structure/bed/stool/chair/office/dark, /turf/simulated/floor/tiled, /area/engineering/lobby) "xSt" = ( @@ -162516,8 +162610,9 @@ /obj/effect/floor_decal/corner_wide/yellow{ dir = 10 }, +/obj/machinery/light, /turf/simulated/floor/tiled, -/area/hallway/engineering) +/area/engineering/lobby) "xXN" = ( /obj/machinery/door/airlock/highsecurity{ dir = 4; @@ -163877,12 +163972,11 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/effect/floor_decal/corner_wide/yellow{ + dir = 10 }, -/obj/effect/floor_decal/corner_wide/yellow/full, /turf/simulated/floor/tiled, -/area/hallway/engineering) +/area/engineering/lobby) "yhn" = ( /obj/structure/grille/diagonal{ dir = 1 @@ -164541,12 +164635,9 @@ /turf/simulated/floor/tiled/dark, /area/horizon/security/evidence_storage) "ylO" = ( -/obj/effect/floor_decal/corner_wide/yellow{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/corner/dark_green, /turf/simulated/floor/tiled, -/area/hallway/engineering) +/area/engineering/lobby) "ylS" = ( /obj/effect/floor_decal/corner/mauve{ dir = 6 @@ -259288,12 +259379,12 @@ pxC sJD vYt kEw -jLD +vDM ukr iyM -iyM +pqw fLF -iXY +wLx wpl aCW ttU @@ -259544,11 +259635,11 @@ sBj tet srq bRG -eQG +sGf eQG uwX -ylO -ylO +aCW +aCW yhj fNq gKO @@ -259802,10 +259893,10 @@ haW gCa hYc oCX -oCX +qJZ nDm -oCX -oCX +vfz +vfz xXM uYv kFd @@ -260061,13 +260152,13 @@ tkx hHV hoS dMU -ihT +xzc xzc jzi aud xWn eAT -ttU +vSx stC wkd wCG @@ -260318,9 +260409,9 @@ xRO qBW vDM chv -vDM -wcQ -vDM +nPX +rol +vxp wLx fZE lwh @@ -260575,12 +260666,12 @@ uQm oJL wLx nyJ -wZy +aCW eUO fzM wLx joZ -pqw +eAT kGm stC aOF @@ -260832,13 +260923,13 @@ qaW jzV wLx ukv -aCW +kbs xSp hnx lYT jTw eAT -ttU +dog stC aOF eSE @@ -261089,10 +261180,10 @@ psk tVy kJF cCI -qJZ -msN +aCW +aCW hpZ -wLx +lYT jTw eAT ttU @@ -261347,12 +261438,12 @@ eln wLx epH wOj -nPX -eoC -lYT -jTw -eAT -eoC +aCW +jLD +ihT +jmu +msN +tpD gJz qbF pyW @@ -261603,13 +261694,13 @@ kgh kCJ wLx sMD -vxp -kbs +aCW +xSp eoC -rol -jmu +lYT +jTw eAT -eoC +aCW duH qbF cbR @@ -261866,8 +261957,8 @@ naz lYT jTw kcq -eoC -gJz +ylO +kKA qbF gPa lsv @@ -262117,14 +262208,14 @@ oJL oJL wLx gXH -gXH +tNd tPZ -gXH -lYT +tPZ +wLx tAG tNk oAv -vDM +wcQ qbF jzW giz @@ -262374,10 +262465,10 @@ ouz aNE cOs brV -brV -dog +noC brV brV +wZy ejy kcq mch @@ -262631,10 +262722,10 @@ lCT kYM bie fyo -jIz csG vfz -vfz +tdZ +jIz fyo uoY aCW @@ -262888,10 +262979,10 @@ jql loY acd aCW -vGS hMN aCW aCW +vGS aCW aCW aCW @@ -263145,7 +263236,7 @@ hFH ykM tur nmA -hEo +lpU nAb hEo rhX