procs
This commit is contained in:
@@ -43,7 +43,7 @@
|
||||
var/mob/living/carbon/P = parent
|
||||
to_chat(P, "<span class='notice'>You are now able to launch tackles! You can do so by activating throw intent, and clicking on your target with an empty hand.</span>")
|
||||
P.tackling = TRUE
|
||||
addtimer(CALLBACK(src, .proc/resetTackle), base_knockdown, TIMER_STOPPABLE)
|
||||
addtimer(CALLBACK(src, PROC_REF(resetTackle)), base_knockdown, TIMER_STOPPABLE)
|
||||
|
||||
/datum/component/tackler/Destroy()
|
||||
var/mob/living/carbon/P = parent
|
||||
@@ -52,9 +52,9 @@
|
||||
..()
|
||||
|
||||
/datum/component/tackler/RegisterWithParent()
|
||||
RegisterSignal(parent, COMSIG_MOB_CLICKON, .proc/checkTackle)
|
||||
RegisterSignal(parent, COMSIG_MOVABLE_IMPACT, .proc/sack)
|
||||
RegisterSignal(parent, COMSIG_MOVABLE_POST_THROW, .proc/registerTackle)
|
||||
RegisterSignal(parent, COMSIG_MOB_CLICKON, PROC_REF(checkTackle))
|
||||
RegisterSignal(parent, COMSIG_MOVABLE_IMPACT, PROC_REF(sack))
|
||||
RegisterSignal(parent, COMSIG_MOVABLE_POST_THROW, PROC_REF(registerTackle))
|
||||
|
||||
/datum/component/tackler/UnregisterFromParent()
|
||||
UnregisterSignal(parent, list(COMSIG_MOB_CLICKON, COMSIG_MOVABLE_IMPACT, COMSIG_MOVABLE_MOVED, COMSIG_MOVABLE_POST_THROW))
|
||||
@@ -105,7 +105,7 @@
|
||||
return
|
||||
|
||||
user.tackling = TRUE
|
||||
RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/checkObstacle)
|
||||
RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(checkObstacle))
|
||||
playsound(user, 'sound/weapons/thudswoosh.ogg', 40, TRUE, -1)
|
||||
|
||||
var/leap_word = iscatperson(user) ? "pounce" : "leap" ///If cat, "pounce" instead of "leap".
|
||||
@@ -121,7 +121,7 @@
|
||||
user.adjustStaminaLoss(stamina_cost)
|
||||
user.throw_at(A, range, speed, user, FALSE)
|
||||
user.toggle_throw_mode()
|
||||
addtimer(CALLBACK(src, .proc/resetTackle), base_knockdown, TIMER_STOPPABLE)
|
||||
addtimer(CALLBACK(src, PROC_REF(resetTackle)), base_knockdown, TIMER_STOPPABLE)
|
||||
return(COMSIG_MOB_CANCEL_CLICKON)
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user