Fixes missing cooldowns, missing cult blade sound.

Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
This commit is contained in:
mwerezak
2015-09-09 15:13:30 -04:00
committed by HarpyEagle
parent deb215d262
commit 4951790b50
21 changed files with 53 additions and 49 deletions
@@ -37,6 +37,8 @@
user << "<span class='danger'>You cannot inject a robotic limb.</span>"
return
user.setClickCooldown(DEFAULT_QUICK_COOLDOWN)
user.do_attack_animation(M)
user << "<span class='notice'>You inject [M] with [src].</span>"
M << "<span class='notice'>You feel a tiny prick!</span>"
@@ -176,6 +176,9 @@
else
user.visible_message("<span class='warning'>[user] begins hunting for an injection port on [target]'s suit!</span>")
user.setClickCooldown(DEFAULT_QUICK_COOLDOWN)
user.do_attack_animation(target)
if(!do_mob(user, target, injtime))
return