diff --git a/code/modules/overmap/ships/computers/sensors.dm b/code/modules/overmap/ships/computers/sensors.dm index 374b50008b1..2d42624ec43 100644 --- a/code/modules/overmap/ships/computers/sensors.dm +++ b/code/modules/overmap/ships/computers/sensors.dm @@ -654,7 +654,7 @@ /obj/machinery/shipsensors/strong/relay name = "\improper S-24 Beacon sensor array" - desc = "A vintage sensor array found on Solarian beacon relays throughout the galaxy. While it lacks deep scanning capabilities, it does have a high heat capacity." + desc = "A vintage sensor array of Solarian design. While it lacks deep scanning capabilities, it does have a high heat capacity." icon = 'icons/obj/machinery/sensors_relay.dmi' density = 1 layer = ABOVE_HUMAN_LAYER @@ -673,3 +673,9 @@ ) pixel_x = -32 pixel_y = -16 + +/obj/machinery/shipsensors/strong/relay/sol + name = "\improper S-24M Beacon sensor array" + desc = "A vintage sensor array found on Solarian sensor relays throughout the galaxy. While it lacks deep scanning capabilities, it does have a high heat capacity. This one is emblazoned with the fading flag of the pre-war Solarian Alliance." + icon = 'icons/obj/machinery/sensors_relay_sol.dmi' + desc_extended = "" diff --git a/html/changelogs/nauticall-relayfixes.yml b/html/changelogs/nauticall-relayfixes.yml new file mode 100644 index 00000000000..d9fedb7afd8 --- /dev/null +++ b/html/changelogs/nauticall-relayfixes.yml @@ -0,0 +1,60 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: nauticall + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixed the sensor relay away site having locked airlocks and undeconstructable windows, alongside other misc changes." + - rscadd: "Performed other various map tweaks and cleanup to the sensor relay." + - imageadd: "Added a generic variant of the sensor relay's sensor suite, intended for other away sites. Replaced the sensor relay's Solarian paintjob into its own variant." diff --git a/icons/obj/machinery/sensors_relay.dmi b/icons/obj/machinery/sensors_relay.dmi index 2ff751ccef6..1f4d45430cb 100644 Binary files a/icons/obj/machinery/sensors_relay.dmi and b/icons/obj/machinery/sensors_relay.dmi differ diff --git a/icons/obj/machinery/sensors_relay_sol.dmi b/icons/obj/machinery/sensors_relay_sol.dmi new file mode 100644 index 00000000000..0b71d1ecaec Binary files /dev/null and b/icons/obj/machinery/sensors_relay_sol.dmi differ diff --git a/maps/away/away_site/sensor_relay/sensor_relay.dm b/maps/away/away_site/sensor_relay/sensor_relay.dm index 0ec1a45830c..ee3ce0f01b4 100644 --- a/maps/away/away_site/sensor_relay/sensor_relay.dm +++ b/maps/away/away_site/sensor_relay/sensor_relay.dm @@ -1,13 +1,16 @@ /datum/map_template/ruin/away_site/sensor_relay name = "sensor relay" - description = "A ring-shaped installation with a powerful sensor suite. These stations were originally built during the pre-Interstellar War era by the Solarian Alliance’s Department of Colonization as a method of making interstellar travel safer. Thousands of these “beacon stations” were built by the Alliance and many were abandoned during the Interstellar War and its aftermath. While they have been mostly replaced in more developed sectors, such as Liberty’s Cradle and the Jewel Worlds, beacon stations are still a common sight in less developed sectors of the Orion Spur such as the Badlands and Weeping Stars." - + description = "A ring-shaped installation with a powerful sensor suite. These stations were originally built during the pre-Interstellar War era by the Solarian Alliance's \ + Department of Colonization as a method of making interstellar travel safer. Thousands of these 'beacon stations' were built by the Alliance and many were abandoned during the \ + Interstellar War and its aftermath. While they have been mostly replaced in more developed sectors, such as Liberty's Cradle and the Jewel Worlds, beacon stations are still \ + a common sight in less developed sectors of the Orion Spur such as the Badlands and Weeping Stars." prefix = "away_site/sensor_relay/" suffixes = list("sensor_relay.dmm") sectors = ALL_POSSIBLE_SECTORS id = "sensor_relay" template_flags = TEMPLATE_FLAG_SPAWN_GUARANTEED + sectors_blacklist = list(SECTOR_LEMURIAN_SEA) //because finding a sensor relay in hell would be weird unit_test_groups = list(1) @@ -20,7 +23,10 @@ icon = 'icons/obj/overmap/overmap_stationary.dmi' icon_state = "sensor_relay" color = COLOR_STEEL - desc = "A ring-shaped installation with a powerful sensor suite. These stations were originally built during the pre-Interstellar War era by the Solarian Alliance’s Department of Colonization as a method of making interstellar travel safer. Thousands of these “beacon stations” were built by the Alliance and many were abandoned during the Interstellar War and its aftermath. While they have been mostly replaced in more developed sectors, such as Liberty’s Cradle and the Jewel Worlds, beacon stations are still a common sight in less developed sectors of the Orion Spur such as the Badlands and Weeping Stars." + desc = "A ring-shaped installation with a powerful sensor suite. These stations were originally built during the pre-Interstellar War era by the Solarian Alliance's \ + Department of Colonization as a method of making interstellar travel safer. Thousands of these 'beacon stations' were built by the Alliance and many were abandoned during the \ + Interstellar War and its aftermath. While they have been mostly replaced in more developed sectors, such as Liberty's Cradle and the Jewel Worlds, beacon stations are still \ + a common sight in less developed sectors of the Orion Spur such as the Badlands and Weeping Stars." comms_support = TRUE comms_name = "Sensor Relay" initial_generic_waypoints = list( @@ -110,3 +116,11 @@ /obj/effect/shuttle_landmark/sensor_relay/southeast name = "Sensor Relay - Space, Southeast" landmark_tag = "relay_se" + +/obj/effect/shuttle_landmark/sensor_relay/east + name = "Sensor Relay - Space, East" + landmark_tag = "relay_e" + +/obj/effect/shuttle_landmark/sensor_relay/west + name = "Sensor Relay - Space, West" + landmark_tag = "relay_w" diff --git a/maps/away/away_site/sensor_relay/sensor_relay.dmm b/maps/away/away_site/sensor_relay/sensor_relay.dmm index ae2f7f2a5c1..090bed34b31 100644 --- a/maps/away/away_site/sensor_relay/sensor_relay.dmm +++ b/maps/away/away_site/sensor_relay/sensor_relay.dmm @@ -619,10 +619,6 @@ }, /turf/simulated/floor/plating, /area/sensor_relay/airlocks) -"act" = ( -/obj/structure/lattice, -/turf/space, -/area/space) "acL" = ( /obj/effect/floor_decal/corner/dark_green{ dir = 6 @@ -634,18 +630,6 @@ /obj/machinery/vending/hydronutrients, /turf/simulated/floor/tiled, /area/sensor_relay/hydroponics) -"adc" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/lattice/catwalk/indoor, -/turf/simulated/floor/airless, -/area/sensor_relay) "ado" = ( /obj/random/junk{ pixel_x = -13; @@ -664,15 +648,6 @@ /obj/random/dirt_75, /turf/simulated/floor/tiled/freezer, /area/sensor_relay/quarters) -"adF" = ( -/obj/effect/map_effect/marker/airlock{ - master_tag = "sensor_relay_int"; - name = "sensor_relay_int" - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/cyan, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, -/area/sensor_relay/airlocks) "adM" = ( /obj/structure/lattice/catwalk/indoor, /obj/effect/shuttle_landmark/sensor_relay/south_docking{ @@ -704,24 +679,6 @@ }, /turf/simulated/floor/tiled/white, /area/sensor_relay/dining) -"adT" = ( -/obj/machinery/door/airlock/external, -/obj/effect/map_effect/marker/airlock{ - master_tag = "sensor_relay_eng"; - name = "sensor_relay_eng" - }, -/obj/effect/map_effect/marker_helper/airlock/interior, -/obj/machinery/access_button{ - pixel_x = -28; - pixel_y = 12; - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/dark, -/area/sensor_relay/airlocks) "adZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -787,19 +744,6 @@ /obj/random/dirt_75, /turf/simulated/floor/tiled/dark, /area/sensor_relay/maintenance) -"aer" = ( -/obj/effect/map_effect/marker/airlock{ - master_tag = "sensor_relay_int"; - name = "sensor_relay_int" - }, -/obj/machinery/door/airlock/external, -/obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/machinery/access_button{ - pixel_x = 28 - }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/full, -/area/sensor_relay/airlocks) "aet" = ( /obj/structure/toilet{ pixel_y = 15 @@ -818,15 +762,6 @@ /obj/random/dirt_75, /turf/simulated/floor/carpet/rubber, /area/sensor_relay/workshop) -"afC" = ( -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/lattice/catwalk/indoor, -/turf/simulated/floor/airless, -/area/sensor_relay) "afL" = ( /obj/effect/floor_decal/industrial/warning/corner, /obj/machinery/atmospherics/unary/outlet_injector{ @@ -851,30 +786,6 @@ /obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/dark, /area/sensor_relay/maintenance) -"agb" = ( -/obj/effect/map_effect/marker/airlock{ - master_tag = "sensor_relay_int"; - name = "sensor_relay_int" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, -/area/sensor_relay/airlocks) -"agi" = ( -/obj/machinery/door/airlock/external, -/obj/effect/map_effect/marker/airlock{ - master_tag = "sensor_relay_eng"; - name = "sensor_relay_eng" - }, -/obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/machinery/access_button{ - pixel_x = 28 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/dark, -/area/sensor_relay/airlocks) "agF" = ( /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/universal{ @@ -974,9 +885,6 @@ }, /turf/simulated/floor/tiled/full, /area/sensor_relay/dining) -"aht" = ( -/turf/space, -/area/space) "ahL" = ( /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor/plating, @@ -1040,35 +948,6 @@ /obj/machinery/computer/ship/sensors/terminal, /turf/simulated/floor/carpet/rubber, /area/sensor_relay/monitoring) -"aiL" = ( -/obj/effect/map_effect/marker/airlock{ - master_tag = "sensor_relay_eng"; - name = "sensor_relay_eng" - }, -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 8; - pixel_y = -6; - pixel_x = 20 - }, -/obj/machinery/airlock_sensor{ - pixel_x = 20; - dir = 8; - pixel_y = 6 - }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 1; - frequency = 1337; - id_tag = "merchant_shuttle_dock_pump" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/light/colored/red{ - dir = 8 - }, -/obj/random/junk, -/turf/simulated/floor/tiled/dark, -/area/sensor_relay/airlocks) "aiP" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -1082,17 +961,6 @@ /obj/structure/railing/mapped, /turf/simulated/floor/airless, /area/sensor_relay) -"aiS" = ( -/obj/structure/table/rack, -/obj/item/stack/material/glass/full, -/obj/item/stack/material/glass/reinforced/full, -/obj/item/stack/material/plasteel/full, -/obj/item/stack/material/steel/full, -/obj/item/stack/rods/full, -/obj/item/stack/material/plastic/full, -/obj/item/stack/material/wood/full, -/turf/simulated/floor/tiled/dark/full, -/area/sensor_relay/maintenance) "aiW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate, @@ -1335,18 +1203,6 @@ /obj/structure/railing/mapped, /turf/simulated/floor/airless, /area/sensor_relay) -"anf" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4 - }, -/obj/effect/map_effect/marker/airlock{ - master_tag = "sensor_relay_ext"; - name = "sensor_relay_ext" - }, -/obj/machinery/light/colored/red, -/obj/random/dirt_75, -/turf/simulated/floor/tiled/bitile, -/area/sensor_relay/airlocks) "ani" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -1377,22 +1233,6 @@ /obj/random/junk, /turf/simulated/floor/tiled/dark, /area/sensor_relay/maintenance) -"aoe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/map_effect/marker/airlock{ - master_tag = "sensor_relay_int"; - name = "sensor_relay_int" - }, -/obj/effect/map_effect/marker_helper/airlock/interior, -/obj/machinery/access_button{ - pixel_x = 28; - pixel_y = 12; - dir = 1 - }, -/obj/machinery/door/airlock/external, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/full, -/area/sensor_relay/airlocks) "aoD" = ( /obj/machinery/door/airlock/generic{ dir = 4; @@ -1428,10 +1268,6 @@ /obj/machinery/alarm/east, /turf/simulated/floor/tiled/white, /area/sensor_relay/quarters) -"aoW" = ( -/obj/machinery/shipsensors/strong/relay, -/turf/simulated/floor/airless, -/area/sensor_relay) "apv" = ( /obj/structure/sink{ pixel_y = 28 @@ -1475,63 +1311,6 @@ /obj/random/dirt_75, /turf/simulated/floor/tiled, /area/sensor_relay/hydroponics) -"aqs" = ( -/obj/structure/table/rack, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/random/dirt_75, -/obj/item/clothing/shoes/workboots, -/obj/item/clothing/shoes/workboots, -/obj/item/clothing/head/hardhat/orange, -/obj/item/clothing/head/hardhat/orange, -/obj/item/clothing/gloves/yellow, -/obj/item/clothing/gloves/yellow, -/obj/structure/sign/poster{ - pixel_x = -32 - }, -/obj/item/storage/box/fancy/cigarettes/dromedaryco, -/turf/simulated/floor/tiled, -/area/sensor_relay/quarters) -"aqB" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/airless, -/area/sensor_relay) -"aqP" = ( -/obj/structure/closet/secure_closet/freezer, -/obj/effect/floor_decal/corner/black/diagonal, -/obj/random/dirt_75, -/obj/item/reagent_containers/food/snacks/meat/undead, -/obj/item/reagent_containers/food/snacks/meat/undead, -/obj/item/reagent_containers/food/snacks/meat/undead, -/obj/item/reagent_containers/food/snacks/meat/undead, -/obj/item/reagent_containers/food/snacks/meat/undead, -/obj/machinery/power/apc/empty/east, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/obj/random/seed, -/obj/random/tech_supply, -/turf/simulated/floor/tiled/white, -/area/sensor_relay/dining) "arb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -1604,20 +1383,6 @@ /obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/airless, /area/sensor_relay) -"asz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/effect/map_effect/marker/airlock{ - master_tag = "sensor_relay_ext"; - name = "sensor_relay_ext" - }, -/obj/effect/map_effect/marker_helper/airlock/interior, -/obj/machinery/access_button{ - pixel_x = 28 - }, -/obj/machinery/door/airlock/external, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/full, -/area/sensor_relay/airlocks) "asU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 1 @@ -1667,64 +1432,6 @@ }, /turf/simulated/floor/tiled, /area/sensor_relay) -"atm" = ( -/obj/machinery/power/tracker, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/simulated/floor/airless, -/area/sensor_relay) -"atR" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 1 - }, -/obj/effect/map_effect/marker/airlock{ - master_tag = "sensor_relay_ext"; - name = "sensor_relay_ext" - }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, -/area/sensor_relay/airlocks) -"atU" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4 - }, -/obj/effect/map_effect/marker/airlock{ - master_tag = "sensor_relay_int"; - name = "sensor_relay_int" - }, -/obj/machinery/airlock_sensor{ - pixel_x = -20; - dir = 4 - }, -/obj/random/dirt_75, -/turf/simulated/floor/tiled/bitile{ - dir = 1 - }, -/area/sensor_relay/airlocks) -"auj" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 8 - }, -/obj/effect/map_effect/marker/airlock{ - master_tag = "sensor_relay_ext"; - name = "sensor_relay_ext" - }, -/obj/machinery/light/colored/red, -/obj/random/dirt_75, -/turf/simulated/floor/tiled/bitile, -/area/sensor_relay/airlocks) -"auE" = ( -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/power/solar_control, -/obj/machinery/light/colored/decayed{ - dir = 1 - }, -/turf/simulated/floor/airless, -/area/sensor_relay) "auV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -1750,19 +1457,6 @@ /obj/machinery/power/portgen/basic, /turf/simulated/floor/plating, /area/sensor_relay/maintenance) -"awh" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 8 - }, -/obj/effect/map_effect/marker/airlock{ - master_tag = "sensor_relay_ext"; - name = "sensor_relay_ext" - }, -/obj/random/dirt_75, -/turf/simulated/floor/tiled/bitile{ - dir = 1 - }, -/area/sensor_relay/airlocks) "awj" = ( /obj/structure/cable/yellow{ d2 = 8; @@ -1770,18 +1464,6 @@ }, /turf/simulated/floor/airless, /area/sensor_relay) -"awr" = ( -/obj/structure/table/steel, -/obj/item/rfd/construction{ - pixel_y = 7 - }, -/obj/item/stack/cable_coil/yellow, -/obj/random/junk, -/obj/structure/extinguisher_cabinet/west, -/obj/item/stack/cable_coil/yellow, -/obj/item/blueprints, -/turf/simulated/floor/tiled/dark/full, -/area/sensor_relay/maintenance) "awM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -1890,22 +1572,6 @@ }, /turf/simulated/floor/tiled/white, /area/sensor_relay/dining) -"ayY" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/cyan, -/obj/effect/map_effect/marker/airlock{ - master_tag = "sensor_relay_ext"; - name = "sensor_relay_ext" - }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, -/area/sensor_relay/airlocks) -"aza" = ( -/obj/structure/bed/padded, -/obj/item/bedsheet/dorms, -/obj/random/dirt_75, -/obj/random/plushie, -/turf/simulated/floor/carpet/green, -/area/sensor_relay/quarters) "azs" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/corner/dark_green{ @@ -2054,47 +1720,6 @@ /obj/effect/shuttle_landmark/sensor_relay/northeast, /turf/template_noop, /area/space) -"aBF" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 8 - }, -/obj/effect/map_effect/marker/airlock{ - master_tag = "sensor_relay_int"; - name = "sensor_relay_int" - }, -/obj/machinery/light/colored/red{ - dir = 4 - }, -/obj/random/dirt_75, -/turf/simulated/floor/tiled/bitile, -/area/sensor_relay/airlocks) -"aBL" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4 - }, -/obj/effect/map_effect/marker/airlock{ - master_tag = "sensor_relay_int"; - name = "sensor_relay_int" - }, -/obj/machinery/light/colored/red{ - dir = 8 - }, -/obj/random/dirt_75, -/turf/simulated/floor/tiled/bitile, -/area/sensor_relay/airlocks) -"aBW" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/airless, -/area/sensor_relay) "aDh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -2118,24 +1743,6 @@ }, /turf/simulated/floor/carpet/rubber, /area/sensor_relay/workshop) -"aDk" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/airless, -/area/sensor_relay) "aDq" = ( /obj/machinery/door/airlock/generic{ dir = 1; @@ -2155,19 +1762,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/sensor_relay/workshop) -"aDw" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/airless, -/area/sensor_relay) "aDE" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 4 @@ -2184,26 +1778,6 @@ /obj/structure/extinguisher_cabinet/south, /turf/simulated/floor/tiled/full, /area/sensor_relay/dining) -"aDP" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4 - }, -/obj/effect/map_effect/marker/airlock{ - master_tag = "sensor_relay_ext"; - name = "sensor_relay_ext" - }, -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - pixel_y = 28 - }, -/obj/machinery/airlock_sensor{ - pixel_x = -20; - dir = 4 - }, -/obj/random/dirt_75, -/turf/simulated/floor/tiled/bitile{ - dir = 1 - }, -/area/sensor_relay/airlocks) "aDR" = ( /obj/structure/lattice/catwalk/indoor, /obj/structure/railing/mapped{ @@ -2341,26 +1915,6 @@ /obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/sensor_relay/maintenance) -"aFJ" = ( -/obj/structure/table/steel, -/obj/machinery/cell_charger{ - pixel_y = 9; - pixel_x = 1 - }, -/obj/item/stack/material/graphite/full, -/obj/machinery/light/colored/decayed{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/outline_straight/yellow{ - dir = 1 - }, -/obj/item/cell/high{ - pixel_y = 10 - }, -/obj/random/tool, -/obj/item/inflatable/wall, -/turf/simulated/floor/tiled/dark/full, -/area/sensor_relay/maintenance) "aGQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -2707,21 +2261,6 @@ /obj/item/storage/box/fancy/cigarettes/dromedaryco, /turf/simulated/floor/tiled/white, /area/sensor_relay/janitor) -"aOC" = ( -/obj/effect/map_effect/marker/airlock{ - master_tag = "sensor_relay_ext"; - name = "sensor_relay_ext" - }, -/obj/machinery/door/airlock/external, -/obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/machinery/access_button{ - pixel_x = 28; - pixel_y = 12; - dir = 1 - }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/full, -/area/sensor_relay/airlocks) "aOK" = ( /obj/structure/cable/yellow{ d2 = 4; @@ -2799,21 +2338,6 @@ /obj/item/device/radio/intercom/ship/south, /turf/simulated/floor/tiled/full, /area/sensor_relay/dining) -"aRq" = ( -/obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/light/colored/decayed{ - dir = 8 - }, -/obj/random/dirt_75, -/obj/random/junk, -/obj/item/toy/comic{ - pixel_y = 16 - }, -/turf/simulated/floor/tiled, -/area/sensor_relay/quarters) "aRK" = ( /obj/effect/floor_decal/corner/dark_green{ dir = 5 @@ -2827,22 +2351,6 @@ /obj/machinery/portable_atmospherics/powered/pump/filled, /turf/simulated/floor/tiled, /area/sensor_relay/hydroponics) -"aRL" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ - pixel_y = 7; - pixel_x = -6 - }, -/obj/item/reagent_containers/food/drinks/bottle/vintage_wine{ - pixel_y = 11; - pixel_x = 5 - }, -/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/rocks{ - pixel_y = 2; - pixel_x = 4 - }, -/turf/simulated/floor/tiled, -/area/sensor_relay/quarters) "aSa" = ( /obj/structure/cable/yellow{ icon_state = "0-8" @@ -2931,6 +2439,13 @@ }, /turf/simulated/floor/tiled/white, /area/sensor_relay/quarters) +"aUr" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor/airless, +/area/sensor_relay) "aUM" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/blue, /obj/machinery/portable_atmospherics/canister/air, @@ -3001,24 +2516,6 @@ }, /turf/simulated/floor/tiled, /area/sensor_relay) -"aVK" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/airless, -/area/sensor_relay) "aVZ" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -3141,22 +2638,6 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/tiled, /area/sensor_relay) -"aZI" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 8 - }, -/obj/effect/map_effect/marker/airlock{ - master_tag = "sensor_relay_int"; - name = "sensor_relay_int" - }, -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - pixel_y = 28 - }, -/obj/random/dirt_75, -/turf/simulated/floor/tiled/bitile{ - dir = 1 - }, -/area/sensor_relay/airlocks) "aZK" = ( /turf/simulated/wall, /area/sensor_relay/airlocks) @@ -3184,6 +2665,63 @@ }, /turf/simulated/floor/airless, /area/sensor_relay) +"csG" = ( +/obj/machinery/door/airlock/external, +/obj/effect/map_effect/marker/airlock{ + master_tag = "sensor_relay_eng"; + name = "sensor_relay_eng"; + req_one_access = null + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/machinery/access_button{ + pixel_x = 28 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, +/area/sensor_relay/airlocks) +"cxA" = ( +/obj/structure/window_frame/empty, +/obj/structure/grille/over, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/structure/inflatable/wall, +/turf/simulated/floor/plating, +/area/sensor_relay/dining) +"cAk" = ( +/obj/effect/floor_decal/spline/fancy{ + dir = 4 + }, +/obj/random/dirt_75, +/obj/machinery/computer/ship/sensors/terminal{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/sensor_relay/quarters) +"cOx" = ( +/turf/space/dynamic, +/area/space) +"cPG" = ( +/obj/machinery/door/airlock/external, +/obj/effect/map_effect/marker/airlock{ + master_tag = "sensor_relay_eng"; + name = "sensor_relay_eng"; + req_one_access = null + }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/machinery/access_button{ + pixel_x = -28; + pixel_y = 12; + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, +/area/sensor_relay/airlocks) "cQd" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/corner/dark_green{ @@ -3193,6 +2731,20 @@ /obj/effect/decal/cleanable/floor_damage/random_tiled_broken, /turf/simulated/floor/tiled, /area/sensor_relay/hydroponics) +"cUv" = ( +/obj/structure/table/steel, +/obj/random/junk, +/obj/structure/extinguisher_cabinet/west, +/obj/item/clothing/head/hardhat/orange, +/obj/item/clothing/head/hardhat/orange, +/obj/item/stack/cable_coil/yellow, +/obj/item/stack/cable_coil/yellow, +/obj/item/rfd/construction{ + pixel_y = 7 + }, +/obj/item/blueprints, +/turf/simulated/floor/tiled/dark/full, +/area/sensor_relay/maintenance) "cVf" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 @@ -3205,12 +2757,99 @@ }, /turf/simulated/floor/airless, /area/sensor_relay) +"dhZ" = ( +/obj/structure/table/rack, +/obj/item/stack/material/glass/full, +/obj/item/stack/material/glass/reinforced/full, +/obj/item/stack/material/plasteel/full, +/obj/item/stack/material/steel/full, +/obj/item/stack/rods/full, +/obj/item/stack/material/plastic/full, +/obj/item/stack/material/wood/full, +/obj/item/clothing/shoes/workboots, +/obj/item/clothing/shoes/workboots, +/turf/simulated/floor/tiled/dark/full, +/area/sensor_relay/maintenance) "djv" = ( /turf/simulated/wall, /area/sensor_relay/dining) +"drD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/effect/map_effect/marker/airlock{ + master_tag = "sensor_relay_int"; + name = "sensor_relay_int"; + req_one_access = null + }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/machinery/access_button{ + pixel_x = 28; + pixel_y = 12; + dir = 1 + }, +/obj/machinery/door/airlock/external, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, +/area/sensor_relay/airlocks) "duP" = ( /turf/simulated/wall, /area/sensor_relay/maintenance) +"dAx" = ( +/obj/structure/bed/padded, +/obj/item/bedsheet/dorms, +/obj/random/dirt_75, +/obj/random/plushie, +/obj/structure/curtain/open, +/turf/simulated/floor/carpet/green, +/area/sensor_relay/quarters) +"dJS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/sign/poster{ + pixel_x = -32 + }, +/obj/structure/filingcabinet/chestdrawer{ + pixel_x = -6 + }, +/obj/structure/filingcabinet{ + pixel_x = 9 + }, +/turf/simulated/floor/tiled, +/area/sensor_relay/quarters) +"dKL" = ( +/obj/structure/table/wood, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/light/colored/decayed{ + dir = 8 + }, +/obj/random/dirt_75, +/obj/random/junk, +/obj/item/toy/comic{ + pixel_y = 16 + }, +/obj/item/storage/box/fancy/cigarettes/dromedaryco, +/turf/simulated/floor/tiled, +/area/sensor_relay/quarters) +"dMq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/map_effect/marker/airlock{ + master_tag = "sensor_relay_ext"; + name = "sensor_relay_ext"; + req_one_access = null + }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/machinery/access_button{ + pixel_x = 28 + }, +/obj/machinery/door/airlock/external, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, +/area/sensor_relay/airlocks) "dSQ" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 6 @@ -3247,6 +2886,54 @@ }, /turf/simulated/floor/tiled, /area/sensor_relay) +"dXn" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "sensor_relay_ext"; + name = "sensor_relay_ext"; + req_one_access = null + }, +/obj/machinery/light/colored/red, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/bitile, +/area/sensor_relay/airlocks) +"dYh" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 4 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "sensor_relay_ext"; + name = "sensor_relay_ext"; + req_one_access = null + }, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + pixel_y = 28 + }, +/obj/machinery/airlock_sensor{ + pixel_x = -20; + dir = 4 + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/bitile{ + dir = 1 + }, +/area/sensor_relay/airlocks) +"elW" = ( +/obj/effect/map_effect/marker/airlock{ + master_tag = "sensor_relay_int"; + name = "sensor_relay_int"; + req_one_access = null + }, +/obj/machinery/door/airlock/external, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/machinery/access_button{ + pixel_x = 28 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, +/area/sensor_relay/airlocks) "enO" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -3273,6 +2960,20 @@ }, /turf/simulated/floor/airless, /area/sensor_relay) +"eNn" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor/airless, +/area/sensor_relay) "ePV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -3286,6 +2987,42 @@ }, /turf/simulated/floor/tiled, /area/sensor_relay) +"eVO" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/bottle/whiskey{ + pixel_y = 7; + pixel_x = -6 + }, +/obj/item/reagent_containers/food/drinks/bottle/vintage_wine{ + pixel_y = 11; + pixel_x = 5 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/rocks{ + pixel_y = 2; + pixel_x = 4 + }, +/obj/structure/extinguisher_cabinet/west, +/turf/simulated/floor/tiled, +/area/sensor_relay/quarters) +"eYp" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor/airless, +/area/sensor_relay) "ffz" = ( /obj/effect/floor_decal/industrial/warning{ dir = 9 @@ -3302,13 +3039,6 @@ /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor/plating, /area/sensor_relay/dining) -"fCA" = ( -/obj/structure/window_frame, -/obj/structure/grille/over, -/obj/structure/inflatable/wall, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/sensor_relay) "fHz" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -3320,6 +3050,12 @@ /obj/item/ore/glass, /turf/simulated/floor/airless, /area/sensor_relay) +"gca" = ( +/obj/effect/shuttle_landmark/sensor_relay/east{ + dir = 8 + }, +/turf/template_noop, +/area/space) "gnJ" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 6 @@ -3334,11 +3070,29 @@ /obj/item/reagent_containers/inhaler/pneumalin, /turf/simulated/floor/tiled, /area/sensor_relay) -"gvY" = ( -/obj/structure/lattice, -/obj/item/hullbeacon/red, -/turf/space, -/area/space) +"gpi" = ( +/obj/effect/map_effect/marker/airlock{ + master_tag = "sensor_relay_int"; + name = "sensor_relay_int"; + req_one_access = null + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/sensor_relay/airlocks) +"gyQ" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 4 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "sensor_relay_ext"; + name = "sensor_relay_ext"; + req_one_access = null + }, +/obj/machinery/light/colored/red, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/bitile, +/area/sensor_relay/airlocks) "gQM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -3355,15 +3109,20 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/sensor_relay/airlocks) -"gTQ" = ( -/obj/structure/window_frame, -/obj/structure/grille/over, -/obj/machinery/door/firedoor{ - dir = 4 +"hov" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8 }, -/obj/structure/inflatable/wall, -/turf/simulated/floor/plating, -/area/sensor_relay) +/obj/effect/map_effect/marker/airlock{ + master_tag = "sensor_relay_ext"; + name = "sensor_relay_ext"; + req_one_access = null + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/bitile{ + dir = 1 + }, +/area/sensor_relay/airlocks) "hty" = ( /obj/machinery/light/colored/decayed{ dir = 4 @@ -3408,15 +3167,6 @@ /obj/structure/extinguisher_cabinet/west, /turf/simulated/floor/tiled, /area/sensor_relay) -"iJt" = ( -/obj/structure/window_frame, -/obj/structure/grille/over, -/obj/machinery/door/firedoor{ - dir = 4 - }, -/obj/structure/inflatable/wall, -/turf/simulated/floor/plating, -/area/sensor_relay/quarters) "iRa" = ( /obj/item/hullbeacon/red, /turf/simulated/floor/airless, @@ -3435,6 +3185,12 @@ }, /turf/simulated/floor/tiled, /area/sensor_relay) +"jgn" = ( +/obj/effect/shuttle_landmark/sensor_relay/west{ + dir = 4 + }, +/turf/template_noop, +/area/space) "jhT" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 @@ -3467,6 +3223,15 @@ /obj/item/reagent_containers/food/snacks/sliceable/cheesewheel, /turf/simulated/floor/tiled/white, /area/sensor_relay/dining) +"kkM" = ( +/obj/structure/window_frame/empty, +/obj/structure/grille/over, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/structure/inflatable/wall, +/turf/simulated/floor/plating, +/area/sensor_relay) "kmb" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/corner/dark_green{ @@ -3533,16 +3298,22 @@ }, /turf/simulated/floor/airless, /area/sensor_relay) -"lxf" = ( -/obj/structure/bed/padded, -/obj/item/bedsheet/dorms, -/obj/random/junk, -/turf/simulated/floor/carpet/green, -/area/sensor_relay/quarters) "lyl" = ( /obj/random/dirt_75, /turf/simulated/floor/tiled/dark, /area/sensor_relay/maintenance) +"lzH" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ + dir = 1 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "sensor_relay_ext"; + name = "sensor_relay_ext"; + req_one_access = null + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/sensor_relay/airlocks) "lPj" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 @@ -3578,19 +3349,40 @@ }, /turf/simulated/floor/airless, /area/sensor_relay) -"mQU" = ( -/obj/structure/window_frame, -/obj/structure/grille/over, -/obj/machinery/door/firedoor{ - dir = 4 - }, -/obj/structure/inflatable/wall, -/turf/simulated/floor/plating, -/area/sensor_relay/dining) "mWz" = ( /obj/effect/shuttle_landmark/sensor_relay/southwest, /turf/template_noop, /area/space) +"njD" = ( +/obj/effect/map_effect/marker/airlock{ + master_tag = "sensor_relay_eng"; + name = "sensor_relay_eng"; + req_one_access = null + }, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 8; + pixel_y = -6; + pixel_x = 20 + }, +/obj/machinery/airlock_sensor{ + pixel_x = 20; + dir = 8; + pixel_y = 6 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1337; + id_tag = "merchant_shuttle_dock_pump" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/light/colored/red{ + dir = 8 + }, +/obj/random/junk, +/turf/simulated/floor/tiled/dark, +/area/sensor_relay/airlocks) "nBw" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -3602,6 +3394,60 @@ /obj/random/dirt_75, /turf/simulated/floor/tiled, /area/sensor_relay) +"oad" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor/airless, +/area/sensor_relay) +"ogA" = ( +/obj/machinery/power/solar_control{ + dir = 1 + }, +/obj/machinery/light/colored/decayed{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/turf/simulated/floor/airless, +/area/sensor_relay) +"ohn" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor/airless, +/area/sensor_relay) +"ojq" = ( +/obj/machinery/shipsensors/strong/relay/sol, +/turf/simulated/floor/airless, +/area/sensor_relay) +"otx" = ( +/obj/structure/lattice, +/obj/item/hullbeacon/red, +/turf/space/dynamic, +/area/space) "oCr" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -3618,6 +3464,21 @@ }, /turf/simulated/floor/airless, /area/sensor_relay) +"oEI" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 4 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "sensor_relay_int"; + name = "sensor_relay_int"; + req_one_access = null + }, +/obj/machinery/light/colored/red{ + dir = 8 + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/bitile, +/area/sensor_relay/airlocks) "oEY" = ( /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor/plating, @@ -3634,6 +3495,16 @@ }, /turf/simulated/floor/airless, /area/sensor_relay) +"pnq" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/cyan, +/obj/effect/map_effect/marker/airlock{ + master_tag = "sensor_relay_ext"; + name = "sensor_relay_ext"; + req_one_access = null + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/sensor_relay/airlocks) "pta" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/airless, @@ -3652,6 +3523,42 @@ /obj/structure/extinguisher_cabinet/south, /turf/simulated/floor/tiled, /area/sensor_relay) +"pxW" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "sensor_relay_int"; + name = "sensor_relay_int"; + req_one_access = null + }, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + pixel_y = 28 + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/bitile{ + dir = 1 + }, +/area/sensor_relay/airlocks) +"pyw" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor/airless, +/area/sensor_relay) "pOh" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 10 @@ -3723,15 +3630,28 @@ }, /turf/simulated/floor/tiled, /area/sensor_relay) -"qUV" = ( -/obj/structure/window_frame, -/obj/structure/grille/over, -/obj/machinery/door/firedoor{ - dir = 4 +"rdm" = ( +/obj/structure/table/steel, +/obj/machinery/cell_charger{ + pixel_y = 9; + pixel_x = 1 }, -/obj/structure/inflatable/wall, -/turf/simulated/floor/plating, -/area/sensor_relay/hydroponics) +/obj/item/stack/material/graphite/full, +/obj/machinery/light/colored/decayed{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_straight/yellow{ + dir = 1 + }, +/obj/item/cell/high{ + pixel_y = 10 + }, +/obj/random/tool, +/obj/item/inflatable/wall, +/obj/item/clothing/gloves/yellow, +/obj/item/clothing/gloves/yellow, +/turf/simulated/floor/tiled/dark/full, +/area/sensor_relay/maintenance) "roM" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 5 @@ -3746,6 +3666,15 @@ }, /turf/simulated/floor/airless, /area/sensor_relay/airlocks) +"rEY" = ( +/obj/structure/window_frame/empty, +/obj/structure/grille/over, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/structure/inflatable/wall, +/turf/simulated/floor/plating, +/area/sensor_relay/quarters) "rLb" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -3754,6 +3683,22 @@ /obj/item/ore/uranium, /turf/simulated/floor/airless, /area/sensor_relay) +"scO" = ( +/obj/effect/map_effect/marker/airlock{ + master_tag = "sensor_relay_ext"; + name = "sensor_relay_ext"; + req_one_access = null + }, +/obj/machinery/door/airlock/external, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/machinery/access_button{ + pixel_x = 28; + pixel_y = 12; + dir = 1 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, +/area/sensor_relay/airlocks) "sxi" = ( /obj/effect/floor_decal/industrial/warning{ dir = 5 @@ -3814,6 +3759,13 @@ }, /turf/simulated/floor/tiled, /area/sensor_relay) +"tmx" = ( +/obj/structure/bed/padded, +/obj/item/bedsheet/dorms, +/obj/random/junk, +/obj/structure/curtain/open, +/turf/simulated/floor/carpet/green, +/area/sensor_relay/quarters) "tus" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -3842,6 +3794,16 @@ /obj/effect/decal/cleanable/floor_damage/random_carpet_broken, /turf/simulated/floor/carpet/green, /area/sensor_relay/quarters) +"tSw" = ( +/obj/effect/map_effect/marker/airlock{ + master_tag = "sensor_relay_int"; + name = "sensor_relay_int"; + req_one_access = null + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/cyan, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/sensor_relay/airlocks) "uhc" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -3944,11 +3906,46 @@ }, /turf/simulated/floor/airless, /area/space) +"vkC" = ( +/obj/structure/window_frame/empty, +/obj/structure/grille/over, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/structure/inflatable/wall, +/turf/simulated/floor/plating, +/area/sensor_relay/hydroponics) +"vmy" = ( +/obj/structure/lattice, +/turf/space/dynamic, +/area/space) +"vnz" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "sensor_relay_int"; + name = "sensor_relay_int"; + req_one_access = null + }, +/obj/machinery/light/colored/red{ + dir = 4 + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/bitile, +/area/sensor_relay/airlocks) "vOo" = ( /obj/structure/lattice/catwalk/indoor, /obj/item/hullbeacon/red, /turf/simulated/floor/airless, /area/sensor_relay) +"vXX" = ( +/obj/machinery/power/tracker, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/space/dynamic, +/area/sensor_relay) "vYn" = ( /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor/plating, @@ -3969,6 +3966,24 @@ }, /turf/simulated/floor/tiled, /area/sensor_relay/airlocks) +"wsW" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 4 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "sensor_relay_int"; + name = "sensor_relay_int"; + req_one_access = null + }, +/obj/machinery/airlock_sensor{ + pixel_x = -20; + dir = 4 + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/bitile{ + dir = 1 + }, +/area/sensor_relay/airlocks) "wAM" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -4024,20 +4039,6 @@ }, /turf/simulated/floor/tiled, /area/sensor_relay/hydroponics) -"wXv" = ( -/obj/structure/extinguisher_cabinet/east, -/obj/structure/filingcabinet/chestdrawer{ - pixel_x = -6 - }, -/obj/structure/filingcabinet{ - pixel_x = 9 - }, -/obj/effect/floor_decal/spline/fancy{ - dir = 4 - }, -/obj/random/dirt_75, -/turf/simulated/floor/tiled, -/area/sensor_relay/quarters) "xdX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -4050,6 +4051,26 @@ }, /turf/simulated/floor/tiled, /area/sensor_relay/airlocks) +"xyP" = ( +/obj/structure/closet/secure_closet/freezer, +/obj/effect/floor_decal/corner/black/diagonal, +/obj/random/dirt_75, +/obj/item/reagent_containers/food/snacks/meat/undead, +/obj/item/reagent_containers/food/snacks/meat/undead, +/obj/item/reagent_containers/food/snacks/meat/undead, +/obj/item/reagent_containers/food/snacks/meat/undead, +/obj/item/reagent_containers/food/snacks/meat/undead, +/obj/machinery/power/apc/empty/east, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/random/seed, +/obj/random/tech_supply, +/obj/item/ore/coal, +/obj/item/ore/coal, +/turf/simulated/floor/tiled/white, +/area/sensor_relay/dining) "xCv" = ( /obj/item/ore/coal, /turf/simulated/floor/airless, @@ -4058,6 +4079,20 @@ /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor/plating, /area/sensor_relay/airlocks) +"xXj" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor/airless, +/area/sensor_relay) "yif" = ( /obj/effect/shuttle_landmark/sensor_relay/southeast, /turf/template_noop, @@ -21924,7 +21959,7 @@ anw anw anw anw -anw +jgn anw anw anw @@ -27053,27 +27088,27 @@ anw anw anw anw -aht -aht -aht -gvY -act -act -aht -act -act -act -aht -act -act -act -aht -act -act -gvY -aht -aht -aht +cOx +cOx +cOx +otx +vmy +vmy +cOx +vmy +vmy +vmy +cOx +vmy +vmy +vmy +cOx +vmy +vmy +otx +cOx +cOx +cOx anw anw anw @@ -27310,27 +27345,27 @@ anw anw anw anw -aht -aht -act -act -act -act -act -act -act -act -act -act -act -act -act -act -act -act -act -aht -aht +cOx +cOx +vmy +vmy +vmy +vmy +vmy +vmy +vmy +vmy +vmy +vmy +vmy +vmy +vmy +vmy +vmy +vmy +vmy +cOx +cOx anw anw anw @@ -27567,27 +27602,27 @@ anw anw anw anw -aht +cOx aEs -aBW +ohn aQE -aht +cOx aEs -aBW +ohn aQE -aht +cOx aEs -aBW +ohn aQE -aht +cOx aEs -aBW +ohn aQE -aht +cOx aEs -aBW +ohn aQE -aht +cOx anw anw anw @@ -27824,27 +27859,27 @@ anw anw anw anw -aht +cOx aEs -aVK +eYp aQE -aht +cOx aEs -aVK +eYp aQE -aht +cOx aEs -aVK +eYp aQE -aht +cOx aEs -aVK +eYp aQE -aht +cOx aEs -aVK +eYp aQE -aht +cOx anw anw anw @@ -28081,27 +28116,27 @@ anw anw anw anw -act +vmy aEs -aVK +eYp aQE -act +vmy aEs -aVK +eYp aQE -act +vmy aEs -aVK +eYp aQE -act +vmy aEs -aVK +eYp aQE -act +vmy aEs -aVK +eYp aQE -act +vmy anw anw anw @@ -28338,27 +28373,27 @@ anw anw anw anw -aht +cOx aEs -aVK +eYp aQE -aht +cOx aEs -aVK +eYp aQE -aht +cOx aEs -aVK +eYp aQE -aht +cOx aEs -aVK +eYp aQE -aht +cOx aEs -aVK +eYp aQE -aht +cOx anw anw anw @@ -28595,27 +28630,27 @@ anw anw anw anw -aht +cOx aEs -aVK +eYp aQE -aht +cOx aEs -aVK +eYp aQE -aht +cOx aEs -aVK +eYp aQE -aht +cOx aEs -aVK +eYp aQE -aht +cOx aEs -aVK +eYp aQE -aht +cOx anw anw anw @@ -28852,27 +28887,27 @@ anw anw anw anw -act +vmy aEs -aVK +eYp aQE -act +vmy aEs -aVK +eYp aQE -act +vmy aEs -aVK +eYp aQE -act +vmy aEs -aVK +eYp aQE -act +vmy aEs -aVK +eYp aQE -act +vmy anw anw anw @@ -29094,6 +29129,7 @@ anw anw anw anw +sHu anw anw anw @@ -29108,28 +29144,27 @@ anw anw anw anw -anw -aht +cOx aEs -aVK +eYp aQE -aht +cOx aEs -aVK +eYp aQE -aht +cOx aEs -aVK +eYp aQE -aht +cOx aEs -aVK +eYp aQE -aht +cOx aEs -aVK +eYp aQE -aht +cOx anw anw anw @@ -29366,27 +29401,27 @@ anw anw anw anw -aht +cOx aEs -aVK +eYp aQE -aht +cOx aEs -aVK +eYp aQE -aht +cOx aEs -aVK +eYp aQE -aht +cOx aEs -aVK +eYp aQE -aht +cOx aEs -aVK +eYp aQE -aht +cOx anw anw anw @@ -29623,27 +29658,27 @@ anw anw anw anw -act +vmy aEs -aqB +oad aQE -act +vmy aEs -aqB +oad aQE -act +vmy aEs -aqB +oad aQE -act +vmy aEs -aqB +oad aQE -act +vmy aEs -aqB +oad aQE -act +vmy anw anw anw @@ -29880,27 +29915,27 @@ anw anw anw anw -aht +cOx aEs -aqB +oad aQE -aht +cOx aEs -aqB +oad aQE -aht +cOx aEs -aqB +oad aQE -aht +cOx aEs -aqB +oad aQE -aht +cOx aEs -aqB +oad aQE -aht +cOx anw anw anw @@ -30137,28 +30172,27 @@ anw anw anw anw -aht +cOx aEs -aqB +oad aQE -aht +cOx aEs -aqB +oad aQE -aht +cOx aEs -aqB +oad aQE -aht +cOx aEs -aqB +oad aQE -aht +cOx aEs -aqB +oad aQE -aht -anw +cOx anw anw anw @@ -30170,6 +30204,7 @@ anw anw anw anw +mWz anw anw anw @@ -30394,27 +30429,27 @@ anw anw anw anw -act +vmy aEs -aqB +oad aQE -act +vmy aEs -aqB +oad aQE -act +vmy aEs -aqB +oad aQE -act +vmy aEs -aqB +oad aQE -act +vmy aEs -aqB +oad aQE -act +vmy anw anw anw @@ -30651,27 +30686,27 @@ anw anw anw anw -aht +cOx aEs -aqB +oad aQE -aht +cOx aEs -aqB +oad aQE -aht +cOx aEs -aqB +oad aQE -aht +cOx aEs -aqB +oad aQE -aht +cOx aEs -aqB +oad aQE -aht +cOx anw anw anw @@ -30884,7 +30919,6 @@ anw anw anw anw -sHu anw anw anw @@ -30908,27 +30942,28 @@ anw anw anw anw -aht +anw +cOx aEs -aVK +eYp aQE -aht +cOx aEs -aVK +eYp aQE -aht +cOx aEs -aVK +eYp aQE -aht +cOx aEs -aVK +eYp aQE -aht +cOx aEs -aVK +eYp aQE -aht +cOx anw anw anw @@ -31165,27 +31200,27 @@ anw anw anw anw -act +vmy aEs -aVK +eYp aQE -act +vmy aEs -aVK +eYp aQE -act +vmy aEs -aVK +eYp aQE -act +vmy aEs -aVK +eYp aQE -act +vmy aEs -aVK +eYp aQE -act +vmy anw anw anw @@ -31422,27 +31457,27 @@ anw anw anw anw -aht -act +cOx +vmy awj -act -act -act +vmy +vmy +vmy awj -act -act -act +vmy +vmy +vmy awj -act -act -act +vmy +vmy +vmy awj -act -act -act +vmy +vmy +vmy awj -act -aht +vmy +cOx anw anw anw @@ -31679,8 +31714,8 @@ anw anw anw anw -aht -aht +cOx +cOx aZQ aZQ aZQ @@ -31698,8 +31733,8 @@ aZQ aZQ aZQ aZQ -aht -aht +cOx +cOx anw anw anw @@ -31936,27 +31971,28 @@ anw anw anw anw -aht -aht +cOx +cOx aZQ -act -act -act -act -act -act -act +vmy +vmy +vmy +vmy +vmy +vmy +vmy aLN -act -act -act -act -act -act -act +vmy +vmy +vmy +vmy +vmy +vmy +vmy aZQ -aht -aht +cOx +anw +anw anw anw anw @@ -31982,7 +32018,6 @@ anw anw anw anw -mWz anw anw anw @@ -32460,7 +32495,7 @@ djv djv fvm fvm -mQU +cxA djv aZQ aZQ @@ -32723,7 +32758,7 @@ fvm uRP uRP mqZ -qUV +vkC uRP uRP aZn @@ -33486,7 +33521,7 @@ aab aYF djv apC -aqP +xyP jYY aac ajn @@ -33747,7 +33782,7 @@ djv ajJ ahr ajJ -ajJ +djv uRP aRK aAf @@ -34011,7 +34046,7 @@ aag aah aKu mqZ -adc +aUr aiP anw anw @@ -34268,7 +34303,7 @@ acL aFs aIJ uRP -auE +aZQ aZn anw anw @@ -34778,9 +34813,9 @@ aAD pvG duP aWD -aiS -awr -aFJ +dhZ +cUv +rdm aaP duP aZn @@ -35030,7 +35065,7 @@ aEA aEA aef deH -fCA +kkM aao aap aaN @@ -35271,14 +35306,14 @@ anw anw rwy aZK -aDP -anf +dYh +gyQ aZK wjT aWd xVr -atU -aBL +wsW +oEI xVr aKh aEA @@ -35527,20 +35562,20 @@ anw anw anw evX -aOC -atR -ayY -asz +scO +lzH +pnq +dMq aIA adZ -aoe -adF -agb -aer +drD +tSw +gpi +elW sWe aEA deH -aoW +ojq pta aEA deH @@ -35785,14 +35820,14 @@ anw anw rwy aZK -awh -auj +hov +dXn aZK xdX abV aZK -aZI -aBF +pxW +vnz aZK mDs aEA @@ -36322,9 +36357,9 @@ duP abx aFB aiy -adT -aiL -agi +cPG +njD +csG ajd anw anw @@ -36566,8 +36601,8 @@ aDE liO aEg ahL -gTQ -gTQ +kkM +kkM aEg ahL ahL @@ -36817,7 +36852,7 @@ anw asy aEg ahL -gTQ +kkM aEg iXH aba @@ -36833,13 +36868,13 @@ aej abf ijN aNP -aqs +dJS asV -aRq -aRL +dKL +eVO aNP -afC -aMa +ogA +aZn anw anw anw @@ -37093,10 +37128,10 @@ aLA abk ahN aIy -wXv +cAk vYn -aZn -anw +eNn +aMa anw anw anw @@ -37607,7 +37642,7 @@ aNP ayE jOf aiX -lxf +tmx aNP aZn anw @@ -38121,7 +38156,7 @@ aNP axZ jOf tLJ -aza +dAx aNP aZn anw @@ -38377,7 +38412,7 @@ aNP aNP aNP vYn -iJt +rEY aNP aNP aZn @@ -39132,27 +39167,27 @@ anw anw anw anw -aht -aht +cOx +cOx aZQ -act -act -act -act -act -act -act +vmy +vmy +vmy +vmy +vmy +vmy +vmy aSa -act -act -act -act -act -act -act +vmy +vmy +vmy +vmy +vmy +vmy +vmy aZQ -aht -aht +cOx +anw anw anw anw @@ -39389,8 +39424,8 @@ anw anw anw anw -aht -aht +cOx +cOx aZQ aZQ aZQ @@ -39408,8 +39443,8 @@ aZQ aZQ aZQ aZQ -aht -aht +cOx +cOx anw anw anw @@ -39646,27 +39681,27 @@ anw anw anw anw -aht -act +cOx +vmy aOK -act -act -act +vmy +vmy +vmy aOK -act -act -act +vmy +vmy +vmy aOK -act -act -act +vmy +vmy +vmy aOK -act -act -act +vmy +vmy +vmy aOK -act -aht +vmy +cOx anw anw anw @@ -39877,7 +39912,6 @@ anw anw anw anw -aBm anw anw anw @@ -39903,27 +39937,28 @@ anw anw anw anw -act +anw +vmy aEs -aDk +pyw aQE -act +vmy aEs -aDk +pyw aQE -act +vmy aEs -aDk +pyw aQE -act +vmy aEs -aDk +pyw aQE -act +vmy aEs -aDk +pyw aQE -act +vmy anw anw anw @@ -40160,27 +40195,27 @@ anw anw anw anw -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx anw anw anw @@ -40417,27 +40452,27 @@ anw anw anw anw -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx anw anw anw @@ -40674,27 +40709,28 @@ anw anw anw anw -act +vmy aEs -aDk +pyw aQE -act +vmy aEs -aDk +pyw aQE -act +vmy aEs -aDk +pyw aQE -act +vmy aEs -aDk +pyw aQE -act +vmy aEs -aDk +pyw aQE -act +vmy +anw anw anw anw @@ -40714,7 +40750,6 @@ anw anw anw anw -yif anw anw anw @@ -40931,27 +40966,27 @@ anw anw anw anw -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx anw anw anw @@ -41175,6 +41210,7 @@ anw anw anw anw +aBm anw anw anw @@ -41187,28 +41223,27 @@ anw anw anw anw -anw -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx anw anw anw @@ -41445,27 +41480,27 @@ anw anw anw anw -act +vmy aEs -aDk +pyw aQE -act +vmy aEs -aDk +pyw aQE -act +vmy aEs -aDk +pyw aQE -act +vmy aEs -aDk +pyw aQE -act +vmy aEs -aDk +pyw aQE -act +vmy anw anw anw @@ -41702,27 +41737,27 @@ anw anw anw anw -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx anw anw anw @@ -41959,28 +41994,27 @@ anw anw anw anw -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht -anw +cOx anw anw anw @@ -41988,6 +42022,7 @@ anw anw anw anw +yif anw anw anw @@ -42216,27 +42251,27 @@ anw anw anw anw -act +vmy aEs -aDk +pyw aQE -act +vmy aEs -aDk +pyw aQE -act +vmy aEs -aDk +pyw aQE -act +vmy aEs -aDk +pyw aQE -act +vmy aEs -aDk +pyw aQE -act +vmy anw anw anw @@ -42473,27 +42508,27 @@ anw anw anw anw -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx anw anw anw @@ -42730,27 +42765,27 @@ anw anw anw anw -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx anw anw anw @@ -42987,27 +43022,27 @@ anw anw anw anw -act +vmy aEs -aDk +pyw aQE -act +vmy aEs -aDk +pyw aQE -act +vmy aEs -aDk +pyw aQE -act +vmy aEs -aDk +pyw aQE -act +vmy aEs -aDk +pyw aQE -act +vmy anw anw anw @@ -43244,27 +43279,27 @@ anw anw anw anw -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx anw anw anw @@ -43501,27 +43536,27 @@ anw anw anw anw -aht +cOx aEs -aDw +xXj aQE -aht +cOx aEs -aDw +xXj aQE -aht +cOx aEs -aDk +pyw aQE -aht +cOx aEs -aDw +xXj aQE -aht +cOx aEs -aDw +xXj aQE -aht +cOx anw anw anw @@ -43758,27 +43793,27 @@ anw anw anw anw -aht -aht -act -act -act -act -act -act -act -act -atm -act -act -act -act -act -act -act -act -aht -aht +cOx +cOx +vmy +vmy +vmy +vmy +vmy +vmy +vmy +vmy +vXX +vmy +vmy +vmy +vmy +vmy +vmy +vmy +vmy +cOx +cOx anw anw anw @@ -44015,27 +44050,27 @@ anw anw anw anw -aht -aht -aht -gvY -act -act -aht -act -act -act -act -act -act -act -aht -act -act -gvY -aht -aht -aht +cOx +cOx +cOx +otx +vmy +vmy +cOx +vmy +vmy +vmy +vmy +vmy +vmy +vmy +cOx +vmy +vmy +otx +cOx +cOx +cOx anw anw anw @@ -48138,7 +48173,7 @@ anw anw anw anw -anw +gca anw anw anw