Skip to content

Commit

Permalink
[MIRROR] Saymode won't process custom say emotes (#1400) (#2374)
Browse files Browse the repository at this point in the history
* Saymode won't process custom say emotes (#81883)

## About The Pull Request

Closes #62666 

Every saymode does some snowflake thing for sending out its messages to
the relevant mobs, and none of those snowflake things have handling for
custom say emotes.

We could manually go through and add the required handling, but for each
implementation, it would get messy fast. So it's a bit easier to just
prevent mobs using saymode from attempting to "emote" over them.
Especially since it doesn't make sense in a lot of situations that we
use saymodes.

## Changelog

:cl: Melbert
fix: Silicons can use asterisks in binary without fear of saying
something interesting.
/:cl:

* Saymode won't process custom say emotes

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: MrMelbert <[email protected]>
  • Loading branch information
3 people authored Mar 12, 2024
1 parent e3ebd1b commit 7dcd5f3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion code/modules/mob/living/living_say.dm
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ GLOBAL_LIST_INIT(message_modes_stat_limits, list(
var/original_message = message
message = get_message_mods(message, message_mods)
saymode = SSradio.saymodes[message_mods[RADIO_KEY]]
if (!forced)
if (!forced && !saymode)
message = check_for_custom_say_emote(message, message_mods)

if(!message)
Expand Down

0 comments on commit 7dcd5f3

Please sign in to comment.