mob fixes

This commit is contained in:
Poojawa
2017-02-08 00:27:04 -06:00
parent 68bad60a1c
commit 883ebad540
13 changed files with 179 additions and 62 deletions
@@ -169,6 +169,8 @@
..()
/mob/living/carbon/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = 0, override = 0, tesla_shock = 0, illusion = 0)
if(tesla_shock && tesla_ignore)
return FALSE
shock_damage *= siemens_coeff
if(dna && dna.species)
shock_damage *= dna.species.siemens_coeff
@@ -448,6 +448,8 @@
if(S.siemens_coefficient <= 0)
total_coeff -= 0.95
siemens_coeff = total_coeff
if(tesla_ignore)
siemens_coeff = 0
else if(!safety)
var/gloves_siemens_coeff = 1
if(gloves)