Merge pull request #9938 from Fox-McCloud/destroy-reagents

Helps Reagents GC Better
This commit is contained in:
variableundefined
2018-10-23 20:49:30 +08:00
committed by GitHub
2 changed files with 5 additions and 4 deletions
+3 -4
View File
@@ -333,7 +333,7 @@
/mob/living/is_injectable(allowmobs = TRUE)
return (allowmobs && reagents && can_inject())
/mob/living/is_drawable(allowmobs = TRUE)
return (allowmobs && reagents && can_inject())
@@ -365,9 +365,8 @@
C.update_inv_legcuffed()
if(C.reagents)
for(var/datum/reagent/R in C.reagents.reagent_list)
C.reagents.clear_reagents()
C.reagents.addiction_list.Cut()
C.reagents.clear_reagents()
QDEL_LIST(C.reagents.addiction_list)
// rejuvenate: Called by `revive` to get the mob into a revivable state
// the admin "rejuvenate" command calls `revive`, not this proc.
@@ -764,5 +764,7 @@ var/const/INGEST = 2
processing_objects -= src
QDEL_LIST(reagent_list)
reagent_list = null
QDEL_LIST(addiction_list)
addiction_list = null
if(my_atom && my_atom.reagents == src)
my_atom.reagents = null