mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-13 09:05:11 +01:00
Merge pull request #4327 from Aranclanos/clickcooldowndefine
Defines for click cooldown numbers and click cooldown for paper camera spam.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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.")
|
||||
|
||||
Reference in New Issue
Block a user