cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 10:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Makes locker staff decaying closets dump contents before qdel [MDB IGNORE] (#11482)

Browse Source 
* 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>
This commit is contained in:
SkyratBot
2022-02-14 07:08:40 +01:00
committed by GitHub
parent 8c21b359fb
commit c81b24c319
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/projectiles/projectile/magic.dm
View File

@@ -297,11 +297,6 @@
if(weld_state) if(weld_state)
unmagify() 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) /obj/structure/closet/decay/open(mob/living/user, force = FALSE)
. = ..() . = ..()
if(.) if(.)
@@ -314,6 +309,15 @@
addtimer(CALLBACK(src, .proc/decay), 15 SECONDS) 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 /obj/projectile/magic/flying
name = "bolt of flying" name = "bolt of flying"
icon_state = "flight" icon_state = "flight"