Merge pull request #8721 from Ghommie/Ghommie-cit77

Ports in "Liver removal/failure now also stops passive reagent effects"
2019-06-23 06:53:30 -07:00
parent f2aaaf9d3e d50afb9275
commit dcab96d9d5
12 changed files with 93 additions and 59 deletions
@@ -654,6 +654,7 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put
 		L.damage += d

 /mob/living/carbon/proc/liver_failure()
+	reagents.end_metabolization(src, keep_liverless = TRUE) //Stops trait-based effects on reagents, to prevent permanent buffs
 	reagents.metabolize(src, can_overdose=FALSE, liverless = TRUE)
 	if(HAS_TRAIT(src, TRAIT_STABLEHEART))
 		return