From d65566005a8261bcd2d64d12f3a2811e35670c2f Mon Sep 17 00:00:00 2001
From: Ghom <42542238+Ghommie@users.noreply.github.com>
Date: Mon, 20 Sep 2021 17:57:46 +0200
Subject: [PATCH] Fixes stun-harmbatong. (#61418)

Title. I have been told the refactor broke stun'n'harm batoning for stunbatons so I'm fixing it.
---
 code/game/objects/items/melee/baton.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/items/melee/baton.dm b/code/game/objects/items/melee/baton.dm
index 54b0ca0db81..e4699b273be 100644
--- a/code/game/objects/items/melee/baton.dm
+++ b/code/game/objects/items/melee/baton.dm
@@ -488,8 +488,8 @@
 	if(. != BATON_DO_NORMAL_ATTACK)
 		return
 	if(LAZYACCESS(modifiers, RIGHT_CLICK))
-		if(active && cooldown_check <= world.time && check_parried(target, user))
-			finalize_baton_attack(target, user, modifiers)
+		if(active && cooldown_check <= world.time && !check_parried(target, user))
+			finalize_baton_attack(target, user, modifiers, in_attack_chain = FALSE)
 	else if(!user.combat_mode)
 		target.visible_message(span_warning("[user] prods [target] with [src]. Luckily it was off."), \
 			span_warning("[user] prods you with [src]. Luckily it was off."))