Baystation Update Merge 01

Mahoosive update. A lot of things.

code/controllers/configuration.dm

@@ -22,6 +22,7 @@
 	var/sql_enabled = 1					// for sql switching
 	var/allow_admin_ooccolor = 0		// Allows admins with relevant permissions to have their own ooc colour
 	var/allow_vote_restart = 0 			// allow votes to restart
+	var/ert_admin_call_only = 0
 	var/allow_vote_mode = 0				// allow votes to change mode
 	var/allow_admin_jump = 1			// allows admin jumping
 	var/allow_admin_spawning = 1		// allows admin item spawning
@@ -30,12 +31,14 @@
 	var/vote_period = 600				// length of voting period (deciseconds, default 1 minute)
 	var/vote_autotransfer_initial = 108000 // Length of time before the first autotransfer vote is called
 	var/vote_autotransfer_interval = 36000 // length of time before next sequential autotransfer vote
+	var/vote_autogamemode_timeleft = 100 //Length of time before round start when autogamemode vote is called (in seconds, default 100).
 	var/vote_no_default = 0				// vote does not default to nochange/norestart (tbi)
 	var/vote_no_dead = 0				// dead people can't vote (tbi)
 //	var/enable_authentication = 0		// goon authentication
 	var/del_new_on_log = 1				// del's new players if they log before they spawn in
 	var/feature_object_spell_system = 0 //spawns a spellbook which gives object-type spells instead of verb-type spells for the wizard
 	var/traitor_scaling = 0 			//if amount of traitors scales based on amount of players
+	var/objectives_disabled = 0 			//if objectives are disabled or not
 	var/protect_roles_from_antagonist = 0// If security and such can be tratior/cult/other
 	var/continous_rounds = 1			// Gamemodes which end instantly will instead keep on going until the round ends by escape shuttle or nuke.
 	var/allow_Metadata = 0				// Metadata is supported.
@@ -136,7 +139,7 @@
 	var/main_irc = ""
 	var/admin_irc = ""
 	var/python_path = "" //Path to the python executable.  Defaults to "python" on windows and "/usr/bin/env python2" on unix
-
+	var/use_lib_nudge = 0 //Use the C library nudge instead of the python nudge.
 
 /datum/configuration/New()
 	var/list/L = typesof(/datum/game_mode) - /datum/game_mode
@@ -147,7 +150,7 @@
 
 		if (M.config_tag)
 			if(!(M.config_tag in modes))		// ensure each mode is added only once
-				diary << "Adding game mode [M.name] ([M.config_tag]) to configuration."
+				log_misc("Adding game mode [M.name] ([M.config_tag]) to configuration.")
 				src.modes += M.config_tag
 				src.mode_names[M.config_tag] = M.name
 				src.probabilities[M.config_tag] = M.probability
@@ -285,6 +288,12 @@
 				if ("vote_autotransfer_interval")
 					config.vote_autotransfer_interval = text2num(value)
 
+				if ("vote_autogamemode_timeleft")
+					config.vote_autogamemode_timeleft = text2num(value)
+
+				if("ert_admin_only")
+					config.ert_admin_call_only = 1
+
 				if ("allow_ai")
 					config.allow_ai = 1
 
@@ -336,6 +345,9 @@
 				if ("traitor_scaling")
 					config.traitor_scaling = 1
 
+				if ("objectives_disabled")
+					config.objectives_disabled = 1
+
 				if("protect_roles_from_antagonist")
 					config.protect_roles_from_antagonist = 1
 
@@ -350,9 +362,9 @@
 						if (prob_name in config.modes)
 							config.probabilities[prob_name] = text2num(prob_value)
 						else
-							diary << "Unknown game mode probability configuration definition: [prob_name]."
+							log_misc("Unknown game mode probability configuration definition: [prob_name].")
 					else
-						diary << "Incorrect probability configuration definition: [prob_name]  [prob_value]."
+						log_misc("Incorrect probability configuration definition: [prob_name]  [prob_value].")
 
 				if("allow_random_events")
 					config.allow_random_events = 1
@@ -462,6 +474,9 @@
 						else //probably windows, if not this should work anyway
 							config.python_path = "python"
 
+				if("use_lib_nudge")
+					config.use_lib_nudge = 1
+
 				if("allow_cult_ghostwriter")
 					config.cult_ghostwriter = 1
 
@@ -469,11 +484,11 @@
 					config.cult_ghostwriter_req_cultists = value
 
 				else
-					diary << "Unknown setting in configuration: '[name]'"
+					log_misc("Unknown setting in configuration: '[name]'")
 
 		else if(type == "game_options")
 			if(!value)
-				diary << "Unknown value for setting [name] in [filename]."
+				log_misc("Unknown value for setting [name] in [filename].")
 			value = text2num(value)
 
 			switch(name)
@@ -514,7 +529,7 @@
 				if("limbs_can_break")
 					config.limbs_can_break = value
 				else
-					diary << "Unknown setting in configuration: '[name]'"
+					log_misc("Unknown setting in configuration: '[name]'")
 
 /datum/configuration/proc/loadsql(filename)  // -- TLE
 	var/list/Lines = file2list(filename)
@@ -560,7 +575,7 @@
 			if ("enable_stat_tracking")
 				sqllogging = 1
 			else
-				diary << "Unknown setting in configuration: '[name]'"
+				log_misc("Unknown setting in configuration: '[name]'")
 
 /datum/configuration/proc/loadforumsql(filename)  // -- TLE
 	var/list/Lines = file2list(filename)
@@ -602,7 +617,7 @@
 			if ("authenticatedgroup")
 				forum_authenticated_group = value
 			else
-				diary << "Unknown setting in configuration: '[name]'"
+				log_misc("Unknown setting in configuration: '[name]'")
 
 /datum/configuration/proc/pick_mode(mode_name)
 	// I wish I didn't have to instance the game modes in order to look up

code/controllers/configuration.dm.bak

@@ -0,0 +1,646 @@
+/datum/configuration
+	var/server_name = null				// server name (for world name / status)
+	var/server_suffix = 0				// generate numeric suffix based on server port
+
+	var/nudge_script_path = "nudge.py"  // where the nudge.py script is located
+
+	var/log_ooc = 0						// log OOC channel
+	var/log_access = 0					// log login/logout
+	var/log_say = 0						// log client say
+	var/log_admin = 0					// log admin actions
+	var/log_debug = 1					// log debug output
+	var/log_game = 0					// log game events
+	var/log_vote = 0					// log voting
+	var/log_whisper = 0					// log client whisper
+	var/log_emote = 0					// log emotes
+	var/log_attack = 0					// log attack messages
+	var/log_adminchat = 0				// log admin chat messages
+	var/log_adminwarn = 0				// log warnings admins get about bomb construction and such
+	var/log_pda = 0						// log pda messages
+	var/log_hrefs = 0					// logs all links clicked in-game. Could be used for debugging and tracking down exploits
+	var/log_runtime = 0					// logs world.log to a file
+	var/sql_enabled = 1					// for sql switching
+	var/allow_admin_ooccolor = 0		// Allows admins with relevant permissions to have their own ooc colour
+	var/allow_vote_restart = 0 			// allow votes to restart
+	var/ert_admin_call_only = 0
+	var/allow_vote_mode = 0				// allow votes to change mode
+	var/allow_admin_jump = 1			// allows admin jumping
+	var/allow_admin_spawning = 1		// allows admin item spawning
+	var/allow_admin_rev = 1				// allows admin revives
+	var/vote_delay = 6000				// minimum time between voting sessions (deciseconds, 10 minute default)
+	var/vote_period = 600				// length of voting period (deciseconds, default 1 minute)
+	var/vote_autotransfer_initial = 108000 // Length of time before the first autotransfer vote is called
+	var/vote_autotransfer_interval = 36000 // length of time before next sequential autotransfer vote
+	var/vote_autogamemode_timeleft = 100 //Length of time before round start when autogamemode vote is called (in seconds, default 100).
+	var/vote_no_default = 0				// vote does not default to nochange/norestart (tbi)
+	var/vote_no_dead = 0				// dead people can't vote (tbi)
+//	var/enable_authentication = 0		// goon authentication
+	var/del_new_on_log = 1				// del's new players if they log before they spawn in
+	var/feature_object_spell_system = 0 //spawns a spellbook which gives object-type spells instead of verb-type spells for the wizard
+	var/traitor_scaling = 0 			//if amount of traitors scales based on amount of players
+	var/objectives_disabled = 0 			//if objectives are disabled or not
+	var/protect_roles_from_antagonist = 0// If security and such can be tratior/cult/other
+	var/continous_rounds = 1			// Gamemodes which end instantly will instead keep on going until the round ends by escape shuttle or nuke.
+	var/allow_Metadata = 0				// Metadata is supported.
+	var/popup_admin_pm = 0				//adminPMs to non-admins show in a pop-up 'reply' window when set to 1.
+	var/Ticklag = 0.9
+	var/Tickcomp = 0
+	var/socket_talk	= 0					// use socket_talk to communicate with other processes
+	var/list/resource_urls = null
+	var/antag_hud_allowed = 0			// Ghosts can turn on Antagovision to see a HUD of who is the bad guys this round.
+	var/antag_hud_restricted = 0                    // Ghosts that turn on Antagovision cannot rejoin the round.
+	var/list/mode_names = list()
+	var/list/modes = list()				// allowed modes
+	var/list/votable_modes = list()		// votable modes
+	var/list/probabilities = list()		// relative probability of each mode
+	var/humans_need_surnames = 0
+	var/allow_random_events = 0			// enables random events mid-round when set to 1
+	var/allow_ai = 1					// allow ai job
+	var/hostedby = null
+	var/respawn = 1
+	var/guest_jobban = 1
+	var/usewhitelist = 0
+	var/kick_inactive = 0				//force disconnect for inactive players
+	var/load_jobs_from_txt = 0
+	var/ToRban = 0
+	var/automute_on = 0					//enables automuting/spam prevention
+	var/jobs_have_minimal_access = 0	//determines whether jobs use minimal access or expanded access.
+
+	var/cult_ghostwriter = 1               //Allows ghosts to write in blood in cult rounds...
+	var/cult_ghostwriter_req_cultists = 10 //...so long as this many cultists are active.
+
+	var/disable_player_mice = 0
+	var/uneducated_mice = 0 //Set to 1 to prevent newly-spawned mice from understanding human speech
+
+	var/usealienwhitelist = 0
+	var/limitalienplayers = 0
+	var/alien_to_human_ratio = 0.5
+
+	var/server
+	var/banappeals
+	var/wikiurl
+	var/forumurl
+
+	//Alert level description
+	var/alert_desc_green = "All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced."
+	var/alert_desc_blue_upto = "The station has received reliable information about possible hostile activity on the station. Security staff may have weapons visible, random searches are permitted."
+	var/alert_desc_blue_downto = "The immediate threat has passed. Security may no longer have weapons drawn at all times, but may continue to have them visible. Random searches are still allowed."
+	var/alert_desc_red_upto = "There is an immediate serious threat to the station. Security may have weapons unholstered at all times. Random searches are allowed and advised."
+	var/alert_desc_red_downto = "The self-destruct mechanism has been deactivated, there is still however an immediate serious threat to the station. Security may have weapons unholstered at all times, random searches are allowed and advised."
+	var/alert_desc_delta = "The station's self-destruct mechanism has been engaged. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill."
+
+	var/forbid_singulo_possession = 0
+
+	//game_options.txt configs
+
+	var/health_threshold_softcrit = 0
+	var/health_threshold_crit = 0
+	var/health_threshold_dead = -100
+
+	var/organ_health_multiplier = 1
+	var/organ_regeneration_multiplier = 1
+
+	var/bones_can_break = 0
+	var/limbs_can_break = 0
+
+	var/revival_pod_plants = 1
+	var/revival_cloning = 1
+	var/revival_brain_life = -1
+
+	//Used for modifying movement speed for mobs.
+	//Unversal modifiers
+	var/run_speed = 0
+	var/walk_speed = 0
+
+	//Mob specific modifiers. NOTE: These will affect different mob types in different ways
+	var/human_delay = 0
+	var/robot_delay = 0
+	var/monkey_delay = 0
+	var/alien_delay = 0
+	var/slime_delay = 0
+	var/animal_delay = 0
+
+	var/admin_legacy_system = 0	//Defines whether the server uses the legacy admin system with admins.txt or the SQL system. Config option in config.txt
+	var/ban_legacy_system = 0	//Defines whether the server uses the legacy banning system with the files in /data or the SQL system. Config option in config.txt
+	var/use_age_restriction_for_jobs = 0 //Do jobs use account age restrictions? --requires database
+
+	var/simultaneous_pm_warning_timeout = 100
+
+	var/use_recursive_explosions //Defines whether the server uses recursive or circular explosions.
+
+	var/assistant_maint = 0 //Do assistants get maint access?
+	var/gateway_delay = 18000 //How long the gateway takes before it activates. Default is half an hour.
+	var/ghost_interaction = 0
+
+	var/comms_password = ""
+
+	var/use_irc_bot = 0
+	var/irc_bot_host = ""
+	var/main_irc = ""
+	var/admin_irc = ""
+	var/python_path = "" //Path to the python executable.  Defaults to "python" on windows and "/usr/bin/env python2" on unix
+	var/use_lib_nudge = 0 //Use the C library nudge instead of the python nudge.
+
+/datum/configuration/New()
+	var/list/L = typesof(/datum/game_mode) - /datum/game_mode
+	for (var/T in L)
+		// I wish I didn't have to instance the game modes in order to look up
+		// their information, but it is the only way (at least that I know of).
+		var/datum/game_mode/M = new T()
+
+		if (M.config_tag)
+			if(!(M.config_tag in modes))		// ensure each mode is added only once
+				log_misc("Adding game mode [M.name] ([M.config_tag]) to configuration.")
+				src.modes += M.config_tag
+				src.mode_names[M.config_tag] = M.name
+				src.probabilities[M.config_tag] = M.probability
+				if (M.votable)
+					src.votable_modes += M.config_tag
+		del(M)
+	src.votable_modes += "secret"
+
+/datum/configuration/proc/load(filename, type = "config") //the type can also be game_options, in which case it uses a different switch. not making it separate to not copypaste code - Urist
+	var/list/Lines = file2list(filename)
+
+	for(var/t in Lines)
+		if(!t)	continue
+
+		t = trim(t)
+		if (length(t) == 0)
+			continue
+		else if (copytext(t, 1, 2) == "#")
+			continue
+
+		var/pos = findtext(t, " ")
+		var/name = null
+		var/value = null
+
+		if (pos)
+			name = lowertext(copytext(t, 1, pos))
+			value = copytext(t, pos + 1)
+		else
+			name = lowertext(t)
+
+		if (!name)
+			continue
+
+		if(type == "config")
+			switch (name)
+				if ("resource_urls")
+					config.resource_urls = text2list(value, " ")
+
+				if ("admin_legacy_system")
+					config.admin_legacy_system = 1
+
+				if ("ban_legacy_system")
+					config.ban_legacy_system = 1
+
+				if ("use_age_restriction_for_jobs")
+					config.use_age_restriction_for_jobs = 1
+
+				if ("jobs_have_minimal_access")
+					config.jobs_have_minimal_access = 1
+
+				if ("use_recursive_explosions")
+					use_recursive_explosions = 1
+
+				if ("log_ooc")
+					config.log_ooc = 1
+
+				if ("log_access")
+					config.log_access = 1
+
+				if ("sql_enabled")
+					config.sql_enabled = text2num(value)
+
+				if ("log_say")
+					config.log_say = 1
+
+				if ("log_admin")
+					config.log_admin = 1
+
+				if ("log_debug")
+					config.log_debug = text2num(value)
+
+				if ("log_game")
+					config.log_game = 1
+
+				if ("log_vote")
+					config.log_vote = 1
+
+				if ("log_whisper")
+					config.log_whisper = 1
+
+				if ("log_attack")
+					config.log_attack = 1
+
+				if ("log_emote")
+					config.log_emote = 1
+
+				if ("log_adminchat")
+					config.log_adminchat = 1
+
+				if ("log_adminwarn")
+					config.log_adminwarn = 1
+
+				if ("log_pda")
+					config.log_pda = 1
+
+				if ("log_hrefs")
+					config.log_hrefs = 1
+
+				if ("log_runtime")
+					config.log_runtime = 1
+
+				if("allow_admin_ooccolor")
+					config.allow_admin_ooccolor = 1
+
+				if ("allow_vote_restart")
+					config.allow_vote_restart = 1
+
+				if ("allow_vote_mode")
+					config.allow_vote_mode = 1
+
+				if ("allow_admin_jump")
+					config.allow_admin_jump = 1
+
+				if("allow_admin_rev")
+					config.allow_admin_rev = 1
+
+				if ("allow_admin_spawning")
+					config.allow_admin_spawning = 1
+
+				if ("no_dead_vote")
+					config.vote_no_dead = 1
+
+				if ("default_no_vote")
+					config.vote_no_default = 1
+
+				if ("vote_delay")
+					config.vote_delay = text2num(value)
+
+				if ("vote_period")
+					config.vote_period = text2num(value)
+
+				if ("vote_autotransfer_initial")
+					config.vote_autotransfer_initial = text2num(value)
+
+				if ("vote_autotransfer_interval")
+					config.vote_autotransfer_interval = text2num(value)
+
+				if ("vote_autogamemode_timeleft")
+					config.vote_autogamemode_timeleft = text2num(value)
+
+				if("ert_admin_only")
+					config.ert_admin_call_only = 1
+
+				if ("allow_ai")
+					config.allow_ai = 1
+
+//				if ("authentication")
+//					config.enable_authentication = 1
+
+				if ("norespawn")
+					config.respawn = 0
+
+				if ("servername")
+					config.server_name = value
+
+				if ("serversuffix")
+					config.server_suffix = 1
+
+				if ("nudge_script_path")
+					config.nudge_script_path = value
+
+				if ("hostedby")
+					config.hostedby = value
+
+				if ("server")
+					config.server = value
+
+				if ("banappeals")
+					config.banappeals = value
+
+				if ("wikiurl")
+					config.wikiurl = value
+
+				if ("forumurl")
+					config.forumurl = value
+
+				if ("guest_jobban")
+					config.guest_jobban = 1
+
+				if ("guest_ban")
+					guests_allowed = 0
+
+				if ("usewhitelist")
+					config.usewhitelist = 1
+
+				if ("feature_object_spell_system")
+					config.feature_object_spell_system = 1
+
+				if ("allow_metadata")
+					config.allow_Metadata = 1
+
+				if ("traitor_scaling")
+					config.traitor_scaling = 1
+
+				if ("objectives_disabled")
+					config.objectives_disabled = 1
+
+				if("protect_roles_from_antagonist")
+					config.protect_roles_from_antagonist = 1
+
+				if ("probability")
+					var/prob_pos = findtext(value, " ")
+					var/prob_name = null
+					var/prob_value = null
+
+					if (prob_pos)
+						prob_name = lowertext(copytext(value, 1, prob_pos))
+						prob_value = copytext(value, prob_pos + 1)
+						if (prob_name in config.modes)
+							config.probabilities[prob_name] = text2num(prob_value)
+						else
+							log_misc("Unknown game mode probability configuration definition: [prob_name].")
+					else
+						log_misc("Incorrect probability configuration definition: [prob_name]  [prob_value].")
+
+				if("allow_random_events")
+					config.allow_random_events = 1
+
+				if("kick_inactive")
+					config.kick_inactive = 1
+
+				if("load_jobs_from_txt")
+					load_jobs_from_txt = 1
+
+				if("alert_red_upto")
+					config.alert_desc_red_upto = value
+
+				if("alert_red_downto")
+					config.alert_desc_red_downto = value
+
+				if("alert_blue_downto")
+					config.alert_desc_blue_downto = value
+
+				if("alert_blue_upto")
+					config.alert_desc_blue_upto = value
+
+				if("alert_green")
+					config.alert_desc_green = value
+
+				if("alert_delta")
+					config.alert_desc_delta = value
+
+				if("forbid_singulo_possession")
+					forbid_singulo_possession = 1
+
+				if("popup_admin_pm")
+					config.popup_admin_pm = 1
+
+				if("allow_holidays")
+					Holiday = 1
+
+				if("use_irc_bot")
+					use_irc_bot = 1
+
+				if("ticklag")
+					Ticklag = text2num(value)
+
+				if("allow_antag_hud")
+					config.antag_hud_allowed = 1
+				if("antag_hud_restricted")
+					config.antag_hud_restricted = 1
+
+				if("socket_talk")
+					socket_talk = text2num(value)
+
+				if("tickcomp")
+					Tickcomp = 1
+
+				if("humans_need_surnames")
+					humans_need_surnames = 1
+
+				if("tor_ban")
+					ToRban = 1
+
+				if("automute_on")
+					automute_on = 1
+
+				if("usealienwhitelist")
+					usealienwhitelist = 1
+
+				if("alien_player_ratio")
+					limitalienplayers = 1
+					alien_to_human_ratio = text2num(value)
+
+				if("assistant_maint")
+					config.assistant_maint = 1
+
+				if("gateway_delay")
+					config.gateway_delay = text2num(value)
+
+				if("continuous_rounds")
+					config.continous_rounds = 1
+
+				if("ghost_interaction")
+					config.ghost_interaction = 1
+
+				if("disable_player_mice")
+					config.disable_player_mice = 1
+
+				if("uneducated_mice")
+					config.uneducated_mice = 1
+
+				if("comms_password")
+					config.comms_password = value
+
+				if("irc_bot_host")
+					config.irc_bot_host = value
+
+				if("main_irc")
+					config.main_irc = value
+
+				if("admin_irc")
+					config.admin_irc = value
+
+				if("python_path")
+					if(value)
+						config.python_path = value
+					else
+						if(world.system_type == UNIX)
+							config.python_path = "/usr/bin/env python2"
+						else //probably windows, if not this should work anyway
+							config.python_path = "python"
+
+				if("use_lib_nudge")
+					config.use_lib_nudge = 1
+
+				if("allow_cult_ghostwriter")
+					config.cult_ghostwriter = 1
+
+				if("req_cult_ghostwriter")
+					config.cult_ghostwriter_req_cultists = value
+
+				else
+					log_misc("Unknown setting in configuration: '[name]'")
+
+		else if(type == "game_options")
+			if(!value)
+				log_misc("Unknown value for setting [name] in [filename].")
+			value = text2num(value)
+
+			switch(name)
+				if("health_threshold_crit")
+					config.health_threshold_crit = value
+				if("health_threshold_softcrit")
+					config.health_threshold_softcrit = value
+				if("health_threshold_dead")
+					config.health_threshold_dead = value
+				if("revival_pod_plants")
+					config.revival_pod_plants = value
+				if("revival_cloning")
+					config.revival_cloning = value
+				if("revival_brain_life")
+					config.revival_brain_life = value
+				if("run_speed")
+					config.run_speed = value
+				if("walk_speed")
+					config.walk_speed = value
+				if("human_delay")
+					config.human_delay = value
+				if("robot_delay")
+					config.robot_delay = value
+				if("monkey_delay")
+					config.monkey_delay = value
+				if("alien_delay")
+					config.alien_delay = value
+				if("slime_delay")
+					config.slime_delay = value
+				if("animal_delay")
+					config.animal_delay = value
+				if("organ_health_multiplier")
+					config.organ_health_multiplier = value / 100
+				if("organ_regeneration_multiplier")
+					config.organ_regeneration_multiplier = value / 100
+				if("bones_can_break")
+					config.bones_can_break = value
+				if("limbs_can_break")
+					config.limbs_can_break = value
+				else
+					log_misc("Unknown setting in configuration: '[name]'")
+
+/datum/configuration/proc/loadsql(filename)  // -- TLE
+	var/list/Lines = file2list(filename)
+	for(var/t in Lines)
+		if(!t)	continue
+
+		t = trim(t)
+		if (length(t) == 0)
+			continue
+		else if (copytext(t, 1, 2) == "#")
+			continue
+
+		var/pos = findtext(t, " ")
+		var/name = null
+		var/value = null
+
+		if (pos)
+			name = lowertext(copytext(t, 1, pos))
+			value = copytext(t, pos + 1)
+		else
+			name = lowertext(t)
+
+		if (!name)
+			continue
+
+		switch (name)
+			if ("address")
+				sqladdress = value
+			if ("port")
+				sqlport = value
+			if ("database")
+				sqldb = value
+			if ("login")
+				sqllogin = value
+			if ("password")
+				sqlpass = value
+			if ("feedback_database")
+				sqlfdbkdb = value
+			if ("feedback_login")
+				sqlfdbklogin = value
+			if ("feedback_password")
+				sqlfdbkpass = value
+			if ("enable_stat_tracking")
+				sqllogging = 1
+			else
+				log_misc("Unknown setting in configuration: '[name]'")
+
+/datum/configuration/proc/loadforumsql(filename)  // -- TLE
+	var/list/Lines = file2list(filename)
+	for(var/t in Lines)
+		if(!t)	continue
+
+		t = trim(t)
+		if (length(t) == 0)
+			continue
+		else if (copytext(t, 1, 2) == "#")
+			continue
+
+		var/pos = findtext(t, " ")
+		var/name = null
+		var/value = null
+
+		if (pos)
+			name = lowertext(copytext(t, 1, pos))
+			value = copytext(t, pos + 1)
+		else
+			name = lowertext(t)
+
+		if (!name)
+			continue
+
+		switch (name)
+			if ("address")
+				forumsqladdress = value
+			if ("port")
+				forumsqlport = value
+			if ("database")
+				forumsqldb = value
+			if ("login")
+				forumsqllogin = value
+			if ("password")
+				forumsqlpass = value
+			if ("activatedgroup")
+				forum_activated_group = value
+			if ("authenticatedgroup")
+				forum_authenticated_group = value
+			else
+				log_misc("Unknown setting in configuration: '[name]'")
+
+/datum/configuration/proc/pick_mode(mode_name)
+	// I wish I didn't have to instance the game modes in order to look up
+	// their information, but it is the only way (at least that I know of).
+	for (var/T in (typesof(/datum/game_mode) - /datum/game_mode))
+		var/datum/game_mode/M = new T()
+		if (M.config_tag && M.config_tag == mode_name)
+			return M
+		del(M)
+	return new /datum/game_mode/extended()
+
+/datum/configuration/proc/get_runnable_modes()
+	var/list/datum/game_mode/runnable_modes = new
+	for (var/T in (typesof(/datum/game_mode) - /datum/game_mode))
+		var/datum/game_mode/M = new T()
+		//world << "DEBUG: [T], tag=[M.config_tag], prob=[probabilities[M.config_tag]]"
+		if (!(M.config_tag in modes))
+			del(M)
+			continue
+		if (probabilities[M.config_tag]<=0)
+			del(M)
+			continue
+		if (M.can_start())
+			runnable_modes[M] = probabilities[M.config_tag]
+			//world << "DEBUG: runnable_mode\[[runnable_modes.len]\] = [M.config_tag]"
+	return runnable_modes

code/controllers/master_controller.dm

@@ -30,10 +30,13 @@ datum/controller/game_controller
 	var/total_cost		= 0
 
 	var/last_thing_processed
+	var/mob/list/expensive_mobs = list()
+	var/rebuild_active_areas = 0
 
 datum/controller/game_controller/New()
 	//There can be only one master_controller. Out with the old and in with the new.
 	if(master_controller != src)
+		log_debug("Rebuilding Master Controller")
 		if(istype(master_controller))
 			Recover()
 			del(master_controller)
@@ -226,11 +229,15 @@ datum/controller/game_controller/proc/process()
 
 datum/controller/game_controller/proc/process_mobs()
 	var/i = 1
+	expensive_mobs.Cut()
 	while(i<=mob_list.len)
 		var/mob/M = mob_list[i]
 		if(M)
+			var/clock = world.timeofday
 			last_thing_processed = M.type
 			M.Life()
+			if((world.timeofday - clock) > 1)
+				expensive_mobs += M
 			i++
 			continue
 		mob_list.Cut(i,i+1)
@@ -254,12 +261,39 @@ datum/controller/game_controller/proc/process_machines()
 			last_thing_processed = Machine.type
 			if(Machine.process() != PROCESS_KILL)
 				if(Machine)
-					if(Machine.use_power)
-						Machine.auto_use_power()
 					i++
 					continue
 		machines.Cut(i,i+1)
 
+	i=1
+	while(i<=active_areas.len)
+		var/area/A = active_areas[i]
+		if(A.powerupdate && A.master == A)
+			A.powerupdate -= 1
+			for(var/area/SubArea in A.related)
+				for(var/obj/machinery/M in SubArea)
+					if(M)
+						if(M.use_power)
+							M.auto_use_power()
+			
+		if(A.apc.len && A.master == A)
+			i++
+			continue
+
+		A.powerupdate = 0
+		active_areas.Cut(i,i+1)
+
+
+	if(controller_iteration % 150 == 0 || rebuild_active_areas)	//Every 300 seconds we retest every area/machine
+		for(var/area/A in all_areas)
+			if(A == A.master)
+				A.powerupdate += 1
+				active_areas |= A
+		rebuild_active_areas = 0
+
+	
+		
+
 datum/controller/game_controller/proc/process_objects()
 	var/i = 1
 	while(i<=processing_objects.len)

code/controllers/voting.dm

@@ -50,9 +50,9 @@ datum/controller/vote
 		initiate_vote("crew_transfer","the server")
 		log_debug("The server has called a crew transfer vote")
 
-/*	proc/autogamemode() //This is here for whoever can figure out how to make this work
+	proc/autogamemode()
 		initiate_vote("gamemode","the server")
-		log_debug("The server has called a gamemode vote")*/
+		log_debug("The server has called a gamemode vote")
 
 	proc/reset()
 		initiator = null