Merge branch 'master' into corporate-comms

code/controllers/configuration.dm

@@ -159,7 +159,7 @@
 	var/simultaneous_pm_warning_timeout = 100
 
 	var/assistant_maint = 0 //Do assistants get maint access?
-	var/gateway_delay = 6000 //How long the gateway takes before it activates. Default is half an hour.
+	var/gateway_delay = 6000
 	var/ghost_interaction = 0
 
 	var/comms_password = ""

code/controllers/subsystem/afk.dm

@@ -29,7 +29,7 @@ SUBSYSTEM_DEF(afk)
 		var/turf/T
 		// Only players and players with the AFK watch enabled
 		// No dead, unconcious, restrained, people without jobs or people on other Z levels than the station
-		if(!H.client || !H.client.prefs.toggles2 & PREFTOGGLE_2_AFKWATCH || !H.mind || \
+		if(!H.client || !(H.client.prefs.toggles2 & PREFTOGGLE_2_AFKWATCH) || !H.mind || \
 			H.stat || H.restrained() || !H.job || !is_station_level((T = get_turf(H)).z)) // Assign the turf as last. Small optimization
 			if(afk_players[H.ckey])
 				toRemove += H.ckey

code/controllers/subsystem/sun.dm

@@ -9,6 +9,7 @@ SUBSYSTEM_DEF(sun)
 	var/dy
 	var/rate
 	var/list/solars	= list()
+	var/solar_gen_rate = 1500
 
 /datum/controller/subsystem/sun/Initialize(start_timeofday)
 	// Lets work out an angle for the "sun" to rotate around the station