diff --git a/code/game/machinery/telecomms/machines/message_server.dm b/code/game/machinery/telecomms/machines/message_server.dm
index 6ac6938f14..ded052eeac 100644
--- a/code/game/machinery/telecomms/machines/message_server.dm
+++ b/code/game/machinery/telecomms/machines/message_server.dm
@@ -21,7 +21,7 @@
 	. = ..()
 	stored = new /obj/item/blackbox(src)
 
-/obj/machinery/blackbox_recorder/attack_hand(mob/living/user)
+/obj/machinery/blackbox_recorder/attack_hand(mob/living/user, act_intent, unarmed_attack_flags)
 	. = ..()
 	if(stored)
 		to_chat(user, "<span class='notice'>You start struggling to pry the [stored] from the [src]...</span>")
diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm
index c12702424b..0c4691bdf0 100644
--- a/code/modules/clothing/shoes/_shoes.dm
+++ b/code/modules/clothing/shoes/_shoes.dm
@@ -268,13 +268,13 @@
 			our_alert = our_guy.throw_alert("shoealert", /obj/screen/alert/shoes/untied)
 
 
-/obj/item/clothing/shoes/attack_hand(mob/living/carbon/human/user)
+/obj/item/clothing/shoes/attack_hand(mob/living/user, act_intent, unarmed_attack_flags)
 	if(!istype(user))
 		return ..()
 	if(loc == user && tied != SHOES_TIED && (user.mobility_flags & MOBILITY_USE))
 		handle_tying(user)
 		return
-	..()
+	return ..()
 
 /obj/item/clothing/shoes/attack_self(mob/user)
 	. = ..()
diff --git a/code/modules/research/designs/tool_designs.dm b/code/modules/research/designs/tool_designs.dm
index 0a278602c1..dd7e130f17 100644
--- a/code/modules/research/designs/tool_designs.dm
+++ b/code/modules/research/designs/tool_designs.dm
@@ -92,7 +92,7 @@
 	category = list("Tool Designs")
 	departmental_flags =  DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO
 	
-	/datum/design/ranged_analyzer
+/datum/design/ranged_analyzer
 	name = "Long-range Analyzer"
 	desc = "A new advanced atmospheric analyzer design, capable of performing scans at long range."
 	id = "ranged_analyzer"
diff --git a/sandcode/code/modules/clothing/spacesuits/chronosuit.dm b/sandcode/code/modules/clothing/spacesuits/chronosuit.dm
index 81aa30554f..ad454ab802 100644
--- a/sandcode/code/modules/clothing/spacesuits/chronosuit.dm
+++ b/sandcode/code/modules/clothing/spacesuits/chronosuit.dm
@@ -85,7 +85,7 @@
 		if(to_turf)
 			user.forceMove(to_turf)
 		user.SetStun(0)
-		user.next_move = 1
+		user.next_action = 1
 		user.alpha = 255
 		user.update_atom_colour()
 		user.animate_movement = FORWARD_STEPS
@@ -118,7 +118,7 @@
 		for(var/obj/item/I in user.held_items)
 			ADD_TRAIT(I, TRAIT_NODROP, CHRONOSUIT_TRAIT)
 		user.animate_movement = NO_STEPS
-		user.changeNext_move(8 + phase_in_ds)
+		user.DelayNextAction(8 + phase_in_ds)
 		user.mob_transforming = 1
 		user.anchored = TRUE
 		user.Stun(INFINITY)
diff --git a/sandcode/code/modules/mob/living/simple_animal/hostile/megafauna/gladiator.dm b/sandcode/code/modules/mob/living/simple_animal/hostile/megafauna/gladiator.dm
index be492a0896..17d89e27bf 100644
--- a/sandcode/code/modules/mob/living/simple_animal/hostile/megafauna/gladiator.dm
+++ b/sandcode/code/modules/mob/living/simple_animal/hostile/megafauna/gladiator.dm
@@ -84,8 +84,8 @@ They deal 35 brute (armor is considered).
 	..()
 	update_phase()
 	var/adjustment_amount = min(damage * 0.15, 15)
-	if(world.time + adjustment_amount > next_move)
-		changeNext_move(adjustment_amount)
+	if(world.time + adjustment_amount > next_action)
+		DelayNextAction(adjustment_amount, considered_action = FALSE, flush = TRUE)
 
 /mob/living/simple_animal/hostile/megafauna/gladiator/Retaliate()
 	. = ..()