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

Cleans up radio code

Browse Source
This commit is contained in:
Atermonera
2019-10-23 15:18:17 -08:00
committed by VirgoBot
parent 931fcbfdc4
commit 02a8c8f8cf
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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. // If we were to send to a channel we don't have, drop it.
return null 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, 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 if(!on) return FALSE // the device has to be on
// Fix for permacell radios, but kinda eh about actually fixing them. // Fix for permacell radios, but kinda eh about actually fixing them.
if(!M || !message) return FALSE if(!M || !message) return FALSE
@@ -470,13 +474,14 @@ var/global/list/default_medbay_channels = list(
to_chat(loc,"<span class='notice'>\The [src] pings as it reestablishes subspace communications.</span>") to_chat(loc,"<span class='notice'>\The [src] pings as it reestablishes subspace communications.</span>")
subspace_transmission = TRUE subspace_transmission = TRUE
// we're done here. // 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. // 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: // Send a mundane broadcast with limited targets:
//THIS IS TEMPORARY. YEAH RIGHT //THIS IS TEMPORARY. YEAH RIGHT
if(!connection) return FALSE //~Carn if(!connection) return FALSE //~Carn
<<<<<<< HEAD
//VOREStation Add Start //VOREStation Add Start
if(bluespace_radio) if(bluespace_radio)
@@ -485,6 +490,8 @@ var/global/list/default_medbay_channels = list(
0, signal.data["compression"], list(0), connection.frequency,verb,speaking) 0, signal.data["compression"], list(0), connection.frequency,verb,speaking)
//VOREStation Add End //VOREStation Add End
=======
>>>>>>> a422d8b... Merge pull request #6486 from Novacat/nova-runtimes
return Broadcast_Message(connection, M, voicemask, pick(M.speak_emote), return Broadcast_Message(connection, M, voicemask, pick(M.speak_emote),
src, message, displayname, jobname, real_name, M.voice_name, src, message, displayname, jobname, real_name, M.voice_name,
filter_type, signal.data["compression"], GetConnectedZlevels(position.z), connection.frequency,verb,speaking) filter_type, signal.data["compression"], GetConnectedZlevels(position.z), connection.frequency,verb,speaking)