Voting Fixes (#8386)

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
+1 -1
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, ", ")]")
+1 -1
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>"
@@ -0,0 +1,41 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: MattAtlas
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- backend: "Fixed some backend voting problems."