Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI

code/controllers/Processes/fast_process.dm

@@ -6,7 +6,7 @@
 
 /datum/controller/process/fast_process/statProcess()
 	..()
-	stat(null, "[fast_processing.len] fast machines")
+	stat(null, "[fast_processing.len] fast processes")
 
 /datum/controller/process/fast_process/doWork()
 	for(last_object in fast_processing)

code/controllers/Processes/timer.dm

@@ -79,6 +79,11 @@ var/global/datum/controller/process/timer/timer_master
 	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)