diff --git a/code/modules/holomap/holomap_area.dm b/code/modules/holomap/holomap_area.dm
index 2cc755dfa5..a9677c562e 100644
--- a/code/modules/holomap/holomap_area.dm
+++ b/code/modules/holomap/holomap_area.dm
@@ -33,7 +33,8 @@
 
 /area/engineering
 	holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
-/area/engineering/atmos/intake
+//TFF 11/12/19 - Minor refactor, makes mice spawn only in Atmos.
+/area/engineering/atmos_intake
 	holomap_color = null
 /area/maintenance/substation/engineering
 	holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm
index 45c8371339..78707f0861 100644
--- a/maps/tether/tether-01-surface1.dmm
+++ b/maps/tether/tether-01-surface1.dmm
@@ -2482,6 +2482,14 @@
 	name = "Atmospherics Substation"
 	},
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "atmoslockdown";
+	name = "Atmospherics Lockdown";
+	opacity = 0
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/surface_atmos)
 "aek" = (
@@ -4936,6 +4944,14 @@
 	req_access = list(24)
 	},
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "atmoslockdown";
+	name = "Atmospherics Lockdown";
+	opacity = 0
+	},
 /turf/simulated/floor/plating,
 /area/engineering/atmos)
 "aiC" = (
@@ -5331,7 +5347,7 @@
 	report_danger_level = 0
 	},
 /turf/simulated/floor/tiled/steel_dirty/virgo3b,
-/area/engineering/atmos/intake)
+/area/engineering/atmos_intake)
 "ajg" = (
 /obj/structure/cable/cyan{
 	d1 = 1;
@@ -5342,13 +5358,13 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/steel_dirty/virgo3b,
-/area/engineering/atmos/intake)
+/area/engineering/atmos_intake)
 "ajh" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/steel_dirty/virgo3b,
-/area/engineering/atmos/intake)
+/area/engineering/atmos_intake)
 "aji" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 6
@@ -22133,6 +22149,13 @@
 	dir = 1;
 	pixel_y = 28
 	},
+/obj/machinery/button/remote/blast_door{
+	id = "atmoslockdown";
+	name = "Atmospherics Lockdown";
+	pixel_x = 0;
+	pixel_y = 0;
+	req_one_access = list(10,24)
+	},
 /turf/simulated/floor/tiled,
 /area/engineering/atmos)
 "aKn" = (
@@ -24610,6 +24633,14 @@
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "atmoslockdown";
+	name = "Atmospherics Lockdown";
+	opacity = 0
+	},
 /turf/simulated/floor/plating,
 /area/engineering/atmos/processing)
 "aOT" = (
@@ -27242,6 +27273,14 @@
 /obj/structure/grille,
 /obj/structure/window/reinforced/full,
 /obj/structure/window/reinforced,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "atmoslockdown";
+	name = "Atmospherics Lockdown";
+	opacity = 0
+	},
 /turf/simulated/floor/plating,
 /area/engineering/atmos/processing)
 "aTK" = (
@@ -27252,6 +27291,14 @@
 /obj/structure/grille,
 /obj/structure/window/reinforced/full,
 /obj/structure/window/reinforced,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "atmoslockdown";
+	name = "Atmospherics Lockdown";
+	opacity = 0
+	},
 /turf/simulated/floor/plating,
 /area/engineering/atmos/processing)
 "aTL" = (
@@ -27263,6 +27310,14 @@
 /obj/structure/grille,
 /obj/structure/window/reinforced/full,
 /obj/structure/window/reinforced,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "atmoslockdown";
+	name = "Atmospherics Lockdown";
+	opacity = 0
+	},
 /turf/simulated/floor/plating,
 /area/engineering/atmos/processing)
 "aTM" = (
@@ -27322,6 +27377,14 @@
 	req_access = list(24)
 	},
 /obj/machinery/door/firedoor,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "atmoslockdown";
+	name = "Atmospherics Lockdown";
+	opacity = 0
+	},
 /turf/simulated/floor/plating,
 /area/engineering/atmos)
 "aTU" = (
@@ -27376,11 +27439,11 @@
 /area/crew_quarters/visitor_lodging)
 "aTW" = (
 /turf/simulated/floor/tiled/steel_dirty/virgo3b,
-/area/engineering/atmos/intake)
+/area/engineering/atmos_intake)
 "aTX" = (
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction,
 /turf/simulated/floor/tiled/steel_dirty/virgo3b,
-/area/engineering/atmos/intake)
+/area/engineering/atmos_intake)
 "aTY" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/black,
 /turf/simulated/floor/tiled/techmaint,
@@ -27644,7 +27707,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled/steel_dirty/virgo3b,
-/area/engineering/atmos/intake)
+/area/engineering/atmos_intake)
 "aUw" = (
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging{
 	dir = 9
@@ -27653,19 +27716,19 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled/steel_dirty/virgo3b,
-/area/engineering/atmos/intake)
+/area/engineering/atmos_intake)
 "aUx" = (
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging{
 	dir = 9
 	},
 /turf/simulated/floor/tiled/steel_dirty/virgo3b,
-/area/engineering/atmos/intake)
+/area/engineering/atmos_intake)
 "aUy" = (
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging{
 	dir = 5
 	},
 /turf/simulated/floor/tiled/steel_dirty/virgo3b,
-/area/engineering/atmos/intake)
+/area/engineering/atmos_intake)
 "aUz" = (
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging{
 	dir = 5
@@ -27674,13 +27737,13 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled/steel_dirty/virgo3b,
-/area/engineering/atmos/intake)
+/area/engineering/atmos_intake)
 "aUA" = (
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging{
 	dir = 10
 	},
 /turf/simulated/floor/tiled/steel_dirty/virgo3b,
-/area/engineering/atmos/intake)
+/area/engineering/atmos_intake)
 "aUB" = (
 /obj/machinery/power/apc/super{
 	dir = 4;
@@ -27692,10 +27755,10 @@
 	icon_state = "0-2"
 	},
 /turf/simulated/floor/tiled/steel_dirty/virgo3b,
-/area/engineering/atmos/intake)
+/area/engineering/atmos_intake)
 "aUC" = (
 /turf/simulated/wall/r_wall,
-/area/engineering/atmos/intake)
+/area/engineering/atmos_intake)
 "aUD" = (
 /obj/machinery/atmospherics/pipe/simple/visible/purple,
 /obj/structure/cable/cyan{
@@ -27704,7 +27767,7 @@
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/plating,
-/area/engineering/atmos/intake)
+/area/engineering/atmos_intake)
 "aUE" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
@@ -27828,7 +27891,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging,
 /turf/simulated/floor/tiled/steel_dirty/virgo3b,
-/area/engineering/atmos/intake)
+/area/engineering/atmos_intake)
 "aUS" = (
 /obj/machinery/atmospherics/pipe/simple/visible/yellow,
 /obj/machinery/light/small{
@@ -28013,6 +28076,14 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 1;
+	icon_state = "pdoor0";
+	id = "atmoslockdown";
+	name = "Atmospherics Lockdown";
+	opacity = 0
+	},
 /turf/simulated/floor/plating,
 /area/engineering/atmos/processing)
 "aVl" = (
@@ -28266,7 +28337,7 @@
 	id_tag = "atmos_intake"
 	},
 /turf/simulated/floor/tiled/steel_dirty/virgo3b,
-/area/engineering/atmos/intake)
+/area/engineering/atmos_intake)
 "aVF" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/visible/purple{
@@ -28277,6 +28348,14 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 1;
+	icon_state = "pdoor0";
+	id = "atmoslockdown";
+	name = "Atmospherics Lockdown";
+	opacity = 0
+	},
 /turf/simulated/floor/plating,
 /area/engineering/atmos/processing)
 "aVG" = (
@@ -28451,7 +28530,7 @@
 	use_power = 1
 	},
 /turf/simulated/floor/tiled/steel_dirty/virgo3b,
-/area/engineering/atmos/intake)
+/area/engineering/atmos_intake)
 "aVV" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/visible/yellow{
@@ -28462,6 +28541,14 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 1;
+	icon_state = "pdoor0";
+	id = "atmoslockdown";
+	name = "Atmospherics Lockdown";
+	opacity = 0
+	},
 /turf/simulated/floor/plating,
 /area/engineering/atmos/processing)
 "aVW" = (
@@ -28483,6 +28570,14 @@
 	name = "Atmospherics";
 	req_access = list(24)
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 1;
+	icon_state = "pdoor0";
+	id = "atmoslockdown";
+	name = "Atmospherics Lockdown";
+	opacity = 0
+	},
 /turf/simulated/floor/plating,
 /area/engineering/atmos/processing)
 "aVZ" = (
@@ -28812,7 +28907,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/steel_dirty/virgo3b,
-/area/engineering/atmos/intake)
+/area/engineering/atmos_intake)
 "aWP" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
@@ -28955,7 +29050,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/steel_dirty/virgo3b,
-/area/engineering/atmos/intake)
+/area/engineering/atmos_intake)
 "aXe" = (
 /obj/structure/table/bench/steel,
 /turf/simulated/floor/plating,
@@ -31881,6 +31976,15 @@
 	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/mining_main/surfacecargo)
+"bcP" = (
+/obj/machinery/atmospherics/pipe/simple/visible/yellow,
+/obj/machinery/alarm{
+	dir = 8;
+	icon_state = "alarm0";
+	pixel_x = 24
+	},
+/turf/simulated/floor/plating,
+/area/engineering/atmos/processing)
 "cGJ" = (
 /turf/simulated/floor/plating,
 /area/maintenance/lower/mining_eva)
@@ -41112,7 +41216,7 @@ aRU
 aSC
 aTj
 aSC
-aSC
+bcP
 aSC
 aUS
 aVm
diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm
index a475b3d2db..cdb08d0844 100644
--- a/maps/tether/tether-02-surface2.dmm
+++ b/maps/tether/tether-02-surface2.dmm
@@ -8551,13 +8551,30 @@
 /turf/simulated/floor/plating,
 /area/engineering/lower/lobby)
 "are" = (
+/obj/machinery/door/firedoor/glass,
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "atmoslockdown";
+	name = "Atmospherics Lockdown";
+	opacity = 0
+	},
+/turf/simulated/floor/plating,
+/area/engineering/lower/lobby)
+"arf" = (
 /obj/machinery/door/airlock/glass{
 	name = "Atmospherics"
 	},
 /obj/machinery/door/firedoor/glass,
 /turf/simulated/floor/tiled/steel_grid,
 /area/engineering/lower/lobby)
-"arf" = (
+"arg" = (
+/turf/simulated/wall,
+/area/engineering/lower/breakroom)
+"arh" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/door/airlock/glass{
@@ -8567,15 +8584,6 @@
 /obj/machinery/door/firedoor/glass,
 /turf/simulated/floor/tiled/steel_grid,
 /area/engineering/lower/lobby)
-"arg" = (
-/turf/simulated/wall,
-/area/engineering/lower/breakroom)
-"arh" = (
-/obj/machinery/door/firedoor/glass,
-/obj/structure/grille,
-/obj/structure/window/reinforced/full,
-/turf/simulated/floor/plating,
-/area/engineering/lower/breakroom)
 "ari" = (
 /obj/structure/grille,
 /obj/structure/railing{
@@ -9857,26 +9865,26 @@
 /area/engineering/lower/lobby)
 "atm" = (
 /obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
 /obj/machinery/door/airlock/glass_atmos{
 	name = "Atmospherics";
 	req_access = list(24)
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/wood,
-/area/engineering/lower/breakroom)
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "atmoslockdown";
+	name = "Atmospherics Lockdown";
+	opacity = 0
+	},
+/turf/simulated/floor/tiled,
+/area/engineering/lower/lobby)
 "atn" = (
 /obj/structure/cable/cyan{
 	d1 = 4;
@@ -9925,6 +9933,13 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/button/remote/blast_door{
+	id = "atmoslockdown";
+	name = "Atmospherics Lockdown";
+	pixel_x = 0;
+	pixel_y = 0;
+	req_one_access = list(10,24)
+	},
 /turf/simulated/floor/carpet,
 /area/engineering/lower/breakroom)
 "atr" = (
@@ -10829,20 +10844,6 @@
 /turf/simulated/wall/r_wall,
 /area/engineering/lower/lobby)
 "avd" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
-/obj/machinery/door/airlock/glass_atmos{
-	name = "Atmospherics";
-	req_access = list(24)
-	},
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled,
-/area/engineering/lower/lobby)
-"ave" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/red,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -10852,8 +10853,46 @@
 	},
 /obj/structure/disposalpipe/segment,
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "atmoslockdown";
+	name = "Atmospherics Lockdown";
+	opacity = 0
+	},
 /turf/simulated/floor/tiled,
 /area/engineering/lower/lobby)
+"ave" = (
+/obj/effect/floor_decal/borderfloor{
+	dir = 1;
+	icon_state = "borderfloor";
+	pixel_y = 0
+	},
+/obj/effect/floor_decal/corner/yellow/border{
+	icon_state = "bordercolor";
+	dir = 1
+	},
+/obj/effect/floor_decal/borderfloor/corner2{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/yellow/bordercorner2{
+	icon_state = "bordercolorcorner2";
+	dir = 1
+	},
+/obj/structure/table/standard,
+/obj/item/taperoll/atmos,
+/obj/random/tech_supply,
+/obj/random/tool,
+/obj/machinery/button/remote/blast_door{
+	id = "atmoslockdown";
+	name = "Atmospherics Lockdown";
+	pixel_x = 0;
+	pixel_y = 0;
+	req_one_access = list(10,24)
+	},
+/turf/simulated/floor/tiled,
+/area/engineering/atmos/monitoring)
 "avf" = (
 /turf/simulated/wall/r_wall,
 /area/engineering/lower/breakroom)
@@ -14064,16 +14103,11 @@
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint2)
 "aAe" = (
-/obj/machinery/door/airlock/maintenance/engi{
-	name = "Atmospherics";
-	req_access = list(24)
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /obj/machinery/door/firedoor/glass,
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
 /turf/simulated/floor/plating,
-/area/engineering/atmos)
+/area/engineering/lower/breakroom)
 "aAf" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 10
@@ -14669,15 +14703,27 @@
 /turf/simulated/open,
 /area/engineering/atmos)
 "aBg" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/airlock/maintenance/engi{
+/obj/structure/cable/cyan{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/door/airlock/glass_atmos{
 	name = "Atmospherics";
 	req_access = list(24)
 	},
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/engineering/atmos)
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/wood,
+/area/engineering/lower/breakroom)
 "aBh" = (
 /obj/structure/railing{
 	dir = 8
@@ -15004,29 +15050,6 @@
 /obj/machinery/vending/coffee,
 /turf/simulated/floor/tiled/monotile,
 /area/rnd/breakroom)
-"aBG" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 1;
-	icon_state = "borderfloor";
-	pixel_y = 0
-	},
-/obj/effect/floor_decal/corner/yellow/border{
-	icon_state = "bordercolor";
-	dir = 1
-	},
-/obj/effect/floor_decal/borderfloor/corner2{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/yellow/bordercorner2{
-	icon_state = "bordercolorcorner2";
-	dir = 1
-	},
-/obj/structure/table/standard,
-/obj/item/taperoll/atmos,
-/obj/random/tech_supply,
-/obj/random/tool,
-/turf/simulated/floor/tiled,
-/area/engineering/atmos/monitoring)
 "aBH" = (
 /obj/structure/cable/cyan{
 	d1 = 1;
@@ -15687,18 +15710,23 @@
 /area/maintenance/asmaint2)
 "aCY" = (
 /obj/machinery/door/airlock/maintenance/engi{
-	name = "Drone Bay";
+	name = "Atmospherics";
 	req_access = list(24)
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/structure/disposalpipe/segment{
 	dir = 4
 	},
 /obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/engineering/drone_fabrication)
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 1;
+	icon_state = "pdoor0";
+	id = "atmoslockdown";
+	name = "Atmospherics Lockdown";
+	opacity = 0
+	},
+/turf/simulated/floor/plating,
+/area/engineering/atmos)
 "aCZ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -16592,12 +16620,21 @@
 /turf/simulated/floor/tiled/steel_dirty,
 /area/maintenance/asmaint2)
 "aFa" = (
-/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/door/airlock/maintenance/engi{
-	name = "Atmospherics Balcony";
+	name = "Atmospherics";
 	req_access = list(24)
 	},
 /obj/structure/catwalk,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "atmoslockdown";
+	name = "Atmospherics Lockdown";
+	opacity = 0
+	},
 /turf/simulated/floor/plating,
 /area/engineering/atmos)
 "aFb" = (
@@ -26821,6 +26858,28 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/tether/surfacebase/security/brig)
+"aVV" = (
+/obj/machinery/door/airlock/maintenance/engi{
+	name = "Drone Bay";
+	req_access = list(24)
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 1;
+	icon_state = "pdoor0";
+	id = "atmoslockdown";
+	name = "Atmospherics Lockdown";
+	opacity = 0
+	},
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/engineering/drone_fabrication)
 "aVW" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -27479,6 +27538,23 @@
 	},
 /turf/simulated/floor/reinforced,
 /area/rnd/outpost/xenobiology/outpost_slimepens)
+"aWN" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/maintenance/engi{
+	name = "Atmospherics Balcony";
+	req_access = list(24)
+	},
+/obj/structure/catwalk,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 1;
+	icon_state = "pdoor0";
+	id = "atmoslockdown";
+	name = "Atmospherics Lockdown";
+	opacity = 0
+	},
+/turf/simulated/floor/plating,
+/area/engineering/atmos)
 "aWO" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/green{
 	icon_state = "intact";
@@ -38579,7 +38655,7 @@ auk
 aAT
 aAT
 aAT
-aCY
+aVV
 aAT
 aAT
 aAT
@@ -38716,7 +38792,7 @@ atJ
 aBF
 auv
 azl
-aAe
+aCY
 aAT
 aAT
 aBW
@@ -39438,7 +39514,7 @@ aAU
 aAT
 azl
 azl
-aFa
+aWN
 azl
 azl
 aEp
@@ -40549,13 +40625,13 @@ aRV
 apd
 apJ
 afG
-are
+arf
 arK
 asF
 ati
 atT
 auC
-avd
+atm
 avH
 awx
 axm
@@ -40564,7 +40640,7 @@ ayJ
 azw
 aAq
 aBc
-aBG
+ave
 aCe
 aCC
 aDe
@@ -40697,7 +40773,7 @@ asF
 atj
 atU
 auD
-ard
+are
 avI
 awy
 axn
@@ -40833,13 +40909,13 @@ aia
 ape
 apM
 aqw
-arf
+arh
 arM
 asG
 atk
 atV
 auE
-ave
+avd
 avJ
 awz
 axo
@@ -41118,11 +41194,11 @@ apf
 apN
 aqs
 arg
-arh
-arh
-atm
-arh
-arh
+aAe
+aAe
+aBg
+aAe
+aAe
 avf
 avN
 awB
@@ -41543,7 +41619,7 @@ aoC
 apf
 apN
 aqs
-arh
+aAe
 arQ
 asK
 atp
@@ -41685,7 +41761,7 @@ aoC
 apf
 apN
 aqs
-arh
+aAe
 arR
 asL
 atq
@@ -41827,7 +41903,7 @@ aoC
 apf
 apN
 aqs
-arh
+aAe
 arS
 asK
 atp
@@ -42267,7 +42343,7 @@ ayh
 ayO
 azG
 aAB
-aBg
+aFa
 aBN
 aCj
 aBO
diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index cb2ffcc94a..f705365fb9 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -27249,10 +27249,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/bridge)
 "aTv" = (
-/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/floor/reinforced,
-/turf/simulated/shuttle/plating/carry,
-/area/shuttle/tether/surface)
+/obj/machinery/computer/station_alert/all{
+	icon_state = "computer";
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark,
+/area/bridge)
 "aTw" = (
 /obj/effect/floor_decal/techfloor{
 	dir = 4
@@ -27275,6 +27277,11 @@
 /obj/structure/window/basic,
 /turf/simulated/floor/plating,
 /area/rnd/outpost/xenobiology/outpost_first_aid)
+"aTy" = (
+/obj/structure/shuttle/engine/propulsion,
+/turf/simulated/floor/reinforced,
+/turf/simulated/shuttle/plating/carry,
+/area/shuttle/tether/surface)
 "aTA" = (
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/wood,
@@ -29877,13 +29884,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/bridge)
-"aYC" = (
-/obj/machinery/computer/station_alert{
-	icon_state = "computer";
-	dir = 4
-	},
-/turf/simulated/floor/tiled/dark,
-/area/bridge)
 "aYD" = (
 /obj/machinery/computer/power_monitor{
 	icon_state = "computer";
@@ -44318,7 +44318,7 @@ aXV
 aYg
 bae
 aYb
-aYC
+aTv
 aYK
 baw
 bbF
@@ -45345,7 +45345,7 @@ aNk
 aNl
 aNJ
 aNP
-aTv
+aTy
 aKU
 abg
 aOk
@@ -45487,7 +45487,7 @@ aNl
 aNl
 aNK
 aNP
-aTv
+aTy
 aKU
 abg
 aOk
@@ -45629,7 +45629,7 @@ aNm
 aNl
 aNK
 aNP
-aTv
+aTy
 aKU
 abg
 aOk
diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm
index e6beaf5f48..56d54fdc72 100644
--- a/maps/tether/tether-06-station2.dmm
+++ b/maps/tether/tether-06-station2.dmm
@@ -30828,7 +30828,7 @@ Yq
 TY
 TY
 kj
-kf
+hQ
 od
 nD
 oj
@@ -30973,10 +30973,10 @@ KJ
 kj
 kj
 nE
-hr
-hr
-hr
-hr
+kj
+kj
+kj
+kj
 qu
 rk
 rX
diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm
index 70e5bbe0ca..2e2bffa524 100644
--- a/maps/tether/tether-07-station3.dmm
+++ b/maps/tether/tether-07-station3.dmm
@@ -26684,20 +26684,13 @@
 /turf/simulated/floor/airless,
 /area/medical/virology)
 "PA" = (
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_medical{
-	name = "Virology Laboratory";
-	req_access = list(39)
+/obj/structure/shuttle/engine/propulsion{
+	dir = 8;
+	icon_state = "propulsion_l"
 	},
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
-/turf/simulated/floor/tiled/white,
-/area/medical/virology)
+/turf/space,
+/turf/simulated/shuttle/plating/airless/carry,
+/area/shuttle/large_escape_pod1/station)
 "PB" = (
 /turf/simulated/wall/r_wall,
 /area/medical/virologyisolation)
@@ -27103,15 +27096,15 @@
 /area/medical/virology)
 "Qp" = (
 /obj/structure/shuttle/engine/propulsion{
-	dir = 8;
-	icon_state = "propulsion_l"
+	dir = 8
 	},
 /turf/space,
 /turf/simulated/shuttle/plating/airless/carry,
 /area/shuttle/large_escape_pod1/station)
 "Qq" = (
 /obj/structure/shuttle/engine/propulsion{
-	dir = 8
+	dir = 8;
+	icon_state = "propulsion_r"
 	},
 /turf/space,
 /turf/simulated/shuttle/plating/airless/carry,
@@ -27134,13 +27127,21 @@
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/medical_restroom)
 "Qs" = (
-/obj/structure/shuttle/engine/propulsion{
-	dir = 8;
-	icon_state = "propulsion_r"
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/glass_medical{
+	name = "Virology Laboratory";
+	req_access = list(39)
 	},
-/turf/space,
-/turf/simulated/shuttle/plating/airless/carry,
-/area/shuttle/large_escape_pod1/station)
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled/white,
+/area/medical/virology)
 "Qt" = (
 /turf/simulated/wall,
 /area/tether/exploration)
@@ -38506,7 +38507,7 @@ Pb
 Pi
 Pp
 Pv
-PA
+Qs
 PE
 PO
 PT
@@ -39349,11 +39350,11 @@ MK
 Iy
 ab
 NL
+PA
+Qp
+Qp
 Qp
 Qq
-Qq
-Qq
-Qs
 NL
 vt
 vt
diff --git a/maps/tether/tether_areas2.dm b/maps/tether/tether_areas2.dm
index 30e28ebd32..abb51ee803 100644
--- a/maps/tether/tether_areas2.dm
+++ b/maps/tether/tether_areas2.dm
@@ -284,7 +284,8 @@
 	name = "Atmospherics Gas Storage"
 	icon_state = "atmos"
 
-/area/engineering/atmos/intake
+//TFF 11/12/19 - Minor refactor, makes mice spawn only in Atmos.
+/area/engineering/atmos_intake
 	name = "\improper Atmospherics Intake"
 	icon_state = "atmos"
 	sound_env = MOUNTAINS
diff --git a/maps/tether/tether_defines.dm b/maps/tether/tether_defines.dm
index 616c44413a..029798c96d 100644
--- a/maps/tether/tether_defines.dm
+++ b/maps/tether/tether_defines.dm
@@ -113,8 +113,9 @@
 		/area/crew_quarters/sleep/Dorm_5/holo,
 		/area/crew_quarters/sleep/Dorm_7/holo,
 		/area/rnd/miscellaneous_lab)	//TFF 31/8/19 - exempt new construction site from unit tests
+	//TFF 11/12/19 - Minor refactor, makes mice spawn only in Atmos.
 	unit_test_exempt_from_atmos = list(
-		/area/engineering/atmos/intake, // Outside,
+		/area/engineering/atmos_intake, // Outside,
 		/area/rnd/external, //  Outside,
 		/area/tether/surfacebase/mining_main/external, // Outside,
 		/area/tether/surfacebase/mining_main/airlock, //  Its an airlock,