diff --git a/modular_chomp/maps/cetus/cetus-1.dmm b/modular_chomp/maps/cetus/cetus-1.dmm
index 1193215013..f834e78c92 100644
--- a/modular_chomp/maps/cetus/cetus-1.dmm
+++ b/modular_chomp/maps/cetus/cetus-1.dmm
@@ -462,19 +462,75 @@
 /area/security/cetus/meteor/brig)
 "aaX" = (
 /obj/structure/table/steel,
-/obj/item/radio/intercom{
-	desc = "Talk... listen through this.";
-	name = "Station Intercom (Brig Radio)";
-	wires = 7;
-	dir = 4;
-	pixel_y = 5
-	},
 /turf/simulated/floor/tiled,
 /area/security/cetus/meteor/brig)
 "aaY" = (
 /obj/machinery/portable_atmospherics/powered/pump/filled,
 /turf/simulated/floor/plating,
 /area/maintenance/cetus/meteor/jrfore)
+"aaZ" = (
+/obj/structure/extinguisher_cabinet{
+	pixel_y = -30;
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/ab_StripBar)
+"aba" = (
+/obj/structure/table/bench/wooden,
+/obj/structure/extinguisher_cabinet{
+	dir = 1;
+	pixel_y = -30
+	},
+/turf/simulated/floor/wood,
+/area/crew_quarters/cetus/meteor/cafeteriaf1)
+"abb" = (
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/maintenance/cetus/engine)
+"abc" = (
+/obj/structure/cryofeed{
+	dir = 4;
+	pixel_x = -31
+	},
+/obj/machinery/vr_sleeper,
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30;
+	pixel_x = -25
+	},
+/turf/simulated/floor/tiled/milspec/raised,
+/area/crew_quarters/cetus/meteor/vr)
+"abd" = (
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/cetus/construction)
+"abe" = (
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30;
+	pixel_x = -25
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/engineering/cetus/meteor/techstorage)
+"abf" = (
+/turf/simulated/wall/r_wall,
+/area/crew_quarters/sleep/cetus/meteor/dorm3)
+"abg" = (
+/obj/effect/floor_decal/corner/grey/diagonal,
+/obj/effect/floor_decal/corner/white/diagonal{
+	dir = 4
+	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = -28;
+	dir = 4
+	},
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/cetus/meteor/laundry)
+"abh" = (
+/turf/simulated/wall/r_wall,
+/area/crew_quarters/sleep/cetus/meteor/dorm4)
 "abi" = (
 /obj/structure/disposalpipe/segment,
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -482,6 +538,53 @@
 	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/cetus/meteor/cafeteriaf1)
+"abj" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/catwalk{
+	pixel_x = -1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "6-10"
+	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
+/turf/simulated/floor/plating,
+/area/engineering/cetus/meteor/atriumdeck1)
+"abk" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/extinguisher_cabinet{
+	pixel_x = -28;
+	dir = 4
+	},
+/turf/simulated/floor/tiled/neutral,
+/area/maintenance/cetus/hallway)
+"abl" = (
+/obj/structure/reagent_dispensers/fueltank,
+/turf/simulated/floor/outdoors/rocks/cetus,
+/area/maintenance/cetus/meteor/portsec)
+"abm" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/catwalk,
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30;
+	pixel_x = -25
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/cetus/meteor/jraft)
 "abr" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -1984,7 +2087,7 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/cetus/meteor/cafeteriaf1)
 "aRi" = (
-/turf/simulated/wall,
+/turf/simulated/wall/r_wall,
 /area/crew_quarters/sleep/cetus/meteor/dorm6)
 "aRz" = (
 /obj/effect/floor_decal/industrial/warning{
@@ -2310,6 +2413,9 @@
 "aYz" = (
 /obj/machinery/mech_recharger,
 /obj/structure/loot_pile/mecha/odysseus/murdysseus,
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/redgrid,
 /area/maintenance/cetus/mechbay)
 "aYC" = (
@@ -4119,6 +4225,10 @@
 "bWs" = (
 /obj/effect/floor_decal/industrial/stand_clear/yellow,
 /obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/extinguisher_cabinet{
+	pixel_x = -28;
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/engineering/cetus/meteor/dronefab)
 "bWM" = (
@@ -4447,6 +4557,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/surgery_hallway)
 "chT" = (
@@ -5089,6 +5202,9 @@
 /obj/effect/floor_decal/industrial/warning/color{
 	color = "#00B8B2"
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/Surgery_Room_1)
 "cvs" = (
@@ -5286,7 +5402,7 @@
 /turf/simulated/wall/r_wall,
 /area/maintenance/cetus/meteor/starsec)
 "cDg" = (
-/turf/simulated/wall,
+/turf/simulated/wall/r_wall,
 /area/crew_quarters/sleep/cetus/meteor/dorm7)
 "cDP" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -5306,6 +5422,10 @@
 	layer = 3;
 	dir = 1
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = -28;
+	dir = 4
+	},
 /turf/simulated/floor/tiled/neutral,
 /area/maintenance/cetus/hallway)
 "cEX" = (
@@ -7169,6 +7289,9 @@
 "dLh" = (
 /obj/machinery/vending/nifsoft_shop,
 /obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/cetus/meteor/hallway2)
 "dLE" = (
@@ -7357,6 +7480,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/cetus/meteor/dorm4)
 "dSj" = (
@@ -8811,6 +8937,10 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/extinguisher_cabinet{
+	dir = 4;
+	pixel_x = -28
+	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/cetus/meteor/hallway2)
 "eIz" = (
@@ -10619,7 +10749,7 @@
 /turf/simulated/floor/outdoors/mud/cetus,
 /area/maintenance/cetus/meteor/ragecage)
 "fCw" = (
-/turf/simulated/wall,
+/turf/simulated/wall/r_wall,
 /area/crew_quarters/sleep/cetus/meteor/dorm10)
 "fCB" = (
 /obj/structure/table/standard,
@@ -11013,6 +11143,9 @@
 /area/crew_quarters/cetus/meteor/pool)
 "fOy" = (
 /obj/machinery/vending/medical,
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay_primary_storage)
 "fOD" = (
@@ -11325,6 +11458,10 @@
 /obj/machinery/light/broken{
 	dir = 8
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = -28;
+	dir = 4
+	},
 /turf/simulated/floor/tiled/neutral,
 /area/maintenance/cetus/hallway)
 "fXe" = (
@@ -12594,6 +12731,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
 	},
+/obj/structure/extinguisher_cabinet{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/cetus/meteor/hallway2)
 "gON" = (
@@ -13129,6 +13270,9 @@
 /obj/machinery/light/fluorescent{
 	dir = 1
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/plating,
 /area/engineering/cetus/meteor/engineroom)
 "hcW" = (
@@ -13925,6 +14069,9 @@
 /obj/structure/undies_wardrobe{
 	anchored = 1
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/cetus/meteor/dorm9)
 "huI" = (
@@ -13935,6 +14082,10 @@
 	c_tag = "CIV -  D1 Central Ring 1";
 	dir = 4
 	},
+/obj/structure/extinguisher_cabinet{
+	dir = 4;
+	pixel_x = -28
+	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/cetus/meteor/hallway1)
 "huY" = (
@@ -14417,6 +14568,10 @@
 	pixel_x = 2;
 	pixel_y = 2
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = -30;
+	dir = 1
+	},
 /turf/simulated/floor/tiled/dark,
 /area/medical/surgery_storage)
 "hHs" = (
@@ -14441,7 +14596,7 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/rnd/cetus/meteor/dangerousspecimens)
 "hHz" = (
-/turf/simulated/wall,
+/turf/simulated/wall/r_wall,
 /area/crew_quarters/sleep/cetus/meteor/dorm9)
 "hHK" = (
 /obj/effect/floor_decal/asteroid,
@@ -14622,6 +14777,10 @@
 	dir = 4
 	},
 /obj/effect/floor_decal/industrial/outline/red,
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 29;
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/security/cetus/meteor/hallway)
 "hLY" = (
@@ -15255,6 +15414,9 @@
 /obj/machinery/light/small/fluorescent{
 	dir = 1
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled/old_tile/white,
 /area/maintenance/cetus/dentist)
 "hZx" = (
@@ -16664,6 +16826,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/cetus/meteor/dorm3)
 "iMH" = (
@@ -17166,6 +17331,9 @@
 /obj/item/handcuffs/legcuffs/fake,
 /obj/item/bodysnatcher,
 /obj/item/reagent_containers/glass/bottle/stoxin,
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/cetus/ripperdock)
 "jar" = (
@@ -17890,17 +18058,24 @@
 /turf/simulated/floor/tiled/dark,
 /area/medical/surgery_storage)
 "jri" = (
+/obj/machinery/door/firedoor/glass,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	icon_state = "pdoor0";
+	id = "Prison Gate";
+	name = "Communal Brig Blast Door";
+	opacity = 0
+	},
 /obj/machinery/door/airlock/glass_security{
 	id_tag = "prisonexit";
 	name = "Brig Exit";
 	req_access = list(2);
 	req_one_access = null
 	},
-/obj/machinery/door/firedoor/glass,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/security/cetus/meteor/brig)
 "jrA" = (
@@ -18917,7 +19092,7 @@
 /turf/simulated/floor/plating,
 /area/maintenance/cetus/aftmed)
 "jPN" = (
-/turf/simulated/wall,
+/turf/simulated/wall/r_wall,
 /area/crew_quarters/sleep/cetus/meteor/dorm2)
 "jPT" = (
 /obj/effect/floor_decal/rust,
@@ -19060,6 +19235,10 @@
 	name = "Station Intercom (General)";
 	pixel_x = -21
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = -30;
+	dir = 1
+	},
 /turf/simulated/floor/grass,
 /area/crew_quarters/cetus/meteor/atrium)
 "jRT" = (
@@ -19690,6 +19869,10 @@
 	name = "Station Intercom (General)";
 	pixel_x = 21
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = -30;
+	dir = 1
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/medical/cetus/atriumd1)
 "kiA" = (
@@ -19796,6 +19979,9 @@
 	dir = 8;
 	pixel_x = 26
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled/freezer,
 /area/maintenance/ab_Kitchen)
 "kll" = (
@@ -20203,6 +20389,9 @@
 /obj/item/stack/tile/maintenance_panel{
 	amount = 60
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled/old_tile/yellow,
 /area/maintenance/cetus/workshop)
 "ktk" = (
@@ -21386,6 +21575,9 @@
 /obj/structure/undies_wardrobe{
 	anchored = 1
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/cetus/meteor/dorm7)
 "ldt" = (
@@ -23843,6 +24035,10 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
+/obj/structure/extinguisher_cabinet{
+	dir = 4;
+	pixel_x = -28
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/security/cetus/meteor/armory)
 "mtx" = (
@@ -24810,7 +25006,7 @@
 /turf/simulated/floor/tiled/kafel_full,
 /area/crew_quarters/sleep/cetus/meteor/dorm2)
 "mVe" = (
-/turf/simulated/wall,
+/turf/simulated/wall/r_wall,
 /area/crew_quarters/sleep/cetus/meteor/dorm1)
 "mWy" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
@@ -25784,6 +25980,9 @@
 /obj/structure/undies_wardrobe{
 	anchored = 1
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/cetus/meteor/dorm10)
 "nAi" = (
@@ -26237,6 +26436,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/cetus/meteor/dorm1)
 "nKO" = (
@@ -26769,6 +26971,10 @@
 /obj/structure/bed/chair/sofa/corner/green{
 	dir = 8
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 29;
+	dir = 8
+	},
 /turf/simulated/floor/carpet/green,
 /area/crew_quarters/cetus/meteor/stairwellf1)
 "nYI" = (
@@ -26794,6 +27000,9 @@
 /obj/structure/undies_wardrobe{
 	anchored = 1
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/cetus/meteor/dorm6)
 "oaa" = (
@@ -28339,7 +28548,7 @@
 /turf/simulated/floor/tiled/neutral,
 /area/maintenance/ab_StripBar)
 "oLx" = (
-/turf/simulated/wall,
+/turf/simulated/wall/r_wall,
 /area/crew_quarters/sleep/cetus/meteor/dorm5)
 "oLR" = (
 /obj/machinery/door/firedoor/border_only,
@@ -28826,9 +29035,6 @@
 	},
 /turf/simulated/floor/tiled/kafel_full,
 /area/crew_quarters/sleep/cetus/meteor/dorm3)
-"oZE" = (
-/turf/simulated/wall,
-/area/maintenance/cetus/meteor/central)
 "oZK" = (
 /obj/effect/floor_decal/industrial/warning/corner,
 /obj/random/trash_pile,
@@ -28970,6 +29176,9 @@
 /obj/structure/undies_wardrobe{
 	anchored = 1
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/cetus/meteor/dorm8)
 "pdC" = (
@@ -29204,6 +29413,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/cetus/meteor/dorm5)
 "pkm" = (
@@ -29731,6 +29943,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = -28;
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/cetus/atriumd1)
 "pEG" = (
@@ -30090,6 +30306,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/cetus/meteor/hallway2)
 "pNA" = (
@@ -30168,6 +30387,10 @@
 /obj/effect/floor_decal/spline/fancy{
 	dir = 1
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 29;
+	dir = 8
+	},
 /turf/simulated/floor/wood,
 /area/maintenance/cetus/stylist)
 "pPc" = (
@@ -30361,7 +30584,7 @@
 /turf/simulated/floor/outdoors/rocks/cetus,
 /area/chapel/chapel_morgue/cetus/crypt)
 "pRO" = (
-/turf/simulated/wall,
+/turf/simulated/wall/r_wall,
 /area/crew_quarters/sleep/cetus/meteor/dorm8)
 "pSa" = (
 /obj/machinery/door/airlock{
@@ -30567,6 +30790,10 @@
 	layer = 3;
 	dir = 1
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 29;
+	dir = 8
+	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/cetus/meteor/carbonresearch)
 "pWS" = (
@@ -31926,6 +32153,10 @@
 /obj/machinery/light/fluorescent{
 	dir = 8
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = -28;
+	dir = 4
+	},
 /turf/simulated/floor/tiled/hydro,
 /area/maintenance/ab_Hydroponics)
 "qzw" = (
@@ -32075,6 +32306,10 @@
 "qDo" = (
 /obj/machinery/appliance/cooker/grill,
 /obj/effect/floor_decal/corner/pink/diagonal,
+/obj/structure/extinguisher_cabinet{
+	pixel_x = -28;
+	dir = 4
+	},
 /turf/simulated/floor/tiled/old_tile/white,
 /area/maintenance/ab_Kitchen)
 "qDp" = (
@@ -34542,6 +34777,10 @@
 	dir = 8;
 	pixel_x = -26
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = -30;
+	dir = 1
+	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/cetus/meteor/hallway1)
 "rRx" = (
@@ -35491,6 +35730,11 @@
 	icon_state = "pipe-c"
 	},
 /obj/effect/floor_decal/steeldecal/steel_decals_central5,
+/obj/structure/extinguisher_cabinet{
+	dir = 1;
+	pixel_y = -30;
+	pixel_x = -6
+	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/cetus/meteor/hallway1)
 "stF" = (
@@ -36690,6 +36934,10 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 4
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 29;
+	dir = 8
+	},
 /turf/simulated/floor/boxing/gym,
 /area/security/cetus/meteor/brig)
 "sXo" = (
@@ -37753,6 +38001,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/cetus/meteor/dorm2)
 "tAn" = (
@@ -40125,6 +40376,9 @@
 /obj/machinery/light/small/yellowed{
 	dir = 1
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled/old_tile/white,
 /area/maintenance/cetus/meteor/jraft)
 "uGt" = (
@@ -43451,7 +43705,7 @@
 /obj/structure/sign/directions/evac{
 	dir = 8
 	},
-/turf/simulated/wall,
+/turf/simulated/wall/r_wall,
 /area/crew_quarters/sleep/cetus/meteor/dorm8)
 "wjF" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
@@ -44402,7 +44656,7 @@
 /area/engineering/cetus/meteor/gravsubstation)
 "wIg" = (
 /obj/structure/sign/directions/evac,
-/turf/simulated/wall,
+/turf/simulated/wall/r_wall,
 /area/crew_quarters/sleep/cetus/meteor/dorm3)
 "wIv" = (
 /obj/structure/table/steel,
@@ -45061,6 +45315,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled/old_tile/white,
 /area/maintenance/abmedical)
 "wYb" = (
@@ -46759,6 +47016,9 @@
 /obj/effect/floor_decal/industrial/warning/color{
 	color = "#00B8B2"
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/Surgery_Room_2)
 "xOm" = (
@@ -47316,10 +47576,6 @@
 /obj/random/mob/mouse,
 /turf/simulated/floor/outdoors/rocks/cetus,
 /area/maintenance/cetus/meteor/central)
-"ycM" = (
-/obj/structure/reagent_dispensers/fueltank,
-/turf/simulated/floor/plating,
-/area/maintenance/cetus/meteor/portsec)
 "ycP" = (
 /obj/machinery/computer/area_atmos/tag{
 	dir = 1;
@@ -66097,7 +66353,7 @@ umc
 aKV
 vRd
 xGA
-dRw
+abm
 fHw
 mOI
 aKV
@@ -70304,7 +70560,7 @@ gcK
 iwP
 tXf
 sVh
-pnK
+abd
 dso
 oQU
 ijC
@@ -73383,7 +73639,7 @@ wFA
 det
 fFj
 fFj
-fFj
+abk
 fFj
 hHm
 xNZ
@@ -74470,7 +74726,7 @@ bjB
 wJV
 wzS
 mHP
-mHP
+aaZ
 cZO
 qFw
 qFw
@@ -78285,7 +78541,7 @@ slB
 slB
 dif
 suy
-iFy
+abl
 dif
 pxX
 lpd
@@ -78810,7 +79066,7 @@ tqS
 tqS
 jrY
 tqS
-tqS
+nSj
 jPN
 rrV
 jPN
@@ -79066,8 +79322,8 @@ obc
 ptB
 dny
 gvO
-ycM
-nSj
+tqS
+tqS
 vUq
 jPN
 liq
@@ -79082,7 +79338,7 @@ wMg
 hbg
 wMg
 lit
-mGP
+abc
 xno
 wgk
 wmM
@@ -79318,14 +79574,14 @@ oLx
 oLx
 oLx
 oLx
-spl
-spl
-spl
-spl
-nYI
-nYI
-nYI
-nYI
+abh
+abh
+abh
+abh
+abf
+abf
+abf
+abf
 tqS
 jPN
 hST
@@ -79579,11 +79835,11 @@ oLx
 otf
 eze
 rVV
-spl
+abh
 rrH
 oZD
 bWM
-nYI
+abf
 tqS
 jPN
 vqJ
@@ -79837,11 +80093,11 @@ oLx
 qXs
 wsI
 nQB
-spl
+abh
 ckd
 pmO
 sgW
-nYI
+abf
 cgs
 jPN
 mHj
@@ -80093,13 +80349,13 @@ oLx
 oLx
 oLx
 aRL
-spl
-spl
-spl
+abh
+abh
+abh
 sBa
-nYI
-nYI
-nYI
+abf
+abf
+abf
 oMd
 jPN
 tzT
@@ -80353,11 +80609,11 @@ oLx
 dUt
 snO
 gQu
-spl
+abh
 mgn
 qNt
 cHM
-nYI
+abf
 tqS
 jPN
 aYq
@@ -80611,11 +80867,11 @@ oLx
 irp
 gYT
 uAY
-spl
+abh
 iOK
 iqB
 tYq
-nYI
+abf
 xxR
 sur
 ohe
@@ -80869,11 +81125,11 @@ oLx
 pJW
 lxU
 aEt
-spl
+abh
 pQz
 wQk
 pXt
-nYI
+abf
 hQa
 nps
 goS
@@ -81127,11 +81383,11 @@ oLx
 sIz
 bdR
 wZn
-spl
+abh
 owC
 swI
 amW
-nYI
+abf
 xBe
 uyr
 pPJ
@@ -81385,11 +81641,11 @@ oLx
 dRY
 hkh
 lWc
-spl
+abh
 iMG
 vkd
 aGk
-nYI
+abf
 hQa
 cZE
 aAa
@@ -81643,7 +81899,7 @@ oLx
 eML
 spl
 spl
-spl
+abh
 qRP
 nYI
 nYI
@@ -82678,7 +82934,7 @@ mwo
 rex
 yhT
 jCr
-xQm
+abg
 jOe
 bgb
 wXf
@@ -86325,7 +86581,7 @@ kUb
 hQJ
 aML
 cAu
-qpA
+aba
 dfp
 wDc
 kml
@@ -87333,7 +87589,7 @@ fCw
 fCw
 fQu
 fCw
-oZE
+vOz
 yiM
 sWg
 eOO
@@ -87591,7 +87847,7 @@ fCw
 siC
 nUy
 sUf
-oZE
+vOz
 yiM
 mRP
 eOO
@@ -87849,7 +88105,7 @@ fCw
 nzS
 vst
 hFW
-oZE
+vOz
 ePw
 yiM
 yiM
@@ -88107,7 +88363,7 @@ fCw
 ihQ
 dEz
 ddK
-oZE
+vOz
 ksN
 alf
 alf
@@ -88365,7 +88621,7 @@ fCw
 jjU
 qFj
 lYE
-oZE
+vOz
 ePw
 tob
 knr
@@ -88623,7 +88879,7 @@ fCw
 bhV
 uTV
 gGu
-oZE
+vOz
 ksN
 tob
 eOO
@@ -88881,7 +89137,7 @@ fCw
 xlh
 fCw
 fCw
-oZE
+vOz
 fwY
 eOO
 eOO
@@ -89139,7 +89395,7 @@ fCw
 gLL
 vZY
 mtx
-oZE
+vOz
 ePw
 eOO
 knr
@@ -89397,7 +89653,7 @@ fCw
 nRw
 acC
 rvu
-oZE
+vOz
 ksN
 knr
 knr
@@ -89655,7 +89911,7 @@ fCw
 fCw
 fCw
 fCw
-oZE
+vOz
 cui
 knr
 knr
@@ -100476,7 +100732,7 @@ lFJ
 bEW
 vDn
 eQd
-wAx
+abj
 kDA
 jhE
 jhE
@@ -100741,7 +100997,7 @@ tym
 wUl
 jhE
 rxL
-aPG
+abe
 aPG
 aPG
 nxD
@@ -102053,7 +102309,7 @@ nzC
 iGr
 iQm
 idC
-qQE
+abb
 rZh
 aRz
 aRz
diff --git a/modular_chomp/maps/cetus/cetus-2.dmm b/modular_chomp/maps/cetus/cetus-2.dmm
index 18744a0c0c..62c445ab78 100644
--- a/modular_chomp/maps/cetus/cetus-2.dmm
+++ b/modular_chomp/maps/cetus/cetus-2.dmm
@@ -521,6 +521,146 @@
 /obj/machinery/atmospherics/pipe/simple/visible/universal,
 /turf/simulated/floor/plating,
 /area/maintenance/cetus/twofp)
+"aaZ" = (
+/obj/structure/extinguisher_cabinet{
+	pixel_x = -28;
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/hallway/secondary/entry/D1)
+"aba" = (
+/obj/structure/lattice,
+/obj/structure/disposalpipe/segment{
+	dir = 8;
+	icon_state = "pipe-c"
+	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 29;
+	dir = 8
+	},
+/turf/simulated/open,
+/area/crew_quarters/cetus/cafeteriaf2)
+"abb" = (
+/obj/machinery/hologram/holopad,
+/obj/effect/floor_decal/corner/paleblue/bordercorner,
+/obj/effect/floor_decal/corner/paleblue/bordercorner{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/paleblue/bordercorner{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/paleblue/bordercorner{
+	dir = 8
+	},
+/obj/effect/floor_decal/spline/plain/three_quarters,
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 29;
+	dir = 8
+	},
+/turf/simulated/floor/tiled/milspec/raised,
+/area/medical/Autoresleeving)
+"abc" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30;
+	pixel_x = -25
+	},
+/turf/simulated/floor/tiled/white,
+/area/medical/cetus/hall)
+"abd" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	icon_state = "pipe-c"
+	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/crew_quarters/cetus/atrium/primary)
+"abe" = (
+/obj/structure/closet/emcloset,
+/obj/structure/extinguisher_cabinet{
+	dir = 1;
+	pixel_y = -30
+	},
+/turf/simulated/floor/tiled,
+/area/hallway/primary/central_two)
+"abf" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/effect/floor_decal/borderfloor/corner{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/green/bordercorner{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner_steel_grid{
+	dir = 5
+	},
+/obj/structure/extinguisher_cabinet{
+	dir = 1;
+	pixel_y = -30
+	},
+/turf/simulated/floor/tiled,
+/area/hallway/primary/central_two)
+"abg" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner_steel_grid{
+	dir = 10
+	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
+/turf/simulated/floor/tiled,
+/area/hallway/primary/central_four)
+"abh" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/effect/floor_decal/corner_steel_grid{
+	dir = 9
+	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 29;
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/crew_quarters/cetus/atrium/primary)
+"abi" = (
+/obj/structure/extinguisher_cabinet{
+	pixel_x = -28;
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/storage/tools)
+"abj" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/floor_decal/corner_steel_grid{
+	dir = 9
+	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 29;
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/hallway/primary/central_one)
+"abk" = (
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
+/turf/simulated/floor/tiled/dark,
+/area/security/Brig)
+"abl" = (
+/turf/simulated/wall/r_wall,
+/area/crew_quarters/sleep/cetus/jrdorm2)
 "abm" = (
 /obj/structure/railing/overhang/hazard,
 /obj/structure/closet/emcloset,
@@ -2112,6 +2252,9 @@
 	dir = 1;
 	layer = 3
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/cetus/jrhallway)
 "aDk" = (
@@ -2785,7 +2928,7 @@
 /turf/simulated/floor/tiled,
 /area/quartermaster/Reception)
 "aOR" = (
-/turf/simulated/wall,
+/turf/simulated/wall/r_wall,
 /area/crew_quarters/sleep/cetus/jrdorm4)
 "aPd" = (
 /obj/effect/floor_decal/industrial/warning{
@@ -3636,6 +3779,10 @@
 /obj/effect/floor_decal/industrial/danger/corner{
 	dir = 4
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = -30;
+	dir = 1
+	},
 /turf/simulated/floor/tiled/dark,
 /area/medical/Virology)
 "beW" = (
@@ -4081,6 +4228,10 @@
 	dir = 1;
 	layer = 3
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30;
+	pixel_x = -25
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ai_monitored/storage/eva)
 "bkE" = (
@@ -4113,6 +4264,10 @@
 	dir = 1;
 	icon_state = "pipe-c"
 	},
+/obj/structure/extinguisher_cabinet{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/crew_quarters/cetus/atrium/secondaryf2)
 "bmb" = (
@@ -4546,6 +4701,10 @@
 /obj/effect/floor_decal/corner_steel_grid{
 	dir = 9
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 29;
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_three)
 "bum" = (
@@ -4664,6 +4823,9 @@
 /turf/simulated/floor/outdoors/rocks/cetus,
 /area/maintenance/cetus/twoap)
 "bwA" = (
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/cetus/jrhallway)
 "bwM" = (
@@ -4722,6 +4884,9 @@
 	dir = 8
 	},
 /obj/machinery/vending/loadout/gadget,
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/Circuitry_Den)
 "bxJ" = (
@@ -5984,6 +6149,10 @@
 /obj/effect/floor_decal/corner_steel_grid{
 	dir = 5
 	},
+/obj/structure/extinguisher_cabinet{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/cetus/atrium/primary)
 "bSK" = (
@@ -11400,6 +11569,10 @@
 /obj/structure/dispenser{
 	phorontanks = 0
 	},
+/obj/structure/extinguisher_cabinet{
+	dir = 4;
+	pixel_x = -28
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/engineering/Engineering_EVA)
 "dLw" = (
@@ -11518,6 +11691,10 @@
 	dir = 1
 	},
 /obj/effect/floor_decal/corner_steel_grid,
+/obj/structure/extinguisher_cabinet{
+	dir = 4;
+	pixel_x = -28
+	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/cetus/atrium/primary)
 "dOc" = (
@@ -14247,6 +14424,11 @@
 	c_tag = "MED - CMO";
 	dir = 10
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = -29;
+	dir = 4;
+	pixel_y = -7
+	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/heads/sc/cmo)
 "eNy" = (
@@ -15920,7 +16102,7 @@
 /turf/simulated/floor/plating,
 /area/maintenance/cetus/twobar)
 "fqw" = (
-/turf/simulated/wall,
+/turf/simulated/wall/r_wall,
 /area/crew_quarters/sleep/cetus/jrdorm1)
 "fqJ" = (
 /obj/effect/floor_decal/industrial/warning/corner{
@@ -17607,6 +17789,10 @@
 "fSs" = (
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/yellow/border,
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 29;
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/engineering/cetus/atriumdeck2)
 "fSv" = (
@@ -17820,6 +18006,10 @@
 /obj/effect/floor_decal/industrial/danger{
 	dir = 4
 	},
+/obj/structure/extinguisher_cabinet{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/tiled/hydro,
 /area/hydroponics)
 "fVE" = (
@@ -20136,6 +20326,10 @@
 /obj/effect/floor_decal/corner_steel_grid{
 	dir = 9
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 29;
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_three)
 "gIq" = (
@@ -20259,6 +20453,10 @@
 /area/crew_quarters/cetus/servicecloset)
 "gLD" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30;
+	pixel_x = -25
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/cetus/quartermaster)
 "gMn" = (
@@ -21593,6 +21791,9 @@
 	dir = 1;
 	name = "1N-lighting fixture"
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/Holodeck)
 "hku" = (
@@ -28456,19 +28657,6 @@
 /obj/random/trash,
 /turf/simulated/floor/plating,
 /area/maintenance/cetus/twobar)
-"jEr" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/closet,
-/turf/simulated/floor/tiled/dark,
-/area/security/Brig)
 "jEK" = (
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/door/airlock/highsecurity{
@@ -28528,6 +28716,10 @@
 /obj/effect/floor_decal/spline/plain/cee{
 	dir = 1
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = -28;
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/security/checkpoint2)
 "jGu" = (
@@ -29075,6 +29267,10 @@
 	dir = 2;
 	icon_state = "pipe-c"
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 29;
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/security/detectives_office)
 "jOM" = (
@@ -29562,6 +29758,10 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30;
+	pixel_x = -25
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/quartermaster/Recycling)
 "jXQ" = (
@@ -31754,6 +31954,10 @@
 /obj/structure/closet/secure_closet/engineering_chief,
 /obj/random_multi/single_item/hand_tele,
 /obj/machinery/light,
+/obj/structure/extinguisher_cabinet{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/heads/sc/chief)
 "kPN" = (
@@ -32807,6 +33011,9 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 1
 	},
+/obj/machinery/light/fluorescent{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/Chemistry)
 "ljf" = (
@@ -33092,6 +33299,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 29;
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/Gym)
 "loe" = (
@@ -40481,6 +40692,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
 	},
+/obj/structure/extinguisher_cabinet{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/cetus/Galleryf1)
 "nRq" = (
@@ -40703,7 +40918,6 @@
 /area/hallway/secondary/entry/D1)
 "nVi" = (
 /obj/structure/closet/toolcloset,
-/obj/structure/closet/toolcloset,
 /obj/structure/disposalpipe/segment{
 	dir = 8;
 	icon_state = "pipe-c"
@@ -41605,6 +41819,9 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled,
 /area/medical/medsci)
 "okz" = (
@@ -42093,7 +42310,7 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/cetus/hall)
 "osi" = (
-/turf/simulated/wall,
+/turf/simulated/wall/r_wall,
 /area/crew_quarters/sleep/cetus/jrdorm3)
 "osD" = (
 /obj/structure/bed/chair/sofa/corp/right{
@@ -43475,17 +43692,17 @@
 /obj/effect/wingrille_spawn/reinforced,
 /obj/machinery/door/firedoor/glass,
 /obj/structure/cable/green,
+/obj/effect/floor_decal/industrial/danger/corner{
+	dir = 4
+	},
 /obj/machinery/door/blast/regular{
 	density = 0;
 	icon_state = "pdoor0";
-	id = "xenobio1station";
+	id = "xenopublic";
 	name = "Containment Blast Doors";
 	opacity = 0;
 	dir = 8
 	},
-/obj/effect/floor_decal/industrial/danger/corner{
-	dir = 4
-	},
 /turf/simulated/floor/plating,
 /area/rnd/Xenobiology_Lab)
 "oQX" = (
@@ -43875,6 +44092,10 @@
 /obj/effect/floor_decal/corner_steel_grid{
 	dir = 5
 	},
+/obj/structure/extinguisher_cabinet{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/cetus/atrium/primary)
 "oWX" = (
@@ -44627,6 +44848,10 @@
 	dir = 8;
 	layer = 3
 	},
+/obj/structure/extinguisher_cabinet{
+	dir = 4;
+	pixel_x = -28
+	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/cetus/chem)
 "phC" = (
@@ -47218,6 +47443,10 @@
 	},
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/machinery/light,
+/obj/structure/extinguisher_cabinet{
+	dir = 4;
+	pixel_x = -28
+	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/kitchen)
 "pVO" = (
@@ -51650,6 +51879,10 @@
 	tag_door = "escape_pod_1_berth_hatch";
 	dir = 4
 	},
+/obj/structure/extinguisher_cabinet{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/cetus/escapepodport)
 "ruI" = (
@@ -52937,6 +53170,10 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
 	},
+/obj/structure/extinguisher_cabinet{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/crew_quarters/cetus/escapepodport)
 "rRF" = (
@@ -54291,6 +54528,10 @@
 	dir = 1;
 	pixel_y = 34
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30;
+	pixel_x = 25
+	},
 /turf/simulated/floor/tiled/milspec/raised,
 /area/medical/Genetics_Lab)
 "snK" = (
@@ -56064,10 +56305,11 @@
 /turf/simulated/floor/plating,
 /area/maintenance/cetus/twocargo)
 "sTX" = (
+/obj/structure/flora/pottedplant/subterranean,
 /obj/structure/extinguisher_cabinet{
+	dir = 1;
 	pixel_y = -30
 	},
-/obj/structure/flora/pottedplant/subterranean,
 /turf/simulated/floor/tiled,
 /area/engineering/Reception)
 "sTZ" = (
@@ -56661,9 +56903,6 @@
 /area/maintenance/cetus/twostar)
 "tdr" = (
 /obj/structure/reagent_dispensers/fueltank,
-/obj/structure/extinguisher_cabinet{
-	pixel_x = 28
-	},
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -56671,6 +56910,10 @@
 	dir = 4;
 	light_color = "#DDFFD3"
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 29;
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/engineering/Engineering_Workshop)
 "tdL" = (
@@ -58236,6 +58479,10 @@
 	dir = 4
 	},
 /obj/machinery/light,
+/obj/structure/extinguisher_cabinet{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/tiled,
 /area/hangar/cetus/explofoyer)
 "tET" = (
@@ -59138,6 +59385,10 @@
 	dir = 4
 	},
 /obj/machinery/light,
+/obj/structure/extinguisher_cabinet{
+	pixel_y = -30;
+	dir = 1
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/security/Firing_Range)
 "tUB" = (
@@ -59496,6 +59747,10 @@
 	dir = 8
 	},
 /obj/effect/floor_decal/corner/beige/diagonal,
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 29;
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/medical/Lounge)
 "tZX" = (
@@ -65500,9 +65755,6 @@
 	name = "north bump";
 	pixel_y = 24
 	},
-/obj/machinery/light/fluorescent{
-	dir = 8
-	},
 /obj/structure/cable/green{
 	icon_state = "0-6"
 	},
@@ -66529,7 +66781,7 @@
 /obj/machinery/door/blast/regular{
 	density = 0;
 	icon_state = "pdoor0";
-	id = "xenobio1station";
+	id = "xenopublic";
 	name = "Containment Blast Doors";
 	opacity = 0;
 	dir = 8
@@ -67648,6 +67900,10 @@
 /obj/effect/floor_decal/corner/purple/bordercorner{
 	dir = 1
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 29;
+	dir = 8
+	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/cetus/jrhall)
 "wQC" = (
@@ -68255,16 +68511,21 @@
 /obj/effect/floor_decal/corner_steel_grid{
 	dir = 5
 	},
+/obj/structure/extinguisher_cabinet{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_two)
 "xbS" = (
 /obj/structure/closet/secure_closet/atmos_personal,
 /obj/item/gps/engineering/atmos,
-/obj/structure/extinguisher_cabinet{
-	pixel_x = 28
-	},
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/item/clothing/under/swimsuit/fluff/engineering,
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 29;
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/engineering/Locker_Room)
 "xcf" = (
@@ -83697,7 +83958,7 @@ iMO
 iMO
 iMO
 iMO
-eEO
+abl
 jqR
 eUB
 eEO
@@ -83955,7 +84216,7 @@ bRa
 bRa
 bRa
 bRa
-eEO
+abl
 fRW
 vWK
 cbc
@@ -84213,16 +84474,16 @@ eyh
 wSM
 chJ
 bRa
-eEO
+abl
 pwW
 tET
-eEO
+abl
 kym
 pyF
-xvm
-xvm
-xvm
-xvm
+gjK
+gjK
+gjK
+gjK
 xvm
 xvm
 esf
@@ -84471,10 +84732,10 @@ jGF
 dkC
 vSM
 bNY
-eEO
-eEO
-eEO
-eEO
+abl
+abl
+abl
+abl
 aDc
 lOL
 xvm
@@ -94617,7 +94878,7 @@ tZJ
 gYc
 kzU
 qqd
-rCH
+abc
 oeA
 eHl
 eza
@@ -101312,7 +101573,7 @@ hbw
 tkx
 alH
 taE
-cpa
+abg
 wgI
 jKZ
 bfy
@@ -102410,7 +102671,7 @@ fxY
 mSm
 fxY
 fxY
-fxY
+aaZ
 alC
 vMq
 pCo
@@ -103450,7 +103711,7 @@ qHq
 xzy
 hdY
 lMb
-pNA
+pzb
 oJw
 oJw
 oJw
@@ -103654,7 +103915,7 @@ sMZ
 lQO
 mxf
 hwA
-jXs
+abb
 kXb
 fYs
 ksd
@@ -105181,7 +105442,7 @@ ozP
 oNr
 ozP
 rYd
-ozP
+abh
 kDK
 kDK
 kDK
@@ -107467,7 +107728,7 @@ rXD
 plZ
 iHn
 gkm
-jEr
+bcN
 aai
 oox
 qLN
@@ -108000,7 +108261,7 @@ aqk
 nWz
 aae
 qDi
-aqk
+abj
 aqk
 ciZ
 qwr
@@ -110095,7 +110356,7 @@ gys
 gys
 gys
 ikE
-qgD
+abd
 uzj
 fWs
 nom
@@ -110553,7 +110814,7 @@ ryf
 aTU
 uCq
 phC
-oaG
+abk
 pJT
 hNN
 siN
@@ -110621,7 +110882,7 @@ hBE
 xOv
 nMW
 xOv
-tkE
+aba
 jGY
 dZZ
 dZZ
@@ -116788,13 +117049,13 @@ aTW
 aaF
 dms
 eWj
-rSb
+abi
 dPW
 cMT
 iTc
 oOu
 efF
-xGB
+abf
 agW
 jWR
 aVC
@@ -122730,7 +122991,7 @@ rFl
 dyt
 iZo
 iqH
-eDR
+abe
 dvf
 abm
 eYp
diff --git a/modular_chomp/maps/cetus/cetus-3.dmm b/modular_chomp/maps/cetus/cetus-3.dmm
index 1ff07c0169..c8d118030b 100644
--- a/modular_chomp/maps/cetus/cetus-3.dmm
+++ b/modular_chomp/maps/cetus/cetus-3.dmm
@@ -374,6 +374,50 @@
 /obj/item/destTagger,
 /turf/space,
 /area/space)
+"aaU" = (
+/obj/structure/cable/cyan{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/extinguisher_cabinet/old{
+	pixel_y = 32
+	},
+/turf/simulated/floor/tiled/neutral,
+/area/maintenance/cetus/shallow/derelict/hallway)
+"aaV" = (
+/obj/machinery/atmospherics/pipe/simple/visible/red{
+	dir = 6
+	},
+/obj/structure/extinguisher_cabinet/old{
+	pixel_y = 32
+	},
+/turf/simulated/floor/tiled/milspec,
+/area/maintenance/cetus/shallow/derelict/atmos)
+"aaW" = (
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 29;
+	dir = 8
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/ai_upload)
+"aaX" = (
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 29;
+	dir = 8
+	},
+/turf/simulated/floor/greengrid,
+/area/ai)
+"aaY" = (
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
+/turf/simulated/floor/carpet/graycarpet,
+/area/hallway/primary/firstdeck/vaultlobby)
 "aaZ" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/full,
@@ -390,6 +434,13 @@
 	},
 /turf/simulated/shuttle/plating,
 /area/shuttle/escape_pod2/station)
+"aba" = (
+/obj/structure/extinguisher_cabinet{
+	dir = 4;
+	pixel_x = -28
+	},
+/turf/simulated/floor/carpet/brown,
+/area/maintenance/cetus/shallow/law)
 "abb" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -402,6 +453,15 @@
 	},
 /turf/simulated/floor/wood,
 /area/bridge/sleep/CMO_Quarters)
+"abc" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 29;
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/crew_quarters/cetus/lounge)
 "abd" = (
 /obj/machinery/button/remote/airlock{
 	id = "cmoquarters";
@@ -424,6 +484,40 @@
 	},
 /turf/simulated/floor/wood,
 /area/bridge/sleep/RD_Quarters)
+"abe" = (
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 29;
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/engineering/Atmospherics_Chamber)
+"abf" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/extinguisher_cabinet{
+	dir = 4;
+	pixel_x = -28
+	},
+/turf/simulated/floor/wood,
+/area/bridge/sleep/Secretary_Quarters)
+"abg" = (
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 29;
+	dir = 8
+	},
+/turf/simulated/floor/tiled/dark,
+/area/rnd/cetus/stairwelljr3)
+"abh" = (
+/obj/effect/floor_decal/spline/plain{
+	dir = 8
+	},
+/obj/structure/extinguisher_cabinet{
+	dir = 1;
+	pixel_y = -30
+	},
+/turf/simulated/floor/boxing/gym,
+/area/maintenance/cetus/jrthreestar)
 "abn" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
@@ -2656,6 +2750,10 @@
 /area/maintenance/cetus/d3docks)
 "bwV" = (
 /obj/machinery/light,
+/obj/structure/extinguisher_cabinet{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/carpet/retro_red,
 /area/bridge/sleep/HoS_Quarters)
 "bxa" = (
@@ -5995,6 +6093,10 @@
 /obj/structure/table/bench/wooden,
 /obj/item/camera_film,
 /obj/item/camera,
+/obj/structure/extinguisher_cabinet{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/boxing/gym{
 	name = "floor mat"
 	},
@@ -7103,6 +7205,10 @@
 /turf/simulated/floor/plating,
 /area/maintenance/cetus/threeas)
 "elo" = (
+/obj/structure/extinguisher_cabinet{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/carpet/blucarpet,
 /area/bridge/sleep/HoP_Quarters)
 "elq" = (
@@ -7644,6 +7750,9 @@
 /obj/structure/bed/chair/comfy/brown{
 	dir = 4
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/cetus/Galleryf2)
 "eAa" = (
@@ -8185,6 +8294,9 @@
 /obj/machinery/light/yellowed{
 	dir = 1
 	},
+/obj/structure/extinguisher_cabinet/old{
+	pixel_y = 32
+	},
 /turf/simulated/floor/tiled/old_tile,
 /area/maintenance/cetus/shallow/derelict/medbay)
 "eOA" = (
@@ -8250,6 +8362,9 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/plating,
 /area/engineering/Atmospherics_Chamber)
 "ePT" = (
@@ -8885,6 +9000,10 @@
 /obj/machinery/light/fluorescent{
 	dir = 1
 	},
+/obj/structure/extinguisher_cabinet{
+	dir = 4;
+	pixel_x = -28
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ai)
 "flG" = (
@@ -9584,6 +9703,10 @@
 /turf/simulated/mineral/cetus/edge,
 /area/maintenance/disposal)
 "fFY" = (
+/obj/structure/extinguisher_cabinet{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/carpet/tealcarpet,
 /area/bridge/sleep/CMO_Quarters)
 "fGi" = (
@@ -11018,6 +11141,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 4
 	},
+/obj/structure/extinguisher_cabinet{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/plating,
 /area/engineering/cetus/jointsubstation)
 "gAn" = (
@@ -12214,6 +12341,10 @@
 /obj/structure/transit_tube/station{
 	dir = 1
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 29;
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/cetus/entry)
 "hhf" = (
@@ -13878,6 +14009,10 @@
 /obj/effect/floor_decal/corner/brown/bordercorner{
 	dir = 4
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 29;
+	dir = 8
+	},
 /turf/simulated/floor/tiled/neutral,
 /area/quartermaster/mininglockerroom)
 "ifh" = (
@@ -14289,6 +14424,10 @@
 /obj/machinery/ai_status_display{
 	pixel_y = 32
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 29;
+	dir = 8
+	},
 /turf/simulated/floor/greengrid,
 /area/ai)
 "iwJ" = (
@@ -16752,6 +16891,9 @@
 /area/maintenance/cetus/d3docks)
 "jYo" = (
 /obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/structure/extinguisher_cabinet/old{
+	pixel_y = 32
+	},
 /turf/simulated/floor/tiled/neutral,
 /area/maintenance/cetus/shallow/derelict/hallway)
 "jYJ" = (
@@ -17554,6 +17696,10 @@
 	layer = 3;
 	dir = 1
 	},
+/obj/structure/extinguisher_cabinet{
+	dir = 4;
+	pixel_x = -28
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ai_server_room)
 "ktx" = (
@@ -19079,6 +19225,9 @@
 	name = "station director's wardrobe"
 	},
 /obj/random/drinkbottle,
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/wood,
 /area/bridge/sleep/Captain_Quarters)
 "lmC" = (
@@ -20029,6 +20178,10 @@
 /area/crew_quarters/cetus/lounge)
 "lKn" = (
 /obj/structure/filingcabinet,
+/obj/structure/extinguisher_cabinet{
+	dir = 4;
+	pixel_x = -28
+	},
 /turf/simulated/floor/carpet/graycarpet,
 /area/maintenance/cetus/shallow/bodyguard)
 "lKp" = (
@@ -21966,6 +22119,9 @@
 	c_tag = "SCI - JR D3 Stairwell 1";
 	dir = 6
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/cetus/entry)
 "mMB" = (
@@ -22700,6 +22856,9 @@
 /obj/machinery/atmospherics/pipe/simple/visible/cyan{
 	dir = 10
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled,
 /area/engineering/Atmospherics_Chamber)
 "ngY" = (
@@ -25041,6 +25200,10 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
+/obj/structure/extinguisher_cabinet{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/wood,
 /area/bridge/sleep/RD_Quarters)
 "oyc" = (
@@ -25714,6 +25877,9 @@
 /obj/structure/bed/chair/comfy/brown{
 	dir = 8
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/sc/sd)
 "oVq" = (
@@ -26486,6 +26652,9 @@
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 4
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled/dark,
 /area/security/nuke_storage)
 "pvF" = (
@@ -26581,6 +26750,9 @@
 	c_tag = "ENG - Atmospherics Fore Port";
 	dir = 6
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled,
 /area/engineering/Atmospherics_Chamber)
 "pzc" = (
@@ -27823,6 +27995,10 @@
 /obj/machinery/status_display{
 	pixel_y = -32
 	},
+/obj/structure/extinguisher_cabinet{
+	dir = 4;
+	pixel_x = -28
+	},
 /turf/simulated/floor/greengrid,
 /area/ai)
 "qgB" = (
@@ -28940,6 +29116,10 @@
 	dir = 4;
 	icon_state = "pipe-c"
 	},
+/obj/structure/extinguisher_cabinet{
+	dir = 4;
+	pixel_x = -28
+	},
 /turf/simulated/floor/wood,
 /area/bridge/secretaryoffice)
 "qTa" = (
@@ -31064,6 +31244,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 29;
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/cetus/atrium/secondaryf3)
 "sbL" = (
@@ -31160,6 +31344,10 @@
 /obj/machinery/light/small/yellowed{
 	dir = 8
 	},
+/obj/structure/extinguisher_cabinet{
+	dir = 4;
+	pixel_x = -28
+	},
 /turf/simulated/floor/boxing,
 /area/maintenance/cetus/shallow/quack)
 "sfW" = (
@@ -31411,6 +31599,10 @@
 /obj/machinery/light/spot{
 	dir = 4
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 29;
+	dir = 8
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/cetus/theater)
 "srB" = (
@@ -32028,6 +32220,10 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
+/obj/structure/extinguisher_cabinet{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/wood,
 /area/bridge/sleep/CE_Quarters)
 "sOu" = (
@@ -33031,6 +33227,10 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
+/obj/structure/extinguisher_cabinet{
+	dir = 1;
+	pixel_y = -30
+	},
 /turf/simulated/floor/tiled/kafel_full,
 /area/crew_quarters/heads/sc/restroom)
 "trq" = (
@@ -35287,6 +35487,10 @@
 /obj/structure/bed/chair/office/dark{
 	dir = 4
 	},
+/obj/structure/extinguisher_cabinet{
+	dir = 4;
+	pixel_x = -28
+	},
 /turf/simulated/floor/wood,
 /area/maintenance/cetus/shallow/detective)
 "uDb" = (
@@ -36780,6 +36984,11 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/structure/extinguisher_cabinet{
+	dir = 1;
+	pixel_y = -30;
+	pixel_x = 28
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/disposal)
 "vBZ" = (
@@ -38894,6 +39103,10 @@
 	dir = 4;
 	light_color = "#DDFFD3"
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 29;
+	dir = 8
+	},
 /turf/simulated/floor/tiled/dark,
 /area/bridge)
 "wGM" = (
@@ -58788,7 +59001,7 @@ aib
 mlx
 hlO
 ulN
-ulN
+abg
 xsu
 asv
 enp
@@ -59816,7 +60029,7 @@ dSN
 uez
 xAw
 jve
-asv
+uez
 oSy
 qyy
 oSy
@@ -60074,7 +60287,7 @@ dSN
 gnS
 sOx
 jve
-asv
+uez
 iUO
 hLd
 xAM
@@ -60332,7 +60545,7 @@ jlZ
 uez
 xnZ
 jve
-asv
+uez
 pZz
 hLd
 haG
@@ -60590,7 +60803,7 @@ asv
 asv
 hUS
 mOO
-asv
+uez
 lkE
 rnV
 rKt
@@ -61106,7 +61319,7 @@ rIV
 asv
 lLJ
 akT
-asv
+uez
 oSy
 qyy
 oSy
@@ -62391,7 +62604,7 @@ ajO
 tKH
 eVg
 lSA
-eVg
+abh
 asv
 aib
 aib
@@ -72789,7 +73002,7 @@ aqE
 gnv
 gnv
 gnv
-ftW
+aaY
 gly
 uwf
 eDb
@@ -75879,7 +76092,7 @@ dhV
 lWk
 hVI
 oNM
-qbV
+abc
 qbV
 rdE
 pzJ
@@ -82591,7 +82804,7 @@ nyi
 cgn
 vMR
 igz
-igz
+aba
 qjT
 nMy
 cBI
@@ -82829,7 +83042,7 @@ qih
 iqX
 fHw
 awN
-doD
+abf
 doD
 lqg
 ozA
@@ -83634,7 +83847,7 @@ nMy
 jbL
 jiP
 uYA
-ojB
+aaV
 mcz
 oQw
 ydE
@@ -86477,7 +86690,7 @@ vxT
 vxT
 rRw
 nIu
-xHx
+aaU
 gCA
 eNe
 hfC
@@ -89560,7 +89773,7 @@ qHv
 hAw
 atV
 elq
-pMS
+aaX
 rVT
 jSG
 jSG
@@ -91115,7 +91328,7 @@ evc
 evc
 icT
 whC
-eoq
+aaW
 vcX
 wFl
 cRb
@@ -95996,7 +96209,7 @@ pmr
 vbb
 rmt
 yjs
-yjs
+abe
 yjs
 jfb
 okA