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

Conflicts:
	maps/tgstation.2.0.8.dmm

code/modules/client/client defines.dm

@@ -49,7 +49,7 @@
 		////////////
 	var/next_allowed_topic_time = 10
 	// comment out the line below when debugging locally to enable the options & messages menu
-	control_freak = 1
+	//control_freak = 1
 
 
 

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

@@ -34,6 +34,11 @@
 	var/t_has = proper_forms["has"]
 	var/t_is = proper_forms["is"]
 
+	if(mutantrace == "lizard")
+		examine_text = "one of those lizard-like Soghuns"
+	if(mutantrace == "skrell")
+		examine_text = "one of those gelatinous Skrells"
+
 	var/msg = "<span class='info'>*---------*\nThis is "
 	if(icon)
 		msg += "\icon[icon] " //fucking BYOND: this should stop dreamseeker crashing if we -somehow- examine somebody before their icon is generated

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

@@ -293,6 +293,11 @@
 
 	if (bodytemperature < 283.222)
 		tally += (283.222 - bodytemperature) / 10 * 1.75
+		if(mutantrace == "lizard") //Soghun are more affected by the cold
+			tally += 1
+		if(istajaran()) //But Tajarans are slightly resistant
+			if(tally != 0)
+				tally -= tally*0.1
 		if (stuttering < 10)
 			stuttering = 10
 
@@ -1250,7 +1255,7 @@
 	// Should be called only when something about the clothing itself changed
 	// which is not handled by the equip code.
 	rebuild_appearance()
-
+	update_face() //Fixes hair not coming back after using a BLOCKHAIR mask/helmet
 	return
 
 	// TODO: once I have replaced the udpate_clothing() calls with update_lying() or

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

@@ -712,11 +712,17 @@
 				increments = difference/10
 			var/change = increments*boost	// Get the amount to change by (x per increment)
 			var/temp_change
-			if(current < loc_temp)
-				temperature = min(loc_temp, temperature+change)
-			else if(current > loc_temp)
-				temperature = max(loc_temp, temperature-change)
-			temp_change = (temperature - current)
+			if(current < loc_temp) //If your body temp is less than loc, then try to heat up
+				if(istajaran(src)) //If Tajaran, you heat up faster
+					change = change*4
+				temperature = min(loc_temp, temperature+change) //Pick the minimum of these two
+			else if(current > loc_temp) //If your body temp is more than loc, then try to cool down
+				if(istajaran(src)) //If Tajaran, you cool down slower
+					change = change*0.5
+				if(mutantrace == "lizard") //If Soghun, you cool down faster
+					change = change*3
+				temperature = max(loc_temp, temperature-change) //Pick the max of these two
+			temp_change = (temperature - current) //Work out the actual change of temp
 			return temp_change
 
 		get_thermal_protection()
@@ -835,7 +841,12 @@
 			if (nutrition > 0 && stat != 2)
 				// sleeping slows the metabolism, hunger increases more slowly
 				if(stat == 1)
-					nutrition = max (0, nutrition - HUNGER_FACTOR)
+					if(istajaran(src)) //Tajarans get hungry slightly faster
+						nutrition = max (0, nutrition - HUNGER_FACTOR*1.25)
+					if(mutantrace == "lizard") //Soghuns get hungry much slower
+						nutrition = max (0, nutrition - HUNGER_FACTOR*0.5)
+					else
+						nutrition = max (0, nutrition - HUNGER_FACTOR)
 				else
 					nutrition = max (0, nutrition - HUNGER_FACTOR / 4)
 

code/modules/recycling/sortingmachinery.dm

@@ -111,7 +111,7 @@
 	desc = "A small wrapped package."
 	name = "small parcel"
 	icon = 'storage.dmi'
-	icon_state = "deliverycrateSmall1"
+	icon_state = "deliverycrate1"
 	var/tmp/obj/item/wrapped = null
 	var/sortTag = null
 	flags = FPRINT
@@ -219,7 +219,20 @@
 				O.loc = P
 				amount -= 1
 				P.w_class = O.w_class
-				P.icon_state = "deliverycrateSmall[P.w_class]"
+				P.icon_state = "deliverycrate[P.w_class]"
+				var/t
+				switch(P.w_class)
+					if(1.0)
+						t = "tiny"
+					if(2.0)
+						t = "small"
+					if(3.0)
+						t = "normal-sized"
+					if(4.0)
+						t = "bulky"
+					if(5.0)
+						t = "huge"
+				P.name = "[t] package"
 				user.visible_message("\The [user] wraps \a [target] with \a [src], producing \a [P].",\
 				"\blue You wrap \the [target], leaving [amount] units of paper on your [src].",\
 				"You hear someone taping paper around a small object.")