From d111c582b42a2fe7f2aa15b0f79f4d60d087aaf6 Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Sun, 24 Sep 2017 07:34:51 +0300 Subject: [PATCH] Meteors can now qdel normally (#30970) --- code/controllers/subsystem/augury.dm | 3 +++ code/game/gamemodes/meteor/meteors.dm | 1 + 2 files changed, 4 insertions(+) diff --git a/code/controllers/subsystem/augury.dm b/code/controllers/subsystem/augury.dm index 32086f52ed..38e9724b5f 100644 --- a/code/controllers/subsystem/augury.dm +++ b/code/controllers/subsystem/augury.dm @@ -14,6 +14,9 @@ SUBSYSTEM_DEF(augury) /datum/controller/subsystem/augury/proc/register_doom(atom/A, severity) doombringers[A] = severity +/datum/controller/subsystem/augury/proc/unregister_doom(atom/A) + doombringers -= A + /datum/controller/subsystem/augury/fire() var/biggest_doom = null var/biggest_threat = null diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index d33dd2127d..d0bb633f8c 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -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 . = ..()