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

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 //Some of this is being changed to a datum to cut down on uneccessary variables at the client level.	~Carn
 /client
 		////////////////
@@ -58,3 +59,54 @@
 
 
 
+=======
+/client
+		////////////////
+		//ADMIN THINGS//
+		////////////////
+	var/datum/admins/holder = null
+	var/buildmode		= 0
+	var/seeprayers		= 0
+
+	var/muted			= 0
+
+	var/last_message = "" //Contains the last message sent by this client - used to protect against copy-paste spamming.
+	var/last_message_count = 0 //contins a number of how many times a message identical to last_message was sent.
+
+	var/warned			= 0
+
+		/////////
+		//OTHER//
+		/////////
+	var/listen_ooc		= 1
+	var/move_delay		= 1
+	var/moving			= null
+	var/adminobs		= null
+	var/deadchat		= 0
+	var/changes			= 0
+	var/area			= null
+	var/played			= 0
+	var/be_alien		= 0		//Check if that guy wants to be an alien
+	var/be_pai			= 1		//Consider client when searching for players to recruit as a pAI
+	var/activeslot		= 1		//Default active slot!
+	var/STFU_ghosts				//80+ people rounds are fun to admin when text flies faster than airport security
+	var/STFU_radio				//80+ people rounds are fun to admin when text flies faster than airport security
+
+		///////////////
+		//SOUND STUFF//
+		///////////////
+	var/canplaysound	= 1
+	var/ambience_playing= null
+	var/no_ambi			= 0		//Toggle Ambience
+	var/midis			= 1		//Toggle Midis
+
+		////////////
+		//SECURITY//
+		////////////
+	var/next_allowed_topic_time = 10
+	// comment out the line below when debugging locally to enable the options & messages menu
+	control_freak = 1
+
+
+
+>>>>>>> remotes/git-svn

code/modules/client/client procs.dm

@@ -33,7 +33,7 @@
 	if( findtext(href,"<script",1,0) )
 		world.log << "Attempted use of scripts within a topic call, by [src]"
 		message_admins("Attempted use of scripts within a topic call, by [src]")
-		del(usr)
+		//del(usr)
 		return
 
 	//Admin PM
@@ -55,7 +55,7 @@
 	..()	//redirect to [locate(hsrc)]/Topic()
 
 /client/proc/handle_spam_prevention(var/message, var/mute_type)
-	if(src.last_message == message)
+	if(config.automute_on && !holder && src.last_message == message)
 		src.last_message_count++
 		if(src.last_message_count >= SPAM_TRIGGER_AUTOMUTE)
 			src << "\red You have exceeded the spam filter limit for identical messages. An auto-mute was applied."
@@ -103,22 +103,23 @@
 		host = key
 		world.update_status()
 
-	..()	//calls mob.Login()
-	//makejson()
-
-	if(custom_event_msg && custom_event_msg != "")
+	..()	//calls mob.Login()	//makejson()	if(custom_event_msg && custom_event_msg != "")
 		src << "<h1 class='alert'>Custom Event</h1>"
 		src << "<h2 class='alert'>A custom event is taking place. OOC Info:</h2>"
 		src << "<span class='alert'>[html_encode(custom_event_msg)]</span>"
 		src << "<br>"
 
 	//Admin Authorisation
-	if( ckey in admins )
-		holder = new /obj/admins(src)
-		holder.rank = admins[ckey]
+	var/datum/admins/Admin_Obj = admins[ckey]
+	if(istype(Admin_Obj))
 		admin_list += src
-		update_admins(admins[ckey])
+		holder = Admin_Obj
+		holder.owner = src
+		holder.state = null
 
+	..()	//calls mob.Login()
+
+	if(holder)
 		admin_memo_show()
 
 	log_client_to_db()
@@ -128,11 +129,9 @@
 	//DISCONNECT//
 	//////////////
 /client/Del()
-
-	spawn(0)
-		if(holder)
-			admin_list -= src
-			del(holder)
+	if(holder)
+		holder.state = null
+		admin_list -= src
 	client_list -= src
 	return ..()