diff --git a/_maps/map_files/Snaxi/Snaxi.dmm b/_maps/map_files/Snaxi/Snaxi.dmm
index 8db7fff10c..c74ca971bc 100644
--- a/_maps/map_files/Snaxi/Snaxi.dmm
+++ b/_maps/map_files/Snaxi/Snaxi.dmm
@@ -746,13 +746,12 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/structure/reagent_dispensers/watertank,
-/obj/item/radio/intercom{
-	pixel_y = -26
-	},
 /obj/structure/sign/departments/xenobio{
 	pixel_x = 32
 	},
+/obj/structure/closet/bombcloset{
+	anchored = 1
+	},
 /turf/open/floor/plasteel/white,
 /area/science/misc_lab)
 "abi" = (
@@ -1258,11 +1257,8 @@
 /turf/open/floor/plasteel/dark,
 /area/security/main)
 "acb" = (
-/obj/structure/sign/poster/official/science{
-	pixel_y = -32
-	},
-/turf/open/floor/plasteel/white,
-/area/science/mixing)
+/turf/open/floor/plasteel/dark,
+/area/hydroponics)
 "acc" = (
 /obj/structure/sign/poster/contraband/lusty_xenomorph{
 	pixel_x = -32;
@@ -7210,9 +7206,6 @@
 	dir = 5
 	},
 /obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/obj/machinery/firealarm{
-	pixel_y = 24
-	},
 /turf/open/floor/plasteel,
 /area/science/mixing)
 "bKO" = (
@@ -11094,6 +11087,13 @@
 "dAV" = (
 /turf/closed/wall/r_wall,
 /area/ai_monitored/turret_protected/ai_upload_foyer)
+"dBA" = (
+/obj/machinery/portable_atmospherics/pump,
+/obj/item/radio/intercom{
+	pixel_y = -26
+	},
+/turf/open/floor/plasteel/white,
+/area/science/mixing)
 "dBL" = (
 /obj/structure/closet/secure_closet/medical1,
 /obj/structure/extinguisher_cabinet{
@@ -13806,7 +13806,6 @@
 	dir = 4;
 	pixel_x = -24
 	},
-/obj/structure/closet/crate/bin,
 /turf/open/floor/plasteel/white,
 /area/science/misc_lab)
 "fjS" = (
@@ -15982,8 +15981,6 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 4
 	},
-/obj/machinery/portable_atmospherics/scrubber,
-/obj/item/storage/firstaid/toxin,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -16492,6 +16489,9 @@
 /area/storage/atmos)
 "gPE" = (
 /obj/machinery/portable_atmospherics/pump,
+/obj/machinery/firealarm{
+	pixel_y = 24
+	},
 /turf/open/floor/plasteel/white,
 /area/science/mixing)
 "gPF" = (
@@ -18394,9 +18394,8 @@
 /turf/open/floor/carpet,
 /area/security/detectives_office)
 "hTL" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/white,
 /area/science/mixing)
 "hTO" = (
 /obj/structure/cable{
@@ -22694,6 +22693,8 @@
 	c_tag = "Testing Lab East";
 	network = list("ss13","rd")
 	},
+/obj/machinery/portable_atmospherics/scrubber,
+/obj/item/storage/firstaid/toxin,
 /turf/open/floor/plasteel/white,
 /area/science/misc_lab)
 "kxI" = (
@@ -28347,6 +28348,12 @@
 /obj/effect/landmark/event_spawn,
 /turf/open/floor/plasteel,
 /area/maintenance/starboard)
+"odf" = (
+/obj/structure/closet/bombcloset{
+	anchored = 1
+	},
+/turf/open/floor/plasteel/white,
+/area/science/mixing)
 "odg" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple{
 	dir = 4
@@ -34162,7 +34169,6 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/obj/structure/reagent_dispensers/fueltank,
 /turf/open/floor/plasteel/white,
 /area/science/misc_lab)
 "rqE" = (
@@ -34835,6 +34841,10 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
+"rQB" = (
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/plasteel/white,
+/area/science/mixing)
 "rQH" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -37706,7 +37716,6 @@
 /area/icemoon/surface/outdoors)
 "tDO" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/obj/machinery/portable_atmospherics/canister/toxins,
 /obj/machinery/computer/security/telescreen{
 	name = "Test Chamber Monitor";
 	network = list("test");
@@ -45263,14 +45272,6 @@
 /area/medical/medbay/central)
 "ykk" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1;
-	name = "north facing firelock"
-	},
-/obj/machinery/door/airlock/research{
-	name = "Toxins Lab";
-	req_access_txt = "7"
-	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/white,
 /area/science/mixing)
@@ -81202,7 +81203,7 @@ bDW
 bEl
 bDE
 bFK
-bJC
+rQB
 prL
 fiN
 hmX
@@ -81459,7 +81460,7 @@ bDW
 bIn
 bQP
 wOK
-bJC
+fjU
 gzZ
 gSu
 ipY
@@ -82230,7 +82231,7 @@ bDW
 mOv
 jOB
 lYy
-bJC
+fjU
 ihE
 fJO
 eex
@@ -82487,7 +82488,7 @@ bDW
 gpp
 wbT
 nHi
-bJC
+fjU
 rDA
 fjU
 dvO
@@ -82744,7 +82745,7 @@ bEa
 kxj
 aaw
 rqx
-qJV
+fjU
 bKL
 fJO
 jKT
@@ -83001,10 +83002,10 @@ bEa
 pHl
 aaw
 abh
-qJV
+odf
+fjU
 fjU
 fjU
-acb
 qJV
 fuG
 qJV
@@ -83261,7 +83262,7 @@ cBt
 tRe
 gPE
 syy
-gPE
+dBA
 qJV
 goM
 gxF
@@ -87024,7 +87025,7 @@ now
 mKv
 sAh
 sAh
-sAh
+acb
 aar
 uEz
 uEz
@@ -87281,7 +87282,7 @@ qss
 mKv
 sAh
 sAh
-sAh
+acb
 urI
 qkO
 uEz
@@ -87795,7 +87796,7 @@ qss
 sYv
 sAh
 sAh
-sAh
+acb
 urI
 uoV
 uEz
@@ -88052,7 +88053,7 @@ qss
 sYv
 sAh
 sAh
-sAh
+acb
 urI
 uoV
 uEz