From 682ce60f30ed4d1ecfa5c77dc462442d950eec4d Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 26 Apr 2019 18:00:18 -0400 Subject: [PATCH] Shortwave and Relay Tweaks - Shortwaves will now transmit to all connected Z levels - Relays will now update their connected Z level if moved (useful for relays on shuttles) Code ported from Baystation. --- code/game/machinery/telecomms/telecomunications.dm | 4 ++++ code/game/objects/items/devices/radio/radio.dm | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index 5abd57e8cf..50e2f504c9 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -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 diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 25f76587ce..e3411ba15c 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -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)