From 03814c01a5d03c00f0efa5f7b2938f497b676c3b Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 31 Jan 2022 12:08:14 +0100 Subject: [PATCH] [MIRROR] Dont init speech controller [MDB IGNORE] (#11164) * Dont init speech controller (#64537) * Dont init speech controller * copypaste Co-authored-by: TiviPlus <572233640+TiviPlus@ users.noreply.com> * Dont init speech controller Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com> Co-authored-by: TiviPlus <572233640+TiviPlus@ users.noreply.com> --- code/__DEFINES/subsystems.dm | 1 - code/controllers/subsystem/speech_controller.dm | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index d428fb6a009..39e45e5ce95 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -113,7 +113,6 @@ #define INIT_ORDER_DBCORE 95 #define INIT_ORDER_BLACKBOX 94 #define INIT_ORDER_SERVER_MAINT 93 -#define INIT_ORDER_SPEECH_CONTROLLER 92 #define INIT_ORDER_INPUT 85 #define INIT_ORDER_SOUNDS 83 #define INIT_ORDER_INSTRUMENTS 82 diff --git a/code/controllers/subsystem/speech_controller.dm b/code/controllers/subsystem/speech_controller.dm index 96476127f41..3168fbd9e96 100644 --- a/code/controllers/subsystem/speech_controller.dm +++ b/code/controllers/subsystem/speech_controller.dm @@ -1,9 +1,8 @@ SUBSYSTEM_DEF(speech_controller) name = "Speech Controller" wait = 1 - flags = SS_TICKER + flags = SS_TICKER|SS_NO_INIT priority = FIRE_PRIORITY_SPEECH_CONTROLLER//has to be high priority, second in priority ONLY to SSinput - init_order = INIT_ORDER_SPEECH_CONTROLLER runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY ///used so that an admin can force all speech verbs to execute immediately instead of queueing