From 306520660dc6191a5221ff0866ab5b80fbf54057 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Mon, 24 Oct 2016 22:30:02 -0400 Subject: [PATCH] something something merge conflicts --- code/modules/mob/living/say.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 4db6da90b20..e534d67ee72 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -79,10 +79,7 @@ proc/get_radio_key_from_channel(var/channel) message = stutter(message) verb = "stammers" speech_problem_flag = 1 - if(cultslurring) - message = cultslur(message) - verb = "slurs" - speech_problem_flag = 1 + if(COMIC in mutations) message = "[message]"