From f85d4e7158a8905be0da8607504e4fd4843b22f4 Mon Sep 17 00:00:00 2001 From: KageIIte Date: Mon, 1 Jul 2024 22:06:50 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B1=D1=80=D0=BE?= =?UTF-8?q?=D1=81=20=D1=83=D1=80=D0=BE=D0=BD=D0=B0=20=D0=BF=D0=BE=20=D0=BB?= =?UTF-8?q?=D0=B5=D0=B3=D0=BA=D0=B8=D0=BC=20=D1=81=20=D0=BE=D0=B6=D0=BE?= =?UTF-8?q?=D0=B3=D0=B0=20=D0=BD=D0=B0=20=D0=B1=D1=80=D1=83=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code/organ_damage/organ_damage_brute.dm | 3 +++ .../medical/code/organ_damage/organ_damage_burn.dm | 14 -------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/modular_bandastation/medical/code/organ_damage/organ_damage_brute.dm b/modular_bandastation/medical/code/organ_damage/organ_damage_brute.dm index d4be9340b1d44..ee2b541bd76c6 100644 --- a/modular_bandastation/medical/code/organ_damage/organ_damage_brute.dm +++ b/modular_bandastation/medical/code/organ_damage/organ_damage_brute.dm @@ -24,6 +24,9 @@ if(BODY_ZONE_CHEST) if(prob(amount)) adjustOrganLoss(ORGAN_SLOT_STOMACH, bruteloss * 0.3) + if(BODY_ZONE_CHEST) + if(prob(amount)) + adjustOrganLoss(ORGAN_SLOT_LUNGS, bruteloss * 0.2) if(BODY_ZONE_PRECISE_GROIN) if(prob(amount)) adjustOrganLoss(ORGAN_SLOT_LIVER, bruteloss * 0.4) diff --git a/modular_bandastation/medical/code/organ_damage/organ_damage_burn.dm b/modular_bandastation/medical/code/organ_damage/organ_damage_burn.dm index 2c9163a842382..8b137891791fe 100644 --- a/modular_bandastation/medical/code/organ_damage/organ_damage_burn.dm +++ b/modular_bandastation/medical/code/organ_damage/organ_damage_burn.dm @@ -1,15 +1 @@ -/mob/living/proc/adjustFireLoss(amount, updating_health = TRUE, forced = FALSE, required_bodytype = ALL) - if(!can_adjust_fire_loss(amount, forced, required_bodytype)) - return 0 - . = fireloss - fireloss = clamp((fireloss + (amount * CONFIG_GET(number/damage_multiplier))), 0, maxHealth * 2) - . -= fireloss - if(BODY_ZONE_CHEST) - if(prob(amount)) - adjustOrganLoss(ORGAN_SLOT_LUNGS, fireloss * 0.2,required_organ_flag = ORGAN_ORGANIC) - - if(. == 0) // no change, no need to update - return - if(updating_health) - updatehealth()