cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-25 17:51:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ParadiseSS13/master' into multi-instance-support

Browse Source
This commit is contained in:
AffectedArc07
2021-09-20 22:11:50 +01:00
parent bbbe8c1d45 ca6f253aa6
commit 9c14b6b732
797 changed files with 21594 additions and 21139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/controllers/configuration/configuration_core.dm
View File

@@ -34,7 +34,9 @@ GLOBAL_DATUM_INIT(configuration, /datum/server_configuration, new())
var/datum/configuration_section/logging_configuration/logging
/// Holder for the MC configuration datum
var/datum/configuration_section/mc_configuration/mc
/// Holder for the MC configuration datum
/// Holder for the metrics configuration datum
var/datum/configuration_section/metrics_configuration/metrics
/// Holder for the movement configuration datum
var/datum/configuration_section/movement_configuration/movement
/// Holder for the overflow configuration datum
var/datum/configuration_section/overflow_configuration/overflow
@@ -86,6 +88,7 @@ GLOBAL_DATUM_INIT(configuration, /datum/server_configuration, new())
jobs = new()
logging = new()
mc = new()
metrics = new()
movement = new()
overflow = new()
ruins = new()
@@ -124,6 +127,7 @@ GLOBAL_DATUM_INIT(configuration, /datum/server_configuration, new())
safe_load(jobs, "job_configuration")
safe_load(logging, "logging_configuration")
safe_load(mc, "mc_configuration")
safe_load(metrics, "metrics_configuration")
safe_load(movement, "movement_configuration")
safe_load(overflow, "overflow_configuration")
safe_load(ruins, "ruin_configuration")

3
code/controllers/configuration/sections/general_configuration.dm
View File

@@ -14,8 +14,6 @@
var/lobby_time = 240
/// Ban all Guest BYOND accounts
var/guest_ban = TRUE
/// Player threshold to automatically enable panic bunker
var/panic_bunker_threshold = 150
/// Allow players to use AntagHUD?
var/allow_antag_hud = TRUE
/// Forbid players from rejoining if they use AntagHUD?
@@ -121,7 +119,6 @@
// Numbers
CONFIG_LOAD_NUM(lobby_time, data["lobby_time"])
CONFIG_LOAD_NUM(panic_bunker_threshold, data["panic_bunker_threshold"])
CONFIG_LOAD_NUM(base_loadout_points, data["base_loadout_points"])
CONFIG_LOAD_NUM(cryo_penalty_period, data["cryo_penalty_period"])
CONFIG_LOAD_NUM(minimum_client_build, data["minimum_client_build"])

17
code/controllers/configuration/sections/metrics_configuration.dm Normal file
View File

@@ -0,0 +1,17 @@
/// Config holder for stuff relating to metrics management
/datum/configuration_section/metrics_configuration
// NO EDITS OR READS TO THIS EVER
protection_state = PROTECTION_PRIVATE
/// Are metrics enabled or disabled
var/enable_metrics = FALSE
/// Endpoint to send metrics to, including protocol
var/metrics_endpoint = null
/// Endpoint authorisation API key
var/metrics_api_token = null
/datum/configuration_section/metrics_configuration/load_data(list/data)
// Use the load wrappers here. That way the default isnt made 'null' if you comment out the config line
CONFIG_LOAD_BOOL(enable_metrics, data["enable_metrics"])
CONFIG_LOAD_STR(metrics_endpoint, data["metrics_endpoint"])
CONFIG_LOAD_STR(metrics_api_token, data["metrics_api_token"])