changes

code/modules/antagonists/abductor/machinery/experiment.dm

@@ -47,7 +47,6 @@
 		to_chat(user, "<span class='warning'>[src]'s door won't budge!</span>")
 
 /obj/machinery/abductor/experiment/container_resist(mob/living/user)
-	user.last_resist = world.time
 	user.visible_message("<span class='notice'>You see [user] kicking against the door of [src]!</span>", \
 		"<span class='notice'>You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)</span>", \
 		"<span class='italics'>You hear a metallic creaking from [src].</span>")

code/modules/atmospherics/machinery/components/unary_devices/cryo.dm

@@ -262,7 +262,6 @@
 		return occupant
 
 /obj/machinery/atmospherics/components/unary/cryo_cell/container_resist(mob/living/user)
-	user.last_resist = world.time
 	user.visible_message("<span class='notice'>You see [user] kicking against the glass of [src]!</span>", \
 		"<span class='notice'>You struggle inside [src], kicking the release with your foot... (this will take about [DisplayTimeText(breakout_time)].)</span>", \
 		"<span class='italics'>You hear a thump from [src].</span>")

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.

code/modules/paperwork/paperbin.dm

@@ -11,6 +11,8 @@
 	throw_speed = 3
 	throw_range = 7
 	pressure_resistance = 8
+	clickdelay_attack_hand_is_action = TRUE
+	clickdelay_attack_hand_preattack_cooldown = CLICK_CD_MELEE
 	var/papertype = /obj/item/paper
 	var/total_paper = 30
 	var/list/papers = list()
@@ -64,7 +66,6 @@
 /obj/item/paper_bin/attack_hand(mob/user)
 	if(user.lying)
 		return
-	user.changeNext_move(CLICK_CD_MELEE)
 	if(bin_pen)
 		var/obj/item/pen/P = bin_pen
 		P.add_fingerprint(user)

code/modules/reagents/reagent_containers/rags.dm

@@ -189,4 +189,4 @@
 	extinguish_efficiency = 5
 	action_speed = 15
 	damp_threshold = 0.8
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 20, "bio" = 20, "rad" = 20, "fire" = 50, "acid" = 50) //items don't provide armor to wearers unlike clothing yet.
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 20, "bio" = 20, "rad" = 20, "fire" = 50, "acid" = 50) //items don't provide armor to wearers unlike clothing yet.

code/modules/research/nanites/nanite_chamber.dm

@@ -150,7 +150,6 @@
 		return
 	if(busy)
 		return
-	user.last_resist = world.time
 	user.visible_message("<span class='notice'>You see [user] kicking against the door of [src]!</span>", \
 		"<span class='notice'>You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)</span>", \
 		"<span class='hear'>You hear a metallic creaking from [src].</span>")

code/modules/research/nanites/public_chamber.dm

@@ -130,7 +130,6 @@
 		return
 	if(busy)
 		return
-	user.last_resist = world.time
 	user.visible_message("<span class='notice'>You see [user] kicking against the door of [src]!</span>", \
 		"<span class='notice'>You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)</span>", \
 		"<span class='hear'>You hear a metallic creaking from [src].</span>")