cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2023-03-17 02:12:55 -04:00
committed by GitHub
parent b8ed862f96
commit d6048bd409
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/client/preference_setup/general/06_flavor.dm
View File

@@ -73,11 +73,7 @@
switch(href_list["flavour_text_robot"]) switch(href_list["flavour_text_robot"])
if("open") if("open")
if("Default") if("Default")
<<<<<<< HEAD
var/msg = sanitize(tgui_input_text(usr,"Set the default flavour text for your robot. It will be used for any module without individual setting. Put in a single space to make blank.","Flavour Text",html_decode(pref.flavour_texts_robot["Default"]), multiline = TRUE, prevent_enter = TRUE), extra = 0)
=======
var/msg = strip_html_simple(tgui_input_text(usr,"Set the default flavour text for your robot. It will be used for any module without individual setting. Put in a single space to make blank.","Flavour Text",html_decode(pref.flavour_texts_robot["Default"]), multiline = TRUE, prevent_enter = TRUE)) var/msg = strip_html_simple(tgui_input_text(usr,"Set the default flavour text for your robot. It will be used for any module without individual setting. Put in a single space to make blank.","Flavour Text",html_decode(pref.flavour_texts_robot["Default"]), multiline = TRUE, prevent_enter = TRUE))
>>>>>>> e07a9d6958... Merge pull request #14670 from KillianKirilenko/kk-sanitweak
if(CanUseTopic(user) && !isnull(msg)) if(CanUseTopic(user) && !isnull(msg))
pref.flavour_texts_robot[href_list["flavour_text_robot"]] = msg pref.flavour_texts_robot[href_list["flavour_text_robot"]] = msg
else else