From 2a29f73ac80cb4bef2511a9f2de01a9e29ea1909 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Sat, 25 Jul 2020 17:34:12 -0700
Subject: [PATCH] ok

---
 code/game/objects/items/melee/misc.dm | 1 +
 code/game/objects/items/stunbaton.dm  | 1 +
 code/modules/projectiles/gun.dm       | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index 02f7f735eb..9a7d455df6 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -375,6 +375,7 @@
 			var/wait_desc = get_wait_description()
 			if(wait_desc)
 				to_chat(user, wait_desc)
+			return DISCARD_LAST_ACTION
 
 /obj/item/melee/classic_baton/telescopic
 	name = "telescopic baton"
diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm
index d5c554a601..c9526a5fc9 100644
--- a/code/game/objects/items/stunbaton.dm
+++ b/code/game/objects/items/stunbaton.dm
@@ -162,6 +162,7 @@
 			return TRUE
 	if(turned_on)
 		if(baton_stun(M, user, disarming))
+			user.DelayNextAction()
 			user.do_attack_animation(M)
 			user.adjustStaminaLossBuffered(getweight(user, STAM_COST_BATON_MOB_MULT))
 	else if(user.a_intent != INTENT_HARM)			//they'll try to bash in the last proc.
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 1015d0a54d..7c726d43e9 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -218,6 +218,8 @@
 		to_chat(user, "<span class='userdanger'>You need both hands free to fire \the [src]!</span>")
 		return
 
+	user.DelayNextAction()
+
 	//DUAL (or more!) WIELDING
 	var/bonus_spread = 0
 	var/loop_counter = 0