cyberpresidentvanellope/Skyrat-tg
1
0
Fork 0
mirror of https://github.com/Skyrat-SS13/Skyrat-tg.git synced 2026-07-18 19:35:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into pulls-tg-to-fix-shit

Browse Source
This commit is contained in:
Waterpig
2024-09-08 00:59:39 +02:00
parent 410024afef 4b4ae0958f
commit 4c4930c71d
1728 changed files with 273718 additions and 2237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/sql_message_system.dm
+20
View File
@@ -79,7 +79,10 @@
"target_ckey" = target_ckey,
"admin_ckey" = admin_ckey,
"text" = text,
<<<<<<< HEAD
"server_name" = CONFIG_GET(string/serversqlname), // SKYRAT EDIT ADDITION - MULTISERVER
=======
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
"server" = server,
"internet_address" = world.internet_address || "0",
"port" = "[world.port]",
@@ -433,10 +436,17 @@
var/text = query_get_type_messages.item[5]
var/timestamp = query_get_type_messages.item[6]
var/server = query_get_type_messages.item[7]
<<<<<<< HEAD
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]
var/round_id = query_get_type_messages.item[12] // SKYRAT EDIT CHANGE END - MULTISERVER
=======
var/editor_key = query_get_type_messages.item[8]
var/expire_timestamp = query_get_type_messages.item[9]
var/playtime = query_get_type_messages.item[10]
var/round_id = query_get_type_messages.item[11]
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
output += "<b>"
if(type == "watchlist entry")
output += "[t_key] | "
@@ -497,6 +507,7 @@
var/text = query_get_messages.item[5]
var/timestamp = query_get_messages.item[6]
var/server = query_get_messages.item[7]
<<<<<<< HEAD
var/editor_key = query_get_messages.item[9] // SKYRAT EDIT CHANGE BEGIN - MULTISERVER
var/age = text2num(query_get_messages.item[10])
target_key = query_get_messages.item[11]
@@ -504,6 +515,15 @@
var/severity = query_get_messages.item[13]
var/playtime = query_get_messages.item[14]
var/round_id = query_get_messages.item[15] // SKYRAT EDIT CHANGE END - MULTISERVER
=======
var/editor_key = query_get_messages.item[8]
var/age = text2num(query_get_messages.item[9])
target_key = query_get_messages.item[10]
var/expire_timestamp = query_get_messages.item[11]
var/severity = query_get_messages.item[12]
var/playtime = query_get_messages.item[13]
var/round_id = query_get_messages.item[14]
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
var/alphatext = ""
var/nsd = CONFIG_GET(number/note_stale_days)
var/nfd = CONFIG_GET(number/note_fresh_days)