Merge pull request #2750 from Asanadas/master

Bugfix: Fix for bloody hands not occurring.
This commit is contained in:
Chinsky
2013-05-13 10:56:30 -07:00

View File

@@ -117,7 +117,7 @@ emp_act
if(!target_zone) if(!target_zone)
visible_message("\red <B>[user] misses [src] with \the [I]!") visible_message("\red <B>[user] misses [src] with \the [I]!")
return return
var/datum/organ/external/affecting = get_organ(target_zone) var/datum/organ/external/affecting = get_organ(target_zone)
if (!affecting) if (!affecting)
return return
@@ -152,7 +152,7 @@ emp_act
location.add_blood(src) location.add_blood(src)
if(ishuman(user)) if(ishuman(user))
var/mob/living/carbon/human/H = user var/mob/living/carbon/human/H = user
if(get_dist(H, src) > 1) //people with TK won't get smeared with blood if(get_dist(H, src) <= 1) //people with TK won't get smeared with blood
H.bloody_body(src) H.bloody_body(src)
H.bloody_hands(src) H.bloody_hands(src)