From 91429c4dc07d2f010ce1c0326ee728a6edf08587 Mon Sep 17 00:00:00 2001 From: JJRcop Date: Thu, 6 Apr 2017 18:25:23 -0400 Subject: [PATCH] Last breath whispering succumbs you after speech is sent --- code/modules/mob/living/say.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 3745c923b94..dfaeb4f3437 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -132,6 +132,8 @@ GLOBAL_LIST_INIT(department_radio_keys, list( var/message_range = 6 + var/succumbed = FALSE + if(message_mode == MODE_WHISPER) message_range = 1 spans |= SPAN_ITALICS @@ -143,7 +145,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( message = copytext(message, 1, health_diff) + "[message_len > health_diff ? "-.." : "..."]" message = Ellipsis(message, 10, 1) message_mode = MODE_WHISPER_CRIT - succumb(1) + succumbed = TRUE else log_say("[name]/[key] : [message]") @@ -182,6 +184,9 @@ GLOBAL_LIST_INIT(department_radio_keys, list( send_speech(message, message_range, src, bubble_type, spans, language, message_mode) + if(succumbed) + succumb(1) + return 1 /mob/living/Hear(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode)