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

Input Fixes

Browse Source
This commit is contained in:
Casey
2022-06-21 06:14:03 -04:00
committed by Darlantan
parent 02f2cb90c5
commit 5788a26593
37 changed files with 1941 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/pda/core_apps.dm
View File

@@ -62,7 +62,15 @@
return TRUE
switch(action)
if("Edit")
<<<<<<< refs/remotes/Upstream/master
var/n = tgui_input_text(usr, "Please enter message", name, notehtml, multiline = TRUE)
=======
<<<<<<< HEAD
var/n = input(usr, "Please enter message", name, notehtml) as message
=======
var/n = tgui_input_text(usr, "Please enter message", name, notehtml, multiline = TRUE, prevent_enter = TRUE)
>>>>>>> 9f14866f07... Merge pull request #13135 from ItsSelis/tgui-input-framework-hotfix
>>>>>>> Input Fixes
if(pda.loc == usr)
note = adminscrub(n)
notehtml = html_decode(note)