cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7446 from VOREStation/aro-bsbp

Browse Source 
Tweak bluespace backpack radio
This commit is contained in:
Aronai Sieyes
2020-04-26 11:30:34 -04:00
committed by GitHub
parent 9eceac3fe1 7a3b4fe041
commit 90fca7774d
3 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/communications.dm
View File

@@ -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,

2
code/game/machinery/telecomms/broadcaster.dm
View File

@@ -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 ---

23
code/game/objects/items/devices/radio/radiopack.dm
View File

@@ -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