cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update 01_basic.dm

Browse Source
This commit is contained in:
Razgriz
2021-06-23 15:48:13 -07:00
committed by GitHub
parent e1083f9ee1
commit c687ed18ef
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/client/preference_setup/general/01_basic.dm
View File

@@ -140,13 +140,7 @@
return TOPIC_REFRESH return TOPIC_REFRESH
else if(href_list["metadata"]) 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, MAX_RECORD_LENGTH, extra = 0) //VOREStation Edit
||||||| parent of 18962f7a77... Merge pull request #10719 from VOREStation/upstream-merge-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, 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" , html_decode(pref.metadata)) as message|null, 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" , html_decode(pref.metadata)) as message|null, extra = 0) //VOREStation Edit
>>>>>>> 18962f7a77... Merge pull request #10719 from VOREStation/upstream-merge-8150
if(new_metadata && CanUseTopic(user)) if(new_metadata && CanUseTopic(user))
pref.metadata = new_metadata pref.metadata = new_metadata
return TOPIC_REFRESH return TOPIC_REFRESH