From a7cba9170d59bbbf547ac257e13b4b1f9ec2cee1 Mon Sep 17 00:00:00 2001 From: CIB123 Date: Wed, 19 Sep 2012 18:04:35 +0000 Subject: [PATCH] Fixed a problem with organ name display. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4728 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/procs/helpers.dm | 4 ++++ code/modules/mob/living/carbon/human/human_defense.dm | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/defines/procs/helpers.dm b/code/defines/procs/helpers.dm index b00635bff7e..3a0a691951b 100644 --- a/code/defines/procs/helpers.dm +++ b/code/defines/procs/helpers.dm @@ -1201,6 +1201,10 @@ proc/get_mob_with_client_list() else if (zone == "r_leg") return "right leg" else if (zone == "l_foot") return "left foot" else if (zone == "r_foot") return "right foot" + else if (zone == "l_hand") return "left hand" + else if (zone == "r_hand") return "right hand" + else if (zone == "l_foot") return "left foot" + else if (zone == "r_foot") return "right foot" else return zone diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index d8d435a3d6e..38dd36c37fc 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -112,7 +112,7 @@ emp_act var/datum/organ/external/affecting = get_organ(ran_zone(user.zone_sel.selecting)) - var/hit_area = parse_zone(affecting.name) + var/hit_area = affecting.display_name if((user != src) && check_shields(I.force, "the [I.name]")) return 0