update

Author: Moltijoe

code/__DEFINES/dcs/signals/signals_mob/signals_carbon.dm

@@ -60,6 +60,8 @@
 #define COMSIG_CARBON_GAIN_ORGAN "carbon_gain_organ"
 ///from /item/organ/proc/Remove() (/obj/item/organ/)
 #define COMSIG_CARBON_LOSE_ORGAN "carbon_lose_organ"
+///from on_mob_metabolize and mob_end_metabolize for the liver
+#define COMSIG_CARBON_UPDATE_TOXINS "carbon_update_toxins_cache"
 ///from /mob/living/carbon/doUnEquip(obj/item/I, force, newloc, no_move, invdrop, silent)
 #define COMSIG_CARBON_EQUIP_HAT "carbon_equip_hat"
 ///from /mob/living/carbon/doUnEquip(obj/item/I, force, newloc, no_move, invdrop, silent)

code/modules/reagents/chemistry/reagents/toxin_reagents.dm

@@ -12,6 +12,14 @@
 	var/toxpwr = 1.5
 	var/silent_toxin = FALSE //won't produce a pain message when processed by liver/Life(seconds_per_tick = SSMOBS_DT, times_fired) if there isn't another non-silent toxin present.
 
+/datum/reagent/toxin/on_mob_metabolize(mob/living/L)
+	. = ..()
+	SEND_SIGNAL(L, COMSIG_CARBON_UPDATE_TOXINS)
+
+/datum/reagent/toxin/on_mob_end_metabolize(mob/living/L)
+	. = ..()
+	SEND_SIGNAL(L, COMSIG_CARBON_UPDATE_TOXINS)
+	
 /datum/reagent/toxin/amatoxin
 	name = "Amatoxin"
 	description = "A powerful poison derived from certain species of mushroom."

code/modules/surgery/organs/liver.dm

@@ -17,43 +17,62 @@
 	var/alcohol_tolerance = ALCOHOL_RATE
 	/// modifier to toxpwr for liver and toxin damage taken
 	var/toxLethality = LIVER_DEFAULT_TOX_LETHALITY 
+	/// cached list of the toxinpower of toxins
+	var/list/cached_toxpower = list()
+	/// whether or not the toxin process can provide a message
+	var/provide_pain_message = FALSE
 
-/obj/item/organ/liver/on_life()
-	var/mob/living/carbon/C = owner
-	..()	//perform general on_life()
-	if(istype(C))
-		if(!(organ_flags & ORGAN_FAILING))//can't process reagents with a failing liver
+/obj/item/organ/liver/Insert(mob/living/carbon/M, special, drop_if_replaced, special_zone)
+	. = ..()
+	RegisterSignal(M, COMSIG_CARBON_UPDATE_TOXINS, PROC_REF(update_toxin_cache))
 
-			var/provide_pain_message = FALSE
-			var/damage_multiplier = 1 //reduced for every toxin
-			var/list/toxpwr = list()
+/obj/item/organ/liver/Remove(mob/living/carbon/M, special)
+	UnregisterSignal(M, COMSIG_CARBON_UPDATE_TOXINS)
+	return ..()
 
-			for(var/datum/reagent/toxin/T in C.reagents.reagent_list)
-				toxpwr += T.toxpwr
-				provide_pain_message = provide_pain_message || !T.silent_toxin
-					
-			sort_list(toxpwr,  cmp = /proc/cmp_numeric_dsc) //sort all toxpowers scaling from highest to lowest
+/obj/item/organ/liver/proc/update_toxin_cache()
+	var/mob/living/carbon/C = owner
+	if(!istype(C))
+		return
 
-			for(var/dmg in toxpwr)
-				var/real_damage = dmg * toxLethality * damage_multiplier
-				damage_multiplier *= 0.5 //reduce the damage dealt for every subsequent toxin
-				C.adjustToxLoss(real_damage)
-				if(!HAS_TRAIT(owner, TRAIT_TOXINLOVER)) //don't hurt the liver if they like toxins
-					damage += (real_damage / 2)
+	provide_pain_message = FALSE
+	cached_toxpower = list()
 
-			//metabolize reagents
-			C.reagents.metabolize(C, can_overdose=TRUE)
+	for(var/datum/reagent/toxin/T in C.reagents.reagent_list)
+		cached_toxpower += T.toxpwr
+		provide_pain_message = provide_pain_message || !T.silent_toxin
+			
+	sort_list(cached_toxpower,  cmp = /proc/cmp_numeric_dsc) //sort all toxpowers scaling from highest to lowest
 
-			if(provide_pain_message && damage > 10 && !HAS_TRAIT(owner, TRAIT_TOXINLOVER) && prob(damage/3))//the higher the damage the higher the probability
-				to_chat(C, span_warning("You feel a dull pain in your abdomen."))
-		else	//for when our liver's failing
+/obj/item/organ/liver/on_life()
+	var/mob/living/carbon/C = owner
+	..()	//perform general on_life()
+	if(istype(C))
+		if(organ_flags & ORGAN_FAILING)//for when our liver's failing
 			C.reagents.end_metabolization(C, keep_liverless = TRUE) //Stops trait-based effects on reagents, to prevent permanent buffs
 			C.reagents.metabolize(C, can_overdose=FALSE, liverless = TRUE)
 			if(HAS_TRAIT(C, TRAIT_STABLELIVER))
 				return
 			C.adjustToxLoss(4, TRUE,  TRUE)
 			if(prob(30))
 				to_chat(C, span_warning("You feel a stabbing pain in your abdomen!"))
+					
+		else 
+			if(length(cached_toxpower)) //deal with toxins
+				var/damage_multiplier = 1 //reduced for every subsequent toxin
+				
+				for(var/dmg in cached_toxpower)
+					var/real_damage = dmg * toxLethality * damage_multiplier
+					damage_multiplier *= 0.5 //reduce the damage dealt for every subsequent toxin
+					C.adjustToxLoss(real_damage)
+					if(!HAS_TRAIT(owner, TRAIT_TOXINLOVER)) //don't hurt the liver if they like toxins
+						damage += (real_damage / 2)
+
+			//metabolize reagents
+			C.reagents.metabolize(C, can_overdose=TRUE)
+
+			if(provide_pain_message && damage > 10 && !HAS_TRAIT(owner, TRAIT_TOXINLOVER) && prob(damage/3))//the higher the damage the higher the probability
+				to_chat(C, span_warning("You feel a dull pain in your abdomen."))
 
 	if(damage > maxHealth)//cap liver damage
 		damage = maxHealth