Skip to content

Commit

Permalink
Fixed maps constantly being metastation (fixes recent maps being incl…
Browse files Browse the repository at this point in the history
…uded in mapvote) (tgstation#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
  • Loading branch information
Watermelon914 authored Sep 19, 2022
1 parent 66931ea commit cc89d67
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
7 changes: 4 additions & 3 deletions code/__DEFINES/subsystems.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions code/controllers/subsystem/vote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit cc89d67

Please sign in to comment.