Merge pull request #4327 from Aranclanos/clickcooldowndefine

Defines for click cooldown numbers and click cooldown for paper camera spam.
This commit is contained in:
Alex
2014-08-05 10:22:52 +01:00
21 changed files with 51 additions and 45 deletions
@@ -398,7 +398,7 @@
if(istype(O, /obj/item/weapon/kitchenknife) || istype(O, /obj/item/weapon/butch))
harvest()
else
user.changeNext_move(8)
user.changeNext_move(CLICK_CD_MELEE)
if(O.force)
if(O.force >= force_threshold)
var/damage = O.force