Merge branch 'master' into random-space

Conflicts:
	_maps/asteroidstation.dm

code/controllers/configuration.dm

@@ -70,6 +70,13 @@
 	var/forbid_singulo_possession = 0
 	var/useircbot = 0
 
+	//IP Intel vars
+	var/ipintel_email
+	var/ipintel_rating_bad = 1
+	var/ipintel_save_good = 12
+	var/ipintel_save_bad = 1
+	var/ipintel_domain = "check.getipintel.net"
+
 	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
@@ -389,6 +396,17 @@
 					config.notify_new_player_age = text2num(value)
 				if("irc_first_connection_alert")
 					config.irc_first_connection_alert = 1
+				if("ipintel_email")
+					if (value != "ch@nge.me")
+						config.ipintel_email = value
+				if("ipintel_rating_bad")
+					config.ipintel_rating_bad = text2num(value)
+				if("ipintel_domain")
+					config.ipintel_domain = value
+				if("ipintel_save_good")
+					config.ipintel_save_good = text2num(value)
+				if("ipintel_save_bad")
+					config.ipintel_save_bad = text2num(value)
 				if("aggressive_changelog")
 					config.aggressive_changelog = 1
 				if("log_runtimes")

code/controllers/subsystem/ipintel.dm

@@ -0,0 +1,19 @@
+var/datum/subsystem/ipintel/SSipintel
+
+/datum/subsystem/ipintel
+	name = "XKeyScore"
+	init_order = -10
+	flags = SS_NO_FIRE
+	var/enabled = 0 //disable at round start to avoid checking reconnects
+	var/throttle = 0
+	var/errors = 0
+
+	var/list/cache = list()
+
+/datum/subsystem/ipintel/New()
+	NEW_SS_GLOBAL(SSipintel)
+
+/datum/subsystem/ipintel/Initialize(timeofday, zlevel)
+	enabled = 1
+	. = ..()
+

code/controllers/subsystem/machines.dm

@@ -51,7 +51,9 @@ var/datum/subsystem/machines/SSmachine
 			if(thing:use_power)
 				thing:auto_use_power() //add back the power state
 		else
-			processing.Remove(thing)
+			processing -= thing
+			if (thing)
+				thing.isprocessing = 0
 		if (MC_TICK_CHECK)
 			return
 

code/controllers/subsystem/objects.dm

@@ -1,8 +1,9 @@
 var/datum/subsystem/objects/SSobj
 
+/datum/var/isprocessing = 0
 /datum/proc/process()
 	set waitfor = 0
-	SSobj.processing.Remove(src)
+	STOP_PROCESSING(SSobj, src)
 	return 0
 
 /datum/subsystem/objects
@@ -50,7 +51,7 @@ var/datum/subsystem/objects/SSobj
 		if(thing)
 			thing.process(wait)
 		else
-			SSobj.processing.Remove(thing)
+			SSobj.processing -= thing
 		if (MC_TICK_CHECK)
 			return
 

code/controllers/subsystem/timer.dm

@@ -83,9 +83,8 @@ var/datum/subsystem/timer/SStimer
 			return hash_event.id
 	SStimer.hashes[event.hash] = event
 	if (wait <= 0)
-		spawn
-			SStimer.runevent(event)
-			SStimer.hashes -= event.hash
+		SStimer.runevent(event)
+		SStimer.hashes -= event.hash
 		return
 	// If we are unique (or we're not checking that), add the timer and return the id.
 	SStimer.processing += event
@@ -97,4 +96,4 @@ var/datum/subsystem/timer/SStimer
 		if(event.id == id)
 			qdel(event)
 			return 1
-	return 0
+	return 0