diff --git a/code/modules/admin/sql_message_system.dm b/code/modules/admin/sql_message_system.dm index 83b3d48380..d4dd5951d2 100644 --- a/code/modules/admin/sql_message_system.dm +++ b/code/modules/admin/sql_message_system.dm @@ -146,9 +146,9 @@ if(!SSdbcore.Connect()) to_chat(usr, "Failed to establish database connection.") return - var/output + var/list/output = list() var/ruler = "
" - var/navbar = "\[All\]|\[#\]" + var/list/navbar = list("\[All\]|\[#\]") for(var/letter in GLOB.alphabet) navbar += "|\[[letter]\]" navbar += "|\[Memos\]|\[Watchlist\]" @@ -198,9 +198,9 @@ var/datum/DBQuery/query_get_messages = SSdbcore.NewQuery("SELECT type, secret, id, adminckey, text, timestamp, server, lasteditor, DATEDIFF(NOW(), timestamp) AS `age` FROM [format_table_name("messages")] WHERE type <> 'memo' AND targetckey = '[target_ckey]' AND deleted = 0 ORDER BY timestamp DESC") if(!query_get_messages.warn_execute()) return - var/messagedata - var/watchdata - var/notedata + var/list/messagedata = list() + var/list/watchdata = list() + var/list/notedata = list() var/skipped = 0 while(query_get_messages.NextRow()) type = query_get_messages.item[1] @@ -230,8 +230,7 @@ skipped = TRUE alphatext = "filter: alpha(opacity=[alpha]); opacity: [alpha/100];" - var/data - data += "

[timestamp] | [server] | [admin_ckey]" + var/list/data = list("

[timestamp] | [server] | [admin_ckey]") if(!linkless) data += " \[Delete\]" if(type == "note") @@ -304,7 +303,7 @@ else if(!type && !target_ckey && !index) output += "

\[Add message\]\[Add watchlist entry\]\[Add note\]
" output += ruler - usr << browse({"[output]"}, "window=browse_messages;size=900x500") + usr << browse({"[jointext(output, "")]"}, "window=browse_messages;size=900x500") proc/get_message_output(type, target_ckey) if(!SSdbcore.Connect())