This commit is contained in:
silicons
2020-07-23 09:32:28 -07:00
parent 703afec454
commit 99eb77c052
7 changed files with 19 additions and 20 deletions
+2 -2
View File
@@ -144,7 +144,7 @@
var/attack_hand_speed = CLICK_CD_MELEE
/// Amount of time to hard stagger (no clicking at all) the mob post attack_hand(). Lower = better
var/attack_hand_unwieldlyness = 0
/// Should we set last action for attack hand?
/// Should we set last action for attack hand? This implies that attack_hands to this atom should flush to clickdelay buffers instead of discarding.
var/attack_hand_is_action = FALSE
/obj/item
@@ -170,7 +170,7 @@
* Called after a successful attack to set a mob's clickdelay.
*/
/obj/item/proc/ApplyAttackCooldown(mob/user, atom/target)
user.DelayNextAction(attack_unwieldlyness, clickdelay_mod_bypass, FALSE)
user.DelayNextAction(attack_unwieldlyness, clickdelay_mod_bypass)
/**
* Get estimated time that a user has to not attack for to use us
+1 -1
View File
@@ -676,7 +676,7 @@
..(pressure_difference, direction, pressure_resistance_prob_delta)
/mob/living/can_resist()
return !(CheckResistCooldown() || !CHECK_MOBILITY(src, MOBILITY_RESIST))
return !CheckResistCooldown() && CHECK_MOBILITY(src, MOBILITY_RESIST)
/// Resist verb for attempting to get out of whatever is restraining your motion. Gives you resist clickdelay if do_resist() returns true.
/mob/living/verb/resist()
+1
View File
@@ -14,6 +14,7 @@
attack_hand_is_action = TRUE
attack_hand_unwieldlyness = CLICK_CD_MELEE
attack_hand_speed = 0
/// What receives our keyboard input. src by default.
var/datum/focus