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/defines/obj.dm

@@ -25,22 +25,6 @@
 		mouse_opacity = 0
 		unacidable = 1//Just to be sure.
 
-/obj/admins
-	name = "admins"
-	var/rank = null
-	var/owner = null
-	var/state = 1
-	//state = 1 for playing : default
-	//state = 2 for observing
-	var/admincaster_screen = 0                           //See newscaster.dm under machinery for a full description
-	var/datum/feed_message/admincaster_feed_message = new /datum/feed_message   //These two will act as holders.
-	var/datum/feed_channel/admincaster_feed_channel = new /datum/feed_channel
-	var/admincaster_signature                            //What you'll sign the newsfeeds as
-
-/obj/admins/New()
-	src.admincaster_signature = "Nanotrasen Officer #[rand(0,9)][rand(0,9)][rand(0,9)]"
-	..()
-
 /obj/effect/beam
 	name = "beam"
 	unacidable = 1//Just to be sure.

code/defines/procs/helpers.dm

@@ -544,7 +544,7 @@ Turf and target are seperate in case you want to teleport some distance from a t
 				else
 					linked = 0
 
-		if (the_client && the_client.holder && the_client.stealth && !include_name)
+		if (the_client && the_client.holder && the_client.holder.fakekey && !include_name)
 			text += "Administrator"
 		else
 			text += "[the_key]"