Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

# Conflicts:
#	vorestation.dme

code/modules/client/preference_setup/general/01_basic.dm

@@ -107,7 +107,7 @@ datum/preferences/proc/set_biological_gender(var/gender)
 	else if(href_list["metadata"])
 		var/new_metadata = sanitize(input(user, "Enter any information you'd like others to see, such as Roleplay-preferences:", "Game Preference" , pref.metadata) as message|null) as message|null
 		if(new_metadata && CanUseTopic(user))
-			pref.metadata = sanitize(new_metadata)
+			pref.metadata = new_metadata
 			return TOPIC_REFRESH
 
 	return ..()

code/modules/client/preference_setup/global/setting_datums.dm

@@ -5,7 +5,7 @@ var/list/_client_preferences_by_type
 /proc/get_client_preferences()
 	if(!_client_preferences)
 		_client_preferences = list()
-		for(var/ct in subtypes(/datum/client_preference))
+		for(var/ct in subtypesof(/datum/client_preference))
 			var/datum/client_preference/client_type = ct
 			if(initial(client_type.description))
 				_client_preferences += new client_type()