cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +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:04:11 -04:00
committed by GitHub
parent 70231ecc55
commit abb12440ec
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,11 +18,7 @@
/client/proc/admin_memo_write()
var/savefile/F = new(MEMOFILE)
if(F)
<<<<<<< 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
@@ -59,4 +55,4 @@
to_chat(src, "<span class='filter_adminlog'><b>Removed Memo created by [ckey].</b></span>")
#undef MEMOFILE
#undef ENABLE_MEMOS
#undef ENABLE_MEMOS