Маленький ребаланс под токсины

ss220club · Oct 16, 2024 · a9ac709 · a9ac709
1 parent 83729cc
commit a9ac709
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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