From d6d01ab630c61d1011e8ed209d738f056b2c7303 Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Sun, 29 Oct 2017 14:13:09 +0200 Subject: [PATCH 1/2] Actually fixes meteors, again (#32162) * Actually fixes meteors, again * unrelated typo fix for an admin debug verb --- code/game/gamemodes/meteor/meteors.dm | 6 ++++-- code/modules/admin/verbs/debug.dm | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index d2c6da2c60..780be71694 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -98,7 +98,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event var/z_original = ZLEVEL_STATION_PRIMARY var/threat = 0 // used for determining which meteors are most interesting var/lifetime = DEFAULT_METEOR_LIFETIME - + var/timerid = null var/list/meteordrop = list(/obj/item/ore/iron) var/dropamt = 2 @@ -117,6 +117,8 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event get_hit() /obj/effect/meteor/Destroy() + if (timerid) + deltimer(timerid) GLOB.meteor_list -= src SSaugury.unregister_doom(src) walk(src,0) //this cancels the walk_towards() proc @@ -127,7 +129,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event GLOB.meteor_list += src SSaugury.register_doom(src, threat) SpinAnimation() - QDEL_IN(src, lifetime) + timerid = QDEL_IN(src, lifetime) chase_target(target) /obj/effect/meteor/Collide(atom/A) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index ebb200e8e4..19e77d4d93 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -780,7 +780,7 @@ GLOBAL_PROTECT(LastAdminCalledProc) /client/proc/cmd_display_init_log() set category = "Debug" - set name = "Display Initialzie() Log" + set name = "Display Initialize() Log" set desc = "Displays a list of things that didn't handle Initialize() properly" usr << browse(replacetext(SSatoms.InitLog(), "\n", "
"), "window=initlog")