shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
LetterJay
2017-07-14 10:22:43 -05:00
parent eb5cce3b8b
commit df26bdd9cf
375 changed files with 0 additions and 1752 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/mob/living/damage_procs.dm.rej
View File

@@ -1,10 +0,0 @@
diff a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm (rejected hunks)
@@ -58,7 +58,7 @@
return getStaminaLoss()
-/mob/living/proc/apply_damages(brute = 0, burn = 0, tox = 0, oxy = 0, clone = 0, def_zone = null, blocked = 0, stamina = 0)
+/mob/living/proc/apply_damages(brute = 0, burn = 0, tox = 0, oxy = 0, clone = 0, def_zone = null, blocked = FALSE, stamina = 0)
if(blocked >= 100)
return 0
if(brute)