From 00a21c94f8be6732018f1805f9c1b5509a156b80 Mon Sep 17 00:00:00 2001 From: ninjanomnom Date: Tue, 19 Dec 2017 16:27:06 -0500 Subject: [PATCH] renames define to UNIQUE_PASSARGS --- code/__DEFINES/components.dm | 2 +- code/datums/components/README.md | 2 +- code/datums/components/_component.dm | 2 +- code/datums/components/radioactive.dm | 2 +- code/datums/components/thermite.dm | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/__DEFINES/components.dm b/code/__DEFINES/components.dm index 48d5f352e80..3912ed6a43b 100644 --- a/code/__DEFINES/components.dm +++ b/code/__DEFINES/components.dm @@ -9,7 +9,7 @@ #define COMPONENT_DUPE_HIGHLANDER 0 //old component is deleted (default) #define COMPONENT_DUPE_ALLOWED 1 //duplicates allowed #define COMPONENT_DUPE_UNIQUE 2 //new component is deleted -#define COMPONENT_DUPE_INSTANCELESS 4 //old component is given the initialization args of the new +#define COMPONENT_DUPE_UNIQUE_PASSARGS 4 //old component is given the initialization args of the new // All signals. Format: // When the signal is called: (signal arguments) diff --git a/code/datums/components/README.md b/code/datums/components/README.md index b3ebd9f6c24..026b387e270 100644 --- a/code/datums/components/README.md +++ b/code/datums/components/README.md @@ -40,7 +40,7 @@ Stands have a lot of procs which mimic mob procs. Rather than inserting hooks fo * `COMPONENT_DUPE_HIGHLANDER` (default): Old component will be deleted, new component will first have `/datum/component/proc/InheritComponent(datum/component/old, FALSE)` on it * `COMPONENT_DUPE_ALLOWED`: The components will be treated as separate, `GetComponent()` will return the first added * `COMPONENT_DUPE_UNIQUE`: New component will be deleted, old component will first have `/datum/component/proc/InheritComponent(datum/component/new, TRUE)` on it - * `COMPONENT_DUPE_INSTANCELESS`: New component will never exist and instead its initialization arguments will be passed on to the old component. + * `COMPONENT_DUPE_UNIQUE_PASSARGS`: New component will never exist and instead its initialization arguments will be passed on to the old component. 1. `/datum/component/var/dupe_type` (protected, type) * Definition of a duplicate component type * `null` means exact match on `type` (default) diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm index afb5b2191e9..fcd46514592 100644 --- a/code/datums/components/_component.dm +++ b/code/datums/components/_component.dm @@ -212,7 +212,7 @@ if(!QDELETED(new_comp)) new_comp.InheritComponent(old_comp, FALSE) qdel(old_comp) - if(COMPONENT_DUPE_INSTANCELESS) + if(COMPONENT_DUPE_UNIQUE_PASSARGS) if(!new_comp) var/list/arguments = args.Copy(2) old_comp.InheritComponent(null, TRUE, arguments) diff --git a/code/datums/components/radioactive.dm b/code/datums/components/radioactive.dm index 70426a5938f..fc0456ad10e 100644 --- a/code/datums/components/radioactive.dm +++ b/code/datums/components/radioactive.dm @@ -4,7 +4,7 @@ #define RAD_AMOUNT_EXTREME 1000 /datum/component/radioactive - dupe_mode = COMPONENT_DUPE_INSTANCELESS + dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS var/source diff --git a/code/datums/components/thermite.dm b/code/datums/components/thermite.dm index 453555d21d5..11611cadfb5 100644 --- a/code/datums/components/thermite.dm +++ b/code/datums/components/thermite.dm @@ -1,5 +1,5 @@ /datum/component/thermite - dupe_mode = COMPONENT_DUPE_INSTANCELESS + dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS var/amount var/overlay