Merges Heal_Damage and Heal_robotic_damage procs

like I should have done in the first place.
Corrects all usages of Heal_damage so it works with the changed version.
Same goes for Heal_robotic_damage
This commit is contained in:
Robson Richards
2013-12-29 17:40:12 +00:00
parent 53bfd06609
commit d3d4c79946
7 changed files with 16 additions and 24 deletions
@@ -79,7 +79,7 @@
var/list/obj/item/organ/limb/parts = get_damaged_organs(brute,burn)
if(!parts.len) return
var/obj/item/organ/limb/picked = pick(parts)
if(picked.heal_damage(brute,burn))
if(picked.heal_damage(brute,burn,0))
update_damage_overlays(0)
updatehealth()
@@ -106,7 +106,7 @@
var/brute_was = picked.brute_dam
var/burn_was = picked.burn_dam
update |= picked.heal_damage(brute,burn)
update |= picked.heal_damage(brute,burn,0)
brute -= (brute_was-picked.brute_dam)
burn -= (burn_was-picked.burn_dam)
@@ -129,7 +129,7 @@ emp_act
if(affecting.status == ORGAN_ROBOTIC)
if (WT.remove_fuel(0))
if(affecting.brute_dam > 0)
affecting.heal_robotic_damage(30,0) //Repair Brute
affecting.heal_damage(30,0,1) //Repair Brute
update_damage_overlays(0)
updatehealth()
for(var/mob/O in viewers(user, null))
@@ -147,7 +147,7 @@ emp_act
var/obj/item/weapon/cable_coil/coil = I
if(affecting.status == ORGAN_ROBOTIC)
if(affecting.burn_dam > 0)
affecting.heal_robotic_damage(0,30) //Repair Burn
affecting.heal_damage(0,30,1) //Repair Burn
updatehealth()
coil.use(1)
for(var/mob/O in viewers(user, null))
+7 -14
View File
@@ -136,8 +136,13 @@
//Heals brute and burn damage for the organ. Returns 1 if the damage-icon states changed at all.
//Damage cannot go below zero.
//Cannot remove negative damage (i.e. apply damage)
/obj/item/organ/limb/proc/heal_damage(brute, burn)
if(status == ORGAN_ROBOTIC) // This makes robolimbs not healable by chems
/obj/item/organ/limb/proc/heal_damage(brute, burn, var/robotic)
if(robotic && status != ORGAN_ROBOTIC) // This makes organic limbs not heal when the proc is in Robotic mode.
brute = max(0, brute - 3)
burn = max(0, burn - 3)
if(!robotic && status == ORGAN_ROBOTIC) // This makes robolimbs not healable by chems.
brute = max(0, brute - 3)
burn = max(0, burn - 3)
@@ -146,18 +151,6 @@
return update_organ_icon()
/obj/item/organ/limb/proc/heal_robotic_damage(brute, burn) //so you can heal robotic limbs but not with the original proc - RR
if(status == ORGAN_ORGANIC) //This is a robotic heal proc so no healing organic limbs - RR
brute = max(0, brute - 3)
burn = max(0, burn - 3)
brute_dam = max(brute_dam - brute, 0)
burn_dam = max(burn_dam - burn, 0)
return update_organ_icon()
//Returns total damage...kinda pointless really
/obj/item/organ/limb/proc/get_damage()
return brute_dam + burn_dam