From 63845ef2429c417eb670bd65ff29b1cbd0f943b3 Mon Sep 17 00:00:00 2001
From: joep van der velden <joepvelden@hotmail.com>
Date: Wed, 24 Jun 2020 14:17:56 +0200
Subject: [PATCH] Makes the assembly cooldown happen before it triggers.
 Stopping an infinite loop

---
 code/modules/assembly/assembly.dm  | 6 ++----
 code/modules/assembly/infrared.dm  | 7 +++----
 code/modules/assembly/proximity.dm | 7 +++----
 code/modules/assembly/signaler.dm  | 3 +--
 code/modules/assembly/timer.dm     | 7 +++----
 5 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm
index 827e7893396..5fea7baa019 100644
--- a/code/modules/assembly/assembly.dm
+++ b/code/modules/assembly/assembly.dm
@@ -59,8 +59,7 @@
 	cooldown--
 	if(cooldown <= 0)
 		return FALSE
-	spawn(10)
-		process_cooldown()
+	addtimer(CALLBACK(src, .proc/process_cooldown), 10)
 	return TRUE
 
 /obj/item/assembly/Destroy()
@@ -94,8 +93,7 @@
 	if(!secured || cooldown > 0)
 		return FALSE
 	cooldown = 2
-	spawn(10)
-		process_cooldown()
+	addtimer(CALLBACK(src, .proc/process_cooldown), 10)
 	return TRUE
 
 /obj/item/assembly/toggle_secure()
diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm
index 19263e010ab..400b50614a6 100644
--- a/code/modules/assembly/infrared.dm
+++ b/code/modules/assembly/infrared.dm
@@ -127,13 +127,12 @@
 /obj/item/assembly/infra/proc/trigger_beam()
 	if(!secured || !on || cooldown > 0)
 		return FALSE
-	pulse(0)
+	cooldown = 2
+	pulse(FALSE)
 	audible_message("[bicon(src)] *beep* *beep*", null, 3)
 	if(first)
 		qdel(first)
-	cooldown = 2
-	spawn(10)
-		process_cooldown()
+	addtimer(CALLBACK(src, .proc/process_cooldown), 10)
 
 /obj/item/assembly/infra/interact(mob/user)//TODO: change this this to the wire control panel
 	if(!secured)	return
diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
index 7e777f235b1..caefabcb1f8 100644
--- a/code/modules/assembly/proximity.dm
+++ b/code/modules/assembly/proximity.dm
@@ -47,11 +47,10 @@
 /obj/item/assembly/prox_sensor/proc/sense()
 	if(!secured || !scanning || cooldown > 0)
 		return FALSE
-	pulse(0)
-	visible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*")
 	cooldown = 2
-	spawn(10)
-		process_cooldown()
+	pulse(FALSE)
+	visible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*")
+	addtimer(CALLBACK(src, .proc/process_cooldown), 10)
 
 /obj/item/assembly/prox_sensor/process()
 	if(timing && (time >= 0))
diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index f774d28921f..2759d12c21a 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -41,8 +41,7 @@
 	if(cooldown > 0)
 		return FALSE
 	cooldown = 2
-	spawn(10)
-		process_cooldown()
+	addtimer(CALLBACK(src, .proc/process_cooldown), 10)
 
 	signal()
 	return TRUE
diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm
index cab132ab747..5bbd9a26538 100644
--- a/code/modules/assembly/timer.dm
+++ b/code/modules/assembly/timer.dm
@@ -39,12 +39,11 @@
 /obj/item/assembly/timer/proc/timer_end()
 	if(!secured || cooldown > 0)
 		return FALSE
-	pulse(0)
+	cooldown = 2
+	pulse(FALSE)
 	if(loc)
 		loc.visible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*")
-	cooldown = 2
-	spawn(10)
-		process_cooldown()
+	addtimer(CALLBACK(src, .proc/process_cooldown), 10)
 
 /obj/item/assembly/timer/process()
 	if(timing && (time > 0))