From da42f3f648af258d1b5f5e27078c726fd5bbc9b1 Mon Sep 17 00:00:00 2001 From: BadAtThisGame Date: Wed, 29 Jan 2025 03:49:18 +0200 Subject: [PATCH 1/2] Deletes restart votes from existance --- code/controllers/subsystem/ticker.dm | 4 ++-- code/controllers/subsystem/vote.dm | 13 ++----------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 364c34aaefa..0ce9262841e 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -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 diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index ddc2644722d..424ee1693a9 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -62,10 +62,6 @@ 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(GLOB.master_mode in choices) choices[GLOB.master_mode] += non_voters.len @@ -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(.) @@ -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") @@ -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) From 8e2b08778bb96a656d87f94fd7b4c51c27aa4247 Mon Sep 17 00:00:00 2001 From: BadAtThisGame Date: Wed, 29 Jan 2025 04:00:07 +0200 Subject: [PATCH 2/2] Fix? --- code/controllers/subsystem/vote.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 424ee1693a9..56146b01cc1 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -62,7 +62,7 @@ SUBSYSTEM_DEF(vote) if (!C || C.is_afk()) non_voters -= non_voter_ckey if(non_voters.len > 0) - 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)