Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 5/10/2015_bay_merge_attempt_two

Conflicts:
	code/game/turfs/simulated/floor.dm
	icons/mob/back.dmi
	maps/exodus-3.dmm
	polaris.dme

code/controllers/Processes/garbage.dm

@@ -18,7 +18,7 @@ var/list/delayed_garbage = list()
 
 /datum/controller/process/garbage_collector/setup()
 	name = "garbage"
-	schedule_interval = 6 SECONDS
+	schedule_interval = 2 SECONDS
 
 	if(!garbage_collector)
 		garbage_collector = src
@@ -94,8 +94,9 @@ var/list/delayed_garbage = list()
 	if(!istype(A))
 		//warning("qdel() passed object of type [A.type]. qdel() can only handle /datum types.")
 		del(A)
-		garbage_collector.dels++
-		garbage_collector.hard_dels++
+		if(garbage_collector)
+			garbage_collector.dels++
+			garbage_collector.hard_dels++
 	else if(isnull(A.gcDestroyed))
 		// Let our friend know they're about to get collected
 		. = !A.Destroy()

code/controllers/Processes/powernet.dm

@@ -11,5 +11,10 @@
 
 		powernets.Remove(powerNetwork)
 
+	// This is necessary to ensure powersinks are always the first devices that drain power from powernet.
+	// Otherwise APCs or other stuff go first, resulting in bad things happening.
+	for(var/obj/item/device/powersink/S in processing_objects)
+		S.drain()
+
 /datum/controller/process/powernet/getStatName()
-	return ..()+"([powernets.len])"
+	return ..()+"([powernets.len])"

code/controllers/configuration.dm

@@ -186,6 +186,7 @@ var/list/gamemode_cache = list()
 	var/ninjas_allowed = 0
 	var/abandon_allowed = 1
 	var/ooc_allowed = 1
+	var/looc_allowed = 1
 	var/dooc_allowed = 1
 	var/dsay_allowed = 1
 
@@ -402,6 +403,7 @@ var/list/gamemode_cache = list()
 
 				if ("disable_ooc")
 					config.ooc_allowed = 0
+					config.looc_allowed = 0
 
 				if ("disable_entry")
 					config.enter_allowed = 0