From e6487cc5ef7daa5f54441b5465cfcd1111404b8f Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Thu, 15 Feb 2018 16:53:41 +0200 Subject: [PATCH] Merge pull request #35692 from Cyberboss/GarbagePreInit Moves garbage up in the init order --- code/__DEFINES/subsystems.dm | 1 + code/controllers/subsystem/garbage.dm | 1 + 2 files changed, 2 insertions(+) diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index 27cd86edd4..ed468f8b18 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -48,6 +48,7 @@ // Subsystems shutdown in the reverse of the order they initialize in // The numbers just define the ordering, they are meaningless otherwise. +#define INIT_ORDER_GARBAGE 19 #define INIT_ORDER_DBCORE 18 #define INIT_ORDER_BLACKBOX 17 #define INIT_ORDER_SERVER_MAINT 16 diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index e83d05a28d..130186c928 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -4,6 +4,7 @@ SUBSYSTEM_DEF(garbage) wait = 2 SECONDS flags = SS_POST_FIRE_TIMING|SS_BACKGROUND|SS_NO_INIT runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY + init_order = INIT_ORDER_GARBAGE var/list/collection_timeout = list(0, 2 MINUTES, 10 SECONDS) // deciseconds to wait before moving something up in the queue to the next level