From cef4392b6e38b36d1f20e091e4f1c0e8ca88879f Mon Sep 17 00:00:00 2001 From: monster860 Date: Wed, 1 Jun 2016 16:52:34 -0400 Subject: [PATCH] Moves HONK HONK code to human's HONK HONK file. --- code/modules/mob/living/carbon/human/say.dm | 3 +++ code/modules/mob/living/say.dm | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 7162933349d..840b500de01 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -148,6 +148,9 @@ if(prob(braindam)) message = uppertext(message) verb = "yells loudly" + + if(locate(/obj/item/organ/internal/cyberimp/brain/clown_voice) in internal_organs) + message = "[message]" returns[1] = message returns[2] = verb diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index a47c123ec4d..c6d0d8e3ee0 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -98,12 +98,6 @@ proc/get_radio_key_from_channel(var/channel) else if(COMIC in mutations) message = "[message]" - - else - if(ishuman(src)) - var/mob/living/carbon/human/H = src - if(locate(/obj/item/organ/internal/cyberimp/brain/clown_voice) in H.internal_organs) - message = "[message]" if(!IsVocal()) message = ""