cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes a bunch of things to not circumvent SetStun/SetWeaken/SetParalyse that has no business doing so.

Browse Source
This commit is contained in:
Tastyfish
2016-02-28 01:11:36 -05:00
parent 386db45948
commit aed9859b9a
11 changed files with 42 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/silicon.dm
+3 -3
View File
@@ -110,11 +110,11 @@
if(!effect || (blocked >= 2)) return 0
switch(effecttype)
if(STUN)
stunned = max(stunned,(effect/(blocked+1)))
Stun(effect / (blocked + 1))
if(WEAKEN)
weakened = max(weakened,(effect/(blocked+1)))
Weaken(effect / (blocked + 1))
if(PARALYZE)
paralysis = max(paralysis,(effect/(blocked+1)))
Paralyse(effect / (blocked + 1))
if(IRRADIATE)
radiation += min((effect - (effect*getarmor(null, "rad"))), 0)//Rads auto check armor
if(STUTTER)