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

Fixes #11381

Browse Source
This commit is contained in:
mwerezak
2015-12-27 01:25:13 -05:00
parent da0a4c47cf
commit b30f81c7ea
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,8 +8,8 @@
var/total_burn = 0
var/total_brute = 0
for(var/obj/item/organ/external/O in organs) //hardcoded to streamline things a bit
if(O.status & ORGAN_ROBOT)
continue //robot limbs don't count towards shock and crit
if(O.status & ORGAN_ROBOT && !O.vital)
continue //*non-vital* robot limbs don't count towards shock and crit
total_brute += O.brute_dam
total_burn += O.burn_dam