cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bodies not being husked when taking large amounts of burns at once (#15084)

Browse Source
This commit is contained in:
DamianX
2017-06-04 18:11:44 +02:00
committed by Intigracy
parent 6c802dc8c8
commit 7dce43cc51
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/mob/living/carbon/human/human_damage.dm
View File

@@ -11,8 +11,9 @@
total_brute += O.brute_dam total_brute += O.brute_dam
total_burn += O.burn_dam total_burn += O.burn_dam
health = maxHealth - getOxyLoss() - getToxLoss() - getCloneLoss() - total_burn - total_brute health = maxHealth - getOxyLoss() - getToxLoss() - getCloneLoss() - total_burn - total_brute
//TODO: fix husking
if( ((maxHealth - total_burn) < config.health_threshold_dead) && stat == DEAD) //100 only being used as the magic human max health number, feel free to change it if you add a var for it -- Urist if((maxHealth - total_burn) < config.health_threshold_dead)
death(FALSE)
ChangeToHusk() ChangeToHusk()
return return