manual sync with upstream

This commit is contained in:
deathride58
2018-05-31 01:45:40 -04:00
parent 327d80d856
commit 3cf4f70f3d
395 changed files with 332843 additions and 19237 deletions
@@ -132,7 +132,7 @@
/obj/machinery/keycard_auth/proc/broadcast_request()
icon_state = "auth_on"
for(var/obj/machinery/keycard_auth/KA in world)
for(var/obj/machinery/keycard_auth/KA in machines)
if(KA == src) continue
KA.reset()
spawn()