Merge pull request #18729 from coiax/remove-spawn-3

Remove spawn III

code/datums/mind.dm

@@ -1717,8 +1717,7 @@
 			if(istype(S, type))
 				continue
 		S.charge_counter = delay
-		spawn(0)
+		addtimer(S, "start_recharge", 0)
-			S.start_recharge()
 
 /datum/mind/proc/get_ghost(even_if_they_cant_reenter)
 	for(var/mob/dead/observer/G in dead_mob_list)

code/game/area/areas.dm

@@ -117,8 +117,7 @@
 					if(D.operating)
 						D.nextstate = CLOSED
 					else if(!D.density)
-						spawn(0)
+						addtimer(D, "close", 0)
-							D.close()
 			for(var/obj/machinery/firealarm/F in RA)
 				F.update_icon()
 		for (var/obj/machinery/camera/C in RA)
@@ -143,8 +142,7 @@
 					if(D.operating)
 						D.nextstate = OPEN
 					else if(D.density)
-						spawn(0)
+						addtimer(D, "open", 0)
-							D.open()
 			for(var/obj/machinery/firealarm/F in RA)
 				F.update_icon()
 
@@ -177,8 +175,7 @@
 	for (var/mob/living/silicon/SILICON in player_list)
 		if(SILICON.triggerAlarm("Burglar", src, cameras, trigger))
 			//Cancel silicon alert after 1 minute
-			spawn(600)
+			addtimer(SILICON, "cancelAlarm", 600, FALSE,"Burglar",src,trigger)
-				SILICON.cancelAlarm("Burglar", src, trigger)
 
 /area/proc/set_fire_alarm_effect()
 	fire = 1
@@ -218,9 +215,7 @@
 				if(D.operating)
 					D.nextstate = OPEN
 				else if(D.density)
-					spawn(0)
+					addtimer(D, "open", 0)
-					D.open()
-	return
 
 /area/proc/updateicon()
 	if ((fire || eject || party) && (!requires_power||power_environ))//If it doesn't require power, can still activate this proc.

code/game/gamemodes/clock_cult/clock_ratvar.dm

@@ -196,8 +196,7 @@
 	var/image/alert_overlay = image('icons/effects/clockwork_effects.dmi', "ratvar_alert")
 	var/area/A = get_area(src)
 	notify_ghosts("The Justiciar's light calls to you! Reach out to Ratvar in [A.name] to be granted a shell to spread his glory!", null, source = src, alert_overlay = alert_overlay)
-	spawn(50)
+	addtimer(SSshuttle.emergency, "request", 50, FALSE, null, 0.3)
-		SSshuttle.emergency.request(null, 0.3)
 
 
 /obj/structure/clockwork/massive/ratvar/Destroy()

code/game/gamemodes/handofgod/structures.dm

@@ -451,9 +451,7 @@
 		user << "<span class='notice'>The water feels warm and soothing as you touch it. The fountain immediately dries up shortly afterwards.</span>"
 		user.reagents.add_reagent("godblood",20)
 	update_icons()
-	spawn(time_between_uses)
+	addtimer(src, "update_icons", time_between_uses)
-		if(src)
-			update_icons()
 
 
 /obj/structure/divine/healingfountain/update_icons()

code/game/machinery/camera/camera.dm

@@ -96,9 +96,7 @@
 						if(can_use())
 							cameranet.addCamera(src)
 						emped = 0 //Resets the consecutive EMP count
-						spawn(100)
+						addtimer(src, "cancelCameraAlarm", 100)
-							if(!qdeleted(src))
-								cancelCameraAlarm()
 			for(var/mob/O in mob_list)
 				if (O.client && O.client.eye == src)
 					O.unset_machine()
@@ -282,9 +280,7 @@
 	if(status)
 		change_msg = "reactivates"
 		triggerCameraAlarm()
-		spawn(100)
+		addtimer(src, "cancelCameraAlarm", 100)
-			if(!qdeleted(src))
-				cancelCameraAlarm()
 	if(displaymessage)
 		if(user)
 			visible_message("<span class='danger'>[user] [change_msg] [src]!</span>")

code/game/machinery/computer/camera.dm

@@ -108,8 +108,7 @@
 			user.reset_perspective(C)
 		watchers[user] = C
 		use_power(50)
-		spawn(5)
+		addtimer(src, "use_camera_console", 5, FALSE, user)
-			use_camera_console(user)
 	else
 		user.unset_machine()
 

code/game/machinery/computer/cloning.dm

@@ -22,8 +22,6 @@
 	..()
 	spawn(5)
 		updatemodules()
-		return
-	return
 
 /obj/machinery/computer/cloning/process()
 	if(!(scanner && pod1 && autoprocess))

code/game/machinery/computer/message.dm

@@ -48,7 +48,8 @@
 			MK.loc = src.loc
 			// Will help make emagging the console not so easy to get away with.
 			MK.info += "<br><br><font color='red'><3E>%@%(*$%&(<28>&?*(%&<26>/{}</font>"
-			spawn(100*length(src.linkedServer.decryptkey)) UnmagConsole()
+			var/time = 100 * length(src.linkedServer.decryptkey)
+			addtimer(src, "UnmagConsole", time)
 			message = rebootmsg
 		else
 			user << "<span class='notice'>A no server error appears on the screen.</span>"

code/game/machinery/doors/brigdoors.dm

@@ -92,8 +92,7 @@
 	for(var/obj/machinery/door/window/brigdoor/door in targets)
 		if(door.density)
 			continue
-		spawn(0)
+		addtimer(door, "close", 0)
-			door.close()
 
 	for(var/obj/structure/closet/secure_closet/brig/C in targets)
 		if(C.broken)
@@ -122,8 +121,7 @@
 	for(var/obj/machinery/door/window/brigdoor/door in targets)
 		if(!door.density)
 			continue
-		spawn(0)
+		addtimer(door, "open", 0)
-			door.open()
 
 	for(var/obj/structure/closet/secure_closet/brig/C in targets)
 		if(C.broken)

code/game/machinery/embedded_controller/embedded_controller_base.dm

@@ -58,10 +58,10 @@
 
 	if(program)
 		program.receive_user_command(href_list["command"])
-		spawn(5) program.process()
+		addtimer(program, "process", 5)
 
 	usr.set_machine(src)
-	spawn(5) src.updateDialog()
+	addtimer(src, "updateDialog", 5)
 
 /obj/machinery/embedded_controller/process()
 	if(program)

code/game/machinery/magnet.dm

@@ -134,8 +134,7 @@
 				on = !on
 
 				if(on)
-					spawn()
+					addtimer(src, "magnetic_process", 0)
-						magnetic_process()
 
 
 

code/game/machinery/syndicatebeacon.dm

@@ -55,7 +55,7 @@
 			if(1)
 				temptext = "<font color=red><i><b>Double-crosser. You planned to betray us from the start. Allow us to repay the favor in kind.</b></i></font>"
 				src.updateUsrDialog()
-				spawn(rand(50,200)) selfdestruct()
+				addtimer(src, "selfdestruct", rand(50, 200))
 				return
 		if(istype(M, /mob/living/carbon/human))
 			var/mob/living/carbon/human/N = M

code/game/machinery/syndicatebomb.dm

@@ -362,9 +362,8 @@
 			RC.reagents.trans_to(reactants, RC.reagents.total_volume*fraction, 1, 1, 1)
 		chem_splash(get_turf(src), spread_range, list(reactants), temp_boost)
 
-		spawn(10)
+		// Detonate it again in one second, until it's out of juice.
-			detonate() // Detonate it again in one second, until it's out of juice.
+		addtimer(src, "detonate", 10)
-
 
 	// If it's not a time release bomb, do normal explosion
 

code/game/mecha/equipment/mecha_equipment.dm

@@ -85,8 +85,7 @@
 /obj/item/mecha_parts/mecha_equipment/proc/start_cooldown()
 	set_ready_state(0)
 	chassis.use_power(energy_drain)
-	spawn(equip_cooldown)
+	addtimer(src, "set_ready_state", equip_cooldown, FALSE, 1)
-		set_ready_state(1)
 
 /obj/item/mecha_parts/mecha_equipment/proc/do_after_cooldown(atom/target)
 	if(!chassis)

code/game/mecha/equipment/weapons/weapons.dm

@@ -63,8 +63,7 @@
 /obj/item/mecha_parts/mecha_equipment/weapon/energy/start_cooldown()
 	set_ready_state(0)
 	chassis.use_power(energy_drain*get_shot_amount())
-	spawn(equip_cooldown)
+	addtimer(src, "set_ready_state", equip_cooldown, FALSE, 1)
-		set_ready_state(1)
 
 /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser
 	equip_cooldown = 8
@@ -340,10 +339,7 @@
 	var/turf/T = get_turf(src)
 	message_admins("[key_name(chassis.occupant, chassis.occupant.client)](<A HREF='?_src_=holder;adminmoreinfo=\ref[chassis.occupant]'>?</A>) fired a [src] in ([T.x],[T.y],[T.z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>JMP</a>)",0,1)
 	log_game("[key_name(chassis.occupant)] fired a [src] ([T.x],[T.y],[T.z])")
-	spawn(det_time)
+	addtimer(F, "prime", det_time)
-		if(F)
-			F.prime()
-
 
 /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/clusterbang //Because I am a heartless bastard -Sieve //Heartless? for making the poor man's honkblast? - Kaze
 	name = "\improper SOB-3 grenade launcher"

code/game/mecha/mecha.dm

@@ -383,7 +383,6 @@
 				speech_bubble_recipients.Add(M.client)
 		spawn(0)
 			flick_overlay(image('icons/mob/talk.dmi', src, "machine[say_test(raw_message)]",MOB_LAYER+1), speech_bubble_recipients, 30)
-	return
 
 ////////////////////////////
 ///// Action processing ////
@@ -430,7 +429,6 @@
 		melee_can_hit = 0
 		spawn(melee_cooldown)
 			melee_can_hit = 1
-	return
 
 
 /obj/mecha/proc/range_action(atom/target)

code/game/objects/items/body_egg.dm

@@ -20,16 +20,14 @@
 	owner.status_flags |= XENO_HOST
 	START_PROCESSING(SSobj, src)
 	owner.med_hud_set_status()
-	spawn(0)
+	addtimer(src, "AddInfectionImages", 0, FALSE, owner)
-		AddInfectionImages(owner)
 
 /obj/item/organ/body_egg/Remove(var/mob/living/carbon/M, special = 0)
 	STOP_PROCESSING(SSobj, src)
 	if(owner)
 		owner.status_flags &= ~(XENO_HOST)
 		owner.med_hud_set_status()
-		spawn(0)
+		addtimer(src, "RemoveInfectionImages", 0, FALSE, owner)
-			RemoveInfectionImages(owner)
 	..()
 
 /obj/item/organ/body_egg/process()

code/game/objects/items/weapons/explosives.dm

@@ -92,8 +92,7 @@
 
 		target.add_overlay(image_overlay, 1)
 		user << "<span class='notice'>You plant the bomb. Timer counting down from [timer].</span>"
-		spawn(timer*10)
+		addtimer(src, "explode", timer * 10)
-			explode()
 
 /obj/item/weapon/c4/proc/explode()
 	if(qdeleted(src))

code/game/objects/items/weapons/grenades/chem_grenade.dm

@@ -45,8 +45,7 @@
 				var/mob/living/carbon/C = user
 				C.throw_mode_on()
 
-			spawn(det_time)
+			addtimer(src, "prime", det_time)
-				prime()
 
 
 /obj/item/weapon/grenade/chem_grenade/attackby(obj/item/I, mob/user, params)

code/game/objects/items/weapons/grenades/clusterbuster.dm

@@ -43,9 +43,7 @@
 	payload = payload_type
 	active = 1
 	walk_away(src,loc,rand(1,4))
-	spawn(rand(15,60))
+	addtimer(src, "prime", rand(15,60))
-		prime()
-
 
 /obj/item/weapon/grenade/clusterbuster/segment/prime()
 

code/game/objects/items/weapons/grenades/ghettobomb.dm

@@ -55,8 +55,7 @@
 			if(iscarbon(user))
 				var/mob/living/carbon/C = user
 				C.throw_mode_on()
-			spawn(det_time)
+			addtimer(src, "prime", det_time)
-				prime()
 
 /obj/item/weapon/grenade/iedcasing/prime() //Blowing that can up
 	update_mob()

code/game/objects/structures/aliens.dm

@@ -186,9 +186,7 @@
 	if(istype(loc, /turf/open/space))
 		qdel(src)
 		return
-	spawn(rand(150, 200))
+	addtimer(src, "Life", rand(150, 200))
-		if(src)
-			Life()
 
 /obj/structure/alien/weeds/Destroy()
 	linked_node = null
@@ -264,8 +262,7 @@
 /obj/structure/alien/egg/New()
 	new /obj/item/clothing/mask/facehugger(src)
 	..()
-	spawn(rand(MIN_GROWTH_TIME, MAX_GROWTH_TIME))
+	addtimer(src, "Grow", rand(MIN_GROWTH_TIME, MAX_GROWTH_TIME))
-		Grow()
 
 /obj/structure/alien/egg/Destroy()
 	remove_from_proximity_list(src, 1)

code/game/objects/structures/hivebot.dm

@@ -15,8 +15,7 @@
 	smoke.start()
 	visible_message("<span class='boldannounce'>The [src] warps in!</span>")
 	playsound(src.loc, 'sound/effects/EMPulse.ogg', 25, 1)
-	spawn(rand(10,600))
+	addtimer(src, "warpbots", rand(10, 600))
-		warpbots()
 
 /obj/structure/hivebot_beacon/proc/warpbots()
 	icon_state = "def_radar"

code/modules/assembly/infrared.dm

@@ -102,9 +102,7 @@
 	pulse(0)
 	audible_message("\icon[src] *beep* *beep*", null, 3)
 	cooldown = 2
-	spawn(10)
+	addtimer(src, "process_cooldown", 10)
-		process_cooldown()
-	return
 
 /obj/item/device/assembly/infra/interact(mob/user)//TODO: change this this to the wire control panel
 	if(is_secured(user))

code/modules/assembly/proximity.dm

@@ -64,8 +64,7 @@
 	pulse(0)
 	audible_message("\icon[src] *beep* *beep*", null, 3)
 	cooldown = 2
-	spawn(10)
+	addtimer(src, "process_cooldown", 10)
-		process_cooldown()
 
 
 /obj/item/device/assembly/prox_sensor/process()
@@ -80,8 +79,7 @@
 /obj/item/device/assembly/prox_sensor/dropped()
 	..()
 	if(scanning)
-		spawn(0)
+		addtimer(src, "sense", 0)
-			sense()
 
 
 /obj/item/device/assembly/prox_sensor/toggle_scan(scan)

code/modules/clothing/glasses/engine_goggles.dm

@@ -67,8 +67,7 @@
 				O.invisibility = 0
 				invis_objects += O
 
-	spawn(5)
+	addtimer(src, "invis_update", 5)
-		invis_update()
 
 /obj/item/clothing/glasses/meson/engine/proc/invis_update()
 	for(var/obj/O in invis_objects)

code/modules/events/spacevine.dm

@@ -125,7 +125,6 @@
 /datum/spacevine_mutation/space_covering/on_death(obj/effect/spacevine/holder)
 	if(istype(holder.loc, /turf/open/floor/vines))
 		var/turf/open/spaceturf = holder.loc
-		spawn(0)
 		spaceturf.ChangeTurf(/turf/open/space)
 
 /datum/spacevine_mutation/bluespace

code/modules/food_and_drinks/drinks/drinks.dm

@@ -77,10 +77,7 @@
 		if(isrobot(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell
 			var/mob/living/silicon/robot/bro = user
 			bro.cell.use(30)
-			spawn(600)
+			addtimer(reagents, "add_reagent", 600, FALSE, refill, trans)
-				reagents.add_reagent(refill, trans)
-
-	return
 
 /obj/item/weapon/reagent_containers/food/drinks/attackby(obj/item/I, mob/user, params)
 	if(I.is_hot())

code/modules/mining/equipment.dm

@@ -154,9 +154,7 @@
 				L.Weaken(3)
 				if(ishuman(L))
 					shake_camera(L, 20, 1)
-					spawn(20)
+					addtimer(L, "vomit", 20)
-						if(L)
-							L.vomit(20)
 
 /**********************Resonator**********************/
 

code/modules/mob/interactive.dm

@@ -734,8 +734,7 @@
 		tryWalk(TARGET)
 	LAST_TARGET = TARGET
 	if(alternateProcessing)
-		spawn(processTime)
+		addtimer(src, "doProcess", processTime)
-			doProcess()
 
 /mob/living/carbon/human/interactive/proc/favouredObjIn(var/list/inList)
 	var/list/outList = list()

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

@@ -131,8 +131,7 @@
 				m_type = 2
 				if(((dna.features["wings"] != "None") && !("wings" in dna.species.mutant_bodyparts)))
 					OpenWings()
-					spawn(20)
+					addtimer(src, "CloseWings", 20)
-						CloseWings()
 
 		if ("wings")
 			if (!src.restrained())

code/modules/mob/living/silicon/robot/robot.dm

@@ -718,8 +718,7 @@
 			if (prob(85))
 				Stun(2)
 				step(src,get_dir(M,src))
-				spawn(5)
+				addtimer(src, "step", 5, FALSE, src, get_dir(M, src))
-					step(src,get_dir(M,src))
 				add_logs(M, src, "pushed")
 				playsound(loc, 'sound/weapons/pierce.ogg', 50, 1, -1)
 				visible_message("<span class='danger'>[M] has forced back [src]!</span>", \

code/modules/mob/living/simple_animal/bot/ed209bot.dm

@@ -306,15 +306,13 @@ Auto Patrol[]"},
 	target = null
 	last_found = world.time
 	frustration = 0
-	spawn(0)
+	addtimer(src, "handle_automated_action", 0) //ensure bot quickly responds
-		handle_automated_action() //ensure bot quickly responds
 
 /mob/living/simple_animal/bot/ed209/proc/back_to_hunt()
 	anchored = 0
 	frustration = 0
 	mode = BOT_HUNT
-	spawn(0)
+	addtimer(src, "handle_automated_action", 0) //ensure bot quickly responds
-		handle_automated_action() //ensure bot quickly responds
 
 // look for a criminal in view of the bot
 

code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm

@@ -117,10 +117,8 @@
 	visible_message("<span class='cult'><font size=5>\"<b>Die.</b>\"</font></span>")
 
 	sleep(10)
-	spawn()
+	addtimer(src, "spiral_shoot", 0)
-		spiral_shoot()
+	addtimer(src, "spiral_shoot", 0, FALSE, 1)
-	spawn()
-		spiral_shoot(1)
 
 /mob/living/simple_animal/hostile/megafauna/colossus/proc/spiral_shoot(negative = 0)
 	spawn()

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

@@ -154,8 +154,7 @@
 			retreat_distance = 10
 			minimum_distance = 10
 			if(will_burrow)
-				spawn(chase_time)
+				addtimer(src, "Burrow", chase_time)
-					Burrow()
 
 /mob/living/simple_animal/hostile/asteroid/goldgrub/AttackingTarget()
 	if(istype(target, /obj/item/weapon/ore))
@@ -344,8 +343,7 @@
 
 /mob/living/simple_animal/hostile/asteroid/hivelordbrood/New()
 	..()
-	spawn(100)
+	addtimer(src, "death", 100)
-		death()
 
 /mob/living/simple_animal/hostile/asteroid/hivelordbrood/blood
 	name = "blood brood"
@@ -501,8 +499,7 @@
 	if(istype(turftype, /turf/closed/mineral))
 		var/turf/closed/mineral/M = turftype
 		M.gets_drilled()
-	spawn(10)
+	addtimer(src, "Trip", 10)
-		Trip()
 
 /obj/effect/goliath_tentacle/original
 
@@ -653,8 +650,7 @@
 	environment_smash = 2
 	mob_size = MOB_SIZE_LARGE
 	speed = 1
-	spawn(100)
+	addtimer(src, "Deflate", 100)
-		Deflate()
 
 /mob/living/simple_animal/hostile/asteroid/fugu/proc/Deflate()
 	if(wumbo)

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

@@ -393,8 +393,7 @@
 				else if(canmove && isturf(loc) && prob(33))
 					step(src, pick(cardinal))
 		else if(!AIproc)
-			spawn()
+			addtimer(src, "AIprocess", 0)
-				AIprocess()
 
 /mob/living/simple_animal/slime/handle_automated_movement()
 	return //slime random movement is currently handled in handle_targets()

code/modules/projectiles/guns/grenade_launcher.dm

@@ -50,5 +50,4 @@
 	F.active = 1
 	F.icon_state = initial(icon_state) + "_active"
 	playsound(user.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
-	spawn(15)
+	addtimer(F, "prime", 15)
-		F.prime()

code/modules/projectiles/guns/medbeam.dm

@@ -47,8 +47,7 @@
 	current_target = target
 	active = 1
 	current_beam = new(user,current_target,time=6000,beam_icon_state="medbeam",btype=/obj/effect/ebeam/medical)
-	spawn(0)
+	addtimer(current_beam, "Start", 0)
-		current_beam.Start()
 
 	feedback_add_details("gun_fired","[src.type]")
 

code/modules/projectiles/projectile/energy.dm

@@ -29,8 +29,7 @@
 		if(C.dna && C.dna.check_mutation(HULK))
 			C.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
 		else if(C.status_flags & CANWEAKEN)
-			spawn(5)
+			addtimer(C, "do_jitter_animation", 5, FALSE, jitter)
-				C.do_jitter_animation(jitter)
 
 /obj/item/projectile/energy/electrode/on_range() //to ensure the bolt sparks when it reaches the end of its range if it didn't hit a target yet
 	var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread