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

Implemented updatehealth() for robots

Browse Source 
Fixes a bug of them never dying.
This commit is contained in:
cib
2013-07-04 09:46:47 +02:00
parent 5b8dadf05e
commit 0eb1b2d12c
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/modules/mob/living/silicon/robot/robot_damage.dm
View File

@@ -1,3 +1,11 @@
/mob/living/silicon/robot/updatehealth()
if(status_flags & GODMODE)
health = 100
stat = CONSCIOUS
return
health = 100 - getBruteLoss() - getFireLoss()
return
/mob/living/silicon/robot/getBruteLoss() /mob/living/silicon/robot/getBruteLoss()
var/amount = 0 var/amount = 0
for(var/V in components) for(var/V in components)
@@ -44,6 +52,7 @@
if(!parts.len) return if(!parts.len) return
var/datum/robot_component/picked = pick(parts) var/datum/robot_component/picked = pick(parts)
picked.heal_damage(brute,burn) picked.heal_damage(brute,burn)
updatehealth()
/mob/living/silicon/robot/take_organ_damage(var/brute, var/burn, var/sharp = 0) /mob/living/silicon/robot/take_organ_damage(var/brute, var/burn, var/sharp = 0)
var/list/components = get_damageable_components() var/list/components = get_damageable_components()
@@ -52,6 +61,7 @@
var/datum/robot_component/C = pick(components) var/datum/robot_component/C = pick(components)
C.take_damage(brute,burn,sharp) C.take_damage(brute,burn,sharp)
updatehealth()
/mob/living/silicon/robot/heal_overall_damage(var/brute, var/burn) /mob/living/silicon/robot/heal_overall_damage(var/brute, var/burn)
var/list/datum/robot_component/parts = get_damaged_components(brute,burn) var/list/datum/robot_component/parts = get_damaged_components(brute,burn)
@@ -68,6 +78,7 @@
burn -= (burn_was-picked.electronics_damage) burn -= (burn_was-picked.electronics_damage)
parts -= picked parts -= picked
updatehealth()
/mob/living/silicon/robot/take_overall_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/used_weapon = null) /mob/living/silicon/robot/take_overall_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/used_weapon = null)
if(status_flags & GODMODE) return //godmode if(status_flags & GODMODE) return //godmode
@@ -102,3 +113,5 @@
burn -= (picked.electronics_damage - burn_was) burn -= (picked.electronics_damage - burn_was)
parts -= picked parts -= picked
updatehealth()