diff --git a/_maps/map_files/Atlas/atlas.dmm b/_maps/map_files/Atlas/atlas.dmm
index 913204384ff..efd857ea4cc 100644
--- a/_maps/map_files/Atlas/atlas.dmm
+++ b/_maps/map_files/Atlas/atlas.dmm
@@ -138,14 +138,17 @@
 /turf/open/floor/plating,
 /area/maintenance/nsv/deck2/port)
 "ar" = (
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/turf/open/floor/monotile/steel,
-/area/quartermaster/storage)
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/techmaint,
+/area/quartermaster/miningoffice)
 "au" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
@@ -346,10 +349,13 @@
 /turf/open/floor/monotile/steel,
 /area/nsv/weapons)
 "be" = (
-/obj/machinery/light,
-/turf/open/floor/monotile/steel{
-	initial_gas_mix = "TEMP=2.7"
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/monotile/steel/airless,
 /area/nsv/hanger/mining)
 "bf" = (
 /obj/structure/disposalpipe/segment{
@@ -578,6 +584,10 @@
 	},
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck2/primary)
+"bX" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/plasteel/techmaint,
+/area/quartermaster/miningoffice)
 "bY" = (
 /obj/machinery/atmospherics/miner/toxins,
 /obj/machinery/air_sensor/atmos/toxin_tank,
@@ -840,18 +850,12 @@
 /turf/open/floor/monotile/steel,
 /area/quartermaster/storage)
 "cY" = (
-/obj/effect/landmark/start/shaft_miner,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
-	},
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/machinery/suit_storage_unit/mining/eva,
 /turf/open/floor/monotile/steel,
-/area/quartermaster/storage)
+/area/quartermaster/miningoffice)
 "cZ" = (
 /obj/structure/table/reinforced,
 /obj/item/clothing/gloves/color/yellow,
@@ -1541,9 +1545,7 @@
 	dir = 10
 	},
 /obj/item/radio/intercom/directional/south,
-/turf/open/floor/monotile/steel{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/monotile/steel/airless,
 /area/nsv/hanger/mining)
 "fo" = (
 /obj/machinery/door/airlock/highsecurity/ship{
@@ -1927,7 +1929,9 @@
 /turf/open/floor/plating,
 /area/maintenance/department/engine/atmos)
 "gn" = (
-/obj/machinery/atmospherics/components/trinary/filter/atmos/co2,
+/obj/machinery/atmospherics/components/trinary/filter/atmos/co2{
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/engine/atmos)
 "go" = (
@@ -2392,6 +2396,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/green/visible,
 /turf/open/floor/plating,
 /area/engine/atmos)
 "hI" = (
@@ -2410,9 +2415,7 @@
 /obj/machinery/camera/autoname{
 	dir = 1
 	},
-/turf/open/floor/monotile/steel{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/monotile/steel/airless,
 /area/nsv/hanger/mining)
 "hK" = (
 /obj/machinery/door/firedoor/border_only{
@@ -2559,6 +2562,13 @@
 /obj/item/extinguisher/advanced/hull_repair_juice,
 /turf/open/floor/plating,
 /area/maintenance/nsv/deck2/port)
+"ip" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/machinery/vendor/mining,
+/turf/open/floor/monotile/steel,
+/area/quartermaster/miningoffice)
 "ir" = (
 /turf/open/floor/durasteel/techfloor,
 /area/maintenance/nsv/deck2/port)
@@ -2996,19 +3006,12 @@
 /turf/open/floor/durasteel/alt,
 /area/hallway/nsv/deck2/primary)
 "jG" = (
-/obj/machinery/requests_console{
-	department = "Mining Hangar";
-	departmentType = 2;
-	name = "Mining Hangar RC";
-	pixel_y = 26
-	},
-/obj/structure/closet/secure_closet/miner,
-/obj/item/encryptionkey/pilot,
-/obj/item/encryptionkey/pilot,
-/obj/item/stack/sheet/mineral/wood/five,
-/turf/open/floor/monotile/steel{
-	initial_gas_mix = "TEMP=2.7"
+/obj/machinery/camera/autoname{
+	c_tag = "Atmos - Airlock #2";
+	dir = 6
 	},
+/obj/structure/reagent_dispensers/fueltank/cryogenic_fuel,
+/turf/open/floor/monotile/steel/airless,
 /area/nsv/hanger/mining)
 "jI" = (
 /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input,
@@ -3261,15 +3264,16 @@
 /turf/open/floor/monotile/dark,
 /area/hallway/secondary/exit/departure_lounge)
 "kx" = (
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/structure/rack,
-/turf/open/floor/monotile/steel{
-	initial_gas_mix = "TEMP=2.7"
+/obj/machinery/light,
+/obj/machinery/atmospherics/pipe/layer_manifold{
+	dir = 4
 	},
-/area/nsv/hanger/mining)
+/obj/machinery/camera/autoname{
+	c_tag = "Atmos - Airlock #2";
+	dir = 8
+	},
+/turf/open/floor/plasteel/techmaint,
+/area/quartermaster/miningoffice)
 "ky" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -3553,6 +3557,18 @@
 	},
 /turf/open/floor/monotile/dark,
 /area/nsv/weapons)
+"lg" = (
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/techmaint,
+/area/quartermaster/miningoffice)
 "lh" = (
 /obj/machinery/portable_atmospherics/scrubber,
 /turf/open/floor/plating{
@@ -3628,16 +3644,8 @@
 /turf/open/floor/plating,
 /area/maintenance/nsv/deck2/port)
 "ls" = (
-/obj/machinery/light{
-	dir = 1
-	},
-/obj/structure/closet/secure_closet/miner,
-/obj/item/encryptionkey/pilot,
-/obj/item/encryptionkey/pilot,
-/obj/item/stack/sheet/mineral/wood/five,
-/turf/open/floor/monotile/steel{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/obj/structure/reagent_dispensers/fueltank/cryogenic_fuel,
+/turf/open/floor/monotile/steel/airless,
 /area/nsv/hanger/mining)
 "lt" = (
 /obj/machinery/computer/ams{
@@ -4178,9 +4186,7 @@
 "no" = (
 /obj/effect/turf_decal/stripes/line,
 /obj/machinery/light,
-/turf/open/floor/monotile/steel{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/monotile/steel/airless,
 /area/nsv/hanger/mining)
 "np" = (
 /obj/machinery/computer/ship/viewscreen,
@@ -4421,9 +4427,6 @@
 /turf/open/floor/durasteel/alt,
 /area/hallway/nsv/deck2/primary)
 "nT" = (
-/obj/machinery/meter/atmos{
-	target_layer = 4
-	},
 /obj/machinery/atmospherics/components/binary/pump/on/layer2{
 	name = "Air to distro";
 	target_pressure = 2000
@@ -4484,9 +4487,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
-/turf/open/floor/monotile/steel{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/monotile/steel/airless,
 /area/nsv/hanger/mining)
 "oj" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -4568,11 +4569,10 @@
 /turf/open/floor/plasteel/techmaint,
 /area/security/brig)
 "ot" = (
-/obj/structure/reagent_dispensers/fueltank/cryogenic_fuel,
-/turf/open/floor/monotile/steel{
-	initial_gas_mix = "TEMP=2.7"
-	},
-/area/nsv/hanger/mining)
+/obj/machinery/firealarm/directional/west,
+/obj/structure/tank_dispenser/oxygen,
+/turf/open/floor/monotile/steel,
+/area/quartermaster/miningoffice)
 "ov" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -4993,6 +4993,13 @@
 	},
 /turf/open/floor/durasteel/alt,
 /area/hallway/nsv/deck2/primary)
+"pA" = (
+/obj/structure/closet/secure_closet/miner,
+/obj/item/stack/sheet/mineral/wood/five,
+/obj/item/encryptionkey/pilot,
+/obj/item/encryptionkey/pilot,
+/turf/open/floor/monotile/steel,
+/area/quartermaster/miningoffice)
 "pC" = (
 /obj/machinery/door/airlock/highsecurity/ship{
 	name = "Weapons Bay";
@@ -5256,9 +5263,7 @@
 /obj/machinery/airalarm/server{
 	pixel_y = 23
 	},
-/turf/open/floor/monotile/steel{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/monotile/steel/airless,
 /area/nsv/hanger/mining)
 "ql" = (
 /obj/effect/turf_decal/tile/ship/green,
@@ -5893,15 +5898,16 @@
 /turf/open/floor/plating,
 /area/maintenance/nsv/deck2/port/fore)
 "sA" = (
-/obj/effect/turf_decal/stripes/corner{
-	dir = 4
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-4"
 	},
 /obj/effect/landmark/start/shaft_miner,
-/obj/machinery/atmospherics/pipe/layer_manifold{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
 	},
-/turf/open/floor/monotile/steel,
-/area/quartermaster/storage)
+/turf/open/floor/plasteel/techmaint,
+/area/quartermaster/miningoffice)
 "sC" = (
 /obj/effect/turf_decal/stripes/line,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -5928,9 +5934,7 @@
 /turf/open/floor/monotile/dark,
 /area/hallway/nsv/deck2/primary)
 "sH" = (
-/turf/open/floor/plasteel/techmaint{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/plasteel/techmaint,
 /area/nsv/hanger/mining)
 "sI" = (
 /obj/effect/turf_decal/tile/ship/half/red{
@@ -6366,6 +6370,13 @@
 /obj/item/radio/intercom/directional/east,
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck2/primary)
+"uc" = (
+/obj/structure/closet/secure_closet/engineering_welding{
+	req_access = null;
+	req_one_access_txt = "48"
+	},
+/turf/open/floor/monotile/steel/airless,
+/area/nsv/hanger/mining)
 "ud" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -6603,9 +6614,7 @@
 	dir = 4;
 	id = "atlas_mining_hangar"
 	},
-/turf/open/floor/plasteel/techmaint{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/monotile/steel/airless,
 /area/nsv/hanger/mining)
 "uC" = (
 /obj/machinery/light/small{
@@ -7081,25 +7090,21 @@
 /area/nsv/weapons/gauss/battery/deck2/port)
 "wk" = (
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
 	},
-/turf/open/floor/monotile/steel,
-/area/quartermaster/storage)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/techmaint,
+/area/quartermaster/miningoffice)
 "wl" = (
 /turf/closed/wall/r_wall,
 /area/security/prison)
 "wn" = (
-/obj/structure/closet/secure_closet/miner,
-/obj/item/encryptionkey/pilot,
-/obj/item/encryptionkey/pilot,
-/obj/item/stack/sheet/mineral/wood/five,
-/turf/open/floor/monotile/steel{
-	initial_gas_mix = "TEMP=2.7"
-	},
-/area/nsv/hanger/mining)
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/monotile/steel,
+/area/quartermaster/miningoffice)
 "wq" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -7116,21 +7121,17 @@
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck2/primary)
 "wr" = (
-/obj/machinery/door/airlock/ship/external{
-	name = "Mining Shuttle Airlock";
-	req_one_access_txt = "31;48"
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/item/radio/intercom/directional/east,
+/obj/machinery/camera/autoname{
+	c_tag = "Atmos - Airlock #2";
+	dir = 8
 	},
 /turf/open/floor/monotile/steel,
-/area/quartermaster/storage)
+/area/quartermaster/miningoffice)
 "wt" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/monotile/steel,
-/area/quartermaster/storage)
+/obj/effect/landmark/start/shaft_miner,
+/turf/open/floor/plasteel/techmaint,
+/area/quartermaster/miningoffice)
 "wu" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
@@ -7431,15 +7432,11 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
-/obj/machinery/button/door{
-	id = "atlas_mining_hangar";
-	name = "Pod Bay Doors";
-	pixel_y = 32;
-	req_one_access_txt = "48"
-	},
-/turf/open/floor/monotile/steel{
-	initial_gas_mix = "TEMP=2.7"
+/obj/machinery/power/apc/auto_name/north,
+/obj/structure/cable{
+	icon_state = "0-2"
 	},
+/turf/open/floor/monotile/steel/airless,
 /area/nsv/hanger/mining)
 "xt" = (
 /obj/structure/cable/yellow{
@@ -7650,9 +7647,9 @@
 /area/nsv/weapons)
 "ya" = (
 /obj/machinery/light,
-/obj/machinery/suit_storage_unit/mining/eva,
+/obj/effect/landmark/start/shaft_miner,
 /turf/open/floor/monotile/steel,
-/area/quartermaster/storage)
+/area/quartermaster/miningoffice)
 "ye" = (
 /obj/effect/turf_decal/stripes/line,
 /obj/item/kirbyplants{
@@ -7661,11 +7658,13 @@
 /turf/open/floor/monotile/steel,
 /area/hallway/secondary/exit/departure_lounge)
 "yg" = (
-/obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/monotile/steel{
-	initial_gas_mix = "TEMP=2.7"
-	},
-/area/nsv/hanger/mining)
+/obj/structure/closet/secure_closet/miner,
+/obj/item/stack/sheet/mineral/wood/five,
+/obj/item/stack/sheet/mineral/wood/five,
+/obj/item/encryptionkey/pilot,
+/obj/machinery/newscaster/directional/north,
+/turf/open/floor/monotile/steel,
+/area/quartermaster/miningoffice)
 "yk" = (
 /obj/machinery/light_switch{
 	pixel_x = 6;
@@ -7928,13 +7927,14 @@
 /turf/open/floor/monotile/steel,
 /area/ai_monitored/security/armory)
 "zc" = (
-/obj/item/gps/mining,
-/obj/structure/rack,
-/obj/item/gps/mining,
-/turf/open/floor/monotile/steel{
-	initial_gas_mix = "TEMP=2.7"
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{
+	dir = 4
 	},
-/area/nsv/hanger/mining)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/techmaint,
+/area/quartermaster/miningoffice)
 "ze" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
@@ -8123,15 +8123,11 @@
 /turf/closed/wall/r_wall,
 /area/maintenance/department/engine/atmos)
 "zJ" = (
-/obj/effect/landmark/start/shaft_miner,
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/turf/open/floor/monotile/steel,
-/area/quartermaster/storage)
+/turf/open/floor/plasteel/techmaint,
+/area/quartermaster/miningoffice)
 "zL" = (
 /obj/effect/turf_decal/ship/outline,
 /obj/machinery/missile_builder/assembler{
@@ -8491,6 +8487,10 @@
 	},
 /turf/open/indestructible/sound/pool/spentfuel/wall,
 /area/engine/engine_room)
+"Br" = (
+/obj/machinery/light,
+/turf/open/floor/monotile/steel/airless,
+/area/nsv/hanger/mining)
 "Bs" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/structure/cable{
@@ -8557,12 +8557,12 @@
 /area/security/prison)
 "BF" = (
 /obj/effect/turf_decal/stripes/line,
-/turf/open/floor/monotile/steel{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/monotile/steel/airless,
 /area/nsv/hanger/mining)
 "BG" = (
-/obj/machinery/atmospherics/components/trinary/filter/atmos/n2o,
+/obj/machinery/atmospherics/components/trinary/filter/atmos/n2o{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/engine/atmos)
 "BH" = (
@@ -8949,16 +8949,9 @@
 /turf/open/floor/carpet/ship,
 /area/nsv/hanger/notkmcstupidhanger)
 "De" = (
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/machinery/camera/autoname{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/suit_storage_unit/mining/eva,
 /turf/open/floor/monotile/steel,
-/area/quartermaster/storage)
+/area/quartermaster/miningoffice)
 "Dh" = (
 /obj/item/radio/intercom/directional/west,
 /turf/open/floor/carpet/orange,
@@ -9102,13 +9095,8 @@
 /turf/open/floor/plating,
 /area/maintenance/nsv/deck2/starboard)
 "DH" = (
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/turf/open/floor/monotile/steel{
-	initial_gas_mix = "TEMP=2.7"
-	},
-/area/nsv/hanger/mining)
+/turf/closed/wall/r_wall,
+/area/quartermaster/miningoffice)
 "DM" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -9178,12 +9166,21 @@
 /turf/open/floor/carpet/red,
 /area/security/brig)
 "Eb" = (
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/west,
-/turf/open/floor/monotile/steel{
-	initial_gas_mix = "TEMP=2.7"
+/obj/machinery/door/airlock/ship/external/glass{
+	req_one_access_txt = "31; 48";
+	name = "Mining Hangar Access"
 	},
-/area/nsv/hanger/mining)
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/techmaint,
+/area/quartermaster/miningoffice)
 "Ec" = (
 /obj/machinery/light{
 	dir = 8
@@ -9537,6 +9534,7 @@
 /obj/machinery/atmospherics/pipe/simple/green/visible{
 	dir = 6
 	},
+/obj/machinery/portable_atmospherics/canister/toxins,
 /turf/open/floor/plating,
 /area/engine/atmos)
 "FE" = (
@@ -9988,6 +9986,16 @@
 	},
 /turf/open/floor/durasteel/alt,
 /area/hallway/nsv/deck2/primary)
+"Hb" = (
+/obj/machinery/camera/autoname{
+	dir = 4
+	},
+/obj/machinery/power/apc/auto_name/west,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/open/floor/monotile/steel,
+/area/quartermaster/miningoffice)
 "Hc" = (
 /obj/structure/rack,
 /obj/effect/spawner/lootdrop/maintenance/three,
@@ -9997,9 +10005,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
-/turf/open/floor/monotile/steel{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/monotile/steel/airless,
 /area/nsv/hanger/mining)
 "He" = (
 /obj/machinery/light_switch/west,
@@ -10054,12 +10060,15 @@
 /turf/open/floor/plating,
 /area/maintenance/nsv/deck2/port)
 "Ho" = (
-/obj/machinery/light_switch/west,
-/obj/machinery/vendor/mining,
-/turf/open/floor/monotile/steel{
-	initial_gas_mix = "TEMP=2.7"
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/area/nsv/hanger/mining)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/quartermaster/miningoffice)
 "Hr" = (
 /obj/machinery/modular_fabricator/autolathe,
 /obj/machinery/power/apc/auto_name/east,
@@ -10247,9 +10256,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/open/floor/monotile/steel{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/monotile/steel/airless,
 /area/nsv/hanger/mining)
 "HQ" = (
 /obj/structure/grille,
@@ -10330,6 +10337,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 9
 	},
+/obj/machinery/meter/atmos{
+	target_layer = 4;
+	name = "Scrubber loop gas flow meter"
+	},
 /turf/open/floor/plating,
 /area/engine/atmos)
 "In" = (
@@ -10459,9 +10470,8 @@
 /turf/open/floor/monotile/steel,
 /area/maintenance/department/science)
 "Ja" = (
-/obj/machinery/suit_storage_unit/mining/eva,
 /turf/open/floor/monotile/steel,
-/area/quartermaster/storage)
+/area/quartermaster/miningoffice)
 "Jb" = (
 /obj/structure/sign/ship/securearea{
 	dir = 4
@@ -10579,7 +10589,7 @@
 "Jq" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
-/area/nsv/hanger/mining)
+/area/quartermaster/miningoffice)
 "Jr" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
@@ -10614,9 +10624,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/turf/open/floor/monotile/steel{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/monotile/steel/airless,
 /area/nsv/hanger/mining)
 "Jw" = (
 /obj/machinery/gauss_dispenser,
@@ -11475,9 +11483,28 @@
 /turf/open/floor/durasteel/techfloor_grid,
 /area/maintenance/nsv/deck2/port)
 "LV" = (
-/turf/open/floor/monotile/steel{
-	initial_gas_mix = "TEMP=2.7"
+/turf/open/floor/monotile/steel/airless,
+/area/nsv/hanger/mining)
+"LW" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/machinery/button/door{
+	id = "atlas_mining_hangar";
+	name = "Pod Bay Doors";
+	pixel_y = 32;
+	req_one_access_txt = "48"
 	},
+/turf/open/floor/monotile/steel/airless,
+/area/nsv/hanger/mining)
+"LX" = (
+/obj/machinery/camera/autoname{
+	dir = 1
+	},
+/obj/structure/rack,
+/obj/item/gps/mining,
+/obj/item/gps/mining,
+/turf/open/floor/monotile/steel/airless,
 /area/nsv/hanger/mining)
 "LY" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -11625,6 +11652,18 @@
 /obj/item/ship_weapon/parts/missile/iff_card,
 /turf/open/floor/engine,
 /area/nsv/weapons)
+"Mq" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/turf/open/floor/monotile/steel,
+/area/quartermaster/miningoffice)
 "Ms" = (
 /obj/structure/cable{
 	icon_state = "1-16"
@@ -11802,7 +11841,8 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /obj/machinery/meter/atmos/distro_loop{
-	target_layer = 2
+	target_layer = 2;
+	name = "Distribution loop gas flow meter"
 	},
 /turf/open/floor/plating,
 /area/engine/atmos)
@@ -11989,14 +12029,17 @@
 /turf/open/floor/monotile/dark,
 /area/engine/engine_room)
 "NN" = (
-/obj/effect/turf_decal/stripes/corner,
-/obj/structure/tank_dispenser/oxygen,
-/obj/machinery/newscaster/directional/north,
-/obj/machinery/atmospherics/pipe/layer_manifold{
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 4
 	},
-/turf/open/floor/monotile/steel,
-/area/quartermaster/storage)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plasteel/techmaint,
+/area/quartermaster/miningoffice)
 "NO" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
@@ -12357,7 +12400,6 @@
 /obj/machinery/atmospherics/pipe/simple/green/visible{
 	dir = 4
 	},
-/obj/machinery/meter/atmos/atmos_waste_loop,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 6
 	},
@@ -12622,9 +12664,10 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/turf/open/floor/plasteel/techmaint{
-	initial_gas_mix = "TEMP=2.7"
+/obj/structure/cable{
+	icon_state = "1-8"
 	},
+/turf/open/floor/monotile/steel/airless,
 /area/nsv/hanger/mining)
 "PL" = (
 /obj/machinery/airalarm/directional/north,
@@ -12826,21 +12869,20 @@
 	},
 /area/nsv/hanger/notkmcstupidhanger)
 "Qs" = (
-/obj/machinery/advanced_airlock_controller/directional/east{
-	pixel_y = 24
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
 	},
-/obj/item/radio/intercom/directional/north,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 1
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 1
+/obj/structure/cable{
+	icon_state = "1-8"
 	},
 /turf/open/floor/monotile/steel,
-/area/quartermaster/storage)
+/area/quartermaster/miningoffice)
 "Qu" = (
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/engine,
@@ -13216,10 +13258,6 @@
 /turf/open/floor/monotile/steel,
 /area/quartermaster/storage)
 "Ry" = (
-/obj/machinery/door/airlock/ship/external{
-	name = "Mining Shuttle Airlock";
-	req_one_access_txt = "31;48"
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
@@ -13229,8 +13267,19 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/ship{
+	name = "Mining Ready Room";
+	req_one_access_txt = "31; 48"
+	},
+/obj/effect/landmark/zebra_interlock_point,
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
 /turf/open/floor/monotile/steel,
-/area/quartermaster/storage)
+/area/quartermaster/miningoffice)
 "Rz" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
@@ -13271,6 +13320,9 @@
 	},
 /turf/open/floor/monotile/steel,
 /area/nsv/weapons/gauss/battery/deck2/port)
+"RG" = (
+/turf/open/floor/plasteel/techmaint,
+/area/quartermaster/miningoffice)
 "RH" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -13583,14 +13635,18 @@
 /turf/open/floor/monotile/steel,
 /area/science)
 "SP" = (
-/obj/structure/closet/secure_closet/engineering_welding{
-	req_access = null;
-	req_one_access_txt = "48"
+/obj/machinery/atmospherics/pipe/layer_manifold{
+	dir = 4
 	},
-/turf/open/floor/monotile/steel{
-	initial_gas_mix = "TEMP=2.7"
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/area/nsv/hanger/mining)
+/obj/machinery/door/airlock/ship/external/glass{
+	req_one_access_txt = "31; 48";
+	name = "Mining Hangar Access"
+	},
+/turf/open/floor/plasteel/techmaint,
+/area/quartermaster/miningoffice)
 "SR" = (
 /obj/machinery/recharge_station,
 /turf/open/floor/plating,
@@ -13954,7 +14010,7 @@
 	dir = 1
 	},
 /turf/open/space/basic,
-/area/nsv/hanger/mining)
+/area/space/nearstation)
 "TT" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -13985,6 +14041,15 @@
 /obj/machinery/light,
 /turf/open/floor/durasteel/alt,
 /area/hallway/nsv/deck2/primary)
+"TV" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/turf/open/floor/monotile/steel,
+/area/quartermaster/miningoffice)
 "TX" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
@@ -14128,10 +14193,12 @@
 /turf/open/floor/plating,
 /area/maintenance/nsv/deck2/port)
 "Uy" = (
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/monotile/steel{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/structure/rack,
+/turf/open/floor/monotile/steel/airless,
 /area/nsv/hanger/mining)
 "Uz" = (
 /obj/structure/disposalpipe/segment{
@@ -14336,9 +14403,7 @@
 /area/nsv/hanger/notkmcstupidhanger)
 "Vg" = (
 /obj/structure/overmap/small_craft/transport/sabre/mining,
-/turf/open/floor/plasteel/techmaint{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/plasteel/techmaint,
 /area/nsv/hanger/mining)
 "Vh" = (
 /obj/structure/cable/yellow{
@@ -14448,6 +14513,22 @@
 /area/crew_quarters/abandoned_gambling_den{
 	name = "Abandoned Bar"
 	})
+"Vy" = (
+/obj/machinery/advanced_airlock_controller/directional/east{
+	pixel_y = 24
+	},
+/obj/item/radio/intercom/directional/north,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/techmaint,
+/area/quartermaster/miningoffice)
 "Vz" = (
 /obj/machinery/conveyor{
 	dir = 8;
@@ -14554,9 +14635,7 @@
 	dir = 4;
 	id = "atlas_mining_hangar"
 	},
-/turf/open/floor/plasteel/techmaint{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/monotile/steel/airless,
 /area/nsv/hanger/mining)
 "VQ" = (
 /obj/structure/particle_accelerator/end_cap{
@@ -15513,9 +15592,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
-/turf/open/floor/plasteel/techmaint{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/plasteel/techmaint,
 /area/nsv/hanger/mining)
 "Zu" = (
 /obj/effect/turf_decal/tile/ship/half/green{
@@ -52844,14 +52921,14 @@ fc
 oo
 tP
 tP
-tP
-tP
-tP
+DH
+DH
+DH
 Ry
-tP
-tP
-tP
-tP
+Jq
+DH
+DH
+DH
 Od
 Nh
 Nh
@@ -53101,14 +53178,14 @@ kg
 Rh
 Tb
 QI
-Pm
+DH
 ot
-tP
+Hb
 Qs
 De
 cY
-Ja
-tR
+De
+Jq
 Od
 Nh
 Nh
@@ -53358,14 +53435,14 @@ kg
 Gy
 td
 VM
-Pm
-wn
-tP
+DH
+ip
+RG
 ar
 wt
 zJ
 ya
-tR
+Jq
 Od
 Nh
 Nh
@@ -53615,14 +53692,14 @@ bo
 ti
 Ki
 xp
-Pm
+DH
 wn
-tP
+bX
 NN
 wk
 sA
 Ja
-tR
+Jq
 Od
 Nh
 Nh
@@ -53872,14 +53949,14 @@ Oq
 ti
 HA
 Yc
-Pm
+DH
 yg
-tP
-tP
+pA
+pA
 wr
-tP
-tP
-tP
+Mq
+TV
+DH
 Od
 Nh
 Nh
@@ -54129,14 +54206,14 @@ qf
 Be
 wU
 Wa
-Pm
-SP
-LV
-Uy
+DH
+DH
+Jq
+Jq
 DH
 Eb
 Ho
-Pm
+DH
 Od
 Nh
 Nh
@@ -54388,10 +54465,10 @@ Bj
 ez
 Pm
 ls
-sH
-sH
-sH
-sH
+LV
+Uy
+DH
+Vy
 zc
 Jq
 Od
@@ -54646,9 +54723,9 @@ ZZ
 Pm
 jG
 sH
-sH
-sH
-sH
+LX
+DH
+lg
 kx
 Jq
 Od
@@ -54901,13 +54978,13 @@ yN
 sn
 Mi
 Pm
-ot
+uc
 LV
-sH
-sH
-sH
-be
-Pm
+Br
+DH
+SP
+DH
+DH
 kD
 Nh
 Nh
@@ -55160,8 +55237,8 @@ fy
 Pm
 Pm
 xs
-PJ
-PJ
+be
+be
 PJ
 fn
 Pm
@@ -55419,8 +55496,8 @@ Pm
 qk
 sH
 sH
-Vg
-hJ
+sH
+BF
 Pm
 Nh
 Nh
@@ -55673,10 +55750,10 @@ av
 lj
 WM
 Pm
-Ju
-sH
+LW
 sH
 sH
+Vg
 BF
 Pm
 Nh
@@ -55934,7 +56011,7 @@ HP
 sH
 sH
 sH
-BF
+hJ
 Pm
 Nh
 Nh
@@ -56190,8 +56267,8 @@ Pm
 Ju
 sH
 sH
-Vg
-BF
+sH
+no
 Pm
 Nh
 Nh
@@ -56447,8 +56524,8 @@ Pm
 Ju
 sH
 sH
-sH
-no
+Vg
+BF
 Pm
 Nh
 Nh
@@ -56958,11 +57035,11 @@ Ya
 Mi
 Mi
 Pm
-oi
-Zs
-Zs
-Zs
-Hd
+Ju
+sH
+sH
+sH
+BF
 Pm
 Nh
 Nh
@@ -57215,11 +57292,11 @@ Vk
 HF
 fI
 Pm
-Pm
-VO
-VO
-VO
-uA
+oi
+Zs
+Zs
+Zs
+Hd
 Pm
 Nh
 Nh
@@ -57472,12 +57549,12 @@ Lt
 UM
 fI
 Pm
-TE
-Nh
-Nh
-Nh
-Nh
-Nh
+Pm
+VO
+VO
+VO
+uA
+Pm
 Nh
 Nh
 Nh
@@ -57729,7 +57806,7 @@ fI
 fI
 fI
 Pm
-TS
+TE
 Nh
 Nh
 Nh
@@ -57986,7 +58063,7 @@ fI
 kD
 kD
 kD
-pK
+TS
 Nh
 Nh
 Nh
diff --git a/_maps/map_files/Atlas/atlas2.dmm b/_maps/map_files/Atlas/atlas2.dmm
index 32d7538cf04..99ddd01f70e 100644
--- a/_maps/map_files/Atlas/atlas2.dmm
+++ b/_maps/map_files/Atlas/atlas2.dmm
@@ -1106,6 +1106,16 @@
 	},
 /turf/open/floor/wood,
 /area/crew_quarters/bar/mess_hall)
+"eZ" = (
+/obj/machinery/computer/robotics{
+	dir = 1
+	},
+/obj/machinery/camera/autoname{
+	dir = 1
+	},
+/obj/structure/extinguisher_cabinet/east,
+/turf/open/floor/carpet/ship/beige_carpet,
+/area/crew_quarters/heads/hor)
 "fa" = (
 /turf/open/floor/plasteel/stairs{
 	dir = 8
@@ -1342,6 +1352,9 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
+/obj/structure/table/reinforced,
+/obj/item/paper_bin,
+/obj/item/stamp/research_director,
 /turf/open/floor/carpet/ship/beige_carpet,
 /area/crew_quarters/heads/hor)
 "fS" = (
@@ -1832,7 +1845,6 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/disposalpipe/segment,
 /obj/effect/turf_decal/tile/ship/blue{
 	dir = 8
 	},
@@ -1926,7 +1938,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/structure/disposalpipe/junction{
+/obj/structure/disposalpipe/sorting/mail{
+	sortType = 10;
 	dir = 8
 	},
 /turf/open/floor/monotile/steel,
@@ -2028,6 +2041,7 @@
 	c_tag = "AI Upload";
 	dir = 10
 	},
+/obj/item/aiModule/core/full/custom,
 /turf/open/floor/circuit,
 /area/ai_monitored/turret_protected/ai_upload)
 "jb" = (
@@ -2748,15 +2762,15 @@
 /obj/effect/turf_decal/tile/ship/half/yellow{
 	dir = 8
 	},
-/obj/structure/disposalpipe/sorting/mail{
-	sortType = 5
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 9
+	},
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck1/hallway)
 "ma" = (
@@ -3321,12 +3335,6 @@
 /turf/closed/wall/r_wall,
 /area/crew_quarters/heads/chief)
 "oX" = (
-/obj/machinery/computer/robotics{
-	dir = 8
-	},
-/obj/machinery/camera/autoname{
-	dir = 1
-	},
 /obj/machinery/light_switch/east,
 /turf/open/floor/carpet/ship/beige_carpet,
 /area/crew_quarters/heads/hor)
@@ -3503,7 +3511,6 @@
 	dir = 1
 	},
 /obj/machinery/firealarm/directional/west,
-/obj/structure/disposalpipe/segment,
 /obj/effect/turf_decal/tile/ship/blue{
 	dir = 8
 	},
@@ -3606,13 +3613,13 @@
 /obj/structure/railing/corner{
 	dir = 8
 	},
-/obj/structure/disposalpipe/sorting/mail{
-	dir = 4;
-	sortType = "5;10"
-	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
 	},
+/obj/structure/disposalpipe/sorting/mail{
+	sortType = 5;
+	dir = 4
+	},
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck1/hallway)
 "qo" = (
@@ -3812,8 +3819,6 @@
 /turf/open/floor/monotile/dark,
 /area/bridge/cic)
 "rs" = (
-/obj/structure/table/reinforced,
-/obj/item/paper_bin,
 /obj/machinery/requests_console{
 	announcementConsole = 1;
 	department = "Research Director's Desk";
@@ -3825,7 +3830,7 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 8
 	},
-/obj/item/stamp/research_director,
+/obj/machinery/disposal/bin,
 /turf/open/floor/carpet/ship/beige_carpet,
 /area/crew_quarters/heads/hor)
 "rt" = (
@@ -4663,7 +4668,6 @@
 /obj/effect/turf_decal/tile/ship/green{
 	dir = 8
 	},
-/obj/structure/disposalpipe/segment,
 /obj/effect/turf_decal/tile/ship/yellow{
 	dir = 1
 	},
@@ -7668,15 +7672,15 @@
 /obj/effect/turf_decal/tile/ship/half/blue{
 	dir = 8
 	},
-/obj/structure/disposalpipe/sorting/mail{
-	sortType = 10
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 10
+	},
 /turf/open/floor/monotile/steel,
 /area/hallway/nsv/deck1/hallway)
 "IV" = (
@@ -8466,7 +8470,6 @@
 /obj/machinery/computer/mecha{
 	dir = 1
 	},
-/obj/structure/extinguisher_cabinet/east,
 /obj/item/radio/intercom/directional/south,
 /turf/open/floor/carpet/ship/beige_carpet,
 /area/crew_quarters/heads/hor)
@@ -8782,6 +8785,18 @@
 /obj/machinery/vending/hydronutrients,
 /turf/open/floor/monotile/steel,
 /area/hydroponics)
+"Nu" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/tile/ship/yellow{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/ship/yellow{
+	dir = 8
+	},
+/turf/open/floor/durasteel/alt,
+/area/hallway/nsv/deck1/hallway)
 "Nv" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 6
@@ -11150,7 +11165,6 @@
 /obj/effect/turf_decal/tile/ship/half/green{
 	dir = 8
 	},
-/obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
@@ -40034,7 +40048,7 @@ ob
 Sx
 dE
 lZ
-dE
+Nu
 vl
 YL
 pK
@@ -40819,7 +40833,7 @@ cD
 Am
 rs
 oX
-Cx
+eZ
 Cx
 MS
 LU