cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-26 01:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Voting Fixes (#8386)

Browse Source 
Ports some miscellaneous fixes from #7872.
This commit is contained in:
Erki
2020-03-04 21:38:48 +02:00
committed by GitHub
parent 8ffc628958
commit 6f6cbe7a63
3 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/subsystems/ticker.dm
View File

@@ -410,7 +410,7 @@ var/datum/controller/subsystem/ticker/SSticker
if(can_start & GAME_FAILURE_NO_PLAYERS)
var/list/voted_not_ready = list()
for(var/mob/abstract/new_player/player in player_list)
for(var/mob/abstract/new_player/player in SSvote.round_voters)
if((player.client)&&(!player.ready))
voted_not_ready += player.ckey
message_admins("The following players voted for [mode.name], but did not ready up: [jointext(voted_not_ready, ", ")]")

2
code/controllers/subsystems/vote.dm
View File

@@ -127,7 +127,7 @@ var/datum/controller/subsystem/vote/SSvote
. = pick(winners)
for(var/key in current_votes)
if(choices[current_votes[key]]["votes"] == .)
if(current_votes[key] == .)
round_voters += key // Keep track of who voted for the winning round.
if((mode == "gamemode" && . == "Extended") || SSticker.hide_mode == 0) // Announce Extended gamemode, but not other gamemodes
text += "<b>Vote Result: [.]</b>"