From 83f33163cea54a6279fb780fca18eb64f3901a76 Mon Sep 17 00:00:00 2001
From: Citinited <kendo123@hotmail.co.uk>
Date: Tue, 3 Jul 2018 02:32:44 +0100
Subject: [PATCH] Better way of handling timers

---
 code/game/machinery/doppler_array.dm | 10 ++++------
 nano/templates/doppler_array.tmpl    |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm
index 9c957954dd9..2d48845fe06 100644
--- a/code/game/machinery/doppler_array.dm
+++ b/code/game/machinery/doppler_array.dm
@@ -9,7 +9,6 @@ var/list/doppler_arrays = list()
 	anchored = 1
 	atom_say_verb = "states coldly"
 	var/list/logged_explosions = list()
-	var/printer_timer
 
 /datum/explosion_log
 	var/logged_time
@@ -83,15 +82,14 @@ var/list/doppler_arrays = list()
 	if(!logged_explosions.len)
 		atom_say("<span class='notice'>No logs currently stored in internal database.</span>")
 		return
-	if(printer_timer)
+	if(active_timers)
 		to_chat(user, "<span class='notice'>[src] is already printing something, please wait.</span>")
 		return
 	atom_say("<span class='notice'>Printing explosive log. Standby...</span>")
-	printer_timer = addtimer(CALLBACK(src, .proc/print), 50)
+	addtimer(CALLBACK(src, .print), 50)
 
 /obj/machinery/doppler_array/proc/print()
-	printer_timer = FALSE
-	visible_message("<span class='notice'>[src] rattles off a sheet of paper!</span>")
+	visible_message("<span class='notice'>[src] prints a piece of paper!</span>")
 	playsound(loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1)
 	var/obj/item/paper/explosive_log/P = new(get_turf(src))
 	for(var/datum/explosion_log/E in logged_explosions)
@@ -177,7 +175,7 @@ var/list/doppler_arrays = list()
 			"theoretical_size_message" = E.theoretical_size_message,
 			"unique_datum_id" = E.unique_datum_id))
 	data["explosion_data"] = explosion_data
-	data["printer_timer"] = printer_timer
+	data["printing"] = active_timers
 	return data
 
 /obj/machinery/doppler_array/Topic(href, href_list)
diff --git a/nano/templates/doppler_array.tmpl b/nano/templates/doppler_array.tmpl
index 49aef551c09..d3bb40744b2 100644
--- a/nano/templates/doppler_array.tmpl
+++ b/nano/templates/doppler_array.tmpl
@@ -21,5 +21,5 @@
 		</div>
 	{{/for}}
 	<br/>
-	{{:helper.link("Print all logs", "print", {"print_logs": 'yes'}, data.printer_timer ? 'disabled' : null)}}
+	{{:helper.link("Print all logs", "print", {"print_logs": 'yes'}, data.printing ? 'disabled' : null)}}
 {{/if}}