From 548d498a5edd048d338ae6272fa846b162a25c23 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sun, 17 Jun 2018 20:30:48 -0400 Subject: [PATCH 1/2] Merge pull request #38542 from ninjanomnom/do-you-have-a-callback-license Some minor cleanup to RegisterSignal --- code/datums/components/_component.dm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm index 20e42345fa..bfd6f5a5de 100644 --- a/code/datums/components/_component.dm +++ b/code/datums/components/_component.dm @@ -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