From 3d41e614a87a06ff16d3dfe6e77e328467c2e8f9 Mon Sep 17 00:00:00 2001 From: DragonTrance Date: Sat, 12 Nov 2022 10:29:43 -0500 Subject: [PATCH] Revert "port tgstation/tgstation#52409" This reverts commit bfdebd524d912956e53526728ca705c0ab7e4e29. --- code/__DEFINES/subsystems.dm | 1 - code/controllers/subsystem/timer.dm | 1 - 2 files changed, 2 deletions(-) diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index be990202a..3ddf29310 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -121,7 +121,6 @@ #define FIRE_PRIORITY_CHAT 400 #define FIRE_PRIORITY_RUNECHAT 410 #define FIRE_PRIORITY_OVERLAYS 500 -#define FIRE_PRIORITY_TIMER 700 #define FIRE_PRIORITY_INPUT 1000 // This must always always be the max highest priority. Player input must never be lost. // SS runlevels diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm index d8c981724..34fde8b9e 100644 --- a/code/controllers/subsystem/timer.dm +++ b/code/controllers/subsystem/timer.dm @@ -7,7 +7,6 @@ SUBSYSTEM_DEF(timer) name = "Timer" wait = 1 //SS_TICKER subsystem, so wait is in ticks init_order = INIT_ORDER_TIMER - priority = FIRE_PRIORITY_TIMER flags = SS_TICKER|SS_NO_INIT