Merge pull request #7791 from Baystation12/dev-freeze

Dev freeze

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

@@ -120,7 +120,7 @@
 		else
 			msg += "[t_He] [t_has] \icon[gloves] \a [gloves] on [t_his] hands.\n"
 	else if(blood_DNA)
-		msg += "<span class='warning'>[t_He] [t_has] blood-stained hands!</span>\n"
+		msg += "<span class='warning'>[t_He] [t_has] [(hand_blood_color != "#030303") ? "blood" : "oil"]-stained hands!</span>\n"
 
 	//handcuffed?
 
@@ -145,7 +145,7 @@
 		else
 			msg += "[t_He] [t_is] wearing \icon[shoes] \a [shoes] on [t_his] feet.\n"
 	else if(feet_blood_DNA)
-		msg += "<span class='warning'>[t_He] [t_has] blood-stained feet!</span>\n"
+		msg += "<span class='warning'>[t_He] [t_has] [(feet_blood_color != "#030303") ? "blood" : "oil"]-stained feet!</span>\n"
 
 	//mask
 	if(wear_mask && !skipmask)

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

@@ -113,7 +113,11 @@
 
 /mob/living/simple_animal/hostile/proc/ListTargets(var/dist = 7)
 	var/list/L = hearers(src, dist)
-	L += mechas_list
+	
+	for (var/obj/mecha/M in mechas_list)
+		if (get_dist(src, M) <= dist)
+			L += M
+	
 	return L
 
 /mob/living/simple_animal/hostile/death()

code/modules/mob/mob_helpers.dm

@@ -360,6 +360,8 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
 		return
 	M.shakecamera = 1
 	spawn(1)
+		if(!M.client)
+			return
 
 		var/atom/oldeye=M.client.eye
 		var/aiEyeFlag = 0