merge from master

code/_onclick/click.dm

@@ -237,9 +237,9 @@
 	proximity_flag is not currently passed to attack_hand, and is instead used
 	in human click code to allow glove touches only at melee range.
 */
-/mob/proc/UnarmedAttack(atom/A, proximity_flag)
-	DelayNextAction(ismob(A)? 8 : 0)
-	return
+/mob/proc/UnarmedAttack(atom/A, proximity, intent = a_intent, flags = NONE)
+	if(ismob(A))
+		changeNext_move(CLICK_CD_MELEE)
 
 /*
 	Ranged unarmed attack: