From fca45a78fc7d960b7ed66250ded97047bda12153 Mon Sep 17 00:00:00 2001 From: XeonMations Date: Sat, 16 Nov 2024 17:30:04 +0200 Subject: [PATCH] adressal to tsar-salat --- code/datums/emotes.dm | 1 + code/modules/mob/living/emote.dm | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm index 79f877386758e..7eeed5c3d7f8d 100644 --- a/code/datums/emotes.dm +++ b/code/datums/emotes.dm @@ -62,6 +62,7 @@ name = key /datum/emote/proc/run_emote(mob/user, params, type_override, intentional = FALSE) + SHOULD_CALL_PARENT(TRUE) if(!can_run_emote(user, TRUE, intentional)) return FALSE diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 46f7e11914ca2..fd5bd82cd86a2 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -526,11 +526,12 @@ to_chat(user, "You cannot send IC messages (muted).") return FALSE else if(!params) - var/custom_emote = stripped_input(usr, "Choose an emote to display.") + var/custom_emote = stripped_input(user, "Choose an emote to display.") if(custom_emote && !check_invalid(user, custom_emote)) - var/type = input("Is this a visible or hearable emote?") as null|anything in list("Visible", "Hearable", "Both") + var/list/emote_list = list("Audible", "Visible", "Both") + var/type = tgui_input_list(user, "Is this a visible or audible emote?", "Emote Type", emote_list) switch(type) - if("Hearable") + if("Audible") emote_type |= EMOTE_AUDIBLE if("Visible") emote_type |= EMOTE_VISIBLE @@ -543,7 +544,7 @@ emote_type = type_override . = ..() message = null - emote_type = 0 + emote_type = null /datum/emote/living/custom/replace_pronoun(mob/user, message) return message