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

Merge pull request #7159 from Citadel-Station-13/upstream-merge-38542

Browse Source 
[MIRROR] Some minor cleanup to RegisterSignal
This commit is contained in:
LetterJay
2018-06-18 12:28:11 -05:00
committed by GitHub
parent e79c48256c 2939115cfb
commit 119fb6abf6
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/datums/components/_component.dm
View File

@@ -85,15 +85,14 @@
procs = list()
signal_procs = procs
if(!istype(proc_or_callback, /datum/callback)) //if it wasnt a callback before, it is now
proc_or_callback = CALLBACK(src, proc_or_callback)
var/list/sig_types = islist(sig_type_or_types) ? sig_type_or_types : list(sig_type_or_types)
for(var/sig_type in sig_types)
if(!override)
. = procs[sig_type]
if(.)
stack_trace("[sig_type] overridden. Use override = TRUE to suppress this warning")
if(!override && procs[sig_type])
stack_trace("[sig_type] overridden. Use override = TRUE to suppress this warning")
if(!istype(proc_or_callback, /datum/callback)) //if it wasnt a callback before, it is now
proc_or_callback = CALLBACK(src, proc_or_callback)
procs[sig_type] = proc_or_callback
enabled = TRUE