cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make weighted votes a configuration option.

Browse Source
This commit is contained in:
D3athrow
2017-12-08 20:43:35 -06:00
parent 2183a76c8a
commit 296caf6941
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/controllers/configuration.dm
View File

@@ -180,6 +180,9 @@
// Discord crap. // Discord crap.
var/discord_url var/discord_url
var/discord_password var/discord_password
// Weighted Votes
var/weighted_votes = 0
/datum/configuration/New() /datum/configuration/New()
. = ..() . = ..()
@@ -574,6 +577,8 @@
discord_url = value discord_url = value
if("discord_password") if("discord_password")
discord_password = value discord_password = value
if("weighted_votes")
weighted_votes = TRUE
else else
diary << "Unknown setting in configuration: '[name]'" diary << "Unknown setting in configuration: '[name]'"

2
code/game/gamemodes/gameticker.dm
View File

@@ -405,7 +405,7 @@ var/datum/controller/gameticker/ticker
declare_completion() declare_completion()
if(config.map_voting) if(config.map_voting)
//testing("Vote picked [chosen_map]") //testing("Vote picked [chosen_map]")
vote.initiate_vote("map","The Server", popup = 1, weighted_vote = 1) vote.initiate_vote("map","The Server", popup = 1, weighted_vote = config.weighted_votes)
var/options = jointext(vote.choices, " ") var/options = jointext(vote.choices, " ")
feedback_set("map vote choices", options) feedback_set("map vote choices", options)