From d1d8687a63771845b286773aa2349877b0a6b115 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sun, 24 Dec 2017 13:56:50 -0500 Subject: [PATCH 1/2] Merge pull request #33765 from MoreRobustThanYou/patch-33 Make airlocks use VARSET_CALLBACK --- code/game/machinery/doors/airlock.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 775c9dd894..3d659f104b 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -251,16 +251,13 @@ note = null update_icon() -/obj/machinery/door/airlock/proc/unzap() //for addtimer - justzap = FALSE - /obj/machinery/door/airlock/bumpopen(mob/living/user) //Airlocks now zap you when you 'bump' them open when they're electrified. --NeoFite if(!issilicon(usr)) if(isElectrified()) if(!justzap) if(shock(user, 100)) justzap = TRUE - addtimer(CALLBACK(src, .proc/unzap), 10) + addtimer(VARSET_CALLBACK(src, justzap, FALSE) , 10) return else return