Merge pull request #3067 from NicholasDV/enhancementsAndFeatures

Adds in the Kida

code/modules/mob/living/carbon/human/human.dm

@@ -817,6 +817,8 @@
 				return "Mobile vegetation"
 			if("golem")
 				return "Animated Construct"
+			if("kidan")
+				return "Kidan"
 			else
 				return "Human"
 
@@ -829,7 +831,9 @@
 		else if(src.dna.mutantrace == "tajaran")
 			return "Tajaran"
 		else if(src.dna.mutantrace == "vox")
-			return "vox"
+			return "Vox"
+		else if(src.dna.mutantrace == "kidan")
+			return "Kidan"
 
 /mob/living/carbon/proc/update_mutantrace_languages()
 	if(src.dna)
@@ -841,6 +845,8 @@
 			src.tajaran_talk_understand = 1
 		else if(src.dna.mutantrace == "vox")
 			src.vox_talk_understand = 1
+		else if(src.dna.mutantrace == "kidan")
+			src.kidan_talk_understand = 1
 
 /mob/living/carbon/human/proc/play_xylophone()
 	if(!src.xylophone)

code/modules/mob/living/carbon/human/update_icons.dm

@@ -444,10 +444,12 @@ proc/get_damage_icon_part(damage_state, body_part)
 			if("skrell")
 				race_icon = 'icons/mob/human_races/r_skrell.dmi'
 				deform_icon = 'icons/mob/human_races/r_def_skrell.dmi'
-
 			if("vox")
 				race_icon = 'icons/mob/human_races/r_vox.dmi'
 				deform_icon = 'icons/mob/human_races/r_def_vox.dmi'
+			if("kidan")
+				race_icon = 'icons/mob/human_races/r_kidan.dmi'
+				deform_icon = 'icons/mob/human_races/r_def_kidan.dmi'
 
 			else
 				race_icon = 'icons/mob/human_races/r_human.dmi'

code/modules/mob/living/say.dm

@@ -19,6 +19,7 @@ var/list/department_radio_keys = list(
 	  ":j" = "tajaran",		"#j" = "tajaran",		".j" = "tajaran",
 	  ":o" = "soghun",		"#o" = "soghun",		".o" = "soghun",
 	  ":v" = "vox",			"#v" = "vox",			".v" = "vox",
+	  ":q" = "kidan",		"#q" = "kidan",			".q" = "kidan",
 
 	  ":R" = "right hand",	"#R" = "right hand",	".R" = "right hand",
 	  ":L" = "left hand",	"#L" = "left hand",		".L" = "left hand",
@@ -39,6 +40,7 @@ var/list/department_radio_keys = list(
 	  ":J" = "tajaran",		"#J" = "tajaran",		".J" = "tajaran",
 	  ":O" = "soghun",		"#O" = "soghun",		".O" = "soghun",
 	  ":V" = "vox",			"#V" = "vox",			".V" = "vox",
+	  ":Q" = "kidan",		"#Q" = "kidan",			".Q" = "kidan",
 
 	  //kinda localization -- rastaf0
 	  //same keys as above, but on russian keyboard layout. This file uses cp1251 as encoding.
@@ -188,6 +190,7 @@ var/list/department_radio_keys = list(
 	var/is_speaking_soghun = 0
 	var/is_speaking_taj = 0
 	var/is_speaking_vox = 0
+	var/is_speaking_kidan = 0
 	var/is_speaking_radio = 0
 
 	switch (message_mode)
@@ -290,6 +293,10 @@ var/list/department_radio_keys = list(
 			if(vox_talk_understand || universal_speak)
 				is_speaking_vox = 1
 
+		if ("kidan")
+			if(kidan_talk_understand || universal_speak)
+				is_speaking_kidan = 1
+
 		if("changeling")
 			if(mind && mind.changeling)
 				for(var/mob/Changeling in mob_list)
@@ -388,6 +395,8 @@ var/list/department_radio_keys = list(
 					heard_a += M
 				else if(is_speaking_vox && (M:vox_talk_understand || M:universal_speak))
 					heard_a += M
+				else if(is_speaking_kidan && (M:kidan_talk_understand || M:universal_speak))
+					heard_a += M
 				else
 					heard_b += M
 			else
@@ -403,7 +412,7 @@ var/list/department_radio_keys = list(
 
 	var/rendered = null
 	if (length(heard_a))
-		var/message_a = say_quote(message,is_speaking_soghun,is_speaking_skrell,is_speaking_taj,is_speaking_vox)
+		var/message_a = say_quote(message,is_speaking_soghun,is_speaking_skrell,is_speaking_taj,is_speaking_vox,is_speaking_kidan)
 
 		if (italics)
 			message_a = "<i>[message_a]</i>"
@@ -428,7 +437,7 @@ var/list/department_radio_keys = list(
 			message_b = voice_message
 		else
 			message_b = stars(message)
-			message_b = say_quote(message_b,is_speaking_soghun,is_speaking_skrell,is_speaking_taj,is_speaking_vox)
+			message_b = say_quote(message_b,is_speaking_soghun,is_speaking_skrell,is_speaking_taj,is_speaking_vox,is_speaking_kidan)
 
 		if (italics)
 			message_b = "<i>[message_b]</i>"

code/modules/mob/mob_defines.dm

@@ -206,12 +206,13 @@
 
 	//Whether or not mobs can understand other mobtypes. These stay in /mob so that ghosts can hear everything.
 	var/universal_speak = 0 // Set to 1 to enable the mob to speak to everyone -- TLE
-	var/robot_talk_understand = 0
-	var/alien_talk_understand = 0
-	var/tajaran_talk_understand = 0
-	var/soghun_talk_understand = 0
-	var/skrell_talk_understand = 0
-	var/vox_talk_understand = 0
+	var/robot_talk_understand		= 0
+	var/alien_talk_understand		= 0
+	var/tajaran_talk_understand		= 0
+	var/soghun_talk_understand		= 0
+	var/skrell_talk_understand		= 0
+	var/vox_talk_understand			= 0
+	var/kidan_talk_understand		= 0
 
 	var/has_limbs = 1 //Whether this mob have any limbs he can move with
 	var/can_stand = 1 //Whether this mob have ability to stand

code/modules/mob/new_player/new_player.dm

@@ -353,6 +353,10 @@
 			if(is_alien_whitelisted(src, "Vox"|| !config.usealienwhitelist))
 				new_character.dna.mutantrace = "vox"
 				new_character.vox_talk_understand = 1
+		if(client.prefs.species == "Kidan")
+			if(is_alien_whitelisted(src, "Vox"|| !config.usealienwhitelist))
+				new_character.dna.mutantrace = "kidan"
+				new_character.kidan_talk_understand = 1
 
 		if(ticker.random_players)
 			new_character.gender = pick(MALE, FEMALE)

code/modules/mob/new_player/preferences_setup.dm

@@ -144,9 +144,10 @@ datum/preferences
 				icobase = 'icons/mob/human_races/r_lizard.dmi'
 			if("Skrell")
 				icobase = 'icons/mob/human_races/r_skrell.dmi'
-
 			if("Vox")
 				icobase = 'icons/mob/human_races/r_vox.dmi'
+			if("Kidan")
+				icobase = 'icons/mob/human_races/r_kidan.dmi'
 
 			else
 				icobase = 'icons/mob/human_races/r_human.dmi'

code/modules/mob/new_player/sprite_accessories.dm

@@ -285,7 +285,6 @@
 		icon_state = "hair_e"
 		gender = MALE // turnoff!
 
-
 	bald
 		name = "Bald"
 		icon_state = "bald"
@@ -306,7 +305,7 @@
 		name = "Shaved"
 		icon_state = "bald"
 		gender = NEUTER
-		species_allowed = list("Human","Unathi","Tajaran","Skrell","Vox")
+		species_allowed = list("Human","Unathi","Tajaran","Skrell","Vox","Kidan")
 
 	watson
 		name = "Watson Mustache"
@@ -484,7 +483,7 @@
 		species_allowed = list("Tajaran")
 
 	taj_ears_spiky
-		name = "Tajara  Spiky"
+		name = "Tajara Spiky"
 		icon_state = "hair_tajspiky"
 		species_allowed = list("Tajaran")
 

code/modules/mob/say.dm

@@ -69,7 +69,7 @@
 		return 1
 	return 0
 
-/mob/proc/say_quote(var/text,var/is_speaking_soghun,var/is_speaking_skrell,var/is_speaking_tajaran,var/is_speaking_vox)
+/mob/proc/say_quote(var/text,var/is_speaking_soghun,var/is_speaking_skrell,var/is_speaking_tajaran,var/is_speaking_vox,var/is_speaking_kidan)
 	if(!text)
 		return "says, \"...\"";	//not the best solution, but it will stop a large number of runtimes. The cause is somewhere in the Tcomms code
 		//tcomms code is still runtiming somewhere here
@@ -82,6 +82,8 @@
 		return "<span class='say_quote'>mrowls</span>, \"<span class='tajaran'>[text]</span>\"";
 	if (is_speaking_vox)
 		return "<span class='say_quote'>chirps</span>, \"<span class='vox'>[text]</span>\"";
+	if (is_speaking_kidan)
+		return "<span class='say_quote'>chitters</span>, \"<span class='kidan'>[text]</span>\"";
 //Needs Virus2
 //	if (src.disease_symptoms & DISEASE_HOARSE)
 //		return "rasps, \"[text]\"";