Skip to content

Commit

Permalink
Whiskey Outpost vote fix (#4525)
Browse files Browse the repository at this point in the history
# About the pull request

It should now be able to select the ground for the next round properly
maybe, who knows, I couldn't force end the WO round and I was not going
to wait 1.5 hours


Also changed "extended" to "Extended" because "extended" isn't real
# Explain why it's good for the game

A game mode should probably be able to work without staff intervention

# Changelog
:cl:
fix: Whiskey Outpost ground map vote works correctly
config: Removed unnecessary config
/:cl:
  • Loading branch information
BeagleGaming1 authored Sep 28, 2023
1 parent 919b1c9 commit 6628064
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 19 deletions.
4 changes: 0 additions & 4 deletions code/controllers/configuration/entries/general.dm
Original file line number Diff line number Diff line change
Expand Up @@ -273,10 +273,6 @@ Voting
/datum/config_entry/string/gamemode_default
config_entry_value = "Extended"

// Rounds needed for gamemode vote
/datum/config_entry/number/gamemode_rounds_needed
config_entry_value = 5

/datum/config_entry/number/rounds_until_hard_restart
config_entry_value = -1 // -1 is disabled by default, 0 is every round, x is after so many rounds

Expand Down
19 changes: 8 additions & 11 deletions code/controllers/subsystem/ticker.dm
Original file line number Diff line number Diff line change
Expand Up @@ -101,17 +101,14 @@ SUBSYSTEM_DEF(ticker)
mode.declare_completion(force_ending)
REDIS_PUBLISH("byond.round", "type" = "round-complete")
flash_clients()
if(text2num(SSperf_logging?.round?.id) % CONFIG_GET(number/gamemode_rounds_needed) == 0)
addtimer(CALLBACK(
SSvote,
/datum/controller/subsystem/vote/proc/initiate_vote,
"gamemode",
"SERVER",
CALLBACK(src, PROC_REF(handle_map_reboot)),
TRUE
), 3 SECONDS)
else
handle_map_reboot()
addtimer(CALLBACK(
SSvote,
/datum/controller/subsystem/vote/proc/initiate_vote,
"gamemode",
"SERVER",
CALLBACK(src, PROC_REF(handle_map_reboot)),
TRUE
), 3 SECONDS)
Master.SetRunLevel(RUNLEVEL_POSTGAME)

/// Attempt to start game asynchronously if applicable
Expand Down
5 changes: 1 addition & 4 deletions config/example/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -234,11 +234,8 @@ AUTOOOCMUTE
## The default value assumes youtube-dl is in your system PATH
# INVOKE_YOUTUBEDL youtube-dl

## Rounds needed before a gamemode vote is casted. Set to -1 to disable
GAMEMODE_ROUNDS_NEEDED 5

## Default gamemode to auto-switch back to after a round has concluded
GAMEMODE_DEFAULT extended
GAMEMODE_DEFAULT Extended

## How long the mob will take to chestburst, in seconds
#EMBRYO_BURST_TIMER 450

0 comments on commit 6628064

Please sign in to comment.