diff --git a/archive/maps/cynosure/turfs/outdoors.dm b/archive/maps/cynosure/turfs/outdoors.dm
index e7cb2f08ec..2f6273f370 100644
--- a/archive/maps/cynosure/turfs/outdoors.dm
+++ b/archive/maps/cynosure/turfs/outdoors.dm
@@ -204,7 +204,7 @@
 /turf/simulated/floor/outdoors/snow/sif/planetuse/attackby(var/obj/item/W, var/mob/user)
 	if(istype(W, /obj/item/shovel))
 		to_chat(user, span_notice("You begin to remove \the [src] with your [W]."))
-		if(do_after(user, 4 SECONDS * W.toolspeed))
+		if(do_after(user, 4 SECONDS * W.toolspeed, src))
 			to_chat(user, span_notice("\The [src] has been dug up, and now lies in a pile nearby."))
 			new /obj/item/stack/material/snow(src)
 			demote()
@@ -215,7 +215,7 @@
 
 /turf/simulated/floor/outdoors/snow/sif/planetuse/attack_hand(mob/user as mob)
 	visible_message("[user] starts scooping up some snow.", "You start scooping up some snow.")
-	if(do_after(user, 1 SECOND))
+	if(do_after(user, 1 SECOND, src))
 		var/obj/S = new /obj/item/stack/material/snow(user.loc)
 		user.put_in_hands(S)
 		visible_message("[user] scoops up a pile of snow.", "You scoop up a pile of snow.")
diff --git a/code/game/machinery/feeder.dm b/code/game/machinery/feeder.dm
index a6e9ee458a..d084705bda 100644
--- a/code/game/machinery/feeder.dm
+++ b/code/game/machinery/feeder.dm
@@ -65,7 +65,7 @@
 		return
 
 	if(default_deconstruction_screwdriver(user, W))
-		if(do_after(user, 15))
+		if(do_after(user, 15, src))
 			to_chat(user, "You deconstruct the feeder.")
 			new /obj/item/stack/material/plastic(src.loc, 4)
 			if(beaker)
diff --git a/code/game/objects/items/weapons/implants/implantreagent_ch.dm b/code/game/objects/items/weapons/implants/implantreagent_ch.dm
index f510a50f63..8bb0bde53f 100644
--- a/code/game/objects/items/weapons/implants/implantreagent_ch.dm
+++ b/code/game/objects/items/weapons/implants/implantreagent_ch.dm
@@ -79,7 +79,7 @@
 			if(rimplant.cascade)
 				to_chat(src, span_notice("You feel your legs quake as your muscles fail to stand strong!"))
 				while(rimplant.reagents.total_volume >= rimplant.transfer_amount)
-					if(do_after(src,30))
+					if(do_after(src,30,src))
 						src.SetStunned(3)
 						playsound(src,'sound/vore/insert.ogg',50,1)
 						src.apply_effect(10,STUTTER,0)
diff --git a/code/game/objects/structures/alien/alien.dm b/code/game/objects/structures/alien/alien.dm
index 8e2a476ca0..7a4a79de64 100644
--- a/code/game/objects/structures/alien/alien.dm
+++ b/code/game/objects/structures/alien/alien.dm
@@ -88,7 +88,7 @@
 					healthcheck()
 					return
 				if(locate(/obj/item/organ/internal/xenos/resinspinner/replicant) in M.internal_organs)
-					if(!do_after(M, 3 SECONDS))
+					if(!do_after(M, 3 SECONDS, src))
 						return
 					visible_message (span_warning("[usr] strokes the [name] and it melts away!"), 1)
 					health = 0
diff --git a/code/modules/projectiles/guns/projectile/zz_ballistics_ch.dm b/code/modules/projectiles/guns/projectile/zz_ballistics_ch.dm
index 9a37168f9a..c5eaacbeaa 100644
--- a/code/modules/projectiles/guns/projectile/zz_ballistics_ch.dm
+++ b/code/modules/projectiles/guns/projectile/zz_ballistics_ch.dm
@@ -1020,7 +1020,7 @@
 /obj/item/gun/projectile/automatic/serdy/kord/afteratt(atom/A, mob/living/user, adjacent, params)
 	if(user.size_multiplier <= 0.5) //They're 50% or lower. If they fire this gun, they're gonna get obliterated.
 		to_chat(user,span_warning("You struggle to reach the trigger. Maybe shooting such a big gun isn't such a good idea..."))
-		if(do_after(user, 5 SECONDS)) //Give them a chance to take it back.
+		if(do_after(user, 5 SECONDS, src)) //Give them a chance to take it back.
 			. = ..() //RIP
 
 /obj/item/gun/projectile/automatic/serdy/kord/handle_post_fire(mob/living/user, atom/target, var/pointblank=0, var/reflex=0)
@@ -1639,7 +1639,7 @@
 			Fire_userless(user)
 			burst = burstsetting
 			return
-		if(do_after(user, 30))	//SHIT IS STEALTHY EYYYYY
+		if(do_after(user, 30, src))	//SHIT IS STEALTHY EYYYYY
 			icon_state = "sawnshotgun"
 			item_state = "sawnshotgun"
 
diff --git a/code/modules/reagents/machinery/bunsen_burner.dm b/code/modules/reagents/machinery/bunsen_burner.dm
index 2063288b05..a0d7bd87f5 100644
--- a/code/modules/reagents/machinery/bunsen_burner.dm
+++ b/code/modules/reagents/machinery/bunsen_burner.dm
@@ -24,7 +24,7 @@
 	if(default_deconstruction_screwdriver(user, W))
 		return
 	if(W.has_tool_quality(TOOL_CROWBAR) && panel_open && isturf(loc))
-		if(do_after(user, 5 * W.toolspeed))
+		if(do_after(user, 5 * W.toolspeed, src))
 			// Breaking it down
 			drop_held_container()
 			to_chat(user, span_notice("You dissasemble \the [src]"))
diff --git a/modular_chomp/code/game/turfs/simulated/outdoors/desert_planet.dm b/modular_chomp/code/game/turfs/simulated/outdoors/desert_planet.dm
index 12b7faf50e..25d4914068 100644
--- a/modular_chomp/code/game/turfs/simulated/outdoors/desert_planet.dm
+++ b/modular_chomp/code/game/turfs/simulated/outdoors/desert_planet.dm
@@ -24,7 +24,7 @@
 /turf/simulated/floor/outdoors/desert_planet/sand/attackby(var/obj/item/W, var/mob/user)
 	if(istype(W, /obj/item/shovel))
 		to_chat(user, span_notice("You begin to remove \the [src] with your [W]."))
-		if(do_after(user, 4 SECONDS * W.toolspeed))
+		if(do_after(user, 4 SECONDS * W.toolspeed, src))
 			to_chat(user, span_notice("\The [src] has been dug up, and now lies in a pile nearby."))
 			icon_state = "sand_dug"
 			new /obj/item/ore/glass (src)
@@ -104,7 +104,7 @@
 		playsound(user, P.drill_sound, 20, 1)
 		to_chat(user, span_notice("You start [P.drill_verb]."))
 
-		if(do_after(user,P.digspeed))
+		if(do_after(user,P.digspeed, src))
 
 			to_chat(user, span_notice("You finish [P.drill_verb] \the [src]."))
 			new /obj/item/stack/material/sandstone(src)
diff --git a/modular_chomp/code/game/turfs/simulated/outdoors/lava_land.dm b/modular_chomp/code/game/turfs/simulated/outdoors/lava_land.dm
index a9d57ded5c..9a6668277a 100644
--- a/modular_chomp/code/game/turfs/simulated/outdoors/lava_land.dm
+++ b/modular_chomp/code/game/turfs/simulated/outdoors/lava_land.dm
@@ -41,7 +41,7 @@
 		playsound(user, P.drill_sound, 20, 1)
 		to_chat(user, span_notice("You start [P.drill_verb]."))
 
-		if(do_after(user,P.digspeed))
+		if(do_after(user,P.digspeed, src))
 
 			to_chat(user, span_notice("You finish [P.drill_verb] \the [src]."))
 			density = FALSE
diff --git a/modular_chomp/code/game/turfs/simulated/shuttlewalls_attacks.dm b/modular_chomp/code/game/turfs/simulated/shuttlewalls_attacks.dm
index 31d300971c..ea4738e349 100644
--- a/modular_chomp/code/game/turfs/simulated/shuttlewalls_attacks.dm
+++ b/modular_chomp/code/game/turfs/simulated/shuttlewalls_attacks.dm
@@ -280,7 +280,7 @@
 			if(cut_delay < 0)
 				cut_delay = 0
 
-			if(!do_after(user,cut_delay * W.toolspeed))
+			if(!do_after(user,cut_delay * W.toolspeed, src))
 				return
 
 			to_chat(user, span_notice("You remove the outer plating."))
@@ -303,7 +303,7 @@
 				if (W.has_tool_quality(TOOL_SCREWDRIVER))
 					to_chat(user, span_notice("You begin removing the support lines."))
 					playsound(src, W.usesound, 100, 1)
-					if(!do_after(user,40 * W.toolspeed) || !istype(src, /turf/simulated/wall) || construction_stage != 5)
+					if(!do_after(user,40 * W.toolspeed, src) || !istype(src, /turf/simulated/wall) || construction_stage != 5)
 						return
 					construction_stage = 4
 					user.update_examine_panel(src)
@@ -333,7 +333,7 @@
 				if(cut_cover)
 					to_chat(user, span_notice("You begin slicing through the metal cover."))
 					playsound(src, W.usesound, 100, 1)
-					if(!do_after(user, 60 * W.toolspeed) || !istype(src, /turf/simulated/wall) || construction_stage != 4)
+					if(!do_after(user, 60 * W.toolspeed, src) || !istype(src, /turf/simulated/wall) || construction_stage != 4)
 						return
 					construction_stage = 3
 					user.update_examine_panel(src)
@@ -343,7 +343,7 @@
 				else if (W.has_tool_quality(TOOL_SCREWDRIVER))
 					to_chat(user, span_notice("You begin screwing down the support lines."))
 					playsound(src, W.usesound, 100, 1)
-					if(!do_after(user,40 * W.toolspeed) || !istype(src, /turf/simulated/wall) || construction_stage != 4)
+					if(!do_after(user,40 * W.toolspeed, src) || !istype(src, /turf/simulated/wall) || construction_stage != 4)
 						return
 					construction_stage = 5
 					user.update_examine_panel(src)
@@ -354,7 +354,7 @@
 				if (W.has_tool_quality(TOOL_CROWBAR))
 					to_chat(user, span_notice("You struggle to pry off the cover."))
 					playsound(src, W.usesound, 100, 1)
-					if(!do_after(user,100 * W.toolspeed) || !istype(src, /turf/simulated/wall) || construction_stage != 3)
+					if(!do_after(user,100 * W.toolspeed, src) || !istype(src, /turf/simulated/wall) || construction_stage != 3)
 						return
 					construction_stage = 2
 					user.update_examine_panel(src)
@@ -365,7 +365,7 @@
 				if (W.has_tool_quality(TOOL_WRENCH))
 					to_chat(user, span_notice("You start loosening the anchoring bolts which secure the support rods to their frame."))
 					playsound(src, W.usesound, 100, 1)
-					if(!do_after(user,40 * W.toolspeed) || !istype(src, /turf/simulated/wall) || construction_stage != 2)
+					if(!do_after(user,40 * W.toolspeed, src) || !istype(src, /turf/simulated/wall) || construction_stage != 2)
 						return
 					construction_stage = 1
 					user.update_examine_panel(src)
@@ -386,7 +386,7 @@
 				if(cut_cover)
 					to_chat(user, span_notice("You begin slicing through the support rods."))
 					playsound(src, W.usesound, 100, 1)
-					if(!do_after(user,70 * W.toolspeed) || !istype(src, /turf/simulated/wall) || construction_stage != 1)
+					if(!do_after(user,70 * W.toolspeed, src) || !istype(src, /turf/simulated/wall) || construction_stage != 1)
 						return
 					construction_stage = 0
 					user.update_examine_panel(src)
@@ -397,7 +397,7 @@
 				if(W.has_tool_quality(TOOL_CROWBAR))
 					to_chat(user, span_notice("You struggle to pry off the outer sheath."))
 					playsound(src, W.usesound, 100, 1)
-					if(!do_after(user,100 * W.toolspeed) || !istype(src, /turf/simulated/wall) || !user || !W || !T )
+					if(!do_after(user,100 * W.toolspeed, src) || !istype(src, /turf/simulated/wall) || !user || !W || !T )
 						return
 					if(user.loc == T && user.get_active_hand() == W )
 						to_chat(user, span_notice("You pry off the outer sheath."))
diff --git a/modular_chomp/code/modules/halloween/items.dm b/modular_chomp/code/modules/halloween/items.dm
index a9250c984b..1e0ed59fed 100644
--- a/modular_chomp/code/modules/halloween/items.dm
+++ b/modular_chomp/code/modules/halloween/items.dm
@@ -214,7 +214,7 @@
 	costumes = typesof(/obj/item/storage/box/halloween/)
 
 /obj/structure/boxpile/attack_hand(mob/living/user)
-	if(!do_after(user, 5 SECONDS))
+	if(!do_after(user, 5 SECONDS, src))
 		return
 	if(!user.ckey)
 		return
diff --git a/modular_chomp/code/modules/instruments/stationary.dm b/modular_chomp/code/modules/instruments/stationary.dm
index 4bae187260..0e2ff0223b 100644
--- a/modular_chomp/code/modules/instruments/stationary.dm
+++ b/modular_chomp/code/modules/instruments/stationary.dm
@@ -6,7 +6,7 @@
 		else
 			user.visible_message(span_filter_notice("[user] begins securing \the [src] to the floor."), span_filter_notice("You start securing \the [src] to the floor."))
 
-		if(do_after(user, 20 * W.toolspeed))
+		if(do_after(user, 20 * W.toolspeed, src))
 			if(!src) return
 			to_chat(user, span_notice("You [anchored? "un" : ""]secured \the [src]!"))
 			anchored = !anchored
diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/species_shapeshift_ch.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/species_shapeshift_ch.dm
index 3023fd3741..b79178f29d 100644
--- a/modular_chomp/code/modules/mob/living/carbon/human/species/species_shapeshift_ch.dm
+++ b/modular_chomp/code/modules/mob/living/carbon/human/species/species_shapeshift_ch.dm
@@ -25,7 +25,7 @@
 		oocnotes = 1
 	to_chat(src, span_notify("You begin to reform. You will need to remain still."))
 	visible_message(span_notify("[src] rapidly contorts and shifts!"), span_danger("You begin to reform."))
-	if (do_after(src, 4 SECONDS))
+	if (do_after(src, 4 SECONDS, src))
 		if (client?.prefs)
 			client.prefs.vanity_copy_to(src, FALSE, flavour, oocnotes, FALSE)
 			visible_message(span_notify("[src] adopts a new form!"), span_danger("You have reformed."))
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/xenomorph_abilities.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/xenomorph_abilities.dm
index 40d6ff3155..6d851af594 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/xenomorph_abilities.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/xenomorph_abilities.dm
@@ -18,7 +18,7 @@
 
 	var/obj/O
 
-	if(do_after(src, xeno_build_time))
+	if(do_after(src, xeno_build_time, src))
 		switch(choice)
 			if("Resin Door")
 				O = new /obj/structure/simple_door/resin(targetLoc)
diff --git a/modular_chomp/code/modules/projectiles/guns/zBallisticPort/bullet.dm b/modular_chomp/code/modules/projectiles/guns/zBallisticPort/bullet.dm
index 69f363f454..b7cc96a0c6 100644
--- a/modular_chomp/code/modules/projectiles/guns/zBallisticPort/bullet.dm
+++ b/modular_chomp/code/modules/projectiles/guns/zBallisticPort/bullet.dm
@@ -919,7 +919,7 @@
 /obj/item/gun/projectile/automatic/serdy/kord/afteratt(atom/A, mob/living/user, adjacent, params)
 	if(user.size_multiplier <= 0.5) //They're 50% or lower. If they fire this gun, they're gonna get obliterated.
 		to_chat(user,span_warning("You struggle to reach the trigger. Maybe shooting such a big gun isn't such a good idea..."))
-		if(do_after(user, 5 SECONDS)) //Give them a chance to take it back.
+		if(do_after(user, 5 SECONDS, src)) //Give them a chance to take it back.
 			. = ..() //RIP
 
 /obj/item/gun/projectile/automatic/serdy/kord/handle_post_fire(mob/living/user, atom/target, var/pointblank=0, var/reflex=0)
@@ -1444,7 +1444,7 @@
 			Fire_userless(user)
 			burst = burstsetting
 			return
-		if(do_after(user, 30))	//SHIT IS STEALTHY EYYYYY
+		if(do_after(user, 30, src))	//SHIT IS STEALTHY EYYYYY
 			icon_state = "sawnshotgun"
 			item_state = "sawnshotgun"
 
diff --git a/modular_chomp/maps/common_submaps/overmap/planets/thor/thor.dm b/modular_chomp/maps/common_submaps/overmap/planets/thor/thor.dm
index 44b76a1864..0a8cfedeb4 100644
--- a/modular_chomp/maps/common_submaps/overmap/planets/thor/thor.dm
+++ b/modular_chomp/maps/common_submaps/overmap/planets/thor/thor.dm
@@ -339,7 +339,7 @@
 /turf/simulated/floor/outdoors/snow/thor/planetuse/attackby(var/obj/item/W, var/mob/user)
 	if(istype(W, /obj/item/shovel))
 		to_chat(user, span_notice("You begin to remove \the [src] with your [W]."))
-		if(do_after(user, 4 SECONDS * W.toolspeed))
+		if(do_after(user, 4 SECONDS * W.toolspeed, src))
 			to_chat(user, span_notice("\The [src] has been dug up, and now lies in a pile nearby."))
 			new /obj/item/stack/material/snow(src)
 			demote()
@@ -350,7 +350,7 @@
 
 /turf/simulated/floor/outdoors/snow/thor/planetuse/attack_hand(mob/user as mob)
 	visible_message("[user] starts scooping up some snow.", "You start scooping up some snow.")
-	if(do_after(user, 1 SECOND))
+	if(do_after(user, 1 SECOND, src))
 		var/obj/S = new /obj/item/stack/material/snow(user.loc)
 		user.put_in_hands(S)
 		visible_message("[user] scoops up a pile of snow.", "You scoop up a pile of snow.")