diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 8529de15843..68ee5f769bb 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -35087,7 +35087,6 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/portable_atmospherics/canister/water_vapor,
 /mob/living/simple_animal/hostile/lizard{
 	name = "Wags-His-Tail";
 	real_name = "Wags-His-Tail"
@@ -49960,7 +49959,6 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/portable_atmospherics/canister/chem_gas,
 /turf/open/floor/plasteel/loadingarea{
 	dir = 4
 	},
@@ -49969,7 +49967,6 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/portable_atmospherics/canister/chem_gas,
 /turf/open/floor/plasteel,
 /area/atmos)
 "bHP" = (
@@ -67519,13 +67516,44 @@
 /turf/open/floor/plasteel/white,
 /area/medical/chemistry)
 "cmh" = (
-/obj/machinery/portable_atmospherics/canister/chem_gas,
 /turf/open/floor/plasteel/whiteyellow/side{
 	dir = 4
 	},
 /area/medical/chemistry)
 "cmi" = (
-/obj/machinery/portable_atmospherics/canister/chem_gas,
+/obj/item/device/assembly/timer{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/device/assembly/timer{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/device/assembly/igniter{
+	pixel_x = 3;
+	pixel_y = -7
+	},
+/obj/item/device/assembly/igniter{
+	pixel_x = 3;
+	pixel_y = -7
+	},
+/obj/item/device/assembly/igniter{
+	pixel_x = 3;
+	pixel_y = -7
+	},
+/obj/item/device/assembly/igniter{
+	pixel_x = 3;
+	pixel_y = -7
+	},
+/obj/item/device/assembly/timer{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/device/assembly/timer{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/structure/table/glass,
 /turf/open/floor/plasteel/whiteyellow{
 	dir = 4
 	},
@@ -68326,22 +68354,6 @@
 	dir = 1;
 	pixel_y = -24
 	},
-/obj/item/device/assembly/igniter{
-	pixel_x = 3;
-	pixel_y = -7
-	},
-/obj/item/device/assembly/igniter{
-	pixel_x = 3;
-	pixel_y = -7
-	},
-/obj/item/device/assembly/timer{
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/obj/item/device/assembly/timer{
-	pixel_x = -3;
-	pixel_y = 3
-	},
 /turf/open/floor/plasteel/whiteyellow{
 	dir = 4
 	},
@@ -73095,7 +73107,7 @@
 /obj/structure/sign/nosmoking_2{
 	pixel_y = 32
 	},
-/obj/machinery/portable_atmospherics/canister/chem_gas,
+/obj/machinery/portable_atmospherics/canister/bz,
 /turf/open/floor/plasteel/warning{
 	dir = 5
 	},
@@ -74094,6 +74106,7 @@
 "cxg" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/structure/disposalpipe/segment,
+/obj/machinery/portable_atmospherics/canister/freon,
 /turf/open/floor/plasteel/warning{
 	dir = 4
 	},
@@ -75357,7 +75370,7 @@
 /obj/machinery/light_switch{
 	pixel_y = -23
 	},
-/obj/machinery/portable_atmospherics/canister/chem_gas,
+/obj/machinery/portable_atmospherics/canister/bz,
 /turf/open/floor/plasteel/warning{
 	dir = 10
 	},
@@ -90633,10 +90646,8 @@
 	},
 /area/shuttle/transport)
 "cZx" = (
-/turf/open/floor/plasteel/warning{
-	dir = 8
-	},
-/area/toxins/storage)
+/turf/closed/wall/mineral/titanium/overspace,
+/area/shuttle/abandoned)
 "cZy" = (
 /turf/open/floor/plating/warnplate{
 	dir = 1
@@ -127405,7 +127416,7 @@ cta
 cuf
 cvs
 cwj
-cZx
+cxf
 cxf
 czi
 cud
diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm
index 5c089421b6f..602803562ed 100644
--- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm
+++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm
@@ -5736,7 +5736,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/portable_atmospherics/canister/chem_gas,
+/obj/machinery/portable_atmospherics/canister/bz,
 /turf/open/floor/plasteel,
 /area/atmos)
 "alY" = (
@@ -7375,9 +7375,13 @@
 /turf/closed/wall/mineral/titanium/overspace,
 /area/shuttle/pod_1)
 "apG" = (
-/obj/machinery/portable_atmospherics/canister/water_vapor,
-/turf/open/floor/plasteel,
-/area/janitor)
+/turf/open/space,
+/turf/closed/wall/shuttle{
+	dir = 2;
+	icon_state = "swall_f10";
+	layer = 2
+	},
+/area/shuttle/pod_1)
 "apH" = (
 /obj/structure/grille,
 /obj/structure/window/shuttle,
@@ -25815,7 +25819,6 @@
 	dir = 4;
 	icon_state = "pipe-c"
 	},
-/obj/machinery/portable_atmospherics/canister/chem_gas,
 /turf/open/floor/plasteel/white,
 /area/medical/chemistry)
 "bgQ" = (
@@ -29023,7 +29026,12 @@
 "bnD" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/portable_atmospherics/canister/chem_gas,
+/obj/structure/table,
+/obj/item/weapon/book/manual/wiki/chemistry,
+/obj/item/weapon/book/manual/wiki/chemistry{
+	pixel_x = 3;
+	pixel_y = 3
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/chemistry)
 "bnE" = (
@@ -29933,10 +29941,6 @@
 /obj/structure/table,
 /obj/item/weapon/hand_labeler,
 /obj/item/stack/packageWrap,
-/obj/item/weapon/book/manual/wiki/chemistry{
-	pixel_x = 3;
-	pixel_y = 3
-	},
 /turf/open/floor/plasteel/white,
 /area/medical/chemistry)
 "bpu" = (
@@ -36605,7 +36609,7 @@
 	scrub_N2O = 0;
 	scrub_Toxins = 0
 	},
-/obj/machinery/portable_atmospherics/canister/chem_gas,
+/obj/machinery/portable_atmospherics/canister/freon,
 /turf/open/floor/plasteel/floorgrime,
 /area/toxins/storage)
 "bCY" = (
@@ -37055,7 +37059,7 @@
 	icon_state = "4-8";
 	pixel_y = 0
 	},
-/obj/machinery/portable_atmospherics/canister/chem_gas,
+/obj/machinery/portable_atmospherics/canister/freon,
 /mob/living/simple_animal/mouse,
 /turf/open/floor/plasteel/floorgrime,
 /area/toxins/storage)
@@ -41832,7 +41836,7 @@
 	name = "Station Intercom (General)";
 	pixel_x = -30
 	},
-/obj/machinery/portable_atmospherics/canister/chem_gas,
+/obj/machinery/portable_atmospherics/canister/bz,
 /turf/open/floor/plasteel,
 /area/atmos)
 "bNQ" = (
@@ -91942,7 +91946,7 @@ aLY
 aLY
 bBx
 bCv
-apG
+bDL
 bFk
 bDs
 bCv