Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Shadow-Quill <[email protected]>
  • Loading branch information
Trilbyspaceclone and Shadow-Quill authored Aug 17, 2024
1 parent 6c61a29 commit e41a5e0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion code/controllers/subsystems/vote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions code/controllers/subsystems/voting/poll_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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, "<br><center><span class='danger'><b><font size=4>The round is ending do to exceeding 8 hours.</font></b><br></span></center><br>")
for(var/mob/M as mob in SSmobs.mob_list)
to_chat(M, "<br><center><span class='danger'><b><font size=4>The round is ending due to exceeding 8 hours.</font></b><br></span></center><br>")

/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

Expand Down

0 comments on commit e41a5e0

Please sign in to comment.