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

component fixes.

Browse Source
This commit is contained in:
Ghommie
2019-07-08 15:09:18 +02:00
parent 9043402483
commit 2af4cfa0ce
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/bouncy.dm
+11 -7
View File
@@ -6,15 +6,19 @@
/datum/component/bouncy/Initialize(_bouncy_mod, list/_bounce_signals) /datum/component/bouncy/Initialize(_bouncy_mod, list/_bounce_signals)
if(!ismovableatom(parent)) if(!ismovableatom(parent))
return COMPONENT_INCOMPATIBLE return COMPONENT_INCOMPATIBLE
bouncy_mod = _bouncy_mod if(_bouncy_mod)
bounce_signals = _bounce_signals bouncy_mod = _bouncy_mod
if(_bounce_signals)
bounce_signals = _bounce_signals
/datum/component/bouncy/InheritComponent(datum/component/bouncy/B, original, _bouncy_mod, list/_bounce_signals) /datum/component/bouncy/InheritComponent(datum/component/bouncy/B, original, _bouncy_mod, list/_bounce_signals)
bouncy_mod = max(bouncy_mod, _bouncy_mod) if(_bouncy_mod)
var/list/diff_bounces = difflist(bounce_signals, _bounce_signals, TRUE) bouncy_mod = max(bouncy_mod, _bouncy_mod)
for(var/bounce in diff_bounces) if(_bounce_signals)
bounce_signals += bounce var/list/diff_bounces = difflist(bounce_signals, _bounce_signals, TRUE)
RegisterSignal(parent, bounce, .proc/bounce_up) for(var/bounce in diff_bounces)
bounce_signals += bounce
RegisterSignal(parent, bounce, .proc/bounce_up)
/datum/component/bouncy/RegisterWithParent() /datum/component/bouncy/RegisterWithParent()
RegisterSignal(parent, bounce_signals, .proc/bounce_up) RegisterSignal(parent, bounce_signals, .proc/bounce_up)