From 1ecef982e245e8b368ca2a4b4eab8d9fcbe5aa21 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Thu, 23 Jun 2022 00:14:18 -0400
Subject: [PATCH] powder that makes you say yes

---
 code/modules/mob/living/silicon/pai/recruit.dm | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/code/modules/mob/living/silicon/pai/recruit.dm b/code/modules/mob/living/silicon/pai/recruit.dm
index 9ae86e2430..d2038698e8 100644
--- a/code/modules/mob/living/silicon/pai/recruit.dm
+++ b/code/modules/mob/living/silicon/pai/recruit.dm
@@ -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")