cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Abductor additions: replaces and improves glands, new surgery type (#35012)

Browse Source 
* Abductor additions: improves glands, new surgery type

* fixes
This commit is contained in:
XDTM
2018-01-29 10:50:32 +01:00
committed by vuonojenmustaturska
parent 265b5e0e45
commit 9b93747d36
7 changed files with 163 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/living_defense.dm
View File

@@ -303,6 +303,8 @@
/mob/living/proc/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = 0, tesla_shock = 0, illusion = 0, stun = TRUE)
if(tesla_shock && (flags_2 & TESLA_IGNORE_2))
return FALSE
if(has_trait(TRAIT_SHOCKIMMUNE))
return FALSE
if(shock_damage > 0)
if(!illusion)
adjustFireLoss(shock_damage)