Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

Conflicts:
	code/controllers/configuration.dm
	code/game/atoms.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/factions.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/verbs/ooc.dm
	code/game/verbs/who.dm
	code/modules/admin/admin.dm
	code/modules/admin/admin_verbs.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/adminpm.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/mob/living/login.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/paperwork/paper.dm
	config/config.txt
	html/changelog.html
	icons/mob/human.dmi
	icons/mob/human_face.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/controllers/_DynamicAreaLighting_TG.dm

@@ -1,7 +1,7 @@
 /*
 	Modified DynamicAreaLighting for TGstation - Coded by Carnwennan
 
-	This is TG's 'new' lighting system. It's basically a heavily modified mix of combination of Forum_Account's and
+	This is TG's 'new' lighting system. It's basically a heavily modified combination of Forum_Account's and
 	ShadowDarke's respective lighting libraries. Credits, where due, to them.
 
 	Like sd_DAL (what we used to use), it changes the shading overlays of areas by splitting each type of area into sub-areas
@@ -29,7 +29,6 @@
 		mob luminosity will be lower than expected when one of multiple light sources is dropped after exceeding the maximum luminosity
 		Shuttles still do not have support for dynamic lighting (I hope to fix this at some point)
 		No directional lighting support. Fairly easy to add this and the code is ready.
-		When opening airlocks etc, lighting does not always update to account for the change in opacity.
 */
 
 #define LIGHTING_MAX_LUMINOSITY 12	//Hard maximum luminosity to prevet lag which could be caused by coders making mini-suns
@@ -272,13 +271,13 @@ area
 
 	proc/SetLightLevel(light)
 		if(!src) return
-		if(light < 0)
+		if(light <= 0)
 			light = 0
-//			luminosity = 0
+			luminosity = 0
 		else
 			if(light > lighting_controller.lighting_states)
 				light = lighting_controller.lighting_states
-//			luminosity = 1
+			luminosity = 1
 
 		if(lighting_overlay)
 			overlays -= lighting_overlay

code/controllers/configuration.dm

@@ -50,6 +50,7 @@
 	var/kick_inactive = 0				//force disconnect for inactive players
 	var/load_jobs_from_txt = 0
 	var/ToRban = 0
+	var/automute_on = 0					//enables automuting/spam prevention
 
 	var/usealienwhitelist = 0
 
@@ -342,10 +343,7 @@
 				if("tor_ban")
 					ToRban = 1
 
-				if("usealienwhitelist")
-					usealienwhitelist = 1
-
-				else
+				if("automute_on")					automute_on = 1				if("usealienwhitelist")					usealienwhitelist = 1				else
 					diary << "Unknown setting in configuration: '[name]'"
 
 		else if(type == "game_options")

code/controllers/voting.dm

@@ -53,10 +53,25 @@ datum/controller/vote
 	proc/get_result()
 		//get the highest number of votes
 		var/greatest_votes = 0
+		var/total_votes = 0
 		for(var/option in choices)
 			var/votes = choices[option]
+			total_votes += votes
 			if(votes > greatest_votes)
 				greatest_votes = votes
+		//default-vote for everyone who didn't vote
+		if(!config.vote_no_default && choices.len)
+			var/non_voters = (client_list.len - total_votes)
+			if(non_voters > 0)
+				if(mode == "restart")
+					choices["Continue Playing"] += non_voters
+					if(choices["Continue Playing"] >= greatest_votes)
+						greatest_votes = choices["Continue Playing"]
+				else if(mode == "gamemode")
+					if(master_mode in choices)
+						choices[master_mode] += non_voters
+						if(choices[master_mode] >= greatest_votes)
+							greatest_votes = choices[master_mode]
 		//get all options with that many votes and return them in a list
 		. = list()
 		if(greatest_votes)