Merge branch 'master' into Sindorman/runtimes

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

@@ -241,9 +241,9 @@
 				if(!org.is_usable())
 					status += "dangling uselessly"
 				if(status.len)
-					src.show_message("My [org.name] is <span class='warning'> [english_list(status)].</span>",1)
+					src.show_message("My [org.name] is <span class='warning'>[english_list(status)].</span>",1)
 				else
-					src.show_message("My [org.name] is <span class='notice'> OK.</span>",1)
+					src.show_message("My [org.name] is <span class='notice'>OK.</span>",1)
 
 			if((isskeleton(H)) && (!H.w_uniform) && (!H.wear_suit))
 				H.play_xylophone()

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

@@ -463,4 +463,8 @@ This function restores all organs.
 
 	if(stat == UNCONSCIOUS)
 		traumatic_shock *= 0.6
-	return max(0,traumatic_shock)
+	return max(0,traumatic_shock)
+
+/mob/living/carbon/human/remove_blood_simple(var/blood)
+	if(should_have_organ(BP_HEART))
+		vessel.remove_reagent("blood", blood)

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

@@ -1154,6 +1154,8 @@
 			holder.icon_state = "0" 	// X_X
 		else if(is_asystole())
 			holder.icon_state = "flatline"
+		else if(isFBP(src))
+			holder.icon_state = "2"
 		else
 			holder.icon_state = "[pulse()]"
 		hud_list[HEALTH_HUD] = holder

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

@@ -431,7 +431,7 @@ There are several things that need to be remembered:
 				standing.underlays	+= "telekinesishead[fat]_s"
 				add_image = 1
 			*/
-			if(LASER)
+			if(LASER_EYES)
 				standing.overlays += "lasereyes_s"
 				add_image = 1
 	if(add_image)

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

@@ -240,9 +240,9 @@
 		)
 
 /obj/item/gripper/chemistry //A gripper designed for chemistry, to allow borgs to work efficiently in the lab
-	name = "chemistry gripper"
+	name = "medical gripper"
 	icon_state = "gripper-sci"
-	desc = "A specialised grasping tool designed for working in chemistry and pharmaceutical labs"
+	desc = "A specialised grasping tool designed for working in medical treatment facilities and pharmaceutical labs."
 
 	can_hold = list(
 		/obj/item/reagent_containers/glass,
@@ -253,7 +253,10 @@
 		/obj/item/storage/pill_bottle,
 		/obj/item/hand_labeler,
 		/obj/item/paper,
-		/obj/item/stack/material/phoron
+		/obj/item/stack/material/phoron,
+		/obj/item/reagent_containers/blood,
+		/obj/item/reagent_containers/food/drinks/sillycup,
+		/obj/item/reagent_containers/food/drinks/medcup
 		)
 
 

code/modules/mob/living/simple_animal/hostile/hostile.dm

@@ -339,6 +339,11 @@ mob/living/simple_animal/hostile/hitby(atom/movable/AM as mob|obj,var/speed = TH
 //////////////////////////////
 
 /mob/living/simple_animal/hostile/proc/validator_living(var/mob/living/L, var/atom/current)
+	if(ismech(L))
+		var/mob/living/heavy_vehicle/M = L
+		if(!M.pilots?.len)
+			return FALSE
+
 	if((L.faction == src.faction) && !attack_same)
 		return FALSE
 	if(L in friends)

code/modules/mob/mob_helpers.dm

@@ -1269,4 +1269,7 @@ proc/is_blind(A)
 	result[1] = asight
 	result[2] = ainvis
 
-	return result
+	return result
+
+/mob/proc/remove_blood_simple(var/blood)
+	return