Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence

Conflicts:
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/storage.dmi

code/modules/client/client defines.dm

@@ -1,3 +1,4 @@
+
 /client
 		////////////////
 		//ADMIN THINGS//

code/modules/client/client procs.dm

@@ -176,12 +176,18 @@ var/next_external_rsc = 0
 		else
 			winset(src, "rpane.changelogb", "background-color=#eaeaea;font-style=bold")
 
+	if (ckey in clientmessages)
+		for (var/message in clientmessages[ckey])
+			src << message
+		clientmessages.Remove(ckey)
+
 	if (config && config.autoconvert_notes)
 		convert_notes_sql(ckey)
 
-	//////////////
-	//DISCONNECT//
-	//////////////
+//////////////
+//DISCONNECT//
+//////////////
+
 /client/Del()
 	if(holder)
 		adminGreet(1)
@@ -273,6 +279,14 @@ var/next_external_rsc = 0
 	if(inactivity > duration)	return inactivity
 	return 0
 
+// Byond seemingly calls stat, each tick.
+// Calling things each tick can get expensive real quick.
+// So we slow this down a little.
+// See: http://www.byond.com/docs/ref/info.html#/client/proc/Stat
+/client/Stat()
+	. = ..()
+	sleep(1)
+
 //send resources to the client. It's here in its own proc so we can move it around easiliy if need be
 /client/proc/send_resources()
 

code/modules/client/message.dm

@@ -0,0 +1,9 @@
+var/list/clientmessages = list()
+
+proc/addclientmessage(var/ckey, var/message)
+	ckey = ckey(ckey)
+	if (!ckey || !message)
+		return
+	if (!(ckey in clientmessages))
+		clientmessages[ckey] = list()
+	clientmessages[ckey] += message

code/modules/client/preferences.dm

@@ -31,6 +31,7 @@ var/list/preferences_datums = list()
 	var/chat_toggles = TOGGLES_DEFAULT_CHAT
 	var/ghost_form = "ghost"
 	var/allow_midround_antag = 1
+	var/preferred_map = null
 
 	//character preferences
 	var/real_name						//our character's name
@@ -344,6 +345,22 @@ var/list/preferences_datums = list()
 					dat += "<b>BYOND Membership Publicity:</b> <a href='?_src_=prefs;preference=publicity'>[(toggles & MEMBER_PUBLIC) ? "Public" : "Hidden"]</a><br>"
 					dat += "<b>Ghost Form:</b> <a href='?_src_=prefs;task=input;preference=ghostform'>[ghost_form]</a><br>"
 
+			if (SERVERTOOLS && config.maprotation)
+				var/p_map = preferred_map
+				if (!p_map)
+					p_map = "Default"
+					if (config.defaultmap)
+						p_map += " ([config.defaultmap.friendlyname])"
+				else
+					if (p_map in config.maplist)
+						var/datum/votablemap/VM = config.maplist[p_map]
+						if (!VM)
+							p_map += " (No longer exists)"
+						else
+							p_map = VM.friendlyname
+					else
+						p_map += " (No longer exists)"
+				dat += "<b>Preferred Map:</b> <a href='?_src_=prefs;preference=preferred_map;task=input'>[p_map]</a>"
 
 			dat += "</td><td width='300px' height='300px' valign='top'>"
 
@@ -945,6 +962,21 @@ var/list/preferences_datums = list()
 						custom_names["deity"] = new_deity_name
 					else
 						user << "<font color='red'>Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and .</font>"
+				if ("preferred_map")
+					var/maplist = list()
+					var/default = "Default"
+					if (config.defaultmap)
+						default += " ([config.defaultmap.friendlyname])"
+					for (var/M in config.maplist)
+						var/datum/votablemap/VM = config.maplist[M]
+						var/friendlyname = "[VM.friendlyname] "
+						if (VM.voteweight <= 0)
+							friendlyname += " (disabled)"
+						maplist[friendlyname] = VM.name
+					maplist[default] = null
+					var/pickedmap = input(user, "Choose your preferred map. This will be used to help weight random map selection.", "Character Preference")  as null|anything in maplist
+					if (pickedmap)
+						preferred_map = maplist[pickedmap]
 
 
 		else

code/modules/client/preferences_savefile.dm

@@ -100,6 +100,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 		chat_toggles = TOGGLES_DEFAULT_CHAT
 		toggles = TOGGLES_DEFAULT
 
+
 //should this proc get fairly long (say 3 versions long),
 //just increase SAVEFILE_VERSION_MIN so it's not as far behind
 //SAVEFILE_VERSION_MAX and then delete any obsolete if clauses
@@ -174,6 +175,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["chat_toggles"]		>> chat_toggles
 	S["toggles"]			>> toggles
 	S["ghost_form"]			>> ghost_form
+	S["preferred_map"]		>> preferred_map
 
 	//try to fix any outdated data if necessary
 	if(needs_update >= 0)
@@ -207,6 +209,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["toggles"]			<< toggles
 	S["chat_toggles"]		<< chat_toggles
 	S["ghost_form"]			<< ghost_form
+	S["preferred_map"]		<< preferred_map
 
 	return 1