cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3154 from Fox-McCloud/damage-fix

Browse Source 
Fixes Take Overall Damage
This commit is contained in:
TheDZD
2016-01-07 19:56:27 -05:00
parent 8c438d84d4 b5af35f7d0
commit f5f90c720b
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_damage.dm
+6 -1
View File
@@ -291,17 +291,22 @@
var/update = 0
while(parts.len && (brute>0 || burn>0) )
var/obj/item/organ/external/picked = pick(parts)
var/brute_per_part = brute/parts.len
var/burn_per_part = burn/parts.len
var/brute_was = picked.brute_dam
var/burn_was = picked.burn_dam
update |= picked.take_damage(brute,burn,sharp,edge,used_weapon)
update |= picked.take_damage(brute_per_part,burn_per_part,sharp,edge,used_weapon)
brute -= (picked.brute_dam - brute_was)
burn -= (picked.burn_dam - burn_was)
parts -= picked
updatehealth()
if(update)
UpdateDamageIcon()