From 6cef81d979736d2efbe01959ac7ae0d9279a5783 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Fri, 20 Jul 2018 06:41:12 -0400 Subject: [PATCH] It's a feature now - makes it plausible to use custom say verbs in place of emotes (allows proper non-buggy emotes over radio) (#7378) * it's a feature now - makes it plausible to use custom say verbs in place of emotes * Makes the thing actually drop the , "" --- code/game/say.dm | 2 +- modular_citadel/code/modules/mob/mob.dm | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/say.dm b/code/game/say.dm index 4fb67cb7c6..6eefc397f5 100644 --- a/code/game/say.dm +++ b/code/game/say.dm @@ -95,7 +95,7 @@ GLOBAL_LIST_INIT(freqtospan, list( spans |= SPAN_YELL var/spanned = attach_spans(input, spans) - return "[say_mod(input, message_mode)], \"[spanned]\"" + return "[say_mod(input, message_mode)][spanned ? ", \"[spanned]\"" : ""]" /atom/movable/proc/lang_treat(atom/movable/speaker, datum/language/language, raw_message, list/spans, message_mode) if(has_language(language)) diff --git a/modular_citadel/code/modules/mob/mob.dm b/modular_citadel/code/modules/mob/mob.dm index d741384140..bf6987ab81 100644 --- a/modular_citadel/code/modules/mob/mob.dm +++ b/modular_citadel/code/modules/mob/mob.dm @@ -11,7 +11,10 @@ var/customsayverb = findtext(input, "*") if(customsayverb) input = capitalize(copytext(input, customsayverb+1)) - return "[message_spans_start(spans)][input]" + if(input) + return "[message_spans_start(spans)][input]" + else + return /mob/living/compose_message(atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode, face_name = FALSE) . = ..()