From 02a8c8f8cf8fa32a6ecaf4d99bc976abac0c6fc6 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Wed, 23 Oct 2019 15:18:17 -0800 Subject: [PATCH] Cleans up radio code --- code/game/objects/items/devices/radio/radio.dm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 0d874228f7..815e8c1795 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -271,7 +271,11 @@ var/global/list/default_medbay_channels = list( // If we were to send to a channel we don't have, drop it. return null +<<<<<<< HEAD /obj/item/device/radio/talk_into(mob/living/M, message, channel, var/verb = "says", var/datum/language/speaking = null) +======= +/obj/item/device/radio/talk_into(mob/living/M as mob, message, channel, var/verb = "says", var/datum/language/speaking = null) +>>>>>>> a422d8b... Merge pull request #6486 from Novacat/nova-runtimes if(!on) return FALSE // the device has to be on // Fix for permacell radios, but kinda eh about actually fixing them. if(!M || !message) return FALSE @@ -470,13 +474,14 @@ var/global/list/default_medbay_channels = list( to_chat(loc,"\The [src] pings as it reestablishes subspace communications.") subspace_transmission = TRUE // we're done here. - return 1 + return TRUE // Oh my god; the comms are down or something because the signal hasn't been broadcasted yet in our level. // Send a mundane broadcast with limited targets: //THIS IS TEMPORARY. YEAH RIGHT if(!connection) return FALSE //~Carn +<<<<<<< HEAD //VOREStation Add Start if(bluespace_radio) @@ -485,6 +490,8 @@ var/global/list/default_medbay_channels = list( 0, signal.data["compression"], list(0), connection.frequency,verb,speaking) //VOREStation Add End +======= +>>>>>>> a422d8b... Merge pull request #6486 from Novacat/nova-runtimes return Broadcast_Message(connection, M, voicemask, pick(M.speak_emote), src, message, displayname, jobname, real_name, M.voice_name, filter_type, signal.data["compression"], GetConnectedZlevels(position.z), connection.frequency,verb,speaking)