cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 20:45:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merges Heal_Damage and Heal_robotic_damage procs

Browse Source 
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
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
@@ -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)
code/modules/mob/living/carbon/human/human_defense.dm
+2 -2
View File
@@ -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))