cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +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-22 23:56:48 -04:00
committed by GitHub
parent 39e426b4c6
commit 531bb77df2
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/datums/mind.dm
View File

@@ -180,11 +180,7 @@
assigned_role = new_role assigned_role = new_role
else if (href_list["memory_edit"]) else if (href_list["memory_edit"])
<<<<<<< HEAD
var/new_memo = sanitize(input("Write new memory", "Memory", memory) as null|message)
=======
var/new_memo = sanitize(tgui_input_text(usr, "Write new memory", "Memory", memory, multiline = TRUE, prevent_enter = TRUE)) var/new_memo = sanitize(tgui_input_text(usr, "Write new memory", "Memory", memory, multiline = TRUE, prevent_enter = TRUE))
>>>>>>> 9f14866f07... Merge pull request #13135 from ItsSelis/tgui-input-framework-hotfix
if (isnull(new_memo)) return if (isnull(new_memo)) return
memory = new_memo memory = new_memo
@@ -192,11 +188,7 @@
var/datum/mind/mind = locate(href_list["amb_edit"]) var/datum/mind/mind = locate(href_list["amb_edit"])
if(!mind) if(!mind)
return return
<<<<<<< HEAD
var/new_ambition = input("Enter a new ambition", "Memory", mind.ambitions) as null|message
=======
var/new_ambition = tgui_input_text(usr, "Enter a new ambition", "Memory", mind.ambitions, multiline = TRUE, prevent_enter = TRUE) var/new_ambition = tgui_input_text(usr, "Enter a new ambition", "Memory", mind.ambitions, multiline = TRUE, prevent_enter = TRUE)
>>>>>>> 9f14866f07... Merge pull request #13135 from ItsSelis/tgui-input-framework-hotfix
if(isnull(new_ambition)) if(isnull(new_ambition))
return return
if(mind) if(mind)
@@ -571,4 +563,4 @@
/mob/living/simple_mob/construct/juggernaut/mind_initialize() /mob/living/simple_mob/construct/juggernaut/mind_initialize()
. = ..() . = ..()
mind.assigned_role = "Juggernaut" mind.assigned_role = "Juggernaut"
mind.special_role = "Cultist" mind.special_role = "Cultist"