Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475

2018-03-09 14:18:47 -05:00
parent a80ab73951 e62f090dad
commit 936c6a33f2
179 changed files with 3274 additions and 1999 deletions
@@ -346,7 +346,11 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
 		icon_state = "runed_sense2"
 		desc = "You can no longer sense your target's presence."
 		return
-	desc = "You are currently tracking [blood_target] in [get_area_name(blood_target)]."
+	if(isliving(blood_target))
+		var/mob/living/real_target = blood_target
+		desc = "You are currently tracking [real_target.real_name] in [get_area_name(blood_target)]."
+	else
+		desc = "You are currently tracking [blood_target] in [get_area_name(blood_target)]."
 	var/target_angle = Get_Angle(Q, P)
 	var/target_dist = get_dist(P, Q)
 	cut_overlays()