Fixes siemens_coefficent not affecting shock damage

Also cleans up electrocute_act()

Conflicts:
	code/game/gamemodes/events/ninja_equipment.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/human.dm
This commit is contained in:
mwerezak
2014-08-03 15:24:53 -04:00
committed by ZomgPonies
parent ea1f8307d0
commit e76cc064df
5 changed files with 58 additions and 37 deletions
+3
View File
@@ -455,6 +455,9 @@
//No animations will be performed by this proc.
/proc/electrocute_mob(mob/living/carbon/M as mob, var/power_source, var/obj/source, var/siemens_coeff = 1.0)
if(istype(M.loc,/obj/mecha)) return 0 //feckin mechs are dumb
//This is for performance optimization only.
//DO NOT modify siemens_coeff here. That is checked in human/electrocute_act()
if(istype(M,/mob/living/carbon/human))
var/mob/living/carbon/human/H = M
if(H.gloves)