From 763c5ff195d2d4b3402379815971ce0d21e0b380 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sat, 11 Jun 2022 01:11:17 -0700 Subject: [PATCH 1/2] Update client_procs.dm --- code/modules/client/client_procs.dm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 5387e1e5c6..b927e83b2c 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -422,10 +422,12 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( if( (world.address == address || !address) && !GLOB.host ) GLOB.host = key world.update_status() - + if(holder) add_admin_verbs() - to_chat(src, get_message_output("memo")) + var/admin_memo_note = get_message_output("memo") + if(admin_memo_note) + to_chat(src, get_message_output("memo")) adminGreet() add_verbs_from_config() @@ -468,7 +470,9 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( if(CONFIG_GET(flag/autoconvert_notes)) convert_notes_sql(ckey) - to_chat(src, get_message_output("message", ckey)) + var/admin_message_note = get_message_output("message", ckey) + if(admin_message_note) + to_chat(src, admin_message_note) if(!winexists(src, "asset_cache_browser")) // The client is using a custom skin, tell them. to_chat(src, "Unable to access asset cache browser, if you are using a custom skin file, please allow DS to download the updated version, if you are not, then make a bug report. This is not a critical issue but can cause issues with resource downloading, as it is impossible to know when extra resources arrived to you.") From 42f14aaef261d65315fe9c9d0c55742790a2bac6 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sat, 23 Jul 2022 14:28:09 -0700 Subject: [PATCH 2/2] Update code/modules/client/client_procs.dm Co-authored-by: deathride58 --- code/modules/client/client_procs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index b927e83b2c..66bb714b99 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -427,7 +427,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( add_admin_verbs() var/admin_memo_note = get_message_output("memo") if(admin_memo_note) - to_chat(src, get_message_output("memo")) + to_chat(src, admin_memo_note) adminGreet() add_verbs_from_config()