aight

code/modules/clothing/gloves/miscellaneous.dm

@@ -109,7 +109,7 @@
 	if(warcry)
 		M.say("[warcry]", ignore_spam = TRUE, forced = TRUE)
 
-	return FALSE
+	return NO_AUTO_CLICKDELAY_HANDLING
 
 /obj/item/clothing/gloves/fingerless/pugilist/rapid/AltClick(mob/user)
 	var/input = stripped_input(user,"What do you want your battlecry to be? Max length of 6 characters.", ,"", 7)
@@ -137,7 +137,7 @@
 	else
 		M.SetNextAction(CLICK_CD_RAPID)
 
-	return FALSE
+	return NO_AUTO_CLICKDELAY_HANDLING
 
 /obj/item/clothing/gloves/botanic_leather
 	name = "botanist's leather gloves"

code/modules/ninja/suit/gloves.dm

@@ -67,6 +67,7 @@
 			to_chat(H, "<span class='notice'>Gained <B>[DisplayEnergy(.)]</B> of energy from [A].</span>")
 		else
 			to_chat(H, "<span class='danger'>\The [A] has run dry of energy, you must find another source!</span>")
+		. = INTERRUPT_UNARMED_ATTACK
 	else
 		. = FALSE	//as to not cancel attack_hand()