cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +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:06:27 -04:00
committed by GitHub
parent 5714966ba6
commit 9b9e99469e
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/modules/admin/topic.dm
View File

@@ -846,15 +846,7 @@
if (ismob(M)) if (ismob(M))
if(!check_if_greater_rights_than(M.client)) if(!check_if_greater_rights_than(M.client))
return return
<<<<<<< refs/remotes/Upstream/master
var/reason = sanitize(tgui_input_text(usr, "Please enter reason.", multiline = TRUE))
=======
<<<<<<< HEAD
var/reason = sanitize(input(usr, "Please enter reason.") as null|message)
=======
var/reason = sanitize(tgui_input_text(usr, "Please enter reason.", multiline = TRUE, prevent_enter = TRUE)) var/reason = sanitize(tgui_input_text(usr, "Please enter reason.", multiline = TRUE, prevent_enter = TRUE))
>>>>>>> 9f14866f07... Merge pull request #13135 from ItsSelis/tgui-input-framework-hotfix
>>>>>>> Input Fixes
if(!reason) if(!reason)
return return
@@ -1829,15 +1821,7 @@
src.access_news_network() src.access_news_network()
else if(href_list["ac_set_new_message"]) else if(href_list["ac_set_new_message"])
<<<<<<< refs/remotes/Upstream/master
src.admincaster_feed_message.body = sanitize(tgui_input_text(usr, "Write your Feed story", "Network Channel Handler", "", multiline = TRUE))
=======
<<<<<<< HEAD
src.admincaster_feed_message.body = sanitize(input(usr, "Write your Feed story", "Network Channel Handler", "") as message)
=======
src.admincaster_feed_message.body = sanitize(tgui_input_text(usr, "Write your Feed story", "Network Channel Handler", "", multiline = TRUE, prevent_enter = TRUE)) src.admincaster_feed_message.body = 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
>>>>>>> Input Fixes
src.access_news_network() src.access_news_network()
else if(href_list["ac_submit_new_message"]) else if(href_list["ac_submit_new_message"])