Ports over Timer Subsystem

code/controllers/Processes/nano_mob_hunter.dm

@@ -44,7 +44,7 @@ DECLARE_GLOBAL_CONTROLLER(mob_hunt, mob_hunt_server)
 		recover_time = 3000
 	if(recover_time > 0)	//when provided with a negative or zero valued recover_time argument, the server won't auto-restart but can be manually rebooted still
 		//set a timer to automatically recover after recover_time has passed (can be manually restarted if you get impatient too)
-		addtimer(src, "auto_recover", recover_time, TRUE)
+		addtimer(CALLBACK(src, .proc/auto_recover), recover_time, TIMER_UNIQUE)
 
 /datum/controller/process/mob_hunt/proc/client_mob_update()
 	var/list/ex_players = list()

code/controllers/Processes/timer.dm

@@ -1,100 +0,0 @@
-var/global/datum/controller/process/timer/timer_master
-
-/datum/controller/process/timer
-	var/list/processing_timers = list()
-	var/list/hashes = list()
-
-/datum/controller/process/timer/setup()
-	name = "timer"
-	schedule_interval = 1 //every 0.1 seconds--2 server ticks
-	log_startup_progress("Timer process starting up.")
-
-/datum/controller/process/timer/statProcess()
-	..()
-	stat(null, "[processing_timers.len] timers")
-
-/datum/controller/process/timer/doWork()
-	if(!processing_timers.len)
-		disabled = 1 //nothing to do, lets stop firing.
-		return
-	for(last_object in processing_timers)
-		var/datum/timedevent/event = last_object
-		if(!event.thingToCall || check_datum_qdeleted(event.thingToCall))
-			qdel(event)
-		if(event.timeToRun <= world.time)
-			runevent(event)
-			qdel(event)
-		SCHECK
-
-DECLARE_GLOBAL_CONTROLLER(timer, timer_master)
-
-/datum/controller/process/timer/proc/runevent(datum/timedevent/event)
-	set waitfor = 0
-	if(event.thingToCall)
-		if(event.thingToCall == GLOBAL_PROC && istext(event.procToCall))
-			call("/proc/[event.procToCall]")(arglist(event.argList))
-		else
-			call(event.thingToCall, event.procToCall)(arglist(event.argList))
-
-/datum/timedevent
-	var/thingToCall
-	var/procToCall
-	var/timeToRun
-	var/argList
-	var/id
-	var/hash
-	var/static/nextid = 1
-
-/datum/timedevent/New()
-	id = nextid++
-
-/datum/timedevent/Destroy()
-	timer_master.processing_timers -= src
-	timer_master.hashes -= hash
-	return QDEL_HINT_IWILLGC
-
-/proc/addtimer(thingToCall, procToCall, wait, unique = FALSE, ...)
-	if(!timer_master) //can't run timers before the mc has been created
-		return
-	if(!thingToCall || !procToCall)
-		return
-	if(timer_master.disabled)
-		timer_master.disabled = 0
-
-	var/datum/timedevent/event = new()
-	event.thingToCall = thingToCall
-	event.procToCall = procToCall
-	event.timeToRun = world.time + wait
-	var/hashlist = args.Copy()
-
-	hashlist[1] = "[thingToCall](\ref[thingToCall])"
-	event.hash = jointext(hashlist, null)
-	if(args.len > 4)
-		event.argList = args.Copy(5)
-
-	// Check for dupes if unique = 1.
-	if(unique)
-		var/datum/timedevent/hash_event = timer_master.hashes[event.hash]
-		if(hash_event)
-			return hash_event.id
-	timer_master.hashes[event.hash] = event
-	if(wait <= 0)
-		timer_master.runevent(event)
-		timer_master.hashes -= event.hash
-		return
-	// If we are unique (or we're not checking that), add the timer and return the id.
-	timer_master.processing_timers += event
-
-	return event.id
-
-/proc/deltimer(id)
-	if(id == 0)
-		// No event will correspond to an id of 0 - the timer does not exist
-		// Save us a possibly expensive iteration through the timer list
-		// This would probably be more efficient in general if we used an associative list instead
-		return 0
-	for(var/datum/timedevent/event in timer_master.processing_timers)
-		if(event.id == id)
-			qdel(event)
-			return 1
-	return 0

code/controllers/Processes/weather.dm

@@ -37,7 +37,7 @@ var/global/datum/controller/process/weather/weather_master
 		var/datum/weather/W = pickweight(possible_weather_for_this_z)
 		run_weather(W.name)
 		eligible_zlevels -= Z
-		addtimer(src, "make_z_eligible", rand(3000, 6000) + W.weather_duration_upper, TRUE, Z) //Around 5-10 minutes between weathers
+		addtimer(CALLBACK(src, .proc/make_z_eligible, Z), rand(3000, 6000) + W.weather_duration_upper, TIMER_UNIQUE) //Around 5-10 minutes between weathers
 
 DECLARE_GLOBAL_CONTROLLER(weather, weather_master)