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

Merge pull request #2242 from Neerti/7/31/2016_technomancer_fixes

Browse Source 
Technomancer Fixes
This commit is contained in:
Yoshax
2016-08-01 01:18:13 +01:00
committed by GitHub
parent 2d91d68fb6 3d11717d13
commit 4779026748
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,12 +18,11 @@ emp_act
//Shields
var/shield_check = check_shields(P.damage, P, null, def_zone, "the [P.name]")
if(shield_check)
if(shield_check < 0)
return shield_check
else
P.on_hit(src, 2, def_zone)
return 2
if(shield_check) // If the block roll succeeded, this is true.
if(shield_check < 0) // The shield did something weird and the bullet needs to keep doing things (e.g. it was reflected).
return shield_check // Likely equal to PROJECTILE_FORCE_MISS or PROJECTILE_CONTINUE.
else // Otherwise we blocked normally and stopped all the damage.
return 0
//Shrapnel
if(P.can_embed())