diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index c6d123ccbba..27fb5cd8c8d 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -169,7 +169,13 @@ SUBSYSTEM_DEF(ticker) send2chat(new /datum/tgs_message_content("<@&[CONFIG_GET(string/game_alert_role_id)]> Round **[GLOB.round_id]** starting on [SSmapping.current_map.map_name], [CONFIG_GET(string/servername)]! \nIf you wish to be pinged for game related stuff, go to <#[CONFIG_GET(string/role_assign_channel_id)]> and assign yourself the roles."), CONFIG_GET(string/channel_announce_new_game)) // SKYRAT EDIT - Role ping and round ID in game-alert // SKYRAT EDIT END current_state = GAME_STATE_PREGAME - SSvote.initiate_vote(/datum/vote/storyteller, "Storyteller Vote", forced = TRUE) // BUBBER EDIT ADDITION + // BUBBERSTATION EDIT START + var/storyteller = CONFIG_GET(string/default_storyteller) + if(storyteller) + SSgamemode.set_storyteller(text2path(storyteller), TRUE) + else + SSvote.initiate_vote(/datum/vote/storyteller, "Storyteller Vote", forced = TRUE) + // BUBBERSTATION EDIT END SStitle.change_title_screen() //SKYRAT EDIT ADDITION - Title screen addtimer(CALLBACK(SStitle, TYPE_PROC_REF(/datum/controller/subsystem/title, change_title_screen)), 1 SECONDS) //SKYRAT EDIT ADDITION - Title screen //Everyone who wants to be an observer is now spawned diff --git a/config/bubbers/bubbers_config.txt b/config/bubbers/bubbers_config.txt index 3dc613b9e17..e94a8a8eaae 100644 --- a/config/bubbers/bubbers_config.txt +++ b/config/bubbers/bubbers_config.txt @@ -16,3 +16,6 @@ INTERN_THRESHOLD_COMMAND 20 # Vetted player system ## If enabled, it will use checks to determine if a player is vetted or not in different parts of the game #CHECK_VETTED + +## Default Storyteller. Comment out to enable voting. +DEFAULT_STORYTELLER /datum/storyteller/extended diff --git a/modular_skyrat/master_files/code/controllers/configuration/entries/skyrat_config_entries.dm b/modular_skyrat/master_files/code/controllers/configuration/entries/skyrat_config_entries.dm index 0771ece5337..7e65d3a513b 100644 --- a/modular_skyrat/master_files/code/controllers/configuration/entries/skyrat_config_entries.dm +++ b/modular_skyrat/master_files/code/controllers/configuration/entries/skyrat_config_entries.dm @@ -60,3 +60,6 @@ /// Defines whether the server uses the legacy mentor system with mentors.txt or the SQL system. /datum/config_entry/flag/mentor_legacy_system protection = CONFIG_ENTRY_LOCKED + +/// If you want to have a default storyteller +/datum/config_entry/string/default_storyteller