diff --git a/maps/tgstation.2.1.0.0.1.dmm b/maps/tgstation.2.1.0.0.1.dmm
index 495fe51b426..4f8b7ada711 100644
--- a/maps/tgstation.2.1.0.0.1.dmm
+++ b/maps/tgstation.2.1.0.0.1.dmm
@@ -4891,7 +4891,7 @@
 "bQc" = (/turf/simulated/wall/r_wall,/area/engine/break_room)
 "bQd" = (/obj/machinery/door/window/westright{name = "Reception Door"; req_access = null; req_access_txt = "0"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/navbeacon{codes_txt = "delivery;dir=4"; freq = 1400; location = "Engineering"},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "atmos"; name = "Atmos Blast Door"; opacity = 0},/turf/simulated/floor{icon_state = "bot"},/area/engine/break_room)
 "bQe" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/grille,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "atmos"; name = "Atmos Blast Door"; opacity = 0},/turf/simulated/floor/plating,/area/engine/break_room)
-"bQf" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/structure/closet/secure_closet/engineering_personal,/turf/simulated/floor,/area/engine/break_room)
+"bQf" = (/obj/structure/closet/secure_closet/atmos_personal,/turf/simulated/floor,/area/engine/break_room)
 "bQg" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/computer/security/telescreen{desc = "Used for watching the singularity chamber."; dir = 8; layer = 4; name = "Singularity Engine Telescreen"; network = list("Singularity"); pixel_x = 0; pixel_y = 30},/obj/structure/stool/bed/chair/office/dark{dir = 4},/turf/simulated/floor,/area/engine/break_room)
 "bQh" = (/obj/machinery/power/monitor,/obj/structure/cable,/turf/simulated/floor{icon_state = "caution"; dir = 5},/area/engine/break_room)
 "bQi" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall/r_wall,/area/atmos)
@@ -4940,7 +4940,7 @@
 "bQZ" = (/obj/structure/disposalpipe/segment,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = -32; pixel_y = 0},/turf/simulated/floor{dir = 8; icon_state = "cautioncorner"},/area/hallway/primary/aft)
 "bRa" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/hallway/primary/aft)
 "bRb" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{dir = 8; icon_state = "loadingarea"},/area/hallway/primary/aft)
-"bRc" = (/obj/structure/extinguisher_cabinet{pixel_x = 0; pixel_y = 30},/obj/structure/closet/secure_closet/engineering_personal,/turf/simulated/floor,/area/engine/break_room)
+"bRc" = (/obj/structure/extinguisher_cabinet{pixel_x = 0; pixel_y = 30},/obj/structure/closet/secure_closet/atmos_personal,/turf/simulated/floor,/area/engine/break_room)
 "bRd" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/window/northleft{dir = 4; icon_state = "left"; name = "Engineering Moniter Station"; req_access_txt = "32"},/turf/simulated/floor{icon_state = "delivery"},/area/engine/break_room)
 "bRe" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor{dir = 4; icon_state = "loadingarea"},/area/engine/break_room)
 "bRf" = (/turf/simulated/floor,/area/engine/break_room)
@@ -10289,7 +10289,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabrjbrjbrjbrjbrjbrjbrjbrjbrjbrjbrjbrjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaaaaaaaaaaaaaaaaabGdbLZbMabMbbGdbMcbGhbGibAJbAJbMdbMdbMdbAJbAJbGrbGrbGrbGrbMebGrbGrbMfbKEaaabKFbMgbMhbMibMjbMkbMlbMmbMjbMjbMnbMobMpbMqbGvbGvbGvbGvbGvbGvbMrbGvbGvbMsbMtbMubMvbMwbMxbMwbyjbMybMzbMAbMBbMCbydbMDbMEbMFbydbMGbMHbMIbMJbMKbMLbqDbMMbitbjYbMNbjXbzTbMObMPbqDbqDbqDbqDbqDbGWbGXbGYbGYbMQbIqbIqbIqbMRbGYbGYbBFbMSbMTbLEbLEbBIbMUbLGbBLbIBbMVbMWbMXbMYbMZbNabNbbKbbNcbNdbHfbNebNfbNgbINbNhbNibNjbNkaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafbEDbGbbGbbGbbGbbGbbGbbNlbGbbNmbGbbGbbGbbGbbGbbEDbEDaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabNnbEGbNobEGbNpaaaaafaaaaaabAJbNqbNrbNsbAJaaaaaaaaabGrbNtbNubIWbGrbMfbKEaaabKFbNvbNwbNxbNybHJbNzbNAbNBbNCbGtbNDbNEbNFbNGbNHbNHbNHbNHbNIbNJbNKbNKbNLbNMbNNbNObNPbNQbNRbNSbNTbNUbNSbNVbNTbNSbNSbNUbNVbNSbNSbNVbNSbNSbNUbNSbNWbNXbqDbsabqDbNYbzTbjYbNZbOabObbOcbOdbqDbOebGXbGYbOfbOgbOhbOibOjbOkbOlbOfbBIbOmbOnbDhbBIbBIbOobLGbOpbINbINbHfbHfbHfbHfbHjbHfbOqbKbbOrbHfbOsbIMbyMbINbOtbOubOvbINaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaabEDbOwbOwbOwbOwbOwbOwbOxbGbbOybOwbNmbGbbGbbGbbGbbEDaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaafaaaaaaaaaaafaaaaaaaaabGrbOzbOAbOBbGrbMfbOCaaabODbJbbOEbOFbOGbHJbHJbOHbOIbOJbOKbOLbOMbONbOObOObOObOObOObOPbOQbORbOSbOTbOUbOVbOWbOXbOYbOZbPabPbbPcbPdbPdbPbbPdbPdbPcbPdbPdbPdbPdbPdbPdbPcbPebsabPfbPgbPhbPibPjbPkbPlbPmbPnbPobPpbPqbGybGWbGXbGYbPrbPsbPtbPubPvbPwbPxbPybBIbBIbPzbBIbBIbPAbPBbLGboabPCaafbPDbPEbPFbPGbPHbPGbPIbPJbPKbHfbPLbHkbPMbINbPNbPObPObPPaagaagaaaaaaaaaaaaaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabPQbFZbFZbFZbFZbFZbFZbFZbPRbGcbGbbGbbGbbGbbPSbGcbEDaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafbGrbGrbGrbGrbGrbPTbGraaaaaaaaaaaabGtbPUbPVbPWbPXbGtbPYbGtbPZbQabQbbQcbQcbQfbRccklbQgbQhbQibQjbQjbQjbQkbQlbQjbQjbQmbQibQnbQjbQjbQjbQkbQjbGybGybGybGybGybGybGybGybGybGXbsabQobQpbQqbQrbQsbzTbQtbQubQvbQwbQxbQybGybGWbQzbQAbQBbQCbQDbQEbQFbQGbQGbQHbQIbQJbQKboabQLboabPBbLGboabQMaafbPDbQNbQNbQObQPbQQbQRbQSbQTbHfbQUbHkbAvbINbINbINbINbINaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaabEDbKpbKpbKpbKpbKpbKpbQVbGbbKobKpbQWbGbbGbbGbbGbbEDaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafbGrbGrbGrbGrbGrbPTbGraaaaaaaaaaaabGtbPUbPVbPWbPXbGtbPYbGtbPZbQabQbbQcbQcbQfbRcbQfbQgbQhbQibQjbQjbQjbQkbQlbQjbQjbQmbQibQnbQjbQjbQjbQkbQjbGybGybGybGybGybGybGybGybGybGXbsabQobQpbQqbQrbQsbzTbQtbQubQvbQwbQxbQybGybGWbQzbQAbQBbQCbQDbQEbQFbQGbQGbQHbQIbQJbQKboabQLboabPBbLGboabQMaafbPDbQNbQNbQObQPbQQbQRbQSbQTbHfbQUbHkbAvbINbINbINbINbINaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaabEDbKpbKpbKpbKpbKpbKpbQVbGbbKobKpbQWbGbbGbbGbbGbbEDaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaabQXbQYbMfbGrbGrbGrbGrbGrbGtbGtbGtbGtbGtbGtbGtbGtbQZbRabRbbQdbRdbRebRfbRfbRgbRhbRibRjbRkbRlbRmbRnbRobRpbRqbRrbRsbRtbRubRvbRwbRxaafaaaaaaaaaaaaaaaaaabGybRybGXbsabNXbqDbsabqDbNXbRzbsabqDbqDbqDbqDbqDbGybGWbRAbGYbRBbRBbRCbRDbREbRFbRDbRGbRHbRIbRJbRKboabRLbPBbLGbRMbRNaafbPDbQNbRObPGbRPbPGbRQbRRbRSbHfbQUbHkbRTbRUbyMaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafbEDbGbbGbbGbbGbbGbbGbbNlbGbbQWbGbbGbbGbbGbbGbbEDbEDaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafbRVbRWbRXbRYbRYbRZbSabSbbScbSdbSebSfbSgbSfbShbScbSibSjbSkbQebSmbSnbSobSobSpbSqbRibSrbRkbRlbSsbRnbStbSubSvbSwbSxbSybSxbSzbSAbSBaafbSCbSCbSCbSCbSCaaabGybSDbSEbPbbPcbPdbPbbSFbSGbSHbSIbSFbPdbPdbPdbPdbPdbSJbSKbGYbSLbSMbSNbSObSPbSQbSRbGYbGYbqXbSSbqXbqXbqXbSTbSUbSVbqXbHfbHfbHfbHfbHfbSWbHfbHfbHfbHfbHfbQUbHkbSXbRUbyMaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaabEDbEDbLYbGbbGbbGbbGbbGbbGbbGbbGbbGbbGbbGbbEDbEDaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabSYaaaaafaafbSZbSZbSZbSZbSZbSZbSZbSZbTabTbbScbTcbSdbSdbSfbTdbShbScbTebTfbSkbTkbThbRfbTibTjbVDbTlbTmbTnbTobTpbSxbRnbTqbSubTrbTsbTtbTubTvbTwbTxbTybTzbTAbTBbTCbTDbSCaaabGybTEbTFbTGbTHbTIbTJbTKbTLbTMbTNbTKbTKbTObTPbTKbTKbTQbGXbGYbGYbGYbGYbGYbGYbTRbGYbGYbTSbTTbTUbTVbTWbqXbSSbTXbTYbqXbTZbUabUbbUcbUdbQUbAvbAvbUebAvbUfbQUbHkbUgbyMbyMbyMaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafbECbEDbOybOwbOwbGbbGbbGbbGbbGbbGbbGbbGbbEDbEDaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa