cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-23 05:07:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-06-23 00:10:16 -04:00
committed by GitHub
parent 189a9a8335
commit 475883ccb3
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/global/03_pai.dm
-16
View File
@@ -46,15 +46,7 @@
if(t && CanUseTopic(user))
candidate.name = t
if("desc")
<<<<<<< refs/remotes/Upstream/master
t = tgui_input_text(user, "Enter a description for your pAI", "Global Preference", html_decode(candidate.description), multiline = TRUE)
=======
<<<<<<< HEAD
t = input(user, "Enter a description for your pAI", "Global Preference", html_decode(candidate.description)) as message|null
=======
t = tgui_input_text(user, "Enter a description for your pAI", "Global Preference", html_decode(candidate.description), multiline = TRUE, prevent_enter = TRUE)
>>>>>>> 9f14866f07... Merge pull request #13135 from ItsSelis/tgui-input-framework-hotfix
>>>>>>> Input Fixes
if(!isnull(t) && CanUseTopic(user))
candidate.description = sanitize(t)
if("role")
@@ -62,15 +54,7 @@
if(!isnull(t) && CanUseTopic(user))
candidate.role = sanitize(t)
if("ooc")
<<<<<<< refs/remotes/Upstream/master
t = tgui_input_text(user, "Enter any OOC comments", "Global Preference", html_decode(candidate.comments), multiline = TRUE)
=======
<<<<<<< HEAD
t = input(user, "Enter any OOC comments", "Global Preference", html_decode(candidate.comments)) as message
=======
t = tgui_input_text(user, "Enter any OOC comments", "Global Preference", html_decode(candidate.comments), multiline = TRUE, prevent_enter = TRUE)
>>>>>>> 9f14866f07... Merge pull request #13135 from ItsSelis/tgui-input-framework-hotfix
>>>>>>> Input Fixes
if(!isnull(t) && CanUseTopic(user))
candidate.comments = sanitize(t)
return TOPIC_REFRESH