From a9ac70921a51f2250e3d91af0d92070d7cd50aef Mon Sep 17 00:00:00 2001 From: KageIIte Date: Wed, 16 Oct 2024 12:00:39 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B0=D0=BB=D0=B5=D0=BD=D1=8C=D0=BA?= =?UTF-8?q?=D0=B8=D0=B9=20=D1=80=D0=B5=D0=B1=D0=B0=D0=BB=D0=B0=D0=BD=D1=81?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=B4=20=D1=82=D0=BE=D0=BA=D1=81=D0=B8=D0=BD?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modular_ss220/species/_components/organs/organ_toxins.dm | 6 ++---- .../code/organs/internal/organs/serpentids_organs_ears.dm | 2 +- .../code/organs/internal/organs/serpentids_organs_eyes.dm | 2 +- .../code/organs/internal/organs/serpentids_organs_heart.dm | 2 +- .../code/organs/internal/organs/serpentids_organs_lungs.dm | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/modular_ss220/species/_components/organs/organ_toxins.dm b/modular_ss220/species/_components/organs/organ_toxins.dm index 728bde23942d..66e2bff4b1f4 100644 --- a/modular_ss220/species/_components/organs/organ_toxins.dm +++ b/modular_ss220/species/_components/organs/organ_toxins.dm @@ -29,15 +29,13 @@ var/obj/item/organ/internal/liver/target_liver = organ.owner.get_int_organ(/obj/item/organ/internal/liver) var/obj/item/organ/internal/kidneys/target_kidney = organ.owner.get_int_organ(/obj/item/organ/internal/kidneys) - if(organ == target_kidney) - organ.receive_damage(organ.owner.get_damage_amount(TOX) * toxin_damage_rate, 1) - organ.owner.adjustToxLoss(-1 * organ.owner.get_damage_amount(TOX) * toxin_damage_rate) - else if(target_kidney.status == ORGAN_DEAD && organ == target_liver) + if(organ == target_kidney || organ == target_liver ) organ.receive_damage(organ.owner.get_damage_amount(TOX) * toxin_damage_rate, 1) organ.owner.adjustToxLoss(-1 * organ.owner.get_damage_amount(TOX) * toxin_damage_rate) else if(target_liver.status == ORGAN_DEAD && target_kidney.status == ORGAN_DEAD) organ.receive_damage(organ.owner.get_damage_amount(TOX) * toxin_damage_rate, 1) + /obj/item/organ/internal/process() SEND_SIGNAL(src, COMSIG_ORGAN_TOX_HANDLE) . = .. () diff --git a/modular_ss220/species/serpentids/code/organs/internal/organs/serpentids_organs_ears.dm b/modular_ss220/species/serpentids/code/organs/internal/organs/serpentids_organs_ears.dm index 62efc896dce0..024cf7d84750 100644 --- a/modular_ss220/species/serpentids/code/organs/internal/organs/serpentids_organs_ears.dm +++ b/modular_ss220/species/serpentids/code/organs/internal/organs/serpentids_organs_ears.dm @@ -9,7 +9,7 @@ action_icon_state = list(/datum/action/item_action/organ_action/toggle = "gas_abilities") var/decay_rate = 0.2 var/decay_recovery = BASIC_RECOVER_VALUE - var/organ_process_toxins = 0.25 + var/organ_process_toxins = 0.025 var/chemical_consuption = GAS_ORGAN_CHEMISTRY_EARS var/chemical_id = SERPENTID_CHEM_REAGENT_ID var/active = FALSE diff --git a/modular_ss220/species/serpentids/code/organs/internal/organs/serpentids_organs_eyes.dm b/modular_ss220/species/serpentids/code/organs/internal/organs/serpentids_organs_eyes.dm index e6c83beffdc8..8d62259844c9 100644 --- a/modular_ss220/species/serpentids/code/organs/internal/organs/serpentids_organs_eyes.dm +++ b/modular_ss220/species/serpentids/code/organs/internal/organs/serpentids_organs_eyes.dm @@ -13,7 +13,7 @@ var/chemical_id = SERPENTID_CHEM_REAGENT_ID var/decay_rate = 0.1 var/decay_recovery = BASIC_RECOVER_VALUE - var/organ_process_toxins = 0.35 + var/organ_process_toxins = 0.035 var/chemical_consuption = GAS_ORGAN_CHEMISTRY_EYES var/vision_ajust_coefficient = 0.4 var/update_time_client_colour = 10 diff --git a/modular_ss220/species/serpentids/code/organs/internal/organs/serpentids_organs_heart.dm b/modular_ss220/species/serpentids/code/organs/internal/organs/serpentids_organs_heart.dm index 48d933e55b39..c72fe8f41ee9 100644 --- a/modular_ss220/species/serpentids/code/organs/internal/organs/serpentids_organs_heart.dm +++ b/modular_ss220/species/serpentids/code/organs/internal/organs/serpentids_organs_heart.dm @@ -9,7 +9,7 @@ var/chemical_id = SERPENTID_CHEM_REAGENT_ID var/decay_rate = 0.5 var/decay_recovery = BASIC_RECOVER_VALUE - var/organ_process_toxins = 0.1 + var/organ_process_toxins = 0.01 /obj/item/organ/internal/heart/serpentid/Initialize(mapload) . = ..() diff --git a/modular_ss220/species/serpentids/code/organs/internal/organs/serpentids_organs_lungs.dm b/modular_ss220/species/serpentids/code/organs/internal/organs/serpentids_organs_lungs.dm index c6265a0122dd..80459c9e96b9 100644 --- a/modular_ss220/species/serpentids/code/organs/internal/organs/serpentids_organs_lungs.dm +++ b/modular_ss220/species/serpentids/code/organs/internal/organs/serpentids_organs_lungs.dm @@ -17,7 +17,7 @@ var/obj/item/tank/internals/oxygen/serpentid_vault = new /obj/item/tank/internals/oxygen/serpentid_vault_tank var/decay_rate = 0.3 var/decay_recovery = BASIC_RECOVER_VALUE - var/organ_process_toxins = 0.25 + var/organ_process_toxins = 0.025 var/chem_to_oxy_mult = 0.1 var/danger_air = FALSE var/hand_active = FALSE