merge conflict fix

code/modules/admin/DB_ban/functions.dm

@@ -362,6 +362,7 @@
 
 	output += "<form method='GET' action='?src=\ref[src]'><b>Add custom ban:</b> (ONLY use this if you can't ban through any other method)"
 	output += "<input type='hidden' name='src' value='\ref[src]'>"
+	output += HrefTokenFormField()
 	output += "<table width='100%'><tr>"
 	output += "<td><b>Ban type:</b><select name='dbbanaddtype'>"
 	output += "<option value=''>--</option>"
@@ -395,6 +396,7 @@
 
 	output += "<form method='GET' action='?src=\ref[src]'><b>Search:</b> "
 	output += "<input type='hidden' name='src' value='\ref[src]'>"
+	output += HrefTokenFormField()
 	output += "<b>Ckey:</b> <input type='text' name='dbsearchckey' value='[playerckey]'>"
 	output += "<b>Admin ckey:</b> <input type='text' name='dbsearchadmin' value='[adminckey]'>"
 	output += "<input type='submit' value='search'>"

code/modules/admin/IsBanned.dm

@@ -20,7 +20,7 @@
 		admin = 1
 
 	//Whitelist
-	if(config.usewhitelist)
+	if(CONFIG_GET(flag/usewhitelist))
 		if(!check_whitelist(ckey(key)))
 			if (admin)
 				log_admin("The admin [key] has been allowed to bypass the whitelist")
@@ -32,19 +32,20 @@
 
 	//Guest Checking
 	if(IsGuestKey(key))
-		if (!GLOB.guests_allowed)
+		if (CONFIG_GET(flag/guest_ban))
 			log_access("Failed Login: [key] - Guests not allowed")
 			return list("reason"="guest", "desc"="\nReason: Guests not allowed. Please sign in with a byond account.")
-		if (config.panic_bunker && SSdbcore && SSdbcore.IsConnected())
+		if (CONFIG_GET(flag/panic_bunker) && SSdbcore.Connect())
 			log_access("Failed Login: [key] - Guests not allowed during panic bunker")
 			return list("reason"="guest", "desc"="\nReason: Sorry but the server is currently not accepting connections from never before seen players or guests. If you have played on this server with a byond account before, please log in to the byond account you have played from.")
 
 	//Population Cap Checking
-	if(config.extreme_popcap && living_player_count() >= config.extreme_popcap && !admin)
+	var/extreme_popcap = CONFIG_GET(number/extreme_popcap)
+	if(extreme_popcap && living_player_count() >= extreme_popcap && !admin)
 		log_access("Failed Login: [key] - Population cap reached")
-		return list("reason"="popcap", "desc"= "\nReason: [config.extreme_popcap_message]")
+		return list("reason"="popcap", "desc"= "\nReason: [CONFIG_GET(string/extreme_popcap_message)]")
 
-	if(config.ban_legacy_system)
+	if(CONFIG_GET(flag/ban_legacy_system))
 
 		//Ban Checking
 		. = CheckBan( ckey(key), computer_id, address )

code/modules/admin/NewBan.dm

@@ -11,8 +11,9 @@ GLOBAL_PROTECT(Banlist)
 
 	. = list()
 	var/appeal
-	if(config && config.banappeals)
-		appeal = "\nFor more information on your ban, or to appeal, head to <a href='[config.banappeals]'>[config.banappeals]</a>"
+	var/bran = CONFIG_GET(string/banappeals)
+	if(bran)
+		appeal = "\nFor more information on your ban, or to appeal, head to <a href='[bran]'>[bran]</a>"
 	GLOB.Banlist.cd = "/base"
 	if( "[ckey][id]" in GLOB.Banlist.dir )
 		GLOB.Banlist.cd = "[ckey][id]"

code/modules/admin/admin.dm

@@ -31,7 +31,7 @@
 	if(M.client)
 		body += " played by <b>[M.client]</b> "
 		body += "\[<A href='?_src_=holder;[HrefToken()];editrights=rank;ckey=[M.ckey]'>[M.client.holder ? M.client.holder.rank : "Player"]</A>\]"
-		if(config.use_exp_tracking)
+		if(CONFIG_GET(flag/use_exp_tracking))
 			body += "\[<A href='?_src_=holder;[HrefToken()];getplaytimewindow=\ref[M]'>" + M.client.get_exp_living() + "</a>\]"
 
 	if(isnewplayer(M))
@@ -380,8 +380,6 @@
 		else
 			dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com"
 
-	//to_chat(world, "Channelname: [src.admincaster_feed_channel.channel_name] [src.admincaster_feed_channel.author]")
-	//to_chat(world, "Msg: [src.admincaster_feed_message.author] [src.admincaster_feed_message.body]")
 	usr << browse(dat, "window=admincaster_main;size=400x600")
 	onclose(usr, "admincaster_main")
 
@@ -423,8 +421,8 @@
 		return
 
 	var/list/options = list("Regular Restart", "Hard Restart (No Delay/Feeback Reason)", "Hardest Restart (No actions, just reboot)")
-	if(world.RunningService())
-		options += "Service Restart (Force restart DD)";
+	if(SERVER_TOOLS_PRESENT)
+		options += "Server Restart (Kill and restart DD)";
 
 	var/rebootconfirm
 	if(SSticker.admin_delay_notice)
@@ -433,19 +431,22 @@
 	else
 		rebootconfirm = TRUE
 	if(rebootconfirm)
-		var result = input(usr, "Select reboot method", "World Reboot", options[1]) as null|anything in options
+		var/result = input(usr, "Select reboot method", "World Reboot", options[1]) as null|anything in options
 		if(result)
 			SSblackbox.add_details("admin_verb","Reboot World") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+			var/init_by = "Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]."
 			switch(result)
 				if("Regular Restart")
-					SSticker.Reboot("Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key].", "admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]", 10)
+					SSticker.Reboot(init_by, "admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]", 10)
 				if("Hard Restart (No Delay, No Feeback Reason)")
+					to_chat(world, "World reboot - [init_by]")
 					world.Reboot()
 				if("Hardest Restart (No actions, just reboot)")
+					to_chat(world, "Hard world reboot - [init_by]")
 					world.Reboot(fast_track = TRUE)
-				if("Service Restart (Force restart DD)")
-					GLOB.reboot_mode = REBOOT_MODE_HARD
-					world.ServiceReboot()
+				if("Server Restart (Kill and restart DD)")
+					to_chat(world, "Server restart - [init_by]")
+					SERVER_TOOLS_REBOOT_BYOND
 
 /datum/admins/proc/end_round()
 	set category = "Server"
@@ -557,28 +558,30 @@
 	set category = "Server"
 	set desc="People can't be AI"
 	set name="Toggle AI"
-	config.allow_ai = !( config.allow_ai )
-	if (!( config.allow_ai ))
+	var/alai = CONFIG_GET(flag/allow_ai)
+	CONFIG_SET(flag/allow_ai, !alai)
+	if (alai)
 		to_chat(world, "<B>The AI job is no longer chooseable.</B>")
 	else
 		to_chat(world, "<B>The AI job is chooseable now.</B>")
 	log_admin("[key_name(usr)] toggled AI allowed.")
 	world.update_status()
-	SSblackbox.add_details("admin_toggle","Toggle AI|[config.allow_ai]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	SSblackbox.add_details("admin_toggle","Toggle AI|[!alai]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /datum/admins/proc/toggleaban()
 	set category = "Server"
 	set desc="Respawn basically"
 	set name="Toggle Respawn"
-	GLOB.abandon_allowed = !( GLOB.abandon_allowed )
-	if (GLOB.abandon_allowed)
+	var/new_nores = !CONFIG_GET(flag/norespawn)
+	CONFIG_SET(flag/norespawn, new_nores)
+	if (!new_nores)
 		to_chat(world, "<B>You may now respawn.</B>")
 	else
 		to_chat(world, "<B>You may no longer respawn :(</B>")
-	message_admins("<span class='adminnotice'>[key_name_admin(usr)] toggled respawn to [GLOB.abandon_allowed ? "On" : "Off"].</span>")
-	log_admin("[key_name(usr)] toggled respawn to [GLOB.abandon_allowed ? "On" : "Off"].")
+	message_admins("<span class='adminnotice'>[key_name_admin(usr)] toggled respawn to [!new_nores ? "On" : "Off"].</span>")
+	log_admin("[key_name(usr)] toggled respawn to [!new_nores ? "On" : "Off"].")
 	world.update_status()
-	SSblackbox.add_details("admin_toggle","Toggle Respawn|[GLOB.abandon_allowed]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	SSblackbox.add_details("admin_toggle","Toggle Respawn|[!new_nores]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /datum/admins/proc/delay()
 	set category = "Server"
@@ -685,14 +688,15 @@
 	set category = "Server"
 	set desc="Guests can't enter"
 	set name="Toggle guests"
-	GLOB.guests_allowed = !( GLOB.guests_allowed )
-	if (!( GLOB.guests_allowed ))
+	var/new_guest_ban = !CONFIG_GET(flag/guest_ban)
+	CONFIG_SET(flag/guest_ban, new_guest_ban)
+	if (new_guest_ban)
 		to_chat(world, "<B>Guests may no longer enter the game.</B>")
 	else
 		to_chat(world, "<B>Guests may now enter the game.</B>")
-	log_admin("[key_name(usr)] toggled guests game entering [GLOB.guests_allowed?"":"dis"]allowed.")
-	message_admins("<span class='adminnotice'>[key_name_admin(usr)] toggled guests game entering [GLOB.guests_allowed?"":"dis"]allowed.</span>")
-	SSblackbox.add_details("admin_toggle","Toggle Guests|[GLOB.guests_allowed]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	log_admin("[key_name(usr)] toggled guests game entering [!new_guest_ban ? "" : "dis"]allowed.")
+	message_admins("<span class='adminnotice'>[key_name_admin(usr)] toggled guests game entering [!new_guest_ban ? "" : "dis"]allowed.</span>")
+	SSblackbox.add_details("admin_toggle","Toggle Guests|[!new_guest_ban]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /datum/admins/proc/output_ai_laws()
 	var/ai_number = 0
@@ -830,10 +834,10 @@
 /client/proc/adminGreet(logout)
 	if(SSticker.HasRoundStarted())
 		var/string
-		if(logout && config && config.announce_admin_logout)
+		if(logout && CONFIG_GET(flag/announce_admin_logout))
 			string = pick(
 				"Admin logout: [key_name(src)]")
-		else if(!logout && config && config.announce_admin_login && (prefs.toggles & ANNOUNCE_LOGIN))
+		else if(!logout && CONFIG_GET(flag/announce_admin_login) && (prefs.toggles & ANNOUNCE_LOGIN))
 			string = pick(
 				"Admin login: [key_name(src)]")
 		if(string)

code/modules/admin/admin_ranks.dm

@@ -117,7 +117,7 @@ GLOBAL_PROTECT(admin_ranks)
 		return
 	GLOB.admin_ranks.Cut()
 
-	if(config.admin_legacy_system)
+	if(CONFIG_GET(flag/admin_legacy_system))
 		var/previous_rights = 0
 		//load text from file and process each line separately
 		for(var/line in world.file2list("config/admin_ranks.txt"))
@@ -143,7 +143,7 @@ GLOBAL_PROTECT(admin_ranks)
 		if(!SSdbcore.Connect())
 			log_world("Failed to connect to database in load_admin_ranks(). Reverting to legacy system.")
 			WRITE_FILE(GLOB.world_game_log, "Failed to connect to database in load_admin_ranks(). Reverting to legacy system.")
-			config.admin_legacy_system = 1
+			CONFIG_SET(flag/admin_legacy_system, TRUE)
 			load_admin_ranks()
 			return
 
@@ -191,7 +191,7 @@ GLOBAL_PROTECT(admin_ranks)
 	for(var/datum/admin_rank/R in GLOB.admin_ranks)
 		rank_names[R.name] = R
 
-	if(config.admin_legacy_system)
+	if(CONFIG_GET(flag/admin_legacy_system))
 		//load text from file
 		var/list/lines = world.file2list("config/admins.txt")
 
@@ -214,14 +214,12 @@ GLOBAL_PROTECT(admin_ranks)
 			var/datum/admins/D = new(rank_names[rank], ckey)	//create the admin datum and store it for later use
 			if(!D)
 				continue									//will occur if an invalid rank is provided
-			if(D.rank.rights & R_DEBUG) //grant profile access
-				world.SetConfig("APP/admin", ckey, "role=admin")
 			D.associate(GLOB.directory[ckey])	//find the client for a ckey if they are connected and associate them with the new admin datum
 	else
 		if(!SSdbcore.Connect())
 			log_world("Failed to connect to database in load_admins(). Reverting to legacy system.")
 			WRITE_FILE(GLOB.world_game_log, "Failed to connect to database in load_admins(). Reverting to legacy system.")
-			config.admin_legacy_system = 1
+			CONFIG_SET(flag/admin_legacy_system, TRUE)
 			load_admins()
 			return
 

code/modules/admin/admin_verbs.dm

@@ -27,6 +27,7 @@ GLOBAL_LIST_INIT(admin_verbs_admin, world.AVerbsAdmin())
 	/client/proc/invisimin,				/*allows our mob to go invisible/visible*/
 //	/datum/admins/proc/show_traitor_panel,	/*interface which shows a mob's mind*/ -Removed due to rare practical use. Moved to debug verbs ~Errorage
 	/datum/admins/proc/show_player_panel,	/*shows an interface for individual players, with various links (links require additional flags*/
+	/datum/verbs/menu/Admin/verb/playerpanel,
 	/client/proc/game_panel,			/*game panel, allows to change game-mode etc*/
 	/client/proc/check_ai_laws,			/*shows AI and borg laws*/
 	/datum/admins/proc/toggleooc,		/*toggles ooc on/off for everyone*/
@@ -261,7 +262,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list(
 			verbs += GLOB.admin_verbs_poll
 		if(rights & R_SOUNDS)
 			verbs += GLOB.admin_verbs_sounds
-			if(config.invoke_youtubedl)
+			if(CONFIG_GET(string/invoke_youtubedl))
 				verbs += /client/proc/play_web_sound
 		if(rights & R_SPAWN)
 			verbs += GLOB.admin_verbs_spawn
@@ -398,7 +399,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list(
 	set name = "Unban Panel"
 	set category = "Admin"
 	if(holder)
-		if(config.ban_legacy_system)
+		if(CONFIG_GET(flag/ban_legacy_system))
 			holder.unbanpanel()
 		else
 			holder.DB_ban_panel()

code/modules/admin/chat_commands.dm

@@ -0,0 +1,76 @@
+#define IRC_STATUS_THROTTLE 5
+
+/datum/server_tools_command/ircstatus
+	name = "status"
+	help_text = "Gets the admincount, playercount, gamemode, and true game mode of the server"
+	admin_only = TRUE
+	var/static/last_irc_status = 0
+
+/datum/server_tools_command/ircstatus/Run(sender, params)
+	var/rtod = REALTIMEOFDAY
+	if(rtod - last_irc_status < IRC_STATUS_THROTTLE)
+		return
+	last_irc_status = rtod
+	var/list/adm = get_admin_counts()
+	var/list/allmins = adm["total"]
+	var/status = "Admins: [allmins.len] (Active: [english_list(adm["present"])] AFK: [english_list(adm["afk"])] Stealth: [english_list(adm["stealth"])] Skipped: [english_list(adm["noflags"])]). "
+	status += "Players: [GLOB.clients.len] (Active: [get_active_player_count(0,1,0)]). Mode: [SSticker.mode ? SSticker.mode.name : "Not started"]."
+	return status
+
+/datum/server_tools_command/irccheck
+	name = "check"
+	help_text = "Gets the playercount, gamemode, and address of the server"
+	var/static/last_irc_check = 0
+
+/datum/server_tools_command/irccheck/Run(sender, params)
+	var/rtod = REALTIMEOFDAY
+	if(rtod - last_irc_check < IRC_STATUS_THROTTLE)
+		return
+	last_irc_check = rtod
+	var/server = CONFIG_GET(string/server)
+	return "[GLOB.round_id ? "Round #[GLOB.round_id]: " : ""][GLOB.clients.len] players on [SSmapping.config.map_name], Mode: [GLOB.master_mode]; Round [SSticker.HasRoundStarted() ? (SSticker.IsRoundInProgress() ? "Active" : "Finishing") : "Starting"] -- [server ? server : "[world.internet_address]:[world.port]"]" 
+
+/datum/server_tools_command/ahelp
+	name = "ahelp"
+	help_text = "<ckey> <message|ticket <close|resolve|icissue|reject|reopen <ticket #>|list>>"
+	required_parameters = 2
+	admin_only = TRUE
+
+/datum/server_tools_command/ahelp/Run(sender, params)
+	var/list/all_params = splittext(params, " ")
+	var/target = all_params[1]
+	all_params.Cut(1, 2)
+	return IrcPm(target, all_params.Join(" "), sender)
+
+/datum/server_tools_command/namecheck
+	name = "namecheck"
+	help_text = "Returns info on the specified target"
+	required_parameters = 1
+	admin_only = TRUE
+
+/datum/server_tools_command/namecheck/Run(sender, params)
+	log_admin("IRC Name Check: [sender] on [params]")
+	message_admins("IRC name checking on [params] from [sender]")
+	return keywords_lookup(params, 1)
+
+/datum/server_tools_command/adminwho
+	name = "adminwho"
+	help_text = "Lists administrators currently on the server"
+	admin_only = TRUE
+
+/datum/server_tools_command/adminwho/Run(sender, params)
+	return ircadminwho()
+
+GLOBAL_LIST(round_end_notifiees)
+
+/datum/server_tools_command/notify
+	name = "notify"
+	help_text = "Pings the invoker when the round ends"
+	admin_only = TRUE
+
+/datum/server_tools_command/notify/Run(sender, params)
+	if(!SSticker.IsRoundInProgress() && SSticker.HasRoundStarted())
+		return "[sender], the round has already ended!"
+	LAZYINITLIST(GLOB.round_end_notifiees)
+	GLOB.round_end_notifiees[sender] = TRUE
+	return "I will notify [sender] when the round ends."

code/modules/admin/create_mob.dm

@@ -7,7 +7,7 @@
 		create_mob_html = file2text('html/create_object.html')
 		create_mob_html = replacetext(create_mob_html, "null /* object types */", "\"[mobjs]\"")
 
-	user << browse(replacetext(create_mob_html, "/* ref src */", "\ref[src];[HrefToken()]"), "window=create_mob;size=425x475")
+	user << browse(create_panel_helper(create_mob_html), "window=create_mob;size=425x475")
 
 /proc/randomize_human(mob/living/carbon/human/H)
 	H.gender = pick(MALE, FEMALE)

code/modules/admin/create_object.dm

@@ -1,3 +1,8 @@
+/datum/admins/proc/create_panel_helper(template)
+	var/final_html = replacetext(template, "/* ref src */", "\ref[src];[HrefToken()]")
+	final_html = replacetext(final_html,"/* hreftokenfield */","[HrefTokenFormField()]")
+	return final_html
+
 /datum/admins/proc/create_object(mob/user)
 	var/static/create_object_html = null
 	if (!create_object_html)
@@ -6,7 +11,7 @@
 		create_object_html = file2text('html/create_object.html')
 		create_object_html = replacetext(create_object_html, "null /* object types */", "\"[objectjs]\"")
 
-	user << browse(replacetext(create_object_html, "/* ref src */", "\ref[src];[HrefToken()]"), "window=create_object;size=425x475")
+	user << browse(create_panel_helper(create_object_html), "window=create_object;size=425x475")
 
 /datum/admins/proc/quick_create_object(mob/user)
 	var/static/list/create_object_forms = list(
@@ -23,4 +28,4 @@
 		html_form = replacetext(html_form, "null /* object types */", "\"[objectjs]\"")
 		create_object_forms[path] = html_form
 
-	user << browse(replacetext(html_form, "/* ref src */", "\ref[src];[HrefToken()]"), "window=qco[path];size=425x475")
+	user << browse(create_panel_helper(html_form), "window=qco[path];size=425x475")

code/modules/admin/create_turf.dm

@@ -6,4 +6,4 @@
 		create_turf_html = file2text('html/create_object.html')
 		create_turf_html = replacetext(create_turf_html, "null /* object types */", "\"[turfjs]\"")
 
-	user << browse(replacetext(create_turf_html, "/* ref src */", "\ref[src];[HrefToken()]"), "window=create_turf;size=425x475")
+	user << browse(create_panel_helper(create_turf_html), "window=create_turf;size=425x475")

code/modules/admin/holder2.dm

@@ -34,13 +34,15 @@ GLOBAL_PROTECT(href_token)
 	admin_signature = "Nanotrasen Officer #[rand(0,9)][rand(0,9)][rand(0,9)]"
 	href_token = GenerateToken()
 	GLOB.admin_datums[ckey] = src
+	if(R.rights & R_DEBUG) //grant profile access
+		world.SetConfig("APP/admin", ckey, "role=admin")
 
 /proc/GenerateToken()
 	. = ""
 	for(var/I in 1 to 32)
 		. += "[rand(10)]"
 
-/proc/HrefToken(forceGlobal = FALSE)
+/proc/RawHrefToken(forceGlobal = FALSE)
 	var/tok = GLOB.href_token
 	if(!forceGlobal && usr)
 		var/client/C = usr.client
@@ -49,7 +51,13 @@ GLOBAL_PROTECT(href_token)
 		var/datum/admins/holder = C.holder
 		if(holder)
 			tok = holder.href_token
-	return "admin_token=[tok]"
+	return tok
+
+/proc/HrefToken(forceGlobal = FALSE)
+	return "admin_token=[RawHrefToken(forceGlobal)]"
+
+/proc/HrefTokenFormField(forceGlobal = FALSE)
+	return "<input type='hidden' name='admin_token' value='[RawHrefToken(forceGlobal)]'>"
 
 /datum/admins/proc/associate(client/C)
 	if(IsAdminAdvancedProcCall())

code/modules/admin/ipintel.dm

@@ -14,18 +14,18 @@
 	. = FALSE
 	if (intel < 0)
 		return
-	if (intel <= config.ipintel_rating_bad)
-		if (world.realtime < cacherealtime+(config.ipintel_save_good*60*60*10))
+	if (intel <= CONFIG_GET(number/ipintel_rating_bad))
+		if (world.realtime < cacherealtime + (CONFIG_GET(number/ipintel_save_good) * 60 * 60 * 10))
 			return TRUE
 	else
-		if (world.realtime < cacherealtime+(config.ipintel_save_bad*60*60*10))
+		if (world.realtime < cacherealtime + (CONFIG_GET(number/ipintel_save_bad) * 60 * 60 * 10))
 			return TRUE
 
 /proc/get_ip_intel(ip, bypasscache = FALSE, updatecache = TRUE)
 	var/datum/ipintel/res = new()
 	res.ip = ip
 	. = res
-	if (!ip || !config.ipintel_email || !SSipintel.enabled)
+	if (!ip || !CONFIG_GET(string/ipintel_email) || !SSipintel.enabled)
 		return
 	if (!bypasscache)
 		var/datum/ipintel/cachedintel = SSipintel.cache[ip]
@@ -34,19 +34,20 @@
 			return cachedintel
 
 		if(SSdbcore.Connect())
+			var/rating_bad = CONFIG_GET(number/ipintel_rating_bad)
 			var/datum/DBQuery/query_get_ip_intel = SSdbcore.NewQuery({"
 				SELECT date, intel, TIMESTAMPDIFF(MINUTE,date,NOW())
 				FROM [format_table_name("ipintel")]
 				WHERE
 					ip = INET_ATON('[ip]')
 					AND ((
-							intel < [config.ipintel_rating_bad]
+							intel < [rating_bad]
 							AND
-							date + INTERVAL [config.ipintel_save_good] HOUR > NOW()
+							date + INTERVAL [CONFIG_GET(number/ipintel_save_good)] HOUR > NOW()
 						) OR (
-							intel >= [config.ipintel_rating_bad]
+							intel >= [rating_bad]
 							AND
-							date + INTERVAL [config.ipintel_save_bad] HOUR > NOW()
+							date + INTERVAL [CONFIG_GET(number/ipintel_save_bad)] HOUR > NOW()
 					))
 				"})
 			if(!query_get_ip_intel.Execute())
@@ -77,7 +78,7 @@
 	if (!SSipintel.enabled)
 		return
 
-	var/list/http[] = world.Export("http://[config.ipintel_domain]/check.php?ip=[ip]&contact=[config.ipintel_email]&format=json&flags=f")
+	var/list/http[] = world.Export("http://[CONFIG_GET(string/ipintel_domain)]/check.php?ip=[ip]&contact=[CONFIG_GET(string/ipintel_email)]&format=json&flags=f")
 
 	if (http)
 		var/status = text2num(http["STATUS"])

code/modules/admin/permissionverbs/permissionedit.dm

@@ -51,7 +51,7 @@
 	usr << browse(output,"window=editrights;size=900x650")
 
 /datum/admins/proc/log_admin_rank_modification(adm_ckey, new_rank)
-	if(config.admin_legacy_system)
+	if(CONFIG_GET(flag/admin_legacy_system))
 		return
 
 	if(!usr.client)
@@ -105,7 +105,7 @@
 
 
 /datum/admins/proc/log_admin_permission_modification(adm_ckey, new_permission)
-	if(config.admin_legacy_system)
+	if(CONFIG_GET(flag/admin_legacy_system))
 		return
 	if(!usr.client)
 		return

code/modules/admin/player_panel.dm

@@ -317,7 +317,7 @@
 			dat += "Replacement Game Mode: <B>[SSticker.mode.replacementmode.name]</B><BR>"
 		else
 			dat += "Current Game Mode: <B>[SSticker.mode.name]</B><BR>"
-		dat += "Round Duration: <B>[round(world.time / 36000)]:[add_zero("[world.time / 600 % 60]", 2)]:[world.time / 100 % 6][world.time / 100 % 10]</B><BR>"
+		dat += "Round Duration: <B>[DisplayTimeText(world.time - SSticker.round_start_time)]</B><BR>"
 		dat += "<B>Emergency shuttle</B><BR>"
 		if(EMERGENCY_IDLE_OR_RECALLED)
 			dat += "<a href='?_src_=holder;[HrefToken()];call_shuttle=1'>Call Shuttle</a><br>"
@@ -329,14 +329,14 @@
 			else
 				dat += "ETA: <a href='?_src_=holder;[HrefToken()];edit_shuttle_time=1'>[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]</a><BR>"
 		dat += "<B>Continuous Round Status</B><BR>"
-		dat += "<a href='?_src_=holder;[HrefToken()];toggle_continuous=1'>[config.continuous[SSticker.mode.config_tag] ? "Continue if antagonists die" : "End on antagonist death"]</a>"
-		if(config.continuous[SSticker.mode.config_tag])
-			dat += ", <a href='?_src_=holder;[HrefToken()];toggle_midround_antag=1'>[config.midround_antag[SSticker.mode.config_tag] ? "creating replacement antagonists" : "not creating new antagonists"]</a><BR>"
+		dat += "<a href='?_src_=holder;[HrefToken()];toggle_continuous=1'>[CONFIG_GET(keyed_flag_list/continuous)[SSticker.mode.config_tag] ? "Continue if antagonists die" : "End on antagonist death"]</a>"
+		if(CONFIG_GET(keyed_flag_list/continuous)[SSticker.mode.config_tag])
+			dat += ", <a href='?_src_=holder;[HrefToken()];toggle_midround_antag=1'>[CONFIG_GET(keyed_flag_list/midround_antag)[SSticker.mode.config_tag] ? "creating replacement antagonists" : "not creating new antagonists"]</a><BR>"
 		else
 			dat += "<BR>"
-		if(config.midround_antag[SSticker.mode.config_tag])
-			dat += "Time limit: <a href='?_src_=holder;[HrefToken()];alter_midround_time_limit=1'>[config.midround_antag_time_check] minutes into round</a><BR>"
-			dat += "Living crew limit: <a href='?_src_=holder;[HrefToken()];alter_midround_life_limit=1'>[config.midround_antag_life_check * 100]% of crew alive</a><BR>"
+		if(CONFIG_GET(keyed_flag_list/midround_antag)[SSticker.mode.config_tag])
+			dat += "Time limit: <a href='?_src_=holder;[HrefToken()];alter_midround_time_limit=1'>[CONFIG_GET(number/midround_antag_time_check)] minutes into round</a><BR>"
+			dat += "Living crew limit: <a href='?_src_=holder;[HrefToken()];alter_midround_life_limit=1'>[CONFIG_GET(number/midround_antag_life_check) * 100]% of crew alive</a><BR>"
 			dat += "If limits past: <a href='?_src_=holder;[HrefToken()];toggle_noncontinuous_behavior=1'>[SSticker.mode.round_ends_with_antag_death ? "End The Round" : "Continue As Extended"]</a><BR>"
 		dat += "<a href='?_src_=holder;[HrefToken()];end_round=\ref[usr]'>End Round Now</a><br>"
 		dat += "<a href='?_src_=holder;[HrefToken()];delay_round_end=1'>[SSticker.delay_end ? "End Round Normally" : "Delay Round End"]</a>"
@@ -530,7 +530,7 @@
 					else
 						dat += "<tr><td><a href='?_src_=vars;[HrefToken()];Vars=\ref[brother]'>[brother.name]([brother.key])</a><i>Brother body destroyed!</i></td>"
 						dat += "<td><A href='?priv_msg=[brother.key]'>PM</A></td></tr>"
-				dat += "</table>"
+			dat += "</table>"
 
 		if(SSticker.mode.abductors.len)
 			dat += "<br><table cellspacing=5><tr><td><B>Abductors</B></td><td></td><td></td></tr>"

code/modules/admin/secrets.dm

@@ -356,16 +356,9 @@
 			SSblackbox.add_details("admin_secrets_fun_used","Bomb Cap")
 
 			var/newBombCap = input(usr,"What would you like the new bomb cap to be. (entered as the light damage range (the 3rd number in common (1,2,3) notation)) Must be above 4)", "New Bomb Cap", GLOB.MAX_EX_LIGHT_RANGE) as num|null
-			if (newBombCap < 4)
+			if (!CONFIG_SET(number/bombcap, newBombCap))
 				return
 
-			GLOB.MAX_EX_DEVESTATION_RANGE = round(newBombCap/4)
-			GLOB.MAX_EX_HEAVY_RANGE = round(newBombCap/2)
-			GLOB.MAX_EX_LIGHT_RANGE = newBombCap
-			//I don't know why these are their own variables, but fuck it, they are.
-			GLOB.MAX_EX_FLASH_RANGE = newBombCap
-			GLOB.MAX_EX_FLAME_RANGE = newBombCap
-
 			message_admins("<span class='boldannounce'>[key_name_admin(usr)] changed the bomb cap to [GLOB.MAX_EX_DEVESTATION_RANGE], [GLOB.MAX_EX_HEAVY_RANGE], [GLOB.MAX_EX_LIGHT_RANGE]</span>")
 			log_admin("[key_name(usr)] changed the bomb cap to [GLOB.MAX_EX_DEVESTATION_RANGE], [GLOB.MAX_EX_HEAVY_RANGE], [GLOB.MAX_EX_LIGHT_RANGE]")
 

code/modules/admin/sql_message_system.dm

@@ -33,8 +33,9 @@
 	if(!timestamp)
 		timestamp = SQLtime()
 	if(!server)
-		if (config && config.server_sql_name)
-			server = config.server_sql_name
+		var/ssqlname = CONFIG_GET(string/serversqlname)
+		if (ssqlname)
+			server = ssqlname
 	server = sanitizeSQL(server)
 	if(isnull(secret))
 		switch(alert("Hide note from being viewed by players?", "Secret note?","Yes","No","Cancel"))
@@ -147,12 +148,13 @@
 		return
 	var/output
 	var/ruler = "<hr style='background:#000000; border:0; height:3px'>"
-	var/navbar = "<a href='?_src_=holder;[HrefToken()];nonalpha=1'>\[All\]</a>|<a href='?_src_=holder;nonalpha=2'>\[#\]</a>"
+	var/navbar = "<a href='?_src_=holder;[HrefToken()];nonalpha=1'>\[All\]</a>|<a href='?_src_=holder;[HrefToken()];nonalpha=2'>\[#\]</a>"
 	for(var/letter in GLOB.alphabet)
 		navbar += "|<a href='?_src_=holder;[HrefToken()];showmessages=[letter]'>\[[letter]\]</a>"
-	navbar += "|<a href='?_src_=holder;[HrefToken()];showmemo=1'>\[Memos\]</a>|<a href='?_src_=holder;showwatch=1'>\[Watchlist\]</a>"
+	navbar += "|<a href='?_src_=holder;[HrefToken()];showmemo=1'>\[Memos\]</a>|<a href='?_src_=holder;[HrefToken()];showwatch=1'>\[Watchlist\]</a>"
 	navbar += "<br><form method='GET' name='search' action='?'>\
 	<input type='hidden' name='_src_' value='holder'>\
+	[HrefTokenFormField()]\
 	<input type='text' name='searchmessages' value='[index]'>\
 	<input type='submit' value='Search'></form>"
 	if(!linkless)
@@ -215,8 +217,10 @@
 			var/editor_ckey = query_get_messages.item[8]
 			var/age = text2num(query_get_messages.item[9])
 			var/alphatext = ""
-			if (agegate && type == "note" && isnum(config.note_stale_days) && isnum(config.note_fresh_days) && config.note_stale_days > config.note_fresh_days)
-				var/alpha = Clamp(100 - (age - config.note_fresh_days) * (85 / (config.note_stale_days - config.note_fresh_days)), 15, 100)
+			var/nsd = CONFIG_GET(number/note_stale_days)
+			var/nfd = CONFIG_GET(number/note_fresh_days)
+			if (agegate && type == "note" && isnum(nsd) && isnum(nfd) && nsd > nfd)
+				var/alpha = Clamp(100 - (age - nfd) * (85 / (nsd - nfd)), 15, 100)
 				if (alpha < 100)
 					if (alpha <= 15)
 						if (skipped)
@@ -352,8 +356,9 @@ proc/get_message_output(type, target_ckey)
 		var/notetext
 		notesfile >> notetext
 		var/server
-		if(config && config.server_sql_name)
-			server = config.server_sql_name
+		var/ssqlname = CONFIG_GET(string/serversqlname)
+		if (ssqlname)
+			server = ssqlname
 		var/regex/note = new("^(\\d{2}-\\w{3}-\\d{4}) \\| (.+) ~(\\w+)$", "i")
 		note.Find(notetext)
 		var/timestamp = note.group[1]

code/modules/admin/topic.dm

@@ -5,7 +5,7 @@
 		return
 	var/msg = !auth ? "no" : "a bad"
 	message_admins("[key_name_admin(usr)] clicked an href with [msg] authorization key!")
-	if(config.debug_admin_hrefs)
+	if(CONFIG_GET(flag/debug_admin_hrefs))
 		message_admins("Debug mode enabled, call not blocked. Please ask your coders to review this round's logs.")
 		log_world("UAH: [href]")
 		return TRUE
@@ -318,35 +318,36 @@
 	else if(href_list["toggle_continuous"])
 		if(!check_rights(R_ADMIN))
 			return
-
-		if(!config.continuous[SSticker.mode.config_tag])
-			config.continuous[SSticker.mode.config_tag] = 1
+		var/list/continuous = CONFIG_GET(keyed_flag_list/continuous)
+		if(!continuous[SSticker.mode.config_tag])
+			continuous[SSticker.mode.config_tag] = TRUE
 		else
-			config.continuous[SSticker.mode.config_tag] = 0
+			continuous[SSticker.mode.config_tag] = FALSE
 
-		message_admins("<span class='adminnotice'>[key_name_admin(usr)] toggled the round to [config.continuous[SSticker.mode.config_tag] ? "continue if all antagonists die" : "end with the antagonists"].</span>")
+		message_admins("<span class='adminnotice'>[key_name_admin(usr)] toggled the round to [continuous[SSticker.mode.config_tag] ? "continue if all antagonists die" : "end with the antagonists"].</span>")
 		check_antagonists()
 
 	else if(href_list["toggle_midround_antag"])
 		if(!check_rights(R_ADMIN))
 			return
 
-		if(!config.midround_antag[SSticker.mode.config_tag])
-			config.midround_antag[SSticker.mode.config_tag] = 1
+		var/list/midround_antag = CONFIG_GET(keyed_flag_list/midround_antag)
+		if(!midround_antag[SSticker.mode.config_tag])
+			midround_antag[SSticker.mode.config_tag] = TRUE
 		else
-			config.midround_antag[SSticker.mode.config_tag] = 0
+			midround_antag[SSticker.mode.config_tag] = FALSE
 
-		message_admins("<span class='adminnotice'>[key_name_admin(usr)] toggled the round to [config.midround_antag[SSticker.mode.config_tag] ? "use" : "skip"] the midround antag system.</span>")
+		message_admins("<span class='adminnotice'>[key_name_admin(usr)] toggled the round to [midround_antag[SSticker.mode.config_tag] ? "use" : "skip"] the midround antag system.</span>")
 		check_antagonists()
 
 	else if(href_list["alter_midround_time_limit"])
 		if(!check_rights(R_ADMIN))
 			return
 
-		var/timer = input("Enter new maximum time",, config.midround_antag_time_check ) as num|null
+		var/timer = input("Enter new maximum time",, CONFIG_GET(number/midround_antag_time_check)) as num|null
 		if(!timer)
 			return
-		config.midround_antag_time_check = timer
+		CONFIG_SET(number/midround_antag_time_check, timer)
 		message_admins("<span class='adminnotice'>[key_name_admin(usr)] edited the maximum midround antagonist time to [timer] minutes.</span>")
 		check_antagonists()
 
@@ -354,9 +355,10 @@
 		if(!check_rights(R_ADMIN))
 			return
 
-		var/ratio = input("Enter new life ratio",, config.midround_antag_life_check*100) as num
-		if(ratio)
-			config.midround_antag_life_check = ratio/100
+		var/ratio = input("Enter new life ratio",, CONFIG_GET(number/midround_antag_life_check) * 100) as num
+		if(!ratio)
+			return
+		CONFIG_SET(number/midround_antag_life_check, ratio / 100)
 
 		message_admins("<span class='adminnotice'>[key_name_admin(usr)] edited the midround antagonist living crew ratio to [ratio]% alive.</span>")
 		check_antagonists()
@@ -586,8 +588,9 @@
 				to_chat(M, "<span class='boldannounce'><BIG>You have been appearance banned by [usr.client.ckey].</BIG></span>")
 				to_chat(M, "<span class='boldannounce'>The reason is: [reason]</span>")
 				to_chat(M, "<span class='danger'>Appearance ban can be lifted only upon request.</span>")
-				if(config.banappeals)
-					to_chat(M, "<span class='danger'>To try to resolve this matter head to [config.banappeals]</span>")
+				var/bran = CONFIG_GET(string/banappeals)
+				if(bran)
+					to_chat(M, "<span class='danger'>To try to resolve this matter head to [bran]</span>")
 				else
 					to_chat(M, "<span class='danger'>No ban appeals URL has been set.</span>")
 			if("No")
@@ -1150,8 +1153,9 @@
 				to_chat(M, "<span class='danger'>This is a temporary ban, it will be removed in [mins] minutes.</span>")
 				SSblackbox.inc("ban_tmp",1)
 				SSblackbox.inc("ban_tmp_mins",mins)
-				if(config.banappeals)
-					to_chat(M, "<span class='danger'>To try to resolve this matter head to [config.banappeals]</span>")
+				var/bran = CONFIG_GET(string/banappeals)
+				if(bran)
+					to_chat(M, "<span class='danger'>To try to resolve this matter head to [bran]</span>")
 				else
 					to_chat(M, "<span class='danger'>No ban appeals URL has been set.</span>")
 				log_admin_private("[key_name(usr)] has banned [M.ckey].\nReason: [key_name(M)]\nThis will be removed in [mins] minutes.")
@@ -1174,8 +1178,9 @@
 						AddBan(M.ckey, M.computer_id, reason, usr.ckey, 0, 0)
 				to_chat(M, "<span class='boldannounce'><BIG>You have been banned by [usr.client.ckey].\nReason: [reason]</BIG></span>")
 				to_chat(M, "<span class='danger'>This is a permanent ban.</span>")
-				if(config.banappeals)
-					to_chat(M, "<span class='danger'>To try to resolve this matter head to [config.banappeals]</span>")
+				var/bran = CONFIG_GET(string/banappeals)
+				if(bran)
+					to_chat(M, "<span class='danger'>To try to resolve this matter head to [bran]</span>")
 				else
 					to_chat(M, "<span class='danger'>No ban appeals URL has been set.</span>")
 				if(!DB_ban_record(BANTYPE_PERMA, M, -1, reason))

code/modules/admin/verbs/SDQL2/SDQL_2.dm

@@ -37,7 +37,6 @@
 	if(!query_text || length(query_text) < 1)
 		return
 
-	//to_chat(world, query_text)
 
 	var/list/query_list = SDQL2_tokenize(query_text)
 
@@ -115,7 +114,7 @@
 	end_time -= start_time
 	to_chat(usr, "<span class='admin'>SDQL query results: [query_text]</span>")
 	to_chat(usr, "<span class='admin'>SDQL query completed: [objs_all] objects selected by path, and [objs_eligible] objects executed on after WHERE filtering if applicable.</span>")
-	to_chat(usr, "<span class='admin'>SDQL query took [end_time/10] seconds to complete.</span>")
+	to_chat(usr, "<span class='admin'>SDQL query took [DisplayTimeText(end_time)] to complete.</span>")
 
 /proc/SDQL_qdel_datum(datum/d)
 	qdel(d)

code/modules/admin/verbs/adminhelp.dm

@@ -211,7 +211,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	return ..()
 
 /datum/admin_help/proc/AddInteraction(formatted_message)
-	if(heard_by_no_admins && usr && usr.client != initiator)
+	if(heard_by_no_admins && usr && usr.ckey != initiator_ckey)
 		heard_by_no_admins = FALSE
 		send2irc(initiator_ckey, "Ticket #[id]: Answered by [key_name(usr)]")
 	_interactions += "[gameTimestamp()]: [formatted_message]"
@@ -242,13 +242,13 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 /datum/admin_help/proc/LinkedReplyName(ref_src)
 	if(!ref_src)
 		ref_src = "\ref[src]"
-	return "<A HREF='?_src_=holder;[HrefToken()];ahelp=[ref_src];ahelp_action=reply'>[initiator_key_name]</A>"
+	return "<A HREF='?_src_=holder;[HrefToken(TRUE)];ahelp=[ref_src];ahelp_action=reply'>[initiator_key_name]</A>"
 
 //private
 /datum/admin_help/proc/TicketHref(msg, ref_src, action = "ticket")
 	if(!ref_src)
 		ref_src = "\ref[src]"
-	return "<A HREF='?_src_=holder;[HrefToken()];ahelp=[ref_src];ahelp_action=[action]'>[msg]</A>"
+	return "<A HREF='?_src_=holder;[HrefToken(TRUE)];ahelp=[ref_src];ahelp_action=[action]'>[msg]</A>"
 
 //message from the initiator without a target, all admins will see this
 //won't bug irc
@@ -399,9 +399,9 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	dat += "</b>[GLOB.TAB][TicketHref("Refresh", ref_src)][GLOB.TAB][TicketHref("Re-Title", ref_src, "retitle")]"
 	if(state != AHELP_ACTIVE)
 		dat += "[GLOB.TAB][TicketHref("Reopen", ref_src, "reopen")]"
-	dat += "<br><br>Opened at: [gameTimestamp(wtime = opened_at)] (Approx [(world.time - opened_at) / 600] minutes ago)"
+	dat += "<br><br>Opened at: [gameTimestamp(wtime = opened_at)] (Approx [DisplayTimeText(world.time - opened_at)] ago)"
 	if(closed_at)
-		dat += "<br>Closed at: [gameTimestamp(wtime = closed_at)] (Approx [(world.time - closed_at) / 600] minutes ago)"
+		dat += "<br>Closed at: [gameTimestamp(wtime = closed_at)] (Approx [DisplayTimeText(world.time - closed_at)] ago)"
 	dat += "<br><br>"
 	if(initiator)
 		dat += "<b>Actions:</b> [FullMonty(ref_src)]<br>"
@@ -587,21 +587,20 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 
 
 /proc/send2irc(msg,msg2)
-	if(world.RunningService())
-		world.ExportService("[SERVICE_REQUEST_IRC_ADMIN_CHANNEL_MESSAGE] [msg] | [msg2]")
-	else if(config.useircbot)
-		shell("python nudge.py [msg] [msg2]")
+	if(SERVER_TOOLS_PRESENT)
+		SERVER_TOOLS_RELAY_BROADCAST("[msg] | [msg2]")
 
 /proc/send2otherserver(source,msg,type = "Ahelp")
-	if(config.cross_allowed)
+	var/comms_key = CONFIG_GET(string/comms_key)
+	if(comms_key)
 		var/list/message = list()
 		message["message_sender"] = source
 		message["message"] = msg
-		message["source"] = "([config.cross_name])"
-		message["key"] = global.comms_key
+		message["source"] = "([CONFIG_GET(string/cross_comms_name)])"
+		message["key"] = comms_key
 		message["crossmessage"] = type
 
-		world.Export("[config.cross_address]?[list2params(message)]")
+		world.Export("[CONFIG_GET(string/cross_server_address)]?[list2params(message)]")
 
 
 /proc/ircadminwho()
@@ -679,7 +678,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 							if(found.mind && found.mind.special_role)
 								is_antag = 1
 							founds += "Name: [found.name]([found.real_name]) Ckey: [found.ckey] [is_antag ? "(Antag)" : null] "
-							msg += "[original_word]<font size='1' color='[is_antag ? "red" : "black"]'>(<A HREF='?_src_=holder;[HrefToken()];adminmoreinfo=\ref[found]'>?</A>|<A HREF='?_src_=holder;[HrefToken()];adminplayerobservefollow=\ref[found]'>F</A>)</font> "
+							msg += "[original_word]<font size='1' color='[is_antag ? "red" : "black"]'>(<A HREF='?_src_=holder;[HrefToken(TRUE)];adminmoreinfo=\ref[found]'>?</A>|<A HREF='?_src_=holder;[HrefToken(TRUE)];adminplayerobservefollow=\ref[found]'>F</A>)</font> "
 							continue
 		msg += "[original_word] "
 	if(irc)

code/modules/admin/verbs/adminpm.dm

@@ -185,7 +185,7 @@
 				SEND_SOUND(recipient, sound('sound/effects/adminhelp.ogg'))
 
 				//AdminPM popup for ApocStation and anybody else who wants to use it. Set it with POPUP_ADMIN_PM in config.txt ~Carn
-				if(config.popup_admin_pm)
+				if(CONFIG_GET(flag/popup_admin_pm))
 					spawn()	//so we don't hold the caller proc up
 						var/sender = src
 						var/sendername = key
@@ -277,7 +277,7 @@
 		return "Error: Ticket could not be found"
 
 	var/static/stealthkey
-	var/adminname = config.showircname ? irc_tagged : "Administrator"
+	var/adminname = CONFIG_GET(flag/show_irc_name) ? irc_tagged : "Administrator"
 
 	if(!C)
 		return "Error: No client"

code/modules/admin/verbs/cinematic.dm

@@ -1,18 +1,11 @@
-/client/proc/cinematic(cinematic as anything in list("explosion",null))
+/client/proc/cinematic()
 	set name = "cinematic"
 	set category = "Fun"
 	set desc = "Shows a cinematic."	// Intended for testing but I thought it might be nice for events on the rare occasion Feel free to comment it out if it's not wanted.
 	set hidden = 1
 	if(!SSticker)
 		return
-	switch(cinematic)
-		if("explosion")
-			var/parameter = input(src,"station_missed = ?","Enter Parameter",0) as num
-			var/override
-			switch(parameter)
-				if(1)
-					override = input(src,"mode = ?","Enter Parameter",null) as anything in list("nuclear emergency","gang war","fake","no override")
-				if(0)
-					override = input(src,"mode = ?","Enter Parameter",null) as anything in list("blob","nuclear emergency","AI malfunction","no override")
-			SSticker.station_explosion_cinematic(parameter,override)
-	return
+
+	var/datum/cinematic/choice = input(src,"Cinematic","Choose",null) as anything in subtypesof(/datum/cinematic)
+	if(choice)
+		Cinematic(initial(choice.id),world,null)

code/modules/admin/verbs/debug.dm

@@ -97,10 +97,16 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 		to_chat(usr, .)
 	SSblackbox.add_details("admin_verb","Advanced ProcCall") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-GLOBAL_VAR_INIT(AdminProcCaller, null)
+GLOBAL_VAR(AdminProcCaller)
 GLOBAL_PROTECT(AdminProcCaller)
 GLOBAL_VAR_INIT(AdminProcCallCount, 0)
 GLOBAL_PROTECT(AdminProcCallCount)
+GLOBAL_VAR(LastAdminCalledTargetRef)
+GLOBAL_PROTECT(LastAdminCalledTargetRef)
+GLOBAL_VAR(LastAdminCalledTarget)
+GLOBAL_PROTECT(LastAdminCalledTarget)
+GLOBAL_VAR(LastAdminCalledProc)
+GLOBAL_PROTECT(LastAdminCalledProc)
 
 /proc/WrapAdminProcCall(target, procname, list/arguments)
 	var/current_caller = GLOB.AdminProcCaller
@@ -109,6 +115,9 @@ GLOBAL_PROTECT(AdminProcCallCount)
 		to_chat(usr, "<span class='adminnotice'>Another set of admin called procs are still running, your proc will be run after theirs finish.</span>")
 		UNTIL(!GLOB.AdminProcCaller)
 		to_chat(usr, "<span class='adminnotice'>Running your proc</span>")
+	GLOB.LastAdminCalledProc = procname
+	if(target != GLOBAL_PROC)
+		GLOB.LastAdminCalledTargetRef = "\ref[target]"
 	GLOB.AdminProcCaller = ckey	//if this runtimes, too bad for you
 	++GLOB.AdminProcCallCount
 	. = world.WrapAdminProcCall(target, procname, arguments)
@@ -837,11 +846,11 @@ GLOBAL_PROTECT(AdminProcCallCount)
 	if(!holder)
 		return
 
-	global.medals_enabled = !global.medals_enabled
+	GLOB.medals_enabled = !GLOB.medals_enabled
 
-	message_admins("<span class='adminnotice'>[key_name_admin(src)] [global.medals_enabled ? "disabled" : "enabled"] the medal hub lockout.</span>")
+	message_admins("<span class='adminnotice'>[key_name_admin(src)] [GLOB.medals_enabled ? "disabled" : "enabled"] the medal hub lockout.</span>")
 	SSblackbox.add_details("admin_verb","Toggle Medal Disable") // If...
-	log_admin("[key_name(src)] [global.medals_enabled ? "disabled" : "enabled"] the medal hub lockout.")
+	log_admin("[key_name(src)] [GLOB.medals_enabled ? "disabled" : "enabled"] the medal hub lockout.")
 
 /client/proc/view_runtimes()
 	set category = "Debug"

code/modules/admin/verbs/diagnostics.dm

@@ -43,8 +43,8 @@
 		log_admin("DEBUG: [key_name(M)]  next_move = [M.next_move]  lastDblClick = [M.next_click]  world.time = [world.time]")
 		M.next_move = 1
 		M.next_click = 0
-	message_admins("[key_name_admin(largest_move_mob)] had the largest move delay with [largest_move_time] frames / [largest_move_time/10] seconds!")
-	message_admins("[key_name_admin(largest_click_mob)] had the largest click delay with [largest_click_time] frames / [largest_click_time/10] seconds!")
+	message_admins("[key_name_admin(largest_move_mob)] had the largest move delay with [largest_move_time] frames / [DisplayTimeText(largest_move_time)]!")
+	message_admins("[key_name_admin(largest_click_mob)] had the largest click delay with [largest_click_time] frames / [DisplayTimeText(largest_click_time)]!")
 	message_admins("world.time = [world.time]")
 	SSblackbox.add_details("admin_verb","Unfreeze Everyone") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	return

code/modules/admin/verbs/fps.dm

@@ -7,13 +7,14 @@
 	if(!check_rights(R_DEBUG))
 		return
 
-	var/new_fps = round(input("Sets game frames-per-second. Can potentially break the game (default: [config.fps])","FPS", world.fps) as num|null)
+	var/cfg_fps = CONFIG_GET(number/fps)
+	var/new_fps = round(input("Sets game frames-per-second. Can potentially break the game (default: [cfg_fps])","FPS", world.fps) as num|null)
 
 	if(new_fps <= 0)
 		to_chat(src, "<span class='danger'>Error: set_server_fps(): Invalid world.fps value. No changes made.</span>")
 		return
-	if(new_fps > config.fps*1.5)
-		if(alert(src, "You are setting fps to a high value:\n\t[new_fps] frames-per-second\n\tconfig.fps = [config.fps]","Warning!","Confirm","ABORT-ABORT-ABORT") != "Confirm")
+	if(new_fps > cfg_fps * 1.5)
+		if(alert(src, "You are setting fps to a high value:\n\t[new_fps] frames-per-second\n\tconfig.fps = [cfg_fps]","Warning!","Confirm","ABORT-ABORT-ABORT") != "Confirm")
 			return
 
 	var/msg = "[key_name(src)] has modified world.fps to [new_fps]"
@@ -21,4 +22,5 @@
 	message_admins(msg, 0)
 	SSblackbox.add_details("admin_toggle","Set Server FPS|[new_fps]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
+	CONFIG_SET(number/fps, new_fps)
 	world.fps = new_fps

code/modules/admin/verbs/one_click_antag.dm

@@ -28,27 +28,39 @@
 	popup.set_content(dat)
 	popup.open()
 
+/datum/admins/proc/isReadytoRumble(mob/living/carbon/human/applicant, targetrole, onstation = TRUE, conscious = TRUE)
+	if(applicant.mind.special_role)
+		return FALSE
+	if(!(targetrole in applicant.client.prefs.be_special))
+		return FALSE
+	if(onstation)
+		var/turf/T = get_turf(applicant)
+		if(!(T.z in GLOB.station_z_levels))
+			return FALSE
+	if(conscious && applicant.stat) //incase you don't care about a certain antag being unconcious when made, ie if they have selfhealing abilities.
+		return FALSE
+	if(!considered_alive(applicant.mind) || considered_afk(applicant.mind)) //makes sure the player isn't a zombie, brain, or just afk all together
+		return FALSE
+	return (!jobban_isbanned(applicant, targetrole) && !jobban_isbanned(applicant, "Syndicate"))
+
+
 /datum/admins/proc/makeTraitors()
 	var/datum/game_mode/traitor/temp = new
 
-	if(config.protect_roles_from_antagonist)
+	if(CONFIG_GET(flag/protect_roles_from_antagonist))
 		temp.restricted_jobs += temp.protected_jobs
 
-	if(config.protect_assistant_from_antagonist)
+	if(CONFIG_GET(flag/protect_assistant_from_antagonist))
 		temp.restricted_jobs += "Assistant"
 
 	var/list/mob/living/carbon/human/candidates = list()
 	var/mob/living/carbon/human/H = null
 
 	for(var/mob/living/carbon/human/applicant in GLOB.player_list)
-		if(ROLE_TRAITOR in applicant.client.prefs.be_special)
-			if(!applicant.stat)
-				if(applicant.mind)
-					if (!applicant.mind.special_role)
-						if(!jobban_isbanned(applicant, ROLE_TRAITOR) && !jobban_isbanned(applicant, "Syndicate"))
-							if(temp.age_check(applicant.client))
-								if(!(applicant.job in temp.restricted_jobs))
-									candidates += applicant
+		if(isReadytoRumble(applicant, ROLE_TRAITOR, FALSE))
+			if(temp.age_check(applicant.client))
+				if(!(applicant.job in temp.restricted_jobs))
+					candidates += applicant
 
 	if(candidates.len)
 		var/numTraitors = min(candidates.len, 3)
@@ -67,23 +79,20 @@
 /datum/admins/proc/makeChanglings()
 
 	var/datum/game_mode/changeling/temp = new
-	if(config.protect_roles_from_antagonist)
+	if(CONFIG_GET(flag/protect_roles_from_antagonist))
 		temp.restricted_jobs += temp.protected_jobs
 
-	if(config.protect_assistant_from_antagonist)
+	if(CONFIG_GET(flag/protect_assistant_from_antagonist))
 		temp.restricted_jobs += "Assistant"
 
 	var/list/mob/living/carbon/human/candidates = list()
 	var/mob/living/carbon/human/H = null
 
 	for(var/mob/living/carbon/human/applicant in GLOB.player_list)
-		if(ROLE_CHANGELING in applicant.client.prefs.be_special)
-			var/turf/T = get_turf(applicant)
-			if(applicant.stat == CONSCIOUS && applicant.mind && !applicant.mind.special_role && (T.z in GLOB.station_z_levels))
-				if(!jobban_isbanned(applicant, ROLE_CHANGELING) && !jobban_isbanned(applicant, "Syndicate"))
-					if(temp.age_check(applicant.client))
-						if(!(applicant.job in temp.restricted_jobs))
-							candidates += applicant
+		if(isReadytoRumble(applicant, ROLE_CHANGELING))
+			if(temp.age_check(applicant.client))
+				if(!(applicant.job in temp.restricted_jobs))
+					candidates += applicant
 
 	if(candidates.len)
 		var/numChanglings = min(candidates.len, 3)
@@ -100,23 +109,20 @@
 /datum/admins/proc/makeRevs()
 
 	var/datum/game_mode/revolution/temp = new
-	if(config.protect_roles_from_antagonist)
+	if(CONFIG_GET(flag/protect_roles_from_antagonist))
 		temp.restricted_jobs += temp.protected_jobs
 
-	if(config.protect_assistant_from_antagonist)
+	if(CONFIG_GET(flag/protect_assistant_from_antagonist))
 		temp.restricted_jobs += "Assistant"
 
 	var/list/mob/living/carbon/human/candidates = list()
 	var/mob/living/carbon/human/H = null
 
 	for(var/mob/living/carbon/human/applicant in GLOB.player_list)
-		if(ROLE_REV in applicant.client.prefs.be_special)
-			var/turf/T = get_turf(applicant)
-			if(applicant.stat == CONSCIOUS && applicant.mind && !applicant.mind.special_role && (T.z in GLOB.station_z_levels))
-				if(!jobban_isbanned(applicant, ROLE_REV) && !jobban_isbanned(applicant, "Syndicate"))
-					if(temp.age_check(applicant.client))
-						if(!(applicant.job in temp.restricted_jobs))
-							candidates += applicant
+		if(isReadytoRumble(applicant, ROLE_REV))
+			if(temp.age_check(applicant.client))
+				if(!(applicant.job in temp.restricted_jobs))
+					candidates += applicant
 
 	if(candidates.len)
 		var/numRevs = min(candidates.len, 3)
@@ -142,23 +148,20 @@
 
 /datum/admins/proc/makeCult()
 	var/datum/game_mode/cult/temp = new
-	if(config.protect_roles_from_antagonist)
+	if(CONFIG_GET(flag/protect_roles_from_antagonist))
 		temp.restricted_jobs += temp.protected_jobs
 
-	if(config.protect_assistant_from_antagonist)
+	if(CONFIG_GET(flag/protect_assistant_from_antagonist))
 		temp.restricted_jobs += "Assistant"
 
 	var/list/mob/living/carbon/human/candidates = list()
 	var/mob/living/carbon/human/H = null
 
 	for(var/mob/living/carbon/human/applicant in GLOB.player_list)
-		if(ROLE_CULTIST in applicant.client.prefs.be_special)
-			var/turf/T = get_turf(applicant)
-			if(applicant.stat == CONSCIOUS && applicant.mind && !applicant.mind.special_role && (T.z in GLOB.station_z_levels))
-				if(!jobban_isbanned(applicant, ROLE_CULTIST) && !jobban_isbanned(applicant, "Syndicate"))
-					if(temp.age_check(applicant.client))
-						if(!(applicant.job in temp.restricted_jobs))
-							candidates += applicant
+		if(isReadytoRumble(applicant, ROLE_CULTIST))
+			if(temp.age_check(applicant.client))
+				if(!(applicant.job in temp.restricted_jobs))
+					candidates += applicant
 
 	if(candidates.len)
 		var/numCultists = min(candidates.len, 4)
@@ -175,23 +178,20 @@
 
 /datum/admins/proc/makeClockCult()
 	var/datum/game_mode/clockwork_cult/temp = new
-	if(config.protect_roles_from_antagonist)
+	if(CONFIG_GET(flag/protect_roles_from_antagonist))
 		temp.restricted_jobs += temp.protected_jobs
 
-	if(config.protect_assistant_from_antagonist)
+	if(CONFIG_GET(flag/protect_assistant_from_antagonist))
 		temp.restricted_jobs += "Assistant"
 
 	var/list/mob/living/carbon/human/candidates = list()
 	var/mob/living/carbon/human/H = null
 
 	for(var/mob/living/carbon/human/applicant in GLOB.player_list)
-		if(ROLE_SERVANT_OF_RATVAR in applicant.client.prefs.be_special)
-			var/turf/T = get_turf(applicant)
-			if(applicant.stat == CONSCIOUS && applicant.mind && !applicant.mind.special_role && (T.z in GLOB.station_z_levels))
-				if(!jobban_isbanned(applicant, ROLE_SERVANT_OF_RATVAR) && !jobban_isbanned(applicant, "Syndicate"))
-					if(temp.age_check(applicant.client))
-						if(!(applicant.job in temp.restricted_jobs))
-							candidates += applicant
+		if(isReadytoRumble(applicant, ROLE_SERVANT_OF_RATVAR))
+			if(temp.age_check(applicant.client))
+				if(!(applicant.job in temp.restricted_jobs))
+					candidates += applicant
 
 	if(candidates.len)
 		var/numCultists = min(candidates.len, 4)
@@ -340,7 +340,7 @@
 			missiondesc += "<BR><B>Your Mission</B>: [mission]"
 			to_chat(Commando, missiondesc)
 
-			if(config.enforce_human_authority)
+			if(CONFIG_GET(flag/enforce_human_authority))
 				Commando.set_species(/datum/species/human)
 
 			//Logging and cleanup
@@ -382,7 +382,7 @@
 		missionobj.completed = 1
 		newmob.mind.objectives += missionobj
 
-		if(config.enforce_human_authority)
+		if(CONFIG_GET(flag/enforce_human_authority))
 			newmob.set_species(/datum/species/human)
 
 		//Greet the official
@@ -497,7 +497,7 @@
 			missiondesc += "<BR><B>Your Mission</B>: [mission]"
 			to_chat(ERTOperative, missiondesc)
 
-			if(config.enforce_human_authority)
+			if(CONFIG_GET(flag/enforce_human_authority))
 				ERTOperative.set_species(/datum/species/human)
 
 			//Logging and cleanup

code/modules/admin/verbs/panicbunker.dm

@@ -1,15 +1,16 @@
 /client/proc/panicbunker()
 	set category = "Server"
 	set name = "Toggle Panic Bunker"
-	if (!config.sql_enabled)
+	if (!CONFIG_GET(flag/sql_enabled))
 		to_chat(usr, "<span class='adminnotice'>The Database is not enabled!</span>")
 		return
 
-	config.panic_bunker = (!config.panic_bunker)
+	var/new_pb = !CONFIG_GET(flag/panic_bunker)
+	CONFIG_SET(flag/panic_bunker, new_pb)
 
-	log_admin("[key_name(usr)] has toggled the Panic Bunker, it is now [(config.panic_bunker?"on":"off")]")
-	message_admins("[key_name_admin(usr)] has toggled the Panic Bunker, it is now [(config.panic_bunker?"enabled":"disabled")].")
-	if (config.panic_bunker && (!SSdbcore || !SSdbcore.IsConnected()))
+	log_admin("[key_name(usr)] has toggled the Panic Bunker, it is now [new_pb ? "on" : "off"]")
+	message_admins("[key_name_admin(usr)] has toggled the Panic Bunker, it is now [new_pb ? "enabled" : "disabled"].")
+	if (new_pb && !SSdbcore.Connect())
 		message_admins("The Database is not connected! Panic bunker will not work until the connection is reestablished.")
-	SSblackbox.add_details("admin_toggle","Toggle Panic Bunker|[config.panic_bunker]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	SSblackbox.add_details("admin_toggle","Toggle Panic Bunker|[new_pb]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 

code/modules/admin/verbs/playsound.dm

@@ -62,7 +62,8 @@
 	if(!check_rights(R_SOUNDS))
 		return
 
-	if(!config.invoke_youtubedl)
+	var/ytdl = CONFIG_GET(string/invoke_youtubedl)
+	if(!ytdl)
 		to_chat(src, "<span class='boldwarning'>Youtube-dl was not configured, action unavailable</span>") //Check config.txt for the INVOKE_YOUTUBEDL value
 		return
 
@@ -79,7 +80,7 @@
 				to_chat(src, "<span class='warning'>For youtube-dl shortcuts like ytsearch: please use the appropriate full url from the website.</span>")
 				return
 			var/shell_scrubbed_input = shell_url_scrub(web_sound_input)
-			var/list/output = world.shelleo("[config.invoke_youtubedl] --format \"bestaudio\[ext=mp3]/best\[ext=mp4]\[height<=360]/bestaudio\[ext=m4a]/bestaudio\[ext=aac]\" --get-url \"[shell_scrubbed_input]\"")
+			var/list/output = world.shelleo("[ytdl] --format \"bestaudio\[ext=mp3]/best\[ext=mp4]\[height<=360]/bestaudio\[ext=m4a]/bestaudio\[ext=aac]\" --get-url \"[shell_scrubbed_input]\"")
 			var/errorlevel = output[SHELLEO_ERRORLEVEL]
 			var/stdout = output[SHELLEO_STDOUT]
 			var/stderr = output[SHELLEO_STDERR]
@@ -92,6 +93,7 @@
 						pitch = pick(0.5, 0.7, 0.8, 0.85, 0.9, 0.95, 1.1, 1.2, 1.4, 1.6, 2.0, 2.5)
 						to_chat(src, "You feel the Honkmother messing with your song...")
 
+					SSblackbox.add_details("played_url", "[web_sound_input]|[ckey]")
 					log_admin("[key_name(src)] played web sound: [web_sound_input]")
 					message_admins("[key_name(src)] played web sound: [web_sound_input]")
 			else

code/modules/admin/verbs/possess.dm

@@ -2,7 +2,7 @@
 	set name = "Possess Obj"
 	set category = "Object"
 
-	if(O.dangerous_possession && config.forbid_singulo_possession)
+	if(O.dangerous_possession && CONFIG_GET(flag/forbid_singulo_possession))
 		to_chat(usr, "[O] is too powerful for you to possess.")
 		return
 

code/modules/admin/verbs/randomverbs.dm

@@ -174,7 +174,7 @@
 		return
 
 	if(automute)
-		if(!config.automute_on)
+		if(!CONFIG_GET(flag/automute_on))
 			return
 	else
 		if(!check_rights())
@@ -344,7 +344,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		new_character.real_name = record_found.fields["name"]
 		new_character.gender = record_found.fields["sex"]
 		new_character.age = record_found.fields["age"]
-		new_character.hardset_dna(record_found.fields["identity"], record_found.fields["enzymes"], record_found.fields["name"], record_found.fields["blood_type"], record_found.fields["species"], record_found.fields["features"])
+		new_character.hardset_dna(record_found.fields["identity"], record_found.fields["enzymes"], record_found.fields["name"], record_found.fields["blood_type"], new record_found.fields["species"], record_found.fields["features"])
 	else
 		var/datum/preferences/A = new()
 		A.copy_to(new_character)
@@ -381,24 +381,19 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 	switch(new_character.mind.special_role)
 		if("Wizard")
-			new_character.loc = pick(GLOB.wizardstart)
-			//SSticker.mode.learn_basic_spells(new_character)
+			new_character.forceMove(pick(GLOB.wizardstart))
 			SSticker.mode.equip_wizard(new_character)
 		if("Syndicate")
-			var/obj/effect/landmark/synd_spawn = locate("landmark*Syndicate-Spawn")
-			if(synd_spawn)
-				new_character.loc = get_turf(synd_spawn)
+			new_character.forceMove(pick(GLOB.nukeop_start))
 			call(/datum/game_mode/proc/equip_syndicate)(new_character)
 		if("Space Ninja")
 			var/list/ninja_spawn = list()
-			for(var/obj/effect/landmark/L in GLOB.landmarks_list)
-				if(L.name=="carpspawn")
-					ninja_spawn += L
+			for(var/obj/effect/landmark/carpspawn/L in GLOB.landmarks_list)
+				ninja_spawn += L
 			var/datum/antagonist/ninja/ninjadatum = new_character.mind.has_antag_datum(ANTAG_DATUM_NINJA)
 			ninjadatum.equip_space_ninja()
 			if(ninja_spawn.len)
-				var/obj/effect/landmark/ninja_spawn_here = pick(ninja_spawn)
-				new_character.loc = ninja_spawn_here.loc
+				new_character.forceMove(pick(ninja_spawn))
 
 		else//They may also be a cyborg or AI.
 			switch(new_character.mind.assigned_role)
@@ -714,8 +709,9 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		to_chat(usr, "Nope you can't do this, the game's already started. This only works before rounds!")
 		return
 
-	if(config.force_random_names)
-		config.force_random_names = 0
+	var/frn = CONFIG_GET(flag/force_random_names)
+	if(frn)
+		CONFIG_SET(flag/force_random_names, FALSE)
 		message_admins("Admin [key_name_admin(usr)] has disabled \"Everyone is Special\" mode.")
 		to_chat(usr, "Disabled.")
 		return
@@ -733,7 +729,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 	to_chat(usr, "<i>Remember: you can always disable the randomness by using the verb again, assuming the round hasn't started yet</i>.")
 
-	config.force_random_names = 1
+	CONFIG_SET(flag/force_random_names, TRUE)
 	SSblackbox.add_details("admin_verb","Make Everyone Random") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 
@@ -741,15 +737,15 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	set category = "Server"
 	set name = "Toggle random events on/off"
 	set desc = "Toggles random events such as meteors, black holes, blob (but not space dust) on/off"
-	if(!config.allow_random_events)
-		config.allow_random_events = 1
+	var/new_are = !CONFIG_GET(flag/allow_random_events)
+	CONFIG_SET(flag/allow_random_events, new_are)
+	if(new_are)
 		to_chat(usr, "Random events enabled")
 		message_admins("Admin [key_name_admin(usr)] has enabled random events.")
 	else
-		config.allow_random_events = 0
 		to_chat(usr, "Random events disabled")
 		message_admins("Admin [key_name_admin(usr)] has disabled random events.")
-	SSblackbox.add_details("admin_toggle","Toggle Random Events|[config.allow_random_events]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	SSblackbox.add_details("admin_toggle","Toggle Random Events|[new_are]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 
 /client/proc/admin_change_sec_level()
@@ -851,8 +847,9 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 
 	var/dat = {"
 	<html><head><title>Create Outfit</title></head><body>
-	<form name="outfit" action="byond://?src=\ref[src]" method="get">
+	<form name="outfit" action="byond://?src=\ref[src];[HrefToken()]" method="get">
 	<input type="hidden" name="src" value="\ref[src]">
+	[HrefTokenFormField()]
 	<input type="hidden" name="create_outfit" value="1">
 	<table>
 		<tr>

code/modules/admin/verbs/reestablish_db_connection.dm

@@ -1,7 +1,7 @@
 /client/proc/reestablish_db_connection()
 	set category = "Special Verbs"
 	set name = "Reestablish DB Connection"
-	if (!config.sql_enabled)
+	if (!CONFIG_GET(flag/sql_enabled))
 		to_chat(usr, "<span class='adminnotice'>The Database is not enabled!</span>")
 		return
 

code/modules/atmospherics/environmental/LINDA_fire.dm

@@ -49,7 +49,7 @@
 	icon = 'icons/effects/fire.dmi'
 	icon_state = "1"
 	layer = ABOVE_OPEN_TURF_LAYER
-	light_range = 3
+	light_range = LIGHT_RANGE_FIRE
 	light_color = LIGHT_COLOR_FIRE
 
 	var/volume = 125
@@ -175,3 +175,15 @@
 	..()
 	if(isliving(L))
 		L.fire_act(temperature, volume)
+
+/obj/effect/dummy/fire
+	name = "fire"
+	desc = "OWWWWWW. IT BURNS. Tell a coder if you're seeing this."
+	icon_state = "nothing"
+	light_color = LIGHT_COLOR_FIRE
+	light_range = LIGHT_RANGE_FIRE
+
+/obj/effect/dummy/fire/Initialize()
+	. = ..()
+	if(!isliving(loc))
+		qdel(src)

code/modules/atmospherics/gasmixtures/reactions.dm

@@ -108,8 +108,6 @@
 	var/list/cached_gases = air.gases //this speeds things up because accessing datum vars is slow
 	var/temperature = air.temperature
 	var/list/cached_results = air.reaction_results
-
-	//to_chat(world, "pre [temperature], [cached_gases["o2"][MOLES]], [cached_gases["plasma"][MOLES]]")
 	cached_results[id] = 0
 
 	//General volatile gas burn
@@ -165,8 +163,6 @@
 		if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
 			air.temperature = (temperature*old_heat_capacity + energy_released)/new_heat_capacity
 
-	//to_chat(world, "post [temperature], [cached_gases["o2"][MOLES]], [cached_gases["plasma"][MOLES]]")
-
 	//let the floor know a fire is happening
 	if(istype(location))
 		temperature = air.temperature
@@ -201,7 +197,6 @@
 		//Fusion wont occur if the level of impurities is too high.
 		return NO_REACTION
 
-	//to_chat(world, "pre [temperature, [cached_gases["plasma"][MOLES]], [cached_gases["co2"][MOLES]])
 	var/old_heat_capacity = air.heat_capacity()
 	var/carbon_efficency = min(cached_gases["plasma"][MOLES]/cached_gases["co2"][MOLES],MAX_CARBON_EFFICENCY)
 	var/reaction_energy = air.thermal_energy()
@@ -226,7 +221,6 @@
 		if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
 			air.temperature = max(((temperature*old_heat_capacity + reaction_energy)/new_heat_capacity),TCMB)
 			//Prevents whatever mechanism is causing it to hit negative temperatures.
-		//to_chat(world, "post [temperature], [cached_gases["plasma"][MOLES]], [cached_gases["co2"][MOLES]])
 		return REACTING
 
 #undef REACTING

code/modules/atmospherics/machinery/airalarm.dm

@@ -415,7 +415,6 @@
 	signal.data["sigtype"] = "command"
 
 	radio_connection.post_signal(src, signal, GLOB.RADIO_FROM_AIRALARM)
-//			to_chat(world, text("Signal [] Broadcasted to []", command, target))
 
 	return 1
 
@@ -709,6 +708,16 @@
 					qdel(W)
 				return
 
+			if(istype(W, /obj/item/device/electroadaptive_pseudocircuit))
+				var/obj/item/device/electroadaptive_pseudocircuit/P = W
+				if(!P.adapt_circuit(user, 25))
+					return
+				user.visible_message("<span class='notice'>[user] fabricates a circuit and places it into [src].</span>", \
+				"<span class='notice'>You adapt an air alarm circuit and slot it into the assembly.</span>")
+				buildstage = 1
+				update_icon()
+				return
+
 			if(istype(W, /obj/item/wrench))
 				to_chat(user, "<span class='notice'>You detach \the [src] from the wall.</span>")
 				playsound(src.loc, W.usesound, 50, 1)

code/modules/atmospherics/machinery/atmosmachinery.dm

@@ -34,6 +34,11 @@ Pipelines + Other Objects -> Pipe network
 	var/device_type = 0
 	var/list/obj/machinery/atmospherics/nodes
 
+/obj/machinery/atmospherics/examine(mob/living/user)
+	..()
+	if(is_type_in_list(src, GLOB.ventcrawl_machinery) && user.ventcrawler)
+		to_chat(user, "<span class='notice'>Alt-click to crawl through it.</span>")
+
 /obj/machinery/atmospherics/New(loc, process = TRUE)
 	nodes = new(device_type)
 	if (!armor)
@@ -91,7 +96,7 @@ Pipelines + Other Objects -> Pipe network
 
 /obj/machinery/atmospherics/proc/can_be_node(obj/machinery/atmospherics/target)
 	if(target.initialize_directions & get_dir(target,src))
-		return 1
+		return TRUE
 
 /obj/machinery/atmospherics/proc/pipeline_expansion()
 	return nodes
@@ -208,6 +213,17 @@ Pipelines + Other Objects -> Pipe network
 		pipe_overlay = . = pipeimages[identifier] = image(iconset, iconstate, dir = direction)
 		pipe_overlay.color = col
 
+/obj/machinery/atmospherics/proc/icon_addintact(var/obj/machinery/atmospherics/node)
+	var/image/img = getpipeimage('icons/obj/atmospherics/components/binary_devices.dmi', "pipe_intact", get_dir(src,node), node.pipe_color)
+	underlays += img
+	return img.dir
+
+/obj/machinery/atmospherics/proc/icon_addbroken(var/connected = FALSE)
+	var/unconnected = (~connected) & initialize_directions
+	for(var/direction in GLOB.cardinals)
+		if(unconnected & direction)
+			underlays += getpipeimage('icons/obj/atmospherics/components/binary_devices.dmi', "pipe_exposed", direction)
+
 /obj/machinery/atmospherics/on_construction(pipe_type, obj_color)
 	if(can_unwrench)
 		add_atom_colour(obj_color, FIXED_COLOUR_PRIORITY)
@@ -275,7 +291,7 @@ Pipelines + Other Objects -> Pipe network
 
 
 /obj/machinery/atmospherics/proc/can_crawl_through()
-	return 1
+	return TRUE
 
 /obj/machinery/atmospherics/proc/returnPipenets()
 	return list()
@@ -285,4 +301,4 @@ Pipelines + Other Objects -> Pipe network
 
 //Used for certain children of obj/machinery/atmospherics to not show pipe vision when mob is inside it.
 /obj/machinery/atmospherics/proc/can_see_pipes()
-	return 1
+	return TRUE

code/modules/atmospherics/machinery/components/binary_devices/circulator.dm

@@ -40,8 +40,6 @@
 
 		last_pressure_delta = pressure_delta
 
-		//to_chat(world, "pressure_delta = [pressure_delta]; transfer_moles = [transfer_moles];")
-
 		//Actually transfer the gas
 		var/datum/gas_mixture/removed = air2.remove(transfer_moles)
 

code/modules/atmospherics/machinery/components/binary_devices/valve.dm

@@ -5,7 +5,7 @@ It's like a regular ol' straight pipe, but you can turn it on and off.
 /obj/machinery/atmospherics/components/binary/valve
 	icon_state = "mvalve_map"
 	name = "manual valve"
-	desc = "A pipe valve"
+	desc = "A pipe with a valve that can be used to disable flow of gas through it."
 
 	can_unwrench = TRUE
 

code/modules/atmospherics/machinery/components/components_base.dm

@@ -23,18 +23,6 @@ On top of that, now people can add component-speciic procs/vars if they want!
 Iconnery
 */
 
-/obj/machinery/atmospherics/components/proc/icon_addintact(var/obj/machinery/atmospherics/node)
-	var/image/img = getpipeimage('icons/obj/atmospherics/components/binary_devices.dmi', "pipe_intact", get_dir(src,node), node.pipe_color)
-	underlays += img
-
-	return img.dir
-
-/obj/machinery/atmospherics/components/proc/icon_addbroken(var/connected = FALSE)
-	var/unconnected = (~connected) & initialize_directions
-	for(var/direction in GLOB.cardinals)
-		if(unconnected & direction)
-			underlays += getpipeimage('icons/obj/atmospherics/components/binary_devices.dmi', "pipe_exposed", direction)
-
 /obj/machinery/atmospherics/components/proc/update_icon_nopipes()
 	return
 
@@ -52,7 +40,7 @@ Iconnery
 	if(!showpipe)
 		return //no need to update the pipes if they aren't showing
 
-	var/connected = FALSE
+	var/connected = 0 //Direction bitset
 
 	for(DEVICE_TYPE_LOOP) //adds intact pieces
 		if(NODE_I)

code/modules/atmospherics/machinery/components/trinary_devices/filter.dm

@@ -1,6 +1,7 @@
 /obj/machinery/atmospherics/components/trinary/filter
 	name = "gas filter"
 	icon_state = "filter_off"
+	desc = "Very useful for filtering gasses."
 	density = FALSE
 	can_unwrench = TRUE
 	var/on = FALSE

code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm

@@ -4,6 +4,7 @@
 
 	name = "gas mixer"
 	can_unwrench = TRUE
+	desc = "Very useful for mixing gasses."
 
 	var/on = FALSE
 

code/modules/atmospherics/machinery/components/unary_devices/cryo.dm

@@ -33,7 +33,7 @@
 
 	var/escape_in_progress = FALSE
 	var/message_cooldown
-	var/breakout_time = 0.5
+	var/breakout_time = 300
 
 /obj/machinery/atmospherics/components/unary/cryo_cell/Initialize()
 	. = ..()
@@ -246,9 +246,9 @@
 	user.changeNext_move(CLICK_CD_BREAKOUT)
 	user.last_special = world.time + CLICK_CD_BREAKOUT
 	user.visible_message("<span class='notice'>You see [user] kicking against the glass of [src]!</span>", \
-		"<span class='notice'>You struggle inside [src], kicking the release with your foot... (this will take about [(breakout_time<1) ? "[breakout_time*60] seconds" : "[breakout_time] minute\s"].)</span>", \
+		"<span class='notice'>You struggle inside [src], kicking the release with your foot... (this will take about [DisplayTimeText(breakout_time)].)</span>", \
 		"<span class='italics'>You hear a thump from [src].</span>")
-	if(do_after(user,(breakout_time*60*10), target = src)) //minutes * 60seconds * 10deciseconds
+	if(do_after(user,(breakout_time), target = src))
 		if(!user || user.stat != CONSCIOUS || user.loc != src )
 			return
 		user.visible_message("<span class='warning'>[user] successfully broke out of [src]!</span>", \
@@ -348,7 +348,7 @@
 	data["cellTemperature"] = round(air1.temperature, 1)
 
 	data["isBeakerLoaded"] = beaker ? TRUE : FALSE
-	var beakerContents = list()
+	var/beakerContents = list()
 	if(beaker && beaker.reagents && beaker.reagents.reagent_list.len)
 		for(var/datum/reagent/R in beaker.reagents.reagent_list)
 			beakerContents += list(list("name" = R.name, "volume" = R.volume))
@@ -377,6 +377,8 @@
 		if("ejectbeaker")
 			if(beaker)
 				beaker.forceMove(loc)
+				if(Adjacent(usr) && !issilicon(usr))
+					usr.put_in_hands(beaker)
 				beaker = null
 				. = TRUE
 	update_icon()
@@ -393,4 +395,11 @@
 /obj/machinery/atmospherics/components/unary/cryo_cell/can_see_pipes()
 	return 0 //you can't see the pipe network when inside a cryo cell.
 
+/obj/machinery/atmospherics/components/unary/cryo_cell/return_temperature()
+	var/datum/gas_mixture/G = AIR1
+
+	if(G.total_moles() > 10)
+		return G.temperature
+	return ..()
+
 #undef CRYOMOBS

code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm

@@ -196,39 +196,39 @@
 			filtered_out.temperature = removed.temperature
 
 			if(scrub_Toxins && removed_gases["plasma"])
-				filtered_out.assert_gas("plasma")
+				filtered_out.add_gas("plasma")
 				filtered_gases["plasma"][MOLES] = removed_gases["plasma"][MOLES]
-				removed.gases["plasma"][MOLES] = 0
+				removed_gases["plasma"][MOLES] = 0
 
 			if(scrub_CO2 && removed_gases["co2"])
-				filtered_out.assert_gas("co2")
-				filtered_out.gases["co2"][MOLES] = removed_gases["co2"][MOLES]
-				removed.gases["co2"][MOLES] = 0
+				filtered_out.add_gas("co2")
+				filtered_gases["co2"][MOLES] = removed_gases["co2"][MOLES]
+				removed_gases["co2"][MOLES] = 0
 
 			if(removed_gases["agent_b"])
-				filtered_out.assert_gas("agent_b")
-				filtered_out.gases["agent_b"][MOLES] = removed_gases["agent_b"][MOLES]
-				removed.gases["agent_b"][MOLES] = 0
+				filtered_out.add_gas("agent_b")
+				filtered_gases["agent_b"][MOLES] = removed_gases["agent_b"][MOLES]
+				removed_gases["agent_b"][MOLES] = 0
 
 			if(scrub_N2O && removed_gases["n2o"])
-				filtered_out.assert_gas("n2o")
-				filtered_out.gases["n2o"][MOLES] = removed_gases["n2o"][MOLES]
-				removed.gases["n2o"][MOLES] = 0
+				filtered_out.add_gas("n2o")
+				filtered_gases["n2o"][MOLES] = removed_gases["n2o"][MOLES]
+				removed_gases["n2o"][MOLES] = 0
 
 			if(scrub_BZ && removed_gases["bz"])
-				filtered_out.assert_gas("bz")
-				filtered_out.gases["bz"][MOLES] = removed_gases["bz"][MOLES]
-				removed.gases["bz"][MOLES] = 0
+				filtered_out.add_gas("bz")
+				filtered_gases["bz"][MOLES] = removed_gases["bz"][MOLES]
+				removed_gases["bz"][MOLES] = 0
 
 			if(scrub_Freon && removed_gases["freon"])
-				filtered_out.assert_gas("freon")
-				filtered_out.gases["freon"][MOLES] = removed_gases["freon"][MOLES]
-				removed.gases["freon"][MOLES] = 0
+				filtered_out.add_gas("freon")
+				filtered_gases["freon"][MOLES] = removed_gases["freon"][MOLES]
+				removed_gases["freon"][MOLES] = 0
 
 			if(scrub_WaterVapor && removed_gases["water_vapor"])
-				filtered_out.assert_gas("water_vapor")
-				filtered_out.gases["water_vapor"][MOLES] = removed_gases["water_vapor"][MOLES]
-				removed.gases["water_vapor"][MOLES] = 0
+				filtered_out.add_gas("water_vapor")
+				filtered_gases["water_vapor"][MOLES] = removed_gases["water_vapor"][MOLES]
+				removed_gases["water_vapor"][MOLES] = 0
 
 			removed.garbage_collect()
 

code/modules/atmospherics/machinery/datum_pipeline.dm

@@ -5,7 +5,7 @@
 	var/list/obj/machinery/atmospherics/pipe/members
 	var/list/obj/machinery/atmospherics/components/other_atmosmch
 
-	var/update = 1
+	var/update = TRUE
 
 /datum/pipeline/New()
 	other_airs = list()
@@ -25,7 +25,7 @@
 
 /datum/pipeline/process()
 	if(update)
-		update = 0
+		update = FALSE
 		reconcile_air()
 	update = air.react()
 
@@ -114,6 +114,7 @@
 	other_airs.Add(E.other_airs)
 	E.members.Cut()
 	E.other_atmosmch.Cut()
+	update = TRUE
 	qdel(E)
 
 /obj/machinery/atmospherics/proc/addMember(obj/machinery/atmospherics/A)
@@ -195,7 +196,7 @@
 				(partial_heat_capacity*target.heat_capacity/(partial_heat_capacity+target.heat_capacity))
 
 			air.temperature -= heat/total_heat_capacity
-	update = 1
+	update = TRUE
 
 /datum/pipeline/proc/return_air()
 	. = other_airs + air

code/modules/atmospherics/machinery/other/zvent.dm

@@ -5,6 +5,7 @@
 	icon_state = "vent_map"
 	density = FALSE
 	anchored=1
+	desc = "This may be needed some day."
 
 	var/on = FALSE
 	var/volume_rate = 800

code/modules/atmospherics/machinery/pipes/bluespace_pipe.dm

@@ -0,0 +1,47 @@
+GLOBAL_LIST_EMPTY(bluespace_pipes)
+
+/obj/machinery/atmospherics/pipe/bluespace
+	name = "bluespace pipe"
+	desc = "Transmits gas across large distances of space. Developed using bluespace technology."
+	icon = 'icons/obj/atmospherics/pipes/bluespace.dmi'
+	icon_state = "map"
+	dir = SOUTH
+	initialize_directions = SOUTH
+	device_type = UNARY
+	can_buckle = FALSE
+
+/obj/machinery/atmospherics/pipe/bluespace/New()
+	icon_state = "pipe"
+	GLOB.bluespace_pipes += src
+	..()
+
+/obj/machinery/atmospherics/pipe/bluespace/Destroy()
+	GLOB.bluespace_pipes -= src
+	for(var/p in GLOB.bluespace_pipes)
+		var/obj/machinery/atmospherics/pipe/bluespace/P = p
+		QDEL_NULL(P.parent)
+		P.build_network()
+	return ..()
+
+/obj/machinery/atmospherics/pipe/bluespace/SetInitDirections()
+	initialize_directions = dir
+
+/obj/machinery/atmospherics/pipe/bluespace/pipeline_expansion()
+	return ..() + GLOB.bluespace_pipes - src
+
+/obj/machinery/atmospherics/components/pipe/bluespace/hide()
+	update_icon()
+
+/obj/machinery/atmospherics/pipe/bluespace/update_icon(showpipe)
+	underlays.Cut()
+	var/turf/T = loc
+	if(level != 2 && T.intact)
+		return //no need to update the pipes if they aren't showing
+	var/connected = 0 //Direction bitset
+	for(DEVICE_TYPE_LOOP) //adds intact pieces
+		if(NODE_I)
+			connected |= icon_addintact(NODE_I)
+	icon_addbroken(connected) //adds broken pieces
+
+/obj/machinery/atmospherics/pipe/bluespace/paint()
+	return FALSE

code/modules/atmospherics/machinery/pipes/pipes.dm

@@ -42,11 +42,6 @@
 		invisibility = i ? INVISIBILITY_MAXIMUM : 0
 	update_icon()
 
-/obj/machinery/atmospherics/pipe/proc/check_pressure(pressure)
-	//Return 1 if parent should continue checking other pipes
-	//Return null if parent should stop checking other pipes. Recall: del(src) will by default return null
-	return 1
-
 /obj/machinery/atmospherics/pipe/proc/releaseAirToTurf()
 	if(air_temporary)
 		var/turf/T = loc
@@ -103,3 +98,10 @@
 	if(damage_flag == "melee" && damage_amount < 12)
 		return 0
 	. = ..()
+
+/obj/machinery/atmospherics/pipe/proc/paint(paint_color)
+	add_atom_colour(paint_color, FIXED_COLOUR_PRIORITY)
+	pipe_color = paint_color
+	update_node_icon()
+	return TRUE
+

code/modules/awaymissions/capture_the_flag.dm

@@ -210,7 +210,7 @@
 		return
 	if(user.ckey in team_members)
 		if(user.ckey in recently_dead_ckeys)
-			to_chat(user, "It must be more than [respawn_cooldown/10] seconds from your last death to respawn!")
+			to_chat(user, "It must be more than [DisplayTimeText(respawn_cooldown)] from your last death to respawn!")
 			return
 		var/client/new_team_member = user.client
 		if(user.mind && user.mind.current)
@@ -320,7 +320,7 @@
 	for(var/atm in A)
 		if(!is_type_in_typecache(atm, ctf_object_typecache))
 			qdel(atm)
-		if(istype(atm, /obj/structure))
+		if(isstructure(atm))
 			var/obj/structure/S = atm
 			S.obj_integrity = S.max_integrity
 

code/modules/awaymissions/gateway.dm

@@ -60,10 +60,6 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
 		return
 	icon_state = "off"
 
-//prevents shuttles attempting to rotate this since it messes up sprites
-/obj/machinery/gateway/shuttleRotate()
-	return
-
 /obj/machinery/gateway/attack_hand(mob/user)
 	if(!detect())
 		return
@@ -80,7 +76,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
 	if(!GLOB.the_gateway)
 		GLOB.the_gateway = src
 	update_icon()
-	wait = world.time + config.gateway_delay	//+ thirty minutes default
+	wait = world.time + CONFIG_GET(number/gateway_delay)	//+ thirty minutes default
 	awaygate = locate(/obj/machinery/gateway/centeraway)
 
 /obj/machinery/gateway/centerstation/Destroy()
@@ -123,7 +119,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
 		to_chat(user, "<span class='notice'>Error: No destination found.</span>")
 		return
 	if(world.time < wait)
-		to_chat(user, "<span class='notice'>Error: Warpspace triangulation in progress. Estimated time to completion: [round(((wait - world.time) / 10) / 60)] minutes.</span>")
+		to_chat(user, "<span class='notice'>Error: Warpspace triangulation in progress. Estimated time to completion: [DisplayTimeText(wait - world.time)].</span>")
 		return
 
 	for(var/obj/machinery/gateway/G in linked)

code/modules/awaymissions/super_secret_room.dm

@@ -9,10 +9,13 @@
 	var/times_spoken_to = 0
 	var/list/shenanigans = list()
 
-/obj/structure/speaking_tile/New()
-	var/savefile/S = new /savefile("data/npc_saves/Poly.sav")
-	S["phrases"] 			>> shenanigans
-	..()
+/obj/structure/speaking_tile/Initialize()
+	. = ..()
+	var/json_file = file("data/npc_saves/Poly.json")
+	if(!fexists(json_file))
+		return
+	var/list/json = json_decode(file2text(json_file))
+	shenanigans = json["phrases"]
 
 /obj/structure/speaking_tile/interact(mob/user)
 	if(!isliving(user) || speaking)

code/modules/cargo/packs.dm

@@ -1644,6 +1644,10 @@
 	                /obj/item/toy/nuke,
 	                /obj/item/toy/minimeteor,
 	                /obj/item/toy/plush/carpplushie,
+	                /obj/item/toy/plush/lizardplushie,
+	                /obj/item/toy/plush/snakeplushie,
+	                /obj/item/toy/plush/nukeplushie,
+	                /obj/item/toy/plush/slimeplushie,
 	                /obj/item/coin/antagtoken,
 	                /obj/item/stack/tile/fakespace/loaded,
 	                /obj/item/gun/ballistic/shotgun/toy/crossbow,

code/modules/client/asset_cache.dm

@@ -317,6 +317,9 @@ GLOBAL_LIST_EMPTY(asset_datums)
 		"chevron.png" = 'html/chevron.png',
 		"chevron-expand.png" = 'html/chevron-expand.png',
 		"scales.png" = 'html/scales.png',
+		"coding.png" = 'html/coding.png',
+		"ban.png" = 'html/ban.png',
+		"chrome-wrench.png" = 'html/chrome-wrench.png',
 		"changelog.css" = 'html/changelog.css'
 	)
 

code/modules/client/client_procs.dm

@@ -42,7 +42,8 @@
 			to_chat(src, "<span class='danger'>An error has been detected in how your client is receiving resources. Attempting to correct.... (If you keep seeing these messages you might want to close byond and reconnect)</span>")
 			src << browse("...", "window=asset_cache_browser")
 
-	if (!holder && config.minutetopiclimit)
+	var/mtl = CONFIG_GET(number/minute_topic_limit)
+	if (!holder && mtl)
 		var/minute = round(world.time, 600)
 		if (!topiclimiter)
 			topiclimiter = new(LIMITER_SIZE)
@@ -50,17 +51,18 @@
 			topiclimiter[CURRENT_MINUTE] = minute
 			topiclimiter[MINUTE_COUNT] = 0
 		topiclimiter[MINUTE_COUNT] += 1
-		if (topiclimiter[MINUTE_COUNT] > config.minutetopiclimit)
+		if (topiclimiter[MINUTE_COUNT] > mtl)
 			var/msg = "Your previous action was ignored because you've done too many in a minute."
 			if (minute != topiclimiter[ADMINSWARNED_AT]) //only one admin message per-minute. (if they spam the admins can just boot/ban them)
 				topiclimiter[ADMINSWARNED_AT] = minute
 				msg += " Administrators have been informed."
-				log_game("[key_name(src)] Has hit the per-minute topic limit of [config.minutetopiclimit] topic calls in a given game minute")
-				message_admins("[key_name_admin(src)] [ADMIN_FLW(usr)] [ADMIN_KICK(usr)] Has hit the per-minute topic limit of [config.minutetopiclimit] topic calls in a given game minute")
+				log_game("[key_name(src)] Has hit the per-minute topic limit of [mtl] topic calls in a given game minute")
+				message_admins("[key_name_admin(src)] [ADMIN_FLW(usr)] [ADMIN_KICK(usr)] Has hit the per-minute topic limit of [mtl] topic calls in a given game minute")
 			to_chat(src, "<span class='danger'>[msg]</span>")
 			return
 
-	if (!holder && config.secondtopiclimit)
+	var/stl = CONFIG_GET(number/second_topic_limit)
+	if (!holder && stl)
 		var/second = round(world.time, 10)
 		if (!topiclimiter)
 			topiclimiter = new(LIMITER_SIZE)
@@ -68,7 +70,7 @@
 			topiclimiter[CURRENT_SECOND] = second
 			topiclimiter[SECOND_COUNT] = 0
 		topiclimiter[SECOND_COUNT] += 1
-		if (topiclimiter[SECOND_COUNT] > config.secondtopiclimit)
+		if (topiclimiter[SECOND_COUNT] > stl)
 			to_chat(src, "<span class='danger'>Your previous action was ignored because you've done too many in a second</span>")
 			return
 
@@ -111,7 +113,7 @@
 	return 1
 
 /client/proc/handle_spam_prevention(message, mute_type)
-	if(config.automute_on && !holder && src.last_message == message)
+	if(CONFIG_GET(flag/automute_on) && !holder && last_message == message)
 		src.last_message_count++
 		if(src.last_message_count >= SPAM_TRIGGER_AUTOMUTE)
 			to_chat(src, "<span class='danger'>You have exceeded the spam filter limit for identical messages. An auto-mute was applied.</span>")
@@ -175,11 +177,11 @@ GLOBAL_LIST(external_rsc_urls)
 		if(localhost_rank)
 			var/datum/admins/localhost_holder = new(localhost_rank, ckey)
 			localhost_holder.associate(src)
-	if(config.autoadmin)
+	if(CONFIG_GET(flag/autoadmin))
 		if(!GLOB.admin_datums[ckey])
 			var/datum/admin_rank/autorank
 			for(var/datum/admin_rank/R in GLOB.admin_ranks)
-				if(R.name == config.autoadmin_rank)
+				if(R.name == CONFIG_GET(string/autoadmin_rank))
 					autorank = R
 					break
 			if(!autorank)
@@ -205,7 +207,7 @@ GLOBAL_LIST(external_rsc_urls)
 
 	log_access("Login: [key_name(src)] from [address ? address : "localhost"]-[computer_id] || BYOND v[byond_version]")
 	var/alert_mob_dupe_login = FALSE
-	if(config.log_access)
+	if(CONFIG_GET(flag/log_access))
 		for(var/I in GLOB.clients)
 			if(!I || I == src)
 				continue
@@ -239,30 +241,32 @@ GLOBAL_LIST(external_rsc_urls)
 	connection_realtime = world.realtime
 	connection_timeofday = world.timeofday
 	winset(src, null, "command=\".configure graphics-hwmode on\"")
-	if (byond_version < config.client_error_version)		//Out of date client.
+	var/cev = CONFIG_GET(number/client_error_version)
+	var/cwv = CONFIG_GET(number/client_warn_version)
+	if (byond_version < cev)		//Out of date client.
 		to_chat(src, "<span class='danger'><b>Your version of byond is too old:</b></span>")
-		to_chat(src, config.client_error_message)
+		to_chat(src, CONFIG_GET(string/client_error_message))
 		to_chat(src, "Your version: [byond_version]")
-		to_chat(src, "Required version: [config.client_error_version] or later")
+		to_chat(src, "Required version: [cev] or later")
 		to_chat(src, "Visit http://www.byond.com/download/ to get the latest version of byond.")
 		if (holder)
 			to_chat(src, "Because you are an admin, you are being allowed to walk past this limitation, But it is still STRONGLY suggested you upgrade")
 		else
 			qdel(src)
 			return 0
-	else if (byond_version < config.client_warn_version)	//We have words for this client.
+	else if (byond_version < cwv)	//We have words for this client.
 		to_chat(src, "<span class='danger'><b>Your version of byond may be getting out of date:</b></span>")
-		to_chat(src, config.client_warn_message)
+		to_chat(src, CONFIG_GET(string/client_warn_message))
 		to_chat(src, "Your version: [byond_version]")
-		to_chat(src, "Required version to remove this message: [config.client_warn_version] or later")
+		to_chat(src, "Required version to remove this message: [cwv] or later")
 		to_chat(src, "Visit http://www.byond.com/download/ to get the latest version of byond.")
 
 	if (connection == "web" && !holder)
-		if (!config.allowwebclient)
+		if (!CONFIG_GET(flag/allow_webclient))
 			to_chat(src, "Web client is disabled")
 			qdel(src)
 			return 0
-		if (config.webclientmembersonly && !IsByondMember())
+		if (CONFIG_GET(flag/webclient_only_byond_members) && !IsByondMember())
 			to_chat(src, "Sorry, but the web client is restricted to byond members only.")
 			qdel(src)
 			return 0
@@ -275,25 +279,24 @@ GLOBAL_LIST(external_rsc_urls)
 		add_admin_verbs()
 		to_chat(src, get_message_output("memo"))
 		adminGreet()
-		if((global.comms_key == "default_pwd" || length(global.comms_key) <= 6) && global.comms_allowed) //It's the default value or less than 6 characters long, but it somehow didn't disable comms.
-			to_chat(src, "<span class='danger'>The server's API key is either too short or is the default value! Consider changing it immediately!</span>")
 
 	add_verbs_from_config()
 	var/cached_player_age = set_client_age_from_db(tdata) //we have to cache this because other shit may change it and we need it's current value now down below.
 	if (isnum(cached_player_age) && cached_player_age == -1) //first connection
 		player_age = 0
+	var/nnpa = CONFIG_GET(number/notify_new_player_age)
 	if (isnum(cached_player_age) && cached_player_age == -1) //first connection
-		if (config.notify_new_player_age >= 0)
+		if (nnpa >= 0)
 			message_admins("New user: [key_name_admin(src)] is connecting here for the first time.")
-			if (config.irc_first_connection_alert)
+			if (CONFIG_GET(flag/irc_first_connection_alert))
 				send2irc_adminless_only("New-user", "[key_name(src)] is connecting for the first time!")
-	else if (isnum(cached_player_age) && cached_player_age < config.notify_new_player_age)
+	else if (isnum(cached_player_age) && cached_player_age < nnpa)
 		message_admins("New user: [key_name_admin(src)] just connected with an age of [cached_player_age] day[(player_age==1?"":"s")]")
-	if(config.use_account_age_for_jobs && account_age >= 0)
+	if(CONFIG_GET(flag/use_account_age_for_jobs) && account_age >= 0)
 		player_age = account_age
-	if(account_age >= 0 && account_age < config.notify_new_player_account_age)
+	if(account_age >= 0 && account_age < nnpa)
 		message_admins("[key_name_admin(src)] (IP: [address], ID: [computer_id]) is a new BYOND account [account_age] day[(account_age==1?"":"s")] old, created on [account_join_date].")
-		if (config.irc_first_connection_alert)
+		if (CONFIG_GET(flag/irc_first_connection_alert))
 			send2irc_adminless_only("new_byond_user", "[key_name(src)] (IP: [address], ID: [computer_id]) is a new BYOND account [account_age] day[(account_age==1?"":"s")] old, created on [account_join_date].")
 	get_message_output("watchlist entry", ckey)
 	check_ip_intel()
@@ -305,7 +308,7 @@ GLOBAL_LIST(external_rsc_urls)
 
 	if(prefs.lastchangelog != GLOB.changelog_hash) //bolds the changelog button on the interface so we know there are updates.
 		to_chat(src, "<span class='info'>You have unread updates in the changelog.</span>")
-		if(config.aggressive_changelog)
+		if(CONFIG_GET(flag/aggressive_changelog))
 			changelog()
 		else
 			winset(src, "infowindow.changelog", "font-style=bold")
@@ -315,7 +318,7 @@ GLOBAL_LIST(external_rsc_urls)
 			to_chat(src, message)
 		GLOB.clientmessages.Remove(ckey)
 
-	if(config && config.autoconvert_notes)
+	if(CONFIG_GET(flag/autoconvert_notes))
 		convert_notes_sql(ckey)
 	to_chat(src, get_message_output("message", ckey))
 	if(!winexists(src, "asset_cache_browser")) // The client is using a custom skin, tell them.
@@ -419,15 +422,17 @@ GLOBAL_LIST(external_rsc_urls)
 	if(!query_client_in_db.Execute())
 		return
 	if(!query_client_in_db.NextRow())
-		if (config.panic_bunker && !holder && !(ckey in GLOB.deadmins))
+		if (CONFIG_GET(flag/panic_bunker) && !holder && !(ckey in GLOB.deadmins))
 			log_access("Failed Login: [key] - New account attempting to connect during panic bunker")
 			message_admins("<span class='adminnotice'>Failed Login: [key] - New account attempting to connect during panic bunker</span>")
 			to_chat(src, "Sorry but the server is currently not accepting connections from never before seen players.")
 			var/list/connectiontopic_a = params2list(connectiontopic)
-			if(config.panic_address && !connectiontopic_a["redirect"])
-				to_chat(src, "<span class='notice'>Sending you to [config.panic_server_name ? config.panic_server_name : config.panic_address].</span>")
+			var/list/panic_addr = CONFIG_GET(string/panic_address)
+			if(panic_addr && !connectiontopic_a["redirect"])
+				var/panic_name = CONFIG_GET(string/panic_server_name)
+				to_chat(src, "<span class='notice'>Sending you to [panic_name ? panic_name : panic_addr].</span>")
 				winset(src, null, "command=.options")
-				src << link("[config.panic_address]?redirect=1")
+				src << link("[panic_addr]?redirect=1")
 			qdel(src)
 			return
 
@@ -488,7 +493,7 @@ GLOBAL_LIST(external_rsc_urls)
 	if (connection != "seeker")
 		return
 	topic = params2list(topic)
-	if (!config.check_randomizer)
+	if (!CONFIG_GET(flag/check_randomizer))
 		return
 	var/static/cidcheck = list()
 	var/static/tokens = list()
@@ -581,15 +586,15 @@ GLOBAL_LIST(external_rsc_urls)
 
 /client/proc/check_ip_intel()
 	set waitfor = 0 //we sleep when getting the intel, no need to hold up the client connection while we sleep
-	if (config.ipintel_email)
+	if (CONFIG_GET(string/ipintel_email))
 		var/datum/ipintel/res = get_ip_intel(address)
-		if (res.intel >= config.ipintel_rating_bad)
+		if (res.intel >= CONFIG_GET(number/ipintel_rating_bad))
 			message_admins("<span class='adminnotice'>Proxy Detection: [key_name_admin(src)] IP intel rated [res.intel*100]% likely to be a Proxy/VPN.</span>")
 		ip_intel = res.intel
 
 
 /client/proc/add_verbs_from_config()
-	if(config.see_own_notes)
+	if(CONFIG_GET(flag/see_own_notes))
 		verbs += /client/proc/self_notes
 
 
@@ -599,7 +604,7 @@ GLOBAL_LIST(external_rsc_urls)
 
 //checks if a client is afk
 //3000 frames = 5 minutes
-/client/proc/is_afk(duration = config.inactivity_period)
+/client/proc/is_afk(duration = CONFIG_GET(number/inactivity_period))
 	if(inactivity > duration)
 		return inactivity
 	return FALSE

code/modules/client/preferences.dm

@@ -46,7 +46,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/inquisitive_ghost = 1
 	var/allow_midround_antag = 1
 	var/preferred_map = null
-
+	var/pda_style = MONO
+	
 	var/uses_glasses_colour = 0
 
 	//character preferences
@@ -206,7 +207,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 
 			dat += "<table width='100%'><tr><td width='24%' valign='top'>"
 
-			if(config.mutant_races)
+			if(CONFIG_GET(flag/join_with_mutant_race))
 				dat += "<b>Species:</b><BR><a href='?_src_=prefs;preference=species;task=input'>[pref_species.name]</a><BR>"
 			else
 				dat += "<b>Species:</b> Human<BR>"
@@ -258,7 +259,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 
 				dat += "</td>"
 
-			if(config.mutant_races) //We don't allow mutant bodyparts for humans either unless this is true.
+			if(CONFIG_GET(flag/join_with_mutant_race)) //We don't allow mutant bodyparts for humans either unless this is true.
 
 				if((MUTCOLORS in pref_species.species_traits) || (MUTCOLORS_PARTSONLY in pref_species.species_traits))
 
@@ -331,7 +332,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					dat += "<a href='?_src_=prefs;preference=legs;task=input'>[features["legs"]]</a><BR>"
 
 					dat += "</td>"
-			if(config.mutant_humans)
+			if(CONFIG_GET(flag/join_with_mutant_humans))
 
 				if("tail_human" in pref_species.mutant_bodyparts)
 					dat += "<td valign='top' width='7%'>"
@@ -370,6 +371,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			dat += "<b>Keybindings:</b> <a href='?_src_=prefs;preference=hotkeys'>[(hotkeys) ? "Hotkeys" : "Default"]</a><br>"
 			dat += "<b>Action Buttons:</b> <a href='?_src_=prefs;preference=action_buttons'>[(buttons_locked) ? "Locked In Place" : "Unlocked"]</a><br>"
 			dat += "<b>tgui Style:</b> <a href='?_src_=prefs;preference=tgui_fancy'>[(tgui_fancy) ? "Fancy" : "No Frills"]</a><br>"
+			dat += "<b>PDA Style:</b> <a href='?_src_=prefs;task=input;preference=PDA'>[pda_style]</a><br>"
 			dat += "<b>tgui Monitors:</b> <a href='?_src_=prefs;preference=tgui_lock'>[(tgui_lock) ? "Primary" : "All"]</a><br>"
 			dat += "<b>Window Flashing:</b> <a href='?_src_=prefs;preference=winflash'>[(windowflashing) ? "Yes" : "No"]</a><br>"
 			dat += "<b>Play admin midis:</b> <a href='?_src_=prefs;preference=hear_midis'>[(toggles & SOUND_MIDI) ? "Yes" : "No"]</a><br>"
@@ -381,7 +383,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			dat += "<b>Ghost pda:</b> <a href='?_src_=prefs;preference=ghost_pda'>[(chat_toggles & CHAT_GHOSTPDA) ? "All Messages" : "Nearest Creatures"]</a><br>"
 			dat += "<b>Pull requests:</b> <a href='?_src_=prefs;preference=pull_requests'>[(chat_toggles & CHAT_PULLR) ? "Yes" : "No"]</a><br>"
 			dat += "<b>Midround Antagonist:</b> <a href='?_src_=prefs;preference=allow_midround_antag'>[(toggles & MIDROUND_ANTAG) ? "Yes" : "No"]</a><br>"
-			if(config.allow_Metadata)
+			if(CONFIG_GET(flag/allow_metadata))
 				dat += "<b>OOC Notes:</b> <a href='?_src_=prefs;preference=metadata;task=input'>Edit </a><br>"
 
 			if(user.client)
@@ -418,7 +420,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 
 			dat += "<b>Ghosts of Others:</b> <a href='?_src_=prefs;task=input;preference=ghostothers'>[button_name]</a><br>"
 
-			if (config.maprotation)
+			if (CONFIG_GET(flag/maprotation))
 				var/p_map = preferred_map
 				if (!p_map)
 					p_map = "Default"
@@ -433,7 +435,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 							p_map = VM.map_name
 					else
 						p_map += " (No longer exists)"
-				if(config.allow_map_voting)
+				if(CONFIG_GET(flag/allow_map_voting))
 					dat += "<b>Preferred Map:</b> <a href='?_src_=prefs;preference=preferred_map;task=input'>[p_map]</a><br>"
 
 			dat += "<b>FPS:</b> <a href='?_src_=prefs;preference=clientfps;task=input'>[clientfps]</a><br>"
@@ -466,7 +468,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					dat += "<b>Be [capitalize(i)]:</b> <a href='?_src_=prefs;jobbancheck=[i]'>BANNED</a><br>"
 				else
 					var/days_remaining = null
-					if(config.use_age_restriction_for_jobs && ispath(GLOB.special_roles[i])) //If it's a game mode antag, check if the player meets the minimum age
+					if(ispath(GLOB.special_roles[i]) && CONFIG_GET(flag/use_age_restriction_for_jobs)) //If it's a game mode antag, check if the player meets the minimum age
 						var/mode_path = GLOB.special_roles[i]
 						var/datum/game_mode/temp_mode = new mode_path
 						days_remaining = temp_mode.get_remaining_days(user.client)
@@ -549,7 +551,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			if((job_civilian_low & ASSISTANT) && (rank != "Assistant") && !jobban_isbanned(user, "Assistant"))
 				HTML += "<font color=orange>[rank]</font></td><td></td></tr>"
 				continue
-			if(config.enforce_human_authority && !user.client.prefs.pref_species.qualifies_for_rank(rank, user.client.prefs.features))
+			if(CONFIG_GET(flag/enforce_human_authority) && !user.client.prefs.pref_species.qualifies_for_rank(rank, user.client.prefs.features))
 				if(user.client.prefs.pref_species.id == "human")
 					HTML += "<font color=red>[rank]</font></td><td><font color=red><b> \[MUTANT\]</b></font></td></tr>"
 				else
@@ -966,10 +968,10 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 
 				if("species")
 
-					var/result = input(user, "Select a species", "Species Selection") as null|anything in GLOB.roundstart_species
+					var/result = input(user, "Select a species", "Species Selection") as null|anything in CONFIG_GET(keyed_flag_list/roundstart_races)
 
 					if(result)
-						var/newtype = GLOB.roundstart_species[result]
+						var/newtype = GLOB.species_list[result]
 						pref_species = new newtype()
 						//Now that we changed our species, we must verify that the mutant colour is still allowed.
 						var/temp_hsv = RGBtoHSV(features["mcolor"])
@@ -1145,6 +1147,10 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					var/pickedui = input(user, "Choose your UI style.", "Character Preference")  as null|anything in list("Midnight", "Plasmafire", "Retro", "Slimecore", "Operative", "Clockwork")
 					if(pickedui)
 						UI_style = pickedui
+				if("PDA")
+					var/pickedPDA = input(user, "Choose your PDA style.", "Character Preference")  as null|anything in list(MONO, SHARE, ORBITRON, VT)
+					if(pickedPDA)
+						pda_style = pickedPDA
 
 		else
 			switch(href_list["preference"])
@@ -1259,7 +1265,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	if(be_random_body)
 		random_character(gender)
 
-	if(config.humans_need_surnames)
+	if(CONFIG_GET(flag/humans_need_surnames))
 		var/firstspace = findtext(real_name, " ")
 		var/name_length = length(real_name)
 		if(!firstspace)	//we need a surname
@@ -1294,7 +1300,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	character.dna.features = features.Copy()
 	character.dna.real_name = character.real_name
 	var/datum/species/chosen_species
-	if(pref_species != /datum/species/human && config.mutant_races)
+	if(pref_species != /datum/species/human && CONFIG_GET(flag/join_with_mutant_race))
 		chosen_species = pref_species.type
 	else
 		chosen_species = /datum/species/human

code/modules/client/preferences_savefile.dm

@@ -2,7 +2,7 @@
 #define SAVEFILE_VERSION_MIN	15
 
 //This is the current version, anything below this will attempt to update (if it's not obsolete)
-#define SAVEFILE_VERSION_MAX	18
+#define SAVEFILE_VERSION_MAX	19
 /*
 SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn
 	This proc checks if the current directory of the savefile S needs updating
@@ -107,7 +107,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 			joblessrole = BEASSISTANT
 	if(current_version < 17)
 		features["legs"] = "Normal Legs"
-
+	if(current_version < 19)
+		pda_style = "mono"
 
 
 /datum/preferences/proc/load_path(ckey,filename="preferences.sav")
@@ -158,6 +159,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["menuoptions"]		>> menuoptions
 	S["enable_tips"]		>> enable_tips
 	S["tip_delay"]			>> tip_delay
+	S["pda_style"]			>> pda_style
 
 	//try to fix any outdated data if necessary
 	if(needs_update >= 0)
@@ -182,7 +184,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	ghost_others	= sanitize_inlist(ghost_others, GLOB.ghost_others_options, GHOST_OTHERS_DEFAULT_OPTION)
 	menuoptions		= SANITIZE_LIST(menuoptions)
 	be_special		= SANITIZE_LIST(be_special)
-
+	pda_style		= sanitize_inlist(MONO, VT, SHARE, ORBITRON)
 
 	return 1
 
@@ -222,6 +224,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	WRITE_FILE(S["menuoptions"], menuoptions)
 	WRITE_FILE(S["enable_tips"], enable_tips)
 	WRITE_FILE(S["tip_delay"], tip_delay)
+	WRITE_FILE(S["pda_style"], pda_style)
 
 	return 1
 
@@ -249,11 +252,12 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	//Species
 	var/species_id
 	S["species"]			>> species_id
-	if(config.mutant_races && species_id && (species_id in GLOB.roundstart_species))
-		var/newtype = GLOB.roundstart_species[species_id]
+	var/list/roundstart_races = CONFIG_GET(keyed_flag_list/roundstart_races)
+	if(species_id && (species_id in roundstart_races) && CONFIG_GET(flag/join_with_mutant_race))
+		var/newtype = GLOB.species_list[species_id]
 		pref_species = new newtype()
-	else if (config.roundstart_races.len)
-		var/rando_race = pick(config.roundstart_races)
+	else if (roundstart_races.len)
+		var/rando_race = pick(roundstart_races)
 		if (rando_race)
 			pref_species = new rando_race()
 
@@ -286,7 +290,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["feature_lizard_spines"]			>> features["spines"]
 	S["feature_lizard_body_markings"]	>> features["body_markings"]
 	S["feature_lizard_legs"]			>> features["legs"]
-	if(!config.mutant_humans)
+	if(!CONFIG_GET(flag/join_with_mutant_humans))
 		features["tail_human"] = "none"
 		features["ears"] = "none"
 	else

code/modules/client/verbs/ooc.dm

@@ -62,7 +62,7 @@
 			if(holder)
 				if(!holder.fakekey || C.holder)
 					if(check_rights_for(src, R_ADMIN))
-						to_chat(C, "<span class='adminooc'>[config.allow_admin_ooccolor && prefs.ooccolor ? "<font color=[prefs.ooccolor]>" :"" ]<span class='prefix'>OOC:</span> <EM>[keyname][holder.fakekey ? "/([holder.fakekey])" : ""]:</EM> <span class='message'>[msg]</span></span></font>")
+						to_chat(C, "<span class='adminooc'>[CONFIG_GET(flag/allow_admin_ooccolor) && prefs.ooccolor ? "<font color=[prefs.ooccolor]>" :"" ]<span class='prefix'>OOC:</span> <EM>[keyname][holder.fakekey ? "/([holder.fakekey])" : ""]:</EM> <span class='message'>[msg]</span></span></font>")
 					else
 						to_chat(C, "<span class='adminobserverooc'><span class='prefix'>OOC:</span> <EM>[keyname][holder.fakekey ? "/([holder.fakekey])" : ""]:</EM> <span class='message'>[msg]</span></span>")
 				else
@@ -239,7 +239,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, OOC_COLOR)
 	set category = "OOC"
 	set desc = "View the notes that admins have written about you"
 
-	if(!config.see_own_notes)
+	if(!CONFIG_GET(flag/see_own_notes))
 		to_chat(usr, "<span class='notice'>Sorry, that function is not enabled on this server.</span>")
 		return
 

code/modules/clothing/chameleon.dm

@@ -211,6 +211,13 @@
 
 	var/datum/action/item_action/chameleon/change/chameleon_action
 
+/obj/item/clothing/under/chameleon/ratvar
+	name = "ratvarian engineer's jumpsuit"
+	desc = "A tough jumpsuit woven from alloy threads. It can take on the appearance of other jumpsuits."
+	icon_state = "engine"
+	item_state = "engi_suit"
+	item_color = "engine"
+
 /obj/item/clothing/under/chameleon/New()
 	..()
 	chameleon_action = new(src)

code/modules/clothing/clothing.dm

@@ -48,7 +48,7 @@
 	if(pockets && over_object == M)
 		return pockets.MouseDrop(over_object)
 
-	if(istype(usr.loc, /obj/mecha)) // stops inventory actions in a mech
+	if(ismecha(M.loc)) // stops inventory actions in a mech
 		return
 
 	if(!M.incapacitated() && loc == M && istype(over_object, /obj/screen/inventory/hand))

code/modules/clothing/ears/ears.dm

@@ -5,7 +5,7 @@
 	w_class = WEIGHT_CLASS_TINY
 	throwforce = 0
 	slot_flags = SLOT_EARS
-	resistance_flags = 0
+	resistance_flags = NONE
 
 /obj/item/clothing/ears/earmuffs
 	name = "earmuffs"
@@ -43,4 +43,4 @@
 		H.update_inv_ears()
 		H.update_inv_neck()
 		H.update_inv_head()
-	to_chat(owner, "<span class='notice'>You turn the music [headphones_on? "on. Untz Untz Untz!" : "off."]</span>")
+	to_chat(owner, "<span class='notice'>You turn the music [headphones_on? "on. Untz Untz Untz!" : "off."]</span>")

code/modules/clothing/glasses/glasses.dm

@@ -3,6 +3,11 @@
 	materials = list(MAT_GLASS = 250)
 	var/glass_colour_type = null //colors your vision when worn
 
+/obj/item/clothing/glasses/examine(mob/user)
+	..()
+	if(glass_colour_type && ishuman(user))
+		to_chat(user, "<span class='notice'>Alt-click to toggle its colors.</span>")
+
 /obj/item/clothing/glasses/visor_toggling()
 	..()
 	if(visor_vars_to_toggle & VISOR_VISIONFLAGS)
@@ -85,6 +90,7 @@
 	item_state = "glasses"
 	origin_tech = "materials=4;magnets=4;plasmatech=4;engineering=4"
 	darkness_view = 8
+	vision_flags = SEE_BLACKNESS
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 	glass_colour_type = /datum/client_colour/glass_colour/green
 

code/modules/clothing/head/jobs.dm

@@ -82,6 +82,10 @@
 	pockets = /obj/item/storage/internal/pocket/small/detective
 	dog_fashion = /datum/dog_fashion/head/detective
 
+/obj/item/clothing/head/fedora/det_hat/examine(mob/user)
+	..()
+	to_chat(user, "<span class='notice'>Alt-click to take a candy corn.</span>")
+
 /obj/item/clothing/head/fedora/det_hat/AltClick()
 	..()
 	if(ismob(loc))
@@ -172,4 +176,4 @@
 /obj/item/clothing/head/fedora/curator
 	name = "treasure hunter's fedora"
 	desc = "You got red text today kid, but it doesn't mean you have to like it."
-	icon_state = "curator"
+	icon_state = "curator"

code/modules/clothing/head/misc.dm

@@ -285,7 +285,7 @@
 
 /obj/item/clothing/head/crown/fancy
 	name = "magnificent crown"
-	desc = "A crown worn by only the highest emperors of the land."
+	desc = "A crown worn by only the highest emperors of the <s>land</s> space."
 	icon_state = "fancycrown"
 
 /obj/item/clothing/head/scarecrow_hat

code/modules/clothing/shoes/miscellaneous.dm

@@ -195,22 +195,24 @@
 	var/jumping = FALSE //are we mid-jump?
 
 /obj/item/clothing/shoes/bhop/ui_action_click(mob/user, action)
-	if(!isliving(usr))
+	if(!isliving(user))
 		return
 
 	if(jumping)
 		return
 
 	if(recharging_time > world.time)
-		to_chat(usr, "<span class='warning'>The boot's internal propulsion needs to recharge still!</span>")
+		to_chat(user, "<span class='warning'>The boot's internal propulsion needs to recharge still!</span>")
 		return
 
-	var/atom/target = get_edge_target_turf(usr, usr.dir) //gets the user's direction
+	var/atom/target = get_edge_target_turf(user, user.dir) //gets the user's direction
 
-	jumping = TRUE
-	playsound(src.loc, 'sound/effects/stealthoff.ogg', 50, 1, 1)
-	usr.visible_message("<span class='warning'>[usr] dashes forward into the air!</span>")
-	usr.throw_at(target, jumpdistance, jumpspeed, spin=0, diagonals_first = 1, callback = CALLBACK(src, .proc/hop_end))
+	if (user.throw_at(target, jumpdistance, jumpspeed, spin = FALSE, diagonals_first = TRUE, callback = CALLBACK(src, .proc/hop_end)))
+		jumping = TRUE
+		playsound(src, 'sound/effects/stealthoff.ogg', 50, 1, 1)
+		user.visible_message("<span class='warning'>[usr] dashes forward into the air!</span>")
+	else
+		to_chat(user, "<span class='warning'>Something prevents you from dashing forward!</span>")
 
 /obj/item/clothing/shoes/bhop/proc/hop_end()
 	jumping = FALSE

code/modules/clothing/spacesuits/chronosuit.dm

@@ -4,7 +4,7 @@
 	icon_state = "chronohelmet"
 	item_state = "chronohelmet"
 	slowdown = 1
-	armor = list(melee = 60, bullet = 30/*bullet through the visor*/, laser = 60, energy = 60, bomb = 30, bio = 90, rad = 90, fire = 100, acid = 100)
+	armor = list(melee = 60, bullet = 60, laser = 60, energy = 60, bomb = 30, bio = 90, rad = 90, fire = 100, acid = 100)
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 	var/obj/item/clothing/suit/space/chronos/suit = null
 

code/modules/clothing/spacesuits/miscellaneous.dm

@@ -173,7 +173,7 @@ Contains:
 	item_state = "ert_command"
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert
 	allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
-	armor = list(melee = 30, bullet = 50, laser = 30, energy = 50, bomb = 50, bio = 100, rad = 100, fire = 0, acid = 95)
+	armor = list(melee = 65, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 100, rad = 100, fire = 80, acid = 80)
 	slowdown = 0
 	strip_delay = 130
 

code/modules/clothing/under/accessories.dm

@@ -153,6 +153,16 @@
 	desc = "A bronze heart-shaped medal awarded for sacrifice. It is often awarded posthumously or for severe injury in the line of duty."
 	icon_state = "bronze_heart"
 
+/obj/item/clothing/accessory/medal/ribbon
+	name = "ribbon"
+	desc = "A ribbon"
+	icon_state = "cargo"
+	item_color = "cargo"
+
+/obj/item/clothing/accessory/medal/ribbon/cargo
+	name = "\"cargo tech of the shift\" award"
+	desc = "An award bestowed only upon those cargotechs who have exhibited devotion to their duty in keeping with the highest traditions of Cargonia."
+
 /obj/item/clothing/accessory/medal/silver
 	name = "silver medal"
 	desc = "A silver medal."

code/modules/detectivework/evidence.dm

@@ -23,7 +23,7 @@
 	icon_state = initial(icon_state)
 	desc = initial(desc)
 
-/obj/item/evidencebag/proc/evidencebagEquip(obj/item/I, mob/user)
+/obj/item/evidencebag/proc/evidencebagEquip(obj/item/I, mob/user)	
 	if(!istype(I) || I.anchored == 1)
 		return
 
@@ -43,9 +43,7 @@
 		if(istype(I.loc, /obj/item/storage))	//in a container.
 			var/obj/item/storage/U = I.loc
 			U.remove_from_storage(I, src)
-		if(user.is_holding(I))
-			user.dropItemToGround(I)
-		else
+		if(!user.dropItemToGround(I))
 			return
 
 	user.visible_message("[user] puts [I] into [src].", "<span class='notice'>You put [I] inside [src].</span>",\
@@ -62,7 +60,7 @@
 	add_overlay("evidence")	//should look nicer for transparent stuff. not really that important, but hey.
 
 	desc = "An evidence bag containing [I]. [I.desc]"
-	I.loc = src
+	I.forceMove(src)
 	w_class = I.w_class
 	return 1
 

code/modules/emoji/emoji_parse.dm

@@ -1,6 +1,6 @@
 /proc/emoji_parse(text)
 	. = text
-	if(!config.emojis)
+	if(!CONFIG_GET(flag/emojis))
 		return
 	var/static/list/emojis = icon_states(icon('icons/emoji.dmi'))
 	var/parsed = ""

code/modules/error_handler/error_handler.dm

@@ -33,14 +33,20 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
 
 	// We can runtime before config is initialized because BYOND initialize objs/map before a bunch of other stuff happens.
 	// This is a bunch of workaround code for that. Hooray!
-
-	var/configured_error_cooldown = initial(config.error_cooldown)
-	var/configured_error_limit = initial(config.error_limit)
-	var/configured_error_silence_time = initial(config.error_silence_time)
+	var/configured_error_cooldown
+	var/configured_error_limit
+	var/configured_error_silence_time
 	if(config)
-		configured_error_cooldown = config.error_cooldown
-		configured_error_limit = config.error_limit
-		configured_error_silence_time = config.error_silence_time
+		configured_error_cooldown = CONFIG_GET(number/error_cooldown)
+		configured_error_limit = CONFIG_GET(number/error_limit)
+		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)
+		CE = /datum/config_entry/number/error_limit
+		configured_error_limit = initial(CE.value)
+		CE = /datum/config_entry/number/error_silence_time
+		configured_error_silence_time = initial(CE.value)
 
 
 	//Each occurence of a unique error adds to its cooldown time...
@@ -88,7 +94,7 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
 	if(usrinfo) //If this info isn't null, it hasn't been added yet
 		desclines.Add(usrinfo)
 	if(silencing)
-		desclines += "  (This error will now be silenced for [configured_error_silence_time / 600] minutes)"
+		desclines += "  (This error will now be silenced for [DisplayTimeText(configured_error_silence_time)])"
 	if(GLOB.error_cache)
 		GLOB.error_cache.log_error(E, desclines)
 

code/modules/error_handler/error_viewer.dm

@@ -119,9 +119,10 @@ GLOBAL_DATUM(error_cache, /datum/error_viewer/error_cache)
 		//log_debug("Runtime in <b>[e.file]</b>, line <b>[e.line]</b>: <b>[html_encode(e.name)]</b> [error_entry.make_link(viewtext)]")
 		var/err_msg_delay
 		if(config)
-			err_msg_delay = config.error_msg_delay
+			err_msg_delay = CONFIG_GET(number/error_msg_delay)
 		else
-			err_msg_delay = initial(config.error_msg_delay)
+			var/datum/config_entry/CE = /datum/config_entry/number/error_msg_delay
+			err_msg_delay = initial(CE.value)
 		error_source.next_message_at = world.time + err_msg_delay
 
 /datum/error_viewer/error_source

code/modules/events/_event.dm

@@ -28,10 +28,9 @@
 	var/triggering	//admin cancellation
 
 /datum/round_event_control/New()
-	..()
 	if(config && !wizardevent) // Magic is unaffected by configs
-		earliest_start = Ceiling(earliest_start * config.events_min_time_mul)
-		min_players = Ceiling(min_players * config.events_min_players_mul)
+		earliest_start = Ceiling(earliest_start * CONFIG_GET(number/events_min_time_mul))
+		min_players = Ceiling(min_players * CONFIG_GET(number/events_min_players_mul))
 
 /datum/round_event_control/wizard
 	wizardevent = 1
@@ -158,19 +157,28 @@
 		return
 
 	if(activeFor == startWhen)
+		processing = FALSE
 		start()
+		processing = TRUE
 
 	if(activeFor == announceWhen)
+		processing = FALSE
 		announce()
+		processing = TRUE
 
 	if(startWhen < activeFor && activeFor < endWhen)
+		processing = FALSE
 		tick()
+		processing = TRUE
 
 	if(activeFor == endWhen)
+		processing = FALSE
 		end()
+		processing = TRUE
 
 	// Everything is done, let's clean up.
 	if(activeFor >= endWhen && activeFor >= announceWhen && activeFor >= startWhen)
+		processing = FALSE
 		kill()
 
 	activeFor++

code/modules/events/abductor.dm

@@ -3,9 +3,7 @@
 	typepath = /datum/round_event/ghost_role/abductor
 	weight = 10
 	max_occurrences = 1
-
 	min_players = 20
-
 	gamemode_blacklist = list("nuclear","wizard","revolution","abduction")
 
 /datum/round_event/ghost_role/abductor
@@ -17,40 +15,17 @@
 
 	if(candidates.len < 2)
 		return NOT_ENOUGH_PLAYERS
-	//Oh god why we can't have static functions
-	// I feel your pain, bro
-	var/number = SSticker.mode.abductor_teams + 1
 
-	var/datum/game_mode/abduction/temp
+	var/datum/game_mode/abduction/GM
 	if(SSticker.mode.config_tag == "abduction")
-		temp = SSticker.mode
+		GM = SSticker.mode
 	else
-		temp = new
+		GM = new
 
-	var/agent_mind = pick_n_take(candidates)
-	var/scientist_mind = pick_n_take(candidates)
+	var/mob/living/carbon/human/agent = makeBody(pick_n_take(candidates))
+	var/mob/living/carbon/human/scientist = makeBody(pick_n_take(candidates))
 
-	var/mob/living/carbon/human/agent = makeBody(agent_mind)
-	var/mob/living/carbon/human/scientist = makeBody(scientist_mind)
-
-	agent_mind = agent.mind
-	scientist_mind = scientist.mind
-
-	temp.scientists.len = number
-	temp.agents.len = number
-	temp.abductors.len = 2*number
-	temp.team_objectives.len = number
-	temp.team_names.len = number
-	temp.scientists[number] = scientist_mind
-	temp.agents[number] = agent_mind
-	temp.abductors |= list(agent_mind,scientist_mind)
-	temp.make_abductor_team(number,preset_scientist=scientist_mind,preset_agent=agent_mind)
-	temp.post_setup_team(number)
-
-	SSticker.mode.abductor_teams++
-
-	if(SSticker.mode.config_tag != "abduction")
-		SSticker.mode.abductors |= temp.abductors
+	GM.post_setup_team(GM.make_abductor_team(agent.mind, scientist.mind))
 
 	spawned_mobs += list(agent, scientist)
 	return SUCCESSFUL_SPAWN

code/modules/events/carp_migration.dm

@@ -18,11 +18,10 @@
 
 
 /datum/round_event/carp_migration/start()
-	for(var/obj/effect/landmark/C in GLOB.landmarks_list)
-		if(C.name == "carpspawn")
-			if(prob(95))
-				new /mob/living/simple_animal/hostile/carp(C.loc)
-			else
-				new /mob/living/simple_animal/hostile/carp/megacarp(C.loc)
+	for(var/obj/effect/landmark/carpspawn/C in GLOB.landmarks_list)
+		if(prob(95))
+			new /mob/living/simple_animal/hostile/carp(C.loc)
+		else
+			new /mob/living/simple_animal/hostile/carp/megacarp(C.loc)
 
 

code/modules/events/electrical_storm.dm

@@ -20,8 +20,8 @@
 
 	for(var/i=1, i <= lightsoutAmount, i++)
 		var/list/possibleEpicentres = list()
-		for(var/obj/effect/landmark/newEpicentre in GLOB.landmarks_list)
-			if(newEpicentre.name == "lightsout" && !(newEpicentre in epicentreList))
+		for(var/obj/effect/landmark/lightsout/newEpicentre in GLOB.landmarks_list)
+			if(!(newEpicentre in epicentreList))
 				possibleEpicentres += newEpicentre
 		if(possibleEpicentres.len)
 			epicentreList += pick(possibleEpicentres)

code/modules/events/holiday/halloween.dm

@@ -35,9 +35,8 @@
 	earliest_start = 0
 
 /datum/round_event/carp_migration/eyeballs/start()
-	for(var/obj/effect/landmark/C in GLOB.landmarks_list)
-		if(C.name == "carpspawn")
-			new /mob/living/simple_animal/hostile/carp/eyeball(C.loc)
+	for(var/obj/effect/landmark/carpspawn/C in GLOB.landmarks_list)
+		new /mob/living/simple_animal/hostile/carp/eyeball(C.loc)
 
 //Pumpking meteors waves
 /datum/round_event_control/meteor_wave/spooky

code/modules/events/holiday/xmas.dm

@@ -88,7 +88,7 @@
 	..()
 	if(FESTIVE_SEASON in SSevents.holidays)
 		new tree(get_turf(src))
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/xmastree/rdrod
 	name = "festivus pole spawner"

code/modules/events/operative.dm

@@ -16,9 +16,8 @@
 	var/mob/dead/selected = pick_n_take(candidates)
 
 	var/list/spawn_locs = list()
-	for(var/obj/effect/landmark/L in GLOB.landmarks_list)
-		if(L.name in list("ninjaspawn","carpspawn"))
-			spawn_locs += L.loc
+	for(var/obj/effect/landmark/carpspawn/L in GLOB.landmarks_list)
+		spawn_locs += L.loc
 	if(!spawn_locs.len)
 		return MAP_ERROR
 

code/modules/events/wizard/fakeexplosion.dm

@@ -7,4 +7,5 @@
 
 /datum/round_event/wizard/fake_explosion/start()
 	sound_to_playing_players('sound/machines/alarm.ogg')
-	addtimer(CALLBACK(SSticker, /datum/controller/subsystem/ticker/.proc/station_explosion_cinematic, 1, "fake"), 100) //:o)
+	sleep(100)
+	Cinematic(CINEMATIC_NUKE_FAKE,world)

code/modules/events/wizard/magicarp.dm

@@ -16,12 +16,11 @@
 	priority_announce("Unknown magical entities have been detected near [station_name()], please stand-by.", "Lifesign Alert")
 
 /datum/round_event/wizard/magicarp/start()
-	for(var/obj/effect/landmark/C in GLOB.landmarks_list)
-		if(C.name == "carpspawn")
-			if(prob(5))
-				new /mob/living/simple_animal/hostile/carp/ranged/chaos(C.loc)
-			else
-				new /mob/living/simple_animal/hostile/carp/ranged(C.loc)
+	for(var/obj/effect/landmark/carpspawn/C in GLOB.landmarks_list)
+		if(prob(5))
+			new /mob/living/simple_animal/hostile/carp/ranged/chaos(C.loc)
+		else
+			new /mob/living/simple_animal/hostile/carp/ranged(C.loc)
 
 /mob/living/simple_animal/hostile/carp/ranged
 	name = "magicarp"
@@ -43,7 +42,7 @@
 	
 /mob/living/simple_animal/hostile/carp/ranged/Initialize()
 	projectiletype = pick(allowed_projectile_types)
-	..()
+	. = ..()
 
 /mob/living/simple_animal/hostile/carp/ranged/chaos
 	name = "chaos magicarp"

code/modules/events/wizard/summons.dm

@@ -6,7 +6,7 @@
 	earliest_start = 0
 
 /datum/round_event_control/wizard/summonguns/New()
-	if(config.no_summon_guns)
+	if(CONFIG_GET(flag/no_summon_guns))
 		weight = 0
 	..()
 
@@ -21,7 +21,7 @@
 	earliest_start = 0
 
 /datum/round_event_control/wizard/summonmagic/New()
-	if(config.no_summon_magic)
+	if(CONFIG_GET(flag/no_summon_magic))
 		weight = 0
 	..()
 

code/modules/events/wormholes.dm

@@ -26,7 +26,7 @@
 
 	for(var/i = 1, i <= number_of_wormholes, i++)
 		var/turf/T = pick(pick_turfs)
-		wormholes += new /obj/effect/portal/wormhole(T, null, 300, null, FALSE)
+		wormholes += new /obj/effect/portal/wormhole(T, null, 0, null, FALSE)
 
 /datum/round_event/wormholes/announce()
 	priority_announce("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert", 'sound/ai/spanomalies.ogg')
@@ -40,6 +40,7 @@
 
 /datum/round_event/wormholes/end()
 	QDEL_LIST(wormholes)
+	wormholes = null
 
 /obj/effect/portal/wormhole
 	name = "wormhole"
@@ -48,17 +49,11 @@
 	icon_state = "anom"
 	mech_sized = TRUE
 
-/obj/effect/portal/wormhole/attack_hand(mob/user)
-	teleport(user)
-
-/obj/effect/portal/wormhole/attackby(obj/item/I, mob/user, params)
-	teleport(user)
-
 /obj/effect/portal/wormhole/teleport(atom/movable/M)
 	if(istype(M, /obj/effect))	//sparks don't teleport
 		return
 	if(M.anchored)
-		if(!(istype(M, /obj/mecha) && mech_sized))
+		if(!(ismecha(M) && mech_sized))
 			return
 
 	if(ismovableatom(M))

code/modules/fields/fields.dm

@@ -30,6 +30,7 @@
 	//Processing
 	var/process_inner_turfs = FALSE	//Don't do this unless it's absolutely necessary
 	var/process_edge_turfs = FALSE	//Don't do this either unless it's absolutely necessary, you can just track what things are inside manually or on the initial setup.
+	var/requires_processing = FALSE
 	var/setup_edge_turfs = FALSE	//Setup edge turfs/all field turfs. Set either or both to ON when you need it, it's defaulting to off unless you do to save CPU.
 	var/setup_field_turfs = FALSE
 	var/use_host_turf = FALSE		//For fields from items carried on mobs to check turf instead of loc...
@@ -41,6 +42,7 @@
 
 /datum/proximity_monitor/advanced/Destroy()
 	full_cleanup()
+	STOP_PROCESSING(SSfields, src)
 	return ..()
 
 /datum/proximity_monitor/advanced/proc/assume_params(list/field_params)
@@ -76,6 +78,10 @@
 
 /datum/proximity_monitor/advanced/proc/process_edge_turf(turf/T)
 
+/datum/proximity_monitor/advanced/New()
+	if(requires_processing)
+		START_PROCESSING(SSfields, src)
+
 /datum/proximity_monitor/advanced/proc/Initialize()
 	setup_field()
 	post_setup_field()
@@ -250,11 +256,6 @@
 	setup_field_turfs = TRUE
 	setup_edge_turfs = TRUE
 
-/datum/proximity_monitor/advanced/debug/recalculate_field()
-	..()
-
-/datum/proximity_monitor/advanced/debug/post_setup_field()
-	..()
 
 /datum/proximity_monitor/advanced/debug/setup_edge_turf(turf/T)
 	T.color = set_edgeturf_color

code/modules/fields/peaceborg_dampener.dm

@@ -5,6 +5,7 @@
 	name = "\improper Hyperkinetic Dampener Field"
 	setup_edge_turfs = TRUE
 	setup_field_turfs = TRUE
+	requires_processing = TRUE
 	field_shape = FIELD_SHAPE_RADIUS_SQUARE
 	var/static/image/edgeturf_south = image('icons/effects/fields.dmi', icon_state = "projectile_dampen_south")
 	var/static/image/edgeturf_north = image('icons/effects/fields.dmi', icon_state = "projectile_dampen_north")
@@ -21,13 +22,11 @@
 	use_host_turf = TRUE
 
 /datum/proximity_monitor/advanced/peaceborg_dampener/New()
-	START_PROCESSING(SSfields, src)
 	tracked = list()
 	staging = list()
 	..()
 
 /datum/proximity_monitor/advanced/peaceborg_dampener/Destroy()
-	STOP_PROCESSING(SSfields, src)
 	return ..()
 
 /datum/proximity_monitor/advanced/peaceborg_dampener/process()

code/modules/fields/timestop.dm

@@ -0,0 +1,131 @@
+
+/obj/effect/timestop
+	anchored = TRUE
+	name = "chronofield"
+	desc = "ZA WARUDO"
+	icon = 'icons/effects/160x160.dmi'
+	icon_state = "time"
+	layer = FLY_LAYER
+	pixel_x = -64
+	pixel_y = -64
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+	var/list/immune = list() // the one who creates the timestop is immune
+	var/turf/target
+	var/freezerange = 2
+	var/duration = 140
+	var/datum/proximity_monitor/advanced/timestop/chronofield
+	alpha = 125
+
+/obj/effect/timestop/Initialize(mapload, radius, time, list/immune_atoms, start = TRUE)	//Immune atoms assoc list atom = TRUE
+	. = ..()
+	if(immune_atoms)
+		immune = immune_atoms.Copy()
+	if(!isnull(time))
+		duration = time
+	if(!isnull(radius))
+		freezerange = radius
+	for(var/mob/living/L in GLOB.player_list)
+		if(locate(/obj/effect/proc_holder/spell/aoe_turf/conjure/timestop) in L.mind.spell_list) //People who can stop time are immune to its effects
+			immune[L] = TRUE
+	if(start)
+		timestop()
+
+/obj/effect/timestop/Destroy()
+	qdel(chronofield)
+	playsound(src, 'sound/magic/timeparadox2.ogg', 75, TRUE, frequency = -1) //reverse!
+	return ..()
+
+/obj/effect/timestop/proc/timestop()
+	target = get_turf(src)
+	playsound(src, 'sound/magic/timeparadox2.ogg', 75, 1, -1)
+	chronofield = make_field(/datum/proximity_monitor/advanced/timestop, list("current_range" = freezerange, "host" = src, "immune" = immune))
+	QDEL_IN(src, duration)
+
+/obj/effect/timestop/wizard
+	duration = 100
+
+/datum/proximity_monitor/advanced/timestop
+	name = "chronofield"
+	setup_field_turfs = TRUE
+	field_shape = FIELD_SHAPE_RADIUS_SQUARE
+	requires_processing = TRUE
+	var/list/immune = list()
+	var/list/mob/living/frozen_mobs = list()
+	var/list/obj/item/projectile/frozen_projectiles = list()
+	var/list/atom/movable/frozen_throws = list()
+
+/datum/proximity_monitor/advanced/timestop/Destroy()
+	unfreeze_all()
+	return ..()
+
+/datum/proximity_monitor/advanced/timestop/field_turf_crossed(atom/movable/AM)
+	freeze_atom(AM)
+
+/datum/proximity_monitor/advanced/timestop/proc/freeze_atom(atom/movable/A)
+	if(immune[A] || !istype(A))
+		return FALSE
+	if(A.throwing)
+		freeze_throwing(A)
+	if(isliving(A))
+		freeze_mob(A)
+	else if(istype(A, /obj/item/projectile))
+		freeze_projectile(A)
+	else
+		return FALSE
+	return TRUE
+
+/datum/proximity_monitor/advanced/timestop/proc/unfreeze_all()
+	for(var/i in frozen_projectiles)
+		unfreeze_projectile(i)
+	for(var/i in frozen_mobs)
+		unfreeze_mob(i)
+	for(var/i in frozen_throws)
+		unfreeze_throw(i)
+
+/datum/proximity_monitor/advanced/timestop/proc/freeze_throwing(atom/movable/AM)
+	var/datum/thrownthing/T = AM.throwing
+	T.paused = TRUE
+	frozen_throws[AM] = T
+
+/datum/proximity_monitor/advanced/timestop/proc/unfreeze_throw(atom/movable/AM)
+	var/datum/thrownthing/T = frozen_throws[AM]
+	T.paused = FALSE
+	frozen_throws -= AM
+
+/datum/proximity_monitor/advanced/timestop/process()
+	for(var/i in frozen_mobs)
+		var/mob/living/m = i
+		if(get_dist(get_turf(m), get_turf(host)) > current_range)
+			unfreeze_mob(m)
+		else
+			m.Stun(20, 1, 1)
+
+/datum/proximity_monitor/advanced/timestop/setup_field_turf(turf/T)
+	for(var/i in T.contents)
+		freeze_atom(i)
+	return ..()
+
+/datum/proximity_monitor/advanced/timestop/proc/unfreeze_projectile(obj/item/projectile/P)
+	frozen_projectiles -= P
+	P.paused = FALSE
+
+/datum/proximity_monitor/advanced/timestop/proc/freeze_projectile(obj/item/projectile/P)
+	frozen_projectiles[P] = TRUE
+	P.paused = TRUE
+
+/datum/proximity_monitor/advanced/timestop/proc/freeze_mob(mob/living/L)
+	L.Stun(20, 1, 1)
+	frozen_mobs[L] = L.anchored
+	L.anchored = TRUE
+	if(ishostile(L))
+		var/mob/living/simple_animal/hostile/H = L
+		H.AIStatus = AI_OFF
+		H.LoseTarget()
+
+/datum/proximity_monitor/advanced/timestop/proc/unfreeze_mob(mob/living/L)
+	L.AdjustStun(-20, 1, 1)
+	L.anchored = frozen_mobs[L]
+	frozen_mobs -= L
+	if(ishostile(L))
+		var/mob/living/simple_animal/hostile/H = L
+		H.AIStatus = initial(H.AIStatus)

code/modules/food_and_drinks/food/snacks_bread.dm

@@ -185,6 +185,37 @@
 	icon_state = ""
 	bitesize = 2
 
+/obj/item/reagent_containers/food/snacks/deepfryholder/proc/fry(obj/item/frying, datum/reagents/reagents, cook_time = 30)
+	if(istype(frying, /obj/item/reagent_containers/))
+		var/obj/item/reagent_containers/food = frying
+		food.reagents.trans_to(src, food.reagents.total_volume)
+	icon = frying.icon
+	overlays = frying.overlays
+	icon_state = frying.icon_state
+	desc = frying.desc
+	w_class = frying.w_class
+	reagents.trans_to(src, 2*(cook_time/15))
+	switch(cook_time)
+		if(0 to 15)
+			add_atom_colour(rgb(166,103,54), FIXED_COLOUR_PRIORITY)
+			name = "lightly-fried [frying.name]"
+		if(16 to 49)
+			add_atom_colour(rgb(103,63,24), FIXED_COLOUR_PRIORITY)
+			name = "fried [frying.name]"
+		if(50 to 59)
+			add_atom_colour(rgb(63,23,4), FIXED_COLOUR_PRIORITY)
+			name = "deep-fried [frying.name]"
+		if(60 to INFINITY)
+			add_atom_colour(rgb(33,19,9), FIXED_COLOUR_PRIORITY)
+			name = "the physical manifestation of the very concept of fried foods"
+			desc = "A heavily fried...something.  Who can tell anymore?"
+	filling_color = color
+	foodtype |= FRIED
+	if(istype(frying, /obj/item/reagent_containers/food/snacks/))
+		qdel(frying)
+	else
+		frying.forceMove(src)
+
 /obj/item/reagent_containers/food/snacks/butteredtoast
 	name = "buttered toast"
 	desc = "Butter lightly spread over a piece of toast."

code/modules/food_and_drinks/food/snacks_burgers.dm

@@ -176,6 +176,22 @@
 	color = "#DA00FFFF"
 	bonus_reagents = list("purplecrayonpowder" = 10, "vitamin" = 5)
 	foodtype = GRAIN | MEAT
+	
+/obj/item/reagent_containers/food/snacks/burger/black
+	name = "black burger"
+	desc = "This is overcooked."
+	icon_state = "cburger"
+	color = "#1C1C1C"
+	bonus_reagents = list("blackcrayonpowder" = 10, "vitamin" = 5)
+	foodtype = GRAIN | MEAT
+	
+/obj/item/reagent_containers/food/snacks/burger/white
+	name = "white burger"
+	desc = "Delicous Titanium!"
+	icon_state = "cburger"
+	color = "#FFFFFF"
+	bonus_reagents = list("whitecrayonpowder" = 10, "vitamin" = 5)
+	foodtype = GRAIN | MEAT
 
 /obj/item/reagent_containers/food/snacks/burger/spell
 	name = "spell burger"
@@ -251,4 +267,4 @@
 	icon_state = "baconburger"
 	bonus_reagents = list("nutriment" = 8, "vitamin" = 1)
 	tastes = list("bun" = 4, "bacon" = 2)
-	foodtype = GRAIN | MEAT
+	foodtype = GRAIN | MEAT

code/modules/food_and_drinks/food/snacks_meat.dm

@@ -25,8 +25,8 @@
 	tastes = list("fish" = 1)
 	foodtype = MEAT
 
-/obj/item/reagent_containers/food/snacks/carpmeat/New()
-	..()
+/obj/item/reagent_containers/food/snacks/carpmeat/Initialize()
+	. = ..()
 	eatverb = pick("bite","chew","choke down","gnaw","swallow","chomp")
 
 /obj/item/reagent_containers/food/snacks/carpmeat/imitation
@@ -114,8 +114,8 @@
 	tastes = list("meat" = 1)
 	foodtype = MEAT
 
-/obj/item/reagent_containers/food/snacks/sausage/New()
-	..()
+/obj/item/reagent_containers/food/snacks/sausage/Initialize()
+	. = ..()
 	eatverb = pick("bite","chew","nibble","deep throat","gobble","chomp")
 
 /obj/item/reagent_containers/food/snacks/kebab
@@ -185,7 +185,9 @@
 
 /obj/item/reagent_containers/food/snacks/monkeycube/proc/Expand()
 	visible_message("<span class='notice'>[src] expands!</span>")
-	new /mob/living/carbon/monkey(get_turf(src))
+	var/mob/spammer = get_mob_by_key(fingerprintslast)
+	var/mob/living/carbon/monkey/bananas = new(drop_location())
+	bananas.log_message("Spawned via [src] at [COORD(src)], Last attached mob: [key_name(spammer)].", INDIVIDUAL_ATTACK_LOG) 
 	qdel(src)
 
 /obj/item/reagent_containers/food/snacks/enchiladas
@@ -210,8 +212,8 @@
 	tastes = list("soy" = 1, "vegetables" = 1)
 	foodtype = VEGETABLES
 
-/obj/item/reagent_containers/food/snacks/stewedsoymeat/New()
-	..()
+/obj/item/reagent_containers/food/snacks/stewedsoymeat/Initialize()
+	. = ..()
 	eatverb = pick("slurp","sip","suck","inhale","drink")
 
 /obj/item/reagent_containers/food/snacks/boiledspiderleg
@@ -255,8 +257,8 @@
 	tastes = list("\"chicken\"" = 1)
 	foodtype = MEAT
 
-/obj/item/reagent_containers/food/snacks/nugget/New()
-	..()
+/obj/item/reagent_containers/food/snacks/nugget/Initialize()
+	. = ..()
 	var/shape = pick("lump", "star", "lizard", "corgi")
 	desc = "A 'chicken' nugget vaguely shaped like a [shape]."
 	icon_state = "nugget_[shape]"

code/modules/food_and_drinks/food/snacks_other.dm

@@ -188,6 +188,24 @@
 	tastes = list("cobwebs" = 1)
 	foodtype = MEAT | TOXIC
 
+/obj/item/reagent_containers/food/snacks/spiderling
+	name = "spiderling"
+	desc = "It's slightly twitching in your hand. Ew..."
+	icon_state = "spiderling"
+	list_reagents = list("nutrient" = 1, "toxin" = 4)
+	filling_color = "#00800"
+	tastes = list("cobwebs" = 1, "guts" = 2)
+	foodtype = MEAT | TOXIC
+
+/obj/item/reagent_containers/food/snacks/spiderlollipop
+	name = "spider lollipop"
+	desc = "Still gross, but at least it has a mountain of sugar on it."
+	icon_state = "spiderlollipop"
+	list_reagents = list("nutriment" = 1, "toxin" = 1, "iron" = 10, "sugar" = 5, "omnizine" = 2) //lollipop, but vitamins = toxins
+	filling_color = "#00800"
+	tastes = list("cobwebs" = 1, "sugar" = 2)
+	foodtype = JUNKFOOD | SUGAR
+
 /obj/item/reagent_containers/food/snacks/chococoin
 	name = "chocolate coin"
 	desc = "A completely edible but nonflippable festive coin."

code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm

@@ -82,36 +82,7 @@ insert ascii eagle on american flag background here
 		if(frying.loc == src)
 			to_chat(user, "<span class='notice'>You eject [frying] from [src].</span>")
 			var/obj/item/reagent_containers/food/snacks/deepfryholder/S = new(get_turf(src))
-			if(istype(frying, /obj/item/reagent_containers/))
-				var/obj/item/reagent_containers/food = frying
-				food.reagents.trans_to(S, food.reagents.total_volume)
-			S.icon = frying.icon
-			S.overlays = frying.overlays
-			S.icon_state = frying.icon_state
-			S.desc = frying.desc
-			S.w_class = frying.w_class
-			reagents.trans_to(S, 2*(cook_time/15))
-			switch(cook_time)
-				if(0 to 15)
-					S.add_atom_colour(rgb(166,103,54), FIXED_COLOUR_PRIORITY)
-					S.name = "lightly-fried [frying.name]"
-				if(16 to 49)
-					S.add_atom_colour(rgb(103,63,24), FIXED_COLOUR_PRIORITY)
-					S.name = "fried [frying.name]"
-				if(50 to 59)
-					S.add_atom_colour(rgb(63,23,4), FIXED_COLOUR_PRIORITY)
-					S.name = "deep-fried [frying.name]"
-				if(60 to INFINITY)
-					S.add_atom_colour(rgb(33,19,9), FIXED_COLOUR_PRIORITY)
-					S.name = "the physical manifestation of the very concept of fried foods"
-					S.desc = "A heavily fried...something.  Who can tell anymore?"
-			S.filling_color = S.color
-			S.foodtype |= FRIED
-			if(istype(frying, /obj/item/reagent_containers/food/snacks/))
-				qdel(frying)
-			else
-				frying.forceMove(S)
-
+			S.fry(frying, reagents, cook_time)
 			icon_state = "fryer_off"
 			user.put_in_hands(S)
 			frying = null

code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm

@@ -176,6 +176,26 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/burger/purple
 	subcategory = CAT_BURGER
+	
+/datum/crafting_recipe/food/blackburger
+	name = "Black burger"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/meat/steak/plain = 1,
+		/obj/item/toy/crayon/black = 1,
+		/obj/item/reagent_containers/food/snacks/bun = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/burger/black
+	subcategory = CAT_BURGER
+	
+/datum/crafting_recipe/food/whiteburger
+	name = "White burger"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/meat/steak/plain = 1,
+		/obj/item/toy/crayon/white = 1,
+		/obj/item/reagent_containers/food/snacks/bun = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/burger/white
+	subcategory = CAT_BURGER
 
 /datum/crafting_recipe/food/spellburger
 	name = "Spell burger"

code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm

@@ -12,6 +12,16 @@
 	result = /obj/item/reagent_containers/food/snacks/candiedapple
 	subcategory = CAT_MISCFOOD
 
+/datum/crafting_recipe/food/spiderlollipop
+ 	name = "Spider Lollipop"
+ 	reqs = list(/obj/item/stack/rods = 1,
+ 		/datum/reagent/consumable/sugar = 5,
+ 		/datum/reagent/water = 5,
+ 		/obj/item/reagent_containers/food/snacks/spiderling = 1
+ 	)
+ 	result = /obj/item/reagent_containers/food/snacks/spiderlollipop
+ 	subcategory = CAT_MISCFOOD
+
 /datum/crafting_recipe/food/chococoin
 	name = "Choco coin"
 	reqs = list(

code/modules/games/cas.dm

@@ -104,12 +104,14 @@
 	var/buffertext = "A funny bit of text."
 
 /obj/item/toy/cards/singlecard/cas/examine(mob/user)
+	..()
 	if (flipped)
 		to_chat(user, "<span class='notice'>The card is face down.</span>")
 	else if (blank)
 		to_chat(user, "<span class='notice'>The card is blank. Write on it with a pen.</span>")
 	else
 		to_chat(user, "<span class='notice'>The card reads: [name]</span>")
+	to_chat(user, "<span class='notice'>Alt-click to flip it.</span>")
 
 /obj/item/toy/cards/singlecard/cas/Flip()
 	set name = "Flip Card"
@@ -145,4 +147,4 @@
 			return
 		name = cardtext
 		buffertext = cardtext
-		blank = 0
+		blank = 0

code/modules/goonchat/browserassets/css/browserOutput.css

@@ -83,7 +83,7 @@ a.popt {text-decoration: none;}
 #ping {
 	position: fixed;
 	top: 0;
-	right: 40px;
+	right: 80px;
 	width: 45px;
 	background: #ddd;
 	height: 30px;
@@ -96,12 +96,12 @@ a.popt {text-decoration: none;}
 	font-size: 8pt;
 	padding-top: 2px;
 }
-#options {
+#userBar {
 	position: fixed;
 	top: 0;
 	right: 0;
 }
-#options .optionsCell {
+#userBar .subCell {
 	background: #ddd;
     height: 30px;
 	padding: 5px 0;
@@ -111,23 +111,23 @@ a.popt {text-decoration: none;}
     line-height: 28px;
     border-top: 1px solid #b4b4b4;
 }
-#options .optionsCell:hover {background: #ccc;}
-#options .toggle {
+#userBar .subCell:hover {background: #ccc;}
+#userBar .toggle {
 	width: 40px;
     background: #ccc;
     border-top: 0;
     float: right;
     text-align: center;
 }
-#options .sub {clear: both; display: none; width: 160px;}
-#options .sub.scroll {overflow-y: scroll;}
-#options .sub.optionsCell {padding: 3px 0 3px 8px; line-height: 30px; font-size: 0.9em; clear: both;}
-#options .sub span {
+#userBar .sub {clear: both; display: none; width: 160px;}
+#userBar .sub.scroll {overflow-y: scroll;}
+#userBar .sub.subCell {padding: 3px 0 3px 8px; line-height: 30px; font-size: 0.9em; clear: both;}
+#userBar .sub span {
 	display: block;
 	line-height: 30px;
 	float: left;
 }
-#options .sub i {
+#userBar .sub i {
 	display: block;
 	padding: 0 5px;
 	font-size: 1.1em;
@@ -136,14 +136,14 @@ a.popt {text-decoration: none;}
 	line-height: 30px;
 	float: right;
 }
-#options .sub input {
+#userBar .sub input {
 	position: absolute;
 	padding: 7px 5px;
 	width: 121px;
 	line-height: 30px;
 	float: left;
 }
-#options .decreaseFont {border-top: 0;}
+#userBar .topCell {border-top: 0;}
 
 /* POPUPS */
 .popup {
@@ -352,6 +352,8 @@ h1.alert, h2.alert		{color: #000000;}
 .alertalien				{color: #00c000;	font-weight: bold;}
 .changeling				{color: #800080;	font-style: italic;}
 
+.spider					{color: #4d004d;}
+
 .interface				{color: #330033;}
 
 .sans					{font-family: "Comic Sans MS", cursive, sans-serif;}

code/modules/goonchat/browserassets/html/browserOutput.html

@@ -27,17 +27,22 @@
 			<i class="icon-circle" id="pingDot"></i>
 			<span class="ms" id="pingMs">--ms</span>
 		</div>
+		<div id="audio">
+			<a href="#" class="subCell toggle" id="toggleAudio" title="Audio"><i class="icon-volume-up"></i></a>
+		</div>
 		<div id="options">
-			<a href="#" class="optionsCell toggle" id="toggleOptions" title="Options"><i class="icon-cog"></i></a>
-			<div class="sub" id="subOptions">
-				<a href="#" class="optionsCell decreaseFont" id="decreaseFont"><span>Decrease font size</span> <i class="icon-font">-</i></a>
-				<a href="#" class="optionsCell increaseFont" id="increaseFont"><span>Increase font size</span> <i class="icon-font">+</i></a>
-				<a href="#" class="optionsCell togglePing" id="togglePing"><span>Toggle ping display</span> <i class="icon-circle"></i></a>
-				<a href="#" class="optionsCell highlightTerm" id="highlightTerm"><span>Highlight string</span> <i class="icon-tag"></i></a>
-				<a href="#" class="optionsCell saveLog" id="saveLog"><span>Save chat log</span> <i class="icon-save"></i></a>
-				<a href="#" class="optionsCell clearMessages" id="clearMessages"><span>Clear all messages</span> <i class="icon-eraser"></i></a>
-				<span class="optionsCell" id="musicVolumeSpan"><input type="range" class="hidden" id="musicVolume"><span id="musicVolumeText">Admin music volume</span><i class="icon-music"></i></span>
-			</div>
+			<a href="#" class="subCell toggle" id="toggleOptions" title="Options"><i class="icon-cog"></i></a>
+		</div>
+		<div class="sub" id="subOptions">
+			<a href="#" class="subCell decreaseFont topCell" id="decreaseFont"><span>Decrease font size</span> <i class="icon-font">-</i></a>
+			<a href="#" class="subCell increaseFont" id="increaseFont"><span>Increase font size</span> <i class="icon-font">+</i></a>
+			<a href="#" class="subCell togglePing" id="togglePing"><span>Toggle ping display</span> <i class="icon-circle"></i></a>
+			<a href="#" class="subCell highlightTerm" id="highlightTerm"><span>Highlight string</span> <i class="icon-tag"></i></a>
+			<a href="#" class="subCell saveLog" id="saveLog"><span>Save chat log</span> <i class="icon-save"></i></a>
+			<a href="#" class="subCell clearMessages" id="clearMessages"><span>Clear all messages</span> <i class="icon-eraser"></i></a>
+		</div>
+		<div class="sub" id="subAudio">
+			<span class="subCell topCell" id="musicVolumeSpan"><input type="range" class="hidden" id="musicVolume"><span id="musicVolumeText">Admin music volume</span><i class="icon-music"></i></span>
 		</div>
 	</div>
 	<audio class="hidden" id="adminMusic" autoplay></audio>

code/modules/goonchat/browserassets/js/browserOutput.js

@@ -22,7 +22,7 @@ window.onerror = function(msg, url, line, col, error) {
 
 //Globals
 window.status = 'Output';
-var $messages, $subOptions, $contextMenu, $filterMessages;
+var $messages, $subOptions, $subAudio, $selectedSub, $contextMenu, $filterMessages;
 var opts = {
 	//General
 	'messageCount': 0, //A count...of messages...
@@ -37,8 +37,8 @@ var opts = {
 	'restarting': false, //Is the round restarting?
 
 	//Options menu
-	'subOptionsLoop': null, //Contains the interval loop for closing the options menu
-	'suppressOptionsClose': false, //Whether or not we should be hiding the suboptions menu
+	'selectedSubLoop': null, //Contains the interval loop for closing the selected sub menu
+	'suppressSubClose': false, //Whether or not we should be hiding the selected sub menu
 	'highlightTerms': [],
 	'highlightLimit': 5,
 	'highlightColor': '#FFFF00', //The color of the highlighted message
@@ -483,6 +483,46 @@ function sendVolumeUpdate() {
 	}
 }
 
+function subSlideUp() {
+	$(this).removeClass('scroll');
+	$(this).css('height', '');
+}
+
+function startSubLoop() {
+	if (opts.selectedSubLoop) {
+		clearInterval(opts.selectedSubLoop);
+	}
+	return setInterval(function() {
+		if (!opts.suppressSubClose && $selectedSub.is(':visible')) {
+			$selectedSub.slideUp('fast', subSlideUp);
+			clearInterval(opts.selectedSubLoop);
+		}
+	}, 5000); //every 5 seconds
+}
+
+function handleToggleClick($sub, $toggle) {
+	if ($selectedSub !== $sub && $selectedSub.is(':visible')) {
+		$selectedSub.slideUp('fast', subSlideUp);
+	}
+	$selectedSub = $sub
+	if ($selectedSub.is(':visible')) {
+		$selectedSub.slideUp('fast', subSlideUp);
+		clearInterval(opts.selectedSubLoop);
+	} else {
+		$selectedSub.slideDown('fast', function() {
+			var windowHeight = $(window).height();
+			var toggleHeight = $toggle.outerHeight();
+			var priorSubHeight = $selectedSub.outerHeight();
+			var newSubHeight = windowHeight - toggleHeight;
+			$(this).height(newSubHeight);
+			if (priorSubHeight > (windowHeight - toggleHeight)) {
+				$(this).addClass('scroll');
+			}
+		});
+		opts.selectedSubLoop = startSubLoop();
+	}
+}
+
 /*****************************************
 *
 * DOM READY
@@ -497,6 +537,8 @@ if (typeof $ === 'undefined') {
 $(function() {
 	$messages = $('#messages');
 	$subOptions = $('#subOptions');
+	$subAudio = $('#subAudio');
+	$selectedSub = $subOptions;
 
 	//Hey look it's a controller loop!
 	setInterval(function() {
@@ -607,12 +649,9 @@ $(function() {
 	});
 
 	$messages.on('mousedown', function(e) {
-		if ($subOptions && $subOptions.is(':visible')) {
-			$subOptions.slideUp('fast', function() {
-				$(this).removeClass('scroll');
-				$(this).css('height', '');
-			});
-			clearInterval(opts.subOptionsLoop);
+		if ($selectedSub && $selectedSub.is(':visible')) {
+			$selectedSub.slideUp('fast', subSlideUp);
+			clearInterval(opts.selectedSubLoop);
 		}
 	});
 
@@ -731,41 +770,19 @@ $(function() {
 	});
 
 	$('#toggleOptions').click(function(e) {
-		if ($subOptions.is(':visible')) {
-			$subOptions.slideUp('fast', function() {
-				$(this).removeClass('scroll');
-				$(this).css('height', '');
-			});
-			clearInterval(opts.subOptionsLoop);
-		} else {
-			$subOptions.slideDown('fast', function() {
-				var windowHeight = $(window).height();
-				var toggleHeight = $('#toggleOptions').outerHeight();
-				var priorSubHeight = $subOptions.outerHeight();
-				var newSubHeight = windowHeight - toggleHeight;
-				$(this).height(newSubHeight);
-				if (priorSubHeight > (windowHeight - toggleHeight)) {
-					$(this).addClass('scroll');
-				}
-			});
-			opts.subOptionsLoop = setInterval(function() {
-				if (!opts.suppressOptionsClose && $('#subOptions').is(':visible')) {
-					$subOptions.slideUp('fast', function() {
-						$(this).removeClass('scroll');
-						$(this).css('height', '');
-					});
-					clearInterval(opts.subOptionsLoop);
-				}
-			}, 5000); //Every 5 seconds
-		}
+		handleToggleClick($subOptions, $(this));
 	});
 
-	$('#subOptions, #toggleOptions').mouseenter(function() {
-		opts.suppressOptionsClose = true;
+	$('#toggleAudio').click(function(e) {
+		handleToggleClick($subAudio, $(this));
 	});
 
-	$('#subOptions, #toggleOptions').mouseleave(function() {
-		opts.suppressOptionsClose = false;
+	$('.sub, .toggle').mouseenter(function() {
+		opts.suppressSubClose = true;
+	});
+
+	$('.sub, .toggle').mouseleave(function() {
+		opts.suppressSubClose = false;
 	});
 
 	$('#decreaseFont').click(function(e) {

code/modules/holiday/holidays.dm

@@ -485,7 +485,6 @@ Since Ramadan is an entire month that lasts 29.5 days on average, the start and
 				begin_day += 31
 				begin_month-- //begins in march, ends in april
 
-//	to_chat(world, "Easter calculates to be on [begin_day] of [begin_month] ([days_early] early) to [end_day] of [end_month] ([days_extra] extra) for 20[yy]")
 	return ..()
 
 /datum/holiday/easter/celebrate()

code/modules/holodeck/area_copy.dm

@@ -31,7 +31,7 @@ GLOBAL_LIST_INIT(duplicate_forbidden_vars,list("tag","area","type","loc","locs",
 			I.damtype = STAMINA // thou shalt not
 
 		N.update_icon()
-		if(istype(O, /obj/machinery))
+		if(ismachinery(O))
 			var/obj/machinery/M = O
 			M.power_change()
 

code/modules/hydroponics/grown.dm

@@ -17,9 +17,9 @@
 	resistance_flags = FLAMMABLE
 	origin_tech = "biotech=1"
 
-/obj/item/reagent_containers/food/snacks/grown/New(newloc, var/obj/item/seeds/new_seed = null)
-	tastes = list(name = 1) // apples taste of apple, silly.
-	..()
+/obj/item/reagent_containers/food/snacks/grown/Initialize(mapload, obj/item/seeds/new_seed)
+	. = ..()
+	tastes = list("[name]" = 1) // apples taste of apple, silly.
 	if(new_seed)
 		seed = new_seed.Copy()
 	else if(ispath(seed))
@@ -35,7 +35,7 @@
 
 	if(seed)
 		for(var/datum/plant_gene/trait/T in seed.genes)
-			T.on_new(src, newloc)
+			T.on_new(src, loc)
 		seed.prepare_result(src)
 		transform *= TransformUsingVariable(seed.potency, 100, 0.5) //Makes the resulting produce's sprite larger or smaller based on potency!
 		add_juice()

code/modules/hydroponics/grown/replicapod.dm

@@ -55,7 +55,7 @@
 	var/obj/machinery/hydroponics/parent = loc
 	var/make_podman = 0
 	var/ckey_holder = null
-	if(config.revival_pod_plants)
+	if(CONFIG_GET(flag/revival_pod_plants))
 		if(ckey)
 			for(var/mob/M in GLOB.player_list)
 				if(isobserver(M))
@@ -99,7 +99,7 @@
 		podman.faction |= factions
 		if(!features["mcolor"])
 			features["mcolor"] = "#59CE00"
-		podman.hardset_dna(null,null,podman.real_name,blood_type, /datum/species/pod,features)//Discard SE's and UI's, podman cloning is inaccurate, and always make them a podman
+		podman.hardset_dna(null,null,podman.real_name,blood_type, new /datum/species/pod,features)//Discard SE's and UI's, podman cloning is inaccurate, and always make them a podman
 		podman.set_cloned_appearance()
 
 	else //else, one packet of seeds. maybe two

code/modules/hydroponics/growninedible.dm

@@ -8,8 +8,8 @@
 	resistance_flags = FLAMMABLE
 	var/obj/item/seeds/seed = null // type path, gets converted to item on New(). It's safe to assume it's always a seed item.
 
-/obj/item/grown/New(newloc, var/obj/item/seeds/new_seed = null)
-	..()
+/obj/item/grown/Initialize(newloc, obj/item/seeds/new_seed)
+	. = ..()
 	create_reagents(50)
 
 	if(new_seed)

code/modules/jobs/job_exp.dm

@@ -6,13 +6,13 @@ GLOBAL_PROTECT(exp_to_update)
 /datum/job/proc/required_playtime_remaining(client/C)
 	if(!C)
 		return 0
-	if(!config.use_exp_tracking)
+	if(!CONFIG_GET(flag/use_exp_tracking))
 		return 0
 	if(!exp_requirements || !exp_type)
 		return 0
 	if(!job_is_xp_locked(src.title))
 		return 0
-	if(config.use_exp_restrictions_admin_bypass && check_rights(R_ADMIN, FALSE, C.mob))
+	if(CONFIG_GET(flag/use_exp_restrictions_admin_bypass) && check_rights(R_ADMIN, FALSE, C.mob))
 		return 0
 	var/isexempt = C.prefs.db_flags & DB_FLAG_EXEMPT
 	if(isexempt)
@@ -26,20 +26,21 @@ GLOBAL_PROTECT(exp_to_update)
 
 /datum/job/proc/get_exp_req_amount()
 	if(title in GLOB.command_positions)
-		if(config.use_exp_restrictions_heads_hours)
-			return config.use_exp_restrictions_heads_hours * 60
+		var/uerhh = CONFIG_GET(number/use_exp_restrictions_heads_hours)
+		if(uerhh)
+			return uerhh * 60
 	return exp_requirements
 
 /datum/job/proc/get_exp_req_type()
 	if(title in GLOB.command_positions)
-		if(config.use_exp_restrictions_heads_department && exp_type_department)
+		if(CONFIG_GET(flag/use_exp_restrictions_heads_department) && exp_type_department)
 			return exp_type_department
 	return exp_type
 
 /proc/job_is_xp_locked(jobtitle)
-	if(!config.use_exp_restrictions_heads && jobtitle in GLOB.command_positions)
+	if(!CONFIG_GET(flag/use_exp_restrictions_heads) && jobtitle in GLOB.command_positions)
 		return FALSE
-	if(!config.use_exp_restrictions_other && !(jobtitle in GLOB.command_positions))
+	if(!CONFIG_GET(flag/use_exp_restrictions_other) && !(jobtitle in GLOB.command_positions))
 		return FALSE
 	return TRUE
 
@@ -55,7 +56,7 @@ GLOBAL_PROTECT(exp_to_update)
 	return amount
 
 /client/proc/get_exp_report()
-	if(!config.use_exp_tracking)
+	if(!CONFIG_GET(flag/use_exp_tracking))
 		return "Tracking is disabled in the server configuration file."
 	var/list/play_records = prefs.exp
 	if(!play_records.len)
@@ -86,7 +87,7 @@ GLOBAL_PROTECT(exp_to_update)
 				return_text += "<LI>[dep] [get_exp_format(exp_data[dep])] ([percentage]%)</LI>"
 			else
 				return_text += "<LI>[dep] [get_exp_format(exp_data[dep])] </LI>"
-	if(config.use_exp_restrictions_admin_bypass && check_rights(R_ADMIN, 0, mob))
+	if(CONFIG_GET(flag/use_exp_restrictions_admin_bypass) && check_rights(R_ADMIN, 0, mob))
 		return_text += "<LI>Admin (all jobs auto-unlocked)</LI>"
 	return_text += "</UL>"
 	var/list/jobs_locked = list()
@@ -139,7 +140,7 @@ GLOBAL_PROTECT(exp_to_update)
 
 //resets a client's exp to what was in the db.
 /client/proc/set_exp_from_db()
-	if(!config.use_exp_tracking)
+	if(!CONFIG_GET(flag/use_exp_tracking))
 		return -1
 	if(!SSdbcore.Connect())
 		return -1
@@ -181,7 +182,7 @@ GLOBAL_PROTECT(exp_to_update)
 
 
 /client/proc/update_exp_list(minutes, announce_changes = FALSE)
-	if(!config.use_exp_tracking)
+	if(!CONFIG_GET(flag/use_exp_tracking))
 		return -1
 	if(!SSdbcore.Connect())
 		return -1

code/modules/jobs/job_types/assistant.dm

@@ -16,16 +16,17 @@ Assistant
 
 
 /datum/job/assistant/get_access()
-	if((config.jobs_have_maint_access & ASSISTANTS_HAVE_MAINT_ACCESS) || !config.jobs_have_minimal_access) //Config has assistant maint access set
+	if(CONFIG_GET(flag/assistants_have_maint_access) || !CONFIG_GET(flag/jobs_have_minimal_access)) //Config has assistant maint access set
 		. = ..()
 		. |= list(ACCESS_MAINT_TUNNELS)
 	else
 		return ..()
 
 /datum/job/assistant/config_check()
-	if(config && !(config.assistant_cap == 0))
-		total_positions = config.assistant_cap
-		spawn_positions = config.assistant_cap
+	var/ac = CONFIG_GET(number/assistant_cap)
+	if(ac != 0)
+		total_positions = ac
+		spawn_positions = ac
 		return 1
 	return 0
 
@@ -36,7 +37,7 @@ Assistant
 
 /datum/outfit/job/assistant/pre_equip(mob/living/carbon/human/H)
 	..()
-	if (config.grey_assistants)
+	if (CONFIG_GET(flag/grey_assistants))
 		uniform = /obj/item/clothing/under/color/grey
 	else
 		uniform = /obj/item/clothing/under/color/random