diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm index 35ed031ba2..c3bcb0e9b0 100644 --- a/code/controllers/subsystem/timer.dm +++ b/code/controllers/subsystem/timer.dm @@ -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 diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 74ee5f9e47..20a57f2d0e 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -133,7 +133,6 @@ var/list/preferences_datums = list() //Mob preview var/icon/preview_icon = null - var/icon/nude_preview_icon = null //Jobs, uses bitflags var/job_civilian_high = 0