From 33c738de3e35277f37b850fb77c7dadfa2a448d5 Mon Sep 17 00:00:00 2001
From: "giacomand@gmail.com"
 <giacomand@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Sun, 16 Sep 2012 05:43:27 +0000
Subject: [PATCH] -Fixed an issue where you would compare your name with
 yourself to see if it was available. -Fixed an issue with the Upgrade Camera
 malf module. -Fixed an issue with HTML codes in whisper. -Ghost ears and eyes
 default to 0.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4700 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/defines/procs/helpers.dm                   | 2 ++
 code/game/gamemodes/malfunction/Malf_Modules.dm | 4 ++--
 code/modules/mob/living/carbon/human/whisper.dm | 2 +-
 code/modules/mob/mob.dm                         | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/code/defines/procs/helpers.dm b/code/defines/procs/helpers.dm
index d7b7a13257..b00635bff7 100644
--- a/code/defines/procs/helpers.dm
+++ b/code/defines/procs/helpers.dm
@@ -311,6 +311,8 @@ Turf and target are seperate in case you want to teleport some distance from a t
 			newname = reject_bad_name(newname,allow_numbers)	//returns null if the name doesn't meet some basic requirements. Tidies up a few other things like bad-characters.
 
 			for(var/mob/living/M in player_list)
+				if(M == src)
+					continue
 				if(!newname || M.real_name == newname)
 					newname = null
 					break
diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm
index b37060a78c..ef39b96db8 100644
--- a/code/game/gamemodes/malfunction/Malf_Modules.dm
+++ b/code/game/gamemodes/malfunction/Malf_Modules.dm
@@ -167,11 +167,11 @@ rcd light flash thingy on matter drain
 						C.upgradeMotion()
 						upgraded = 1
 						// Add it to machines that process
-						machines |= src
+						machines |= C
 
 					if(upgraded)
 						UC.uses --
-						C.visible_message("<span class='notice'>\icon[src] *beep*</span>")
+						C.visible_message("<span class='notice'>\icon[C] *beep*</span>")
 						usr << "Camera successully upgraded!"
 					else
 						usr << "This camera is already upgraded!"
diff --git a/code/modules/mob/living/carbon/human/whisper.dm b/code/modules/mob/living/carbon/human/whisper.dm
index df7c086be6..7525e90fe7 100644
--- a/code/modules/mob/living/carbon/human/whisper.dm
+++ b/code/modules/mob/living/carbon/human/whisper.dm
@@ -1,6 +1,6 @@
 //Lallander was here
 /mob/living/carbon/human/whisper(message as text)
-	message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
+	message = trim(copytext(strip_html_simple(message), 1, MAX_MESSAGE_LEN))
 
 	if (!message || silent || miming)
 		return
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 8113b92350..768801d720 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -401,7 +401,7 @@ var/list/slot_equipment_priority = list( \
 		src << browse('html/changelog.html', "window=changes;size=675x650")
 		client.changes = 1
 
-/client/var/ghost_ears = 1
+/client/var/ghost_ears = 0
 /client/verb/toggle_ghost_ears()
 	set name = "Ghost ears"
 	set category = "OOC"
@@ -412,7 +412,7 @@ var/list/slot_equipment_priority = list( \
 	else
 		usr << "\blue Now you hear speech only from nearest creatures."
 
-/client/var/ghost_sight = 1
+/client/var/ghost_sight = 0
 /client/verb/toggle_ghost_sight()
 	set name = "Ghost sight"
 	set category = "OOC"