cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-18 10:34:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

WIP fix of this PR

Browse Source
This commit is contained in:
Aronai Sieyes
2021-06-21 19:29:43 -04:00
parent 385fa640af
commit 85c31e9fda
70 changed files with 1878 additions and 4962 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/general/01_basic.dm
+1 -5
View File
@@ -140,11 +140,7 @@
return TOPIC_REFRESH
else if(href_list["metadata"])
<<<<<<< HEAD
var/new_metadata = sanitize(input(user, "Enter any information you'd like others to see, such as Roleplay-preferences:", "Game Preference" , html_decode(pref.metadata)) as message, extra = 0) //VOREStation Edit
=======
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)
>>>>>>> 593246b... Linter diagnostics + bans non-var relative pathing (#8150)
var/new_metadata = sanitize(input(user, "Enter any information you'd like others to see, such as Roleplay-preferences:", "Game Preference" , html_decode(pref.metadata)) as message|null, extra = 0) //VOREStation Edit
if(new_metadata && CanUseTopic(user))
pref.metadata = new_metadata
return TOPIC_REFRESH