cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Gamemode Voting & Map Edits (#1937)

Browse Source 
* fixes roundtype voting

* keg spawner

* maint bar to box and kinkmates to delta+meta
This commit is contained in:
TalkingCactus
2017-07-07 17:54:53 -04:00
committed by GitHub
parent ff15495f18
commit cb5247d060
7 changed files with 1992 additions and 602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
code/controllers/subsystem/ticker.dm
View File

@@ -61,7 +61,7 @@ SUBSYSTEM_DEF(ticker)
var/list/round_start_events
var/mode_result = "undefined"
var/end_state = "undefined"
var/modevoted = FALSE //Have we sent a vote for the gamemode?
/datum/controller/subsystem/ticker/Initialize(timeofday)
@@ -87,11 +87,11 @@ SUBSYSTEM_DEF(ticker)
current_state = GAME_STATE_PREGAME
//Everyone who wants to be an observer is now spawned
create_observers()
if(!modevoted)
send_gamemode_vote()
fire()
if(GAME_STATE_PREGAME)
//lobby stats for statpanels
if(!modevoted)
send_gamemode_vote()
if(isnull(timeLeft))
timeLeft = max(0,start_at - world.time)
totalPlayers = 0
@@ -664,10 +664,13 @@ SUBSYSTEM_DEF(ticker)
/datum/controller/subsystem/ticker/proc/IsRoundInProgress()
return current_state == GAME_STATE_PLAYING
/proc/send_gamemode_vote()
SSticker.modevoted = TRUE
SSvote.initiate_vote("roundtype","server")
if(SSticker.current_state == GAME_STATE_PREGAME)
if(SSticker.timeLeft < 900)
SSticker.timeLeft = 900
SSticker.modevoted = TRUE
SSvote.initiate_vote("roundtype","server")
/datum/controller/subsystem/ticker/Recover()
current_state = SSticker.current_state
@@ -707,7 +710,7 @@ SUBSYSTEM_DEF(ticker)
queued_players = SSticker.queued_players
cinematic = SSticker.cinematic
maprotatechecked = SSticker.maprotatechecked
modevoted = SSticker.modevoted
switch (current_state)

7
code/controllers/subsystem/vote.dm
View File

@@ -113,6 +113,13 @@ SUBSYSTEM_DEF(vote)
var/restart = 0
if(.)
switch(mode)
if("roundtype")
if(SSticker.current_state > GAME_STATE_PREGAME)//Don't change the mode if the round already started.
return message_admins("A vote has tried to change the gamemode, but the game has already started. Aborting.")
GLOB.master_mode = .
SSticker.save_mode(.)
to_chat(world, "<span class='adminnotice'><b>The mode is now: [GLOB.master_mode]</b></span>")
log_admin("Gamemode has been voted for and switched to: [GLOB.master_mode].")
if("restart")
if(. == "Restart Round")
restart = 1