From efe73cbbaba7d338253d0d67703839c7cd40b976 Mon Sep 17 00:00:00 2001 From: alex-gh Date: Tue, 11 Sep 2018 06:32:58 +0200 Subject: [PATCH] VV can now also fix robotic limbs. --- code/datums/datumvars.dm | 4 ++-- code/modules/mob/living/carbon/human/human_damage.dm | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index 27d92b085fd..cefaa344dca 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -1215,8 +1215,8 @@ return switch(Text) - if("brute") L.adjustBruteLoss(amount) - if("fire") L.adjustFireLoss(amount) + if("brute") L.adjustBruteLoss(amount, robotic=1) + if("fire") L.adjustFireLoss(amount, robotic=1) if("toxin") L.adjustToxLoss(amount) if("oxygen")L.adjustOxyLoss(amount) if("brain") L.adjustBrainLoss(amount) diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 80c128ee07f..ddfce48f6ce 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -88,21 +88,21 @@ return amount -/mob/living/carbon/human/adjustBruteLoss(amount, damage_source) +/mob/living/carbon/human/adjustBruteLoss(amount, damage_source, robotic=0) if(dna.species) amount = amount * dna.species.brute_mod if(amount > 0) take_overall_damage(amount, 0, used_weapon = damage_source) else - heal_overall_damage(-amount, 0) + heal_overall_damage(-amount, 0, 0, robotic) -/mob/living/carbon/human/adjustFireLoss(amount, damage_source) +/mob/living/carbon/human/adjustFireLoss(amount, damage_source, robotic=0) if(dna.species) amount = amount * dna.species.burn_mod if(amount > 0) take_overall_damage(0, amount, used_weapon = damage_source) else - heal_overall_damage(0, -amount) + heal_overall_damage(0, -amount, 0, robotic) /mob/living/carbon/human/proc/adjustBruteLossByPart(amount, organ_name, obj/damage_source = null) if(dna.species)