cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 20:43:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Tastyfish
2012-02-29 18:50:17 -05:00
parent c8810833e9 665c2bf7fd
commit 1724038ce9
27 changed files with 5050 additions and 4906 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/damage_procs.dm
+2 -2
View File
@@ -42,9 +42,9 @@
if(!effect || (blocked >= 2)) return 0
switch(effecttype)
if(STUN)
Stun((effect - (effect*getarmor(null, "melee")))/(blocked + 1))
Stun((effect - (effect*getarmor(null, "laser")))/(blocked + 1))
if(WEAKEN)
Weaken((effect - (effect*getarmor(null, "melee")))/(blocked + 1))
Weaken((effect - (effect*getarmor(null, "laser")))/(blocked + 1))
if(PARALYZE)
Paralyse(effect/(blocked+1))
if(IRRADIATE)