From 580a84900a5b5551fa40cfcfe47a9b4c808d8901 Mon Sep 17 00:00:00 2001
From: ToonClyde <49804499+ToonClyde@users.noreply.github.com>
Date: Thu, 1 Oct 2020 15:54:41 -0700
Subject: [PATCH] Windoors for Cargo flaps

---
 .../lavaland_surface_syndicate_base1.dmm      | 29 ++++++++++---------
 _maps/map_files/BoxStation/BoxStation.dmm     |  8 ++---
 _maps/map_files/PubbyStation/PubbyStation.dmm | 14 ++++-----
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
index 1a3d28c2..73deae60 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
@@ -30,7 +30,10 @@
 "aD" = (/obj/structure/closet/secure_closet/medical1{req_access = null; req_access_txt = "150"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/item/defibrillator/compact/combat,/turf/open/floor/plasteel/white/side{dir = 9},/area/ruin/unpowered/syndicate_lava_base/medbay)
 "aE" = (/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/machinery/light/small{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/telecomms)
 "aF" = (/turf/open/floor/mineral/plastitanium,/area/ruin/unpowered/syndicate_lava_base/testlab)
+"aG" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/light{dir = 1; pixel_y = 16},/turf/open/floor/mineral/plastitanium,/area/ruin/unpowered/syndicate_lava_base/testlab)
+"aH" = (/obj/structure/table/reinforced,/obj/machinery/light{dir = 1; pixel_y = 16},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/testlab)
 "aI" = (/obj/machinery/airalarm/syndicate{dir = 4; pixel_x = -24},/obj/structure/closet/crate/bin,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/telecomms)
+"aJ" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/light{dir = 4; light_color = "#c1caff"},/turf/open/floor/mineral/plastitanium,/area/ruin/unpowered/syndicate_lava_base/testlab)
 "aK" = (/obj/structure/disposalpipe/trunk{dir = 4},/obj/structure/disposaloutlet{dir = 8},/turf/open/floor/mineral/plastitanium,/area/ruin/unpowered/syndicate_lava_base/testlab)
 "aL" = (/turf/closed/wall/mineral/plastitanium/explosive,/area/ruin/unpowered/syndicate_lava_base/testlab)
 "aM" = (/obj/machinery/door/window/southleft{dir = 4; req_access_txt = "150"},/obj/machinery/door/window/southleft{dir = 8; req_access_txt = "150"},/obj/effect/turf_decal/stripes/line{dir = 8},/obj/effect/turf_decal/stripes/line{dir = 4},/turf/open/floor/plating,/area/ruin/unpowered/syndicate_lava_base/testlab)
@@ -45,6 +48,7 @@
 "aV" = (/obj/structure/cable/yellow{icon_state = "4-8"},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/medbay)
 "aW" = (/obj/structure/lattice/catwalk,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
 "aX" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 1; external_pressure_bound = 140; name = "killroom vent"; pressure_checks = 0},/turf/open/floor/circuit/telecomms,/area/ruin/unpowered/syndicate_lava_base/testlab)
+"aY" = (/obj/machinery/disposal/bin,/obj/structure/disposalpipe/trunk{dir = 4},/obj/effect/turf_decal/stripes/red/box,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/testlab)
 "aZ" = (/obj/structure/disposalpipe/trunk,/obj/structure/disposaloutlet{dir = 8},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
 "ba" = (/mob/living/simple_animal/slime,/turf/open/floor/mineral/plastitanium,/area/ruin/unpowered/syndicate_lava_base/testlab)
 "bb" = (/obj/structure/table/glass,/obj/machinery/light/small{dir = 8},/obj/item/clothing/glasses/science,/obj/item/clothing/mask/gas,/obj/effect/turf_decal/tile/purple{dir = 8},/obj/effect/turf_decal/tile/purple{dir = 1},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/testlab)
@@ -53,10 +57,10 @@
 "be" = (/obj/effect/turf_decal/stripes/line{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/testlab)
 "bf" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/testlab)
 "bg" = (/obj/machinery/smartfridge/extract/preloaded,/obj/effect/turf_decal/tile/purple{dir = 8},/obj/effect/turf_decal/tile/purple{dir = 1},/obj/effect/turf_decal/tile/purple,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/testlab)
-"bh" = (/obj/machinery/light/small{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/open/floor/mineral/plastitanium,/area/ruin/unpowered/syndicate_lava_base/testlab)
+"bh" = (/obj/machinery/light{light_color = "#cee5d2"},/turf/open/floor/mineral/plastitanium,/area/ruin/unpowered/syndicate_lava_base/testlab)
 "bi" = (/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/testlab)
-"bj" = (/obj/structure/table/reinforced,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/testlab)
-"bk" = (/obj/machinery/light/small{dir = 8},/turf/open/floor/mineral/plastitanium,/area/ruin/unpowered/syndicate_lava_base/testlab)
+"bj" = (/obj/machinery/light{dir = 4; light_color = "#c1caff"},/turf/open/floor/mineral/plastitanium,/area/ruin/unpowered/syndicate_lava_base/testlab)
+"bk" = (/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on,/obj/structure/window/reinforced{dir = 1},/obj/machinery/camera{c_tag = "Xenobiology Inner South"; dir = 4; network = list("ss13","rd")},/obj/machinery/light{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/testlab)
 "bl" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/testlab)
 "bm" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{dir = 4},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/testlab)
 "bn" = (/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/testlab)
@@ -86,7 +90,7 @@
 "bL" = (/obj/structure/sign/warning/biohazard,/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/virology)
 "bM" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/window/plasma/reinforced,/turf/open/floor/mineral/plastitanium,/area/ruin/unpowered/syndicate_lava_base/testlab)
 "bN" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/testlab)
-"bO" = (/obj/machinery/light/small{dir = 4},/turf/open/floor/mineral/plastitanium,/area/ruin/unpowered/syndicate_lava_base/testlab)
+"bO" = (/obj/machinery/atmospherics/pipe/simple/general/visible,/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/testlab)
 "bP" = (/obj/effect/turf_decal/stripes/line{dir = 8},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/chem_dispenser/fullupgrade,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/chemistry)
 "bQ" = (/obj/effect/turf_decal/stripes/corner{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/testlab)
 "bR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/obj/structure/cable/yellow{icon_state = "1-2"},/obj/effect/turf_decal/tile/red{dir = 8},/obj/effect/turf_decal/tile/green{dir = 1},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/main)
@@ -117,9 +121,6 @@
 "cr" = (/obj/effect/turf_decal/stripes/line{dir = 10},/obj/machinery/chem_heater,/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/chemistry)
 "cs" = (/obj/structure/chair/office/light{dir = 1},/obj/effect/turf_decal/bot,/obj/effect/turf_decal/stripes/line,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/chemistry)
 "ct" = (/obj/structure/grille,/obj/structure/window/plastitanium,/obj/machinery/door/poddoor/preopen{id = "lavalandsyndi_virology"},/turf/open/floor/plating,/area/ruin/unpowered/syndicate_lava_base/virology)
-"cu" = (/obj/machinery/disposal/bin,/obj/structure/disposalpipe/trunk{dir = 4},/obj/effect/turf_decal/stripes/red/box,/obj/machinery/light/small{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/testlab)
-"cv" = (/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on,/obj/structure/window/reinforced{dir = 1},/obj/machinery/camera{c_tag = "Xenobiology Inner South"; dir = 4; network = list("ss13","rd")},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/testlab)
-"cw" = (/obj/machinery/atmospherics/pipe/simple/general/visible,/obj/effect/turf_decal/stripes/line{dir = 8},/obj/machinery/light/small{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/testlab)
 "cx" = (/obj/effect/decal/cleanable/dirt,/obj/effect/mapping_helpers/no_lava,/obj/effect/turf_decal/stripes/line{dir = 4},/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/lavaland/surface/outdoors)
 "cy" = (/obj/effect/decal/cleanable/dirt,/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/circuits)
 "cz" = (/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/structure/chair{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/bar)
@@ -722,14 +723,14 @@ aaaaaaaaaaaaaaaaaaabaaaaaaaaabaaabababaaaaaaaaaaaaababaaaaaaaaaaaaaaaaaaaaabaaaa
 aaaaaaaaaaaaaaaaabababababababababababababababababababababababaaaaaaaaaaabababababaaaaaaaaaaaaaa
 aaaaaaaaaaabaaababababababababababababababababababababababababababaaababababababababababaaaaaaaa
 aaaaaaabaaabababababadaeaeaeaeaeaeaeaeaeaeaeaeapabababababababababababababababababababababaaaaaa
-aaaaaaabababababababaeawaAaAaFaeaxbjboekaFaFaAaeababababababababababababababababababababaaaaaaaa
-aaaaababababababababaeaFaAaFaKcZbsbebiaMaFbabhaeababababababababababababababababababababababaaaa
-aaaaaaababababababacaebkaFaFaFaMcWcXcucZbMbMcGaegoabababababababababababababababababababababaaaa
+aaaaaaabababababababaeawaAaGaFaeaxaHboekaFaFaAaeababababababababababababababababababababaaaaaaaa
+aaaaababababababababaeaFaAaFaKcZbsbebiaMaFbaaJaeababababababababababababababababababababababaaaa
+aaaaaaababababababacaeaFaFaFaFaMcWcXaYcZbMbMcGaegoabababababababababababababababababababababaaaa
 aaaaabababababababavaeaFaFaAaFekbndcddekaFaFaFaehZasatatatasabababababababababababababababaaaaaa
-aaabababababababababaeaAaFaFaAaedecqbNaMaAaFbOaeasasbPbScaasapigababababababababababababababaaaa
-aaababababababababacaeaeaeaeaeaecvbQdicZbMbMcGaLdoducrcscAasasdydydydyihababababababababababaaaa
-abababababababababacihaeaNaOaNekcwazdlekaFaAaFaedAdBdCdCdEdIasdKdLdMdydydydydydyabababababababaa
-ababababababababababacaeaQaTaUcTdrbidfaMaFbabhaedTdUdVdXdYdZaseaebecdbdyeeefegdyapababababababaa
+aaabababababababababaeaAaFbhaAaedecqbNaMaAaFbjaeasasbPbScaasapigababababababababababababababaaaa
+aaababababababababacaeaeaeaeaeaebkbQdicZbMbMcGaLdoducrcscAasasdydydydyihababababababababababaaaa
+abababababababababacihaeaNaOaNekbOazdlekaFaAaFaedAdBdCdCdEdIasdKdLdMdydydydydydyabababababababaa
+ababababababababababacaeaQaTaUcTdrbidfaMaFbaaJaedTdUdVdXdYdZaseaebecdbdyeeefegdyapababababababaa
 abababababababababababaeaNaXaNekbeckdicZbDbDbJaeerdqdsdvevewasdwdxdHdxdOeBeCeDeEeFababababababaa
 abababababababababababaeaeaeaeaedDdacpaeaeaeaeaeeRedeneseVasaseteXdFeufafbfcfdfeeFababababababab
 ababababababababiiababacaZaecMdNcYdQdRdgaebpdWoPfmfnfofnfpasexeyfsftdydyfufvfwdydydyfxababababab
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 20625f71..fdbf1dc4 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -418,7 +418,7 @@
 "aib" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel,/area/security/main)
 "aic" = (/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/machinery/door/window/southleft{name = "Firing Range"; req_access_txt = "63"},/obj/structure/window/reinforced{dir = 4},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/obj/machinery/light{dir = 8},/turf/open/floor/plasteel/dark,/area/security/range)
 "aid" = (/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/obj/machinery/light{dir = 4},/turf/open/floor/plasteel/dark,/area/security/range)
-"aie" = (/obj/machinery/door/airlock/security/glass{dir = 4; name = "Firing Range"; req_access_txt = "1"},/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel/dark,/area/security/range)
+"aie" = (/obj/machinery/door/airlock/security/glass{dir = 2; name = "Firing Range"; req_access_txt = "1"},/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel/dark,/area/security/range)
 "aif" = (/obj/effect/turf_decal/tile/red{dir = 8},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/obj/machinery/door/poddoor/shutters/preopen{id = "Laneshutter"; name = "Lane Shutter"},/turf/open/floor/plasteel,/area/security/range)
 "aig" = (/obj/structure/cable{icon_state = "1-4"},/obj/structure/disposalpipe/segment{dir = 5},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel,/area/security/main)
 "aih" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel,/area/security/main)
@@ -2685,6 +2685,7 @@
 "aZG" = (/obj/structure/chair/comfy/brown,/obj/effect/landmark/start/detective,/turf/open/floor/carpet,/area/security/detectives_office)
 "aZH" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/structure/closet/radiation,/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 4},/turf/open/floor/plasteel,/area/engine/engineering)
 "aZI" = (/obj/effect/landmark/stationroom/box/engine,/turf/open/space/basic,/area/space)
+"aZJ" = (/obj/structure/plasticflaps/opaque,/obj/machinery/door/firedoor,/obj/effect/turf_decal/delivery,/obj/machinery/door/window/westleft{dir = 6; name = "Cargo Office"; req_access_txt = "50"},/turf/open/floor/plasteel,/area/quartermaster/sorting)
 "aZK" = (/obj/structure/table,/obj/item/stack/sheet/metal/fifty,/obj/item/stack/sheet/glass/fifty,/obj/item/clothing/head/welding,/obj/item/stack/sheet/mineral/plasma{amount = 35},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/effect/turf_decal/stripes/corner{dir = 1},/turf/open/floor/plating,/area/ai_monitored/turret_protected/aisat/service)
 "aZL" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 8},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/open/floor/plasteel/dark,/area/ai_monitored/turret_protected/ai)
 "aZM" = (/turf/open/floor/carpet,/area/crew_quarters/bar)
@@ -3106,7 +3107,7 @@
 "bhM" = (/obj/structure/disposalpipe/trunk{dir = 2},/obj/machinery/disposal/deliveryChute{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"; layer = 3},/obj/effect/turf_decal/stripes/line{dir = 4},/turf/open/floor/plating,/area/maintenance/disposal)
 "bhN" = (/obj/machinery/mineral/stacking_machine{input_dir = 1; stack_amt = 10},/turf/open/floor/plating,/area/maintenance/disposal)
 "bhO" = (/obj/machinery/mineral/stacking_unit_console{machinedir = 8},/turf/closed/wall,/area/maintenance/disposal)
-"bhP" = (/obj/structure/disposalpipe/segment{dir = 9},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/obj/structure/table/wood,/obj/structure/table/wood,/obj/structure/table/wood,/obj/item/stack/packageWrap,/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/turf/open/floor/wood,/area/library)
+"bhP" = (/obj/structure/disposalpipe/segment{dir = 9},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/obj/structure/table/wood,/obj/item/stack/packageWrap,/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/turf/open/floor/wood,/area/library)
 "bhQ" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 1},/obj/machinery/light/small,/obj/effect/turf_decal/stripes/line,/turf/open/floor/plasteel,/area/storage/tools)
 "bhR" = (/obj/effect/turf_decal/stripes/line,/turf/open/floor/plasteel,/area/storage/tools)
 "bhS" = (/obj/machinery/shower{dir = 1},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/crew_quarters/toilet)
@@ -3549,7 +3550,6 @@
 "bqn" = (/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plasteel,/area/science/robotics/lab)
 "bqo" = (/obj/machinery/holopad,/obj/effect/turf_decal/bot,/turf/open/floor/plasteel/white,/area/medical/medbay/central)
 "bqp" = (/obj/structure/table,/obj/item/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/stock_parts/cell/high/plus,/obj/item/stock_parts/cell/high/plus,/obj/item/crowbar,/obj/structure/extinguisher_cabinet{pixel_x = 27},/obj/item/radio/headset/headset_sci{pixel_x = -3},/turf/open/floor/plasteel,/area/science/robotics/lab)
-"bqq" = (/obj/structure/plasticflaps/opaque,/obj/machinery/door/firedoor,/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel,/area/quartermaster/sorting)
 "bqr" = (/obj/machinery/camera{c_tag = "Locker Room South"; dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel,/area/crew_quarters/locker)
 "bqs" = (/obj/effect/turf_decal/tile/blue,/obj/machinery/light,/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/primary/starboard)
 "bqt" = (/turf/closed/wall,/area/science/lab)
@@ -7300,7 +7300,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdrblZbdrbmabmbbmbbxBbdrbmdbmdaPjbmebmfbmebmebmebmfbmeaPjaPjbhYbhYbmgbmhbhYbmibmibmibmibmibmibmjbmkbmlbmmbmnbmobmpbmqbmrrJHbmsbiebmucWYbjCbmvbzhbmxbmybmzbmAbmBaZybpIbpJaZvaadaadaAxcGFaCSbpKaFzcGGaAxaadaadaZDbmHbmIaZDaZDaZDaZDbmJaZDbmKaIPbmLbfvbmMbmNbmObitbiubmPbhcblxbmQbmRbmSbmTbmUbmVbmWbmXbixberbmYbmZbnabpzbkabhibhibkbbkacHvbncbfBbndblJbjWbnebkgbnfbkibngbkkbnhbnibnjbnkbnlbnmbnnbfLbnoblSbnpbfSbnqbnrbnsblnbtIblpbfSbkzbnwbANblYblYblYatJaaaaaaaaeaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJbdrbnBbkCbnCbmbbnDbnEbdraaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaabnFbnGbnHbnIbnJbnKbmibmibmibnLbmibmibnMbnNbnOblbbnQbnRblbbnTkjTeDbbiebqIbeVbAObnWbbfblhbnXbnYbnYbnYbnYbnZbrdbobaadaaaaAxaEnaHbaEobqgaEqaAxaaaaadaZDbntbnubnvbojbokaZDbreaZDbjiaIPbombfvbonboobopboqborbfvbosblxbmQbotboubhcbovbotbmWbowboxberboybozboAboBboCboCboDboEboHcIoboHboIboJboKbjWboLboMboNboOboPboQboRboSboTboUboVboWaRhbfLboXboYboZbfSbpabpbbpcblqbgRblrbfSbpebpfcEfblYcEgblYatJatJaaajXDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJbdrbpjbkCbkCbkCbdrbdrbdraaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaabnFbpkbplbpmbpnbpnbpnbpnbpnbpnbpnbpnbqJbhYbppbpqbprbpsbptbpubeVviwbiebpybeVbjCbpAbjDblhblhbobbpCbpDbpEbpFbpGbobaaaaaaaAxaFybrccGBcGLaFCaAxaaaaaaaZDboibpdbpxaZDbpOaZDcGHaZDbjiaIPbpQbpRbpSboobpTbitbpUbfvbjEbpVbpWbpXbpYbhcbpZbpXbqabqbbjEberberbqcbqPbqdbqebqfbqfbqfbqfbqhbqibqibqibqjbqkbfIbfIbfIbfIbfIbqlbqmbkmbqnboWboWbvAbqpbqlbATbAUbBQbqtblUblVblWblXbogbohbfScEqbfScEpbphbphbphbphbphbphbpiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJatJaaaatJaaaaaaatJaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaabqFbnFbnFbqGbplbkVbmibqHbqHbqHbqHbmibmibmibsmbhYbihbmwbqLbqMbqNbeVbeVbqQbqqbeVbeVbBVbqSbqTbqUbqVbqWbqXbpLbpMbpNbrbbobaadaaaaAxaAxcGUaHccGVaAxaAxaaaaadaZDbqxbqybDUaZDbriaZDbolaZDbjiaIPbpQbfvbrjboobrkbrlbrmbfvbrnblxbrobpXbjEbrpbjEbpXbrqbrrbrsbrtbrubrvbrwbrxbrybrzbrAbrBbrCbrDbrEbrFbrGblJbrHbrIbrJbrKbrLbrMbrNbrObrPbrQbrRbrSboWbrTbrUbrVbrWaSxbqtbqubqvbqwbqYbgRbqZbsccEscEtbqCbqDbqDbqDbqDbqDbqEbhIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJatJaaaatJaaaaaaatJaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaabqFbnFbnFbqGbplbkVbmibqHbqHbqHbqHbmibmibmibsmbhYbihbmwbqLbqMbqNbeVbeVbqQaZJbeVbeVbBVbqSbqTbqUbqVbqWbqXbpLbpMbpNbrbbobaadaaaaAxaAxcGUaHccGVaAxaAxaaaaadaZDbqxbqybDUaZDbriaZDbolaZDbjiaIPbpQbfvbrjboobrkbrlbrmbfvbrnblxbrobpXbjEbrpbjEbpXbrqbrrbrsbrtbrubrvbrwbrxbrybrzbrAbrBbrCbrDbrEbrFbrGblJbrHbrIbrJbrKbrLbrMbrNbrObrPbrQbrRbrSboWbrTbrUbrVbrWaSxbqtbqubqvbqwbqYbgRbqZbsccEscEtbqCbqDbqDbqDbqDbqDbqEbhIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJaaaaaajXDaaaaaaaaaaaajXDaaaaaaaaaaaaaaaaaaaaabsfbsgbsfbshbsibsjbskbslbmibmibmibmibzKbmibvlbhYbqKbvmcEOcEPcEQcERbsqbsnbtHbDubxPbzAbpAbjDcFTbsxbsybszbrabrfbpNbsCbobaaaaaaaTBbmCcIpaIPcIqcGJaTBaaaaaabsHbsIbsJbsHbsHbsHbsHbsKbsHbsLaLzbsMbfvbfvbsNbsObsPbfvbfvbhcbsQbsRbsSbsTbsSbsUbsSbsWbqbbhcbhcbhcbqbbhcbhbbrybrzbsXbsYbsZbtabtbbtcbrGbtdbtebtfbtgbtgbtgbthbtibtjbtkbtlbtmbtnbtobtpbtqbtrblSbtsbqtbqtbttbtubtvbttbqtbScbScbScbScbScbScbScbScbScbtBbhIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJatJatJjXDatJjXDjXDatJjXDaaaaaaaaaaaaaaaaaaaaabtCbtDbtEbtFbmibkVbmibqHbqHbtGbqHbmibmibvgbhYbhYbxRbxYbzqbzwbzxbzxbpwbzybtLbDwbDxbzAbpAbjDcFUbtMbtNbtObrgbrgbrhbtRbobaadaadaTBcGKcGWcIrcIscGNaTBaadaadbsHbuabubbucbudbuebufbugbsHbjoaIPbMmbujbukbulbumbunbuobupbuqburbusbutbutbutbutbutbuubuvbutbutbutbuwblCbuxbuybrzbuzbuAbuBbuBbuCbuDbrGblJbrHbuEbuFbuGbuHbuIbuJbuKbkmbuLbkmbkmbkmbuMbqlbuNbuObuPbuQbuRbuSbuTbuUbuVbuWbuXbuYbuZbvabvbbvabtwbvcbvdbvebhIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJaaaaaajXDaaaaaaaaaaaajXDaaaaaaaaaaaaaaaaaaaaabqFbnFbnFbvfbmibkVbmibmibmibmibmibmibmibwEbwWbxTbxRbvibvjbvkbvnbvnbvnbvobAwbDwbDxbzAbpAbjDcFVbsxbobbvrbvsbvtbvubvvbobaaaaaaaTBcGMcGWcItcIucGOaTBaaaaaabsHbvybvzbALbvBbvCbvCbvDbvEbvFbvGbWxbvHbvIbvJbvKbvLbvMbvNbvMbvMbvObvPbvQbvRbvRbvRbvSbvTbhcbhcbvUbvVbvVbvWbrzbrzbrzbvXbvYbvZbtbbuDbrGbwabrHbfLbqlbqlbqlbqlbqlbqlbqlbqlbqlbwbbwcbwbbqlbwdbwebwfbwgbwgbwgbwhbwibwjbwkbwlbwmbwnbwqbwpbwqbwrbwsbwtbwubwvblYbwwbwwblYaadaadaadaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 00b63f62..2c37890b 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -2460,10 +2460,10 @@
 "aVp" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel,/area/quartermaster/office)
 "aVq" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/open/floor/plasteel,/area/quartermaster/office)
 "aVr" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/effect/turf_decal/loading_area{dir = 8},/turf/open/floor/plasteel,/area/quartermaster/office)
-"aVs" = (/obj/structure/plasticflaps/opaque,/obj/machinery/conveyor{dir = 4; id = "cargodeliver"},/obj/effect/turf_decal/delivery,/obj/machinery/door/firedoor,/turf/open/floor/plasteel,/area/quartermaster/office)
+"aVs" = (/obj/structure/plasticflaps/opaque,/obj/effect/turf_decal/delivery,/obj/machinery/door/firedoor,/obj/machinery/door/window/westleft{dir = 8; name = "Cargo Bay"; req_access_txt = "50"},/turf/open/floor/plasteel,/area/quartermaster/office)
 "aVt" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 8},/turf/open/floor/plasteel,/area/quartermaster/office)
 "aVu" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 1},/turf/open/floor/plasteel,/area/quartermaster/office)
-"aVv" = (/obj/machinery/light{dir = 4},/obj/structure/extinguisher_cabinet{pixel_x = 27},/obj/machinery/conveyor_switch{id = "cargodeliver"},/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 4},/turf/open/floor/plasteel,/area/quartermaster/office)
+"aVv" = (/obj/machinery/light{dir = 4},/obj/structure/extinguisher_cabinet{pixel_x = 27},/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 4},/turf/open/floor/plasteel,/area/quartermaster/office)
 "aVw" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=4"; freq = 1400; location = "QM #1"},/obj/effect/turf_decal/bot,/mob/living/simple_animal/bot/mulebot{beacon_freq = 1400; home_destination = "QM #1"; suffix = "#1"},/turf/open/floor/plasteel,/area/quartermaster/storage)
 "aVx" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plasteel,/area/quartermaster/storage)
 "aVy" = (/obj/effect/landmark/start/cargo_technician,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/turf_decal/bot,/turf/open/floor/plasteel,/area/quartermaster/storage)
@@ -2897,7 +2897,7 @@
 "bdK" = (/obj/structure/chair/office/dark{dir = 8},/obj/effect/landmark/start/shaft_miner,/obj/structure/cable{icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel,/area/quartermaster/miningdock)
 "bdL" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 1},/turf/open/floor/plasteel,/area/quartermaster/miningdock)
 "bdM" = (/obj/machinery/requests_console{department = "Mining"; departmentType = 0; pixel_x = 32},/obj/machinery/computer/security/mining{dir = 8},/obj/effect/turf_decal/tile/brown,/turf/open/floor/plasteel,/area/quartermaster/miningdock)
-"bdN" = (/obj/machinery/door/airlock/security/glass{dir = 4; name = "Firing Range"; req_access_txt = "1"},/obj/effect/turf_decal/delivery,/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/cyan/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/range)
+"bdN" = (/obj/effect/turf_decal/delivery,/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/cyan/hidden{dir = 4},/obj/machinery/door/airlock/security{dir = 4; name = "Firing Range"; req_access_txt = "1"},/turf/open/floor/plasteel,/area/security/range)
 "bdO" = (/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/cyan/hidden{dir = 4},/turf/open/floor/plasteel/dark,/area/security/range)
 "bdP" = (/obj/structure/cable{icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/cyan/hidden{dir = 9},/turf/open/floor/plasteel/dark,/area/security/range)
 "bdQ" = (/obj/structure/cable{icon_state = "2-4"},/obj/structure/disposalpipe/segment{dir = 6},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/open/floor/plating{icon_state = "platingdmg3"},/area/maintenance/department/cargo)
@@ -3089,6 +3089,8 @@
 "bhu" = (/obj/structure/closet/secure_closet/miner,/obj/machinery/light,/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/turf/open/floor/plasteel,/area/quartermaster/miningdock)
 "bhv" = (/obj/structure/closet/secure_closet/miner,/obj/structure/extinguisher_cabinet{pixel_x = 27},/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 8},/turf/open/floor/plasteel,/area/quartermaster/miningdock)
 "bhw" = (/obj/machinery/button/door{id = "hos_spess_shutters"; name = "Space shutters"; pixel_x = 24; req_access_txt = "1"},/turf/open/floor/plasteel/dark,/area/crew_quarters/heads/hos)
+"bhx" = (/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel,/area/engine/atmos)
+"bhy" = (/obj/structure/plasticflaps/opaque,/obj/effect/turf_decal/delivery,/obj/machinery/door/firedoor/heavy,/obj/machinery/door/poddoor/preopen{id = "atmos"; name = "atmospherics security door"},/obj/machinery/door/window/northleft{dir = 4; icon_state = "left"; name = "Atmospherics"; req_access_txt = "24"},/turf/open/floor/plasteel,/area/engine/atmos)
 "bhz" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/light/small{dir = 1},/turf/open/floor/plating,/area/maintenance/department/cargo)
 "bhB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/structure/cable{icon_state = "2-8"},/turf/open/floor/plating,/area/maintenance/department/cargo)
 "bhF" = (/obj/structure/chair/comfy/beige{dir = 4},/obj/machinery/newscaster{pixel_x = -32},/turf/open/floor/plasteel/grimy,/area/crew_quarters/lounge)
@@ -4565,7 +4567,6 @@
 "bPK" = (/obj/structure/table,/obj/item/clothing/gloves/color/fyellow,/obj/item/wrench,/turf/open/floor/plasteel,/area/hallway/primary/aft)
 "bPL" = (/obj/structure/table,/obj/item/storage/toolbox/mechanical,/turf/open/floor/plasteel,/area/hallway/primary/aft)
 "bPM" = (/obj/machinery/light{dir = 4},/obj/effect/turf_decal/tile/yellow,/turf/open/floor/plasteel,/area/hallway/primary/aft)
-"bPN" = (/obj/machinery/conveyor_switch{id = "atmosdeliver"},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel,/area/engine/atmos)
 "bPO" = (/obj/structure/disposalpipe/segment,/turf/open/floor/plasteel,/area/engine/atmos)
 "bPP" = (/obj/structure/tank_dispenser,/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 4},/turf/open/floor/plasteel,/area/engine/atmos)
 "bPQ" = (/turf/closed/wall,/area/engine/atmos)
@@ -4674,7 +4675,6 @@
 "bRX" = (/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel,/area/hallway/primary/aft)
 "bRY" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 1},/turf/open/floor/plasteel,/area/hallway/primary/aft)
 "bRZ" = (/obj/structure/cable{icon_state = "2-8"},/turf/open/floor/plasteel,/area/hallway/primary/aft)
-"bSa" = (/obj/structure/plasticflaps/opaque,/obj/effect/turf_decal/delivery,/obj/machinery/conveyor{dir = 4; id = "atmosdeliver"},/obj/machinery/door/firedoor/heavy,/obj/machinery/door/poddoor/preopen{id = "atmos"; name = "atmospherics security door"},/turf/open/floor/plasteel,/area/engine/atmos)
 "bSb" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=4"; freq = 1400; location = "Atmospherics"},/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel,/area/engine/atmos)
 "bSc" = (/obj/structure/disposalpipe/sorting/mail/flip{dir = 2; sortType = 6},/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 1},/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel,/area/engine/atmos)
 "bSd" = (/obj/machinery/disposal/bin,/obj/structure/disposalpipe/trunk{dir = 8},/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel,/area/engine/atmos)
@@ -7019,10 +7019,10 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabIaaaabIbGHbMrbHMbLnbMsbMtbMubMvaOjaOjaOlbHMaZxaZxaZxaZxaZxahtalabvabHQbJbbLubMAbMBbLxbMCbMDbLybMEbGNwKcbErbMFbMGbKnbMGbMFbKnbMHbMIbGWbMJbErbjcbjcbjcbjcbMKboNbMMbFUbFUbFUbFUbFUbMNbMObMPbMQbMRbFUbKHbvabHfbMSbMTbMUbMVbmCbmCbMWbMXbMYbMZbNaagkbNcbNdbNebNfbNgbNfbNhbNibMfbMfbNjbNkbNlbNmbNnbLbbNobLebLebJPaaaaaaahtaaaaaabHybNpbNpbNpbHybNqbPlahiahtahtahtahtbwmikBwTOqnTlWydMIoEGhFpbwmahtabyaedaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyaaabNrbNsbNsbHMbNtbNubLnbNvbNwbNxbNybNzbNAbNBamCamBamCamBamDahtbIZbNFbJbbNGbNHbNIbNJbJbbKmbvabvabGNnSjbErbNLbNMbKnbNNbNObKnbNPbNQbNRbErbErbNSbNTbNUbjcbjccBLbjcbjcbNVbNWbNXbFUbFUbFUbFUbFUbFUbFUbNYabrbOabObbOcbmCbOdbmCbmCbOebOfbOgbOhbOiagmbOkbOlbOmbOkbOnbOkbOobOkbOkbOkbOpbOqbOibOrabIbJPbJPbJPbJPbJPahtabyabyabyahtbOsbOtbOtbOtbOsaOnmZEahtaaaahtaaaaaarNBiVJhPUlJrlWylWyndIabfrNBaaaabyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabybOvbNsbNsbaybNwbNwbOxcqIbNwbNwbNwbNwbHMbHMhRQaaaahtaaaahtaaaaaabIZbHQbJbbOzbOzbOzbOzbJbbOAbvabJibGNcXWbErbOCbODbErbODbOCbErbOEbOCbErbErbOFbCzbCzbCzbCzbCzbCzbCzbCzbCzbOHbCzhZBbCzbCzbCzbCzbCzbCzbOJbvabOKbJBbmDbOLbOLbOLbmCbOMbONbOObOPbOQbORbOSbOTbOUbOVbOWbOXbOYbOZbPabPbbPcbPdbPebPfbLabLbbPgbPhbPhbJPaaaaaaaaaaaaaaamZEmZEmZEmZEahtahtahtahtahtabIahtahtbwmizFxsOlWylWylWylWyabfbwmahtabyabIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabybGDbNsaYtaROaRObNwbPnbPobNwaYIaRObaybNsbSZabIahtahtahtahtahtahtbvabvabPpbHQbHQbHQbHQbPqbPrbvabHTbPsbPtbPubPvbPwbPxbPxbPvbPxbPybPzbvabPAbDzbPBbPBbPBbPBbPBbPBbPBbPCbPDbPEbPEbPFbPEbPEbPEbPEbPEbPEbPEbPEbPGbPHbPIbPJbPKbPLbmCbPMbJNbPNbPObPPbJNbPQbPRbPSbPQbPQbPQbPTbMfbPUbMfbPVbPWbPXbPYabIbMibPZbQabQbbJPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabIaaaabIaaaahtrNBtyprEhmaWlWyjDAiVJijUrNBaaaabyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabybGDbNsaYtaROaRObNwbPnbPobNwaYIaRObaybNsbSZabIahtahtahtahtahtahtbvabvabPpbHQbHQbHQbHQbPqbPrbvabHTbPsbPtbPubPvbPwbPxbPxbPvbPxbPybPzbvabPAbDzbPBbPBbPBbPBbPBbPBbPBbPCbPDbPEbPEbPFbPEbPEbPEbPEbPEbPEbPEbPEbPGbPHbPIbPJbPKbPLbmCbPMbJNbhxbPObPPbJNbPQbPRbPSbPQbPQbPQbPTbMfbPUbMfbPVbPWbPXbPYabIbMibPZbQabQbbJPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabIaaaabIaaaahtrNBtyprEhmaWlWyjDAiVJijUrNBaaaabyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabybOvbNsaTGaTIaRObQebQfbQgbQebQdaROaXebNsbQiabyabyaaaaaaahtaaaahtabIbvabvabIZbIZbIZbIZbvabvabvabQjbvaqyFbvabIZbQkbvabIZbIZbvabQlbIZbvabNXbDzbPBbQmbQnbQobQpbQqbPBbPBbPBbQrbQsbTubQubQvbQwbQxbQybQzbQAbPEbQBbQCbmDbOLbOLbOLbmCbQDbQEbQFbPObQGbJNbQHbQIbPSbQJbPQbQKbQLbMfbOYbQMbPVbQNbNlbQObNnbLbbQPbPhbPhbJPaaabzyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabIabIabIaaaahtbwmbwmrNBbwmbwmbwmrNBbwmbwmaedabyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabQQbNsaROaROaRObOwbQfbQgbOwaROaROaRObNsbQRabIabyaaaaaaahtaaaahtaaaaaaahtahtahtabIabIbvabSoapDaOpbSqbQUrXTbOGbQVbOIbCzbCzbCzbQWpwjpwjbQXbCDbPBbQZcCPcCFcCHbRbbRcbRdbRebRfbRgbRhbRibRjbRjbRjbRkbRlbRmbPEbBmbJBbRnbRobRpbRobRobRqbRrbRsbRtbRubJNbRvbQIbRwbRxbPQbQKbRybRzbRAbQMbPVbPWbRBbPYabIbJPbJPbJPbJPbJPabIabyaaaacOaaaaaaaaaaaaaaaaaaaaaaaaabIaaaabIaaaahtaaaahtaaaahtaaaahtaaaahtaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyabyabIbNrbNsbNsaROaROaTIaRObQfbQgbOwaROaROaRObNsbNsbRCabIabIaaaahtahtahtaaaaaaaaaahtbBWahtaOorMVvmYaOAvayaORbvabFZbvabREbFZbvabsnbNKbvabvabvabKHbDibPBbQZcCFbRacCFbRGabsbRIbRJagwbRLbRMbRNbRObRPbRQbRRbRSbRTagGbRVbRWbRXbRXbRYbRZbmCbCCbSabSbbScbSdbJNbSebQIbMfbQJbPQbQKbSfbMfbOYbQMbSgbPdbShbSibLabLbbSjbSkbSlbJPaaaabyaaaabyaaaaaaaaaaaaaaaaaaaaaaaaabIaaaabIaaaahtabyabyabyaedabyabyabyaedabyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyabyabIbNrbNsbNsaROaROaTIaRObQfbQgbOwaROaROaRObNsbNsbRCabIabIaaaahtahtahtaaaaaaaaaahtbBWahtaOorMVvmYaOAvayaORbvabFZbvabREbFZbvabsnbNKbvabvabvabKHbDibPBbQZcCFbRacCFbRGabsbRIbRJagwbRLbRMbRNbRObRPbRQbRRbRSbRTagGbRVbRWbRXbRXbRYbRZbmCbCCbhybSbbScbSdbJNbSebQIbMfbQJbPQbQKbSfbMfbOYbQMbSgbPdbShbSibLabLbbSjbSkbSlbJPaaaabyaaaabyaaaaaaaaaaaaaaaaaaaaaaaaabIaaaabIaaaahtabyabyabyaedabyabyabyaedabyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyaaabGDbNsbNsaXfaROaROaROaRObQfbQgbOwaROaYcaYtaRObNsbNsmfgabIaaaahtaaaahtahtahtahtbvabvaaQWbvabvabQSbRDbDinpEbvasUPbSsbStbFZbSubDibSvbSwbSxbvabKHbUebPBbQZcCHbSycCPbSzbSAbSBbSCbSDbSEbSFbSGbSHbSHbSHbSIbSJbSKbPEbSLbSMbSMbSNbSMbSObQDbSPbJNbLWbSQbLWbJNbPQbQIbMfbPQbPQbPQbSRbSSbSTbSUbPVbPWbSVbPYabIbMibSWbSXbSYbJPaaaabyabIabyaaaaaaaaaaaaaaaaaaaaaaaaabIaaaabIaaaaaaaaaahtaaaahtaaaahtaaaahtaaacFBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyaaabQQbNsaROaROaROaROaRObQebQfbQgbQeaTIaROaXfaROaRObNssRHabIabIabIaaaahtaaaaaabvabvaaQXaRraRxbvaaRAbRDbvanpEbvabTfbTgbThbFZbTibPCbTjbPCbTkbvabKHbTlbPBbTmbTnbTobTpbTqbPBbTrbTsbQrbTtbTubTvbTwbTxbTybTzbTAbTBbPEbTCbTCbTCbTDppsbTFppsbTGbJNbTHbTIbTJbTKbTLbTMbTNbTObTPbTQbTMbTRbTSbTTbPVbTUbNlbQObNnbLbbTVbSkbSkbJPaaaabyaaaabyaaaaaaaaaaaaaaaaaaaaaaaaabIabIabIaaaaaaaaaabyaedabyaaaabyabyaedabyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabybOvbNsbNsaROaYHbajaROaRObOwbQfbQgbOwbOwaROaROaROaRObNscqSsRHaaaabIaaaahtaaaaaaaQWaXgbSvbWZbDiaRUbDibXabNKoZWagJvGgbUarJglmsbUbbDibDibUcbUdbvabKHbBXbPBbPBbPBbPBbPBbPBbPBbPBbPBbQrbUfbUgbUhbQrbQrbQrbQrbQrbQrbQraOqaOraOzbTCbUlbUmbUnbUobJNbUpbUqbMfbUrbUsbUsbUtcApflPflPflPnYebUubUvbUwbUxbUybUzbUAbJPbJPbJPbJPbJPabIabyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabIaaaabIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa