From d45b668a390ca0c97cf4df7315cf51a892731414 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Thu, 14 Dec 2017 18:23:10 -0500
Subject: [PATCH] Adds config inclusion system

---
 code/__DEFINES/configuration.dm               |   2 -
 .../controllers/configuration/config_entry.dm |   4 +-
 .../configuration/configuration.dm            |  44 +-
 .../configuration/entries/comms.dm            |  14 +-
 .../configuration/entries/config.dm           | 390 ------------------
 .../configuration/entries/dbconfig.dm         |  16 +-
 .../configuration/entries/game_options.dm     | 176 ++++----
 .../configuration/entries/general.dm          | 388 +++++++++++++++++
 config/config.txt                             |   6 +
 tgstation.dme                                 |   2 +-
 10 files changed, 527 insertions(+), 515 deletions(-)
 delete mode 100644 code/controllers/configuration/entries/config.dm
 create mode 100644 code/controllers/configuration/entries/general.dm

diff --git a/code/__DEFINES/configuration.dm b/code/__DEFINES/configuration.dm
index 3db0ca24c2..c4ef8e6606 100644
--- a/code/__DEFINES/configuration.dm
+++ b/code/__DEFINES/configuration.dm
@@ -1,8 +1,6 @@
 //config files
-#define CONFIG_DEF(X) /datum/config_entry/##X { resident_file = CURRENT_RESIDENT_FILE }; /datum/config_entry/##X
 #define CONFIG_GET(X) global.config.Get(/datum/config_entry/##X)
 #define CONFIG_SET(X, Y) global.config.Set(/datum/config_entry/##X, ##Y)
-#define CONFIG_TWEAK(X) /datum/config_entry/##X
 
 #define CONFIG_MAPS_FILE "maps.txt"
 
diff --git a/code/controllers/configuration/config_entry.dm b/code/controllers/configuration/config_entry.dm
index 92dcb9baf0..7e6f481392 100644
--- a/code/controllers/configuration/config_entry.dm
+++ b/code/controllers/configuration/config_entry.dm
@@ -9,7 +9,7 @@
 	var/value
 	var/default	//read-only, just set value directly
 	
-	var/resident_file	//the file which this belongs to, must be set
+	var/resident_file	//the file which this was loaded from, if any
 	var/modified = FALSE	//set to TRUE if the default has been overridden by a config entry
 
 	var/protection = NONE
@@ -18,8 +18,6 @@
 	var/dupes_allowed = FALSE
 
 /datum/config_entry/New()
-	if(!resident_file)
-		CRASH("Config entry [type] has no resident_file set")
 	if(type == abstract_type)
 		CRASH("Abstract config entry [type] instatiated!")	
 	name = lowertext(type2top(type))
diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm
index e9c0aa71b8..f411bd65d3 100644
--- a/code/controllers/configuration/configuration.dm
+++ b/code/controllers/configuration/configuration.dm
@@ -20,10 +20,13 @@ GLOBAL_PROTECT(config_dir)
 
 /datum/controller/configuration/New()
 	config = src
-	var/list/config_files = InitEntries()
+	InitEntries()
 	LoadModes()
-	for(var/I in config_files)
-		LoadEntries(I)
+	if(!LoadEntries("config.txt"))
+		log_config("No $include directives found in config.txt! Loading legacy game_options/dbconfig/comms files...")
+		LoadEntries("game_options.txt")
+		LoadEntries("dbconfig.txt")
+		LoadEntries("comms.txt")
 	loadmaplist(CONFIG_MAPS_FILE)
 
 /datum/controller/configuration/Destroy()
@@ -42,8 +45,6 @@ GLOBAL_PROTECT(config_dir)
 	var/list/_entries_by_type = list()
 	entries_by_type = _entries_by_type
 
-	. = list()
-
 	for(var/I in typesof(/datum/config_entry))	//typesof is faster in this case
 		var/datum/config_entry/E = I
 		if(initial(E.abstract_type) == I)
@@ -57,24 +58,30 @@ GLOBAL_PROTECT(config_dir)
 			continue
 		_entries[esname] = E
 		_entries_by_type[I] = E
-		.[E.resident_file] = TRUE
 
 /datum/controller/configuration/proc/RemoveEntry(datum/config_entry/CE)
 	entries -= CE.name
 	entries_by_type -= CE.type
 
-/datum/controller/configuration/proc/LoadEntries(filename)
+/datum/controller/configuration/proc/LoadEntries(filename, list/stack = list())
+	var/filename_to_test = world.system_type == MS_WINDOWS ? lowertext(filename) : filename
+	if(filename_to_test in stack)
+		log_config("Warning: Config recursion detected ([english_list(stack)]), breaking!")
+		return
+	stack = stack + filename_to_test
+
 	log_config("Loading config file [filename]...")
 	var/list/lines = world.file2list("[GLOB.config_dir][filename]")
 	var/list/_entries = entries
 	for(var/L in lines)
 		if(!L)
 			continue
-
-		if(copytext(L, 1, 2) == "#")
+		
+		var/firstchar = copytext(L, 1, 2)
+		if(firstchar == "#")
 			continue
 
-		var/lockthis = copytext(L, 1, 2) == "@"
+		var/lockthis = firstchar == "@"
 		if(lockthis)
 			L = copytext(L, 2)
 
@@ -91,14 +98,17 @@ GLOBAL_PROTECT(config_dir)
 		if(!entry)
 			continue
 		
+		if(entry == "$include")
+			if(!value)
+				log_config("Warning: Invalid $include directive: [value]")
+			else
+				LoadEntries(value, stack)
+			continue
+		
 		var/datum/config_entry/E = _entries[entry]
 		if(!E)
 			log_config("Unknown setting in configuration: '[entry]'")
 			continue
-		
-		if(filename != E.resident_file)
-			log_config("Found [entry] in [filename] when it should have been in [E.resident_file]! Ignoring.")
-			continue
 
 		if(lockthis)
 			E.protection |= CONFIG_ENTRY_LOCKED
@@ -107,10 +117,14 @@ GLOBAL_PROTECT(config_dir)
 		if(!validated)
 			log_config("Failed to validate setting \"[value]\" for [entry]")
 		else if(E.modified && !E.dupes_allowed)
-			log_config("Duplicate setting for [entry] ([value]) detected! Using latest.")
+			log_config("Duplicate setting for [entry] ([value], [E.resident_file]) detected! Using latest.")
+
+		E.resident_file = filename
 		
 		if(validated)
 			E.modified = TRUE
+		
+		. = TRUE
 
 /datum/controller/configuration/can_vv_get(var_name)
 	return (var_name != "entries_by_type" || !hiding_entries_by_type) && ..()
diff --git a/code/controllers/configuration/entries/comms.dm b/code/controllers/configuration/entries/comms.dm
index bf099f6cb6..70197b6fd4 100644
--- a/code/controllers/configuration/entries/comms.dm
+++ b/code/controllers/configuration/entries/comms.dm
@@ -1,22 +1,24 @@
-#define CURRENT_RESIDENT_FILE "comms.txt"
-
-CONFIG_DEF(string/comms_key)
+/datum/config_entry/string/comms_key
 	protection = CONFIG_ENTRY_HIDDEN
 
 /datum/config_entry/string/comms_key/ValidateAndSet(str_val)
     return str_val != "default_pwd" && length(str_val) > 6 && ..()
 
+<<<<<<< HEAD
 CONFIG_DEF(string/cross_server_address)
+=======
+/datum/config_entry/keyed_string_list/cross_server
+>>>>>>> 8c537ea... Adds config inclusion system (#33307)
 	protection = CONFIG_ENTRY_LOCKED
 
 /datum/config_entry/string/cross_server_address/ValidateAndSet(str_val)
     return str_val != "byond:\\address:port" && ..()
 
-CONFIG_DEF(string/cross_comms_name)
+/datum/config_entry/string/cross_comms_name
 
 GLOBAL_VAR_INIT(medals_enabled, TRUE)	//will be auto set to false if the game fails contacting the medal hub to prevent unneeded calls.
 
-CONFIG_DEF(string/medal_hub_address)
+/datum/config_entry/string/medal_hub_address
 
-CONFIG_DEF(string/medal_hub_password)
+/datum/config_entry/string/medal_hub_password
 	protection = CONFIG_ENTRY_HIDDEN
\ No newline at end of file
diff --git a/code/controllers/configuration/entries/config.dm b/code/controllers/configuration/entries/config.dm
deleted file mode 100644
index 37081c15dd..0000000000
--- a/code/controllers/configuration/entries/config.dm
+++ /dev/null
@@ -1,390 +0,0 @@
-#define CURRENT_RESIDENT_FILE "config.txt"
-
-CONFIG_DEF(flag/autoadmin)  // if autoadmin is enabled
-	protection = CONFIG_ENTRY_LOCKED
-
-CONFIG_DEF(string/autoadmin_rank)	// the rank for autoadmins
-	value = "Game Master"
-	protection = CONFIG_ENTRY_LOCKED
-
-CONFIG_DEF(string/servername)	// server name (the name of the game window)
-
-CONFIG_DEF(string/serversqlname)	// short form server name used for the DB
-
-CONFIG_DEF(string/stationname)	// station name (the name of the station in-game)
-
-CONFIG_DEF(number/lobby_countdown)	// In between round countdown.
-	value = 120
-	min_val = 0
-
-CONFIG_DEF(number/round_end_countdown)	// Post round murder death kill countdown
-	value = 25
-	min_val = 0
-
-CONFIG_DEF(flag/hub)	// if the game appears on the hub or not
-
-CONFIG_DEF(flag/log_ooc)	// log OOC channel
-
-CONFIG_DEF(flag/log_access)	// log login/logout
-
-CONFIG_DEF(flag/log_say)	// log client say
-
-CONFIG_DEF(flag/log_admin)	// log admin actions
-	protection = CONFIG_ENTRY_LOCKED
-
-CONFIG_DEF(flag/log_prayer)	// log prayers
-
-CONFIG_DEF(flag/log_law)	// log lawchanges
-
-CONFIG_DEF(flag/log_game)	// log game events
-
-CONFIG_DEF(flag/log_vote)	// log voting
-
-CONFIG_DEF(flag/log_whisper)	// log client whisper
-
-CONFIG_DEF(flag/log_attack)	// log attack messages
-
-CONFIG_DEF(flag/log_emote)	// log emotes
-
-CONFIG_DEF(flag/log_adminchat)	// log admin chat messages
-	protection = CONFIG_ENTRY_LOCKED
-
-CONFIG_DEF(flag/log_pda)	// log pda messages
-
-CONFIG_DEF(flag/log_twitter)	// log certain expliotable parrots and other such fun things in a JSON file of twitter valid phrases.
-
-CONFIG_DEF(flag/log_world_topic)	// log all world.Topic() calls
-
-CONFIG_DEF(flag/log_manifest)	// log crew manifest to seperate file
-
-CONFIG_DEF(flag/allow_admin_ooccolor)	// Allows admins with relevant permissions to have their own ooc colour
-
-CONFIG_DEF(flag/allow_vote_restart)	// allow votes to restart
-
-CONFIG_DEF(flag/allow_vote_mode)	// allow votes to change mode
-
-CONFIG_DEF(number/vote_delay)	// minimum time between voting sessions (deciseconds, 10 minute default)
-	value = 6000
-	min_val = 0
-
-CONFIG_DEF(number/vote_period)	// length of voting period (deciseconds, default 1 minute)
-	value = 600
-	min_val = 0
-
-CONFIG_DEF(flag/default_no_vote)	// vote does not default to nochange/norestart
-
-CONFIG_DEF(flag/no_dead_vote)	// dead people can't vote
-
-CONFIG_DEF(flag/allow_metadata)	// Metadata is supported.
-
-CONFIG_DEF(flag/popup_admin_pm)	// adminPMs to non-admins show in a pop-up 'reply' window when set
-
-CONFIG_DEF(number/fps)
-	value = 20
-	min_val = 1
-	max_val = 100   //byond will start crapping out at 50, so this is just ridic
-	var/sync_validate = FALSE
-
-/datum/config_entry/number/fps/ValidateAndSet(str_val)
-	. = ..()
-	if(.)
-		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)
-		sync_validate = FALSE
-
-CONFIG_DEF(number/ticklag)
-	integer = FALSE
-	var/sync_validate = FALSE
-
-/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)
-	..()
-
-/datum/config_entry/number/ticklag/ValidateAndSet(str_val)
-	. = text2num(str_val) > 0 && ..()
-	if(.)
-		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)
-		sync_validate = FALSE
-
-CONFIG_DEF(flag/allow_holidays)
-
-CONFIG_DEF(number/tick_limit_mc_init)	//SSinitialization throttling
-	value = TICK_LIMIT_MC_INIT_DEFAULT
-	min_val = 0 //oranges warned us
-	integer = FALSE
-
-CONFIG_DEF(flag/admin_legacy_system)	//Defines whether the server uses the legacy admin system with admins.txt or the SQL system
-	protection = CONFIG_ENTRY_LOCKED
-
-CONFIG_DEF(string/hostedby)
-
-CONFIG_DEF(flag/norespawn)
-
-CONFIG_DEF(flag/guest_jobban)
-
-CONFIG_DEF(flag/usewhitelist)
-
-CONFIG_DEF(flag/ban_legacy_system)	//Defines whether the server uses the legacy banning system with the files in /data or the SQL system.
-	protection = CONFIG_ENTRY_LOCKED
-
-CONFIG_DEF(flag/use_age_restriction_for_jobs)	//Do jobs use account age restrictions? --requires database
-
-CONFIG_DEF(flag/use_account_age_for_jobs)	//Uses the time they made the account for the job restriction stuff. New player joining alerts should be unaffected.
-
-CONFIG_DEF(flag/use_exp_tracking)
-
-CONFIG_DEF(flag/use_exp_restrictions_heads)
-
-CONFIG_DEF(number/use_exp_restrictions_heads_hours)
-	value = 0
-	min_val = 0
-
-CONFIG_DEF(flag/use_exp_restrictions_heads_department)
-
-CONFIG_DEF(flag/use_exp_restrictions_other)
-
-CONFIG_DEF(flag/use_exp_restrictions_admin_bypass)
-
-CONFIG_DEF(string/server)
-
-CONFIG_DEF(string/banappeals)
-
-CONFIG_DEF(string/wikiurl)
-	value = "http://www.tgstation13.org/wiki"
-
-CONFIG_DEF(string/forumurl)
-	value = "http://tgstation13.org/phpBB/index.php"
-
-CONFIG_DEF(string/rulesurl)
-	value = "http://www.tgstation13.org/wiki/Rules"
-
-CONFIG_DEF(string/githuburl)
-	value = "https://www.github.com/tgstation/-tg-station"
-
-CONFIG_DEF(number/githubrepoid)
-	value = null
-	min_val = 0
-
-CONFIG_DEF(flag/guest_ban)
-
-CONFIG_DEF(number/id_console_jobslot_delay)
-	value = 30
-	min_val = 0
-
-CONFIG_DEF(number/inactivity_period)	//time in ds until a player is considered inactive)
-	value = 3000
-	min_val = 0
-
-/datum/config_entry/number/inactivity_period/ValidateAndSet(str_val)
-	. = ..()
-	if(.)
-		value *= 10 //documented as seconds in config.txt
-
-CONFIG_DEF(number/afk_period)	//time in ds until a player is considered inactive)
-	value = 3000
-	min_val = 0
-
-/datum/config_entry/number/afk_period/ValidateAndSet(str_val)
-	. = ..()
-	if(.)
-		value *= 10 //documented as seconds in config.txt
-
-CONFIG_DEF(flag/kick_inactive)	//force disconnect for inactive players
-
-CONFIG_DEF(flag/load_jobs_from_txt)
-
-CONFIG_DEF(flag/forbid_singulo_possession)
-
-CONFIG_DEF(flag/automute_on)	//enables automuting/spam prevention
-
-CONFIG_DEF(string/panic_server_name)
-
-/datum/config_entry/string/panic_server_name/ValidateAndSet(str_val)
-	return str_val != "\[Put the name here\]" && ..()
-
-CONFIG_DEF(string/panic_server_address)	//Reconnect a player this linked server if this server isn't accepting new players
-
-/datum/config_entry/string/panic_server_address/ValidateAndSet(str_val)
-	return str_val != "byond://address:port" && ..()
-
-CONFIG_DEF(string/invoke_youtubedl)
-	protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN
-
-CONFIG_DEF(flag/show_irc_name)
-
-CONFIG_DEF(flag/see_own_notes)	//Can players see their own admin notes (read-only)?
-
-CONFIG_DEF(number/note_fresh_days)
-	value = null
-	min_val = 0
-	integer = FALSE
-
-CONFIG_DEF(number/note_stale_days)
-	value = null
-	min_val = 0
-	integer = FALSE
-
-CONFIG_DEF(flag/maprotation)
-
-CONFIG_DEF(number/maprotatechancedelta)
-	value = 0.75
-	min_val = 0
-	max_val = 1
-	integer = FALSE
-
-CONFIG_DEF(number/soft_popcap)
-	value = null
-	min_val = 0
-
-CONFIG_DEF(number/hard_popcap)
-	value = null
-	min_val = 0
-
-CONFIG_DEF(number/extreme_popcap)
-	value = null
-	min_val = 0
-
-CONFIG_DEF(string/soft_popcap_message)
-	value = "Be warned that the server is currently serving a high number of users, consider using alternative game servers."
-
-CONFIG_DEF(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_DEF(string/extreme_popcap_message)
-	value = "The server is currently serving a high number of users, find alternative servers."
-
-CONFIG_DEF(flag/panic_bunker)	// prevents people the server hasn't seen before from connecting
-
-CONFIG_DEF(number/notify_new_player_age)	// how long do we notify admins of a new player
-	min_val = -1
-
-CONFIG_DEF(number/notify_new_player_account_age)	// how long do we notify admins of a new byond account
-	min_val = 0
-
-CONFIG_DEF(flag/irc_first_connection_alert)	// do we notify the irc channel when somebody is connecting for the first time?
-
-CONFIG_DEF(flag/check_randomizer)
-
-CONFIG_DEF(string/ipintel_email)
-
-/datum/config_entry/string/ipintel_email/ValidateAndSet(str_val)
-	return str_val != "ch@nge.me" && ..()
-
-CONFIG_DEF(number/ipintel_rating_bad)
-	value = 1
-	integer = FALSE
-	min_val = 0
-	max_val = 1
-
-CONFIG_DEF(number/ipintel_save_good)
-	value = 12
-	min_val = 0
-
-CONFIG_DEF(number/ipintel_save_bad)
-	value = 1
-	min_val = 0
-
-CONFIG_DEF(string/ipintel_domain)
-	value = "check.getipintel.net"
-
-CONFIG_DEF(flag/aggressive_changelog)
-
-CONFIG_DEF(flag/autoconvert_notes)	//if all connecting player's notes should attempt to be converted to the database
-	protection = CONFIG_ENTRY_LOCKED
-
-CONFIG_DEF(flag/allow_webclient)
-
-CONFIG_DEF(flag/webclient_only_byond_members)
-
-CONFIG_DEF(flag/announce_admin_logout)
-
-CONFIG_DEF(flag/announce_admin_login)
-
-CONFIG_DEF(flag/allow_map_voting)
-
-CONFIG_DEF(flag/generate_minimaps)
-
-CONFIG_DEF(number/client_warn_version)
-	value = null
-	min_val = 500
-	max_val = DM_VERSION - 1
-
-CONFIG_DEF(string/client_warn_message)
-	value = "Your version of byond may have issues or be blocked from accessing this server in the future."
-
-CONFIG_DEF(flag/client_warn_popup)
-
-CONFIG_DEF(number/client_error_version)
-	value = null
-	min_val = 500
-	max_val = DM_VERSION - 1
-
-CONFIG_DEF(string/client_error_message)
-	value = "Your version of byond is too old, may have issues, and is blocked from accessing this server."
-
-CONFIG_DEF(number/minute_topic_limit)
-	value = null
-	min_val = 0
-
-CONFIG_DEF(number/second_topic_limit)
-	value = null
-	min_val = 0
-
-CONFIG_DEF(number/error_cooldown)	// The "cooldown" time for each occurrence of a unique error)
-	value = 600
-	min_val = 0
-
-CONFIG_DEF(number/error_limit)	// How many occurrences before the next will silence them
-	value = 50
-
-CONFIG_DEF(number/error_silence_time)	// How long a unique error will be silenced for
-	value = 6000
-
-CONFIG_DEF(number/error_msg_delay)	// How long to wait between messaging admins about occurrences of a unique error
-	value = 50
-
-CONFIG_DEF(flag/irc_announce_new_game)
-
-CONFIG_DEF(flag/debug_admin_hrefs)
-
-CONFIG_DEF(number/mc_tick_rate/base_mc_tick_rate)
-	integer = FALSE
-	value = 1
-
-CONFIG_DEF(number/mc_tick_rate/high_pop_mc_tick_rate)
-	integer = FALSE
-	value = 1.1
-
-CONFIG_DEF(number/mc_tick_rate/high_pop_mc_mode_amount)
-	value = 65
-
-CONFIG_DEF(number/mc_tick_rate/disable_high_pop_mc_mode_amount)
-	value = 60
-
-CONFIG_TWEAK(number/mc_tick_rate)
-	abstract_type = /datum/config_entry/number/mc_tick_rate
-
-CONFIG_TWEAK(number/mc_tick_rate/ValidateAndSet(str_val))
-	. = ..()
-	if (.)
-		Master.UpdateTickRate()
-
-CONFIG_DEF(flag/resume_after_initializations)
-
-CONFIG_TWEAK(flag/resume_after_initializations/ValidateAndSet(str_val))
-	. = ..()
-	if(. && Master.current_runlevel)
-		world.sleep_offline = !value
-
-CONFIG_DEF(number/rounds_until_hard_restart)
-	value = -1
-	min_val = 0
-
-CONFIG_DEF(string/default_view)
-	value = "15x15"
diff --git a/code/controllers/configuration/entries/dbconfig.dm b/code/controllers/configuration/entries/dbconfig.dm
index c46880686a..1ac4d85419 100644
--- a/code/controllers/configuration/entries/dbconfig.dm
+++ b/code/controllers/configuration/entries/dbconfig.dm
@@ -1,28 +1,26 @@
-#define CURRENT_RESIDENT_FILE "dbconfig.txt"
-
-CONFIG_DEF(flag/sql_enabled)	// for sql switching
+/datum/config_entry/flag/sql_enabled	// for sql switching
 	protection = CONFIG_ENTRY_LOCKED
 
-CONFIG_DEF(string/address)
+/datum/config_entry/string/address
 	value = "localhost"
 	protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN
 	
-CONFIG_DEF(number/port)
+/datum/config_entry/number/port
 	value = 3306
 	min_val = 0
 	max_val = 65535
 	protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN
 
-CONFIG_DEF(string/feedback_database)
+/datum/config_entry/string/feedback_database
 	value = "test"
 	protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN
 
-CONFIG_DEF(string/feedback_login)
+/datum/config_entry/string/feedback_login
 	value = "root"
 	protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN
 
-CONFIG_DEF(string/feedback_password)
+/datum/config_entry/string/feedback_password
 	protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN
 
-CONFIG_DEF(string/feedback_tableprefix)
+/datum/config_entry/string/feedback_tableprefix
 	protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN
diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm
index b04d7845f5..4fa6133883 100644
--- a/code/controllers/configuration/entries/game_options.dm
+++ b/code/controllers/configuration/entries/game_options.dm
@@ -1,247 +1,245 @@
-#define CURRENT_RESIDENT_FILE "game_options.txt"
+/datum/config_entry/number_list/repeated_mode_adjust
 
-CONFIG_DEF(number_list/repeated_mode_adjust)
-
-CONFIG_DEF(keyed_number_list/probability)
+/datum/config_entry/keyed_number_list/probability
 
 /datum/config_entry/keyed_number_list/probability/ValidateKeyName(key_name)
 	return key_name in config.modes
 
-CONFIG_DEF(keyed_number_list/max_pop)
+/datum/config_entry/keyed_number_list/max_pop
 
 /datum/config_entry/keyed_number_list/max_pop/ValidateKeyName(key_name)
 	return key_name in config.modes
 
-CONFIG_DEF(keyed_number_list/min_pop)
+/datum/config_entry/keyed_number_list/min_pop
 
 /datum/config_entry/keyed_number_list/min_pop/ValidateKeyName(key_name)
 	return key_name in config.modes
 
-CONFIG_DEF(keyed_flag_list/continuous)	// which roundtypes continue if all antagonists die
+/datum/config_entry/keyed_flag_list/continuous	// which roundtypes continue if all antagonists die
 
 /datum/config_entry/keyed_flag_list/continuous/ValidateKeyName(key_name)
 	return key_name in config.modes
 
-CONFIG_DEF(keyed_flag_list/midround_antag)	// which roundtypes use the midround antagonist system
+/datum/config_entry/keyed_flag_list/midround_antag	// which roundtypes use the midround antagonist system
 
 /datum/config_entry/keyed_flag_list/midround_antag/ValidateKeyName(key_name)
 	return key_name in config.modes
 
-CONFIG_DEF(keyed_string_list/policy)
+/datum/config_entry/keyed_string_list/policy
 
-CONFIG_DEF(number/damage_multiplier)
+/datum/config_entry/number/damage_multiplier
 	value = 1
 	integer = FALSE
 
-CONFIG_DEF(number/minimal_access_threshold)	//If the number of players is larger than this threshold, minimal access will be turned on.
+/datum/config_entry/number/minimal_access_threshold	//If the number of players is larger than this threshold, minimal access will be turned on.
 	min_val = 0
 
-CONFIG_DEF(flag/jobs_have_minimal_access)	//determines whether jobs use minimal access or expanded access.
+/datum/config_entry/flag/jobs_have_minimal_access	//determines whether jobs use minimal access or expanded access.
 
-CONFIG_DEF(flag/assistants_have_maint_access)
+/datum/config_entry/flag/assistants_have_maint_access
 
-CONFIG_DEF(flag/security_has_maint_access)
+/datum/config_entry/flag/security_has_maint_access
 
-CONFIG_DEF(flag/everyone_has_maint_access)
+/datum/config_entry/flag/everyone_has_maint_access
 
-CONFIG_DEF(flag/sec_start_brig)	//makes sec start in brig instead of dept sec posts
+/datum/config_entry/flag/sec_start_brig	//makes sec start in brig instead of dept sec posts
 
-CONFIG_DEF(flag/force_random_names)
+/datum/config_entry/flag/force_random_names
 
-CONFIG_DEF(flag/humans_need_surnames)
+/datum/config_entry/flag/humans_need_surnames
 
-CONFIG_DEF(flag/allow_ai)	// allow ai job
+/datum/config_entry/flag/allow_ai	// allow ai job
 
-CONFIG_DEF(flag/disable_secborg)	// disallow secborg module to be chosen.
+/datum/config_entry/flag/disable_secborg	// disallow secborg module to be chosen.
 
-CONFIG_DEF(flag/disable_peaceborg)
+/datum/config_entry/flag/disable_peaceborg
 
-CONFIG_DEF(number/traitor_scaling_coeff)	//how much does the amount of players get divided by to determine traitors
+/datum/config_entry/number/traitor_scaling_coeff	//how much does the amount of players get divided by to determine traitors
 	value = 6
 	min_val = 1
 
-CONFIG_DEF(number/brother_scaling_coeff)	//how many players per brother team
+/datum/config_entry/number/brother_scaling_coeff	//how many players per brother team
 	value = 25
 	min_val = 1
 
-CONFIG_DEF(number/changeling_scaling_coeff)	//how much does the amount of players get divided by to determine changelings
+/datum/config_entry/number/changeling_scaling_coeff	//how much does the amount of players get divided by to determine changelings
 	value = 6
 	min_val = 1
 
-CONFIG_DEF(number/security_scaling_coeff)	//how much does the amount of players get divided by to determine open security officer positions
+/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
 	min_val = 1
 
-CONFIG_DEF(number/abductor_scaling_coeff)	//how many players per abductor team
+/datum/config_entry/number/abductor_scaling_coeff	//how many players per abductor team
 	value = 15
 	min_val = 1
 
-CONFIG_DEF(number/traitor_objectives_amount)
+/datum/config_entry/number/traitor_objectives_amount
 	value = 2
 	min_val = 0
 
-CONFIG_DEF(number/brother_objectives_amount)
+/datum/config_entry/number/brother_objectives_amount
 	value = 2
 	min_val = 0
 
-CONFIG_DEF(flag/reactionary_explosions)	//If we use reactionary explosions, explosions that react to walls and doors
+/datum/config_entry/flag/reactionary_explosions	//If we use reactionary explosions, explosions that react to walls and doors
 
-CONFIG_DEF(flag/protect_roles_from_antagonist)	//If security and such can be traitor/cult/other
+/datum/config_entry/flag/protect_roles_from_antagonist	//If security and such can be traitor/cult/other
 
-CONFIG_DEF(flag/protect_assistant_from_antagonist)	//If assistants can be traitor/cult/other
+/datum/config_entry/flag/protect_assistant_from_antagonist	//If assistants can be traitor/cult/other
 
-CONFIG_DEF(flag/enforce_human_authority)	//If non-human species are barred from joining as a head of staff
+/datum/config_entry/flag/enforce_human_authority	//If non-human species are barred from joining as a head of staff
 
-CONFIG_DEF(flag/allow_latejoin_antagonists)	// If late-joining players can be traitor/changeling
+/datum/config_entry/flag/allow_latejoin_antagonists	// If late-joining players can be traitor/changeling
 
-CONFIG_DEF(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
+/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
 	min_val = 0
 
-CONFIG_DEF(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
+/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
 	integer = FALSE
 	min_val = 0
 	max_val = 1
 
-CONFIG_DEF(number/shuttle_refuel_delay)
+/datum/config_entry/number/shuttle_refuel_delay
 	value = 12000
 	min_val = 0
 
-CONFIG_DEF(flag/show_game_type_odds)	//if set this allows players to see the odds of each roundtype on the get revision screen
+/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
 
-CONFIG_DEF(keyed_flag_list/roundstart_races)	//races you can play as from the get go.
+/datum/config_entry/keyed_flag_list/roundstart_races	//races you can play as from the get go.
 
-CONFIG_DEF(flag/join_with_mutant_humans)	//players can pick mutant bodyparts for humans before joining the game
+/datum/config_entry/flag/join_with_mutant_humans	//players can pick mutant bodyparts for humans before joining the game
 
-CONFIG_DEF(flag/no_summon_guns)	//No
+/datum/config_entry/flag/no_summon_guns	//No
 
-CONFIG_DEF(flag/no_summon_magic)	//Fun
+/datum/config_entry/flag/no_summon_magic	//Fun
 
-CONFIG_DEF(flag/no_summon_events)	//Allowed
+/datum/config_entry/flag/no_summon_events	//Allowed
 
-CONFIG_DEF(flag/no_intercept_report)	//Whether or not to send a communications intercept report roundstart. This may be overriden by gamemodes.
+/datum/config_entry/flag/no_intercept_report	//Whether or not to send a communications intercept report roundstart. This may be overriden by gamemodes.
 
-CONFIG_DEF(number/arrivals_shuttle_dock_window)	//Time from when a player late joins on the arrivals shuttle to when the shuttle docks on the station
+/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
 	min_val = 30
 
-CONFIG_DEF(flag/arrivals_shuttle_require_undocked)	//Require the arrivals shuttle to be undocked before latejoiners can join
+/datum/config_entry/flag/arrivals_shuttle_require_undocked	//Require the arrivals shuttle to be undocked before latejoiners can join
 
-CONFIG_DEF(flag/arrivals_shuttle_require_safe_latejoin)	//Require the arrivals shuttle to be operational in order for latejoiners to join
+/datum/config_entry/flag/arrivals_shuttle_require_safe_latejoin	//Require the arrivals shuttle to be operational in order for latejoiners to join
 
-CONFIG_DEF(string/alert_green)
+/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_DEF(string/alert_blue_upto)
+/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_DEF(string/alert_blue_downto)
+/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_DEF(string/alert_red_upto)
+/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_DEF(string/alert_red_downto)
+/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_DEF(string/alert_delta)
+/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_DEF(flag/revival_pod_plants)
+/datum/config_entry/flag/revival_pod_plants
 
-CONFIG_DEF(flag/revival_cloning)
+/datum/config_entry/flag/revival_cloning
 
-CONFIG_DEF(number/revival_brain_life)
+/datum/config_entry/number/revival_brain_life
 	value = -1
 	min_val = -1
 
-CONFIG_DEF(flag/rename_cyborg)
+/datum/config_entry/flag/rename_cyborg
 
-CONFIG_DEF(flag/ooc_during_round)
+/datum/config_entry/flag/ooc_during_round
 
-CONFIG_DEF(flag/emojis)
+/datum/config_entry/flag/emojis
 
-CONFIG_DEF(number/run_delay)	//Used for modifying movement speed for mobs.
+/datum/config_entry/number/run_delay	//Used for modifying movement speed for mobs.
 	var/static/value_cache = 0
 
-CONFIG_TWEAK(number/run_delay/ValidateAndSet())
+/datum/config_entry/number/run_delay/ValidateAndSet()
 	. = ..()
 	if(.)
 		value_cache = value
 
-CONFIG_DEF(number/walk_delay)
+/datum/config_entry/number/walk_delay
 	var/static/value_cache = 0
 
-CONFIG_TWEAK(number/walk_delay/ValidateAndSet())
+/datum/config_entry/number/walk_delay/ValidateAndSet()
 	. = ..()
 	if(.)
 		value_cache = value
 
-CONFIG_DEF(number/human_delay)	//Mob specific modifiers. NOTE: These will affect different mob types in different ways
-CONFIG_DEF(number/robot_delay)
-CONFIG_DEF(number/monkey_delay)
-CONFIG_DEF(number/alien_delay)
-CONFIG_DEF(number/slime_delay)
-CONFIG_DEF(number/animal_delay)
+/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
+/datum/config_entry/number/monkey_delay
+/datum/config_entry/number/alien_delay
+/datum/config_entry/number/slime_delay
+/datum/config_entry/number/animal_delay
 
-CONFIG_DEF(number/gateway_delay)	//How long the gateway takes before it activates. Default is half an hour.
+/datum/config_entry/number/gateway_delay	//How long the gateway takes before it activates. Default is half an hour.
 	value = 18000
 	min_val = 0
 
-CONFIG_DEF(flag/ghost_interaction)
+/datum/config_entry/flag/ghost_interaction
 
-CONFIG_DEF(flag/silent_ai)
-CONFIG_DEF(flag/silent_borg)
+/datum/config_entry/flag/silent_ai
+/datum/config_entry/flag/silent_borg
 
-CONFIG_DEF(flag/sandbox_autoclose)	// close the sandbox panel after spawning an item, potentially reducing griff
+/datum/config_entry/flag/sandbox_autoclose	// close the sandbox panel after spawning an item, potentially reducing griff
 
-CONFIG_DEF(number/default_laws) //Controls what laws the AI spawns with.
+/datum/config_entry/number/default_laws //Controls what laws the AI spawns with.
 	value = 0
 	min_val = 0
 	max_val = 3
 
-CONFIG_DEF(number/silicon_max_law_amount)
+/datum/config_entry/number/silicon_max_law_amount
 	value = 12
 	min_val = 0
 
-CONFIG_DEF(keyed_flag_list/random_laws)
+/datum/config_entry/keyed_flag_list/random_laws
 
-CONFIG_DEF(keyed_number_list/law_weight)
+/datum/config_entry/keyed_number_list/law_weight
 	splitter = ","
 
-CONFIG_DEF(number/assistant_cap)
+/datum/config_entry/number/assistant_cap
 	value = -1
 	min_val = -1
 
-CONFIG_DEF(flag/starlight)
-CONFIG_DEF(flag/grey_assistants)
+/datum/config_entry/flag/starlight
+/datum/config_entry/flag/grey_assistants
 
-CONFIG_DEF(number/lavaland_budget)
+/datum/config_entry/number/lavaland_budget
 	value = 60
 	min_val = 0
 
-CONFIG_DEF(number/space_budget)
+/datum/config_entry/number/space_budget
 	value = 16
 	min_val = 0
 
-CONFIG_DEF(flag/allow_random_events)	// Enables random events mid-round when set
+/datum/config_entry/flag/allow_random_events	// Enables random events mid-round when set
 
-CONFIG_DEF(number/events_min_time_mul)	// Multipliers for random events minimal starting time and minimal players amounts
+/datum/config_entry/number/events_min_time_mul	// Multipliers for random events minimal starting time and minimal players amounts
 	value = 1
 	min_val = 0
 	integer = FALSE
 
-CONFIG_DEF(number/events_min_players_mul)
+/datum/config_entry/number/events_min_players_mul
 	value = 1
 	min_val = 0
 	integer = FALSE
 
-CONFIG_DEF(number/mice_roundstart)
+/datum/config_entry/number/mice_roundstart
 	value = 10
 	min_val = 0
 
-CONFIG_DEF(number/bombcap)
+/datum/config_entry/number/bombcap
 	value = 14
 	min_val = 4
 
@@ -258,9 +256,9 @@ CONFIG_DEF(flag/allow_extended_miscreants)
 		GLOB.MAX_EX_FLASH_RANGE = value
 		GLOB.MAX_EX_FLAME_RANGE = value
 
-CONFIG_DEF(number/emergency_shuttle_autocall_threshold)
+/datum/config_entry/number/emergency_shuttle_autocall_threshold
 	min_val = 0
 	max_val = 1
 	integer = FALSE
 
-CONFIG_DEF(flag/ic_printing)
+/datum/config_entry/flag/ic_printing
diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm
new file mode 100644
index 0000000000..637e65c46f
--- /dev/null
+++ b/code/controllers/configuration/entries/general.dm
@@ -0,0 +1,388 @@
+/datum/config_entry/flag/autoadmin  // if autoadmin is enabled
+	protection = CONFIG_ENTRY_LOCKED
+
+/datum/config_entry/string/autoadmin_rank	// the rank for autoadmins
+	value = "Game Master"
+	protection = CONFIG_ENTRY_LOCKED
+
+/datum/config_entry/string/servername	// server name (the name of the game window)
+
+/datum/config_entry/string/serversqlname	// short form server name used for the DB
+
+/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
+	min_val = 0
+
+/datum/config_entry/number/round_end_countdown	// Post round murder death kill countdown
+	value = 25
+	min_val = 0
+
+/datum/config_entry/flag/hub	// if the game appears on the hub or not
+
+/datum/config_entry/flag/log_ooc	// log OOC channel
+
+/datum/config_entry/flag/log_access	// log login/logout
+
+/datum/config_entry/flag/log_say	// log client say
+
+/datum/config_entry/flag/log_admin	// log admin actions
+	protection = CONFIG_ENTRY_LOCKED
+
+/datum/config_entry/flag/log_prayer	// log prayers
+
+/datum/config_entry/flag/log_law	// log lawchanges
+
+/datum/config_entry/flag/log_game	// log game events
+
+/datum/config_entry/flag/log_vote	// log voting
+
+/datum/config_entry/flag/log_whisper	// log client whisper
+
+/datum/config_entry/flag/log_attack	// log attack messages
+
+/datum/config_entry/flag/log_emote	// log emotes
+
+/datum/config_entry/flag/log_adminchat	// log admin chat messages
+	protection = CONFIG_ENTRY_LOCKED
+
+/datum/config_entry/flag/log_pda	// log pda messages
+
+/datum/config_entry/flag/log_twitter	// log certain expliotable parrots and other such fun things in a JSON file of twitter valid phrases.
+
+/datum/config_entry/flag/log_world_topic	// log all world.Topic() calls
+
+/datum/config_entry/flag/log_manifest	// log crew manifest to seperate file
+
+/datum/config_entry/flag/allow_admin_ooccolor	// Allows admins with relevant permissions to have their own ooc colour
+
+/datum/config_entry/flag/allow_vote_restart	// allow votes to restart
+
+/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
+	min_val = 0
+
+/datum/config_entry/number/vote_period  // length of voting period (deciseconds, default 1 minute)
+	value = 600
+	min_val = 0
+
+/datum/config_entry/flag/default_no_vote	// vote does not default to nochange/norestart
+
+/datum/config_entry/flag/no_dead_vote	// dead people can't vote
+
+/datum/config_entry/flag/allow_metadata	// Metadata is supported.
+
+/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
+	min_val = 1
+	max_val = 100   //byond will start crapping out at 50, so this is just ridic
+	var/sync_validate = FALSE
+
+/datum/config_entry/number/fps/ValidateAndSet(str_val)
+	. = ..()
+	if(.)
+		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)
+		sync_validate = FALSE
+
+/datum/config_entry/number/ticklag
+	integer = FALSE
+	var/sync_validate = FALSE
+
+/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)
+	..()
+
+/datum/config_entry/number/ticklag/ValidateAndSet(str_val)
+	. = text2num(str_val) > 0 && ..()
+	if(.)
+		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)
+		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
+	min_val = 0 //oranges warned us
+	integer = FALSE
+
+/datum/config_entry/flag/admin_legacy_system	//Defines whether the server uses the legacy admin system with admins.txt or the SQL system
+	protection = CONFIG_ENTRY_LOCKED
+
+/datum/config_entry/string/hostedby
+
+/datum/config_entry/flag/norespawn
+
+/datum/config_entry/flag/guest_jobban
+
+/datum/config_entry/flag/usewhitelist
+
+/datum/config_entry/flag/ban_legacy_system	//Defines whether the server uses the legacy banning system with the files in /data or the SQL system.
+	protection = CONFIG_ENTRY_LOCKED
+
+/datum/config_entry/flag/use_age_restriction_for_jobs	//Do jobs use account age restrictions? --requires database
+
+/datum/config_entry/flag/use_account_age_for_jobs	//Uses the time they made the account for the job restriction stuff. New player joining alerts should be unaffected.
+
+/datum/config_entry/flag/use_exp_tracking
+
+/datum/config_entry/flag/use_exp_restrictions_heads
+
+/datum/config_entry/number/use_exp_restrictions_heads_hours
+	value = 0
+	min_val = 0
+
+/datum/config_entry/flag/use_exp_restrictions_heads_department
+
+/datum/config_entry/flag/use_exp_restrictions_other
+
+/datum/config_entry/flag/use_exp_restrictions_admin_bypass
+
+/datum/config_entry/string/server
+
+/datum/config_entry/string/banappeals
+
+/datum/config_entry/string/wikiurl
+	value = "http://www.tgstation13.org/wiki"
+
+/datum/config_entry/string/forumurl
+	value = "http://tgstation13.org/phpBB/index.php"
+
+/datum/config_entry/string/rulesurl
+	value = "http://www.tgstation13.org/wiki/Rules"
+
+/datum/config_entry/string/githuburl
+	value = "https://www.github.com/tgstation/-tg-station"
+
+/datum/config_entry/number/githubrepoid
+	value = null
+	min_val = 0
+
+/datum/config_entry/flag/guest_ban
+
+/datum/config_entry/number/id_console_jobslot_delay
+	value = 30
+	min_val = 0
+
+/datum/config_entry/number/inactivity_period	//time in ds until a player is considered inactive
+	value = 3000
+	min_val = 0
+
+/datum/config_entry/number/inactivity_period/ValidateAndSet(str_val)
+	. = ..()
+	if(.)
+		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
+	min_val = 0
+
+/datum/config_entry/number/afk_period/ValidateAndSet(str_val)
+	. = ..()
+	if(.)
+		value *= 10 //documented as seconds in config.txt
+
+/datum/config_entry/flag/kick_inactive	//force disconnect for inactive players
+
+/datum/config_entry/flag/load_jobs_from_txt
+
+/datum/config_entry/flag/forbid_singulo_possession
+
+/datum/config_entry/flag/automute_on	//enables automuting/spam prevention
+
+/datum/config_entry/string/panic_server_name
+
+/datum/config_entry/string/panic_server_name/ValidateAndSet(str_val)
+	return str_val != "\[Put the name here\]" && ..()
+
+/datum/config_entry/string/panic_server_address	//Reconnect a player this linked server if this server isn't accepting new players
+
+/datum/config_entry/string/panic_server_address/ValidateAndSet(str_val)
+	return str_val != "byond://address:port" && ..()
+
+/datum/config_entry/string/invoke_youtubedl
+	protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN
+
+/datum/config_entry/flag/show_irc_name
+
+/datum/config_entry/flag/see_own_notes	//Can players see their own admin notes
+
+/datum/config_entry/number/note_fresh_days
+	value = null
+	min_val = 0
+	integer = FALSE
+
+/datum/config_entry/number/note_stale_days
+	value = null
+	min_val = 0
+	integer = FALSE
+
+/datum/config_entry/flag/maprotation
+
+/datum/config_entry/number/maprotatechancedelta
+	value = 0.75
+	min_val = 0
+	max_val = 1
+	integer = FALSE
+
+/datum/config_entry/number/soft_popcap
+	value = null
+	min_val = 0
+
+/datum/config_entry/number/hard_popcap
+	value = null
+	min_val = 0
+
+/datum/config_entry/number/extreme_popcap
+	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."
+
+/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."
+
+/datum/config_entry/string/extreme_popcap_message
+	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
+
+/datum/config_entry/number/notify_new_player_age	// how long do we notify admins of a new player
+	min_val = -1
+
+/datum/config_entry/number/notify_new_player_account_age	// how long do we notify admins of a new byond account
+	min_val = 0
+
+/datum/config_entry/flag/irc_first_connection_alert	// do we notify the irc channel when somebody is connecting for the first time?
+
+/datum/config_entry/flag/check_randomizer
+
+/datum/config_entry/string/ipintel_email
+
+/datum/config_entry/string/ipintel_email/ValidateAndSet(str_val)
+	return str_val != "ch@nge.me" && ..()
+
+/datum/config_entry/number/ipintel_rating_bad
+	value = 1
+	integer = FALSE
+	min_val = 0
+	max_val = 1
+
+/datum/config_entry/number/ipintel_save_good
+	value = 12
+	min_val = 0
+
+/datum/config_entry/number/ipintel_save_bad
+	value = 1
+	min_val = 0
+
+/datum/config_entry/string/ipintel_domain
+	value = "check.getipintel.net"
+
+/datum/config_entry/flag/aggressive_changelog
+
+/datum/config_entry/flag/autoconvert_notes	//if all connecting player's notes should attempt to be converted to the database
+	protection = CONFIG_ENTRY_LOCKED
+
+/datum/config_entry/flag/allow_webclient
+
+/datum/config_entry/flag/webclient_only_byond_members
+
+/datum/config_entry/flag/announce_admin_logout
+
+/datum/config_entry/flag/announce_admin_login
+
+/datum/config_entry/flag/allow_map_voting
+
+/datum/config_entry/flag/generate_minimaps
+
+/datum/config_entry/number/client_warn_version
+	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."
+
+/datum/config_entry/flag/client_warn_popup
+
+/datum/config_entry/number/client_error_version
+	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."
+
+/datum/config_entry/number/minute_topic_limit
+	value = null
+	min_val = 0
+
+/datum/config_entry/number/second_topic_limit
+	value = null
+	min_val = 0
+
+/datum/config_entry/number/error_cooldown	// The "cooldown" time for each occurrence of a unique error
+	value = 600
+	min_val = 0
+
+/datum/config_entry/number/error_limit	// How many occurrences before the next will silence them
+	value = 50
+
+/datum/config_entry/number/error_silence_time	// How long a unique error will be silenced for
+	value = 6000
+
+/datum/config_entry/number/error_msg_delay	// How long to wait between messaging admins about occurrences of a unique error
+	value = 50
+
+/datum/config_entry/flag/irc_announce_new_game
+
+/datum/config_entry/flag/debug_admin_hrefs
+
+/datum/config_entry/number/mc_tick_rate/base_mc_tick_rate
+	integer = FALSE
+	value = 1
+
+/datum/config_entry/number/mc_tick_rate/high_pop_mc_tick_rate
+	integer = FALSE
+	value = 1.1
+
+/datum/config_entry/number/mc_tick_rate/high_pop_mc_mode_amount
+	value = 65
+
+/datum/config_entry/number/mc_tick_rate/disable_high_pop_mc_mode_amount
+	value = 60
+
+/datum/config_entry/number/mc_tick_rate
+	abstract_type = /datum/config_entry/number/mc_tick_rate
+
+/datum/config_entry/number/mc_tick_rate/ValidateAndSet(str_val)
+	. = ..()
+	if (.)
+		Master.UpdateTickRate()
+
+/datum/config_entry/flag/resume_after_initializations
+
+/datum/config_entry/flag/resume_after_initializations/ValidateAndSet(str_val)
+	. = ..()
+	if(. && Master.current_runlevel)
+		world.sleep_offline = !value
+
+/datum/config_entry/number/rounds_until_hard_restart
+	value = -1
+	min_val = 0
+
+/datum/config_entry/string/default_view
+	value = "15x15"
diff --git a/config/config.txt b/config/config.txt
index fb648a5fa9..e43b38b568 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -1,3 +1,9 @@
+# You can use the "$include" directive to split your configs however you want
+
+$include game_options.txt
+$include dbconfig.txt
+$include comms.txt
+
 # You can use the @ character at the beginning of a config option to lock it from being edited in-game
 # Example usage:
 # @SERVERNAME tgstation
diff --git a/tgstation.dme b/tgstation.dme
index 11399a1b14..cfe9e0d0c5 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -224,9 +224,9 @@
 #include "code\controllers\configuration\config_entry.dm"
 #include "code\controllers\configuration\configuration.dm"
 #include "code\controllers\configuration\entries\comms.dm"
-#include "code\controllers\configuration\entries\config.dm"
 #include "code\controllers\configuration\entries\dbconfig.dm"
 #include "code\controllers\configuration\entries\game_options.dm"
+#include "code\controllers\configuration\entries\general.dm"
 #include "code\controllers\subsystem\acid.dm"
 #include "code\controllers\subsystem\air.dm"
 #include "code\controllers\subsystem\assets.dm"