Merge pull request #35692 from Cyberboss/GarbagePreInit

Moves garbage up in the init order
This commit is contained in:
vuonojenmustaturska
2018-02-15 16:53:41 +02:00
committed by CitadelStationBot
parent 95582c597b
commit e6487cc5ef
2 changed files with 2 additions and 0 deletions

View File

@@ -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

View File

@@ -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