mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-21 20:13:45 +01:00
Say code rewrite, Silicon jerks now using new saycode.
Tracking added for AI's and Observers Instead of calling GetVoice() over and over for everyone that can hear you we're checking a variable that is updated with Life() removed a bunch of my debug verbs. Conflicts: code/game/machinery/telecomms/broadcaster.dm code/modules/mob/dead/observer/observer.dm code/modules/mob/living/carbon/human/human_defines.dm code/modules/mob/living/silicon/say.dm
This commit is contained in:
@@ -220,10 +220,6 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
|
||||
return
|
||||
|
||||
/obj/item/device/radio/talk_into(mob/living/M as mob, message, channel, var/verb = "says", var/datum/language/speaking = null)
|
||||
if(speaking)
|
||||
world << "radio talk_into language = [speaking.name]"
|
||||
else
|
||||
world << "radio talk_into language = null"
|
||||
if(!on) return // the device has to be on
|
||||
// Fix for permacell radios, but kinda eh about actually fixing them.
|
||||
if(!M || !message) return
|
||||
@@ -432,7 +428,6 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
|
||||
//THIS IS TEMPORARY.
|
||||
if(!connection) return //~Carn
|
||||
|
||||
world << "WTF, WE'RE JUST DOING A STRAIGHT BROADCAST"
|
||||
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)
|
||||
@@ -441,7 +436,6 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
|
||||
|
||||
else // OLD RADIO SYSTEMS: By Goons?
|
||||
|
||||
world << "WTF we're in old system"
|
||||
var/datum/radio_frequency/connection = null
|
||||
if(channel && channels && channels.len > 0)
|
||||
if (channel == "department")
|
||||
|
||||
Reference in New Issue
Block a user