Merge remote-tracking branch 'origin/master' into TGUI-3.0

code/modules/client/client_defines.dm

@@ -134,6 +134,14 @@
 	var/parallax_layers_max = 3
 	var/parallax_animate_timer
 
+	// List of all asset filenames sent to this client by the asset cache, along with their assoicated md5s
+	var/list/sent_assets = list()
+	/// List of all completed blocking send jobs awaiting acknowledgement by send_asset
+	var/list/completed_asset_jobs = list()
+	/// Last asset send job id.
+	var/last_asset_job = 0
+	var/last_completed_asset_job = 0
+
 	//world.time of when the crew manifest can be accessed
 	var/crew_manifest_delay
 

code/modules/client/preferences_savefile.dm

@@ -325,6 +325,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	modless_key_bindings 	= sanitize_islist(modless_key_bindings, list())
 
 	verify_keybindings_valid()		// one of these days this will runtime and you'll be glad that i put it in a different proc so no one gets their saves wiped
+	sanitize_speech_and_tongue()
 
 	return 1
 
@@ -346,6 +347,12 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 		if(!GLOB.keybindings_by_name[bindname])
 			modless_key_bindings -= key
 
+/datum/preferences/proc/sanitize_speech_and_tongue()
+	if(!(custom_speech_verb in GLOB.speech_verbs))
+		custom_speech_verb = GLOB.speech_verbs[1]
+	if(!(custom_tongue in GLOB.roundstart_tongues))
+		custom_tongue = GLOB.roundstart_tongues[1]
+
 /datum/preferences/proc/save_preferences()
 	if(!path)
 		return 0