shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3668 from Citadel-Station-13/upstream-merge-32162

Browse Source 
[MIRROR] Actually fixes meteors, again
This commit is contained in:
LetterJay
2017-10-29 15:49:40 -04:00
committed by GitHub
parent 5210883d3b f4d4a12f30
commit 254ffca3b7
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/meteor/meteors.dm
+4 -2
View File
@@ -98,7 +98,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
var/z_original = ZLEVEL_STATION_PRIMARY var/z_original = ZLEVEL_STATION_PRIMARY
var/threat = 0 // used for determining which meteors are most interesting var/threat = 0 // used for determining which meteors are most interesting
var/lifetime = DEFAULT_METEOR_LIFETIME var/lifetime = DEFAULT_METEOR_LIFETIME
var/timerid = null
var/list/meteordrop = list(/obj/item/ore/iron) var/list/meteordrop = list(/obj/item/ore/iron)
var/dropamt = 2 var/dropamt = 2
@@ -117,6 +117,8 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
get_hit() get_hit()
/obj/effect/meteor/Destroy() /obj/effect/meteor/Destroy()
if (timerid)
deltimer(timerid)
GLOB.meteor_list -= src GLOB.meteor_list -= src
SSaugury.unregister_doom(src) SSaugury.unregister_doom(src)
walk(src,0) //this cancels the walk_towards() proc 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 GLOB.meteor_list += src
SSaugury.register_doom(src, threat) SSaugury.register_doom(src, threat)
SpinAnimation() SpinAnimation()
QDEL_IN(src, lifetime) timerid = QDEL_IN(src, lifetime)
chase_target(target) chase_target(target)
/obj/effect/meteor/Collide(atom/A) /obj/effect/meteor/Collide(atom/A)
code/modules/admin/verbs/debug.dm
+1 -1
View File
@@ -780,7 +780,7 @@ GLOBAL_PROTECT(LastAdminCalledProc)
/client/proc/cmd_display_init_log() /client/proc/cmd_display_init_log()
set category = "Debug" 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" set desc = "Displays a list of things that didn't handle Initialize() properly"
usr << browse(replacetext(SSatoms.InitLog(), "\n", "<br>"), "window=initlog") usr << browse(replacetext(SSatoms.InitLog(), "\n", "<br>"), "window=initlog")