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/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")