cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-04 14:33:58 +00: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:14:18 -04:00
committed by GitHub
parent cc1317b1ba
commit 1ecef982e2
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/modules/mob/living/silicon/pai/recruit.dm
View File

@@ -73,15 +73,7 @@ var/datum/paiController/paiController // Global handler for pAI candidates
if(t)
candidate.name = t
if("desc")
<<<<<<< refs/remotes/Upstream/master
t = tgui_input_text(usr, "Enter a description for your pAI", "pAI Description", candidate.description, multiline = TRUE)
=======
<<<<<<< HEAD
t = input(usr, "Enter a description for your pAI", "pAI Description", candidate.description) as message
=======
t = tgui_input_text(usr, "Enter a description for your pAI", "pAI Description", candidate.description, multiline = TRUE, prevent_enter = TRUE)
>>>>>>> 9f14866f07... Merge pull request #13135 from ItsSelis/tgui-input-framework-hotfix
>>>>>>> Input Fixes
if(t)
candidate.description = sanitize(t)
if("role")
@@ -89,15 +81,7 @@ var/datum/paiController/paiController // Global handler for pAI candidates
if(t)
candidate.role = sanitize(t)
if("ooc")
<<<<<<< refs/remotes/Upstream/master
t = tgui_input_text(usr, "Enter any OOC comments", "pAI OOC Comments", candidate.comments, multiline = TRUE)
=======
<<<<<<< HEAD
t = input(usr, "Enter any OOC comments", "pAI OOC Comments", candidate.comments) as message
=======
t = tgui_input_text(usr, "Enter any OOC comments", "pAI OOC Comments", candidate.comments, multiline = TRUE, prevent_enter = TRUE)
>>>>>>> 9f14866f07... Merge pull request #13135 from ItsSelis/tgui-input-framework-hotfix
>>>>>>> Input Fixes
if(t)
candidate.comments = sanitize(t)
if("save")