Skip to content

Deletes restart votes from existance #1267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BadAtThisGame302 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Deletes restart votes from existance #1267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da42f3f
Deletes restart votes from existance
BadAtThisGame302 Jan 29, 2025
8e2b087
Fix?
BadAtThisGame302 Jan 29, 2025
00cab19
Merge branch 'main' into removerestart
BadAtThisGame302 Feb 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/controllers/subsystem/ticker.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,13 +247,13 @@ SUBSYSTEM_DEF(ticker)
Master.SetRunLevel(RUNLEVEL_POSTGAME)
if(firstvote)
if(world.time > round_start_time + time_until_vote)
SSvote.initiate_vote("restart", "The Gods")
SSvote.initiate_vote("endround", "The Gods")
time_until_vote = 40 MINUTES
last_vote_time = world.time
firstvote = FALSE
else
if(world.time > last_vote_time + time_until_vote)
SSvote.initiate_vote("restart", "The Gods")
SSvote.initiate_vote("endround", "The Gods")

/datum/controller/subsystem/ticker
var/last_bot_update = 0
Expand Down
15 changes: 3 additions & 12 deletions code/controllers/subsystem/vote.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,7 @@ SUBSYSTEM_DEF(vote)
if (!C || C.is_afk())
non_voters -= non_voter_ckey
if(non_voters.len > 0)
if(mode == "restart")
choices["Continue Playing"] += non_voters.len
if(choices["Continue Playing"] >= greatest_votes)
greatest_votes = choices["Continue Playing"]
else if(mode == "gamemode")
if(mode == "gamemode")
if(GLOB.master_mode in choices)
choices[GLOB.master_mode] += non_voters.len
if(choices[GLOB.master_mode] >= greatest_votes)
Expand Down Expand Up @@ -130,9 +126,6 @@ SUBSYSTEM_DEF(vote)
var/restart = 0
if(.)
switch(mode)
if("restart")
if(. == "Restart Round")
restart = 1
if("gamemode")
if(GLOB.master_mode != .)
SSticker.save_mode(.)
Expand Down Expand Up @@ -215,8 +208,6 @@ SUBSYSTEM_DEF(vote)

reset()
switch(vote_type)
if("restart")
choices.Add("Restart Round","Continue Playing")
if("gamemode")
choices.Add(config.votable_modes)
if("map")
Expand Down Expand Up @@ -350,9 +341,9 @@ SUBSYSTEM_DEF(vote)
if("toggle_map")
if(usr.client.holder && trialmin)
CONFIG_SET(flag/allow_vote_map, !CONFIG_GET(flag/allow_vote_map))
if("restart")
if("endround")
if(CONFIG_GET(flag/allow_vote_restart) || usr.client.holder)
initiate_vote("restart",usr.key)
initiate_vote("endround",usr.key)
if("gamemode")
if(CONFIG_GET(flag/allow_vote_mode) || usr.client.holder)
initiate_vote("gamemode",usr.key)
Expand Down