cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-06 07:23:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

Browse Source
This commit is contained in:
jack-fractal
2013-11-17 16:30:42 -05:00
parent 923a969eaf bad8dbf695
commit cf5012ce1d
199 changed files with 16877 additions and 14848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/configuration.dm
View File

@@ -28,7 +28,7 @@
var/vote_delay = 6000 // minimum time between voting sessions (deciseconds, 10 minute default)
var/vote_period = 600 // length of voting period (deciseconds, default 1 minute)
var/vote_autotransfer_initial = 108000 // Length of time before the first autotransfer vote is called
var/vote_autotransfer_interval = 3600 // length of time before next sequential autotransfer vote
var/vote_autotransfer_interval = 36000 // length of time before next sequential autotransfer vote
var/vote_no_default = 0 // vote does not default to nochange/norestart (tbi)
var/vote_no_dead = 0 // dead people can't vote (tbi)
// var/enable_authentication = 0 // goon authentication

5
code/controllers/voting.dm
View File

@@ -48,6 +48,7 @@ datum/controller/vote
proc/autotransfer()
initiate_vote("crew_transfer","the server")
log_debug("The server has called an Autotransfer")
proc/reset()
@@ -206,14 +207,16 @@ datum/controller/vote
return 0
choices.Add(config.votable_modes)
if("crew_transfer")
if(check_rights(R_ADMIN) || check_rights(R_MOD))
if(check_rights(R_ADMIN|R_MOD, 0))
question = "End the shift?"
choices.Add("Initiate Crew Transfer", "Continue The Round")
else
if (get_security_level() == "red" || get_security_level() == "delta")
initiator_key << "The current alert status is too high to call for a crew transfer!"
return 0
if(ticker.current_state <= 2)
return 0
initiator_key << "The crew transfer button has been disabled!"
question = "End the shift?"
choices.Add("Initiate Crew Transfer", "Continue The Round")
if("custom")