From d32c677c4e50391a9020bda72aa798e328acfd15 Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Sat, 8 Jul 2023 12:14:33 +0200 Subject: [PATCH] Fixes emotes not applying the hearer's accent tag preference. (#16649) Co-authored-by: Matt Atlas --- code/modules/mob/mob.dm | 2 +- html/changelogs/mattatlas-sickandtired.yml | 41 ++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/mattatlas-sickandtired.yml diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index b1d91dcaac6..b84b1b7fb51 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -259,7 +259,7 @@ AM.show_message("[get_accent_icon(null, src)] [self_message]", 2, deaf_message, 1) continue - AM.show_message("[get_accent_icon(null, src)] [message]", 2, deaf_message, 1) + AM.show_message("[get_accent_icon(null, ismob(AM) ? AM : src)] [message]", 2, deaf_message, 1) /mob/proc/findname(msg) for(var/mob/M in mob_list) diff --git a/html/changelogs/mattatlas-sickandtired.yml b/html/changelogs/mattatlas-sickandtired.yml new file mode 100644 index 00000000000..ce76119fe54 --- /dev/null +++ b/html/changelogs/mattatlas-sickandtired.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: MattAtlas + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixes emotes not applying the hearer's accent tag preference."