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/modules/mob/dead/observer/login.dm

@@ -1,7 +1,2 @@
 /mob/dead/observer/Login()
-	..()
-	if(client.holder && client.holder.state != 2)
-		client.holder.state = 2
-		var/rank = client.holder.rank
-		client.clear_admin_verbs()
-		client.update_admins(rank)
+	..()

code/modules/mob/dead/observer/say.dm

@@ -10,8 +10,8 @@
 	log_say("Ghost/[src.key] : [message]")
 
 	if (src.client)
-		if(src.client.muted_deadchat)
-			src << "\red You cannot talk in deadchat (muted by admins)."
+		if(src.client.muted & MUTE_DEADCHAT)
+			src << "\red You cannot talk in deadchat (muted)."
 			return
 
 		if (src.client.handle_spam_prevention(message,MUTE_DEADCHAT))