More and more Destroy() cleanups all across the board - Return qdel hints.

This commit is contained in:
Leshana
2017-06-05 23:01:41 -04:00
parent 010cca1d44
commit e48b548f2b
51 changed files with 128 additions and 113 deletions
+1 -1
View File
@@ -20,7 +20,7 @@
message_admins("ERROR: ability_master's New() was not given an owner argument. This is a bug.")
/obj/screen/movable/ability_master/Destroy()
..()
. = ..()
//Get rid of the ability objects.
remove_all_abilities()
ability_objects.Cut()
+4 -1
View File
@@ -30,6 +30,9 @@
/datum/action/Destroy()
if(owner)
Remove(owner)
target = null
qdel_null(button)
return ..()
/datum/action/proc/Grant(mob/living/T)
if(owner)
@@ -45,7 +48,7 @@
if(button)
if(T.client)
T.client.screen -= button
del(button)
qdel_null(button)
T.actions.Remove(src)
T.update_action_buttons()
owner = null
+1 -1
View File
@@ -155,7 +155,7 @@ datum/hud/New(mob/owner)
..()
/datum/hud/Destroy()
..()
. = ..()
grab_intent = null
hurt_intent = null
disarm_intent = null
+1 -1
View File
@@ -46,7 +46,7 @@
var/obj/item/owner
/obj/screen/item_action/Destroy()
..()
. = ..()
owner = null
/obj/screen/item_action/Click()
+2 -2
View File
@@ -13,7 +13,7 @@
var/mob/spell_holder
/obj/screen/movable/spell_master/Destroy()
..()
. = ..()
for(var/obj/screen/spell/spells in spell_objects)
spells.spellmaster = null
spell_objects.Cut()
@@ -156,7 +156,7 @@
var/icon/last_charged_icon
/obj/screen/spell/Destroy()
..()
. = ..()
spell = null
last_charged_icon = null
if(spellmaster)