Steel tweaks

This commit is contained in:
AffectedArc07
2021-06-09 13:14:11 +01:00
parent 22fa5e0629
commit def7a4ef52
6 changed files with 23 additions and 14 deletions
@@ -1,6 +1,7 @@
// Paradise SS13 Configuration System
// Refactored to use config sections as part of a single TOML file, since thats much better to deal with
/// Global configuration datum holder for all the config sections
GLOBAL_DATUM_INIT(configuration, /datum/server_configuration, new())
/// Represents a base configuration datum. Has everything else bundled into it
@@ -120,17 +121,17 @@ GLOBAL_DATUM_INIT(configuration, /datum/server_configuration, new())
/datum/configuration_section/can_vv_get(var_name)
if(protection_state == PROTECTION_PRIVATE)
return FALSE
. = ..()
return ..()
/datum/configuration_section/vv_edit_var(var_name, var_value)
if(protection_state in list(PROTECTION_PRIVATE, PROTECTION_READONLY))
return FALSE
. = ..()
return ..()
/datum/configuration_section/vv_get_var(var_name)
if(protection_state == PROTECTION_PRIVATE)
return FALSE
. = ..()
return ..()
/datum/configuration_section/Destroy(force)
SHOULD_CALL_PARENT(FALSE)
@@ -1,8 +1,11 @@
/// Config holder for all admin related things
/datum/configuration_section/admin_configuration
protection_state = PROTECTION_READONLY // Dont even think about it
/// Do we want to load admins from the database?
var/use_database_admins = FALSE
/// Do we want to auto enable admin rights if you connect from localhost?
var/enable_localhost_autoadmin = TRUE
/// Do we want to allow admins to set their own OOC colour?
var/allow_admin_ooc_colour = TRUE
/// Assoc list of admin ranks and their stuff. key: rank name string | value: list of rights
var/list/rank_rights_map = list()
@@ -28,15 +28,20 @@
for(var/T in subtypesof(/datum/game_mode))
var/datum/game_mode/M = T
if(initial(M.config_tag))
// Ensure each mode is added only once
if(!(initial(M.config_tag) in gamemodes))
gamemodes += initial(M.config_tag)
gamemode_names[initial(M.config_tag)] = initial(M.name)
probabilities[initial(M.config_tag)] = initial(M.probability)
// Dont bother if theres no tag
if(!initial(M.config_tag))
continue
// Ensure each mode is added only once
if(initial(M.config_tag) in gamemodes)
continue
if(initial(M.votable))
votable_modes += initial(M.config_tag)
// Add it in
gamemodes += initial(M.config_tag)
gamemode_names[initial(M.config_tag)] = initial(M.name)
probabilities[initial(M.config_tag)] = initial(M.probability)
if(initial(M.votable))
votable_modes += initial(M.config_tag)
// Add secret to the votable pool
votable_modes += "secret"
+1 -1
View File
@@ -77,7 +77,7 @@ SUBSYSTEM_DEF(ticker)
switch(current_state)
if(GAME_STATE_STARTUP)
// This is ran as soon as the MC starts firing, and should only run ONCE, unless startup fails
round_start_time = world.time + (GLOB.configuration.general.lobby_time * 10)
round_start_time = world.time + (GLOB.configuration.general.lobby_time SECONDS)
to_chat(world, "<B><span class='darkmblue'>Welcome to the pre-game lobby!</span></B>")
to_chat(world, "Please, setup your character and select ready. Game will start in [GLOB.configuration.general.lobby_time] seconds")
current_state = GAME_STATE_PREGAME