Fixes and Updates CQC

code/game/objects/items/weapons/melee/misc.dm

@@ -1,6 +1,13 @@
 /obj/item/melee
 	needs_permit = 1
 
+/obj/item/melee/proc/check_martial_counter(mob/living/carbon/human/target, mob/living/carbon/human/user)
+	if(target.check_block())
+		target.visible_message("<span class='danger'>[target.name] blocks [src] and twists [user]'s arm behind [user.p_their()] back!</span>",
+					"<span class='userdanger'>You block the attack!</span>")
+		user.Stun(2)
+		return TRUE
+
 /obj/item/melee/chainofcommand
 	name = "chain of command"
 	desc = "A tool used by great men to placate the frothing masses."

code/game/objects/items/weapons/stunbaton.dm

@@ -141,6 +141,12 @@
 	if(isrobot(M))
 		..()
 		return
+
+	if(ishuman(M))
+		var/mob/living/carbon/human/H = M
+		if(check_martial_counter(H, user))
+			return
+
 	if(!isliving(M))
 		return
 
@@ -166,8 +172,6 @@
 
 	if(ishuman(L))
 		var/mob/living/carbon/human/H = L
-		if(check_martial_counter(L, user))
-			return
 		if(H.check_shields(0, "[user]'s [name]", src, MELEE_ATTACK)) //No message; check_shields() handles that
 			playsound(L, 'sound/weapons/Genhit.ogg', 50, 1)
 			return

code/game/objects/items/weapons/swords_axes_etc.dm

@@ -52,7 +52,9 @@
 				if(ishuman(target))
 					var/mob/living/carbon/human/H = target
 					if(H.check_shields(0, "[user]'s [name]", src, MELEE_ATTACK))
-						return 0
+						return
+					if(check_martial_counter(H, user))
+						return
 				playsound(get_turf(src), 'sound/effects/woodhit.ogg', 75, 1, -1)
 				target.Weaken(3)
 				add_attack_logs(user, target, "Stunned with [src]")