diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm
index e2ea9fccf6..4dc6fd1f6c 100644
--- a/code/modules/clothing/spacesuits/chronosuit.dm
+++ b/code/modules/clothing/spacesuits/chronosuit.dm
@@ -80,7 +80,7 @@
 		if(to_turf)
 			user.forceMove(to_turf)
 		user.SetStun(0)
-		user.next_move = 1
+		user.SetNextAction(0, considered_action = FALSE, immediate = FALSE)
 		user.alpha = 255
 		user.update_atom_colour()
 		user.animate_movement = FORWARD_STEPS
@@ -124,7 +124,7 @@
 		for(var/obj/item/I in user.held_items)
 			ADD_TRAIT(I, TRAIT_NODROP, CHRONOSUIT_TRAIT)
 		user.animate_movement = NO_STEPS
-		user.DelayNextAction(8 + phase_in_ds)
+		user.DelayNextAction(8 + phase_in_ds, considered_action = FALSE, immediate = FALSE)
 		user.mob_transforming = TRUE
 		user.anchored = TRUE
 		user.Stun(INFINITY)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
index edfabca7e7..9b1cc3b355 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
@@ -86,8 +86,8 @@ Difficulty: Medium
 
 /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
 	var/adjustment_amount = amount * 0.1
-	if(world.time + adjustment_amount > next_move)
-		changeNext_move(adjustment_amount) //attacking it interrupts it attacking, but only briefly
+	if(world.time + adjustment_amount > next_action)
+		DelayNextAction(adjustment_amount) //attacking it interrupts it attacking, but only briefly
 	. = ..()
 
 /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/death()
@@ -109,7 +109,7 @@ Difficulty: Medium
 /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/AttackingTarget()
 	if(QDELETED(target))
 		return
-	if(next_move > world.time || !Adjacent(target)) //some cheating
+	if(!CheckActionCooldown() || !Adjacent(target)) //some cheating
 		INVOKE_ASYNC(src, .proc/quick_attack_loop)
 		return
 	face_atom(target)
@@ -125,7 +125,7 @@ Difficulty: Medium
 					adjustHealth(-(L.maxHealth * 0.5))
 			L.gib()
 			return TRUE
-	changeNext_move(CLICK_CD_MELEE)
+	DelayNextAction(CLICK_CD_MELEE)
 	miner_saw.melee_attack_chain(src, target)
 	if(guidance)
 		adjustHealth(-2)
@@ -161,19 +161,19 @@ Difficulty: Medium
 		face_atom(target)
 		new /obj/effect/temp_visual/dir_setting/firing_effect(loc, dir)
 		Shoot(target)
-		changeNext_move(CLICK_CD_RANGE)
+		DelayNextAction(CLICK_CD_RANGE)
 
 //I'm still of the belief that this entire proc needs to be wiped from existence.
 //  do not take my touching of it to be endorsement of it. ~mso
 /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/proc/quick_attack_loop()
-	while(!QDELETED(target) && next_move <= world.time) //this is done this way because next_move can change to be sooner while we sleep.
+	while(!QDELETED(target) && !CheckActionCooldown()) //this is done this way because next_move can change to be sooner while we sleep.
 		stoplag(1)
-	sleep((next_move - world.time) * 1.5) //but don't ask me what the fuck this is about
+	sleep((next_action - world.time) * 1.5) //but don't ask me what the fuck this is about
 	if(QDELETED(target))
 		return
-	if(dashing || next_move > world.time || !Adjacent(target))
-		if(dashing && next_move <= world.time)
-			next_move = world.time + 1
+	if(dashing || !CheckActionCooldown() || !Adjacent(target))
+		if(dashing && next_action <= world.time)
+			SetNextAction(1, considered_action = FALSE, immediate = FALSE)
 		INVOKE_ASYNC(src, .proc/quick_attack_loop) //lets try that again.
 		return
 	AttackingTarget()
diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm
index beaf4bfc43..912fc0a72b 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_control.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm
@@ -246,7 +246,6 @@
 				did_something = TRUE
 
 	if(did_something)
-		user.changeNext_move(CLICK_CD_MELEE)
 		update_state()
 		update_icon()
 		return