From 118591046da53d1304bb974fd1d5942e60abe382 Mon Sep 17 00:00:00 2001 From: evilew Date: Fri, 6 Dec 2024 13:06:59 +0100 Subject: [PATCH] Revert "tweaked voting code" This reverts commit 0d91a9de6d4a0134914d0a76d3688ea284f77df5. --- code/controllers/subsystem/vote.dm | 7 +++++-- code/game/objects/items/toys.dm | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 02b1c4ae65..7d81aec281 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -252,8 +252,11 @@ SUBSYSTEM_DEF(vote) if(vote_system == HIGHEST_MEDIAN_VOTING) calculate_highest_median(vote_title_text) var/list/winners = list() - if(mode == "transfer") //GS13 - removed a bit of code that made it so extending the round requires an incremental amount of votes to win - if(choices[VOTE_TRANSFER] >= choices[VOTE_CONTINUE]) + if(mode == "transfer") + var/amount_required = 1 + transfer_votes_done + transfer_votes_done = 0 //gs13 tweaked from 1 to 0 (also removed it incrementing with each vote) + text += "\nExtending requires at least [amount_required] votes to win." + if(choices[VOTE_CONTINUE] < amount_required || choices[VOTE_TRANSFER] >= choices[VOTE_CONTINUE]) winners = list(VOTE_TRANSFER) else winners = list(VOTE_CONTINUE) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 50cc688eb2..fcfb9a1048 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -684,7 +684,7 @@ /obj/item/toy/cards/deck name = "deck of cards" desc = "A deck of space-grade playing cards." - icon = 'GainStation13/icons/obj/toys/toy.dmi' //GS13 - GATO sprite + icon = 'GainStation13/icons/obj/toy.dmi' //GS13 - GATO sprite deckstyle = "nanotrasen" icon_state = "deck_nanotrasen_full" w_class = WEIGHT_CLASS_SMALL @@ -815,7 +815,7 @@ /obj/item/toy/cards/cardhand name = "hand of cards" desc = "A number of cards not in a deck, customarily held in ones hand." - icon = 'GainStation13/icons/obj/toys/toy.dmi' //GS13 - GATO sprite + icon = 'GainStation13/icons/obj/toy.dmi' //GS13 - GATO sprite icon_state = "none" w_class = WEIGHT_CLASS_TINY var/list/currenthand = list() @@ -912,7 +912,7 @@ /obj/item/toy/cards/singlecard name = "card" desc = "a card" - icon = 'GainStation13/icons/obj/toys/toy.dmi' //GS13 - GATO sprite + icon = 'GainStation13/icons/obj/toy.dmi' //GS13 - GATO sprite icon_state = "singlecard_down_nanotrasen" w_class = WEIGHT_CLASS_TINY var/cardname = null