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

Removes ComponentActivated in favor of callbacks

Browse Source
This commit is contained in:
Jordan Brown
2017-12-05 15:42:47 -06:00
committed by CitadelStationBot
parent a6aa181161
commit e1f658a50d
14 changed files with 190 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/slippery.dm
+5 -8
View File
@@ -1,18 +1,15 @@
/datum/component/slippery
var/intensity
var/lube_flags
var/mob/slip_victim
var/datum/callback/callback
/datum/component/slippery/Initialize(_intensity, _lube_flags = NONE)
/datum/component/slippery/Initialize(_intensity, _lube_flags = NONE, datum/callback/_callback)
intensity = max(_intensity, 0)
lube_flags = _lube_flags
callback = _callback
RegisterSignal(list(COMSIG_MOVABLE_CROSSED, COMSIG_ATOM_ENTERED), .proc/Slip)
/datum/component/slippery/proc/Slip(atom/movable/AM)
var/mob/victim = AM
if(istype(victim) && !victim.is_flying() && victim.slip(intensity, parent, lube_flags))
slip_victim = victim
return COMPONENT_ACTIVATED
/datum/component/slippery/AfterComponentActivated()
slip_victim = null
if(istype(victim) && !victim.is_flying() && victim.slip(intensity, parent, lube_flags) && callback)
callback.Invoke(victim)