diff --git a/code/game/machinery/telecomms/presets.dm b/code/game/machinery/telecomms/presets.dm index 4d018002861..b77682201af 100644 --- a/code/game/machinery/telecomms/presets.dm +++ b/code/game/machinery/telecomms/presets.dm @@ -73,7 +73,7 @@ id = "Receiver B" network = "tcommsat" autolinkers = list("receiverB") // link to relay - freq_listening = list(COMM_FREQ, ENG_FREQ, SEC_FREQ) + freq_listening = list(AI_FREQ, COMM_FREQ, ENG_FREQ, SEC_FREQ) //Common and other radio frequencies for people to freely use New() @@ -182,10 +182,10 @@ /obj/machinery/telecomms/server/presets/common id = "Common Server" - freq_listening = list() + freq_listening = list(PUB_FREQ, AI_FREQ) autolinkers = list("common") - //Common and other radio frequencies for people to freely use +//Common and other radio frequencies for people to freely use /obj/machinery/telecomms/server/presets/common/New() for(var/i = PUBLIC_LOW_FREQ, i < PUBLIC_HIGH_FREQ, i += 2) freq_listening |= i diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm index 9bfa1cc1298..96954d82d25 100644 --- a/code/modules/mob/living/silicon/ai/say.dm +++ b/code/modules/mob/living/silicon/ai/say.dm @@ -1,9 +1,3 @@ -/mob/living/silicon/ai/say(var/message) - if(parent && istype(parent) && parent.stat != 2) - return parent.say(message) - //If there is a defined "parent" AI, it is actually an AI, and it is alive, anything the AI tries to say is said by the parent instead. - return ..(message) - /mob/living/silicon/ai/proc/IsVocal() var/announcing_vox = 0 // Stores the time of the last announcement diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index b49812d63fb..ac0c4d10432 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -129,12 +129,12 @@ //parses the language code (e.g. :j) from text, such as that supplied to say. //returns the language object only if the code corresponds to a language that src can speak, otherwise null. /mob/proc/parse_language(var/message) - if(length(message) >= 1 && copytext(message,1,2) == "!") + var/prefix = copytext(message,1,2) + if(length(message) >= 1 && prefix == "!") return all_languages["Noise"] if(length(message) >= 2) - - var/language_prefix = trim_right(lowertext(copytext(message, 1 ,4))) + var/language_prefix = lowertext(copytext(message, 1, 3)) var/datum/language/L = language_keys[language_prefix] if (can_speak(L)) return L