mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
Merge pull request #4702 from VOREStation/upstream-merge-5885
[MIRROR] Bots don't speak gibberish
This commit is contained in:
@@ -179,7 +179,14 @@
|
||||
if (only_species_language && speaking != all_languages[species_language])
|
||||
return 0
|
||||
|
||||
return (speaking.can_speak_special(src) && (universal_speak || (speaking && (speaking.flags & INNATE)) || speaking in src.languages))
|
||||
if(speaking.can_speak_special(src))
|
||||
if(universal_speak)
|
||||
return 1
|
||||
if(speaking && (speaking.flags & INNATE))
|
||||
return 1
|
||||
if(speaking in src.languages)
|
||||
return 1
|
||||
return 0
|
||||
|
||||
/mob/proc/get_language_prefix()
|
||||
if(client && client.prefs.language_prefixes && client.prefs.language_prefixes.len)
|
||||
|
||||
@@ -44,6 +44,8 @@
|
||||
..()
|
||||
update_icons()
|
||||
|
||||
default_language = all_languages[LANGUAGE_GALCOM]
|
||||
|
||||
botcard = new /obj/item/weapon/card/id(src)
|
||||
botcard.access = botcard_access.Copy()
|
||||
|
||||
|
||||
@@ -138,7 +138,7 @@ proc/get_radio_key_from_channel(var/channel)
|
||||
if(message)
|
||||
client.handle_spam_prevention(MUTE_IC)
|
||||
if((client.prefs.muted & MUTE_IC) || say_disabled)
|
||||
src << "<span class='warning'>You cannot speak in IC (Muted).</span>"
|
||||
to_chat(src, "<span class='warning'>You cannot speak in IC (Muted).</span>")
|
||||
return
|
||||
|
||||
//Redirect to say_dead if talker is dead
|
||||
@@ -196,7 +196,7 @@ proc/get_radio_key_from_channel(var/channel)
|
||||
|
||||
//Self explanatory.
|
||||
if(is_muzzled() && !(speaking && (speaking.flags & SIGNLANG)))
|
||||
src << "<span class='danger'>You're muzzled and cannot speak!</span>"
|
||||
to_chat(src, "<span class='danger'>You're muzzled and cannot speak!</span>")
|
||||
return
|
||||
|
||||
//Clean up any remaining junk on the left like spaces.
|
||||
|
||||
4
html/changelogs/ater_botspeak.yml
Normal file
4
html/changelogs/ater_botspeak.yml
Normal file
@@ -0,0 +1,4 @@
|
||||
author: Atermonera
|
||||
delete-after: True
|
||||
changes:
|
||||
- bugfix: "Robot sound files have been decrypted following a bizarre ransomware attack by Boiling Point remnants."
|
||||
Reference in New Issue
Block a user