From 660ce3454b5c2de1b5b649cacd34a5a8bcc4f269 Mon Sep 17 00:00:00 2001
From: ZomgPonies <lorden@zomgponies.com>
Date: Sat, 21 Feb 2015 13:25:09 -0500
Subject: [PATCH] COMIC mutation bugfix

---
 code/game/dna/genes/disabilities.dm         | 10 ----------
 code/modules/mob/living/carbon/human/say.dm |  4 +++-
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/code/game/dna/genes/disabilities.dm b/code/game/dna/genes/disabilities.dm
index 9a46eb04dda..4d80cba48c5 100644
--- a/code/game/dna/genes/disabilities.dm
+++ b/code/game/dna/genes/disabilities.dm
@@ -158,14 +158,4 @@
 	mutation=M_COMIC
 
 	New()
-		..()
 		block = COMICBLOCK
-
-	OnSay(var/mob/M, var/message)
-		if(ishuman(M))
-			var/mob/living/carbon/human/H = M
-			if((H.wear_id && istype(H.wear_id,/obj/item/weapon/card/id/syndicate)) && (H.wear_mask && istype(H.wear_mask,/obj/item/clothing/mask/gas/voice)))
-				return message
-		if(message)
-			message = "<span class='sans'>[message]</span>"
-			return message
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm
index 4cc61b36290..42f954669d1 100644
--- a/code/modules/mob/living/carbon/human/say.dm
+++ b/code/modules/mob/living/carbon/human/say.dm
@@ -276,7 +276,7 @@
 				message = pick("NEEIIGGGHHHH!", "NEEEIIIIGHH!", "NEIIIGGHH!", "HAAWWWWW!", "HAAAWWW!")
 				verb = pick("whinnies","neighs", "says")
 				handled = 1
-	
+
 	if(dna)
 		for(var/datum/dna/gene/gene in dna_genes)
 			if(!gene.block)
@@ -309,6 +309,8 @@
 				message = uppertext(message)
 				verb = "yells loudly"
 
+		if(M_COMIC in mutations)
+			message = "<span class='sans'>[message]</span>"
 	returns[1] = message
 	returns[2] = verb
 	returns[3] = handled