From c81b24c319f921db235bf3bd7cbe2eeeeb32cba0 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon, 14 Feb 2022 07:08:40 +0100
Subject: [PATCH] [MIRROR] Makes locker staff decaying closets dump contents
 before qdel [MDB IGNORE] (#11482)

* Makes locker staff decaying closets dump contents before qdel (#64859)

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@ users.noreply.github.com>

* Makes locker staff decaying closets dump contents before qdel

Co-authored-by: GoblinBackwards <kinggreenyoshi@gmail.com>
Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@ users.noreply.github.com>
---
 code/modules/projectiles/projectile/magic.dm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index c29afbc162f..bdb3487648d 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -297,11 +297,6 @@
 	if(weld_state)
 		unmagify()
 
-///Fade away into nothing
-/obj/structure/closet/decay/proc/decay()
-	animate(src, alpha = 0, time = 30)
-	addtimer(CALLBACK(GLOBAL_PROC, .proc/qdel, src), 30)
-
 /obj/structure/closet/decay/open(mob/living/user, force = FALSE)
 	. = ..()
 	if(.)
@@ -314,6 +309,15 @@
 
 	addtimer(CALLBACK(src, .proc/decay), 15 SECONDS)
 
+///Fade away into nothing
+/obj/structure/closet/decay/proc/decay()
+	animate(src, alpha = 0, time = 3 SECONDS)
+	addtimer(CALLBACK(src, .proc/decay_finished), 3 SECONDS)
+
+/obj/structure/closet/decay/proc/decay_finished()
+	dump_contents()
+	qdel(src)
+
 /obj/projectile/magic/flying
 	name = "bolt of flying"
 	icon_state = "flight"