Merge pull request #5973 from Walter0o/robot_fix

fixes #5970, prevents bugs in the future
This commit is contained in:
Chinsky
2014-08-13 18:41:29 +04:00
@@ -1,9 +1,9 @@
/mob/living/silicon/robot/updatehealth()
if(status_flags & GODMODE)
health = 200
health = maxHealth
stat = CONSCIOUS
return
health = 200 - (getBruteLoss() + getFireLoss())
health = maxHealth - (getBruteLoss() + getFireLoss())
return
/mob/living/silicon/robot/getBruteLoss()
@@ -145,4 +145,4 @@
brute -= (picked.brute_damage - brute_was)
burn -= (picked.electronics_damage - burn_was)
parts -= picked
parts -= picked