From 38ffd7306bb07419cbd86e4fd621dca0ce2750d2 Mon Sep 17 00:00:00 2001 From: HarpyEagle Date: Sun, 17 Apr 2016 02:38:43 -0400 Subject: [PATCH] Adds click cooldowns for attacking non-mob atoms for various mob types --- code/_onclick/other_mobs.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm index 95c77d6708..c0a0cac8b3 100644 --- a/code/_onclick/other_mobs.dm +++ b/code/_onclick/other_mobs.dm @@ -55,6 +55,7 @@ if(!..()) return 0 + setClickCooldown(DEFAULT_ATTACK_COOLDOWN) A.attack_generic(src,rand(5,6),"bitten") /* @@ -76,6 +77,9 @@ Feedstop() return + //should have already been set if we are attacking a mob, but it doesn't hurt and will cover attacking non-mobs too + setClickCooldown(DEFAULT_ATTACK_COOLDOWN) + var/mob/living/M = A if (istype(M)) @@ -144,6 +148,7 @@ custom_emote(1,"[friendly] [A]!") return + setClickCooldown(DEFAULT_ATTACK_COOLDOWN) var/damage = rand(melee_damage_lower, melee_damage_upper) if(A.attack_generic(src,damage,attacktext,environment_smash) && loc && attack_sound) playsound(loc, attack_sound, 50, 1, 1)