From 8c7fdf88c28a6aabd28a18dfa68f97a1b0e96e4e Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 12 Jul 2017 04:15:34 -0400 Subject: [PATCH] Cleans up carbons (#29179) --- code/modules/mob/living/carbon/carbon.dm | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 4415c0d7ab7..f70c4cfa2cc 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -2,23 +2,17 @@ blood_volume = BLOOD_VOLUME_NORMAL /mob/living/carbon/Initialize() + . = ..() create_reagents(1000) update_body_parts() //to update the carbon's new bodyparts appearance - ..() /mob/living/carbon/Destroy() - for(var/guts in internal_organs) - qdel(guts) - for(var/atom/movable/food in stomach_contents) - qdel(food) - for(var/BP in bodyparts) - qdel(BP) - for(var/imp in implants) - qdel(imp) - bodyparts = list() + QDEL_LIST(internal_organs) + QDEL_LIST(stomach_contents) + QDEL_LIST(bodyparts) + QDEL_LIST(implants) remove_from_all_data_huds() - if(dna) - qdel(dna) + QDEL_NULL(dna) return ..() /mob/living/carbon/relaymove(mob/user, direction)