powder that makes you say yes

This commit is contained in:
Nadyr
2022-06-23 00:00:54 -04:00
committed by GitHub
parent 6bb7db9a6a
commit b26ddd56ea

View File

@@ -447,11 +447,7 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster)
return TRUE
if("set_new_message")
<<<<<<< HEAD
msg = sanitize(tgui_input_message(usr, "Write your Feed story", "Network Channel Handler"))
=======
msg = sanitize(tgui_input_text(usr, "Write your Feed story", "Network Channel Handler", multiline = TRUE, prevent_enter = TRUE))
>>>>>>> 9f14866f07... Merge pull request #13135 from ItsSelis/tgui-input-framework-hotfix
return TRUE
if("set_new_title")