cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 12:35:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #48647 from ShizCalev/tesla-shock-refund-fix

Browse Source 
Fixes tesla immunity being lost if you have reactive armor and refund the lighting bolt spell / vice versa
This commit is contained in:
skoglol
2020-01-08 11:17:00 +01:00
committed by GitHub
parent dc3c890232 0432f132fb
commit c471f51dff
8 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living_defense.dm
+1 -1
View File
@@ -342,7 +342,7 @@
/mob/living/proc/electrocute_act(shock_damage, source, siemens_coeff = 1, flags = NONE)
SEND_SIGNAL(src, COMSIG_LIVING_ELECTROCUTE_ACT, shock_damage, source, siemens_coeff, flags)
shock_damage *= siemens_coeff
if((flags & SHOCK_TESLA) && (flags_1 & TESLA_IGNORE_1))
if((flags & SHOCK_TESLA) && HAS_TRAIT(src, TRAIT_TESLA_SHOCKIMMUNE))
return FALSE
if(HAS_TRAIT(src, TRAIT_SHOCKIMMUNE))
return FALSE