yea

code/datums/components/storage/storage.dm

@@ -258,7 +258,7 @@
 		return
 	var/datum/progressbar/progress = new(M, len, I.loc)
 	var/list/rejections = list()
-	while(do_after(M, 10, TRUE, parent, FALSE, CALLBACK(src, PROC_REF(handle_mass_pickup), things, I.loc, rejections, progress)))
+	while(do_after(M, 10, parent, TRUE, FALSE, CALLBACK(src, PROC_REF(handle_mass_pickup), things, I.loc, rejections, progress)))
 		stoplag(1)
 	progress.end_progress()
 	to_chat(M, "<span class='notice'>You put everything you could [insert_preposition] [parent].</span>")

code/game/objects/effects/anomalies/_anomalies.dm

@@ -133,7 +133,7 @@
 /obj/effect/anomaly/attackby(obj/item/weapon, mob/user, params)
 	if(weapon.tool_behaviour == TOOL_ANALYZER && aSignal)
 		to_chat(user, span_notice("You start analyzing [src]."))
-		if(do_after(user, 20, TRUE, src))
+		if(do_after(user, 20, src, TRUE))
 			to_chat(user, span_notice("[src]'s primary field is fluctuating along frequency [format_frequency(aSignal.frequency)], code [aSignal.code]."))
 			if(bSignal)
 				to_chat(user, span_notice("A second field is fluctuating along [format_frequency(bSignal.frequency)], code [bSignal.code]. It is highly unstable." ))

code/modules/mining/drill.dm

@@ -218,7 +218,7 @@
 /obj/machinery/drill/AltClick(mob/user)
 	if(active)
 		to_chat(user, "<span class='notice'>You begin the manual shutoff process.</span>")
-		if(do_after(user,10))
+		if(do_after(user, 10, src))
 			active = FALSE
 			soundloop.stop()
 			deltimer(current_timerid)

code/modules/mob/living/carbon/human/species_types/spider.dm

@@ -147,7 +147,7 @@ GLOBAL_LIST_INIT(spider_last, world.file2list("strings/names/spider_last.txt"))
 	var/nutrition_threshold = NUTRITION_LEVEL_FED
 	if (H.nutrition >= nutrition_threshold)
 		to_chat(H, "<i>You begin spinning some web...</i>")
-		if(!do_after(H, 10 SECONDS, 1, T))
+		if(!do_after(H, 10 SECONDS, T, TRUE))
 			to_chat(H, "<span class='warning'>Your web spinning was interrupted!</span>")
 			return
 		if(prob(75))
@@ -208,7 +208,7 @@ GLOBAL_LIST_INIT(spider_last, world.file2list("strings/names/spider_last.txt"))
 			to_chat(H, "<span class='warning'>You cannot wrap this.</span>")
 			return
 		H.visible_message("<span class='danger'>[H] starts to wrap [A] into a cocoon!</span>","<span class='warning'>You start to wrap [A] into a cocoon.</span>")
-		if(!do_after(H, 10 SECONDS, 1, A))
+		if(!do_after(H, 10 SECONDS, A, TRUE))
 			to_chat(H, "<span class='warning'>Your web spinning was interrupted!</span>")
 			return
 		H.adjust_nutrition(E.spinner_rate * -3.5)

code/modules/mob/living/silicon/pai/pai_defense.dm

@@ -50,7 +50,7 @@
 			user.do_attack_animation(src)
 			if (user.name == master)
 				visible_message("<span class='notice'>Responding to its master's touch, [src] disengages its holochassis emitter, rapidly losing coherence.</span>")
-				if(do_after(user, 1 SECONDS, TRUE, src))
+				if(do_after(user, 1 SECONDS, src, TRUE))
 					fold_in()
 					if(user.put_in_hands(card))
 						user.visible_message("<span class='notice'>[user] promptly scoops up [user.p_their()] pAI's card.</span>")

code/modules/mob/living/simple_animal/friendly/drone/interaction.dm

@@ -17,7 +17,7 @@
 				if("Cannibalize")
 					if(D.health < D.maxHealth)
 						D.visible_message("<span class='notice'>[D] begins to cannibalize parts from [src].</span>", "<span class='notice'>You begin to cannibalize parts from [src]...</span>")
-						if(do_after(D, 60, 0, target = src))
+						if(do_after(D, 60, src, FALSE))
 							D.visible_message("<span class='notice'>[D] repairs itself using [src]'s remains!</span>", "<span class='notice'>You repair yourself using [src]'s remains.</span>")
 							D.adjustBruteLoss(-src.maxHealth)
 							new /obj/effect/decal/cleanable/oil/streak(get_turf(src))

code/modules/mob/living/simple_animal/friendly/mouse.dm

@@ -165,7 +165,7 @@ GLOBAL_VAR_INIT(mouse_killed, 0)
 	visible_message(
 		"<span class='danger'>[src] starts eating away [A]...</span>",
 		"<span class='notice'>You start eating the [A]...</span>")
-	if(do_after(src, 30, FALSE, A))
+	if(do_after(src, 30, A, TRUE))
 		if(QDELETED(A))
 			return
 		visible_message(

code/modules/projectiles/guns/ballistic.dm

@@ -238,7 +238,7 @@
 		to_chat(user, "<span class='notice'>You pull the [magazine_wording] out of \the [src].</span>")
 	update_appearance()
 	if (tac_load)
-		if(do_after(user, tactical_reload_delay, TRUE, src))
+		if(do_after(user, tactical_reload_delay, src, TRUE))
 			if (insert_magazine(user, tac_load, FALSE))
 				to_chat(user, "<span class='notice'>You perform a tactical reload on \the [src].</span>")
 			else

code/modules/projectiles/guns/energy.dm

@@ -153,7 +153,7 @@
 	to_chat(user, "<span class='notice'>You pull the cell out of \the [src].</span>")
 	update_appearance()
 	if(tac_load && tac_reloads)
-		if(do_after(user, tactical_reload_delay, TRUE, src))
+		if(do_after(user, tactical_reload_delay, src, TRUE))
 			if(insert_cell(user, tac_load))
 				to_chat(user, "<span class='notice'>You perform a tactical reload on \the [src].</span>")
 			else

code/modules/vehicles/secway.dm

@@ -47,7 +47,7 @@
 	if(istype(W, /obj/item/reagent_containers/food/snacks/grown/banana))
 		// ignore the occupants because they're presumably too distracted to notice the guy stuffing fruit into their vehicle's exhaust. do segways have exhausts? they do now!
 		user.visible_message("<span class='warning'>[user] begins stuffing [W] into [src]'s tailpipe.</span>", "<span class='warning'>You begin stuffing [W] into [src]'s tailpipe...</span>", ignored_mobs = occupants)
-		if(do_after(user, 30, TRUE, src))
+		if(do_after(user, 30, src, TRUE))
 			if(user.transferItemToLoc(W, src))
 				user.visible_message("<span class='warning'>[user] stuffs [W] into [src]'s tailpipe.</span>", "<span class='warning'>You stuff [W] into [src]'s tailpipe.</span>", ignored_mobs = occupants)
 				eddie_murphy = W