cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-22 04:28:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Shortwave and Relay Tweaks

Browse Source
This commit is contained in:
Neerti
2019-04-29 00:01:07 -04:00
committed by VirgoBot
parent 7943c60676
commit 0d76e09b7c
3 changed files with 48 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/radio/radio.dm
+5 -2
View File
@@ -422,7 +422,7 @@ var/global/list/default_medbay_channels = list(
subspace_transmission = FALSE
return Broadcast_Message(connection, M, voicemask, pick(M.speak_emote),
src, message, displayname, jobname, real_name, M.voice_name,
signal.transmission_method, signal.data["compression"], list(position.z), connection.frequency,verb,speaking)
signal.transmission_method, signal.data["compression"], GetConnectedZlevels(position.z), connection.frequency,verb,speaking)
/* ###### Intercoms and station-bounced radios ###### */
@@ -481,6 +481,7 @@ var/global/list/default_medbay_channels = list(
//THIS IS TEMPORARY. YEAH RIGHT
if(!connection) return 0 //~Carn
<<<<<<< HEAD
//VOREStation Add Start
if(bluespace_radio)
@@ -489,9 +490,11 @@ var/global/list/default_medbay_channels = list(
0, signal.data["compression"], list(0), connection.frequency,verb,speaking)
//VOREStation Add End
=======
>>>>>>> 2c20c12... Merge pull request #6136 from Novacat/nova-alerts
return Broadcast_Message(connection, M, voicemask, pick(M.speak_emote),
src, message, displayname, jobname, real_name, M.voice_name,
filter_type, signal.data["compression"], list(position.z), connection.frequency,verb,speaking)
filter_type, signal.data["compression"], GetConnectedZlevels(position.z), connection.frequency,verb,speaking)
/obj/item/device/radio/hear_talk(mob/M as mob, msg, var/verb = "says", var/datum/language/speaking = null)