Revert "tweaked voting code"

This reverts commit 0d91a9de6d.

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)

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