shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4518 from Citadel-Station-13/upstream-merge-33765

Browse Source 
[MIRROR] Make airlocks use VARSET_CALLBACK
This commit is contained in:
LetterJay
2017-12-24 17:00:41 -06:00
committed by GitHub
parent 06354b97d9 cedbe20878
commit c99d847163
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/doors/airlock.dm
+1 -4
View File
@@ -251,16 +251,13 @@
note = null note = null
update_icon() 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 /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(!issilicon(usr))
if(isElectrified()) if(isElectrified())
if(!justzap) if(!justzap)
if(shock(user, 100)) if(shock(user, 100))
justzap = TRUE justzap = TRUE
addtimer(CALLBACK(src, .proc/unzap), 10) addtimer(VARSET_CALLBACK(src, justzap, FALSE) , 10)
return return
else else
return return