mirror of
https://github.com/Sandstorm-Station/Sandstorm-Station-13.git
synced 2026-08-28 15:49:16 +01:00
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
This commit is contained in:
@@ -28,7 +28,7 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new)
|
||||
|
||||
/obj/machinery/keycard_auth/Initialize(mapload)
|
||||
. = ..()
|
||||
ev = GLOB.keycard_events.addEvent("triggerEvent", CALLBACK(src, .proc/triggerEvent))
|
||||
ev = GLOB.keycard_events.addEvent("triggerEvent", CALLBACK(src, PROC_REF(triggerEvent)))
|
||||
|
||||
/obj/machinery/keycard_auth/Destroy()
|
||||
GLOB.keycard_events.clearEvent("triggerEvent", ev)
|
||||
@@ -93,7 +93,7 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new)
|
||||
event = event_type
|
||||
waiting = 1
|
||||
GLOB.keycard_events.fireEvent("triggerEvent", src, trigger_id)
|
||||
addtimer(CALLBACK(src, .proc/eventSent), 20)
|
||||
addtimer(CALLBACK(src, PROC_REF(eventSent)), 20)
|
||||
|
||||
/obj/machinery/keycard_auth/proc/eventSent()
|
||||
triggerer = null
|
||||
@@ -104,7 +104,7 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new)
|
||||
icon_state = "auth_on"
|
||||
first_id = trigger_id
|
||||
event_source = source
|
||||
addtimer(CALLBACK(src, .proc/eventTriggered), 20)
|
||||
addtimer(CALLBACK(src, PROC_REF(eventTriggered)), 20)
|
||||
|
||||
/obj/machinery/keycard_auth/proc/eventTriggered()
|
||||
icon_state = "auth_off"
|
||||
|
||||
Reference in New Issue
Block a user