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

# Conflicts:
#	vorestation.dme
This commit is contained in:
Arokha Sieyes
2016-06-07 18:37:47 -04:00
193 changed files with 3373 additions and 1913 deletions

View File

@@ -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 ..()