From 6e07981e67a3828f5ba2a84fdf70e0d9bd77ca8c Mon Sep 17 00:00:00 2001 From: Chinsky Date: Thu, 10 Oct 2013 14:14:48 +0400 Subject: [PATCH 1/2] Applied Arancalos fix for firedoors, no more process for them --- code/game/machinery/doors/firedoor.dm | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index e22b1ce804d..b4ba1064e18 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -70,6 +70,7 @@ power_change() if(powered(ENVIRON)) stat &= ~NOPOWER + latetoggle() else stat |= NOPOWER return @@ -197,19 +198,27 @@ nextstate = CLOSED - process() + latetoggle() if(operating || stat & NOPOWER || !nextstate) return switch(nextstate) if(OPEN) - spawn() - open() + nextstate = null + open() if(CLOSED) - spawn() - close() - nextstate = null + nextstate = null + close() return + open() + ..() + latetoggle() + return + + close() + ..() + latetoggle() + return do_animate(animation) switch(animation) From 032d69742ff3347fb840d9a177c78552fe71dc19 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Thu, 10 Oct 2013 14:46:22 +0400 Subject: [PATCH 2/2] Derp --- code/game/machinery/doors/firedoor.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index b4ba1064e18..81a4ea8ffb0 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -198,7 +198,7 @@ nextstate = CLOSED - latetoggle() + proc/latetoggle() if(operating || stat & NOPOWER || !nextstate) return switch(nextstate) @@ -285,4 +285,4 @@ /obj/machinery/door/firedoor/multi_tile icon = 'icons/obj/doors/DoorHazard2x1.dmi' - width = 2 \ No newline at end of file + width = 2