cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a problem with organ name display.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4728 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
CIB123
2012-09-19 18:04:35 +00:00
parent 3b9e914f32
commit a7cba9170d
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/defines/procs/helpers.dm
View File

@@ -1201,6 +1201,10 @@ proc/get_mob_with_client_list()
else if (zone == "r_leg") return "right leg" else if (zone == "r_leg") return "right leg"
else if (zone == "l_foot") return "left foot" else if (zone == "l_foot") return "left foot"
else if (zone == "r_foot") return "right 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 else return zone

2
code/modules/mob/living/carbon/human/human_defense.dm
View File

@@ -112,7 +112,7 @@ emp_act
var/datum/organ/external/affecting = get_organ(ran_zone(user.zone_sel.selecting)) 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]")) if((user != src) && check_shields(I.force, "the [I.name]"))
return 0 return 0