From 0c6368e3e791af9cf90c886618c2fb9d7354d1b2 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Sat, 18 Jul 2020 18:34:16 -0700
Subject: [PATCH] e

---
 code/_onclick/item_attack.dm   | 2 +-
 code/modules/mob/clickdelay.dm | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index f0667c71f1..c26b35616f 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -21,7 +21,7 @@
 		return
 	if(QDELETED(src) || QDELETED(target))
 		return
-	PostattackClickdelaySet(user, target))
+	PostattackClickdelaySet(user, target)
 	afterattack(target, user, TRUE, params)
 
 /// Like melee_attack_chain but for ranged.
diff --git a/code/modules/mob/clickdelay.dm b/code/modules/mob/clickdelay.dm
index 513bafaa32..20eb72be4a 100644
--- a/code/modules/mob/clickdelay.dm
+++ b/code/modules/mob/clickdelay.dm
@@ -73,6 +73,8 @@
 	var/clickdelay_from_next_action = FALSE
 	/// This item ignores next action delays.
 	var/clickdelay_ignores_next_action = FALSE
+	/// This item sets clickdelay in preattack rather than post attack. This means it's set in a melee attack even if the user doesn't bash or bop it against something.
+	var/clickdelay_set_on_pre_attack = FALSE
 
 /**
   * Checks if a user's clickdelay is met for a standard attack
@@ -84,7 +86,8 @@
   * Called if check is successful before the attack happens.
   */
 /obj/item/proc/PreattackClickdelaySet(mob/user, atom/target)
-	user.DelayNextAction(0, FALSe, TRUE)
+	if(clickdelay_set_on_pre_attack)
+		user.DelayNextAction(0, FALSe, TRUE)
 
 /**
   * Called after a successful attack to set a mob's clickdelay.