cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed issue 657. Attacking someone at a distance (using TK) will no longer make you get smeared in their blood.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4458 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
baloh.matevz
2012-08-17 04:18:08 +00:00
parent 9062d7fb23
commit f3996dfc5e
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,21 +140,22 @@ 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(H.wear_suit) if(get_dist(H, src) > 1) //people with TK won't get smeared with blood
H.wear_suit.add_blood(src) if(H.wear_suit)
H.update_inv_wear_suit(0) //updates mob overlays to show the new blood (no refresh) H.wear_suit.add_blood(src)
else if(H.w_uniform) H.update_inv_wear_suit(0) //updates mob overlays to show the new blood (no refresh)
H.w_uniform.add_blood(src) else if(H.w_uniform)
H.update_inv_w_uniform(0) //updates mob overlays to show the new blood (no refresh) H.w_uniform.add_blood(src)
if (H.gloves) H.update_inv_w_uniform(0) //updates mob overlays to show the new blood (no refresh)
H.gloves.add_blood(H) if (H.gloves)
H.gloves:transfer_blood = 2 H.gloves.add_blood(H)
H.gloves:bloody_hands_mob = H H.gloves:transfer_blood = 2
else H.gloves:bloody_hands_mob = H
H.add_blood(H) else
H.bloody_hands = 2 H.add_blood(H)
H.bloody_hands_mob = H H.bloody_hands = 2
H.update_inv_gloves() //updates on-mob overlays for bloody hands and/or bloody gloves H.bloody_hands_mob = H
H.update_inv_gloves() //updates on-mob overlays for bloody hands and/or bloody gloves
switch(hit_area) switch(hit_area)
if("head")//Harder to score a stun but if you do it lasts a bit longer if("head")//Harder to score a stun but if you do it lasts a bit longer