From 4ce8f3bfac178ec0a906b15c683dc70f198fc290 Mon Sep 17 00:00:00 2001
From: Aronai Sieyes <arokha@arokha.com>
Date: Sun, 3 May 2020 21:02:52 -0400
Subject: [PATCH] Tweak bluespace backpack radio

---
 code/game/machinery/telecomms/broadcaster.dm  |  2 +-
 .../objects/items/devices/radio/radiopack.dm  | 23 ++++++-------------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm
index 8a4c88b51a..28c03f1eee 100644
--- a/code/game/machinery/telecomms/broadcaster.dm
+++ b/code/game/machinery/telecomms/broadcaster.dm
@@ -353,7 +353,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