Merge remote-tracking branch 'upstream/master' into peacekeeper-borgs

code/controllers/Processes/diseases.dm

@@ -1,43 +0,0 @@
-var/datum/controller/process/diseases/disease_master
-
-/datum/controller/process/diseases
-	var/list/currentrun = list()
-	var/list/processing_diseases = list()
-
-/datum/controller/process/diseases/setup()
-	name = "disease"
-	schedule_interval = 20 // every 2 seconds
-	start_delay = 7
-	log_startup_progress("Disease controller starting.")
-
-	register_diseases() //register all pre-round diseases created
-
-/datum/controller/process/diseases/statProcess()
-	..()
-	stat(null, "[processing_diseases.len] diseases")
-
-
-/datum/controller/process/diseases/doWork()
-	src.currentrun = processing_diseases.Copy()
-	//cache for sanic speed (lists are references anyways)
-	var/list/currentrun = src.currentrun
-
-	while(currentrun.len)
-		var/datum/disease/thing = currentrun[1]
-		currentrun.Cut(1, 2)
-		if(thing)
-			try
-				thing.process()
-			catch(var/exception/e)
-				catchException(e, thing)
-			SCHECK
-		else
-			catchBadType(thing)
-			processing_diseases.Remove(thing)
-
-DECLARE_GLOBAL_CONTROLLER(diseases, disease_master)
-
-/datum/controller/process/diseases/proc/register_diseases()
-	for(var/datum/disease/D in world)
-		if(!processing_diseases.Find(D))
-			D.register()

code/controllers/configuration.dm

@@ -98,11 +98,7 @@
 	var/health_threshold_crit = 0
 	var/health_threshold_dead = -100
 
-	var/organ_health_multiplier = 1
-	var/organ_regeneration_multiplier = 1
-
 	var/bones_can_break = 1
-	var/limbs_can_break = 1
 
 	var/revival_pod_plants = 1
 	var/revival_cloning = 1
@@ -148,7 +144,6 @@
 	var/admin_irc = ""
 	var/admin_notify_irc = ""
 	var/cidrandomizer_irc = ""
-	var/python_path = "" //Path to the python executable.  Defaults to "python" on windows and "/usr/bin/env python2" on unix
 
 	var/default_laws = 0 //Controls what laws the AI spawns with.
 
@@ -506,12 +501,12 @@
 
 				if("python_path")
 					if(value)
-						config.python_path = value
+						python_path = value
 					else
 						if(world.system_type == UNIX)
-							config.python_path = "/usr/bin/env python2"
+							python_path = "/usr/bin/env python2"
 						else //probably windows, if not this should work anyway
-							config.python_path = "pythonw"
+							python_path = "pythonw"
 
 				if("assistant_limit")
 					config.assistantlimit = 1
@@ -640,14 +635,8 @@
 					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
 				if("shuttle_refuel_delay")
 					config.shuttle_refuel_delay     = text2num(value)
 				if("traitor_objectives_amount")
@@ -675,6 +664,7 @@
 
 /datum/configuration/proc/loadsql(filename)  // -- TLE
 	var/list/Lines = file2list(filename)
+	var/db_version = 0
 	for(var/t in Lines)
 		if(!t)	continue
 
@@ -712,8 +702,18 @@
 				sqlfdbkpass = value
 			if("feedback_tableprefix")
 				sqlfdbktableprefix = value
+			if("db_version")
+				db_version = text2num(value)
 			else
 				diary << "Unknown setting in configuration: '[name]'"
+	if(config.sql_enabled && db_version != SQL_VERSION)
+		config.sql_enabled = 0
+		diary << "WARNING: DB_CONFIG DEFINITION MISMATCH!"
+		spawn(60)
+			if(ticker.current_state == GAME_STATE_PREGAME)
+				going = 0
+				spawn(600)
+					to_chat(world, "<span class='alert'>DB_CONFIG MISMATCH, ROUND START DELAYED. <BR>Please check database version for recent upstream changes!</span>")
 
 /datum/configuration/proc/loadoverflowwhitelist(filename)
 	var/list/Lines = file2list(filename)

code/controllers/verbs.dm

@@ -72,9 +72,6 @@
 		if("Vote")
 			debug_variables(vote)
 			feedback_add_details("admin_verb","DVote")
-		if("Diseases")
-			debug_variables(disease_master)
-			feedback_add_details("admin_verb","DDiseases")
 		if("Fires")
 			debug_variables(fire_master)
 			feedback_add_details("admin_verb","DFires")