ok

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"

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.