cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 04:51:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #563 from SkyMarshal/master

Browse Source 
Disposals for mining, final blood_DNA stuff, cleaned up more code, fixed some scattered bugs, added 50% chance to end up in deep space.
This commit is contained in:
Mloc
2012-02-29 12:51:48 -08:00
parent e1caabdec2 4524a2ff10
commit 9cee329958
21 changed files with 4979 additions and 4880 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)