Fixing radio emotes conflict with drunk memes.

2019-10-20 12:21:21 +02:00
parent c59f15a8bc
commit 7e9298d5ac
5 changed files with 25 additions and 21 deletions
@@ -3,9 +3,11 @@

 /mob/say_mod(input, message_mode)
 	var/customsayverb = findtext(input, "*")
-	if(customsayverb)
+	if(customsayverb && message_mode != MODE_WHISPER_CRIT)
+		message_mode = MODE_CUSTOM_SAY
 		return lowertext(copytext(input, 1, customsayverb))
-	. = ..()
+	else
+		return ..()

 /atom/movable/proc/attach_spans(input, list/spans)
 	var/customsayverb = findtext(input, "*")