diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index bb372563cf..7693ea16a2 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -69,35 +69,18 @@
 /turf/closed/wall/r_wall,
 /area/security/prison)
 "aaj" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/closed/wall/r_wall,
-/area/security/prison)
-"aak" = (
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/security/prison)
-"aal" = (
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "aam" = (
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/security/prison)
@@ -115,11 +98,17 @@
 /obj/structure/sign/warning/electricshock{
 	pixel_y = 32
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/grass,
 /area/security/prison)
 "aap" = (
 /obj/machinery/hydroponics/soil,
 /obj/item/seeds/carrot,
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
 /turf/open/floor/grass,
 /area/security/prison)
 "aaq" = (
@@ -140,17 +129,29 @@
 /obj/structure/sink{
 	pixel_y = 20
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel,
 /area/security/prison)
 "aar" = (
 /obj/machinery/hydroponics/soil,
 /obj/item/seeds/glowshroom,
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/grass,
 /area/security/prison)
 "aas" = (
 /obj/structure/sign/warning/electricshock{
 	pixel_y = 32
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel,
 /area/security/prison)
 "aat" = (
@@ -5666,6 +5667,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
 /turf/open/floor/plasteel,
 /area/security/brig)
 "akw" = (
@@ -5845,10 +5849,13 @@
 /area/science/xenobiology)
 "akQ" = (
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-2"
 	},
-/turf/closed/wall,
-/area/security/brig)
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plasteel,
+/area/security/prison)
 "akR" = (
 /obj/machinery/camera{
 	c_tag = "Security Office";
@@ -6108,7 +6115,7 @@
 "alq" = (
 /obj/machinery/door/airlock/security/glass{
 	name = "Evidence Storage";
-	req_access_txt = "4"
+	req_one_access_txt = "4;1"
 	},
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -6142,25 +6149,11 @@
 /turf/open/floor/plasteel,
 /area/security/brig)
 "alt" = (
-/obj/machinery/door/airlock/security/glass{
-	id_tag = "innerbrig";
-	name = "Brig";
-	req_access_txt = "63"
-	},
-/obj/machinery/door/firedoor,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 1
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel,
 /area/security/brig)
@@ -6180,16 +6173,11 @@
 /area/ai_monitored/nuke_storage)
 "alv" = (
 /obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
 /obj/machinery/door/poddoor/preopen{
 	id = "Secure Gate";
 	name = "brig shutters"
 	},
+/obj/structure/cable,
 /turf/open/floor/plating,
 /area/security/brig)
 "alw" = (
@@ -6272,6 +6260,9 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
 /turf/open/floor/plasteel,
 /area/security/brig)
 "alB" = (
@@ -6572,9 +6563,6 @@
 /turf/open/floor/engine,
 /area/science/xenobiology)
 "amm" = (
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
@@ -6609,6 +6597,9 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel,
 /area/security/brig)
 "amq" = (
@@ -6661,9 +6652,6 @@
 	icon_state = "0-8"
 	},
 /obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
 /area/security/brig)
@@ -6763,6 +6751,12 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
 /turf/open/floor/plasteel,
 /area/security/brig)
 "amJ" = (
@@ -6853,25 +6847,15 @@
 	},
 /turf/open/floor/plasteel,
 /area/science/xenobiology)
-"amR" = (
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/door/poddoor/preopen{
-	id = "Secure Gate";
-	name = "brig shutters"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/security/brig)
 "amS" = (
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+	dir = 8
 	},
-/turf/closed/wall/r_wall,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
 /area/security/brig)
 "amT" = (
 /obj/structure/cable{
@@ -7271,9 +7255,11 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
-/obj/structure/cable,
 /obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
 /turf/open/floor/plating,
 /area/security/brig)
 "anQ" = (
@@ -7281,9 +7267,6 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /turf/open/floor/plasteel,
 /area/security/brig)
 "anR" = (
@@ -7514,14 +7497,13 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
-/obj/structure/cable,
 /obj/machinery/door/poddoor/preopen{
 	id = "Secure Gate";
 	name = "brig shutters"
 	},
 /obj/effect/spawner/structure/window/reinforced,
 /obj/structure/cable{
-	icon_state = "1-8"
+	icon_state = "0-8"
 	},
 /turf/open/floor/plating,
 /area/security/brig)
@@ -7755,13 +7737,13 @@
 /area/security/brig)
 "aoZ" = (
 /obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
 /obj/machinery/door/poddoor/preopen{
 	id = "Secure Brig Control";
 	name = "brig shutters"
 	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
 /turf/open/floor/plating,
 /area/security/warden)
 "apa" = (
@@ -7780,6 +7762,9 @@
 /area/science/xenobiology)
 "apc" = (
 /obj/structure/chair/office/dark,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/showroomfloor,
 /area/security/warden)
 "apd" = (
@@ -7933,6 +7918,12 @@
 	pixel_x = 6;
 	pixel_y = 3
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
 /turf/open/floor/plasteel/showroomfloor,
 /area/security/warden)
 "apw" = (
@@ -8052,6 +8043,12 @@
 	pixel_y = -24;
 	req_access_txt = "2"
 	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/showroomfloor,
 /area/security/warden)
 "apI" = (
@@ -8133,9 +8130,6 @@
 	req_access_txt = "63"
 	},
 /obj/machinery/door/firedoor,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 1
 	},
@@ -8158,14 +8152,19 @@
 /turf/open/floor/plating,
 /area/maintenance/fore)
 "apT" = (
+/obj/machinery/door/poddoor/preopen{
+	id = "Cell Interior Shutters";
+	name = "brig shutters"
+	},
+/obj/effect/spawner/structure/window/reinforced,
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "0-8"
 	},
 /obj/structure/cable{
-	icon_state = "1-8"
+	icon_state = "0-4"
 	},
-/turf/closed/wall/r_wall,
-/area/security/warden)
+/turf/open/floor/plating,
+/area/security/brig)
 "apU" = (
 /turf/open/floor/plating,
 /area/security/vacantoffice/b)
@@ -8181,20 +8180,6 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/fore)
-"apX" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/machinery/door/poddoor/preopen{
-	id = "Secure Brig Control";
-	name = "brig shutters"
-	},
-/turf/open/floor/plating,
-/area/security/warden)
 "apY" = (
 /obj/machinery/light/small{
 	dir = 1
@@ -8406,13 +8391,11 @@
 /area/crew_quarters/fitness/pool)
 "aqt" = (
 /obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
 /obj/machinery/door/poddoor/preopen{
 	id = "Secure Brig Control";
 	name = "brig shutters"
 	},
+/obj/structure/cable,
 /turf/open/floor/plating,
 /area/security/warden)
 "aqu" = (
@@ -8858,6 +8841,9 @@
 	c_tag = "Brig Control";
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
 /turf/open/floor/plasteel/showroomfloor,
 /area/security/warden)
 "arz" = (
@@ -52616,9 +52602,6 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /turf/open/floor/plasteel,
 /area/security/brig)
 "cLS" = (
@@ -53521,9 +53504,17 @@
 /area/science/circuit)
 "dyE" = (
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "0-4"
 	},
-/turf/open/floor/plasteel,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/door/poddoor/preopen{
+	id = "Secure Gate";
+	name = "brig shutters"
+	},
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
 /area/security/brig)
 "dyS" = (
 /obj/effect/turf_decal/tile/green{
@@ -53583,9 +53574,6 @@
 /turf/open/space,
 /area/space/nearstation)
 "dCV" = (
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
@@ -54994,11 +54982,11 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
 /obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
 /turf/open/floor/plating,
 /area/security/brig)
 "gOZ" = (
@@ -56342,15 +56330,15 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
 /obj/effect/turf_decal/tile/red{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
 /turf/open/floor/plasteel,
 /area/security/brig)
 "kcx" = (
@@ -56869,9 +56857,6 @@
 /turf/open/floor/plasteel,
 /area/security/brig)
 "laq" = (
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
@@ -57160,7 +57145,7 @@
 /area/maintenance/starboard/aft)
 "lZn" = (
 /obj/machinery/door/airlock/security/glass{
-	id_tag = "innerbrig";
+	id_tag = null;
 	name = "Brig Infirmary";
 	req_access_txt = "2"
 	},
@@ -58195,9 +58180,6 @@
 /area/hallway/primary/central)
 "ovv" = (
 /obj/structure/table,
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
@@ -58540,9 +58522,6 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
@@ -58671,9 +58650,6 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
@@ -58681,7 +58657,10 @@
 	dir = 4
 	},
 /obj/structure/cable{
-	icon_state = "2-4"
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
 	},
 /turf/open/floor/plasteel,
 /area/security/brig)
@@ -58809,9 +58788,6 @@
 /turf/open/floor/plating,
 /area/crew_quarters/fitness)
 "pQr" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/effect/turf_decal/tile/green,
 /obj/effect/turf_decal/tile/green{
 	dir = 8
@@ -59498,9 +59474,6 @@
 /area/maintenance/bar)
 "rCl" = (
 /obj/machinery/door/firedoor,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 1
 	},
@@ -59544,20 +59517,6 @@
 	},
 /turf/open/floor/plating,
 /area/crew_quarters/abandoned_gambling_den)
-"rJv" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/door/poddoor/preopen{
-	id = "Secure Gate";
-	name = "brig shutters"
-	},
-/turf/open/floor/plating,
-/area/security/brig)
 "rJw" = (
 /obj/structure/table/glass,
 /obj/item/hemostat,
@@ -59764,9 +59723,6 @@
 	},
 /area/crew_quarters/fitness)
 "seP" = (
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
@@ -61092,6 +61048,9 @@
 /area/maintenance/starboard/aft)
 "uXt" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel,
 /area/security/brig)
 "vae" = (
@@ -61332,13 +61291,13 @@
 /area/crew_quarters/dorms)
 "vyK" = (
 /obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
 /obj/machinery/door/poddoor/preopen{
 	id = "Secure Gate";
 	name = "brig shutters"
 	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
 /turf/open/floor/plating,
 /area/security/brig)
 "vzp" = (
@@ -88087,7 +88046,7 @@ aaa
 aaa
 aag
 aaa
-aak
+aam
 aap
 saX
 aaD
@@ -88344,7 +88303,7 @@ aaa
 aaa
 aag
 aaf
-aaj
+aai
 aao
 aax
 aaC
@@ -88370,7 +88329,7 @@ alz
 cZe
 alg
 plS
-dyE
+afM
 pQr
 aou
 aqC
@@ -88601,7 +88560,7 @@ aaa
 aaa
 aag
 aaa
-aal
+aam
 aar
 uGI
 aaF
@@ -88858,7 +88817,7 @@ aaa
 aaa
 aag
 aaf
-aaj
+aai
 aaq
 dyS
 aaE
@@ -88883,10 +88842,10 @@ agj
 agM
 sAk
 akp
-akQ
+agj
 amB
 amn
-amS
+aiX
 anz
 anz
 aov
@@ -89115,8 +89074,8 @@ aaa
 aaa
 aag
 aaa
-aal
-aat
+aam
+aaj
 aat
 aat
 aat
@@ -89143,7 +89102,7 @@ akM
 amm
 gyr
 anM
-rJv
+xal
 aqC
 anz
 aox
@@ -89372,7 +89331,7 @@ aaa
 aaa
 aag
 aaf
-aaj
+aai
 aas
 aat
 aat
@@ -89395,12 +89354,12 @@ akU
 afM
 lBz
 alA
-ene
-alg
+alt
+amS
 kbm
-dyE
+afM
 cKC
-seP
+dyE
 aqC
 anR
 aow
@@ -89630,7 +89589,7 @@ aaa
 aag
 aaa
 aam
-aav
+akQ
 aav
 aav
 aav
@@ -89657,7 +89616,7 @@ akT
 gNE
 gLz
 anB
-amR
+seP
 aqC
 anz
 aov
@@ -89911,10 +89870,10 @@ fxx
 ako
 ene
 amj
-akQ
+agj
 amB
 amn
-amS
+aiX
 anz
 anz
 aov
@@ -90171,7 +90130,7 @@ amk
 amm
 gyr
 mos
-rJv
+xal
 aqC
 anz
 aov
@@ -90424,11 +90383,11 @@ akF
 aiy
 akv
 uXt
-alg
+amS
 pAK
-dyE
+afM
 anQ
-seP
+dyE
 aqC
 anz
 aov
@@ -90685,7 +90644,7 @@ akT
 amx
 any
 arD
-amR
+seP
 aqC
 anz
 aov
@@ -90939,10 +90898,10 @@ ajc
 akz
 ene
 als
-akQ
-amB
+agj
+apT
 amn
-amS
+aiX
 aqD
 anz
 aov
@@ -91196,7 +91155,7 @@ ajc
 akz
 ene
 alg
-alt
+alw
 amp
 aot
 apR
@@ -91455,7 +91414,7 @@ itD
 alg
 vyK
 amI
-alg
+amS
 alv
 aqE
 anS
@@ -91970,7 +91929,7 @@ agn
 agn
 amN
 aoZ
-apT
+agn
 anw
 anz
 cXU
@@ -92227,7 +92186,7 @@ akY
 alE
 amU
 apH
-apX
+aqt
 aqC
 anz
 gfC