Removes a bunch of sleeps/spawns and makes a few booleans defines

code/game/gamemodes/miniantags/abduction/gland.dm

@@ -241,11 +241,20 @@
 
 /obj/item/organ/heart/gland/plasma/activate()
 	to_chat(owner, "<span class='warning'>You feel bloated.</span>")
+<<<<<<< HEAD
 	sleep(150)
 	if(!owner) return
 	to_chat(owner, "<span class='userdanger'>A massive stomachache overcomes you.</span>")
 	sleep(50)
 	if(!owner) return
+=======
+	addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, owner, "<span class='userdanger'>A massive stomachache overcomes you.</span>"), 150)
+	addtimer(CALLBACK(src, .proc/vomit_plasma), 200)
+
+/obj/item/organ/heart/gland/plasma/proc/vomit_plasma()
+	if(!owner)
+		return
+>>>>>>> b83d777... Removes a bunch of sleeps/spawns and makes a few booleans defines (#31553)
 	owner.visible_message("<span class='danger'>[owner] vomits a cloud of plasma!</span>")
 	var/turf/open/T = get_turf(owner)
 	if(istype(T))

code/game/gamemodes/miniantags/abduction/machinery/pad.dm

@@ -25,21 +25,24 @@
 	new /obj/effect/temp_visual/dir_setting/ninja(get_turf(target), target.dir)
 	Warp(target)
 
-/obj/machinery/abductor/pad/proc/MobToLoc(place,mob/living/target)
-	new /obj/effect/temp_visual/teleport_abductor(place)
-	sleep(80)
+/obj/machinery/abductor/pad/proc/doMobToLoc(place, atom/movable/target)
 	flick("alien-pad", src)
 	target.forceMove(place)
 	new /obj/effect/temp_visual/dir_setting/ninja(get_turf(target), target.dir)
 
-/obj/machinery/abductor/pad/proc/PadToLoc(place)
+/obj/machinery/abductor/pad/proc/MobToLoc(place,mob/living/target)
 	new /obj/effect/temp_visual/teleport_abductor(place)
-	sleep(80)
+	addtimer(CALLBACK(src, .proc/doMobToLoc, place, target), 80)
+
+/obj/machinery/abductor/pad/proc/doPadToLoc(place)
 	flick("alien-pad", src)
 	for(var/mob/living/target in get_turf(src))
 		target.forceMove(place)
 		new /obj/effect/temp_visual/dir_setting/ninja(get_turf(target), target.dir)
 
+/obj/machinery/abductor/pad/proc/PadToLoc(place)
+	new /obj/effect/temp_visual/teleport_abductor(place)
+	addtimer(CALLBACK(src, .proc/doPadToLoc, place), 80)
 
 /obj/effect/temp_visual/teleport_abductor
 	name = "Huh"

code/game/gamemodes/miniantags/revenant/revenant_abilities.dm

@@ -205,20 +205,20 @@
 		var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
 		s.set_up(4, 0, L)
 		s.start()
-		new /obj/effect/temp_visual/revenant(L.loc)
-		sleep(20)
-		if(!L.on) //wait, wait, don't shock me
-			return
-		flick("[L.base_state]2", L)
-		for(var/mob/living/carbon/human/M in view(shock_range, L))
-			if(M == user)
-				continue
-			L.Beam(M,icon_state="purple_lightning",time=5)
-			M.electrocute_act(shock_damage, L, safety=1)
-			var/datum/effect_system/spark_spread/z = new /datum/effect_system/spark_spread
-			z.set_up(4, 0, M)
-			z.start()
-			playsound(M, 'sound/machines/defib_zap.ogg', 50, 1, -1)
+		new /obj/effect/temp_visual/revenant(get_turf(L))
+		addtimer(CALLBACK(src, .proc/overload_shock, L, user), 20)
+
+/obj/effect/proc_holder/spell/aoe_turf/revenant/overload/proc/overload_shock(obj/machinery/light/L, mob/user)
+	if(!L.on) //wait, wait, don't shock me
+		return
+	flick("[L.base_state]2", L)
+	for(var/mob/living/carbon/human/M in view(shock_range, L))
+		if(M == user)
+			continue
+		L.Beam(M,icon_state="purple_lightning",time=5)
+		M.electrocute_act(shock_damage, L, safety=1)
+		do_sparks(4, FALSE, M)
+		playsound(M, 'sound/machines/defib_zap.ogg', 50, 1, -1)
 
 //Defile: Corrupts nearby stuff, unblesses floor tiles.
 /obj/effect/proc_holder/spell/aoe_turf/revenant/defile

code/game/gamemodes/nuclear/nuclearbomb.dm

@@ -434,14 +434,15 @@
 	sound_to_playing_players('sound/machines/alarm.ogg')
 	if(SSticker && SSticker.mode)
 		SSticker.roundend_check_paused = TRUE
-	sleep(100)
+	addtimer(CALLBACK(src, .proc/actually_explode), 100)
 
+/obj/machinery/nuclearbomb/proc/actually_explode()
 	if(!core)
 		Cinematic(CINEMATIC_NUKE_NO_CORE,world)
 		SSticker.roundend_check_paused = FALSE
 		return
 
-	GLOB.enter_allowed = 0
+	GLOB.enter_allowed = FALSE
 
 	var/off_station = 0
 	var/turf/bomb_location = get_turf(src)
@@ -533,9 +534,9 @@ This is here to make the tiles around the station mininuke change when it's arme
 			H.nuke_disk = null
 			return
 		user.visible_message("<span class='warning'>[user] captures [src]!</span>", "<span class='userdanger'>You've got the disk! Defend it with your life!</span>")
-		loc = H
+		forceMove(H)
 		H.nuke_disk = src
-		return 1
+		return TRUE
 	return ..()
 
 /obj/item/disk/nuclear/Destroy(force=FALSE)
@@ -547,20 +548,13 @@ This is here to make the tiles around the station mininuke change when it's arme
 /obj/item/disk/nuclear/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is going delta! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	playsound(user.loc, 'sound/machines/alarm.ogg', 50, -1, 1)
-	var/end_time = world.time + 100
-	var/newcolor = "#00FF00"
-	while(world.time < end_time)
-		if(!user)
-			return
-		if(newcolor == "#FF0000")
-			newcolor = "#00FF00"
-		else
-			newcolor = "#FF0000"
-		user.add_atom_colour(newcolor, ADMIN_COLOUR_PRIORITY)
-		sleep(1)
-	user.remove_atom_colour(ADMIN_COLOUR_PRIORITY)
-	user.visible_message("<span class='suicide'>[user] was destroyed by the nuclear blast!</span>")
-	return OXYLOSS
+	for(var/i in 1 to 100)
+		addtimer(CALLBACK(user, /atom/proc/add_atom_colour, (i % 2)? "#00FF00" : "#FF0000", ADMIN_COLOUR_PRIORITY), i)
+	addtimer(CALLBACK(user, /atom/proc/remove_atom_colour, ADMIN_COLOUR_PRIORITY), 101)
+	addtimer(CALLBACK(user, /atom/proc/visible_message, "<span class='suicide'>[user] was destroyed by the nuclear blast!</span>"), 101)
+	addtimer(CALLBACK(user, /mob/living/proc/adjustOxyLoss, 200), 101)
+	addtimer(CALLBACK(user, /mob/proc/death, 0), 101)
+	return MANUAL_SUICIDE
 
 /obj/item/disk/fakenucleardisk
 	name = "cheap plastic imitation of the nuclear authentication disk"