diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index ff9147ce22..dcb83ee9bb 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -28095,6 +28095,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/machinery/holopad,
 /turf/open/floor/plasteel/white,
 /area/security/brig)
 "bgw" = (
@@ -28944,7 +28945,7 @@
 /area/security/brig)
 "bio" = (
 /obj/machinery/light/small,
-/obj/machinery/holopad,
+/obj/machinery/chem_master,
 /turf/open/floor/plasteel/whitered/side,
 /area/security/brig)
 "bip" = (
@@ -41783,21 +41784,11 @@
 /turf/open/floor/plating,
 /area/security/brig)
 "bFj" = (
-/obj/structure/cable/white{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
 /turf/open/floor/plasteel/red/side{
 	dir = 8
 	},
 /area/security/brig)
 "bFk" = (
-/obj/structure/cable/white{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
 /turf/open/floor/plasteel/red/side{
 	dir = 4
 	},
@@ -41813,11 +41804,6 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/obj/structure/cable/white{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
 /obj/machinery/door/window/brigdoor/security/cell/westright{
 	id = "brig1";
 	name = "Cell 1"
@@ -43788,12 +43774,6 @@
 	},
 /area/hallway/primary/starboard)
 "bIY" = (
-/obj/structure/sign/securearea{
-	desc = "A warning sign which reads 'HIGH VOLTAGE'";
-	icon_state = "shock";
-	name = "HIGH VOLTAGE";
-	pixel_x = 32
-	},
 /obj/machinery/light{
 	dir = 4
 	},
@@ -45783,11 +45763,6 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/obj/structure/cable/white{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
 /obj/machinery/door/window/brigdoor/security/cell/westright{
 	id = "brig2";
 	name = "Cell 2"
@@ -48042,12 +48017,6 @@
 /turf/open/floor/plasteel/neutral,
 /area/hallway/primary/starboard)
 "bQV" = (
-/obj/structure/sign/securearea{
-	desc = "A warning sign which reads 'HIGH VOLTAGE'";
-	icon_state = "shock";
-	name = "HIGH VOLTAGE";
-	pixel_x = 32
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 10
 	},
@@ -106597,11 +106566,10 @@
 /turf/open/floor/plasteel,
 /area/hydroponics)
 "efr" = (
-/obj/structure/table/glass,
-/obj/machinery/computer/med_data/laptop,
 /obj/structure/sign/poster/official/cleanliness{
 	pixel_y = 32
 	},
+/obj/machinery/chem_dispenser,
 /turf/open/floor/plasteel/whitered/side{
 	dir = 9
 	},
@@ -108983,11 +108951,6 @@
 	},
 /area/maintenance/port/fore)
 "erg" = (
-/obj/structure/cable/white{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
 /obj/effect/landmark/event_spawn,
 /turf/open/floor/plasteel/red/side{
 	dir = 8
@@ -159408,13 +159371,13 @@ bwi
 bxY
 efF
 bjQ
-bDn
-bFi
-bHa
 bdi
-bDn
-bFi
-bHa
+bdi
+bdi
+bdi
+bdi
+bdi
+bdi
 bdi
 bTh
 bVn
@@ -159927,7 +159890,7 @@ bFk
 bHc
 bAb
 bLc
-bit
+bgA
 bOO
 bIZ
 bTj
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 7a1d624abd..229ba40ea9 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -5236,25 +5236,21 @@
 	},
 /area/security/brig)
 "akv" = (
-/obj/structure/table,
 /obj/machinery/airalarm{
 	pixel_y = 28
 	},
-/obj/machinery/computer/med_data/laptop,
+/obj/machinery/chem_dispenser{
+	layer = 2.7
+	},
 /turf/open/floor/plasteel/whitered/side{
 	dir = 1
 	},
 /area/security/brig)
 "akw" = (
-/obj/structure/table,
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/obj/item/paper_bin{
-	pixel_x = -3;
-	pixel_y = 7
-	},
-/obj/item/pen,
+/obj/machinery/chem_master,
 /turf/open/floor/plasteel/whitered/side{
 	dir = 5
 	},
@@ -12670,11 +12666,6 @@
 /turf/open/floor/plating,
 /area/security/brig)
 "ayx" = (
-/obj/structure/cable/yellow{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
 /obj/structure/cable/yellow{
 	d1 = 1;
 	d2 = 8;
@@ -12703,11 +12694,6 @@
 /turf/open/floor/plating,
 /area/security/brig)
 "ayz" = (
-/obj/structure/cable/yellow{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
 /obj/structure/cable/yellow{
 	d1 = 1;
 	d2 = 8;
@@ -12725,11 +12711,6 @@
 /turf/open/floor/plasteel/red/side,
 /area/security/brig)
 "ayA" = (
-/obj/structure/cable/yellow{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
 /obj/structure/cable/yellow{
 	d1 = 1;
 	d2 = 8;
@@ -13274,11 +13255,6 @@
 /turf/open/floor/plasteel/floorgrime,
 /area/security/brig)
 "azE" = (
-/obj/structure/cable/yellow{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
 /turf/open/floor/plasteel/floorgrime,
 /area/security/brig)
 "azF" = (
@@ -15317,12 +15293,6 @@
 	},
 /area/hallway/primary/fore)
 "aDz" = (
-/obj/structure/sign/securearea{
-	desc = "A warning sign which reads 'HIGH VOLTAGE'";
-	icon_state = "shock";
-	name = "HIGH VOLTAGE";
-	pixel_y = 32
-	},
 /obj/machinery/camera{
 	c_tag = "Fore Primary Hallway Cells";
 	dir = 2;
@@ -85683,11 +85653,6 @@
 	},
 /area/maintenance/starboard/fore)
 "dCj" = (
-/obj/structure/cable/yellow{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
 /obj/effect/landmark/event_spawn,
 /turf/open/floor/plasteel/floorgrime,
 /area/security/brig)
@@ -111035,7 +111000,7 @@ awZ
 ayw
 azD
 aAY
-aCk
+ajm
 aDw
 aDC
 aGb
@@ -111292,8 +111257,8 @@ axa
 ayx
 azE
 azE
-aCl
-aDx
+ajm
+aDw
 aEK
 aGc
 aHx
@@ -111549,7 +111514,7 @@ axb
 ayy
 azF
 aAZ
-aCm
+ajm
 aDw
 aEL
 aGd
@@ -111807,7 +111772,7 @@ ahx
 ahx
 ahx
 ajm
-aDy
+aDw
 aEM
 aGe
 aHx
@@ -112063,7 +112028,7 @@ axd
 ayw
 azG
 aAY
-aCk
+ajm
 aDw
 aEN
 aGf
@@ -112320,8 +112285,8 @@ axe
 ayz
 dCj
 azE
-aCl
-aDx
+ajm
+aDw
 dCo
 aGg
 aHx
@@ -112577,7 +112542,7 @@ axb
 ayy
 azF
 aBa
-aCm
+ajm
 aDw
 aEO
 aGh
@@ -113091,7 +113056,7 @@ axd
 ayw
 azH
 aAY
-aCk
+ajm
 aDw
 aEO
 aGg
@@ -113348,8 +113313,8 @@ axa
 ayA
 azE
 azE
-aCl
-aDx
+ajm
+aDw
 aEQ
 aGj
 aHz
@@ -113605,7 +113570,7 @@ axg
 ayy
 azF
 aBb
-aCm
+ajm
 aDw
 aEN
 aGk