From 9d08a88d10f7deca2c2d7ec769b8f6ee7152ef4e Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Mon, 17 Jul 2017 07:51:17 -0400 Subject: [PATCH] Made cell / holding cell windoors their own subtype (#29293) --- _maps/map_files/BoxStation/BoxStation.dmm | 20 ++--- _maps/map_files/Cerestation/cerestation.dmm | 67 +++++++---------- .../map_files/Deltastation/DeltaStation2.dmm | 15 ++-- _maps/map_files/MetaStation/MetaStation.dmm | 20 ++--- _maps/map_files/OmegaStation/OmegaStation.dmm | 10 +-- _maps/map_files/PubbyStation/PubbyStation.dmm | 15 ++-- code/game/machinery/doors/windowdoor.dm | 73 +++++++++++++++++++ 7 files changed, 133 insertions(+), 87 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index e36ddc39052..7ec0dac07e2 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -5011,10 +5011,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; @@ -5046,10 +5045,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; @@ -5073,10 +5071,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; @@ -5173,10 +5170,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 2e62e3156f3..287c280d1ae 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"; @@ -72136,10 +72128,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 @@ -73562,9 +73553,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 @@ -87989,7 +87979,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" }, @@ -88408,7 +88398,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" }, @@ -90886,10 +90876,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 @@ -90906,7 +90895,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 0fc89570d32..d6357cc5583 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -43216,10 +43216,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 @@ -47207,10 +47206,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 @@ -55946,9 +55944,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 074db03b26b..9fb29795ae4 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -12881,10 +12881,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) @@ -12916,10 +12915,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) @@ -12939,10 +12937,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) @@ -13000,10 +12997,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 6d5ada79b17..e97cf55a3bb 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -6031,10 +6031,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 @@ -7939,10 +7938,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 4d027893039..3debe76dcaf 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -7422,10 +7422,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; @@ -7476,10 +7475,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; @@ -7497,10 +7495,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 35d021e80cb..9a8d2c2e3ba 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