From 3b099d8fd0cd69836dbf949af4426383bd7a8faf Mon Sep 17 00:00:00 2001 From: hazelrat <83198434+hazelrat@users.noreply.github.com> Date: Wed, 20 Nov 2024 09:26:33 +0000 Subject: [PATCH] Offsite scattershot changes & fixes (#20172) Touches on the Sol Bunker, Shady Asteroid, and Crashed Elyran offsites to bring them a little closer to standard. Alters balance of the Sol Bunker by giving it a regular airlock that can be cycled. Extends the docking hangar of the Shady Asteroid so that it should(?) support most possible shuttles. Gives the Sol Bunker the old Solarian flag subtype - since it spawns in the Coalition, I assume this is meant to be mid or pre-IW. --- html/changelogs/hazelmouse-buckshot1.yml | 59 + .../crashed_elyran_tanker.dmm | 698 ++- maps/away/away_site/shady/shady.dm | 4 + maps/away/away_site/shady/shady.dmm | 3931 +++++++++-------- maps/away/away_site/sol_bunker/bunker.dm | 12 + maps/away/away_site/sol_bunker/bunker.dmm | 1757 +++++--- 6 files changed, 3547 insertions(+), 2914 deletions(-) create mode 100644 html/changelogs/hazelmouse-buckshot1.yml diff --git a/html/changelogs/hazelmouse-buckshot1.yml b/html/changelogs/hazelmouse-buckshot1.yml new file mode 100644 index 00000000000..53a1867bf1b --- /dev/null +++ b/html/changelogs/hazelmouse-buckshot1.yml @@ -0,0 +1,59 @@ +################################ +# 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: hazelmouse + +# 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: + - rscadd: "Implemented various QoL mapping improvements to the Shady Asteroid, Sol Bunker, and Crashed Elyran Tanker offsites." + - bugfix: "All shuttles should now be able to dock with the Shady Asteroid offsite's primary docking landmarks." diff --git a/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dmm b/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dmm index 99c41e190c0..0211a28c490 100644 --- a/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dmm +++ b/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dmm @@ -1,6 +1,5 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/inflatable/door, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -10,6 +9,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/crashed_elyran_tanker/thruster) "ab" = ( @@ -76,11 +76,13 @@ /area/crashed_elyran_tanker/tanks) "aq" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/firedoor/noid, /obj/machinery/door/airlock/hatch{ dir = 4 }, -/turf/simulated/floor, +/obj/machinery/door/firedoor/noid{ + dir = 8 + }, +/turf/simulated/floor/tiled/full, /area/crashed_elyran_tanker/crew) "av" = ( /obj/effect/floor_decal/industrial/warning{ @@ -141,21 +143,21 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/crashed_elyran_tanker/thruster) "aW" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/crashed_elyran_tanker/thruster) "aX" = ( @@ -189,7 +191,7 @@ dir = 4 }, /obj/structure/lattice, -/turf/template_noop, +/turf/space/dynamic, /area/crashed_elyran_tanker/tanks) "bj" = ( /obj/effect/decal/cleanable/dirt, @@ -242,19 +244,16 @@ /turf/simulated/floor/tiled, /area/crashed_elyran_tanker/bridge) "cl" = ( -/obj/structure/inflatable/wall, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/rust/airless{ - icon_state = "damaged1" - }, -/area/crashed_elyran_tanker/engineering) +/obj/structure/lattice, +/turf/space/dynamic, +/area/space) "cn" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/power/apc/empty/south, /obj/structure/cable{ d2 = 8; icon_state = "0-8" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/crashed_elyran_tanker/thruster) "cr" = ( @@ -321,12 +320,15 @@ dir = 6 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/alarm/east{ + req_one_access = null + }, /turf/simulated/floor/tiled, /area/crashed_elyran_tanker/crew) "dd" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/light/small, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/crashed_elyran_tanker/thruster) "de" = ( @@ -387,11 +389,13 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/firedoor/noid, /obj/machinery/door/airlock/hatch{ dir = 4 }, -/turf/simulated/floor, +/obj/machinery/door/firedoor/noid{ + dir = 8 + }, +/turf/simulated/floor/tiled/full, /area/crashed_elyran_tanker/crew) "du" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ @@ -437,13 +441,6 @@ }, /turf/simulated/floor/reinforced/airless, /area/crashed_elyran_tanker/tanks) -"dQ" = ( -/obj/structure/inflatable/wall, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/rust/airless{ - icon_state = "damaged2" - }, -/area/crashed_elyran_tanker/engineering) "dT" = ( /obj/structure/tank_wall{ density = 0; @@ -670,10 +667,12 @@ dir = 4 }, /obj/structure/lattice, -/turf/template_noop, +/turf/space/dynamic, /area/crashed_elyran_tanker/tanks) "gm" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/grille, +/obj/effect/map_effect/window_spawner/full/shuttle{ + color = "#BDB6AE" + }, /turf/simulated/floor/plating, /area/crashed_elyran_tanker/bridge) "gq" = ( @@ -786,9 +785,7 @@ pixel_x = 4 }, /obj/effect/decal/cleanable/generic, -/turf/simulated/floor/tiled/rust/airless{ - icon_state = "damaged1" - }, +/turf/simulated/floor/tiled/rust/airless, /area/crashed_elyran_tanker/engineering) "hO" = ( /obj/machinery/atmospherics/portables_connector, @@ -932,13 +929,15 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/firedoor/noid, -/turf/simulated/floor, +/obj/machinery/door/firedoor/noid{ + dir = 8 + }, +/turf/simulated/floor/tiled/full, /area/crashed_elyran_tanker/thruster) "ja" = ( /obj/structure/lattice/catwalk, /obj/structure/railing/mapped, -/turf/template_noop, +/turf/space/dynamic, /area/crashed_elyran_tanker/tanks) "jd" = ( /obj/structure/foamedmetal, @@ -1002,9 +1001,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm/south, -/turf/simulated/floor/tiled/rust/airless{ - icon_state = "damaged2" - }, +/turf/simulated/floor/tiled/rust/airless, /area/crashed_elyran_tanker/engineering) "jN" = ( /obj/effect/decal/cleanable/dirt, @@ -1013,6 +1010,9 @@ dir = 8 }, /obj/machinery/portable_atmospherics/canister/empty/air, +/obj/machinery/alarm/north{ + req_one_access = null + }, /turf/simulated/floor/tiled/rust/airless, /area/crashed_elyran_tanker/engineering) "jT" = ( @@ -1088,10 +1088,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, -/obj/item/device/flashlight/lamp{ - pixel_y = 4; - pixel_x = -7 - }, /obj/item/device/gps{ pixel_x = 5 }, @@ -1153,12 +1149,11 @@ pixel_x = -13; pixel_y = 4 }, +/obj/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/crashed_elyran_tanker/crew) -"lB" = ( -/obj/structure/lattice, -/turf/template_noop, -/area/crashed_elyran_tanker/tanks) "lN" = ( /obj/structure/inflatable/wall, /obj/effect/decal/cleanable/dirt, @@ -1190,7 +1185,7 @@ "lT" = ( /obj/structure/lattice, /obj/item/stack/rods, -/turf/template_noop, +/turf/space/dynamic, /area/crashed_elyran_tanker/tanks) "lX" = ( /obj/machinery/portable_atmospherics/canister/empty, @@ -1200,17 +1195,17 @@ "ma" = ( /obj/machinery/atmospherics/valve, /obj/structure/lattice, -/turf/template_noop, +/turf/space/dynamic, /area/crashed_elyran_tanker/tanks) "me" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/machinery/firealarm/north, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/crashed_elyran_tanker/thruster) "mk" = ( @@ -1264,9 +1259,7 @@ "mS" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/girder, -/turf/simulated/floor/tiled/rust/airless{ - icon_state = "damaged5" - }, +/turf/simulated/floor/tiled/rust/airless, /area/crashed_elyran_tanker/engineering) "mU" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black{ @@ -1275,11 +1268,8 @@ /turf/simulated/floor/airless, /area/crashed_elyran_tanker/tanks) "ng" = ( -/obj/structure/inflatable/wall, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/rust/airless{ - icon_state = "damaged3" - }, +/obj/structure/lattice, +/turf/space/dynamic, /area/crashed_elyran_tanker/engineering) "ni" = ( /obj/item/material/shard{ @@ -1289,9 +1279,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 }, -/turf/simulated/floor/tiled/rust/airless{ - icon_state = "damaged2" - }, +/turf/simulated/floor/tiled/rust/airless, /area/crashed_elyran_tanker/engineering) "nq" = ( /obj/effect/decal/cleanable/dirt, @@ -1386,13 +1374,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, /area/crashed_elyran_tanker/thruster) -"od" = ( -/obj/structure/inflatable/wall, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/rust/airless{ - icon_state = "damaged5" - }, -/area/crashed_elyran_tanker/engineering) "oh" = ( /obj/effect/floor_decal/industrial/warning, /obj/effect/decal/cleanable/dirt, @@ -1425,7 +1406,7 @@ /obj/structure/railing/mapped{ dir = 1 }, -/turf/template_noop, +/turf/space/dynamic, /area/crashed_elyran_tanker/tanks) "oL" = ( /obj/machinery/door/airlock/external{ @@ -1476,7 +1457,8 @@ }, /obj/random/junk, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - pixel_y = -32 + pixel_y = -22; + dir = 1 }, /turf/simulated/floor, /area/crashed_elyran_tanker/crew) @@ -1562,9 +1544,7 @@ /area/crashed_elyran_tanker/tanks) "pI" = ( /obj/structure/inflatable/wall, -/turf/simulated/floor/tiled/rust/airless{ - icon_state = "damaged1" - }, +/turf/simulated/floor/tiled/rust/airless, /area/crashed_elyran_tanker/engineering) "pO" = ( /obj/structure/closet, @@ -1653,7 +1633,7 @@ pixel_x = 7; pixel_y = 6 }, -/turf/template_noop, +/turf/space/dynamic, /area/crashed_elyran_tanker/tanks) "qA" = ( /turf/simulated/wall/r_wall, @@ -1666,7 +1646,7 @@ /obj/structure/railing/mapped{ dir = 4 }, -/turf/template_noop, +/turf/space/dynamic, /area/crashed_elyran_tanker/tanks) "qF" = ( /obj/machinery/atmospherics/binary/pump/high_power{ @@ -1714,10 +1694,6 @@ /turf/simulated/wall/shuttle/space_ship, /area/crashed_elyran_tanker/tanks) "qU" = ( -/obj/structure/sign/flag/elyra{ - pixel_y = 32; - pixel_x = -32 - }, /obj/effect/floor_decal/corner/beige{ dir = 9 }, @@ -1747,6 +1723,9 @@ pixel_y = 7 }, /obj/machinery/recharger, +/obj/machinery/alarm/north{ + req_one_access = null + }, /turf/simulated/floor/tiled, /area/crashed_elyran_tanker/bridge) "rD" = ( @@ -1816,9 +1795,7 @@ pixel_x = -3; pixel_y = 3 }, -/turf/simulated/floor/tiled/rust/airless{ - icon_state = "damaged3" - }, +/turf/simulated/floor/tiled/rust/airless, /area/crashed_elyran_tanker/engineering) "sv" = ( /obj/effect/decal/cleanable/dirt, @@ -1861,7 +1838,9 @@ /area/crashed_elyran_tanker/engineering) "sV" = ( /obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/power/apc/empty/south, +/obj/machinery/power/apc/empty/south{ + req_access = null + }, /obj/structure/cable, /turf/simulated/floor, /area/crashed_elyran_tanker/bridge) @@ -1972,17 +1951,15 @@ }, /obj/machinery/atmospherics/pipe/simple/visible/purple, /obj/structure/lattice, -/turf/template_noop, +/turf/space/dynamic, /area/crashed_elyran_tanker/tanks) "ur" = ( /obj/structure/lattice, /obj/structure/railing/mapped, -/turf/template_noop, +/turf/space/dynamic, /area/crashed_elyran_tanker/tanks) "ux" = ( -/turf/simulated/floor/tiled/rust/airless{ - icon_state = "damaged5" - }, +/turf/simulated/floor/tiled/rust/airless, /area/crashed_elyran_tanker/engineering) "uA" = ( /obj/effect/floor_decal/industrial/warning{ @@ -2027,9 +2004,7 @@ "uP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/inflatable/door, -/turf/simulated/floor/tiled/rust/airless{ - icon_state = "damaged3" - }, +/turf/simulated/floor/tiled/rust/airless, /area/crashed_elyran_tanker/engineering) "uZ" = ( /obj/machinery/portable_atmospherics/canister/empty/carbon_dioxide, @@ -2193,6 +2168,9 @@ pixel_x = -1; pixel_y = 5 }, +/obj/machinery/alarm/north{ + req_one_access = null + }, /turf/simulated/floor/tiled, /area/crashed_elyran_tanker/crew) "wW" = ( @@ -2204,11 +2182,13 @@ /turf/simulated/floor/tiled/dark, /area/crashed_elyran_tanker/thruster) "xe" = ( -/obj/machinery/door/firedoor/noid, /obj/machinery/door/airlock/hatch{ dir = 4 }, -/turf/simulated/floor, +/obj/machinery/door/firedoor/noid{ + dir = 8 + }, +/turf/simulated/floor/tiled/full, /area/crashed_elyran_tanker/crew) "xf" = ( /obj/effect/floor_decal/industrial/warning{ @@ -2250,7 +2230,7 @@ /turf/simulated/floor, /area/crashed_elyran_tanker/crew) "xx" = ( -/turf/template_noop, +/turf/space/dynamic, /area/crashed_elyran_tanker/tanks) "xy" = ( /obj/effect/floor_decal/industrial/warning{ @@ -2264,6 +2244,9 @@ dir = 4; pixel_x = 11 }, +/obj/machinery/alarm/south{ + req_one_access = null + }, /turf/simulated/floor/tiled/white, /area/crashed_elyran_tanker/crew) "xC" = ( @@ -2326,7 +2309,7 @@ "xP" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible/black, /obj/structure/lattice, -/turf/template_noop, +/turf/space/dynamic, /area/crashed_elyran_tanker/tanks) "xQ" = ( /obj/effect/floor_decal/industrial/warning, @@ -2349,7 +2332,7 @@ dir = 4 }, /obj/structure/lattice, -/turf/template_noop, +/turf/space/dynamic, /area/crashed_elyran_tanker/tanks) "xX" = ( /obj/machinery/atmospherics/pipe/simple/visible{ @@ -2470,6 +2453,10 @@ "yS" = ( /obj/effect/floor_decal/industrial/warning, /obj/effect/decal/cleanable/dirt, +/obj/item/weldingtool{ + pixel_x = 4; + pixel_y = -7 + }, /turf/simulated/floor/airless, /area/crashed_elyran_tanker/engineering) "yW" = ( @@ -2519,9 +2506,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/button/distress{ - pixel_y = 25 - }, /turf/simulated/floor/tiled, /area/crashed_elyran_tanker/bridge) "zr" = ( @@ -2540,7 +2524,7 @@ "zN" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible/purple, /obj/structure/lattice, -/turf/template_noop, +/turf/space/dynamic, /area/crashed_elyran_tanker/tanks) "zU" = ( /obj/effect/decal/cleanable/dirt, @@ -2553,6 +2537,9 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/alarm/east{ + req_one_access = null + }, /turf/simulated/floor/tiled, /area/crashed_elyran_tanker/crew) "Ab" = ( @@ -2573,18 +2560,20 @@ /area/crashed_elyran_tanker/tanks) "Am" = ( /obj/structure/lattice/catwalk/indoor/grate, -/obj/structure/sign/flag/elyra/large/north, +/obj/structure/sign/flag/elyra/large/north{ + pixel_y = 32 + }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, /area/crashed_elyran_tanker/crew) "Ao" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/crashed_elyran_tanker/thruster) "Ap" = ( @@ -2710,14 +2699,15 @@ /turf/simulated/floor/airless, /area/crashed_elyran_tanker/tanks) "Bs" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/closet/crate/loot, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/crashed_elyran_tanker/thruster) "Bt" = ( /obj/structure/foamedmetal, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - pixel_x = 32 + pixel_x = 26; + dir = 8 }, /turf/simulated/floor/airless, /area/crashed_elyran_tanker/engineering) @@ -2889,6 +2879,9 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/machinery/alarm/south{ + req_one_access = null + }, /turf/simulated/floor/tiled, /area/crashed_elyran_tanker/crew) "CC" = ( @@ -2896,9 +2889,7 @@ pixel_y = 1; pixel_x = -9 }, -/turf/simulated/floor/tiled/rust/airless{ - icon_state = "damaged3" - }, +/turf/simulated/floor/tiled/rust/airless, /area/crashed_elyran_tanker/engineering) "CD" = ( /obj/structure/lattice, @@ -2923,7 +2914,9 @@ dir = 10 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/sign/flag/elyra/large/south, +/obj/structure/sign/flag/elyra/large/south{ + pixel_y = -32 + }, /turf/simulated/floor/tiled, /area/crashed_elyran_tanker/crew) "CP" = ( @@ -3155,8 +3148,8 @@ /turf/simulated/floor/airless, /area/crashed_elyran_tanker/tanks) "FY" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/inflatable/wall, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/crashed_elyran_tanker/thruster) "FZ" = ( @@ -3243,10 +3236,6 @@ }, /area/crashed_elyran_tanker/engineering) "GZ" = ( -/obj/structure/sign/flag/elyra{ - pixel_y = -32; - pixel_x = -32 - }, /obj/effect/floor_decal/corner/beige{ dir = 9 }, @@ -3256,11 +3245,11 @@ /turf/simulated/floor/tiled, /area/crashed_elyran_tanker/bridge) "Hi" = ( -/obj/structure/foamedmetal, -/turf/simulated/floor/tiled/rust/airless{ - icon_state = "damaged3" +/obj/effect/map_effect/window_spawner/full/shuttle{ + color = "#BDB6AE" }, -/area/crashed_elyran_tanker/engineering) +/turf/simulated/floor/plating, +/area/crashed_elyran_tanker/crew) "Hj" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -3301,9 +3290,7 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/tiled/rust/airless{ - icon_state = "damaged1" - }, +/turf/simulated/floor/tiled/rust/airless, /area/crashed_elyran_tanker/engineering) "HB" = ( /obj/item/stack/material/steel, @@ -3340,13 +3327,6 @@ }, /turf/simulated/floor/airless, /area/crashed_elyran_tanker/tanks) -"HO" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/hatch{ - dir = 4 - }, -/turf/simulated/floor, -/area/crashed_elyran_tanker/crew) "HT" = ( /obj/item/pipewrench{ pixel_x = -6; @@ -3415,7 +3395,6 @@ /area/crashed_elyran_tanker/engineering) "Il" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -3429,24 +3408,12 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/crashed_elyran_tanker/thruster) -"Io" = ( -/obj/structure/foamedmetal, -/turf/simulated/floor/tiled/rust/airless{ - icon_state = "damaged2" - }, -/area/crashed_elyran_tanker/engineering) "IA" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/rust/airless{ - icon_state = "damaged5" - }, -/area/crashed_elyran_tanker/engineering) +/turf/space/dynamic, +/area/space) "IE" = ( /obj/machinery/atmospherics/unary/outlet_injector{ frequency = 1441; @@ -3503,7 +3470,7 @@ /obj/machinery/atmospherics/valve{ dir = 4 }, -/turf/template_noop, +/turf/space/dynamic, /area/crashed_elyran_tanker/tanks) "Jm" = ( /obj/effect/decal/cleanable/dirt, @@ -3553,11 +3520,13 @@ "JM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spider/stickyweb, -/obj/machinery/door/firedoor/noid, /obj/machinery/door/airlock/hatch{ dir = 4 }, -/turf/simulated/floor, +/obj/machinery/door/firedoor/noid{ + dir = 8 + }, +/turf/simulated/floor/tiled/full, /area/crashed_elyran_tanker/bridge) "JP" = ( /obj/structure/lattice/catwalk/indoor/grate, @@ -3586,6 +3555,9 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/closet/emcloset, +/obj/machinery/alarm/east{ + req_one_access = null + }, /turf/simulated/floor/tiled, /area/crashed_elyran_tanker/crew) "Ki" = ( @@ -3624,9 +3596,7 @@ pixel_x = 12; pixel_y = 2 }, -/turf/simulated/floor/tiled/rust/airless{ - icon_state = "damaged4" - }, +/turf/simulated/floor/tiled/rust/airless, /area/crashed_elyran_tanker/engineering) "KH" = ( /obj/structure/lattice/catwalk/indoor/grate, @@ -3676,15 +3646,23 @@ /obj/machinery/light{ dir = 1 }, +/obj/structure/sign/flag/elyra{ + pixel_y = 32; + pixel_x = -32; + dir = 1 + }, /turf/simulated/floor/tiled, /area/crashed_elyran_tanker/bridge) "Ld" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/machinery/alarm/south{ + req_one_access = null + }, /turf/simulated/floor, /area/crashed_elyran_tanker/thruster) "Le" = ( @@ -3696,12 +3674,9 @@ /turf/simulated/floor/reinforced/phoron, /area/crashed_elyran_tanker/tanks) "Lf" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/girder, -/turf/simulated/floor/tiled/rust/airless{ - icon_state = "damaged4" - }, -/area/crashed_elyran_tanker/engineering) +/obj/structure/lattice, +/turf/space/dynamic, +/area/crashed_elyran_tanker/tanks) "Lj" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -3724,7 +3699,7 @@ /obj/item/material/shard/shrapnel{ icon_state = "shrapnelmedium" }, -/turf/template_noop, +/turf/space/dynamic, /area/crashed_elyran_tanker/tanks) "Lw" = ( /obj/effect/decal/cleanable/dirt, @@ -3750,14 +3725,6 @@ "LC" = ( /turf/simulated/wall/shuttle/space_ship, /area/crashed_elyran_tanker/bridge) -"LE" = ( -/obj/structure/lattice, -/obj/item/weldingtool{ - pixel_x = 4; - pixel_y = -7 - }, -/turf/template_noop, -/area/space) "LO" = ( /obj/effect/floor_decal/industrial/warning, /obj/effect/decal/cleanable/dirt, @@ -3769,7 +3736,7 @@ /obj/structure/railing/mapped{ dir = 4 }, -/turf/template_noop, +/turf/space/dynamic, /area/crashed_elyran_tanker/tanks) "LT" = ( /obj/effect/floor_decal/corner/beige{ @@ -3832,9 +3799,7 @@ /obj/item/material/shard/shrapnel{ icon_state = "shrapnelmedium" }, -/turf/simulated/floor/tiled/rust/airless{ - icon_state = "damaged1" - }, +/turf/simulated/floor/tiled/rust/airless, /area/crashed_elyran_tanker/engineering) "ME" = ( /obj/effect/floor_decal/corner/beige{ @@ -4031,7 +3996,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 }, -/turf/template_noop, +/turf/space/dynamic, /area/crashed_elyran_tanker/tanks) "On" = ( /obj/effect/floor_decal/corner/beige{ @@ -4096,7 +4061,7 @@ /area/crashed_elyran_tanker/crew) "OS" = ( /obj/structure/lattice/catwalk, -/turf/template_noop, +/turf/space/dynamic, /area/crashed_elyran_tanker/engineering) "OU" = ( /obj/structure/lattice, @@ -4164,7 +4129,7 @@ /area/crashed_elyran_tanker/crew) "Pt" = ( /obj/structure/lattice/catwalk, -/turf/template_noop, +/turf/space/dynamic, /area/crashed_elyran_tanker/tanks) "Pu" = ( /obj/effect/decal/cleanable/dirt, @@ -4177,16 +4142,12 @@ pixel_y = -5; pixel_x = -4 }, -/turf/simulated/floor/tiled/rust/airless{ - icon_state = "damaged2" - }, +/turf/simulated/floor/tiled/rust/airless, /area/crashed_elyran_tanker/engineering) "Pw" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/rust/airless{ - icon_state = "damaged2" - }, +/turf/simulated/floor/tiled/rust/airless, /area/crashed_elyran_tanker/engineering) "PB" = ( /obj/effect/decal/cleanable/dirt, @@ -4227,14 +4188,9 @@ /turf/simulated/floor, /area/crashed_elyran_tanker/thruster) "PH" = ( -/obj/effect/floor_decal/corner/beige{ - dir = 6 - }, -/obj/machinery/light/small{ - dir = 4 - }, /obj/machinery/door/firedoor/noid, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, /area/crashed_elyran_tanker/crew) "PI" = ( /obj/effect/decal/cleanable/dirt, @@ -4445,14 +4401,14 @@ /turf/simulated/floor, /area/crashed_elyran_tanker/crew) "Sf" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/machinery/door/firedoor/noid, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, /area/crashed_elyran_tanker/crew) "Sk" = ( /obj/structure/cable{ @@ -4519,6 +4475,9 @@ /obj/structure/bed/stool/chair/office/bridge/pilot{ dir = 8 }, +/obj/structure/sign/flag/elyra{ + pixel_y = -32 + }, /turf/simulated/floor/tiled, /area/crashed_elyran_tanker/bridge) "Tl" = ( @@ -4537,12 +4496,6 @@ "Tn" = ( /turf/simulated/floor/reinforced/carbon_dioxide, /area/crashed_elyran_tanker/tanks) -"Ts" = ( -/obj/structure/foamedmetal, -/turf/simulated/floor/tiled/rust/airless{ - icon_state = "damaged5" - }, -/area/crashed_elyran_tanker/engineering) "Tu" = ( /obj/effect/floor_decal/industrial/warning, /obj/effect/decal/cleanable/generic{ @@ -4604,9 +4557,7 @@ d2 = 4; icon_state = "2-4" }, -/turf/simulated/floor/tiled/rust/airless{ - icon_state = "damaged5" - }, +/turf/simulated/floor/tiled/rust/airless, /area/crashed_elyran_tanker/engineering) "TP" = ( /obj/machinery/atmospherics/pipe/simple/visible{ @@ -4631,7 +4582,7 @@ /area/crashed_elyran_tanker/tanks) "TU" = ( /obj/structure/lattice/catwalk, -/turf/template_noop, +/turf/space/dynamic, /area/space) "TZ" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ @@ -4659,6 +4610,9 @@ "Uw" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm/east, +/obj/machinery/alarm/south{ + req_one_access = null + }, /turf/simulated/floor/tiled, /area/crashed_elyran_tanker/bridge) "Uz" = ( @@ -4764,7 +4718,7 @@ "Vv" = ( /obj/machinery/portable_atmospherics/canister/empty/carbon_dioxide, /obj/effect/decal/cleanable/dirt, -/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/crashed_elyran_tanker/thruster) "Vx" = ( @@ -4862,9 +4816,7 @@ /area/crashed_elyran_tanker/tanks) "Wg" = ( /obj/structure/inflatable/door, -/turf/simulated/floor/tiled/rust/airless{ - icon_state = "damaged5" - }, +/turf/simulated/floor/tiled/rust/airless, /area/crashed_elyran_tanker/engineering) "Wi" = ( /obj/structure/lattice, @@ -4917,7 +4869,8 @@ /area/crashed_elyran_tanker/tanks) "WO" = ( /obj/machinery/embedded_controller/radio/airlock/docking_port{ - pixel_x = 32 + pixel_x = 24; + dir = 8 }, /turf/simulated/floor, /area/crashed_elyran_tanker/crew) @@ -4954,7 +4907,7 @@ /obj/machinery/door/airlock/hatch{ dir = 1 }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/full, /area/crashed_elyran_tanker/crew) "WZ" = ( /obj/machinery/door/airlock/hatch{ @@ -4966,7 +4919,7 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor/noid, -/turf/simulated/floor, +/turf/simulated/floor/tiled/full, /area/crashed_elyran_tanker/engineering) "Xd" = ( /obj/effect/decal/cleanable/dirt, @@ -5077,17 +5030,12 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/reinforced/airless, /area/crashed_elyran_tanker/tanks) -"Yf" = ( -/obj/structure/lattice, -/obj/structure/girder, -/turf/template_noop, -/area/space) "Yh" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, -/turf/template_noop, +/turf/space/dynamic, /area/crashed_elyran_tanker/tanks) "Yk" = ( /obj/machinery/atmospherics/pipe/manifold/visible/purple, @@ -5334,7 +5282,9 @@ dir = 9 }, /obj/effect/decal/cleanable/generic, -/obj/structure/sign/flag/elyra/large/north, +/obj/structure/sign/flag/elyra/large/north{ + pixel_y = 32 + }, /obj/item/trash/cigbutt{ pixel_x = 3; pixel_y = -8 @@ -25782,7 +25732,7 @@ Dg Dg Dg Dg -Kp +Dg Dg Dg qu @@ -26036,10 +25986,10 @@ Dg qu qu Dg -Kp -Kp -Kp -Kp +Dg +Dg +Dg +Dg Dg Dg Bj @@ -26295,8 +26245,8 @@ qu tA qA qA -Yf -Yf +Dg +Dg Dg tA qu @@ -29641,7 +29591,7 @@ jr qN qN FE -lB +Lf CD ih qN @@ -29898,8 +29848,8 @@ mE mE Nd Vc -lB -lB +Lf +Lf oQ dG Ss @@ -31182,7 +31132,7 @@ tS Yw mQ fw -lB +Lf Yh Wt CD @@ -32204,7 +32154,7 @@ Dg Dg Dg or -lB +Lf uc gc PY @@ -32219,7 +32169,7 @@ gc kg BG Id -lB +Lf ja Dg Dg @@ -33238,10 +33188,10 @@ gc gc gc fw -lB +Lf Jl Jl -lB +Lf HG gc gc @@ -34260,7 +34210,7 @@ Dg Dg Dg or -lB +Lf uc Tn YM @@ -34275,7 +34225,7 @@ nK et pB Fr -lB +Lf Pt Dg Dg @@ -34533,7 +34483,7 @@ de dT OF xx -lB +Lf Dg Dg Dg @@ -34790,7 +34740,7 @@ QV xf Dk xx -lB +Lf Dg Dg Dg @@ -35047,7 +34997,7 @@ gc Sk fw xx -lB +Lf Dg Dg Dg @@ -35294,17 +35244,17 @@ gc gc gc fw -lB +Lf Jl Jl -lB +Lf HG gc gc Sk fw -lB -lB +Lf +Lf Dg Dg Dg @@ -35544,7 +35494,7 @@ Dg Dg Dg Dg -lB +Lf xx yb gc @@ -35561,7 +35511,7 @@ gc Sk fw xx -lB +Lf Dg Dg Dg @@ -35818,7 +35768,7 @@ uA Yt Dk xx -lB +Lf Dg Dg Dg @@ -36316,7 +36266,7 @@ Dg Dg Dg or -lB +Lf HK bV UG @@ -36331,7 +36281,7 @@ Wr HE hz CQ -lB +Lf ja Dg Dg @@ -37350,7 +37300,7 @@ gc gc vu fw -lB +Lf Jl xx qz @@ -37866,7 +37816,7 @@ hb Dk xx gl -lB +Lf xx Dk wc @@ -38372,7 +38322,7 @@ Dg Dg Dg or -lB +Lf uc mE Qr @@ -38387,8 +38337,8 @@ gc QR Sk Id -lB -lB +Lf +Lf Dg qu qu @@ -38645,7 +38595,7 @@ Qp Fl Ew xx -lB +Lf Dg qu qu @@ -38902,7 +38852,7 @@ KL qK Dk xx -lB +Lf tA qu qu @@ -39158,7 +39108,7 @@ gc gc Sk fw -lB +Lf CD SA qu @@ -39400,22 +39350,22 @@ gm gm gm gm -lB +Lf HG gc zi di Nd -lB +Lf Yh Oi -lB +Lf HG Xw zi Sk fw -lB +Lf CD SA SA @@ -39657,7 +39607,7 @@ qj jg Rp gm -lB +Lf HG gc zi @@ -39914,7 +39864,7 @@ zk XU Tj LC -lB +Lf HG gc HZ @@ -40445,9 +40395,9 @@ Sk As GS yK -Ts -od -dQ +Ry +yZ +yZ yK yi yi @@ -40701,11 +40651,11 @@ gc ae oh VD -Hi -dQ -Lf -ng -dQ +Ry +yZ +mS +yZ +yZ yi yi qu @@ -40949,8 +40899,8 @@ mE Gq le le -EK -EK +Hi +Hi le le mE @@ -40958,7 +40908,7 @@ mE cw VT GS -Io +Ry uP Pu BF @@ -41201,8 +41151,8 @@ JM LC le le -EK -EK +Hi +Hi le le ZP @@ -41215,7 +41165,7 @@ YY oL Sq Sq -cl +yZ yZ CC mS @@ -42244,7 +42194,7 @@ pO vT Bv sn -IA +HA TL xL Sq @@ -43008,7 +42958,7 @@ kl Ov le le -HO +aq le Sq EG @@ -43513,9 +43463,9 @@ cr Sc vr le -Kp -Kp -Kp +cl +cl +cl Th Th iY @@ -43526,7 +43476,7 @@ Th uG bj ji -hj +ng Sq Ry uH @@ -43770,10 +43720,10 @@ le le le le -Kp -Dg -Kp -Kp +cl +IA +cl +cl Th Ao nu @@ -43783,7 +43733,7 @@ lq Kz Ci ji -hj +ng Sq Sq wh @@ -44024,13 +43974,13 @@ Xj Me eJ le -Kp -Kp -Kp -Kp -Dg -Kp -Kp +cl +cl +cl +cl +IA +cl +cl Th Il eT @@ -44281,12 +44231,12 @@ nW it Pl Pl -Kp -Dg -Dg -Dg -Dg -Kp +cl +IA +IA +IA +IA +cl Th Th me @@ -44297,8 +44247,8 @@ Th Th ZJ cP -Kp -Dg +cl +IA qu yi qu @@ -44306,7 +44256,7 @@ mN VE Vx xM -LE +Dg Dg Dg Dg @@ -44537,13 +44487,13 @@ ph MP PI Pl -Kp -Kp -Kp -Dg -Kp -Kp -Kp +cl +cl +cl +cl +cl +cl +cl Th VN aS @@ -44554,16 +44504,16 @@ FY Th ZJ cP -Kp -Dg +cl +IA qu qu qu -Kp +cl aL Dd yS -Kp +Dg Dg Dg Dg @@ -44811,16 +44761,16 @@ pm Th ZJ cP -Kp -Dg +cl +IA qu qu -Dg -Kp +IA +cl YH nq Vi -Kp +Dg Dg Dg Dg @@ -45051,13 +45001,13 @@ EK Xj Zd Pl -Kp -Kp -Kp -Dg -Kp -Kp -Kp +cl +cl +cl +cl +cl +cl +cl Th PZ Og @@ -45068,12 +45018,12 @@ OH gf dY hQ -Kp +cl qu qu qu -Dg -Kp +IA +cl QB nq mK @@ -45309,12 +45259,12 @@ ac uD Pl Pl -Kp -Dg -Dg -Dg -Dg -Kp +cl +IA +IA +IA +IA +cl Th Yq hU @@ -45325,12 +45275,12 @@ ok AE IX cP -Kp +cl qu qu -Dg -Dg -Kp +IA +IA +cl Hj nq mK @@ -45566,12 +45516,12 @@ fd HJ Hp Pl -Kp -Dg -Dg -Dg -Dg -Kp +cl +IA +IA +IA +IA +cl Th Th kE @@ -45582,12 +45532,12 @@ Th Th gF Cr -Kp -Dg -Dg -Dg -Dg -Kp +cl +IA +IA +IA +IA +cl Hj nq mK @@ -45823,28 +45773,28 @@ pj DB pa Pl -Kp -Dg -Dg -Dg -Dg -Kp -Kp +cl +cl +cl +cl +cl +cl +cl Th bo nX lp YE Th -Kp -Kp -Kp -Kp -Dg -Dg -Dg -Dg -Kp +cl +cl +cl +cl +cl +cl +cl +cl +cl Hj nV Yb @@ -46080,28 +46030,28 @@ Fd Vk Pl Pl -Kp -Kp -Kp -Kp -Kp -Kp -Kp +TU +TU +TU +TU +TU +TU +TU Th xX PF PF NG Th -Kp -Kp -Kp -Kp -Kp -Kp -Kp -Kp -Kp +TU +TU +TU +TU +TU +TU +TU +TU +TU Hj nV Yb @@ -46343,7 +46293,7 @@ Dg Dg Dg Dg -Kp +Dg Th PM PM @@ -46358,7 +46308,7 @@ Dg Dg Dg Dg -Kp +Dg av nV mK @@ -46600,7 +46550,7 @@ Dg Dg Dg Dg -Kp +Dg Th KM KM @@ -46615,7 +46565,7 @@ Dg Dg Dg Dg -Kp +Dg iE qM Yb diff --git a/maps/away/away_site/shady/shady.dm b/maps/away/away_site/shady/shady.dm index 93815204f6b..4bacd673a33 100644 --- a/maps/away/away_site/shady/shady.dm +++ b/maps/away/away_site/shady/shady.dm @@ -22,6 +22,10 @@ desc = "An asteroid with a hangar carved out inside it. Scans detect an unregistered structure within, with multiple lifeforms present." icon_state = "object" +/obj/effect/map_effect/marker/airlock/shady + name = "Entrance Airlock" + master_tag = "airlock_shady" + /area/hideout area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP name = "hideout outpost" diff --git a/maps/away/away_site/shady/shady.dmm b/maps/away/away_site/shady/shady.dmm index 8c2a0cac03b..820f05454ba 100644 --- a/maps/away/away_site/shady/shady.dmm +++ b/maps/away/away_site/shady/shady.dmm @@ -436,7 +436,7 @@ dir = 8 }, /obj/structure/lattice/catwalk/indoor/grate/old, -/turf/simulated/floor/tiled/asteroid, +/turf/simulated/floor/plating, /area/hideout) "fY" = ( /obj/effect/floor_decal/spline/fancy{ @@ -871,6 +871,10 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/effect/decal/cleanable/blood/no_dry, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1 + }, +/obj/effect/map_effect/marker/airlock/shady, /turf/simulated/floor/tiled, /area/hideout) "mj" = ( @@ -978,6 +982,16 @@ /mob/living/simple_animal/hostile/giant_spider, /turf/simulated/floor/tiled, /area/hideout) +"nr" = ( +/obj/machinery/door/airlock/external, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/obj/effect/map_effect/marker/airlock/shady, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/floor_decal/industrial/hatch/red, +/turf/simulated/floor/tiled/full, +/area/hideout) "nB" = ( /obj/structure/lattice/catwalk/indoor/grate/old, /obj/machinery/light/small, @@ -1135,12 +1149,6 @@ /obj/random/civgun/rifle, /turf/simulated/floor/tiled, /area/hideout) -"qr" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/exoplanet/asteroid/ash, -/area/mine) "qu" = ( /obj/structure/lattice/catwalk/indoor/grate/old, /obj/effect/decal/cleanable/dirt, @@ -1265,7 +1273,7 @@ /obj/effect/floor_decal/spline/plain/black{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/visible{ +/obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, /turf/simulated/floor/tiled, @@ -1337,7 +1345,16 @@ "tH" = ( /obj/effect/decal/cleanable/blood/no_dry, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled, +/obj/machinery/door/airlock/external, +/obj/effect/map_effect/marker/airlock/shady, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/machinery/access_button{ + pixel_x = -26; + pixel_y = -27; + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch/red, +/turf/simulated/floor/tiled/full, /area/hideout) "tI" = ( /obj/effect/decal/cleanable/dirt, @@ -1477,6 +1494,20 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /obj/effect/decal/cleanable/blood/no_dry, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/obj/effect/map_effect/marker/airlock/shady, +/obj/machinery/airlock_sensor{ + pixel_x = -24; + dir = 4; + pixel_y = -6 + }, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + pixel_y = 7; + dir = 4; + pixel_x = -25 + }, /turf/simulated/floor/tiled, /area/hideout) "vA" = ( @@ -2445,6 +2476,15 @@ "LI" = ( /turf/simulated/wall/shuttle/raider, /area/mine) +"LL" = ( +/obj/effect/decal/cleanable/blood/no_dry, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/external, +/obj/effect/map_effect/marker/airlock/shady, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/floor_decal/industrial/hatch/red, +/turf/simulated/floor/tiled/full, +/area/hideout) "LV" = ( /mob/living/simple_animal/hostile/giant_spider/hunter, /obj/effect/decal/cleanable/dirt, @@ -2718,11 +2758,20 @@ /turf/simulated/floor/plating, /area/hideout) "Qv" = ( -/obj/effect/map_effect/airlock/long/square{ - required_access = null +/obj/machinery/door/airlock/external, +/obj/effect/map_effect/marker/airlock/shady, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/machinery/access_button{ + pixel_x = 33; + pixel_y = 7; + dir = 1 }, -/turf/simulated/wall/shuttle/raider, -/area/mine) +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/hatch/red, +/turf/simulated/floor/tiled/full, +/area/hideout) "QD" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed/stool/bar/padded, @@ -2733,6 +2782,16 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /obj/effect/decal/cleanable/blood/no_dry, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1 + }, +/obj/effect/map_effect/marker/airlock/shady, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/hideout) "QF" = ( @@ -14022,18 +14081,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC ae DC DC @@ -14112,6 +14159,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (44,1,1) = {" DC @@ -21983,18 +22042,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -22176,6 +22223,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (76,1,1) = {" DC @@ -22234,18 +22293,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -22428,6 +22475,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (77,1,1) = {" DC @@ -22485,18 +22544,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -22680,6 +22727,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (78,1,1) = {" DC @@ -22737,18 +22796,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -22932,6 +22979,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (79,1,1) = {" DC @@ -22989,6 +23048,68 @@ DC DC DC DC +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk DC DC DC @@ -23001,68 +23122,6 @@ DC DC DC DC -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk DC DC DC @@ -23240,6 +23299,68 @@ DC DC DC DC +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk DC DC DC @@ -23252,68 +23373,6 @@ DC DC DC DC -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk DC DC DC @@ -23492,18 +23551,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -23688,6 +23735,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (82,1,1) = {" DC @@ -23743,18 +23802,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -23940,6 +23987,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (83,1,1) = {" DC @@ -23994,18 +24053,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -24192,6 +24239,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (84,1,1) = {" DC @@ -24245,18 +24304,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -24444,6 +24491,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (85,1,1) = {" DC @@ -24497,18 +24556,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -24696,6 +24743,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (86,1,1) = {" DC @@ -24749,18 +24808,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -24948,6 +24995,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (87,1,1) = {" DC @@ -25001,18 +25060,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -25200,6 +25247,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (88,1,1) = {" DC @@ -25253,18 +25312,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -25452,6 +25499,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (89,1,1) = {" DC @@ -25504,18 +25563,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -25704,6 +25751,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (90,1,1) = {" DC @@ -25755,18 +25814,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -25956,6 +26003,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (91,1,1) = {" DC @@ -26007,18 +26066,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -26208,6 +26255,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (92,1,1) = {" DC @@ -26259,18 +26318,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -26460,6 +26507,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (93,1,1) = {" DC @@ -26511,18 +26570,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -26712,6 +26759,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (94,1,1) = {" DC @@ -26763,18 +26822,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -26964,6 +27011,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (95,1,1) = {" DC @@ -27015,18 +27074,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -27216,6 +27263,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (96,1,1) = {" DC @@ -27267,18 +27326,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -27468,6 +27515,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (97,1,1) = {" DC @@ -27519,18 +27578,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -27720,6 +27767,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (98,1,1) = {" DC @@ -27764,18 +27823,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -27972,6 +28019,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (99,1,1) = {" DC @@ -28014,18 +28073,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -28224,6 +28271,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (100,1,1) = {" DC @@ -28266,18 +28325,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -28476,6 +28523,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (101,1,1) = {" DC @@ -28518,18 +28577,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -28728,6 +28775,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (102,1,1) = {" DC @@ -28770,18 +28829,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -28980,6 +29027,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (103,1,1) = {" DC @@ -29022,18 +29081,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -29232,6 +29279,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (104,1,1) = {" DC @@ -29273,18 +29332,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -29449,10 +29496,22 @@ Nx Nx Nx Nx -DC -DC -DC -DC +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx DC DC DC @@ -29524,18 +29583,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -29704,11 +29751,23 @@ Cu Cu Cu Cu -DC -DC -DC -DC -DC +Cu +Cu +Cu +Cu +Cu +Cu +Cu +Cu +Cu +Cu +Cu +Cu +Cu +Cu +Cu +Cu +Cu DC DC DC @@ -29771,18 +29830,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -29948,6 +29995,15 @@ Cu Be Cu Be +Cu +Cu +Cu +Be +Be +Cu +Cu +Cu +Cu Be Be Cu @@ -29956,11 +30012,14 @@ Cu Cu Cu Cu +Cu Be -DC -DC -DC -DC +Be +Cu +Cu +Cu +Cu +Cu DC DC DC @@ -30021,18 +30080,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -30209,10 +30256,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -30274,18 +30333,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -30461,10 +30508,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -30526,18 +30585,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -30713,10 +30760,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -30778,18 +30837,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -30965,10 +31012,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -31030,18 +31089,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -31217,10 +31264,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -31282,18 +31341,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -31469,10 +31516,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -31534,18 +31593,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -31721,10 +31768,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -31786,18 +31845,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -31973,10 +32020,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -32039,18 +32098,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -32225,10 +32272,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -32291,18 +32350,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -32477,10 +32524,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -32543,18 +32602,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -32729,10 +32776,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -32795,18 +32854,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -32981,10 +33028,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -33047,18 +33106,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -33218,6 +33265,22 @@ Be Be Be Be +JQ +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be Be Be Be @@ -33233,10 +33296,6 @@ Be Be Be Be -DC -DC -DC -DC DC DC DC @@ -33299,18 +33358,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -33460,7 +33507,6 @@ Be Be Be Be -JQ Be Be Be @@ -33485,10 +33531,23 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -33551,18 +33610,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -33737,10 +33784,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -33803,18 +33862,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -33989,10 +34036,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -34054,18 +34113,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -34241,10 +34288,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -34306,18 +34365,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -34493,10 +34540,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -34558,18 +34617,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -34745,10 +34792,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -34810,18 +34869,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -34997,10 +35044,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -35062,18 +35121,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -35249,10 +35296,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -35313,18 +35372,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -35452,9 +35499,25 @@ rl lf lf LI -Qv LI -qr +LI +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be Be Be Be @@ -35501,10 +35564,6 @@ Be Be Be Be -DC -DC -DC -DC DC DC DC @@ -35565,18 +35624,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -35701,7 +35748,7 @@ Up Up Up sw -jh +nr vy lY tH @@ -35753,10 +35800,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -35817,18 +35876,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -35953,10 +36000,10 @@ Rw VG EB Fa -jh +Qv QE lY -tH +LL Js Js Be @@ -36005,10 +36052,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -36069,18 +36128,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -36210,7 +36257,6 @@ lf LI LI LI -qr Be Be Be @@ -36257,10 +36303,23 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -36321,18 +36380,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -36509,10 +36556,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -36573,18 +36632,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -36761,10 +36808,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -36825,18 +36884,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -37013,10 +37060,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -37077,18 +37136,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -37265,10 +37312,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -37329,18 +37388,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -37517,10 +37564,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -37581,18 +37640,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -37754,6 +37801,22 @@ Be Be Be Be +JQ +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be Be Be Be @@ -37769,10 +37832,6 @@ Be Be Be Be -DC -DC -DC -DC DC DC DC @@ -37834,18 +37893,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -38021,10 +38068,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -38086,18 +38145,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -38248,7 +38295,6 @@ Be Be Be Be -JQ Be Be Be @@ -38273,10 +38319,23 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -38338,18 +38397,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -38525,10 +38572,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -38590,18 +38649,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -38777,10 +38824,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -38842,18 +38901,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -39029,10 +39076,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -39094,18 +39153,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -39281,10 +39328,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -39346,18 +39405,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -39533,10 +39580,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -39598,18 +39657,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -39785,10 +39832,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -39850,18 +39909,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -40037,10 +40084,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -40102,18 +40161,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -40289,10 +40336,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -40353,18 +40412,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -40541,10 +40588,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -40605,18 +40664,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -40793,10 +40840,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -40857,18 +40916,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -41045,10 +41092,22 @@ Be Be Be Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be +Be DC DC DC @@ -41109,18 +41168,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -41292,15 +41339,27 @@ Be Be Be Be +Cu +Cu +Cu +Cu +Cu +Cu +Cu +Cu +Cu +Be +Be +Be +Be +Be +Be +Be Be Be Be Be Be -DC -DC -DC -DC DC DC DC @@ -41361,18 +41420,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -41548,11 +41595,23 @@ Cu Cu Cu Cu +Cu +Cu +Cu +Cu +Cu +Cu +Cu +Cu +Cu Be -DC -DC -DC -DC +Be +Be +Be +Be +Be +Cu +Cu DC DC DC @@ -41613,18 +41672,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -41800,11 +41847,23 @@ Cu Cu Cu Cu -DC -DC -DC -DC -DC +Cu +Cu +Cu +Cu +Cu +Cu +Cu +Cu +Cu +Cu +Cu +Cu +Cu +Cu +Cu +Cu +Cu DC DC DC @@ -41865,18 +41924,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -42045,16 +42092,28 @@ Nx Nx Nx Nx -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx DC DC DC @@ -42117,18 +42176,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -42336,6 +42383,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (156,1,1) = {" DC @@ -42369,18 +42428,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -42588,6 +42635,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (157,1,1) = {" DC @@ -42621,18 +42680,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -42840,6 +42887,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (158,1,1) = {" DC @@ -42874,18 +42933,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -43092,6 +43139,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (159,1,1) = {" DC @@ -43125,18 +43184,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -43344,6 +43391,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (160,1,1) = {" DC @@ -43377,18 +43436,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -43596,6 +43643,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (161,1,1) = {" DC @@ -43629,18 +43688,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -43848,6 +43895,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (162,1,1) = {" DC @@ -43881,18 +43940,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -44100,6 +44147,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (163,1,1) = {" DC @@ -44135,18 +44194,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -44352,6 +44399,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (164,1,1) = {" DC @@ -44387,18 +44446,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -44604,6 +44651,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (165,1,1) = {" DC @@ -44639,18 +44698,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -44856,6 +44903,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (166,1,1) = {" DC @@ -44891,18 +44950,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -45108,6 +45155,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (167,1,1) = {" DC @@ -45143,18 +45202,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -45360,6 +45407,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (168,1,1) = {" DC @@ -45395,18 +45454,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -45612,6 +45659,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (169,1,1) = {" DC @@ -45647,18 +45706,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -45864,6 +45911,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (170,1,1) = {" DC @@ -45899,18 +45958,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -46116,6 +46163,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (171,1,1) = {" DC @@ -46150,18 +46209,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -46368,6 +46415,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (172,1,1) = {" DC @@ -46401,18 +46460,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -46620,6 +46667,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (173,1,1) = {" DC @@ -46653,18 +46712,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -46872,6 +46919,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (174,1,1) = {" DC @@ -46905,18 +46964,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -47124,6 +47171,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (175,1,1) = {" DC @@ -47157,18 +47216,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -47376,6 +47423,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (176,1,1) = {" DC @@ -47409,18 +47468,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -47628,6 +47675,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (177,1,1) = {" DC @@ -47661,18 +47720,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -47880,6 +47927,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (178,1,1) = {" DC @@ -47913,18 +47972,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -48132,6 +48179,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (179,1,1) = {" DC @@ -48165,18 +48224,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -48384,6 +48431,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (180,1,1) = {" DC @@ -48417,18 +48476,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -48636,6 +48683,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (181,1,1) = {" DC @@ -48669,18 +48728,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -48888,6 +48935,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (182,1,1) = {" DC @@ -48921,18 +48980,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -49140,6 +49187,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (183,1,1) = {" DC @@ -49173,18 +49232,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -49392,6 +49439,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (184,1,1) = {" DC @@ -49428,18 +49487,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -49644,6 +49691,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (185,1,1) = {" DC @@ -49680,18 +49739,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -49896,6 +49943,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (186,1,1) = {" DC @@ -49934,18 +49993,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -50148,6 +50195,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (187,1,1) = {" DC @@ -50186,18 +50245,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -50400,6 +50447,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (188,1,1) = {" DC @@ -50447,6 +50506,83 @@ DC DC DC DC +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk DC DC DC @@ -50459,83 +50595,6 @@ DC DC DC DC -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk DC DC DC @@ -50714,6 +50773,67 @@ DC DC DC DC +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk DC DC DC @@ -50726,67 +50846,6 @@ DC DC DC DC -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk DC DC DC @@ -50966,6 +51025,67 @@ DC DC DC DC +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk +Hk DC DC DC @@ -50978,67 +51098,6 @@ DC DC DC DC -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk -Hk DC DC DC @@ -51220,18 +51279,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk Hk Hk @@ -51408,6 +51455,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (192,1,1) = {" DC @@ -51473,18 +51532,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC Hk DC DC @@ -51660,6 +51707,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (193,1,1) = {" DC @@ -55099,18 +55158,6 @@ DC DC DC DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC -DC ae DC DC @@ -55188,6 +55235,18 @@ DC DC DC DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC "} (207,1,1) = {" DC diff --git a/maps/away/away_site/sol_bunker/bunker.dm b/maps/away/away_site/sol_bunker/bunker.dm index 5aea7a01383..49a42ec6798 100644 --- a/maps/away/away_site/sol_bunker/bunker.dm +++ b/maps/away/away_site/sol_bunker/bunker.dm @@ -19,3 +19,15 @@ /obj/effect/overmap/visitable/sector/abandoned_bunker name = "lone asteroid" desc = "A lone asteroid. Strange signals are coming from this one." + +/obj/effect/map_effect/marker/airlock/sol_bunker + name = "Entrance Airlock" + master_tag = "airlock_sol_bunker" + +/area/sol_bunker + name = "ASSN Naval Installation" + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP + requires_power = FALSE + ambience = AMBIENCE_RUINS + base_turf = /turf/space + icon_state = "bluenew" diff --git a/maps/away/away_site/sol_bunker/bunker.dmm b/maps/away/away_site/sol_bunker/bunker.dmm index c62a7f8b2a8..7299df70807 100644 --- a/maps/away/away_site/sol_bunker/bunker.dmm +++ b/maps/away/away_site/sol_bunker/bunker.dmm @@ -3,115 +3,170 @@ /obj/machinery/door/airlock/centcom{ dir = 1 }, -/turf/simulated/floor/wood, -/area/derelict) +/obj/machinery/door/firedoor/noid, +/turf/simulated/floor/tiled/full, +/area/sol_bunker) "aj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood/airless, -/area/derelict) +/turf/simulated/floor/wood, +/area/sol_bunker) "aC" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner_wide/dark_blue{ + dir = 5 + }, /turf/simulated/floor/tiled/dark, -/area/derelict) +/area/sol_bunker) "aL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, -/turf/simulated/floor/tiled/airless, -/area/derelict) +/obj/effect/floor_decal/corner/brown{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) "bJ" = ( /obj/structure/bed/padded, /obj/item/bedsheet/blue, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood/airless, -/area/derelict) -"bK" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor, -/area/derelict) +/turf/simulated/floor/wood, +/area/sol_bunker) "cn" = ( /obj/effect/decal/cleanable/spiderling_remains, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood/airless, -/area/derelict) -"cv" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor, -/area/derelict) -"cA" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, -/turf/simulated/floor, -/area/derelict) +/turf/simulated/floor/wood, +/area/sol_bunker) +"cv" = ( +/obj/structure/sign/flag/sol/old{ + pixel_x = -32; + dir = 8 + }, +/obj/effect/floor_decal/corner/brown{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) +"cA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/unary/vent_pump/high_volume, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/map_effect/marker/airlock/sol_bunker, +/obj/machinery/light/small/red{ + dir = 4 + }, +/turf/simulated/floor/tiled/full, +/area/sol_bunker) +"cW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner/brown{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) "du" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - brightness_color = "#FA8282"; - dir = 8 +/obj/item/gun/projectile/automatic/rifle/sol, +/obj/effect/floor_decal/corner_wide/dark_blue{ + dir = 9 }, /obj/structure/closet/secure_closet/guncabinet{ locked = 0; opened = 1; - req_access = list(150) + req_access = null }, -/obj/item/gun/projectile/automatic/rifle/sol, /turf/simulated/floor/tiled/dark, -/area/derelict) +/area/sol_bunker) +"dU" = ( +/obj/structure/table/reinforced, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner_wide/dark_blue/full{ + dir = 1 + }, +/obj/machinery/light/small/red{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/sol_bunker) +"et" = ( +/obj/structure/bed/padded, +/obj/item/bedsheet/blue, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 7 + }, +/turf/simulated/floor/wood, +/area/sol_bunker) "fj" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/icarus_drone/malf, +/obj/effect/floor_decal/corner_wide/dark_blue{ + dir = 10 + }, /turf/simulated/floor/tiled/dark, -/area/derelict) +/area/sol_bunker) "fr" = ( /obj/effect/shuttle_landmark/automatic, /turf/template_noop, /area/space) +"fu" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/landmine/frag{ + deployed = 1 + }, +/obj/effect/floor_decal/corner/brown{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) "fv" = ( /obj/effect/decal/cleanable/cobweb, /obj/machinery/appliance/cooker/oven, +/obj/effect/floor_decal/corner_wide/paleblue/full{ + dir = 8 + }, /turf/simulated/floor/tiled, -/area/derelict) +/area/sol_bunker) "fy" = ( /obj/structure/table/wood, /obj/item/modular_computer/laptop, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, /turf/simulated/floor/wood, -/area/derelict) +/area/sol_bunker) +"fB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner/brown{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) "fJ" = ( -/obj/structure/computerframe, +/obj/structure/computerframe{ + dir = 4 + }, /turf/simulated/floor/wood, -/area/derelict) +/area/sol_bunker) "fT" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, /obj/item/gun/launcher/grenade{ pixel_y = 6 }, +/obj/effect/floor_decal/corner_wide/dark_blue{ + dir = 5 + }, /turf/simulated/floor/tiled/dark, -/area/derelict) +/area/sol_bunker) "fY" = ( /obj/structure/sink{ dir = 8; @@ -122,53 +177,98 @@ pixel_x = -32 }, /turf/simulated/floor/tiled/white, -/area/derelict) +/area/sol_bunker) "gd" = ( -/turf/simulated/floor/tiled/airless, -/area/derelict) +/obj/effect/floor_decal/corner/brown/full, +/turf/simulated/floor/tiled, +/area/sol_bunker) "gI" = ( /obj/structure/table/standard, +/obj/effect/floor_decal/corner_wide/paleblue{ + dir = 5 + }, /turf/simulated/floor/tiled, -/area/derelict) +/area/sol_bunker) +"gS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner_wide/dark_blue{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/sol_bunker) +"hl" = ( +/obj/structure/table/wood, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 + }, +/turf/simulated/floor/wood, +/area/sol_bunker) "ht" = ( /obj/machinery/appliance/cooker/fryer, +/obj/effect/floor_decal/corner_wide/paleblue{ + dir = 5 + }, /turf/simulated/floor/tiled, -/area/derelict) +/area/sol_bunker) "hE" = ( /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood/airless, -/area/derelict) +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/sol_bunker) "hS" = ( /obj/machinery/door/airlock/centcom{ dir = 4 }, -/turf/simulated/floor/wood, -/area/derelict) +/obj/machinery/door/firedoor/noid{ + dir = 8 + }, +/turf/simulated/floor/tiled/full, +/area/sol_bunker) +"hT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner_wide/dark_blue{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/sol_bunker) "ia" = ( /obj/structure/bed/stool/chair/office/light{ dir = 1 }, /turf/simulated/floor/wood, -/area/derelict) +/area/sol_bunker) +"ik" = ( +/obj/effect/floor_decal/corner/brown{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) "iv" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood/airless, -/area/derelict) +/turf/simulated/floor/wood, +/area/sol_bunker) "iU" = ( /obj/effect/decal/cleanable/spiderling_remains, -/turf/simulated/floor/tiled/airless, -/area/derelict) +/turf/simulated/floor/tiled/full, +/area/sol_bunker) +"jb" = ( +/obj/structure/bed/stool/padded/red, +/obj/effect/floor_decal/corner_wide/paleblue/full, +/turf/simulated/floor/tiled, +/area/sol_bunker) "jC" = ( -/obj/structure/sign/flag/sol{ - pixel_x = -32 +/obj/effect/floor_decal/corner/brown{ + dir = 9 }, -/obj/machinery/light_construct{ +/obj/machinery/light/small/red{ dir = 8 }, -/turf/simulated/floor/tiled/airless, -/area/derelict) +/turf/simulated/floor/tiled, +/area/sol_bunker) "jD" = ( /obj/effect/decal/cleanable/cobweb, /obj/structure/table/rack, @@ -183,94 +283,148 @@ pixel_y = 32 }, /turf/simulated/floor/tiled, -/area/derelict) +/area/sol_bunker) "jF" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - brightness_color = "#FA8282"; - dir = 1 - }, /obj/machinery/appliance/cooker/stove, +/obj/effect/floor_decal/corner_wide/paleblue{ + dir = 5 + }, /turf/simulated/floor/tiled, -/area/derelict) -"jK" = ( -/obj/structure/sign/flag/sol/large/north, -/obj/machinery/light_construct{ +/area/sol_bunker) +"jV" = ( +/obj/random/junk, +/obj/effect/floor_decal/corner/brown/full{ dir = 1 }, -/turf/simulated/floor/tiled/airless, -/area/derelict) +/turf/simulated/floor/tiled, +/area/sol_bunker) "kc" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/airless, -/area/derelict) -"ki" = ( -/obj/structure/sign/flag/sol/large/north, -/turf/simulated/floor/tiled/airless, -/area/derelict) +/turf/simulated/floor/tiled, +/area/sol_bunker) "kj" = ( +/obj/effect/floor_decal/corner_wide/dark_blue{ + dir = 10 + }, /turf/simulated/floor/tiled/dark, -/area/derelict) +/area/sol_bunker) "ku" = ( /obj/structure/table/reinforced, /obj/random/junk, -/turf/simulated/floor/tiled, -/area/derelict) -"kL" = ( -/obj/structure/closet/secure_closet/guncabinet{ - req_access = list(150) +/obj/effect/floor_decal/corner_wide/paleblue{ + dir = 10 }, +/turf/simulated/floor/tiled, +/area/sol_bunker) +"kH" = ( +/obj/structure/table/wood, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/machinery/light/small/red{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/sol_bunker) +"kL" = ( /obj/effect/decal/cleanable/dirt, /obj/item/gun/projectile/shotgun/pump/combat/sol, /obj/item/storage/box/shotgunshells, +/obj/effect/floor_decal/corner_wide/dark_blue{ + dir = 9 + }, +/obj/structure/closet/secure_closet/guncabinet{ + locked = 0; + opened = 1; + req_access = null + }, /turf/simulated/floor/tiled/dark, -/area/derelict) +/area/sol_bunker) "kP" = ( -/turf/simulated/floor/foamedmetal, -/area/derelict) +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/obj/machinery/door/airlock/external, +/obj/machinery/access_button{ + pixel_x = 33; + pixel_y = -6 + }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/map_effect/marker/airlock/sol_bunker, +/obj/effect/floor_decal/industrial/hatch/red, +/turf/simulated/floor/tiled/full, +/area/sol_bunker) "ld" = ( /obj/structure/table/reinforced, /obj/item/storage/box/snack, +/obj/effect/floor_decal/corner_wide/paleblue{ + dir = 5 + }, +/obj/machinery/light/small/red{ + dir = 1 + }, /turf/simulated/floor/tiled, -/area/derelict) +/area/sol_bunker) +"le" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner_wide/dark_blue{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/sol_bunker) "lg" = ( /obj/effect/decal/cleanable/dirt, /obj/item/landmine/frag{ deployed = 1 }, -/turf/simulated/floor/tiled/airless, -/area/derelict) +/turf/simulated/floor/tiled/full, +/area/sol_bunker) "li" = ( /turf/simulated/floor/wood, -/area/derelict) +/area/sol_bunker) "lp" = ( /obj/structure/bed/padded, /obj/item/bedsheet/blue, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood/airless, -/area/derelict) +/turf/simulated/floor/wood, +/area/sol_bunker) "lu" = ( /obj/structure/curtain/open/shower, /obj/effect/decal/cleanable/dirt, /obj/item/soap/blue_soap, /turf/simulated/floor/tiled/white, -/area/derelict) -"lU" = ( -/obj/structure/closet/secure_closet/guncabinet{ - req_access = list(150) +/area/sol_bunker) +"lw" = ( +/obj/effect/floor_decal/corner/brown{ + dir = 10 }, +/turf/simulated/floor/tiled, +/area/sol_bunker) +"lU" = ( /obj/effect/decal/cleanable/dirt, /obj/item/ammo_magazine/mc9mm, /obj/item/gun/projectile/pistol/sol, /obj/item/gun/projectile/pistol/sol, /obj/item/ammo_magazine/mc9mm, +/obj/effect/floor_decal/corner_wide/dark_blue{ + dir = 6 + }, +/obj/structure/closet/secure_closet/guncabinet{ + locked = 0; + opened = 1; + req_access = null + }, /turf/simulated/floor/tiled/dark, -/area/derelict) +/area/sol_bunker) "mg" = ( /obj/machinery/vending/dinnerware, +/obj/effect/floor_decal/corner_wide/paleblue/full{ + dir = 1 + }, /turf/simulated/floor/tiled, -/area/derelict) +/area/sol_bunker) "mo" = ( /obj/structure/window/reinforced{ dir = 8 @@ -284,87 +438,138 @@ }, /obj/machinery/portable_atmospherics/canister/air/airlock, /turf/simulated/floor/tiled, -/area/derelict) +/area/sol_bunker) "mH" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/mucus, /obj/structure/sink{ dir = 8; - pixel_x = -12; - pixel_y = 6 + pixel_x = -12 + }, +/obj/effect/floor_decal/corner_wide/paleblue{ + dir = 9 }, /turf/simulated/floor/tiled, -/area/derelict) +/area/sol_bunker) +"mJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/sol_bunker) "mM" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/door_assembly, -/turf/simulated/floor/wood/airless, -/area/derelict) +/obj/structure/door_assembly{ + dir = 4 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/sol_bunker) "mP" = ( /obj/structure/table/wood, /obj/item/pen, +/obj/effect/floor_decal/spline/fancy/wood, +/obj/machinery/light/small/red, /turf/simulated/floor/wood, -/area/derelict) +/area/sol_bunker) +"mR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/sol_bunker) "nj" = ( /obj/effect/decal/cleanable/ash, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood/airless, -/area/derelict) +/turf/simulated/floor/wood, +/area/sol_bunker) "nx" = ( /obj/structure/table/wood, /obj/item/paper_bin, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, /turf/simulated/floor/wood, -/area/derelict) +/area/sol_bunker) "nR" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8 }, -/turf/simulated/floor/foamedmetal, -/area/derelict) +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/map_effect/marker/airlock/sol_bunker, +/turf/simulated/floor/tiled/full, +/area/sol_bunker) +"od" = ( +/obj/random/junk, +/obj/effect/floor_decal/corner/brown{ + dir = 10 + }, +/obj/structure/sign/securearea{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) "om" = ( /obj/machinery/photocopier, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, /turf/simulated/floor/wood, -/area/derelict) +/area/sol_bunker) "op" = ( /obj/structure/curtain/open/shower, /turf/simulated/floor/tiled/white, -/area/derelict) +/area/sol_bunker) "oM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/remains/rat, /turf/simulated/floor/wood, -/area/derelict) +/area/sol_bunker) "oU" = ( /obj/structure/door_assembly{ - anchored = 1 + anchored = 1; + dir = 8 }, -/turf/simulated/floor/wood/airless, -/area/derelict) +/obj/machinery/door/firedoor/noid{ + dir = 8 + }, +/turf/simulated/floor/tiled/full, +/area/sol_bunker) "oZ" = ( -/turf/simulated/floor/tiled, -/area/derelict) +/turf/simulated/floor/tiled/full, +/area/sol_bunker) "pd" = ( /obj/effect/decal/cleanable/flour, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled, -/area/derelict) +/turf/simulated/floor/tiled/full, +/area/sol_bunker) "pA" = ( -/obj/machinery/light_construct{ +/obj/effect/floor_decal/corner/brown{ + dir = 5 + }, +/obj/machinery/light/small/red{ dir = 1 }, -/turf/simulated/floor/tiled/airless, -/area/derelict) +/turf/simulated/floor/tiled, +/area/sol_bunker) "pV" = ( /obj/effect/decal/cleanable/generic, -/turf/simulated/floor/tiled, -/area/derelict) +/turf/simulated/floor/tiled/full, +/area/sol_bunker) "qy" = ( /obj/structure/bed/stool/padded/red, /obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner_wide/paleblue{ + dir = 9 + }, /turf/simulated/floor/tiled, -/area/derelict) +/area/sol_bunker) "qH" = ( /obj/structure/window/reinforced{ dir = 4 @@ -377,142 +582,199 @@ dir = 1 }, /obj/machinery/portable_atmospherics/canister/air/airlock, -/obj/structure/sign/flag/sol{ +/obj/structure/sign/flag/sol/old{ + dir = 1; pixel_y = -32 }, /turf/simulated/floor/tiled, -/area/derelict) +/area/sol_bunker) +"qT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner_wide/dark_blue/full, +/obj/machinery/light/small/red{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/sol_bunker) "qZ" = ( /obj/structure/table/wood, /obj/item/phone, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/machinery/light/small/red{ + dir = 1 + }, /turf/simulated/floor/wood, -/area/derelict) +/area/sol_bunker) "rp" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sign/securearea{ - pixel_y = -32 +/obj/effect/floor_decal/corner/brown{ + dir = 10 }, -/obj/machinery/light_construct, -/turf/simulated/floor/tiled/airless, -/area/derelict) +/obj/machinery/light/small/red, +/turf/simulated/floor/tiled, +/area/sol_bunker) "rr" = ( /obj/structure/bed/stool/chair/office/light{ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark, -/area/derelict) +/turf/simulated/floor/tiled/dark/full, +/area/sol_bunker) "rF" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - brightness_color = "#FA8282" - }, +/obj/machinery/light/small/red, /turf/simulated/floor/tiled/white, -/area/derelict) +/area/sol_bunker) +"rP" = ( +/obj/effect/floor_decal/corner/brown{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) "sk" = ( -/obj/structure/door_assembly/door_assembly_hatch, -/turf/simulated/floor/tiled/airless, -/area/derelict) +/obj/structure/door_assembly/door_assembly_hatch{ + dir = 4 + }, +/obj/machinery/door/firedoor/noid{ + dir = 8 + }, +/turf/simulated/floor/tiled/full, +/area/sol_bunker) +"su" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/sol_bunker) "sv" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster{ pixel_x = 32 }, -/turf/simulated/floor/wood/airless, -/area/derelict) -"sI" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, -/obj/structure/window/reinforced{ - dir = 1 +/turf/simulated/floor/wood, +/area/sol_bunker) +"sz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner_wide/paleblue{ + dir = 9 }, -/turf/simulated/floor, -/area/derelict) +/turf/simulated/floor/tiled, +/area/sol_bunker) +"sG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner/brown{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) +"sI" = ( +/obj/machinery/door/airlock/external, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/sol_bunker, +/obj/effect/floor_decal/industrial/hatch/red, +/turf/simulated/floor/tiled/full, +/area/sol_bunker) "sJ" = ( /obj/item/landmine/frag{ deployed = 1 }, -/turf/simulated/floor/tiled/airless, -/area/derelict) +/turf/simulated/floor/tiled/full, +/area/sol_bunker) "sN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb2{ icon_state = "spiderling"; name = "dead greimorian" }, -/obj/machinery/light{ - brightness_color = "#FA8282" +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 7 }, -/turf/simulated/floor/wood/airless, -/area/derelict) +/obj/machinery/light/small/red, +/turf/simulated/floor/wood, +/area/sol_bunker) +"sX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner/brown{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) "tz" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled, -/area/derelict) +/area/sol_bunker) "tD" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb2{ icon_state = "spiderling"; name = "dead greimorian" }, -/turf/simulated/floor/tiled, -/area/derelict) +/turf/simulated/floor/tiled/full, +/area/sol_bunker) "tL" = ( /obj/structure/safe, +/obj/effect/floor_decal/spline/fancy/wood, +/obj/machinery/light/small/red, /turf/simulated/floor/wood, -/area/derelict) +/area/sol_bunker) "tS" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor, -/area/derelict) +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/full, +/area/sol_bunker) "tV" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet/guncabinet{ locked = 0; opened = 1; - req_access = list(150) + req_access = null }, /obj/item/grenade/frag, +/obj/effect/floor_decal/corner_wide/dark_blue{ + dir = 9 + }, /turf/simulated/floor/tiled/dark, -/area/derelict) +/area/sol_bunker) "uk" = ( /obj/structure/table/reinforced, /obj/effect/decal/remains/rat, -/turf/simulated/floor/tiled, -/area/derelict) +/turf/simulated/floor/tiled/full, +/area/sol_bunker) "un" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/generic, -/turf/simulated/floor/wood/airless, -/area/derelict) -"us" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 +/obj/effect/floor_decal/corner/brown{ + dir = 9 }, -/turf/simulated/floor, -/area/derelict) +/turf/simulated/floor/tiled, +/area/sol_bunker) +"us" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/flag/sol/old/large/north{ + pixel_y = 32 + }, +/obj/effect/floor_decal/corner/brown{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) "uA" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes, -/obj/machinery/porta_turret/ballistic, -/turf/simulated/floor/tiled/airless, -/area/derelict) +/obj/machinery/porta_turret/ballistic{ + light_range = 1 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) "uE" = ( /obj/structure/bed/stool/padded/red, /obj/effect/decal/cleanable/flour, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled, -/area/derelict) +/turf/simulated/floor/tiled/full, +/area/sol_bunker) "uG" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/fake_object{ @@ -524,32 +786,48 @@ name = "dilapitated cryogenic freezer"; pixel_x = 1 }, -/turf/simulated/floor/wood/airless, -/area/derelict) +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, +/turf/simulated/floor/wood, +/area/sol_bunker) "uQ" = ( /obj/effect/decal/cleanable/dirt, /obj/random/junk, /turf/simulated/floor/tiled/white, -/area/derelict) +/area/sol_bunker) "vJ" = ( /obj/random/junk, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, -/turf/simulated/floor/tiled, -/area/derelict) +/turf/simulated/floor/tiled/full, +/area/sol_bunker) "vN" = ( /obj/structure/table/reinforced, -/turf/simulated/floor/tiled, -/area/derelict) +/turf/simulated/floor/tiled/full, +/area/sol_bunker) "vY" = ( /obj/structure/curtain/open/shower, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, -/area/derelict) +/area/sol_bunker) "wi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/foamedmetal, -/area/derelict) +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/obj/machinery/door/airlock/external, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/map_effect/marker/airlock/sol_bunker, +/obj/effect/floor_decal/industrial/hatch/red, +/turf/simulated/floor/tiled/full, +/area/sol_bunker) +"wR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner_wide/paleblue{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) "wY" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb2{ @@ -557,48 +835,84 @@ name = "dead greimorian" }, /turf/simulated/floor/wood, -/area/derelict) +/area/sol_bunker) "xU" = ( /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/foamedmetal, -/area/derelict) +/obj/machinery/atmospherics/unary/vent_pump/high_volume, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/map_effect/marker/airlock/sol_bunker, +/turf/simulated/floor/tiled/full, +/area/sol_bunker) "xW" = ( /obj/effect/decal/cleanable/mucus, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 +/obj/machinery/atmospherics/unary/vent_pump/high_volume, +/obj/machinery/airlock_sensor{ + pixel_x = -24; + dir = 4; + pixel_y = -6 }, -/turf/simulated/floor/foamedmetal, -/area/derelict) +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/map_effect/marker/airlock/sol_bunker, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + pixel_y = 7; + dir = 4; + pixel_x = -25 + }, +/turf/simulated/floor/tiled/full, +/area/sol_bunker) "yt" = ( /obj/machinery/shower{ dir = 8 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, -/area/derelict) +/area/sol_bunker) "yT" = ( /obj/structure/dispenser/oxygen, /obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/airless, -/area/derelict) +/turf/simulated/floor/tiled, +/area/sol_bunker) "zs" = ( /obj/structure/bed/stool/padded/red, +/obj/effect/floor_decal/corner_wide/paleblue/full{ + dir = 4 + }, /turf/simulated/floor/tiled, -/area/derelict) +/area/sol_bunker) "zJ" = ( /obj/effect/decal/cleanable/ash, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/airless, -/area/derelict) +/obj/structure/foamedmetal, +/turf/simulated/floor/tiled/full, +/area/sol_bunker) "zM" = ( /turf/simulated/mineral, /area/space) +"zP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/spline/fancy/wood, +/turf/simulated/floor/wood, +/area/sol_bunker) +"zU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner/brown{ + dir = 6 + }, +/obj/structure/sign/flag/sol/old{ + pixel_x = 32; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) "Bi" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, -/turf/simulated/floor/wood/airless, -/area/derelict) +/turf/simulated/floor/wood, +/area/sol_bunker) "Bl" = ( /obj/structure/toilet, /obj/effect/decal/cleanable/cobweb2{ @@ -607,21 +921,24 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, -/area/derelict) +/area/sol_bunker) "Bq" = ( /obj/effect/decal/cleanable/generic, -/turf/simulated/floor/tiled/airless, -/area/derelict) -"BV" = ( -/obj/structure/sign/securearea{ - pixel_y = -32 +/obj/effect/floor_decal/corner/brown{ + dir = 5 }, -/obj/machinery/light_construct, -/turf/simulated/floor/tiled/airless, -/area/derelict) +/turf/simulated/floor/tiled, +/area/sol_bunker) +"BV" = ( +/obj/effect/floor_decal/corner/brown{ + dir = 10 + }, +/obj/machinery/light/small/red, +/turf/simulated/floor/tiled, +/area/sol_bunker) "Ce" = ( /turf/simulated/wall, -/area/derelict) +/area/sol_bunker) "Cs" = ( /obj/structure/table/wood, /obj/machinery/photocopier/faxmachine, @@ -629,67 +946,143 @@ info = "\[center]\[flag_sol]\[/center]\[center]\[small]\[i]This paper has been transmitted by Solarian Naval Fleet Command, 39th Fleet\[/i]\[/small]\[/center]\[hr]\[hr]\[small]Date: 09/22/2452 Orders sent by: Admiral Sooraj Sirasikar, 39th FleetRecipient: Captain Obasie UchiePosition: Commanding Officer of Marine Garrison Installation Tango Charlie-22 Priority: CriticalSubject: EvacuationTransmission: Tau Ceti independence imminent. Bunker must be evacuated in accordance to independence agreement. Scrub all databases and activate automated defenses. Leave nothing valuable. Do not destroy installation. It may be needed again one day. Evacuation shuttle will arrive in one hour." }, /obj/effect/decal/cleanable/cobweb, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, /turf/simulated/floor/wood, -/area/derelict) +/area/sol_bunker) "CD" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/sol/marine, -/turf/simulated/floor/wood/airless, -/area/derelict) -"DF" = ( -/obj/random/junk, -/turf/simulated/floor/tiled/airless, -/area/derelict) -"Eb" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - brightness_color = "#FA8282"; +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/turf/simulated/floor/wood, +/area/sol_bunker) +"CV" = ( +/obj/effect/floor_decal/corner/brown/full{ dir = 1 }, +/turf/simulated/floor/tiled, +/area/sol_bunker) +"Dg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/foamedmetal, +/turf/simulated/floor/tiled/full, +/area/sol_bunker) +"DF" = ( +/obj/random/junk, +/obj/effect/floor_decal/corner/brown{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) +"Eb" = ( +/obj/effect/decal/cleanable/dirt, /obj/structure/bed/stool/padded/red, -/turf/simulated/floor/wood/airless, -/area/derelict) +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/machinery/light/small/red{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/sol_bunker) +"Ef" = ( +/obj/structure/computerframe{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/sol_bunker) +"Eg" = ( +/obj/effect/map_effect/window_spawner/full/reinforced/grille, +/obj/machinery/door/firedoor/noid{ + dir = 8 + }, +/turf/simulated/floor, +/area/sol_bunker) "Em" = ( /obj/structure/toilet, /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, -/area/derelict) +/area/sol_bunker) +"EJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/firedoor/noid{ + dir = 8 + }, +/turf/simulated/floor/tiled/full, +/area/sol_bunker) "EK" = ( /obj/structure/toilet, /obj/effect/decal/cleanable/mucus, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/vomit, /turf/simulated/floor/tiled/white, -/area/derelict) +/area/sol_bunker) "EO" = ( /obj/effect/decal/cleanable/generic, /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/icarus_drone/malf, -/turf/simulated/floor/tiled/dark, -/area/derelict) +/turf/simulated/floor/tiled/dark/full, +/area/sol_bunker) +"Fh" = ( +/obj/structure/bed/stool/padded/red, +/obj/effect/floor_decal/corner_wide/paleblue{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) "Fn" = ( /obj/random/junk, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, /turf/simulated/floor/wood, -/area/derelict) +/area/sol_bunker) +"FH" = ( +/obj/effect/decal/cleanable/generic, +/obj/effect/floor_decal/corner/brown{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) "FJ" = ( /obj/structure/door_assembly, +/obj/machinery/door/firedoor/noid, /turf/simulated/floor/tiled/white, -/area/derelict) +/area/sol_bunker) "FK" = ( /obj/structure/sign/vacuum{ pixel_x = -32 }, -/obj/machinery/light_construct{ +/obj/effect/floor_decal/corner/brown{ + dir = 9 + }, +/obj/machinery/light/small/red{ dir = 8 }, -/turf/simulated/floor/tiled/airless, -/area/derelict) +/turf/simulated/floor/tiled, +/area/sol_bunker) +"Gd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner/brown{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) "Gf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/spiderling_remains, -/turf/simulated/floor/tiled/dark, -/area/derelict) +/turf/simulated/floor/tiled/dark/full, +/area/sol_bunker) +"Gp" = ( +/obj/effect/floor_decal/corner/brown/full{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) "Gt" = ( /obj/structure/table/rack, /obj/structure/window/reinforced{ @@ -699,40 +1092,45 @@ /obj/machinery/door/window/eastleft, /obj/item/clothing/head/helmet/space/void/sol, /turf/simulated/floor/tiled, -/area/derelict) +/area/sol_bunker) "Gw" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 }, -/obj/structure/window/reinforced, -/turf/simulated/floor, -/area/derelict) +/turf/simulated/floor/wood, +/area/sol_bunker) "Gy" = ( /obj/item/landmine/frag{ deployed = 1 }, /turf/simulated/floor/exoplanet/asteroid/ash/rocky, -/area/derelict) +/area/sol_bunker) "GF" = ( /obj/structure/bed/stool/padded/red, -/obj/machinery/light{ - brightness_color = "#FA8282" +/obj/effect/floor_decal/corner_wide/paleblue{ + dir = 10 }, +/obj/machinery/light/small/red, /turf/simulated/floor/tiled, -/area/derelict) +/area/sol_bunker) "GU" = ( -/obj/machinery/light{ - brightness_color = "#FA8282"; - dir = 1; - status = 2 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 }, -/turf/simulated/floor/wood/airless, -/area/derelict) +/obj/machinery/light/small/red{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/sol_bunker) "GX" = ( /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark, -/area/derelict) +/turf/simulated/floor/tiled/dark/full, +/area/sol_bunker) +"Hc" = ( +/obj/structure/bed/stool/padded/red, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/full, +/area/sol_bunker) "HB" = ( /obj/structure/table/wood, /obj/random/junk, @@ -741,12 +1139,23 @@ }, /obj/item/ammo_magazine/mc9mm, /obj/structure/closet/crate/drop, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, /turf/simulated/floor/wood, -/area/derelict) +/area/sol_bunker) +"Iy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/generic, +/turf/simulated/floor/tiled/full, +/area/sol_bunker) "IB" = ( /obj/effect/decal/cleanable/spiderling_remains, +/obj/effect/floor_decal/corner_wide/paleblue{ + dir = 10 + }, /turf/simulated/floor/tiled, -/area/derelict) +/area/sol_bunker) "II" = ( /obj/structure/sink{ dir = 8; @@ -758,136 +1167,197 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, -/area/derelict) +/area/sol_bunker) "IJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/remains/rat, /turf/simulated/floor/tiled/white, -/area/derelict) +/area/sol_bunker) "IO" = ( /obj/structure/bed/stool/padded/red, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - brightness_color = "#FA8282" +/obj/effect/floor_decal/corner_wide/paleblue{ + dir = 10 }, +/obj/machinery/light/small/red, /turf/simulated/floor/tiled, -/area/derelict) +/area/sol_bunker) "Jc" = ( /obj/structure/table/reinforced, /obj/random/booze, +/obj/effect/floor_decal/corner_wide/paleblue{ + dir = 10 + }, /turf/simulated/floor/tiled, -/area/derelict) -"Kq" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ +/area/sol_bunker) +"JT" = ( +/obj/structure/table/standard, +/obj/effect/floor_decal/corner_wide/paleblue{ + dir = 5 + }, +/obj/machinery/light/small/red{ dir = 1 }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, +/turf/simulated/floor/tiled, +/area/sol_bunker) +"Kq" = ( +/obj/effect/map_effect/window_spawner/full/reinforced/grille, +/obj/machinery/door/firedoor/noid, /turf/simulated/floor, -/area/derelict) +/area/sol_bunker) "Ku" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner_wide/dark_blue/full{ + dir = 8 + }, +/obj/machinery/light/small/red{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, -/area/derelict) +/area/sol_bunker) "KG" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - brightness_color = "#FA8282" +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 7 }, -/turf/simulated/floor/wood/airless, -/area/derelict) +/obj/machinery/light/small/red, +/turf/simulated/floor/wood, +/area/sol_bunker) "KL" = ( /obj/structure/boulder, /turf/simulated/floor/exoplanet/asteroid/ash/rocky, -/area/derelict) +/area/sol_bunker) "KZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/spiderling_remains, /obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/airless, -/area/derelict) +/obj/structure/foamedmetal, +/turf/simulated/floor/tiled/full, +/area/sol_bunker) +"Lc" = ( +/obj/effect/floor_decal/corner/brown{ + dir = 10 + }, +/obj/structure/sign/securearea{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) "Lu" = ( -/obj/machinery/door/airlock/vault/bolted{ +/obj/machinery/door/airlock/external, +/obj/machinery/access_button{ + pixel_x = -33; + pixel_y = 7; dir = 1 }, -/turf/simulated/floor, -/area/derelict) +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/sol_bunker, +/obj/effect/floor_decal/industrial/hatch/red, +/turf/simulated/floor/tiled/full, +/area/sol_bunker) "LH" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, -/turf/simulated/floor/tiled/airless, -/area/derelict) +/turf/simulated/floor/tiled, +/area/sol_bunker) "LJ" = ( -/obj/structure/sign/flag/sol{ - pixel_x = 32 +/obj/effect/floor_decal/corner/brown{ + dir = 6 }, -/obj/machinery/light_construct{ +/obj/machinery/light/small/red{ dir = 4 }, -/turf/simulated/floor/tiled/airless, -/area/derelict) +/turf/simulated/floor/tiled, +/area/sol_bunker) +"LP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/generic, +/obj/effect/floor_decal/spline/fancy/wood, +/turf/simulated/floor/wood, +/area/sol_bunker) "Mf" = ( /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/airless, -/area/derelict) +/obj/effect/floor_decal/corner/brown{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) "Mh" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/door_assembly, /turf/simulated/floor/tiled/white, -/area/derelict) +/area/sol_bunker) "Mi" = ( -/obj/structure/sign/flag/sol/large/south, /obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner_wide/dark_blue{ + dir = 10 + }, +/obj/structure/sign/flag/sol/old/large/south{ + pixel_y = -32 + }, /turf/simulated/floor/tiled/dark, -/area/derelict) +/area/sol_bunker) "MJ" = ( /obj/effect/decal/warning_stripes, -/obj/machinery/porta_turret/ballistic, -/turf/simulated/floor/tiled/airless, -/area/derelict) +/obj/machinery/porta_turret/ballistic{ + light_range = 1 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) "ML" = ( /obj/machinery/door/airlock/glass{ dir = 1 }, -/turf/simulated/floor/tiled, -/area/derelict) +/obj/machinery/door/firedoor/noid, +/turf/simulated/floor/tiled/full, +/area/sol_bunker) "Nf" = ( /obj/random/junk, /obj/structure/bed/stool/chair/office/light, /turf/simulated/floor/wood, -/area/derelict) +/area/sol_bunker) +"Nz" = ( +/obj/effect/floor_decal/corner/brown, +/turf/simulated/floor/tiled, +/area/sol_bunker) "Oe" = ( /obj/effect/decal/remains/rat, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark, -/area/derelict) +/turf/simulated/floor/tiled/dark/full, +/area/sol_bunker) +"Of" = ( +/obj/effect/floor_decal/corner/brown{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) "Oh" = ( -/turf/simulated/floor/wood/airless, -/area/derelict) +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/sol_bunker) "Oi" = ( /obj/effect/decal/cleanable/mucus, /turf/simulated/floor/wood, -/area/derelict) +/area/sol_bunker) "OK" = ( /obj/effect/decal/cleanable/mucus, -/turf/simulated/floor/tiled/airless, -/area/derelict) +/turf/simulated/floor/tiled/full, +/area/sol_bunker) "OL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/nosmoking_1{ pixel_y = -32 }, -/obj/machinery/light_construct, -/turf/simulated/floor/tiled/airless, -/area/derelict) +/obj/machinery/light/small/red, +/turf/simulated/floor/tiled, +/area/sol_bunker) "OR" = ( /obj/structure/table/rack, /obj/structure/window/reinforced{ @@ -897,73 +1367,106 @@ /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/sol, /turf/simulated/floor/tiled, -/area/derelict) +/area/sol_bunker) "OV" = ( /obj/random/junk, /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8 }, -/turf/simulated/floor/tiled/airless, -/area/derelict) +/turf/simulated/floor/tiled/full, +/area/sol_bunker) "Pe" = ( /obj/effect/decal/cleanable/generic, -/obj/structure/sign/flag/sol{ - pixel_x = 32 +/obj/effect/floor_decal/corner/brown{ + dir = 6 }, -/obj/machinery/light_construct{ +/obj/machinery/light/small/red{ dir = 4 }, -/turf/simulated/floor/tiled/airless, -/area/derelict) +/turf/simulated/floor/tiled, +/area/sol_bunker) "Pz" = ( /obj/structure/bed/padded, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood/airless, -/area/derelict) +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 + }, +/turf/simulated/floor/wood, +/area/sol_bunker) +"PW" = ( +/obj/structure/table/reinforced, +/obj/random/junk, +/obj/effect/floor_decal/corner_wide/paleblue{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) +"Qf" = ( +/obj/effect/floor_decal/corner/brown{ + dir = 6 + }, +/obj/structure/sign/flag/sol/old{ + pixel_x = 32; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) "QX" = ( /obj/effect/decal/cleanable/cobweb, -/turf/simulated/floor/tiled/airless, -/area/derelict) +/obj/effect/floor_decal/corner/brown/full{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) "Rb" = ( /obj/effect/decal/cleanable/dirt, /obj/random/junk, -/turf/simulated/floor/tiled/dark, -/area/derelict) +/turf/simulated/floor/tiled/dark/full, +/area/sol_bunker) "Re" = ( /obj/structure/table/wood, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, /turf/simulated/floor/wood, -/area/derelict) +/area/sol_bunker) "Rk" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, -/turf/simulated/floor/tiled/airless, -/area/derelict) +/turf/simulated/floor/tiled/full, +/area/sol_bunker) "Rq" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed/stool/chair/office/light{ dir = 4 }, /turf/simulated/floor/wood, -/area/derelict) +/area/sol_bunker) +"Ry" = ( +/obj/effect/floor_decal/corner/brown{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) "RB" = ( /obj/effect/decal/cleanable/dirt, /obj/item/reagent_containers/toothpaste, /turf/simulated/floor/tiled/white, -/area/derelict) +/area/sol_bunker) "RO" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/mucus, -/turf/simulated/floor/tiled/airless, -/area/derelict) +/turf/simulated/floor/tiled/full, +/area/sol_bunker) "Sv" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, -/area/derelict) +/area/sol_bunker) "SC" = ( /obj/effect/decal/fake_object{ density = 1; @@ -975,44 +1478,60 @@ pixel_x = 1 }, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood/airless, -/area/derelict) +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/sol_bunker) "SI" = ( /obj/machinery/door/airlock/vault/bolted{ dir = 1 }, -/turf/simulated/floor/tiled/airless, -/area/derelict) +/obj/machinery/door/firedoor/noid, +/turf/simulated/floor/tiled/full, +/area/sol_bunker) +"SU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/fake_object{ + density = 1; + desc = "An old cryogenic freezer ."; + dir = 4; + icon = 'icons/obj/sleeper.dmi'; + icon_state = "body_scanner"; + name = "dilapitated cryogenic freezer"; + pixel_x = 1 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/sol_bunker) "SW" = ( /obj/item/reagent_containers/toothbrush, /turf/simulated/floor/tiled/white, -/area/derelict) +/area/sol_bunker) +"Tv" = ( +/obj/effect/floor_decal/corner/brown{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) "TC" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, -/area/derelict) +/area/sol_bunker) "TN" = ( /obj/effect/overmap/visitable/sector/abandoned_bunker, /turf/simulated/floor/wood, -/area/derelict) -"TO" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor, -/area/derelict) +/area/sol_bunker) "TP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/greenglow, /turf/simulated/floor/tiled/white, -/area/derelict) +/area/sol_bunker) "Uq" = ( /turf/simulated/wall/r_wall, -/area/derelict) +/area/sol_bunker) "UK" = ( /obj/effect/decal/cleanable/cobweb2, /obj/machinery/vending/wallmed2{ @@ -1021,90 +1540,106 @@ req_access = null }, /turf/simulated/floor/tiled/white, -/area/derelict) +/area/sol_bunker) +"UU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner_wide/dark_blue/full{ + dir = 4 + }, +/obj/machinery/light/small/red{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/sol_bunker) "Va" = ( /obj/machinery/light/small{ brightness_color = "#FA8282" }, /turf/simulated/floor/exoplanet/asteroid/ash/rocky, -/area/derelict) +/area/sol_bunker) "Vs" = ( -/obj/structure/sign/flag/sol/large/south, /obj/item/landmine/frag{ deployed = 1 }, +/obj/structure/sign/flag/sol/old{ + pixel_y = -32 + }, /turf/simulated/floor/exoplanet/asteroid/ash/rocky, -/area/derelict) +/area/sol_bunker) +"VC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 7 + }, +/turf/simulated/floor/wood, +/area/sol_bunker) +"Wj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner_wide/paleblue{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) "Wn" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/remains/rat, -/obj/structure/sign/flag/sol{ - pixel_x = 32 - }, -/turf/simulated/floor/wood/airless, -/area/derelict) -"WE" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ +/obj/structure/sign/flag/sol/old{ + pixel_x = 32; dir = 4 }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor, -/area/derelict) -"WG" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor, -/area/derelict) -"WS" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor, -/area/derelict) +/turf/simulated/floor/wood, +/area/sol_bunker) +"WV" = ( +/obj/random/junk, +/turf/simulated/floor/tiled/full, +/area/sol_bunker) "Xd" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, /turf/simulated/floor/wood, -/area/derelict) +/area/sol_bunker) "Xu" = ( /obj/structure/bed/stool/chair/office/light{ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark, -/area/derelict) +/turf/simulated/floor/tiled/dark/full, +/area/sol_bunker) +"XD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/sol/marine, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, +/turf/simulated/floor/wood, +/area/sol_bunker) "XK" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood, -/area/derelict) +/area/sol_bunker) "Ya" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - brightness_color = "#FA8282"; - dir = 4 +/obj/effect/floor_decal/corner_wide/dark_blue{ + dir = 6 }, /obj/structure/closet/secure_closet/guncabinet{ locked = 0; opened = 1; - req_access = list(150) + req_access = null }, /turf/simulated/floor/tiled/dark, -/area/derelict) +/area/sol_bunker) "Yp" = ( /turf/simulated/floor/exoplanet/asteroid/ash/rocky, -/area/derelict) +/area/sol_bunker) +"Yq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner/brown, +/turf/simulated/floor/tiled, +/area/sol_bunker) "YV" = ( /turf/template_noop, /area/space) @@ -1113,16 +1648,30 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 }, -/turf/simulated/floor/tiled/airless, -/area/derelict) +/obj/structure/foamedmetal, +/turf/simulated/floor/tiled/full, +/area/sol_bunker) "Zg" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ +/obj/structure/sign/flag/sol/old/large/north{ + pixel_y = 32 + }, +/obj/effect/floor_decal/corner/brown{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) +"ZJ" = ( +/obj/effect/floor_decal/corner/brown/full{ dir = 4 }, -/obj/structure/window/reinforced, -/turf/simulated/floor, -/area/derelict) +/turf/simulated/floor/tiled, +/area/sol_bunker) +"ZZ" = ( +/obj/effect/floor_decal/corner_wide/paleblue{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/sol_bunker) (1,1,1) = {" YV @@ -31828,11 +32377,11 @@ Yp Yp Yp Yp -Lu -xU +sI +cA xU kP -xU +Dg Rk OV mo @@ -32090,7 +32639,7 @@ Uq Uq Uq kc -Mf +tz LH qH Uq @@ -32600,14 +33149,14 @@ Yp Yp Uq Uq -gd -Mf -gd +Gp +un +cv jC -Mf -Mf +un +un FK -gd +Of DF gd Uq @@ -32856,17 +33405,17 @@ Yp Yp Uq Uq -gd -gd -Mf -DF -aL +Gp +rP +tS +WV +Iy lg -Mf +tS iU -gd -gd -Mf +oZ +oZ +sG gd Uq Uq @@ -33113,18 +33662,18 @@ Uq Uq Uq QX -Mf +fB uA -gd -Mf -gd -gd -gd -gd -gd +Tv +cW +Tv +Tv +Tv +Tv +Tv aL uA -gd +ik gd Uq Uq @@ -33365,22 +33914,22 @@ zM Uq fv mH -tz +sz qy -zs +jb Ce -Mf -gd -Bq -TO -tS -WE +us +oZ +FH +Eg +Eg +Eg hS hS -cA -tS -Gw -gd +Eg +Eg +Eg +Ry OK Mf Uq @@ -33388,7 +33937,7 @@ Ku kL du tV -GX +qT Uq Uq zM @@ -33620,32 +34169,32 @@ zM zM zM Uq -gI +JT oZ pd uk ku Ce -ki +Ry +tS Mf -Mf -WG +Kq Cs nx -li -XK +su +mR nx Re -us +Kq Bq -gd -gd +oZ +Lc Uq aC Xu GX GX -GX +le Uq Uq zM @@ -33884,25 +34433,25 @@ uE GF Ce pA +tS Mf -Mf -WS -Re +Kq +kH ia Xd XK Nf mP -cv -gd -Mf +Kq +Ry +tS rp Uq aC GX GX Gf -GX +le Uq Uq zM @@ -34137,25 +34686,25 @@ Uq gI oZ tD -tz +tS IB ML -gd -Mf -gd +Ry +tS +lw ab Fn li -fJ -fJ +Ef +Ef Oi -XK +zP ab -gd -gd -Bq +Ry +oZ +FH SI -GX +gS GX EO GX @@ -34393,26 +34942,26 @@ zM Uq jF pV -tz +tS vJ -tz +wR ML -Mf -gd +sX +oZ Mf ab -li +Oh Xd fJ fJ TN -Xd +LP ab -gd +Ry sJ -gd +lw SI -GX +gS GX GX GX @@ -34648,15 +35197,15 @@ zM zM zM Uq -ku -qy -tz -qy +PW +Hc +tS +Hc IO Ce -jK -Mf -gd +pA +tS +lw Kq qZ ia @@ -34664,16 +35213,16 @@ wY oM Rq tL -bK -gd -Mf +Kq +Ry +tS BV Uq aC Oe GX Rb -GX +le Uq Uq zM @@ -34906,25 +35455,25 @@ zM zM Uq ld -qy +Hc pV vN Jc Ce -gd -Mf -gd -WG +Zg +tS +lw +Kq HB om -li -XK +Gw +mJ fy -Re -us -gd -Mf -DF +hl +Kq +Ry +tS +od Uq fT rr @@ -35163,31 +35712,31 @@ zM zM Uq mg -oZ -tz -zs +ZZ +Wj +Fh zs Ce -gd -gd +Ry +oZ Mf -sI -tS -WE +Eg +Eg +Eg hS hS -cA -tS -Zg -Mf -gd -gd +Eg +Eg +Eg +sX +oZ +lw Uq -aC +dU lU Ya -GX -GX +hT +UU Uq Uq zM @@ -35425,20 +35974,20 @@ Uq Uq Uq Uq -gd -Mf +CV +Gd MJ -Mf -gd -gd -lg -gd -gd -Mf -gd +un +Of +Of +fu +Of +Of +un +Of MJ -gd -gd +Nz +ZJ Uq Uq Uq @@ -35683,18 +36232,18 @@ zM zM Uq Uq -DF -Mf -gd -gd +jV +Gd +oZ +oZ RO -Bq -Mf -Mf -gd -gd -Mf -gd +pV +tS +tS +oZ +oZ +Yq +ZJ Uq Uq Uq @@ -35941,16 +36490,16 @@ zM zM Uq Uq -gd -gd -gd +CV +Tv +Qf LJ -Mf -gd +cW +Tv Pe -Mf -Mf -gd +zU +cW +ZJ Uq Uq zM @@ -36202,7 +36751,7 @@ Ce Ce Ce Uq -hE +EJ oU Ce Ce @@ -36457,12 +37006,12 @@ II fY Ce CD -hE +mR mM -hE +mR cn SC -uG +SU uG Uq zM @@ -36717,9 +37266,9 @@ GU aj aj Bi -hE -hE -hE +XK +XK +XK KG Uq zM @@ -36972,12 +37521,12 @@ TC FJ hE Bi -hE -hE -hE -hE -Oh -hE +XK +XK +XK +XK +li +VC Uq Yp Yp @@ -37230,11 +37779,11 @@ FJ Oh aj nj -hE +XK aj lp lp -lp +et Uq zM Yp @@ -37485,12 +38034,12 @@ vY op Ce Eb -Oh -hE +li +XK iv -hE -hE -un +XK +XK +Xd sN Uq zM @@ -37741,9 +38290,9 @@ UK lu yt Ce -CD -hE -hE +XD +mJ +mJ sv Wn bJ