Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates

Conflicts:
	code/modules/mob/mob_defines.dm

code/WorkInProgress/Cael_Aislinn/Tajara/examine.dm

@@ -241,7 +241,7 @@
 		var/datum/organ/external/temp = organs[named]
 		if(temp)
 			if(temp.destroyed)
-				wound_flavor_text["[temp.display_name]"] = "<span class='warning'><b>[src.name] is missing [t_his] [temp.display_name].</b></span>\n"
+				wound_flavor_text["[temp.display_name]"] = "<span class='warning'><b>[t_He] is missing [t_his] [temp.display_name].</b></span>\n"
 				continue
 			if(temp.wounds)
 				var/list/wounds = list(list(),list(),list(),list(),list(),list())
@@ -401,22 +401,22 @@
 				switch(tally[tallied])
 					if(1)
 						if(!flavor_text.len)
-							flavor_text += "<span class='warning'>[src] has[prob(4) && !(tallied in no_exclude)  ? " what might be" : ""] a [tallied_rename[tallied]]"
+							flavor_text += "<span class='warning'>\The [src] has[prob(4) && !(tallied in no_exclude)  ? " what might be" : ""] a [tallied_rename[tallied]]"
 						else
 							flavor_text += "[prob(4) && !(tallied in no_exclude) ? " what might be" : ""] a [tallied_rename[tallied]]"
 					if(2)
 						if(!flavor_text.len)
-							flavor_text += "<span class='warning'>[src] has[prob(4) && !(tallied in no_exclude) ? " what might be" : ""] a pair of [tallied_rename[tallied]]s"
+							flavor_text += "<span class='warning'>\The [src] has[prob(4) && !(tallied in no_exclude) ? " what might be" : ""] a pair of [tallied_rename[tallied]]s"
 						else
 							flavor_text += "[prob(4) && !(tallied in no_exclude) ? " what might be" : ""] a pair of [tallied_rename[tallied]]s"
 					if(3 to 5)
 						if(!flavor_text.len)
-							flavor_text += "<span class='warning'>[src] has several [tallied_rename[tallied]]s"
+							flavor_text += "<span class='warning'>\The [src] has several [tallied_rename[tallied]]s"
 						else
 							flavor_text += " several [tallied_rename[tallied]]s"
 					if(6 to INFINITY)
 						if(!flavor_text.len)
-							flavor_text += "<span class='warning'>[src] has a bunch of [tallied_rename[tallied]]s"
+							flavor_text += "<span class='warning'>\The [src] has a bunch of [tallied_rename[tallied]]s"
 						else
 							flavor_text += " a ton of [tallied_rename[tallied]]s"
 		if(flavor_text.len)

code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm

@@ -2,12 +2,14 @@
 	name = "tajaran"
 	real_name = "tajaran"
 	voice_name = "tajaran"
-	icon = 'tajaran.dmi'
+	icon = 'mob.dmi'
+	icon_state = "m-none"
 	var/list/tajspeak_letters
 	//
 	universal_speak = 1 //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."
 
 /mob/living/carbon/human/tajaran/New()
 	tajspeak_letters = new/list("~","*","-")
@@ -460,8 +462,6 @@
 	last_b_state = stat
 
 /mob/living/carbon/human/tajaran/update_body()
-	return
-
 	if(stand_icon)
 		del(stand_icon)
 	if(lying_icon)
@@ -606,4 +606,4 @@
 	del(eyes_s)
 
 /mob/living/carbon/human/tajaran/co2overloadtime = null
-/mob/living/carbon/human/tajaran/temperature_resistance = T0C+70
+/mob/living/carbon/human/tajaran/temperature_resistance = T0C+70