diff --git a/code/_onclick/hud/screen_objects/clickdelay.dm b/code/_onclick/hud/screen_objects/clickdelay.dm
index 8b6a2f5328..f28fb27963 100644
--- a/code/_onclick/hud/screen_objects/clickdelay.dm
+++ b/code/_onclick/hud/screen_objects/clickdelay.dm
@@ -41,7 +41,7 @@
 	icon = 'icons/effects/progessbar.dmi'
 	icon_state = "prog_bar_100"
 
-/obj/screen/action_bar/clickdelay/proc/update_to_mob(mob/living/L)
+/obj/screen/action_bar/resistdelay/update_to_mob(mob/living/L)
 	var/diff = L.next_resist - L.last_resist
 	var/left = L.next_resist - world.time
 	if(left < 0 || diff < 0)
diff --git a/code/modules/mob/clickdelay.dm b/code/modules/mob/clickdelay.dm
index 2729970510..640acbd2a4 100644
--- a/code/modules/mob/clickdelay.dm
+++ b/code/modules/mob/clickdelay.dm
@@ -54,9 +54,14 @@
   * * immediate - defaults to TRUE - if TRUE, writes to cached/last_attack_immediate instead of last_attack. This ensures it can't collide with any delay checks in the actual attack. 
   */
 /mob/proc/DelayNextAction(amount = 0, ignore_mod = FALSE, considered_action = TRUE, immediate = TRUE)
-	if(considered_action)
-		(immediate? last_action_immediate : last_action) = world.time
-	(immediate? next_action_immediate : next_action) = max(next_action, world.time + (ignore_mod? amount : (amount * action_cooldown_mod + action_cooldown_adjust)))
+	if(immediate)
+		if(considered_action)
+			last_action_immediate = world.time
+		next_action_immediate = max(next_action, world.time + (ignore_mod? amount : (amount * action_cooldown_mod + action_cooldown_adjust)))
+	else
+		if(considered_action)
+			last_action = world.time
+		next_action = max(next_action, world.time + (ignore_mod? amount : (amount * action_cooldown_mod + action_cooldown_adjust)))
 	hud_used?.clickdelay?.mark_dirty()
 
 /**
@@ -73,9 +78,14 @@
   * Sets our next action to. The difference is DelayNextAction cannot reduce next_action under any circumstances while this can.
   */
 /mob/proc/SetNextAction(amount = 0, ignore_mod = FALSE, considered_action = TRUE, immediate = TRUE)
-	if(considered_action)
-		(immediate? last_action_immediate : last_action) = world.time
-	(immediate? next_action_immediate : next_action) = world.time + (ignore_mod? amount : (amount * action_cooldown_mod + action_cooldown_adjust))
+	if(immediate)
+		if(considered_action)
+			last_action_immediate = world.time
+		next_action_immediate = world.time + (ignore_mod? amount : (amount * action_cooldown_mod + action_cooldown_adjust))
+	else
+		if(considered_action)
+			last_action = world.time
+		next_action = world.time + (ignore_mod? amount : (amount * action_cooldown_mod + action_cooldown_adjust))
 	hud_used?.clickdelay?.mark_dirty()
 
 /**