From f6f5d9af4b2fc45833fb4030ecebf23893d5da68 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Thu, 9 Mar 2017 03:16:49 -0500 Subject: [PATCH] AHH A DEL! (#24796) * AHH A DEL! * HELP! * MORE OF THEM! --- code/__HELPERS/icons.dm | 2 +- code/modules/admin/holder2.dm | 6 ++---- .../modules/mob/living/simple_animal/hostile/bosses/boss.dm | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index dff0bcd6355..2daf9450389 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -869,7 +869,7 @@ The _flatIcons list is a cache for generated icon files. text_image.color = AverageColour(atom_icon) text_image.pixel_x = 7 text_image.pixel_y = 5 - del(atom_icon) + qdel(atom_icon) return text_image var/global/list/friendly_animal_types = list() diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm index 6f7ca9f04e8..d40aa83e435 100644 --- a/code/modules/admin/holder2.dm +++ b/code/modules/admin/holder2.dm @@ -18,13 +18,11 @@ var/list/admin_datums = list() /datum/admins/New(datum/admin_rank/R, ckey) if(!ckey) - spawn(0) - del(src) + QDEL_IN(src, 0) throw EXCEPTION("Admin datum created without a ckey") return if(!istype(R)) - spawn(0) - del(src) + QDEL_IN(src, 0) throw EXCEPTION("Admin datum created without a rank") return rank = R diff --git a/code/modules/mob/living/simple_animal/hostile/bosses/boss.dm b/code/modules/mob/living/simple_animal/hostile/bosses/boss.dm index 17e5856ca50..77209751fb9 100644 --- a/code/modules/mob/living/simple_animal/hostile/bosses/boss.dm +++ b/code/modules/mob/living/simple_animal/hostile/bosses/boss.dm @@ -36,7 +36,7 @@ AB.boss = null AB.Remove(src) qdel(AB) - del(boss_abilities) + boss_abilities.Cut() return ..()