From c6a9bbc9fcc4c2ae22db30681a5bd9a1eb6e0acf Mon Sep 17 00:00:00 2001
From: Mloc-Argent <colmohici@gmail.com>
Date: Fri, 12 Jul 2013 12:48:07 +0100
Subject: [PATCH] Properly reverts Kida.  (what a mess)

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
---
 code/modules/client/preferences.dm                | 7 ++++---
 code/modules/mob/new_player/new_player.dm         | 8 ++++----
 code/modules/mob/new_player/preferences_setup.dm  | 2 --
 code/modules/mob/new_player/sprite_accessories.dm | 2 +-
 code/modules/mob/say.dm                           | 4 +---
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 93c997a6e23..0abbe3aa264 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -794,17 +794,18 @@ datum/preferences
 							if(is_alien_whitelisted(user, "Skrell")) //Check for Skrell and admins
 								new_species += "Skrell"
 								whitelisted = 1
-							if(is_alien_whitelisted(user, "Kidan")) // Check for Kidan and admins
-								new_species += "Kidan"
+							if(is_alien_whitelisted(user, "Vox")) //Check for Skrell and admins
+								new_species += "Vox"
 								whitelisted = 1
 
+
 							if(!whitelisted)
 								alert(user, "You cannot change your species as you need to be whitelisted. If you wish to be whitelisted contact an admin in-game, on the forums, or on IRC.")
 						else //Not using the whitelist? Aliens for everyone!
 							new_species += "Tajaran"
 							new_species += "Unathi"
 							new_species += "Skrell"
-							new_species += "Kidan"
+							new_species += "Vox"
 						species = input("Please select a species", "Character Generation", null) in new_species
 
 						if(prev_species != species)
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index bb81a5ca4e7..8c0769550d2 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -359,10 +359,10 @@
 			if(is_alien_whitelisted(src, "Skrell") || !config.usealienwhitelist)
 				new_character.dna.mutantrace = "skrell"
 				new_character.skrell_talk_understand = 1
-		if(client.prefs.species == "Kidan")
-			if(is_alien_whitelisted(src, "Kidan") || !config.usealienwhitelist)
-				new_character.dna.mutantrace = "kidan"
-				new_character.kidan_talk_understand = 1
+		if(client.prefs.species == "Vox")
+			if(is_alien_whitelisted(src, "Vox"|| !config.usealienwhitelist))
+				new_character.dna.mutantrace = "vox"
+				new_character.vox_talk_understand = 1
 
 		if(client.prefs.language == "Tajaran")
 			if(is_alien_whitelisted(src, "Language_Tajaran") || !config.usealienwhitelist)
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index 110a3fd6b1a..1c8a8872b9b 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -147,8 +147,6 @@ datum/preferences
 
 			if("Vox")
 				icobase = 'icons/mob/human_races/r_vox.dmi'
-			if("Kidan")
-				icobase = 'icons/mob/human_races/r_vox.dmi'
 
 			else
 				icobase = 'icons/mob/human_races/r_human.dmi'
diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm
index 4d4baf0ba18..97b80338a66 100644
--- a/code/modules/mob/new_player/sprite_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories.dm
@@ -484,7 +484,7 @@
 		species_allowed = list("Tajaran")
 
 	taj_ears_spiky
-		name = "Tajara  Spiky"
+		name = "Tajara Spiky"
 		icon_state = "hair_tajspiky"
 		species_allowed = list("Tajaran")
 
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index fa7d69ad73e..58f6724e85f 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -81,9 +81,7 @@
 	if (is_speaking_tajaran)
 		return "<span class='say_quote'>mrowls</span>, \"<span class='tajaran'>[text]</span>\"";
 	if (is_speaking_vox)
-		return "<span class='say_quote'>shrieks</span>, \"<span class='vox'>[text]</span>\"";
-	if (is_speaking_kidan)
-		return "<span class='say_quote'>chitters</span>, \"<span class='kidan'>[text]</span>\"";
+		return "<span class='say_quote'>chirps</span>, \"<span class='vox'>[text]</span>\"";
 //Needs Virus2
 //	if (src.disease_symptoms & DISEASE_HOARSE)
 //		return "rasps, \"[text]\"";