Merge pull request #9548 from Ghommie/Ghommie-cit251

Fixing radio emotes conflict with drunk memes.
This commit is contained in:
kevinz000
2019-10-24 18:48:33 -07:00
committed by GitHub
5 changed files with 25 additions and 21 deletions
+4 -2
View File
@@ -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, "*")