From fc4863f97c6a4a63fc2a84c1eea335e751078a15 Mon Sep 17 00:00:00 2001
From: Krausus <vaeusx@gmail.com>
Date: Mon, 18 May 2015 04:52:49 -0400
Subject: [PATCH] Fixes Signaler sleeping and frequencies

This brings handheld signalers in line with the frequency range of
cartridge-based signalers, and fixes anomalies' built-in signalers to
also be in this range.
---
 code/game/objects/effects/anomalies.dm |  5 +----
 code/modules/assembly/signaler.dm      | 23 ++++++++++++++---------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm
index 1716c0773ef..2f5d627f567 100644
--- a/code/game/objects/effects/anomalies.dm
+++ b/code/game/objects/effects/anomalies.dm
@@ -16,10 +16,7 @@
 	aSignal = new(src)
 	aSignal.code = rand(1,100)
 
-	aSignal.frequency = rand(1200, 1599)
-	if(IsMultiple(aSignal.frequency, 2))//signaller frequencies are always uneven!
-		aSignal.frequency++
-
+	aSignal.frequency = sanitize_frequency(rand(1441, 1489))
 
 /obj/effect/anomaly/proc/anomalyEffect()
 	if(prob(50))
diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index a46b683ca45..869720b1d43 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -21,8 +21,12 @@
 
 	New()
 		..()
-		spawn(40)
-			set_frequency(frequency)
+		if(!radio_controller)
+			spawn(40)
+				set_frequency(frequency)
+		else
+			spawn(1) // For things that set the frequency directly
+				set_frequency(frequency)
 		return
 	describe()
 		return "\The [src]'s power light is [receiving?"on":"off"]"
@@ -83,7 +87,7 @@
 
 		if (href_list["freq"])
 			var/new_frequency = (frequency + text2num(href_list["freq"]))
-			if(new_frequency < 1200 || new_frequency > 1600)
+			if(new_frequency < 1441 || new_frequency > 1489)
 				new_frequency = sanitize_frequency(new_frequency)
 			set_frequency(new_frequency)
 
@@ -144,13 +148,14 @@
 
 
 	proc/set_frequency(new_frequency)
-		spawn(20)
-			if(!radio_controller)
-				return
-			radio_controller.remove_object(src, frequency)
-			frequency = new_frequency
-			radio_connection = radio_controller.add_object(src, frequency, RADIO_CHAT)
+		if(!radio_controller)
+			sleep(20)
+		if(!radio_controller)
 			return
+		radio_controller.remove_object(src, frequency)
+		frequency = new_frequency
+		radio_connection = radio_controller.add_object(src, frequency, RADIO_CHAT)
+		return
 
 // Embedded signaller used in anomalies.
 /obj/item/device/assembly/signaler/anomaly