diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 1150ec080b..a88bc4a890 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -484,7 +484,7 @@ SUBSYSTEM_DEF(ticker) SSvote.initiate_vote("dynamic","server",hideresults=FALSE,votesystem=RANKED_CHOICE_VOTING,forced=TRUE) else SSvote.initiate_vote("roundtype","server",hideresults=TRUE,votesystem=PLURALITY_VOTING,forced=TRUE) - SSvote.end_time = SSticker.start_at - 10 + SSvote.end_time = SSticker.start_at - 100 to_chat(world, "\nVoting time has been extended to [DisplayTimeText(SSvote.end_time-world.time)].") /datum/controller/subsystem/ticker/Recover() diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index c597044565..83364db0de 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -48,6 +48,7 @@ SUBSYSTEM_DEF(vote) mode = null question = null choices.Cut() + choice_descs.Cut() voted.Cut() voting.Cut() obfuscated = FALSE //CIT CHANGE - obfuscated votes