From ab0a698421dd011512324ed79fdfa35ade0ae90f Mon Sep 17 00:00:00 2001 From: ikarrus Date: Fri, 26 Sep 2014 22:44:50 -0600 Subject: [PATCH 1/2] Fixes Issue with Deleting Memos It was logging every memo as being deleted every time any memo was deleted. --- code/modules/admin/admin_memo.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/admin_memo.dm b/code/modules/admin/admin_memo.dm index 18b9b030ed1..51577510d90 100644 --- a/code/modules/admin/admin_memo.dm +++ b/code/modules/admin/admin_memo.dm @@ -49,9 +49,9 @@ else ckey = src.ckey if(ckey) + message_admins("[src.ckey] removed [ckey]'s Memo.") + log_admin("[src.ckey] removed Memo created by [F[memo]].") for(var/memo in F.dir) - message_admins("[src.ckey] removed [ckey]'s Memo.") - log_admin("[src.ckey] removed Memo created by [F[memo]].") F.dir.Remove(ckey) #undef MEMOFILE From 4b1deb22528383e51ca883c727ed972a578fc978 Mon Sep 17 00:00:00 2001 From: ikarrus Date: Fri, 26 Sep 2014 22:48:23 -0600 Subject: [PATCH 2/2] fix --- code/modules/admin/admin_memo.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/admin_memo.dm b/code/modules/admin/admin_memo.dm index 51577510d90..89f9116aeaf 100644 --- a/code/modules/admin/admin_memo.dm +++ b/code/modules/admin/admin_memo.dm @@ -50,7 +50,7 @@ ckey = src.ckey if(ckey) message_admins("[src.ckey] removed [ckey]'s Memo.") - log_admin("[src.ckey] removed Memo created by [F[memo]].") + log_admin("[src.ckey] removed Memo created by [ckey].") for(var/memo in F.dir) F.dir.Remove(ckey)