From 412952e2c6c0eb28baa389b70884cc62709abeed Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Thu, 11 Feb 2016 05:06:25 -0500
Subject: [PATCH] wait for it

---
 code/controllers/Processes/timer.dm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/code/controllers/Processes/timer.dm b/code/controllers/Processes/timer.dm
index 426770a2ad9..8cea3c60514 100644
--- a/code/controllers/Processes/timer.dm
+++ b/code/controllers/Processes/timer.dm
@@ -22,11 +22,14 @@ var/global/datum/controller/process/timer/PStimer
 		if(!event.thingToCall || qdeleted(event.thingToCall))
 			qdel(event)
 		if(event.timeToRun <= world.time)
-			spawn(-1)
-				call(event.thingToCall, event.procToCall)(arglist(event.argList))
+			runevent(event)
 			qdel(event)
 		SCHECK
 
+/datum/controller/process/timer/proc/runevent(datum/timedevent/event)
+	set waitfor = 0
+	call(event.thingToCall, event.procToCall)(arglist(event.argList))
+
 /datum/timedevent
 	var/thingToCall
 	var/procToCall