Skip to content

Commit

Permalink
[MIRROR] Tramstation Isolation cell doors actually open on their timer (
Browse files Browse the repository at this point in the history
#1853)

* Tramstation Isolation cell doors actually open on their timer (#81312)

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: PapaMichael <[email protected]>
  • Loading branch information
3 people authored Feb 7, 2024
1 parent 78f602b commit c6776da
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 7 deletions.
20 changes: 13 additions & 7 deletions _maps/map_files/tramstation/tramstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -11853,7 +11853,8 @@
dir = 4
},
/obj/machinery/door/airlock/security/glass{
name = "Isolation Cell C"
name = "Isolation Cell C";
id = "Isolation_C"
},
/obj/effect/mapping_helpers/airlock/access/all/security/brig,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
Expand Down Expand Up @@ -22002,7 +22003,8 @@
dir = 8
},
/obj/machinery/door/airlock/security/glass{
name = "Isolation Cell B"
name = "Isolation Cell B";
id = "Isolation_B"
},
/obj/effect/mapping_helpers/airlock/access/all/security/brig,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
Expand Down Expand Up @@ -26835,7 +26837,8 @@
dir = 8
},
/obj/machinery/door/airlock/security/glass{
name = "Isolation Cell D"
name = "Isolation Cell D";
id = "Isolation_D"
},
/obj/effect/mapping_helpers/airlock/access/all/security/brig,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
Expand Down Expand Up @@ -58742,12 +58745,13 @@
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
},
/obj/machinery/door/airlock/security/glass{
name = "Isolation Cell A"
},
/obj/effect/mapping_helpers/airlock/access/all/security/brig,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/door/airlock/security/glass{
name = "Isolation Cell A";
id = "Isolation_A"
},
/turf/open/floor/iron,
/area/station/security/execution/transfer)
"tJR" = (
Expand Down Expand Up @@ -69026,7 +69030,9 @@
/area/station/commons/fitness/recreation)
"xog" = (
/obj/machinery/door/airlock/security/glass{
name = "Isolation Wing"
name = "Isolation Wing";
unres_sensor = 1;
unres_sides = 8
},
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/trimline/red/filled/line,
Expand Down
1 change: 1 addition & 0 deletions code/game/machinery/doors/airlock.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1819,6 +1819,7 @@
/obj/machinery/door/airlock/security
name = "security airlock"
icon = 'icons/obj/doors/airlocks/station/security.dmi'
var/id = null
assemblytype = /obj/structure/door_assembly/door_assembly_sec
normal_integrity = 450

Expand Down
4 changes: 4 additions & 0 deletions code/game/machinery/doors/brigdoors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@
if (M.id == id)
doors += WEAKREF(M)

for(var/obj/machinery/door/airlock/security/M in urange(20, src))
if (M.id == id)
doors += WEAKREF(M)

for(var/obj/machinery/flasher/F in urange(20, src))
if(F.id == id)
flashers += WEAKREF(F)
Expand Down

0 comments on commit c6776da

Please sign in to comment.