cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 03:27:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #678 from Zuhayr/fix

Browse Source 
Applying Harpy's prosthetic limb damage fix.
This commit is contained in:
Neerti
2015-12-28 23:22:17 -05:00
parent 39bb0acd42 1617a43685
commit 143a48558c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_damage.dm
+2 -2
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