diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 4be782b3c3..edc8ef9fd6 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -5017,10 +5017,9 @@
 /turf/open/floor/plating,
 /area/security/brig)
 "akO" = (
-/obj/machinery/door/window/brigdoor{
+/obj/machinery/door/window/brigdoor/security/cell{
 	id = "Cell 1";
-	name = "Cell 1";
-	req_access_txt = "1"
+	name = "Cell 1"
 	},
 /obj/structure/cable{
 	d1 = 4;
@@ -5052,10 +5051,9 @@
 /turf/closed/wall,
 /area/security/brig)
 "akR" = (
-/obj/machinery/door/window/brigdoor{
+/obj/machinery/door/window/brigdoor/security/cell{
 	id = "Cell 2";
-	name = "Cell 2";
-	req_access_txt = "1"
+	name = "Cell 2"
 	},
 /obj/structure/cable{
 	d1 = 4;
@@ -5079,10 +5077,9 @@
 /turf/open/floor/plating,
 /area/security/brig)
 "akT" = (
-/obj/machinery/door/window/brigdoor{
+/obj/machinery/door/window/brigdoor/security/cell{
 	id = "Cell 3";
-	name = "Cell 3";
-	req_access_txt = "1"
+	name = "Cell 3"
 	},
 /obj/structure/cable{
 	d1 = 4;
@@ -5179,10 +5176,9 @@
 /turf/open/floor/plating,
 /area/security/brig)
 "ala" = (
-/obj/machinery/door/window/brigdoor{
+/obj/machinery/door/window/brigdoor/security/cell{
 	id = "Cell 4";
-	name = "Cell 4";
-	req_access_txt = "1"
+	name = "Cell 4"
 	},
 /obj/structure/cable{
 	d1 = 4;
diff --git a/_maps/map_files/Cerestation/cerestation.dmm b/_maps/map_files/Cerestation/cerestation.dmm
index 3f7cf58f73..c4ce0014dd 100644
--- a/_maps/map_files/Cerestation/cerestation.dmm
+++ b/_maps/map_files/Cerestation/cerestation.dmm
@@ -2543,7 +2543,7 @@
 	},
 /area/ai_monitored/security/armory)
 "afz" = (
-/obj/machinery/door/window/brigdoor/northleft{
+/obj/machinery/door/window/brigdoor/security/cell/northleft{
 	id = "Cell 6";
 	name = "Cell Door 6"
 	},
@@ -3366,10 +3366,9 @@
 	},
 /area/security/prison)
 "agY" = (
-/obj/machinery/door/window/brigdoor/westleft{
+/obj/machinery/door/window/brigdoor/security/cell/westleft{
 	id = "Cell 4";
-	name = "Cell Door 4";
-	req_access_txt = "1"
+	name = "Cell Door 4"
 	},
 /turf/open/floor/plasteel/red{
 	baseturf = /turf/open/floor/plating/asteroid/airless
@@ -4891,7 +4890,7 @@
 	},
 /area/security/prison)
 "akf" = (
-/obj/machinery/door/window/brigdoor/eastleft{
+/obj/machinery/door/window/brigdoor/security/cell/eastleft{
 	id = "Cell 8";
 	name = "Cell Door 8"
 	},
@@ -6352,10 +6351,9 @@
 	},
 /area/security/prison)
 "amZ" = (
-/obj/machinery/door/window/brigdoor/eastleft{
+/obj/machinery/door/window/brigdoor/security/cell/eastleft{
 	id = "Cell 8";
-	name = "Cell Door 8";
-	req_access_txt = "1"
+	name = "Cell Door 8"
 	},
 /turf/open/floor/plasteel/red/side{
 	icon_state = "red";
@@ -7602,10 +7600,9 @@
 	},
 /area/security/prison)
 "apz" = (
-/obj/machinery/door/window/brigdoor/westleft{
+/obj/machinery/door/window/brigdoor/security/cell/westleft{
 	id = "Cell 2";
-	name = "Cell Door 2";
-	req_access_txt = "1"
+	name = "Cell Door 2"
 	},
 /turf/open/floor/plasteel/red{
 	baseturf = /turf/open/floor/plating/asteroid/airless
@@ -7654,7 +7651,7 @@
 	},
 /area/security/prison)
 "apD" = (
-/obj/machinery/door/window/brigdoor/eastleft{
+/obj/machinery/door/window/brigdoor/security/cell/eastleft{
 	id = "Cell 9";
 	name = "Cell Door 9"
 	},
@@ -8044,10 +8041,9 @@
 	},
 /area/quartermaster/miningdock)
 "aqu" = (
-/obj/machinery/door/window/brigdoor/westleft{
+/obj/machinery/door/window/brigdoor/security/cell/westleft{
 	id = "Cell 3";
-	name = "Cell Door 3";
-	req_access_txt = "1"
+	name = "Cell Door 3"
 	},
 /turf/open/floor/plasteel/red/side{
 	icon_state = "red";
@@ -8110,10 +8106,9 @@
 	},
 /area/security/warden)
 "aqB" = (
-/obj/machinery/door/window/brigdoor/eastleft{
+/obj/machinery/door/window/brigdoor/security/cell/eastleft{
 	id = "Cell 7";
-	name = "Cell Door 7";
-	req_one_access_txt = "1"
+	name = "Cell Door 7"
 	},
 /turf/open/floor/plasteel/red/side{
 	icon_state = "red";
@@ -10024,10 +10019,9 @@
 	},
 /area/security/armory)
 "auu" = (
-/obj/machinery/door/window/brigdoor/westleft{
+/obj/machinery/door/window/brigdoor/security/cell/westleft{
 	id = "Cell 2";
-	name = "Cell Door 2";
-	req_access_txt = "1"
+	name = "Cell Door 2"
 	},
 /turf/open/floor/plasteel/red/side{
 	icon_state = "red";
@@ -10071,10 +10065,9 @@
 	},
 /area/security/warden)
 "auy" = (
-/obj/machinery/door/window/brigdoor/eastleft{
+/obj/machinery/door/window/brigdoor/security/cell/eastleft{
 	id = "Cell 6";
-	name = "Cell Door 6";
-	req_access_txt = "1"
+	name = "Cell Door 6"
 	},
 /turf/open/floor/plasteel/red/side{
 	icon_state = "red";
@@ -12397,10 +12390,9 @@
 	},
 /area/security/brig)
 "azj" = (
-/obj/machinery/door/window/brigdoor/westleft{
+/obj/machinery/door/window/brigdoor/security/cell/westleft{
 	id = "Cell 1";
-	name = "Cell Door 1";
-	req_access_txt = "1"
+	name = "Cell Door 1"
 	},
 /turf/open/floor/plasteel/red/side{
 	icon_state = "red";
@@ -72160,10 +72152,9 @@
 	},
 /area/quartermaster/sorting)
 "cEr" = (
-/obj/machinery/door/window/brigdoor/westleft{
+/obj/machinery/door/window/brigdoor/security/cell/westleft{
 	id = "Cell 3";
-	name = "Cell Door 3";
-	req_access_txt = "1"
+	name = "Cell Door 3"
 	},
 /turf/open/floor/plasteel/red{
 	baseturf = /turf/open/floor/plating/asteroid/airless
@@ -73586,9 +73577,8 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/obj/machinery/door/window/brigdoor{
-	name = "Holding Cell";
-	req_access_txt = "2"
+/obj/machinery/door/window/brigdoor/security/holding{
+	name = "Holding Cell"
 	},
 /turf/open/floor/plasteel{
 	baseturf = /turf/open/floor/plating/asteroid/airless
@@ -88013,7 +88003,7 @@
 	},
 /area/security/prison)
 "dmi" = (
-/obj/machinery/door/window/brigdoor/northleft{
+/obj/machinery/door/window/brigdoor/security/cell/northleft{
 	id = "Cell 5";
 	name = "Cell Door 5"
 	},
@@ -88432,7 +88422,7 @@
 	},
 /area/security/prison)
 "dnc" = (
-/obj/machinery/door/window/brigdoor/eastleft{
+/obj/machinery/door/window/brigdoor/security/cell/eastleft{
 	id = "Cell 7";
 	name = "Cell Door 7"
 	},
@@ -90911,10 +90901,9 @@
 	},
 /area/security/armory)
 "drT" = (
-/obj/machinery/door/window/brigdoor/westleft{
+/obj/machinery/door/window/brigdoor/security/cell/westleft{
 	id = "Cell 1";
-	name = "Cell Door 1";
-	req_access_txt = "1"
+	name = "Cell Door 1"
 	},
 /turf/open/floor/plasteel/red{
 	baseturf = /turf/open/floor/plating/asteroid/airless
@@ -90931,7 +90920,7 @@
 	},
 /area/security/prison)
 "drV" = (
-/obj/machinery/door/window/brigdoor/eastleft{
+/obj/machinery/door/window/brigdoor/security/cell/eastleft{
 	id = "Cell 10";
 	name = "Cell Door 10"
 	},
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 57eb6aa2ac..53e4296134 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -43257,10 +43257,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/door/window/brigdoor/westright{
+/obj/machinery/door/window/brigdoor/security/cell/westright{
 	id = "brig1";
-	name = "Cell 1";
-	req_access_txt = "2"
+	name = "Cell 1"
 	},
 /turf/open/floor/plasteel/red/side{
 	dir = 8
@@ -47264,10 +47263,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/door/window/brigdoor/westright{
+/obj/machinery/door/window/brigdoor/security/cell/westright{
 	id = "brig2";
-	name = "Cell 2";
-	req_access_txt = "2"
+	name = "Cell 2"
 	},
 /turf/open/floor/plasteel/red/side{
 	dir = 8
@@ -56006,9 +56004,8 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/door/window/brigdoor/westright{
-	name = "Holding Cell";
-	req_access_txt = "63"
+/obj/machinery/door/window/brigdoor/security/holding/westright{
+	name = "Holding Cell"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index c63e8b3f37..46c0a7b2fe 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -12890,10 +12890,9 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
-/obj/machinery/door/window/brigdoor{
+/obj/machinery/door/window/brigdoor/security/cell{
 	id = "Cell 1";
-	name = "Cell 1";
-	req_access_txt = "2"
+	name = "Cell 1"
 	},
 /turf/open/floor/plasteel/red/side,
 /area/security/brig)
@@ -12925,10 +12924,9 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
-/obj/machinery/door/window/brigdoor{
+/obj/machinery/door/window/brigdoor/security/cell{
 	id = "Cell 2";
-	name = "Cell 2";
-	req_access_txt = "2"
+	name = "Cell 2"
 	},
 /turf/open/floor/plasteel/red/side,
 /area/security/brig)
@@ -12948,10 +12946,9 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
-/obj/machinery/door/window/brigdoor{
+/obj/machinery/door/window/brigdoor/security/cell{
 	id = "Cell 3";
-	name = "Cell 3";
-	req_access_txt = "2"
+	name = "Cell 3"
 	},
 /turf/open/floor/plasteel/red/side,
 /area/security/brig)
@@ -13009,10 +13006,9 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
-/obj/machinery/door/window/brigdoor{
+/obj/machinery/door/window/brigdoor/security/holding{
 	id = "Holding Cell";
-	name = "Holding Cell";
-	req_access_txt = "2"
+	name = "Holding Cell"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/red/side,
diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index a14cc8ac17..f54273c0a0 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -6041,10 +6041,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/door/window/brigdoor/westright{
+/obj/machinery/door/window/brigdoor/security/cell/westright{
 	id = "brig1";
-	name = "Cell 1";
-	req_access_txt = "2"
+	name = "Cell 1"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -7949,10 +7948,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/door/window/brigdoor/westright{
+/obj/machinery/door/window/brigdoor/security/cell/westright{
 	id = "brig2";
-	name = "Cell 2";
-	req_access_txt = "2"
+	name = "Cell 2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 63475a027b..86ef84e751 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -7432,10 +7432,9 @@
 /turf/open/floor/plating,
 /area/security/brig)
 "aql" = (
-/obj/machinery/door/window/brigdoor{
+/obj/machinery/door/window/brigdoor/security/cell{
 	id = "Cell 1";
-	name = "Cell 1";
-	req_access_txt = "1"
+	name = "Cell 1"
 	},
 /obj/structure/cable{
 	d1 = 4;
@@ -7486,10 +7485,9 @@
 /turf/open/floor/plating,
 /area/security/brig)
 "aqp" = (
-/obj/machinery/door/window/brigdoor{
+/obj/machinery/door/window/brigdoor/security/cell{
 	id = "Cell 2";
-	name = "Cell 2";
-	req_access_txt = "1"
+	name = "Cell 2"
 	},
 /obj/structure/cable{
 	d1 = 4;
@@ -7507,10 +7505,9 @@
 /turf/closed/wall,
 /area/security/brig)
 "aqr" = (
-/obj/machinery/door/window/brigdoor{
+/obj/machinery/door/window/brigdoor/security/cell{
 	id = "Cell 3";
-	name = "Cell 3";
-	req_access_txt = "1"
+	name = "Cell 3"
 	},
 /obj/structure/cable{
 	d1 = 4;
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index 35d021e80c..9a8d2c2e3b 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -309,6 +309,15 @@
 	reinf = 1
 	explosion_block = 1
 
+/obj/machinery/door/window/brigdoor/security/cell
+	name = "cell door"
+	desc = "For keeping in criminal scum."
+	req_access = list(ACCESS_BRIG)
+
+/obj/machinery/door/window/brigdoor/security/holding
+	name = "holding cell door"
+	req_access = list(ACCESS_SEC_DOORS, ACCESS_LAWYER) //love for the lawyer
+
 /obj/machinery/door/window/clockwork
 	name = "brass windoor"
 	desc = "A thin door with translucent brass paneling."
@@ -423,3 +432,67 @@
 	dir = SOUTH
 	icon_state = "rightsecure"
 	base_state = "rightsecure"
+
+/obj/machinery/door/window/brigdoor/security/cell/northleft
+	dir = NORTH
+
+/obj/machinery/door/window/brigdoor/security/cell/eastleft
+	dir = EAST
+
+/obj/machinery/door/window/brigdoor/security/cell/westleft
+	dir = WEST
+
+/obj/machinery/door/window/brigdoor/security/cell/southleft
+	dir = SOUTH
+
+/obj/machinery/door/window/brigdoor/security/cell/northright
+	dir = NORTH
+	icon_state = "rightsecure"
+	base_state = "rightsecure"
+
+/obj/machinery/door/window/brigdoor/security/cell/eastright
+	dir = EAST
+	icon_state = "rightsecure"
+	base_state = "rightsecure"
+
+/obj/machinery/door/window/brigdoor/security/cell/westright
+	dir = WEST
+	icon_state = "rightsecure"
+	base_state = "rightsecure"
+
+/obj/machinery/door/window/brigdoor/security/cell/southright
+	dir = SOUTH
+	icon_state = "rightsecure"
+	base_state = "rightsecure"
+
+/obj/machinery/door/window/brigdoor/security/holding/northleft
+	dir = NORTH
+
+/obj/machinery/door/window/brigdoor/security/holding/eastleft
+	dir = EAST
+
+/obj/machinery/door/window/brigdoor/security/holding/westleft
+	dir = WEST
+
+/obj/machinery/door/window/brigdoor/security/holding/southleft
+	dir = SOUTH
+
+/obj/machinery/door/window/brigdoor/security/holding/northright
+	dir = NORTH
+	icon_state = "rightsecure"
+	base_state = "rightsecure"
+
+/obj/machinery/door/window/brigdoor/security/holding/eastright
+	dir = EAST
+	icon_state = "rightsecure"
+	base_state = "rightsecure"
+
+/obj/machinery/door/window/brigdoor/security/holding/westright
+	dir = WEST
+	icon_state = "rightsecure"
+	base_state = "rightsecure"
+
+/obj/machinery/door/window/brigdoor/security/holding/southright
+	dir = SOUTH
+	icon_state = "rightsecure"
+	base_state = "rightsecure"
\ No newline at end of file