Merge pull request #10829 from Ghommie/Ghommie-cit544

Fixed and brutalized clown op slippery weapons a little.
This commit is contained in:
kevinz000
2020-02-02 03:16:23 -07:00
committed by GitHub
7 changed files with 62 additions and 61 deletions
+3 -2
View File
@@ -9,7 +9,8 @@
callback = _callback
RegisterSignal(parent, list(COMSIG_MOVABLE_CROSSED, COMSIG_ATOM_ENTERED), .proc/Slip)
/datum/component/slippery/proc/Slip(datum/source, atom/movable/AM)
/datum/component/slippery/proc/Slip(datum/source, atom/movable/AM, extra_flags = NONE)
var/mob/victim = AM
if(istype(victim) && !victim.is_flying() && victim.slip(intensity, parent, lube_flags) && callback)
var/lube = lube_flags | extra_flags
if(istype(victim) && victim.slip(intensity, parent, lube) && callback)
callback.Invoke(victim)