cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

renames define to UNIQUE_PASSARGS

Browse Source
This commit is contained in:
ninjanomnom
2017-12-19 16:27:06 -05:00
parent a93b957cb5
commit 00a21c94f8
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/__DEFINES/components.dm
View File

@@ -9,7 +9,7 @@
#define COMPONENT_DUPE_HIGHLANDER 0 //old component is deleted (default) #define COMPONENT_DUPE_HIGHLANDER 0 //old component is deleted (default)
#define COMPONENT_DUPE_ALLOWED 1 //duplicates allowed #define COMPONENT_DUPE_ALLOWED 1 //duplicates allowed
#define COMPONENT_DUPE_UNIQUE 2 //new component is deleted #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: // All signals. Format:
// When the signal is called: (signal arguments) // When the signal is called: (signal arguments)

2
code/datums/components/README.md
View File

@@ -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_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_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_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) 1. `/datum/component/var/dupe_type` (protected, type)
* Definition of a duplicate component type * Definition of a duplicate component type
* `null` means exact match on `type` (default) * `null` means exact match on `type` (default)

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

@@ -212,7 +212,7 @@
if(!QDELETED(new_comp)) if(!QDELETED(new_comp))
new_comp.InheritComponent(old_comp, FALSE) new_comp.InheritComponent(old_comp, FALSE)
qdel(old_comp) qdel(old_comp)
if(COMPONENT_DUPE_INSTANCELESS) if(COMPONENT_DUPE_UNIQUE_PASSARGS)
if(!new_comp) if(!new_comp)
var/list/arguments = args.Copy(2) var/list/arguments = args.Copy(2)
old_comp.InheritComponent(null, TRUE, arguments) old_comp.InheritComponent(null, TRUE, arguments)

2
code/datums/components/radioactive.dm
View File

@@ -4,7 +4,7 @@
#define RAD_AMOUNT_EXTREME 1000 #define RAD_AMOUNT_EXTREME 1000
/datum/component/radioactive /datum/component/radioactive
dupe_mode = COMPONENT_DUPE_INSTANCELESS dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
var/source var/source

2
code/datums/components/thermite.dm
View File

@@ -1,5 +1,5 @@
/datum/component/thermite /datum/component/thermite
dupe_mode = COMPONENT_DUPE_INSTANCELESS dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
var/amount var/amount
var/overlay var/overlay