cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12063 from Fox-McCloud/fix-stun-absorption

Browse Source 
Fixes Stun Absorbtion Not Working
This commit is contained in:
variableundefined
2019-08-23 17:15:40 -04:00
committed by GitHub
parent e8e153b097 6f254e8339
commit 412a9fe79b
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/status_procs.dm
+6
View File
@@ -397,6 +397,9 @@
// STUN
/mob/living/Stun(amount, updating = 1, force = 0)
if(status_flags & CANSTUN || force)
if(absorb_stun(amount, force))
return FALSE
return SetStunned(max(stunned, amount), updating, force)
/mob/living/SetStunned(amount, updating = 1, force = 0) //if you REALLY need to set stun to a set amount without the whole "can't go below current stunned"
@@ -434,6 +437,9 @@
// WEAKEN
/mob/living/Weaken(amount, updating = 1, force = 0)
if(status_flags & CANWEAKEN || force)
if(absorb_stun(amount, force))
return FALSE
return SetWeakened(max(weakened, amount), updating, force)
/mob/living/SetWeakened(amount, updating = 1, force = 0)