From ded49a5af9cf57b4041d35d6a0256b75db7f05b4 Mon Sep 17 00:00:00 2001
From: Heredth <Heredth@gmail.com>
Date: Thu, 29 May 2014 13:35:06 -0700
Subject: [PATCH] Update whisper.dm Conflicts: 
 code/modules/mob/living/carbon/human/whisper.dm

---
 code/modules/mob/living/carbon/human/whisper.dm | 17 ++++++++++-------
 code/setup.dm                                   |  5 +++++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/whisper.dm b/code/modules/mob/living/carbon/human/whisper.dm
index f499bb8811c..ab37fb9449e 100644
--- a/code/modules/mob/living/carbon/human/whisper.dm
+++ b/code/modules/mob/living/carbon/human/whisper.dm
@@ -31,6 +31,9 @@
 	if (src.sdisabilities & MUTE)
 		return
 
+	if(M_WHISPER in src.mutations)
+		src.say(message)
+
 	if (istype(src.wear_mask, /obj/item/clothing/mask/muzzle))
 		return
 
@@ -48,13 +51,13 @@
 				if(findtext(temp_message[H], "*") || findtext(temp_message[H], ";") || findtext(temp_message[H], ":")) continue
 				temp_message[H] = ninjaspeak(temp_message[H])
 				pick_list -= H
-			message = list2text(temp_message, " ")
-			message = replacetext(message, "o", "¤")
-			message = replacetext(message, "p", "þ")
-			message = replacetext(message, "l", "£")
-			message = replacetext(message, "s", "§")
-			message = replacetext(message, "u", "µ")
-			message = replacetext(message, "b", "ß")
+			message = dd_list2text(temp_message, " ")
+			message = replacetext(message, "o", "�")
+			message = replacetext(message, "p", "�")
+			message = replacetext(message, "l", "�")
+			message = replacetext(message, "s", "�")
+			message = replacetext(message, "u", "�")
+			message = replacetext(message, "b", "�")
 
 	if (src.stuttering)
 		message = stutter(message)
diff --git a/code/setup.dm b/code/setup.dm
index 02cd256c44f..c63f0c9bc2d 100644
--- a/code/setup.dm
+++ b/code/setup.dm
@@ -387,6 +387,11 @@ var/MAX_EXPLOSION_RANGE = 14
 #define M_PSY_RESIST    204		// Block remoteview
 #define M_SUPER_FART    205		// Duh
 
+// /vg/ muts
+#define M_LOUD		208		// CAUSES INTENSE YELLING
+#define M_WHISPER	209		// causes quiet whispering
+#define M_DIZZY		210		// Trippy.
+
 //disabilities
 #define NEARSIGHTED		1
 #define EPILEPSY		2