cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-17 21:52:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6136 from Novacat/nova-alerts

Browse Source 
Shortwave and Relay Tweaks
This commit is contained in:
Neerti
2019-04-29 00:01:07 -04:00
committed by GitHub
parent 2baef09f0f 17c1a7908e
commit 2c20c129fc
3 changed files with 43 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/machinery/telecomms/telecomunications.dm
View File

@@ -371,6 +371,10 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
var/broadcasting = 1
var/receiving = 1
/obj/machinery/telecomms/relay/forceMove(var/newloc)
. = ..(newloc)
listening_level = z
/obj/machinery/telecomms/relay/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from)
// Add our level and send it back

5
code/game/objects/items/devices/radio/radio.dm
View File

@@ -419,7 +419,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 ###### */
@@ -478,10 +478,9 @@ var/global/list/default_medbay_channels = list(
//THIS IS TEMPORARY. YEAH RIGHT
if(!connection) return 0 //~Carn
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)