Patches for 4/18/17 (#454)
* fixes modular receiver sprites * fixes legs rendering for taurs * fixes shoes not rendering in UI for nagas * typo fix in preferences.dm * crewsimov * Revert "fixes legs rendering for taurs" This reverts commit 8a64c0c80af8a6798639bb151d1448eeb454ac5d. * fixes looc logging * fixes gamemode voting * admin respawn bypass * thanks GitHub Desktop totally wanted to omit the very important if() * proc tweak * savefile sanitizing
This commit is contained in:
@@ -83,7 +83,6 @@ SUBSYSTEM_DEF(ticker)
|
||||
current_state = GAME_STATE_PREGAME
|
||||
if(!modevoted)
|
||||
send_gamemode_vote()
|
||||
modevoted = TRUE
|
||||
fire()
|
||||
if(GAME_STATE_PREGAME)
|
||||
//lobby stats for statpanels
|
||||
@@ -673,7 +672,8 @@ SUBSYSTEM_DEF(ticker)
|
||||
return
|
||||
INVOKE_ASYNC(SSmapping, /datum/controller/subsystem/mapping/.proc/maprotate)
|
||||
|
||||
/datum/controller/subsystem/ticker/proc/send_gamemode_vote(var/)
|
||||
/proc/send_gamemode_vote()
|
||||
SSticker.modevoted = TRUE
|
||||
SSvote.initiate_vote("roundtype","server")
|
||||
|
||||
/world/proc/has_round_started()
|
||||
|
||||
@@ -114,6 +114,13 @@ SUBSYSTEM_DEF(vote)
|
||||
if("restart")
|
||||
if(. == "Restart Round")
|
||||
restart = 1
|
||||
if("roundtype")
|
||||
if(SSticker && SSticker.mode)//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 = .
|
||||
world.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("gamemode")
|
||||
if(GLOB.master_mode != .)
|
||||
world.save_mode(.)
|
||||
@@ -169,6 +176,8 @@ SUBSYSTEM_DEF(vote)
|
||||
choices.Add("Restart Round","Continue Playing")
|
||||
if("gamemode")
|
||||
choices.Add(config.votable_modes)
|
||||
if("roundtype")
|
||||
choices.Add("secret", "extended")
|
||||
if("custom")
|
||||
question = stripped_input(usr,"What is the vote for?")
|
||||
if(!question)
|
||||
|
||||
Reference in New Issue
Block a user