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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

Browse Source
This commit is contained in:
LetterJay
2017-03-31 14:04:52 -05:00
parent d7222a44eb 376dd1f89a
commit d6fd1de6ad
5 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/timer.dm
+3 -3
View File
@@ -79,12 +79,12 @@ var/datum/controller/subsystem/timer/SStimer
do
var/datum/callback/callBack = timer.callBack
if (!callBack)
message_admins("The timer SS has crashed because a timer did not return a callback. MC restarted automatically. Timer hash: [timer.hash]")
qdel(timer)
bucket_resolution = null //force bucket recreation
CRASH("Invalid timer: timer.timeToRun=[timer.timeToRun]||QDELETED(timer)=[QDELETED(timer)]||world.time=[world.time]||head_offset=[head_offset]||practical_offset=[practical_offset]||timer.spent=[timer.spent]")
//Temporary fix
Recreate_MC()
message_admins("The timer SS has crashed. A full report can be found in the runtime viewer. MC restarted automatically.")
//I really don't know if I should keep this crash log in; I feel like it might cause problems.
// CRASH("Invalid timer: timer.timeToRun=[timer.timeToRun]||QDELETED(timer)=[QDELETED(timer)]||world.time=[world.time]||head_offset=[head_offset]||practical_offset=[practical_offset]||timer.spent=[timer.spent]")
if (!timer.spent)
spent += timer