Merge pull request #2 from Nerezza/Tara-patch1

Tara patch1

code/WorkInProgress/Cael_Aislinn/Tajara/say.dm

@@ -491,4 +491,21 @@
 		for (var/mob/M in eavesdroppers)
 			M << "\blue [src] speaks into their radio..."
 			M << speech_bubble
-		spawn(30) del(speech_bubble)
+		spawn(30) del(speech_bubble)
+
+/living/carbon/human/tajaran/say_understands(var/other)
+	if (istype(other, /mob/living/silicon/ai))
+		return 1
+	if (istype(other, /mob/living/silicon/decoy))
+		return 1
+	if (istype(other, /mob/living/silicon/pai))
+		return 1
+	if (istype(other, /mob/living/silicon/robot))
+		return 1
+	if (istype(other, /mob/living/carbon/brain))
+		return 1
+	if (istype(other, /mob/living/carbon/metroid))
+		return 1
+	if (istype(other, /mob/living/carbon/human))
+		return 1
+	return ..()

code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm

@@ -5,8 +5,7 @@
 	icon = 'tajaran.dmi'
 	icon_state = "m_none"
 	var/list/tajspeak_letters = list("~","*","-")
-	//
-	universal_speak = 1 //hacky fix until someone can figure out how to make them only understand humans
+	//universal_speak = 1 (I think I fixed it, need testy testy) hacky fix until someone can figure out how to make them only understand humans
 	taj_talk_understand = 1
 	voice_message = "mrowls"
 	examine_text = "one of the cat-like Tajarans"

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

@@ -28,6 +28,8 @@
 			return 1
 		if (istype(other, /mob/living/carbon/human))
 			return 1
+		if (istype(other, /mob/living/carbon/human/tajaran))
+			return 1
 		if (istype(other, /mob/living/carbon/metroid))
 			return 1
 		return ..()

code/modules/mob/living/silicon/ai/say.dm

@@ -8,6 +8,8 @@
 /mob/living/silicon/ai/say_understands(var/other)
 	if (istype(other, /mob/living/carbon/human))
 		return 1
+	if (istype(other, /mob/living/carbon/human/tajaran))
+			return 1
 	if (istype(other, /mob/living/silicon/robot))
 		return 1
 	if (istype(other, /mob/living/silicon/decoy))

code/modules/mob/living/silicon/decoy/decoy.dm

@@ -7,6 +7,8 @@
 /mob/living/silicon/decoy/say_understands(var/other)
 	if (istype(other, /mob/living/carbon/human))
 		return 1
+	if (istype(other, /mob/living/carbon/human/tajaran))
+			return 1
 	if (istype(other, /mob/living/silicon/robot))
 		return 1
 	if (istype(other, /mob/living/silicon/ai))

code/modules/mob/living/silicon/pai/say.dm

@@ -11,6 +11,8 @@
 		return 1
 	if (istype(other, /mob/living/carbon/brain))
 		return 1
+	if (istype(other, /mob/living/carbon/human/tajaran))
+			return 1
 	return ..()
 
 /mob/living/silicon/pai/say_quote(var/text)

code/modules/mob/living/silicon/robot/say.dm

@@ -5,6 +5,8 @@
 		return 1
 	if (istype(other, /mob/living/carbon/human))
 		return 1
+	if (istype(other, /mob/living/carbon/human/tajaran))
+			return 1
 	if (istype(other, /mob/living/carbon/brain))
 		return 1
 	if (istype(other, /mob/living/silicon/pai))

code/unused/hivebot/mainframe.dm

@@ -71,6 +71,8 @@
 		return 1
 	if (istype(other, /mob/living/silicon/ai))
 		return 1
+	if (istype(other, /mob/living/carbon/human/tajaran))
+			return 1
 	return ..()
 
 /mob/living/silicon/hive_mainframe/say_quote(var/text)

code/unused/hivebot/say.dm

@@ -3,6 +3,8 @@
 		return 1
 	if (istype(other, /mob/living/carbon/human))
 		return 1
+	if (istype(other, /mob/living/carbon/human/tajaran))
+			return 1
 	if (istype(other, /mob/living/silicon/robot))
 		return 1
 	return ..()