changes

code/modules/mob/clickdelay.dm

@@ -61,6 +61,15 @@
 /mob/proc/CheckResistCooldown()
 	return (world.time >= (last_resist + resist_cooldown))
 
+/atom
+	// Standard clickdelay variables
+	/// Amount of time to check for from a mob's last attack to allow an attack_hand().
+	var/clickdelay_attack_hand_preattack_cooldown = CLICK_CD_MELEE
+	/// Should we set last action before or after attack hand passes?
+	var/clickdelay_attack_hand_set_preattack = FALSE
+	/// Should we set last action for attack hand?
+	var/clickdelay_attack_hand_is_action = FALSE
+
 /obj/item
 	// Standard clickdelay variables
 	/// Amount of time to check for from a mob's last attack, checked before an attack happens

code/modules/mob/living/living.dm

@@ -687,10 +687,12 @@
 		return
 
 	if(do_resist())
+		last_resist = world.time
 		changeNext_move(CLICK_CD_RESIST)
 
 /// The actual proc for resisting. Return TRUE to give clickdelay.
 /mob/living/proc/do_resist()
+	set waitfor = FALSE			// some of these sleep.
 	SEND_SIGNAL(src, COMSIG_LIVING_RESIST, src)
 	//resisting grabs (as if it helps anyone...)
 	// only works if you're not cuffed.