From 0afaf6794c8163c0f3d8aa94f4bdd7ebd479e34a Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Fri, 6 Mar 2020 07:21:52 -0700
Subject: [PATCH 1/2] Update stunbaton.dm

---
 code/game/objects/items/stunbaton.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm
index 78ba6d4f5f..52f628b240 100644
--- a/code/game/objects/items/stunbaton.dm
+++ b/code/game/objects/items/stunbaton.dm
@@ -161,7 +161,7 @@
 		if(check_martial_counter(L, user))
 			return TRUE
 	if(status)
-		if(baton_stun(M, user, disarming))
+		if(baton_stun(M, user, disarming || (user.a_intent == INTENT_DISARM)))
 			user.do_attack_animation(M)
 			user.adjustStaminaLossBuffered(getweight())		//CIT CHANGE - makes stunbatonning others cost stamina
 	else if(user.a_intent != INTENT_HARM)			//they'll try to bash in the last proc.

From c2822dd885b91ac1284ceb77f8c86d9980374018 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Fri, 6 Mar 2020 07:23:29 -0700
Subject: [PATCH 2/2] Update stunbaton.dm

---
 code/game/objects/items/stunbaton.dm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm
index 52f628b240..3079c3cad9 100644
--- a/code/game/objects/items/stunbaton.dm
+++ b/code/game/objects/items/stunbaton.dm
@@ -25,7 +25,7 @@
 
 /obj/item/melee/baton/examine(mob/user)
 	. = ..()
-	. += "<span class='notice'>Right click attack while in combat mode to disarm instead of stun.</span>"
+	. += "<span class='notice'>Right click attack while in combat mode or attack while in disarm intent to disarm instead of stun.</span>"
 
 /obj/item/melee/baton/get_cell()
 	. = cell
@@ -149,6 +149,8 @@
 
 //return TRUE to interrupt attack chain.
 /obj/item/melee/baton/proc/common_baton_melee(mob/M, mob/living/user, disarming = FALSE)
+	if(user.a_intent == INTENT_DISARM)
+		disarming = TRUE			//override if they're in disarm intent.
 	if(iscyborg(M) || !isliving(M))		//can't baton cyborgs
 		return FALSE
 	if(status && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
@@ -161,7 +163,7 @@
 		if(check_martial_counter(L, user))
 			return TRUE
 	if(status)
-		if(baton_stun(M, user, disarming || (user.a_intent == INTENT_DISARM)))
+		if(baton_stun(M, user, disarming))
 			user.do_attack_animation(M)
 			user.adjustStaminaLossBuffered(getweight())		//CIT CHANGE - makes stunbatonning others cost stamina
 	else if(user.a_intent != INTENT_HARM)			//they'll try to bash in the last proc.