Merge pull request #2925 from Citadel-Station-13/upstream-merge-30970

[MIRROR] Enables meteors to qdel normally, saving actual seconds of time spent harddeleting them otherwise
2017-09-24 09:36:50 -04:00
parent ff59548cb7 12e9862bac
commit f462c1ba93
2 changed files with 4 additions and 0 deletions
@@ -119,6 +119,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event

 /obj/effect/meteor/Destroy()
 	GLOB.meteor_list -= src
+	SSaugury.unregister_doom(src)
 	walk(src,0) //this cancels the walk_towards() proc
 	. = ..()