diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm index d3f9b6c1868..7a8837e1671 100644 --- a/code/__HELPERS/time.dm +++ b/code/__HELPERS/time.dm @@ -34,6 +34,6 @@ proc/time_stamp() //else //return 1 -//returns time in a sql and ISO 8601 friendly format +//returns timestamp in a sql and ISO 8601 friendly format /proc/SQLtime() return time2text(world.realtime, "YYYY-MM-DD hh:mm:ss") \ No newline at end of file diff --git a/code/modules/admin/admin_memo.dm b/code/modules/admin/admin_memo.dm index 64ede615a6c..ee07c6573f1 100644 --- a/code/modules/admin/admin_memo.dm +++ b/code/modules/admin/admin_memo.dm @@ -67,8 +67,8 @@ output += "Memo by [ckey] on [timestamp]:" if(last_editor) output += "
Last edit by [last_editor] (Click here to see edit log)" - output += "
[memotext]
" - src << output + output += "
[memotext]
+ src << output if("Remove") var/DBQuery/query_memolist = dbcon.NewQuery("SELECT ckey FROM [format_table_name("memo")])") //should select all memos there are query_memolist.Execute()