From bc6da3082dec7928175271f77506b86af7a4224e Mon Sep 17 00:00:00 2001 From: Crazylemon64 Date: Wed, 31 Aug 2016 00:11:01 -0700 Subject: [PATCH] Fixes a runtime when a null memo would be attempted to be displayed to an admin Null descriptions will no longer `to_chat` KA now no longer runtimes --- code/game/atoms.dm | 3 ++- code/modules/admin/admin_memo.dm | 6 +++--- code/modules/projectiles/guns/energy/special.dm | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index bc58c346b01..c60d726236b 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -200,7 +200,8 @@ f_name += "oil-stained [name][infix]." to_chat(user, "[bicon(src)] That's [f_name] [suffix]") - to_chat(user, desc) + if(desc) + to_chat(user, desc) if(reagents && is_open_container()) //is_open_container() isn't really the right proc for this, but w/e to_chat(user, "It contains:") diff --git a/code/modules/admin/admin_memo.dm b/code/modules/admin/admin_memo.dm index 489be7b68dc..530b9e7958e 100644 --- a/code/modules/admin/admin_memo.dm +++ b/code/modules/admin/admin_memo.dm @@ -99,10 +99,10 @@ if(last_editor) output += "
Last edit by [last_editor] (Click here to see edit log)" output += "
[memotext]
" - if(!output && !silent) + if(output) + to_chat(src, output) + else if(!silent) to_chat(src, "No memos found in database.") - return - to_chat(src, output) if("Remove") var/DBQuery/query_memodellist = dbcon.NewQuery("SELECT ckey FROM [format_table_name("memo")]") if(!query_memodellist.Execute()) diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 4339cd504e9..c982cdb7e6e 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -209,7 +209,7 @@ power_supply.give(5000) if(!suppressed) playsound(loc, 'sound/weapons/kenetic_reload.ogg', 60, 1) - else + else if(ismob(loc)) to_chat(loc, "[src] silently charges up.") update_icon()