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/new_player/preferences.dm

@@ -1120,9 +1120,10 @@ datum/preferences
 
 	proc/setup_client(var/client/C)
 		if(C)
-			C.sound_adminhelp = src.sound_adminhelp
+			if(C.holder)
+				C.holder.sound_adminhelp = src.sound_adminhelp
+				C.holder.ooccolor = src.ooccolor
 			C.midis = src.midis
-			C.ooccolor = src.ooccolor
 			C.be_alien = be_special & BE_ALIEN
 			C.be_pai = be_special & BE_PAI
 			if(isnull(src.ghost_ears)) src.ghost_ears = 1 //There were problems where the default was null before someone saved their profile.

code/modules/mob/new_player/preferences_setup.dm

@@ -540,7 +540,6 @@ datum/preferences
 		preview_icon_side = new(preview_icon, dir = WEST)
 
 		del(preview_icon)
-		del(mouth_s)
 		del(eyes_s)
 		del(clothes_s)