diff --git a/_maps/map_files/Atlas/atlas.dmm b/_maps/map_files/Atlas/atlas.dmm
index 65a3da33c0f..6da16b773bd 100644
--- a/_maps/map_files/Atlas/atlas.dmm
+++ b/_maps/map_files/Atlas/atlas.dmm
@@ -4882,18 +4882,6 @@
 "pd" = (
 /obj/item/paper_bin/construction,
 /obj/item/pen/fountain,
-/obj/machinery/button/door{
-	id = "gaussgang_atlas";
-	name = "public gauss access";
-	pixel_y = 32;
-	req_one_access_txt = "69"
-	},
-/obj/machinery/button/door{
-	id = "muni_atlas";
-	name = "public munitions access";
-	pixel_y = 24;
-	req_one_access_txt = "69"
-	},
 /obj/structure/closet/secure_closet/master_at_arms,
 /obj/machinery/requests_console{
 	announcementConsole = 1;
@@ -9352,6 +9340,23 @@
 /obj/structure/lattice/catwalk/over/ship,
 /turf/open/floor/monotile/steel,
 /area/nsv/weapons)
+"DX" = (
+/obj/machinery/button/door{
+	id = "muni_atlas";
+	name = "public munitions access";
+	pixel_y = 24;
+	req_one_access_txt = "69"
+	},
+/obj/machinery/button/door{
+	id = "gaussgang_atlas";
+	name = "public gauss access";
+	pixel_y = 32;
+	req_one_access_txt = "69"
+	},
+/obj/item/tank/internals/oxygen,
+/obj/machinery/suit_storage_unit/maa,
+/turf/open/floor/carpet/ship,
+/area/nsv/weapons)
 "DZ" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -9485,6 +9490,7 @@
 /obj/structure/rack,
 /obj/item/clothing/ears/earmuffs,
 /obj/item/clothing/ears/earmuffs,
+/obj/item/clothing/ears/earmuffs,
 /turf/open/floor/monotile/dark,
 /area/nsv/weapons)
 "Ex" = (
@@ -15411,6 +15417,7 @@
 /obj/item/clothing/ears/earmuffs,
 /obj/item/clothing/ears/earmuffs,
 /obj/machinery/light,
+/obj/item/clothing/ears/earmuffs,
 /turf/open/floor/monotile/dark,
 /area/nsv/weapons)
 "XG" = (
@@ -51959,7 +51966,7 @@ eY
 pE
 zO
 eY
-eY
+DX
 pd
 Ty
 eY
@@ -52215,7 +52222,7 @@ Dl
 VU
 mq
 vu
-Eu
+eY
 Dy
 Dy
 Dy
diff --git a/_maps/map_files/Atlas/atlas2.dmm b/_maps/map_files/Atlas/atlas2.dmm
index f60acd880df..3097f95369f 100644
--- a/_maps/map_files/Atlas/atlas2.dmm
+++ b/_maps/map_files/Atlas/atlas2.dmm
@@ -2896,6 +2896,7 @@
 	dir = 1
 	},
 /obj/machinery/suit_storage_unit/captain,
+/obj/item/tank/internals/oxygen,
 /turf/open/floor/monotile/steel,
 /area/crew_quarters/heads/captain)
 "ms" = (
@@ -3751,6 +3752,7 @@
 /area/crew_quarters/kitchen)
 "qx" = (
 /obj/machinery/suit_storage_unit/cmo,
+/obj/item/tank/internals/oxygen,
 /turf/open/floor/monotile/steel,
 /area/crew_quarters/heads/cmo)
 "qz" = (
@@ -3952,6 +3954,7 @@
 /area/maintenance/nsv/deck1/port)
 "rv" = (
 /obj/machinery/suit_storage_unit/ce,
+/obj/item/tank/internals/oxygen,
 /turf/open/floor/monotile/steel,
 /area/crew_quarters/heads/chief)
 "rw" = (
@@ -8683,6 +8686,7 @@
 	name = "Head of Security RC";
 	pixel_y = 26
 	},
+/obj/item/tank/internals/oxygen,
 /turf/open/floor/carpet/red,
 /area/crew_quarters/heads/hos)
 "LT" = (