Moves tesla_ignore from var on /mob/living to secondary flag

This commit is contained in:
CitadelStationBot
2017-04-17 09:45:30 -05:00
parent 21827263f5
commit dd76874f1c
7 changed files with 8 additions and 6 deletions
@@ -169,7 +169,7 @@
..()
/mob/living/carbon/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = 0, override = 0, tesla_shock = 0, illusion = 0, stun = TRUE)
if(tesla_shock && tesla_ignore)
if(tesla_shock && HAS_SECONDARY_FLAG(src, TESLA_IGNORE))
return FALSE
shock_damage *= siemens_coeff
if(dna && dna.species)
@@ -456,7 +456,7 @@
else if(S.siemens_coefficient == (-1))
total_coeff -= 1
siemens_coeff = total_coeff
if(tesla_ignore)
if(HAS_SECONDARY_FLAG(src, TESLA_IGNORE))
siemens_coeff = 0
else if(!safety)
var/gloves_siemens_coeff = 1