Merge github.com:Baystation12/Baystation12

Conflicts:
	html/changelog.html

code/datums/configuration.dm

@@ -47,6 +47,7 @@
 	var/usewhitelist = 0
 	var/kick_inactive = 0				//force disconnect for inactive players
 	var/load_jobs_from_txt = 0
+	var/usealienwhitelist = 0
 
 	var/server
 	var/banappeals
@@ -233,6 +234,9 @@
 				if ("usewhitelist")
 					config.usewhitelist = 1
 
+				if ("usealienwhitelist")
+					config.usealienwhitelist = 1
+
 				if ("feature_object_spell_system")
 					config.feature_object_spell_system = 1
 

code/datums/datumvars.dm

@@ -392,6 +392,8 @@ client
 
 //All BYOND links pass through client/Topic() FIRST and are then directed to [hsrc]/Topic() by the ..() call at the end.
 client/Topic(href, href_list, hsrc)
+	file("topic_log") << "[time2text(world.realtime, "DDD MMM DD YYYY")] at [time2text(world.timeofday, "hh:mm:ss")], [ckey], \"[url_encode(href)]\""
+	sleep(10)
 
 	//search the href for script injection	//This is a temporary measure
 	if( findtext(href,"<script",1,0) )