diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 2af8467b98d..dceabff846c 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -31,6 +31,7 @@ var/list/gamemode_cache = list() var/allow_admin_jump = 1 // allows admin jumping var/allow_admin_spawning = 1 // allows admin item spawning var/allow_admin_rev = 1 // allows admin revives + var/pregame_time = 180 // pregame time in seconds 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 @@ -420,6 +421,9 @@ var/list/gamemode_cache = list() if ("default_no_vote") config.vote_no_default = 1 + if ("pregame_time") + config.pregame_time = text2num(value) + if ("vote_delay") config.vote_delay = text2num(value) diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 73399e72690..3444372838f 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -48,8 +48,9 @@ var/global/datum/controller/gameticker/ticker send2mainirc("Server lobby is loaded and open at byond://[config.serverurl ? config.serverurl : (config.server ? config.server : "[world.address]:[world.port]")]") + pregame_timeleft = config.pregame_time + do - pregame_timeleft = 180 to_chat(world, "Welcome to the pregame lobby!") to_chat(world, "Please set up your character and select ready. The round will start in [pregame_timeleft] seconds.") while(current_state == GAME_STATE_PREGAME) diff --git a/config/example/config.txt b/config/example/config.txt index f9be5fc872e..018cd9e364b 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -163,6 +163,9 @@ ALLOW_VOTE_RESTART ## allow players to initate a mode-change start ALLOW_VOTE_MODE +## time in pregame lobby in seconds +PREGAME_TIME 180 + ## min delay (deciseconds) between voting sessions (default 10 minutes) VOTE_DELAY 6000