HUD damage indicator now updates with halloss

Inspecting yourself for organ damage now randomly shows damaged organs if you have halloss
Mining shuttle now shunts people where it wants to be
Shuttles now crush people if they fail to move out of where they want to be with the initial shunt.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3337 316c924e-a436-60f5-8080-3fe189b3f50e

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

@@ -165,20 +165,29 @@
 
 			for(var/datum/organ/external/org in H.organs)
 				var/status = ""
-				if(org.brute_dam > 0)
+				var/brutedamage = org.brute_dam
+				var/burndamage = org.burn_dam
+
+				if(halloss > 0)
+					if(prob(30))
+						brutedamage += halloss
+					if(prob(30))
+						burndamage += halloss
+
+				if(brutedamage > 0)
 					status = "bruised"
-				if(org.brute_dam > 20)
+				if(brutedamage > 20)
 					status = "bleeding"
-				if(org.brute_dam > 40)
+				if(brutedamage > 40)
 					status = "mangled"
-				if(org.brute_dam > 0 && org.burn_dam > 0)
+				if(brutedamage > 0 && burndamage > 0)
 					status += " and "
-				if(org.burn_dam > 40)
+				if(burndamage > 40)
 					status += "peeling away"
 
-				else if(org.burn_dam > 10)
+				else if(burndamage > 10)
 					status += "blistered"
-				else if(org.burn_dam > 0)
+				else if(burndamage > 0)
 					status += "numb"
 				if(status == "")
 					status = "OK"

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

@@ -911,7 +911,7 @@
 
 			if (healths)
 				if (stat != 2)
-					switch(health)
+					switch(health - halloss)
 						if(100 to INFINITY)
 							healths.icon_state = "health0"
 						if(80 to 100)