diff --git a/code/controllers/configuration/config_entry.dm b/code/controllers/configuration/config_entry.dm index 87112f0001..28526d8870 100644 --- a/code/controllers/configuration/config_entry.dm +++ b/code/controllers/configuration/config_entry.dm @@ -6,7 +6,7 @@ /datum/config_entry var/name //read-only, this is determined by the last portion of the derived entry type - var/value + var/config_entry_value var/default //read-only, just set value directly var/resident_file //the file which this was loaded from, if any @@ -21,11 +21,11 @@ if(type == abstract_type) CRASH("Abstract config entry [type] instatiated!") name = lowertext(type2top(type)) - if(islist(value)) - var/list/L = value + if(islist(config_entry_value)) + var/list/L = config_entry_value default = L.Copy() else - default = value + default = config_entry_value /datum/config_entry/Destroy() config.RemoveEntry(src) @@ -80,7 +80,7 @@ temp = key_value continue_check = temp if(continue_check && ValidateListEntry(key_name, temp)) - value[key_name] = temp + config_entry_value[key_name] = temp return TRUE return FALSE @@ -88,7 +88,7 @@ return TRUE /datum/config_entry/string - value = "" + config_entry_value = "" abstract_type = /datum/config_entry/string var/auto_trim = TRUE @@ -98,11 +98,11 @@ /datum/config_entry/string/ValidateAndSet(str_val) if(!VASProcCallGuard(str_val)) return FALSE - value = auto_trim ? trim(str_val) : str_val + config_entry_value = auto_trim ? trim(str_val) : str_val return TRUE /datum/config_entry/number - value = 0 + config_entry_value = 0 abstract_type = /datum/config_entry/number var/integer = TRUE var/max_val = INFINITY @@ -113,9 +113,9 @@ return FALSE var/temp = text2num(trim(str_val)) if(!isnull(temp)) - value = CLAMP(integer ? round(temp) : temp, min_val, max_val) - if(value != temp && !(datum_flags & DF_VAR_EDITED)) - log_config("Changing [name] from [temp] to [value]!") + config_entry_value = CLAMP(integer ? round(temp) : temp, min_val, max_val) + if(config_entry_value != temp && !(datum_flags & DF_VAR_EDITED)) + log_config("Changing [name] from [temp] to [config_entry_value]!") return TRUE return FALSE @@ -124,18 +124,18 @@ return !(var_name in banned_edits) && ..() /datum/config_entry/flag - value = FALSE + config_entry_value = FALSE abstract_type = /datum/config_entry/flag /datum/config_entry/flag/ValidateAndSet(str_val) if(!VASProcCallGuard(str_val)) return FALSE - value = text2num(trim(str_val)) != 0 + config_entry_value = text2num(trim(str_val)) != 0 return TRUE /datum/config_entry/number_list abstract_type = /datum/config_entry/number_list - value = list() + config_entry_value = list() /datum/config_entry/number_list/ValidateAndSet(str_val) if(!VASProcCallGuard(str_val)) @@ -150,12 +150,12 @@ new_list += temp if(!new_list.len) return FALSE - value = new_list + config_entry_value = new_list return TRUE /datum/config_entry/keyed_flag_list abstract_type = /datum/config_entry/keyed_flag_list - value = list() + config_entry_value = list() dupes_allowed = TRUE /datum/config_entry/keyed_flag_list/ValidateAndSet(str_val) @@ -165,7 +165,7 @@ /datum/config_entry/keyed_number_list abstract_type = /datum/config_entry/keyed_number_list - value = list() + config_entry_value = list() dupes_allowed = TRUE var/splitter = " " @@ -179,7 +179,7 @@ /datum/config_entry/keyed_string_list abstract_type = /datum/config_entry/keyed_string_list - value = list() + config_entry_value = list() dupes_allowed = TRUE var/splitter = " " diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm index c1fc1f076e..3ca27110ef 100644 --- a/code/controllers/configuration/configuration.dm +++ b/code/controllers/configuration/configuration.dm @@ -153,7 +153,7 @@ E = entries_by_type[entry_type] if(!E) CRASH("Missing config entry for [entry_type]!") - return E.value + return E.config_entry_value /datum/controller/configuration/proc/Set(entry_type, new_val) if(IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "Set" && GLOB.LastAdminCalledTargetRef == "[REF(src)]") diff --git a/code/controllers/configuration/entries/comms.dm b/code/controllers/configuration/entries/comms.dm index e720ed93fd..289691caad 100644 --- a/code/controllers/configuration/entries/comms.dm +++ b/code/controllers/configuration/entries/comms.dm @@ -11,9 +11,9 @@ . = ..() if(.) var/list/newv = list() - for(var/I in value) - newv[replacetext(I, "+", " ")] = value[I] - value = newv + for(var/I in config_entry_value) + newv[replacetext(I, "+", " ")] = config_entry_value[I] + config_entry_value = newv /datum/config_entry/keyed_string_list/cross_server/ValidateListEntry(key_name, key_value) return key_value != "byond:\\address:port" && ..() diff --git a/code/controllers/configuration/entries/dbconfig.dm b/code/controllers/configuration/entries/dbconfig.dm index 1ac4d85419..c9dbdb4f54 100644 --- a/code/controllers/configuration/entries/dbconfig.dm +++ b/code/controllers/configuration/entries/dbconfig.dm @@ -2,21 +2,21 @@ protection = CONFIG_ENTRY_LOCKED /datum/config_entry/string/address - value = "localhost" + config_entry_value = "localhost" protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN /datum/config_entry/number/port - value = 3306 + config_entry_value = 3306 min_val = 0 max_val = 65535 protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN /datum/config_entry/string/feedback_database - value = "test" + config_entry_value = "test" protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN /datum/config_entry/string/feedback_login - value = "root" + config_entry_value = "root" protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN /datum/config_entry/string/feedback_password diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index 5b516f031a..f91d775fba 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -28,7 +28,7 @@ /datum/config_entry/keyed_string_list/policy /datum/config_entry/number/damage_multiplier - value = 1 + config_entry_value = 1 integer = FALSE /datum/config_entry/number/minimal_access_threshold //If the number of players is larger than this threshold, minimal access will be turned on. @@ -55,31 +55,31 @@ /datum/config_entry/flag/disable_peaceborg /datum/config_entry/number/traitor_scaling_coeff //how much does the amount of players get divided by to determine traitors - value = 6 + config_entry_value = 6 min_val = 1 /datum/config_entry/number/brother_scaling_coeff //how many players per brother team - value = 25 + config_entry_value = 25 min_val = 1 /datum/config_entry/number/changeling_scaling_coeff //how much does the amount of players get divided by to determine changelings - value = 6 + config_entry_value = 6 min_val = 1 /datum/config_entry/number/security_scaling_coeff //how much does the amount of players get divided by to determine open security officer positions - value = 8 + config_entry_value = 8 min_val = 1 /datum/config_entry/number/abductor_scaling_coeff //how many players per abductor team - value = 15 + config_entry_value = 15 min_val = 1 /datum/config_entry/number/traitor_objectives_amount - value = 2 + config_entry_value = 2 min_val = 0 /datum/config_entry/number/brother_objectives_amount - value = 2 + config_entry_value = 2 min_val = 0 /datum/config_entry/flag/reactionary_explosions //If we use reactionary explosions, explosions that react to walls and doors @@ -93,17 +93,17 @@ /datum/config_entry/flag/allow_latejoin_antagonists // If late-joining players can be traitor/changeling /datum/config_entry/number/midround_antag_time_check // How late (in minutes you want the midround antag system to stay on, setting this to 0 will disable the system) - value = 60 + config_entry_value = 60 min_val = 0 /datum/config_entry/number/midround_antag_life_check // A ratio of how many people need to be alive in order for the round not to immediately end in midround antagonist - value = 0.7 + config_entry_value = 0.7 integer = FALSE min_val = 0 max_val = 1 /datum/config_entry/number/shuttle_refuel_delay - value = 12000 + config_entry_value = 12000 min_val = 0 /datum/config_entry/flag/show_game_type_odds //if set this allows players to see the odds of each roundtype on the get revision screen @@ -121,7 +121,7 @@ /datum/config_entry/flag/no_intercept_report //Whether or not to send a communications intercept report roundstart. This may be overriden by gamemodes. /datum/config_entry/number/arrivals_shuttle_dock_window //Time from when a player late joins on the arrivals shuttle to when the shuttle docks on the station - value = 55 + config_entry_value = 55 min_val = 30 /datum/config_entry/flag/arrivals_shuttle_require_undocked //Require the arrivals shuttle to be undocked before latejoiners can join @@ -129,29 +129,29 @@ /datum/config_entry/flag/arrivals_shuttle_require_safe_latejoin //Require the arrivals shuttle to be operational in order for latejoiners to join /datum/config_entry/string/alert_green - value = "All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced." + config_entry_value = "All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced." /datum/config_entry/string/alert_blue_upto - value = "The station has received reliable information about possible hostile activity on the station. Security staff may have weapons visible, random searches are permitted." + config_entry_value = "The station has received reliable information about possible hostile activity on the station. Security staff may have weapons visible, random searches are permitted." /datum/config_entry/string/alert_blue_downto - value = "The immediate threat has passed. Security may no longer have weapons drawn at all times, but may continue to have them visible. Random searches are still allowed." + config_entry_value = "The immediate threat has passed. Security may no longer have weapons drawn at all times, but may continue to have them visible. Random searches are still allowed." /datum/config_entry/string/alert_red_upto - value = "There is an immediate serious threat to the station. Security may have weapons unholstered at all times. Random searches are allowed and advised." + config_entry_value = "There is an immediate serious threat to the station. Security may have weapons unholstered at all times. Random searches are allowed and advised." /datum/config_entry/string/alert_red_downto - value = "The station's destruction has been averted. There is still however an immediate serious threat to the station. Security may have weapons unholstered at all times, random searches are allowed and advised." + config_entry_value = "The station's destruction has been averted. There is still however an immediate serious threat to the station. Security may have weapons unholstered at all times, random searches are allowed and advised." /datum/config_entry/string/alert_delta - value = "Destruction of the station is imminent. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill." + config_entry_value = "Destruction of the station is imminent. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill." /datum/config_entry/flag/revival_pod_plants /datum/config_entry/flag/revival_cloning /datum/config_entry/number/revival_brain_life - value = -1 + config_entry_value = -1 min_val = -1 /datum/config_entry/flag/rename_cyborg @@ -166,7 +166,7 @@ /datum/config_entry/number/run_delay/ValidateAndSet() . = ..() if(.) - value_cache = value + value_cache = config_entry_value /datum/config_entry/number/walk_delay var/static/value_cache = 0 @@ -174,7 +174,7 @@ /datum/config_entry/number/walk_delay/ValidateAndSet() . = ..() if(.) - value_cache = value + value_cache = config_entry_value /datum/config_entry/number/human_delay //Mob specific modifiers. NOTE: These will affect different mob types in different ways /datum/config_entry/number/robot_delay @@ -184,7 +184,7 @@ /datum/config_entry/number/animal_delay /datum/config_entry/number/gateway_delay //How long the gateway takes before it activates. Default is half an hour. - value = 18000 + config_entry_value = 18000 min_val = 0 /datum/config_entry/flag/ghost_interaction @@ -195,12 +195,12 @@ /datum/config_entry/flag/sandbox_autoclose // close the sandbox panel after spawning an item, potentially reducing griff /datum/config_entry/number/default_laws //Controls what laws the AI spawns with. - value = 0 + config_entry_value = 0 min_val = 0 max_val = 3 /datum/config_entry/number/silicon_max_law_amount - value = 12 + config_entry_value = 12 min_val = 0 /datum/config_entry/keyed_flag_list/random_laws @@ -209,38 +209,38 @@ splitter = "," /datum/config_entry/number/assistant_cap - value = -1 + config_entry_value = -1 min_val = -1 /datum/config_entry/flag/starlight /datum/config_entry/flag/grey_assistants /datum/config_entry/number/lavaland_budget - value = 60 + config_entry_value = 60 min_val = 0 /datum/config_entry/number/space_budget - value = 16 + config_entry_value = 16 min_val = 0 /datum/config_entry/flag/allow_random_events // Enables random events mid-round when set /datum/config_entry/number/events_min_time_mul // Multipliers for random events minimal starting time and minimal players amounts - value = 1 + config_entry_value = 1 min_val = 0 integer = FALSE /datum/config_entry/number/events_min_players_mul - value = 1 + config_entry_value = 1 min_val = 0 integer = FALSE /datum/config_entry/number/mice_roundstart - value = 10 + config_entry_value = 10 min_val = 0 /datum/config_entry/number/bombcap - value = 14 + config_entry_value = 14 min_val = 4 //Cit changes - Adds config options for crew objectives and miscreants @@ -254,11 +254,11 @@ /datum/config_entry/number/bombcap/ValidateAndSet(str_val) . = ..() if(.) - GLOB.MAX_EX_DEVESTATION_RANGE = round(value / 4) - GLOB.MAX_EX_HEAVY_RANGE = round(value / 2) - GLOB.MAX_EX_LIGHT_RANGE = value - GLOB.MAX_EX_FLASH_RANGE = value - GLOB.MAX_EX_FLAME_RANGE = value + GLOB.MAX_EX_DEVESTATION_RANGE = round(config_entry_value / 4) + GLOB.MAX_EX_HEAVY_RANGE = round(config_entry_value / 2) + GLOB.MAX_EX_LIGHT_RANGE = config_entry_value + GLOB.MAX_EX_FLASH_RANGE = config_entry_value + GLOB.MAX_EX_FLAME_RANGE = config_entry_value /datum/config_entry/number/emergency_shuttle_autocall_threshold min_val = 0 diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm index 637e65c46f..ec7a18ba31 100644 --- a/code/controllers/configuration/entries/general.dm +++ b/code/controllers/configuration/entries/general.dm @@ -2,7 +2,7 @@ protection = CONFIG_ENTRY_LOCKED /datum/config_entry/string/autoadmin_rank // the rank for autoadmins - value = "Game Master" + config_entry_value = "Game Master" protection = CONFIG_ENTRY_LOCKED /datum/config_entry/string/servername // server name (the name of the game window) @@ -12,11 +12,11 @@ /datum/config_entry/string/stationname // station name (the name of the station in-game) /datum/config_entry/number/lobby_countdown // In between round countdown. - value = 120 + config_entry_value = 120 min_val = 0 /datum/config_entry/number/round_end_countdown // Post round murder death kill countdown - value = 25 + config_entry_value = 25 min_val = 0 /datum/config_entry/flag/hub // if the game appears on the hub or not @@ -62,11 +62,11 @@ /datum/config_entry/flag/allow_vote_mode // allow votes to change mode /datum/config_entry/number/vote_delay // minimum time between voting sessions (deciseconds, 10 minute default) - value = 6000 + config_entry_value = 6000 min_val = 0 /datum/config_entry/number/vote_period // length of voting period (deciseconds, default 1 minute) - value = 600 + config_entry_value = 600 min_val = 0 /datum/config_entry/flag/default_no_vote // vote does not default to nochange/norestart @@ -78,7 +78,7 @@ /datum/config_entry/flag/popup_admin_pm // adminPMs to non-admins show in a pop-up 'reply' window when set /datum/config_entry/number/fps - value = 20 + config_entry_value = 20 min_val = 1 max_val = 100 //byond will start crapping out at 50, so this is just ridic var/sync_validate = FALSE @@ -89,7 +89,7 @@ sync_validate = TRUE var/datum/config_entry/number/ticklag/TL = config.entries_by_type[/datum/config_entry/number/ticklag] if(!TL.sync_validate) - TL.ValidateAndSet(10 / value) + TL.ValidateAndSet(10 / config_entry_value) sync_validate = FALSE /datum/config_entry/number/ticklag @@ -98,7 +98,7 @@ /datum/config_entry/number/ticklag/New() //ticklag weirdly just mirrors fps var/datum/config_entry/CE = /datum/config_entry/number/fps - value = 10 / initial(CE.value) + config_entry_value = 10 / initial(CE.config_entry_value) ..() /datum/config_entry/number/ticklag/ValidateAndSet(str_val) @@ -107,13 +107,13 @@ sync_validate = TRUE var/datum/config_entry/number/fps/FPS = config.entries_by_type[/datum/config_entry/number/fps] if(!FPS.sync_validate) - FPS.ValidateAndSet(10 / value) + FPS.ValidateAndSet(10 / config_entry_value) sync_validate = FALSE /datum/config_entry/flag/allow_holidays /datum/config_entry/number/tick_limit_mc_init //SSinitialization throttling - value = TICK_LIMIT_MC_INIT_DEFAULT + config_entry_value = TICK_LIMIT_MC_INIT_DEFAULT min_val = 0 //oranges warned us integer = FALSE @@ -140,7 +140,7 @@ /datum/config_entry/flag/use_exp_restrictions_heads /datum/config_entry/number/use_exp_restrictions_heads_hours - value = 0 + config_entry_value = 0 min_val = 0 /datum/config_entry/flag/use_exp_restrictions_heads_department @@ -154,44 +154,44 @@ /datum/config_entry/string/banappeals /datum/config_entry/string/wikiurl - value = "http://www.tgstation13.org/wiki" + config_entry_value = "http://www.tgstation13.org/wiki" /datum/config_entry/string/forumurl - value = "http://tgstation13.org/phpBB/index.php" + config_entry_value = "http://tgstation13.org/phpBB/index.php" /datum/config_entry/string/rulesurl - value = "http://www.tgstation13.org/wiki/Rules" + config_entry_value = "http://www.tgstation13.org/wiki/Rules" /datum/config_entry/string/githuburl - value = "https://www.github.com/tgstation/-tg-station" + config_entry_value = "https://www.github.com/tgstation/-tg-station" /datum/config_entry/number/githubrepoid - value = null + config_entry_value = null min_val = 0 /datum/config_entry/flag/guest_ban /datum/config_entry/number/id_console_jobslot_delay - value = 30 + config_entry_value = 30 min_val = 0 /datum/config_entry/number/inactivity_period //time in ds until a player is considered inactive - value = 3000 + config_entry_value = 3000 min_val = 0 /datum/config_entry/number/inactivity_period/ValidateAndSet(str_val) . = ..() if(.) - value *= 10 //documented as seconds in config.txt + config_entry_value *= 10 //documented as seconds in config.txt /datum/config_entry/number/afk_period //time in ds until a player is considered inactive - value = 3000 + config_entry_value = 3000 min_val = 0 /datum/config_entry/number/afk_period/ValidateAndSet(str_val) . = ..() if(.) - value *= 10 //documented as seconds in config.txt + config_entry_value *= 10 //documented as seconds in config.txt /datum/config_entry/flag/kick_inactive //force disconnect for inactive players @@ -219,43 +219,43 @@ /datum/config_entry/flag/see_own_notes //Can players see their own admin notes /datum/config_entry/number/note_fresh_days - value = null + config_entry_value = null min_val = 0 integer = FALSE /datum/config_entry/number/note_stale_days - value = null + config_entry_value = null min_val = 0 integer = FALSE /datum/config_entry/flag/maprotation /datum/config_entry/number/maprotatechancedelta - value = 0.75 + config_entry_value = 0.75 min_val = 0 max_val = 1 integer = FALSE /datum/config_entry/number/soft_popcap - value = null + config_entry_value = null min_val = 0 /datum/config_entry/number/hard_popcap - value = null + config_entry_value = null min_val = 0 /datum/config_entry/number/extreme_popcap - value = null + config_entry_value = null min_val = 0 /datum/config_entry/string/soft_popcap_message - value = "Be warned that the server is currently serving a high number of users, consider using alternative game servers." + config_entry_value = "Be warned that the server is currently serving a high number of users, consider using alternative game servers." /datum/config_entry/string/hard_popcap_message - value = "The server is currently serving a high number of users, You cannot currently join. You may wait for the number of living crew to decline, observe, or find alternative servers." + config_entry_value = "The server is currently serving a high number of users, You cannot currently join. You may wait for the number of living crew to decline, observe, or find alternative servers." /datum/config_entry/string/extreme_popcap_message - value = "The server is currently serving a high number of users, find alternative servers." + config_entry_value = "The server is currently serving a high number of users, find alternative servers." /datum/config_entry/flag/panic_bunker // prevents people the server hasn't seen before from connecting @@ -275,21 +275,21 @@ return str_val != "ch@nge.me" && ..() /datum/config_entry/number/ipintel_rating_bad - value = 1 + config_entry_value = 1 integer = FALSE min_val = 0 max_val = 1 /datum/config_entry/number/ipintel_save_good - value = 12 + config_entry_value = 12 min_val = 0 /datum/config_entry/number/ipintel_save_bad - value = 1 + config_entry_value = 1 min_val = 0 /datum/config_entry/string/ipintel_domain - value = "check.getipintel.net" + config_entry_value = "check.getipintel.net" /datum/config_entry/flag/aggressive_changelog @@ -309,43 +309,43 @@ /datum/config_entry/flag/generate_minimaps /datum/config_entry/number/client_warn_version - value = null + config_entry_value = null min_val = 500 max_val = DM_VERSION - 1 /datum/config_entry/string/client_warn_message - value = "Your version of byond may have issues or be blocked from accessing this server in the future." + config_entry_value = "Your version of byond may have issues or be blocked from accessing this server in the future." /datum/config_entry/flag/client_warn_popup /datum/config_entry/number/client_error_version - value = null + config_entry_value = null min_val = 500 max_val = DM_VERSION - 1 /datum/config_entry/string/client_error_message - value = "Your version of byond is too old, may have issues, and is blocked from accessing this server." + config_entry_value = "Your version of byond is too old, may have issues, and is blocked from accessing this server." /datum/config_entry/number/minute_topic_limit - value = null + config_entry_value = null min_val = 0 /datum/config_entry/number/second_topic_limit - value = null + config_entry_value = null min_val = 0 /datum/config_entry/number/error_cooldown // The "cooldown" time for each occurrence of a unique error - value = 600 + config_entry_value = 600 min_val = 0 /datum/config_entry/number/error_limit // How many occurrences before the next will silence them - value = 50 + config_entry_value = 50 /datum/config_entry/number/error_silence_time // How long a unique error will be silenced for - value = 6000 + config_entry_value = 6000 /datum/config_entry/number/error_msg_delay // How long to wait between messaging admins about occurrences of a unique error - value = 50 + config_entry_value = 50 /datum/config_entry/flag/irc_announce_new_game @@ -353,17 +353,17 @@ /datum/config_entry/number/mc_tick_rate/base_mc_tick_rate integer = FALSE - value = 1 + config_entry_value = 1 /datum/config_entry/number/mc_tick_rate/high_pop_mc_tick_rate integer = FALSE - value = 1.1 + config_entry_value = 1.1 /datum/config_entry/number/mc_tick_rate/high_pop_mc_mode_amount - value = 65 + config_entry_value = 65 /datum/config_entry/number/mc_tick_rate/disable_high_pop_mc_mode_amount - value = 60 + config_entry_value = 60 /datum/config_entry/number/mc_tick_rate abstract_type = /datum/config_entry/number/mc_tick_rate @@ -378,11 +378,11 @@ /datum/config_entry/flag/resume_after_initializations/ValidateAndSet(str_val) . = ..() if(. && Master.current_runlevel) - world.sleep_offline = !value + world.sleep_offline = !config_entry_value /datum/config_entry/number/rounds_until_hard_restart - value = -1 + config_entry_value = -1 min_val = 0 /datum/config_entry/string/default_view - value = "15x15" + config_entry_value = "15x15" diff --git a/code/modules/error_handler/error_handler.dm b/code/modules/error_handler/error_handler.dm index f5882ca916..06ff548e42 100644 --- a/code/modules/error_handler/error_handler.dm +++ b/code/modules/error_handler/error_handler.dm @@ -60,11 +60,11 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0) configured_error_silence_time = CONFIG_GET(number/error_silence_time) else var/datum/config_entry/CE = /datum/config_entry/number/error_cooldown - configured_error_cooldown = initial(CE.value) + configured_error_cooldown = initial(CE.config_entry_value) CE = /datum/config_entry/number/error_limit - configured_error_limit = initial(CE.value) + configured_error_limit = initial(CE.config_entry_value) CE = /datum/config_entry/number/error_silence_time - configured_error_silence_time = initial(CE.value) + configured_error_silence_time = initial(CE.config_entry_value) //Each occurence of a unique error adds to its cooldown time... diff --git a/code/modules/error_handler/error_viewer.dm b/code/modules/error_handler/error_viewer.dm index 7d10488c68..1f93bba9a0 100644 --- a/code/modules/error_handler/error_viewer.dm +++ b/code/modules/error_handler/error_viewer.dm @@ -122,7 +122,7 @@ GLOBAL_DATUM(error_cache, /datum/error_viewer/error_cache) err_msg_delay = CONFIG_GET(number/error_msg_delay) else var/datum/config_entry/CE = /datum/config_entry/number/error_msg_delay - err_msg_delay = initial(CE.value) + err_msg_delay = initial(CE.config_entry_value) error_source.next_message_at = world.time + err_msg_delay /datum/error_viewer/error_source