Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

# Conflicts:
#	paradise.dme

code/controllers/subsystem/ipintel.dm

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