From b1996a77e1a49c26875de129e5e1ea1290f96ce0 Mon Sep 17 00:00:00 2001 From: Perakp Date: Sat, 21 Dec 2013 23:01:52 +0200 Subject: [PATCH] Fixes AI seeing the name of the person who speaks over radio using a voice changer. --- code/game/machinery/camera/tracking.dm | 2 +- code/modules/mob/living/carbon/human/human_helpers.dm | 2 +- code/modules/mob/living/living.dm | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index 9e1a8552b9d..6461837c7a7 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -125,7 +125,7 @@ //U << text("Now tracking [] on camera.", target.name) //if (U.machine == null) // U.machine = U - U << "Now tracking [target.name] on camera." + U << "Now tracking [target.get_visible_name()] on camera." spawn (0) while (U.cameraFollow == target) diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 774d1fee51c..f721c364c9d 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -33,7 +33,7 @@ return if_no_id //repurposed proc. Now it combines get_id_name() and get_face_name() to determine a mob's name variable. Made into a seperate proc as it'll be useful elsewhere -/mob/living/carbon/human/proc/get_visible_name() +/mob/living/carbon/human/get_visible_name() var/face_name = get_face_name("") var/id_name = get_id_name("") if(face_name) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 41a4882f910..7c71c2fa3c9 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -553,3 +553,7 @@ CM.legcuffed.loc = usr.loc CM.legcuffed = null CM.update_inv_legcuffed(0) + + +/mob/living/proc/get_visible_name() + return name \ No newline at end of file