From 7a3b4fe041386b89924b73f78c0b4a86f2e04968 Mon Sep 17 00:00:00 2001
From: Aronai Sieyes <arokha@arokha.com>
Date: Sat, 25 Apr 2020 18:40:32 -0400
Subject: [PATCH] Tweak bluespace backpack radio

---
 code/controllers/communications.dm            |  2 +-
 code/game/machinery/telecomms/broadcaster.dm  |  2 +-
 .../objects/items/devices/radio/radiopack.dm  | 23 ++++++-------------
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/code/controllers/communications.dm b/code/controllers/communications.dm
index 3b3512bbf9..b99ab68064 100644
--- a/code/controllers/communications.dm
+++ b/code/controllers/communications.dm
@@ -125,7 +125,7 @@ var/const/EXP_FREQ = 1361
 var/const/MED_I_FREQ = 1485
 var/const/SEC_I_FREQ = 1475
 
-var/const/TALON_FREQ = 1481 //VOREStation Add
+var/const/TALON_FREQ = 1363 //VOREStation Add
 
 var/list/radiochannels = list(
 	"Common"		= PUB_FREQ,
diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm
index 17bc771734..9a9ec69278 100644
--- a/code/game/machinery/telecomms/broadcaster.dm
+++ b/code/game/machinery/telecomms/broadcaster.dm
@@ -355,7 +355,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 
 	for(var/obj/item/device/radio/R in forced_radios)
 		//Cursory check to ensure they are 'on' and stuff
-		if(R.receive_range(display_freq, list(0)))
+		if(R.receive_range(display_freq, list(0)) > -1)
 			radios |= R
 
 	// --- Broadcast only to intercom devices ---
diff --git a/code/game/objects/items/devices/radio/radiopack.dm b/code/game/objects/items/devices/radio/radiopack.dm
index c2ba25ecc2..8f2e849320 100644
--- a/code/game/objects/items/devices/radio/radiopack.dm
+++ b/code/game/objects/items/devices/radio/radiopack.dm
@@ -132,22 +132,13 @@
 		return -1
 	if(!listening)
 		return -1
-	if(is_jammed(src))
+	if(!on)
 		return -1
-	if (!on)
+	if(!freq)
 		return -1
-	if (!freq) //recieved on main frequency
-		if (!listening)
-			return -1
-	else
-		var/accept = (freq==frequency && listening)
-		if (!accept)
-			for (var/ch_name in channels)
-				var/datum/radio_frequency/RF = secure_radio_connections[ch_name]
-				if (RF && RF.frequency==freq && (channels[ch_name]&FREQ_LISTENING))
-					accept = 1
-					break
-		if (!accept)
-			return -1
 	
-	return canhear_range
+	//Only listen on main freq
+	if(freq == frequency)
+		return canhear_range
+	else
+		return -1