From cc89d67cc024243ace752f822e42c53b3c4cb0de Mon Sep 17 00:00:00 2001 From: Watermelon914 <37270891+Watermelon914@users.noreply.github.com> Date: Tue, 20 Sep 2022 00:16:42 +0100 Subject: [PATCH] Fixed maps constantly being metastation (fixes recent maps being included in mapvote) (#70006) About The Pull Request See title. The vote subsystem needs to load after the persistence subsystem so that the blocked_maps list can be properly populated with data from the RecentMaps.json in the data folder. This fixes the maps constantly being metastation Why It's Good For The Game Same map over and over again = bad Different maps each time = good Changelog cl fix: Fixed map vote including maps that have already been played twice in the last 3 rounds. /cl --- code/__DEFINES/subsystems.dm | 7 ++++--- code/controllers/subsystem/vote.dm | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index 9998aedbbfd..720515a39d7 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -169,9 +169,10 @@ #define INIT_ORDER_AIR -1 #define INIT_ORDER_PERSISTENCE -2 #define INIT_ORDER_PERSISTENT_PAINTINGS -3 // Assets relies on this -#define INIT_ORDER_ASSETS -4 -#define INIT_ORDER_ICON_SMOOTHING -5 -#define INIT_ORDER_OVERLAY -6 +#define INIT_ORDER_VOTE -4 // Needs to be after persistence so that recent maps are not loaded. +#define INIT_ORDER_ASSETS -5 +#define INIT_ORDER_ICON_SMOOTHING -6 +#define INIT_ORDER_OVERLAY -7 #define INIT_ORDER_XKEYSCORE -10 #define INIT_ORDER_STICKY_BAN -10 #define INIT_ORDER_LIGHTING -20 diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index c27135841e3..15a80fc0dbe 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -5,6 +5,7 @@ SUBSYSTEM_DEF(vote) name = "Vote" wait = 1 SECONDS flags = SS_KEEP_TIMING + init_order = INIT_ORDER_VOTE runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT /// A list of all generated action buttons