fixes

code/modules/antagonists/blob/blob/theblob.dm

@@ -225,7 +225,7 @@
 
 /obj/structure/blob/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/analyzer))
-		user.changeNext_move(CLICK_CD_MELEE)
+		user.DelayNextAction(CLICK_CD_MELEE)
 		to_chat(user, "<b>The analyzer beeps once, then reports:</b><br>")
 		SEND_SOUND(user, sound('sound/machines/ping.ogg'))
 		if(overmind)

code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm

@@ -150,6 +150,8 @@ God bless America.
 			fry_loop.stop()
 			return
 	else if(user.pulling && user.a_intent == "grab" && iscarbon(user.pulling) && reagents.total_volume)
+		if(!user.CheckActionCooldown(CLICK_CD_MELEE))
+			return
 		if(user.grab_state < GRAB_AGGRESSIVE)
 			to_chat(user, "<span class='warning'>You need a better grip to do that!</span>")
 			return
@@ -159,5 +161,5 @@ God bless America.
 		C.apply_damage(min(30, reagents.total_volume), BURN, BODY_ZONE_HEAD)
 		reagents.remove_any((reagents.total_volume/2))
 		C.DefaultCombatKnockdown(60)
-		user.changeNext_move(CLICK_CD_MELEE)
+		user.DelayNextAction()
 	return ..()

code/modules/mob/living/brain/MMI.dm

@@ -39,7 +39,9 @@
 	laws.set_laws_config()
 
 /obj/item/mmi/attackby(obj/item/O, mob/user, params)
-	user.changeNext_move(CLICK_CD_MELEE)
+	if(!user.CheckActionCooldown(CLICK_CD_MELEE))
+		return
+	user.DelayNextAction()
 	if(istype(O, /obj/item/organ/brain)) //Time to stick a brain in it --NEO
 		var/obj/item/organ/brain/newbrain = O
 		if(brain)

code/modules/mob/living/carbon/carbon.dm

@@ -315,7 +315,7 @@
 	spin(32,2)
 	visible_message("<span class='danger'>[src] rolls on the floor, trying to put [p_them()]self out!</span>", \
 		"<span class='notice'>You stop, drop, and roll!</span>")
-	MarkResistCooldown(30)
+	MarkResistTime(30)
 	sleep(30)
 	if(fire_stacks <= 0)
 		visible_message("<span class='danger'>[src] has successfully extinguished [p_them()]self!</span>", \

code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm

@@ -105,7 +105,7 @@ IGNORE_PROC_IF_NOT_TARGET(attack_slime)
 
 /mob/living/simple_animal/hostile/asteroid/curseblob/attacked_by(obj/item/I, mob/living/L, attackchain_flags = NONE, damage_multiplier = 1)
 	if(L != set_target)
-		L.changeNext_move(I.click_delay) //pre_attacked_by not called
+		I.ApplyAttackCooldown(L, src)
 		return
 	return ..()
 

code/modules/mob/living/simple_animal/slime/slime.dm

@@ -356,7 +356,7 @@
 		attacked += 10
 		if(prob(25))
 			user.do_attack_animation(src)
-			user.changeNext_move(CLICK_CD_MELEE)
+			W.ApplyAttackCooldown(user, src)
 			to_chat(user, "<span class='danger'>[W] passes right through [src]!</span>")
 			return
 		if(Discipline && prob(50)) // wow, buddy, why am I getting attacked??

code/modules/mob/login.dm

@@ -13,9 +13,7 @@
 		hud_used.show_hud(hud_used.hud_version)
 		hud_used.update_ui_style(ui_style2icon(client.prefs.UI_style))
 
-	next_move = 1
-
-	..()
+	. = ..()
 
 	reset_perspective(loc)
 

code/modules/projectiles/gun.dm

@@ -357,11 +357,9 @@
 	if(user.a_intent == INTENT_HARM) //Flogging
 		if(bayonet)
 			M.attackby(bayonet, user)
-			attack_delay_done = TRUE
 			return
 		else
 			return ..()
-	attack_delay_done = TRUE //we are firing the gun, not bashing people with its butt.
 
 /obj/item/gun/attack_obj(obj/O, mob/user)
 	if(user.a_intent == INTENT_HARM)

code/modules/projectiles/guns/ballistic.dm

@@ -179,13 +179,11 @@
 #undef BRAINS_BLOWN_THROW_SPEED
 #undef BRAINS_BLOWN_THROW_RANGE
 
-
-
 /obj/item/gun/ballistic/proc/sawoff(mob/user)
 	if(sawn_off)
 		to_chat(user, "<span class='warning'>\The [src] is already shortened!</span>")
 		return
-	user.changeNext_move(CLICK_CD_MELEE)
+	user.DelayNextAction(CLICK_CD_MELEE)
 	user.visible_message("[user] begins to shorten \the [src].", "<span class='notice'>You begin to shorten \the [src]...</span>")
 
 	//if there's any live ammo inside the gun, makes it go off

code/modules/reagents/reagent_containers/rags.dm

@@ -51,11 +51,10 @@
 		if(do_after(user, action_speed, target = A))
 			user.visible_message("[user] finishes wiping off [A]!", "<span class='notice'>You finish wiping off [A].</span>")
 			SEND_SIGNAL(A, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_MEDIUM)
-	return
 
 /obj/item/reagent_containers/rag/alt_pre_attack(mob/living/M, mob/living/user, params)
 	if(istype(M) && user.a_intent == INTENT_HELP)
-		user.changeNext_move(CLICK_CD_MELEE)
+		user.DelayNextAction(CLICK_CD_MELEE)
 		if(M.on_fire)
 			user.visible_message("<span class='warning'>\The [user] uses \the [src] to pat out [M == user ? "[user.p_their()]" : "\the [M]'s"] flames!</span>")
 			if(hitsound)

code/modules/vore/eating/living.dm

@@ -370,7 +370,6 @@
 
 	visible_message("<span class='warning'>[src] licks [tasted]!</span>","<span class='notice'>You lick [tasted]. They taste rather like [tasted.get_taste_message()].</span>","<b>Slurp!</b>")
 
-
 /mob/living/proc/get_taste_message(allow_generic = TRUE, datum/species/mrace)
 	if(!vore_taste && !allow_generic)
 		return FALSE