Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12

code/modules/client/client defines.dm

@@ -16,6 +16,7 @@
 	var/moving			= null
 	var/adminobs		= null
 	var/area			= null
+	var/time_died_as_mouse = null //when the client last died as a mouse
 
 
 		///////////////

code/modules/client/preferences_savefile.dm

@@ -151,6 +151,7 @@
 	metadata		= sanitize_text(metadata, initial(metadata))
 	real_name		= reject_bad_name(real_name)
 	if(isnull(species)) species = "Human"
+	if(isnull(nanotrasen_relation)) nanotrasen_relation = initial(nanotrasen_relation)
 	if(!real_name) real_name = random_name()
 	be_random_name	= sanitize_integer(be_random_name, 0, 1, initial(be_random_name))
 	gender			= sanitize_gender(gender)