Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
This commit is contained in:
mwerezak
2014-06-30 14:43:45 -04:00
committed by ZomgPonies
parent ac95fb3c37
commit b3742982bb
@@ -262,7 +262,7 @@ emp_act
if(armor >= 2) return 0
if(!I.force) return 0
apply_damage(I.force, I.damtype, affecting, armor , sharp=weapon_sharp, edge=weapon_edge, used_weapon=I)
apply_damage(I.force, I.damtype, affecting, armor, sharp=weapon_sharp, edge=weapon_edge, used_weapon=I)
var/bloody = 0
if(((I.damtype == BRUTE) || (I.damtype == HALLOSS)) && prob(25 + (I.force * 2)))