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

Merge remote-tracking branch 'upstream/master' into TGUI_Next_Crafting

Browse Source
This commit is contained in:
Artur
2020-02-04 13:11:02 +01:00
parent ed60724a8e 8e44f98a83
commit 614a44ea18
123 changed files with 1014 additions and 1110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/slippery.dm
+2 -3
View File
@@ -9,8 +9,7 @@
callback = _callback
RegisterSignal(parent, list(COMSIG_MOVABLE_CROSSED, COMSIG_ATOM_ENTERED), .proc/Slip)
/datum/component/slippery/proc/Slip(datum/source, atom/movable/AM, extra_flags = NONE)
/datum/component/slippery/proc/Slip(datum/source, atom/movable/AM)
var/mob/victim = AM
var/lube = lube_flags | extra_flags
if(istype(victim) && victim.slip(intensity, parent, lube) && callback)
if(istype(victim) && victim.slip(intensity, parent, lube_flags) && callback)
callback.Invoke(victim)