Merge remote-tracking branch 'origin/master' into development

code/modules/client/preferences_save_migration.dm

@@ -54,8 +54,8 @@
 	for (var/slot in character_slots)
 		load_character(slot)
 
-		if (!skills || !skills.len)
-			ZeroSkills(1)
+//		if (!skills || !skills.len)
+//			ZeroSkills(1)
 
 		if (!insert_character_sql(C))
 			log_debug("Character insert error during migration. Client: [C.ckey], character slot: [slot].")

code/modules/client/preferences_sql.dm

@@ -283,6 +283,11 @@
 	// Miscellaneous
 	disabilities			= text2num(character_query.item[48])
 	skills					= params2list(character_query.item[49])
+
+	for (var/skill in skills)
+		if (skills[skill])
+			skills[skill] = text2num(skills[skill])
+
 	skill_specialization	= character_query.item[50]
 	home_system				= character_query.item[51]
 	citizenship				= character_query.item[52]
@@ -530,8 +535,23 @@
 	params[":facial_colour"] = facial_hex
 	params[":skin_tone"] = s_tone
 	params[":skin_colour"] = skin_hex
-	params[":hair_style"] = h_style
-	params[":facial_style"] = f_style
+
+	if (istext(h_style))
+		params[":hair_style"] = h_style
+	else if (istype(h_style, /datum/sprite_accessory/hair))
+		var/datum/sprite_accessory/hair/current_h = h_style
+		params[":hair_style"] = current_h.name
+	else
+		params[":hair_style"] = "Bald"
+
+	if (istext(f_style))
+		params[":facial_style"] = f_style
+	else if (istype(h_style, /datum/sprite_accessory/facial_hair))
+		var/datum/sprite_accessory/facial_hair/current_f = f_style
+		params[":facial_style"] = current_f.name
+	else
+		params[":facial_style"] = "Shaved"
+
 	params[":eyes_colour"] = eyes_hex
 	params[":underwear"] = underwear
 	params[":undershirt"] = undershirt