Skip to content

Commit

Permalink
put it at the front so we just dont.
Browse files Browse the repository at this point in the history
  • Loading branch information
FalloutFalcon committed May 18, 2024
1 parent 70f0ccc commit 50bb321
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions code/modules/mob/living/carbon/human/human_defense.dm
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,9 @@

///Calculates the siemens coeff based on clothing and species, can also restart hearts.
/mob/living/carbon/human/electrocute_act(shock_damage, source, siemens_coeff = 1, flags = NONE)
//If it doesnt have physiology its prob still initializing.
if(!physiology)
return
//Calculates the siemens coeff based on clothing. Completely ignores the arguments
if(flags & SHOCK_TESLA) //I hate this entire block. This gets the siemens_coeff for tesla shocks
if(gloves && gloves.siemens_coefficient <= 0)
Expand All @@ -498,10 +501,6 @@
else if(!(flags & SHOCK_NOGLOVES)) //This gets the siemens_coeff for all non tesla shocks
if(gloves)
siemens_coeff *= gloves.siemens_coefficient
//If it doesnt have physiology its prob still initializing.
if(!physiology)
. = ..()
return
siemens_coeff *= physiology.siemens_coeff
siemens_coeff *= dna.species.siemens_coeff
. = ..()
Expand Down

0 comments on commit 50bb321

Please sign in to comment.