cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +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

6
code/modules/admin/admin_memo.dm
View File

@@ -18,7 +18,11 @@
/client/proc/admin_memo_write()
var/savefile/F = new(MEMOFILE)
if(F)
var/memo = sanitize(tgui_input_text(src,"Type your memo\n(Leaving it blank will delete your current memo):","Write Memo",null, multiline = TRUE), extra = 0)
<<<<<<< HEAD
var/memo = sanitize(input(src,"Type your memo\n(Leaving it blank will delete your current memo):","Write Memo",null) as null|message, extra = 0)
=======
var/memo = sanitize(tgui_input_text(src,"Type your memo\n(Leaving it blank will delete your current memo):","Write Memo",null, multiline = TRUE, prevent_enter = TRUE), extra = 0)
>>>>>>> 9f14866f07... Merge pull request #13135 from ItsSelis/tgui-input-framework-hotfix
switch(memo)
if(null)
return