From e41a5e0f1fd90c6d9e6a6de4ad3c084fdcee9619 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sat, 17 Aug 2024 16:28:48 -0400 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Shadow-Quill <44811257+Shadow-Quill@users.noreply.github.com> --- code/controllers/subsystems/vote.dm | 2 +- code/controllers/subsystems/voting/poll_types.dm | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/controllers/subsystems/vote.dm b/code/controllers/subsystems/vote.dm index ca0bc10029f..3e4306deadb 100755 --- a/code/controllers/subsystems/vote.dm +++ b/code/controllers/subsystems/vote.dm @@ -45,7 +45,7 @@ SUBSYSTEM_DEF(vote) start_vote(/datum/poll/storyteller) /datum/controller/subsystem/vote/proc/start_restart_vote_loop() - addtimer(CALLBACK(src, /datum/controller/subsystem/vote/proc/recall_vote), 240 MINUTES) + addtimer(CALLBACK(src, /datum/controller/subsystem/vote/proc/recall_vote), 4 HOURS) /datum/controller/subsystem/vote/proc/recall_vote_loop() addtimer(CALLBACK(src, /datum/controller/subsystem/vote/proc/recall_vote), 60 MINUTES) diff --git a/code/controllers/subsystems/voting/poll_types.dm b/code/controllers/subsystems/voting/poll_types.dm index 60ab482ee7a..6a4fb348a0e 100755 --- a/code/controllers/subsystems/voting/poll_types.dm +++ b/code/controllers/subsystems/voting/poll_types.dm @@ -39,16 +39,16 @@ if(minimum_win_percentage <= 0.2) SSticker.shift_end(15 MINUTES) - for (var/mob/M as mob in SSmobs.mob_list) - to_chat(M, "
The round is ending do to exceeding 8 hours.

") + for(var/mob/M as mob in SSmobs.mob_list) + to_chat(M, "
The round is ending due to exceeding 8 hours.

") /datum/poll/restart/admin non_admin = FALSE - name = "Supper Majority: End Round" + name = "Super Majority: End Round" question = "End Shift?" choice_types = list(/datum/vote_choice/restart, /datum/vote_choice/countinue_round) minimum_win_percentage = 0.75 - next_vote = 255 MINUTES //Minimum round length before it can be called for the first time + next_vote = 4 HOURS + 15 MINUTES //Minimum round length before it can be called for the first time cooldown = 30 MINUTES //Cooldown is set to 30 mins as 1 hour is a bit much when things change so much in so little time + maxium 8 hour rounds means we should be a bit more forgiven. only_admin = FALSE