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

Merge branch 'master' into upstream-merge-33055

Browse Source
This commit is contained in:
LetterJay
2017-12-25 04:10:34 -06:00
committed by GitHub
parent cfeea088e8 2609dc109f
commit ac5503d338
687 changed files with 9555 additions and 5558 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/brain/brain_item.dm
+1 -1
View File
@@ -154,7 +154,7 @@
var/adjusted_amount
if(amount >= 0 && maximum)
var/brainloss = get_brain_damage()
var/new_brainloss = Clamp(brainloss + amount, 0, maximum)
var/new_brainloss = CLAMP(brainloss + amount, 0, maximum)
if(brainloss > new_brainloss) //brainloss is over the cap already
return 0
adjusted_amount = new_brainloss - brainloss