From a3a4ecffbefe3de76e7421a7a8caf43d9ce1386a Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 24 Jun 2018 15:08:37 -0500 Subject: [PATCH] Update components.dm --- code/__DEFINES/components.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/__DEFINES/components.dm b/code/__DEFINES/components.dm index cade3d1ef3..7c00573089 100644 --- a/code/__DEFINES/components.dm +++ b/code/__DEFINES/components.dm @@ -1,10 +1,6 @@ -<<<<<<< HEAD -======= #define SEND_SIGNAL(target, sigtype, arguments...) ( !target.datum_components ? NONE : target._SendSignal(sigtype, list(##arguments)) ) #define SEND_GLOBAL_SIGNAL(sigtype, arguments...) ( !SSdcs.comp_lookup[sigtype] ? NONE : SSdcs._SendGlobalSignal(sigtype, list(##arguments)) ) - ->>>>>>> 84a85a5... Merge pull request #38574 from ninjanomnom/glob-signals //shorthand #define GET_COMPONENT_FROM(varname, path, target) var##path/##varname = ##target.GetComponent(##path) #define GET_COMPONENT(varname, path) GET_COMPONENT_FROM(varname, path, src)