diff --git a/code/modules/admin/sql_message_system.dm b/code/modules/admin/sql_message_system.dm index e819ad80ba9..d12a4f37102 100644 --- a/code/modules/admin/sql_message_system.dm +++ b/code/modules/admin/sql_message_system.dm @@ -410,7 +410,8 @@ server, IFNULL((SELECT byond_key FROM [format_table_name("player")] WHERE ckey = lasteditor), lasteditor), expire_timestamp, - playtime + playtime, + round_id FROM [format_table_name("messages")] WHERE type = :type AND deleted = 0 AND (expire_timestamp > NOW() OR expire_timestamp IS NULL) "}, list("type" = type)) @@ -431,11 +432,12 @@ var/server = query_get_type_messages.item[7] var/editor_key = query_get_type_messages.item[9] // SKYRAT EDIT CHANGE BEGIN - MULTISERVER var/expire_timestamp = query_get_type_messages.item[10] - var/playtime = query_get_type_messages.item[11] // SKYRAT EDIT CHANGE END - MULTISERVER + var/playtime = query_get_type_messages.item[11] + var/round_id = query_get_type_messages.item[12] // SKYRAT EDIT CHANGE END - MULTISERVER output += "" if(type == "watchlist entry") output += "[t_key] | " - output += "[timestamp] | [server] | [admin_key]" + output += "[timestamp] | [server] | Round [round_id] | [admin_key]" if(type == "watchlist entry") output += " | [get_exp_format(text2num(playtime))] Living Playtime" if(expire_timestamp) @@ -463,7 +465,10 @@ IFNULL((SELECT byond_key FROM [format_table_name("player")] WHERE ckey = lasteditor), lasteditor), DATEDIFF(NOW(), timestamp), IFNULL((SELECT byond_key FROM [format_table_name("player")] WHERE ckey = targetckey), targetckey), - expire_timestamp, severity, playtime + expire_timestamp, + severity, + playtime, + round_id FROM [format_table_name("messages")] WHERE type <> 'memo' AND targetckey = :targetckey AND deleted = 0 AND (expire_timestamp > NOW() OR expire_timestamp IS NULL) ORDER BY timestamp DESC @@ -494,7 +499,8 @@ target_key = query_get_messages.item[11] var/expire_timestamp = query_get_messages.item[12] var/severity = query_get_messages.item[13] - var/playtime = query_get_messages.item[14] // SKYRAT EDIT CHANGE END - MULTISERVER + var/playtime = query_get_messages.item[14] + var/round_id = query_get_messages.item[15] // SKYRAT EDIT CHANGE END - MULTISERVER var/alphatext = "" var/nsd = CONFIG_GET(number/note_stale_days) var/nfd = CONFIG_GET(number/note_fresh_days) @@ -511,7 +517,7 @@ var/list/data = list("

") if(severity) data += " " - data += "[timestamp] | [server] | [admin_key][secret ? " | - Secret" : ""] | [get_exp_format(text2num(playtime))] Living Playtime" + data += "[timestamp] | [server] | Round [round_id] | [admin_key][secret ? " | - Secret" : ""] | [get_exp_format(text2num(playtime))] Living Playtime" if(expire_timestamp) data += " | Expires [expire_timestamp]" data += "

"