Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170609

# Conflicts:
#	code/_macros.dm
#	code/controllers/master_controller.dm
#	vorestation.dme

code/modules/client/client procs.dm

@@ -284,6 +284,18 @@
 	if(inactivity > duration)	return inactivity
 	return 0
 
+// Byond seemingly calls stat, each tick.
+// Calling things each tick can get expensive real quick.
+// So we slow this down a little.
+// See: http://www.byond.com/docs/ref/info.html#/client/proc/Stat
+/client/Stat()
+	. = ..()
+	if (holder)
+		sleep(1)
+	else
+		sleep(5)
+		stoplag()
+
 /client/proc/last_activity_seconds()
 	return inactivity / 10