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
+1 -1
View File
@@ -248,7 +248,7 @@
/obj/effect/spacevine/attackby(obj/item/weapon/W as obj, mob/user as mob)
if (!W || !user || !W.type) return
user.changeNext_move(8)
user.changeNext_move(CLICK_CD_MELEE)
var/override = 0
@@ -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
+1 -1
View File
@@ -10,7 +10,7 @@
return 0
if(i > 1)
newshot()
user.changeNext_move(4)
user.changeNext_move(CLICK_CD_RANGE)
update_icon()
return 1
@@ -57,7 +57,7 @@
qdel(D)
playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)
user.changeNext_move(4)
user.changeNext_move(CLICK_CD_RANGE)
if(reagents.has_reagent("sacid"))
message_admins("[key_name_admin(user)] fired sulphuric acid from \a [src].")
@@ -217,7 +217,7 @@
qdel(D)
playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)
user.changeNext_move(4)
user.changeNext_move(CLICK_CD_RANGE)
if(reagents.has_reagent("sacid"))
message_admins("[key_name_admin(user)] fired sulphuric acid from a chem sprayer.")