From cc1070c7db892eb7812010ad5c54e3dac5eadf4d Mon Sep 17 00:00:00 2001 From: AnturK Date: Fri, 6 Jul 2018 18:39:08 +0200 Subject: [PATCH] Cleans up other components destroys (#38930) * wearertargeting destroy * Why did these variables even existed. * .... --- code/datums/components/uplink.dm | 1 + code/datums/components/wearertargeting.dm | 4 ++++ code/modules/uplink/uplink_purchase_log.dm | 3 --- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/datums/components/uplink.dm b/code/datums/components/uplink.dm index a945e1d347..ad6e76182d 100644 --- a/code/datums/components/uplink.dm +++ b/code/datums/components/uplink.dm @@ -70,6 +70,7 @@ GLOBAL_LIST_EMPTY(uplinks) /datum/component/uplink/Destroy() GLOB.uplinks -= src gamemode = null + purchase_log = null return ..() /datum/component/uplink/proc/LoadTC(mob/user, obj/item/stack/telecrystal/TC, silent = FALSE) diff --git a/code/datums/components/wearertargeting.dm b/code/datums/components/wearertargeting.dm index 14f9d95293..107ab41e39 100644 --- a/code/datums/components/wearertargeting.dm +++ b/code/datums/components/wearertargeting.dm @@ -20,3 +20,7 @@ /datum/component/wearertargeting/proc/on_drop(mob/user) UnregisterSignal(user, signals) + +/datum/component/wearertargeting/Destroy() + QDEL_NULL(callback) //is likely to ourselves. + return ..() \ No newline at end of file diff --git a/code/modules/uplink/uplink_purchase_log.dm b/code/modules/uplink/uplink_purchase_log.dm index 1226fcd27a..293191b170 100644 --- a/code/modules/uplink/uplink_purchase_log.dm +++ b/code/modules/uplink/uplink_purchase_log.dm @@ -3,12 +3,10 @@ GLOBAL_LIST(uplink_purchase_logs_by_key) //assoc key = /datum/uplink_purchase_lo /datum/uplink_purchase_log var/owner var/list/purchase_log //assoc path-of-item = /datum/uplink_purchase_entry - var/datum/component/uplink/parent var/total_spent = 0 /datum/uplink_purchase_log/New(_owner, datum/component/uplink/_parent) owner = _owner - parent = _parent LAZYINITLIST(GLOB.uplink_purchase_logs_by_key) if(owner) if(GLOB.uplink_purchase_logs_by_key[owner]) @@ -19,7 +17,6 @@ GLOBAL_LIST(uplink_purchase_logs_by_key) //assoc key = /datum/uplink_purchase_lo /datum/uplink_purchase_log/Destroy() purchase_log = null - parent = null if(GLOB.uplink_purchase_logs_by_key[owner] == src) GLOB.uplink_purchase_logs_by_key -= owner return ..()