[MIRROR] Fix chemicals not recognizing end of metabolization (#756)

* Fix chemicals not recognizing end of metabolization (#53550)

* Fix chemicals not recognizing end of metabolization

* Make generic to all organs

* Fix chemicals not recognizing end of metabolization

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
This commit is contained in:
SkyratBot
2020-09-11 23:21:10 +02:00
committed by GitHub
co-authored by Jared-Fogle
parent fc542177be
commit a669313e10
4 changed files with 44 additions and 5 deletions
+12 -4
View File
@@ -614,12 +614,20 @@
for(var/_reagent in cached_reagents)
var/datum/reagent/R = _reagent
if(R.type == reagent)
if(my_atom && isliving(my_atom))
var/mob/living/M = my_atom
var/mob/living/mob_consumer
if (isliving(my_atom))
mob_consumer = my_atom
else if (istype(my_atom, /obj/item/organ))
var/obj/item/organ/organ = my_atom
mob_consumer = organ.owner
if (mob_consumer)
if(R.metabolizing)
R.metabolizing = FALSE
R.on_mob_end_metabolize(M)
R.on_mob_delete(M)
R.on_mob_end_metabolize(mob_consumer)
R.on_mob_delete(mob_consumer)
//Clear from relevant lists
addiction_list -= R
reagent_list -= R