From 86b8f429ee6d3da169b6ad4d66d7a078a1ce6a12 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Tue, 16 Apr 2024 18:35:19 +0100 Subject: [PATCH 1/3] log tweak --- code/game/machinery/ARES/ARES_procs.dm | 4 ++-- code/modules/cm_marines/orbital_cannon.dm | 3 +++ code/modules/cm_marines/overwatch.dm | 2 +- tgui/packages/tgui/interfaces/AresAdmin.js | 2 +- tgui/packages/tgui/interfaces/AresInterface.jsx | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/ARES/ARES_procs.dm b/code/game/machinery/ARES/ARES_procs.dm index 1212d1509a01..debd7088cd6f 100644 --- a/code/game/machinery/ARES/ARES_procs.dm +++ b/code/game/machinery/ARES/ARES_procs.dm @@ -144,11 +144,11 @@ GLOBAL_LIST_INIT(maintenance_categories, list( var/datum/ares_datacore/datacore = GLOB.ares_datacore datacore.records_bioscan.Add(new /datum/ares_record/bioscan(title, input)) -/proc/log_ares_bombardment(user_name, ob_name, coordinates) +/proc/log_ares_bombardment(user_name, ob_name, message) if(!ares_can_log()) return FALSE var/datum/ares_datacore/datacore = GLOB.ares_datacore - datacore.records_bombardment.Add(new /datum/ares_record/bombardment(ob_name, "Bombardment fired at [coordinates].", user_name)) + datacore.records_bombardment.Add(new /datum/ares_record/bombardment(ob_name, message, user_name)) /proc/log_ares_announcement(title, message) if(!ares_can_log()) diff --git a/code/modules/cm_marines/orbital_cannon.dm b/code/modules/cm_marines/orbital_cannon.dm index 23bce06fdc1a..46ba3baedf75 100644 --- a/code/modules/cm_marines/orbital_cannon.dm +++ b/code/modules/cm_marines/orbital_cannon.dm @@ -184,9 +184,12 @@ GLOBAL_LIST(ob_type_fuel_requirements) chambered_tray = TRUE var/misfuel = get_misfuel_amount() var/message = "[key_name(user)] chambered the Orbital Bombardment cannon." + var/ares_message = "Shell chambered." if(misfuel) message += " It is misfueled by [misfuel] units!" + ares_message += " It is misfueled by [misfuel] units!" message_admins(message, x, y, z) + log_ares_bombardment(user, lowertext(tray.warhead.name), ares_message) update_icon() diff --git a/code/modules/cm_marines/overwatch.dm b/code/modules/cm_marines/overwatch.dm index 489a7e528832..70b2b82d8c86 100644 --- a/code/modules/cm_marines/overwatch.dm +++ b/code/modules/cm_marines/overwatch.dm @@ -800,7 +800,7 @@ notify_ghosts(header = "Bombardment Inbound", message = "\A [ob_name] targeting [get_area(T)] has been fired!", source = T, alert_overlay = warhead_appearance, extra_large = TRUE) /// Project ARES interface log. - log_ares_bombardment(user.name, ob_name, "X[x_bomb], Y[y_bomb] in [get_area(T)]") + log_ares_bombardment(user.name, ob_name, "Bombardment fired at X[x_bomb], Y[y_bomb] in [get_area(T)]") busy = FALSE if(istype(T)) diff --git a/tgui/packages/tgui/interfaces/AresAdmin.js b/tgui/packages/tgui/interfaces/AresAdmin.js index 3963ee87f3a4..cda7c9075509 100644 --- a/tgui/packages/tgui/interfaces/AresAdmin.js +++ b/tgui/packages/tgui/interfaces/AresAdmin.js @@ -665,7 +665,7 @@ const BombardmentLogs = (props, context) => { User - Coordinates + Details )} diff --git a/tgui/packages/tgui/interfaces/AresInterface.jsx b/tgui/packages/tgui/interfaces/AresInterface.jsx index 4045cba6509c..fa9386a6d03a 100644 --- a/tgui/packages/tgui/interfaces/AresInterface.jsx +++ b/tgui/packages/tgui/interfaces/AresInterface.jsx @@ -628,7 +628,7 @@ const BombardmentLogs = (props) => { User - Coordinates + Details )} From dea8dd9559a6ae83c485d80e8411bd019f605546 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Tue, 16 Apr 2024 19:10:18 +0100 Subject: [PATCH 2/3] wording --- code/modules/cm_marines/orbital_cannon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cm_marines/orbital_cannon.dm b/code/modules/cm_marines/orbital_cannon.dm index 46ba3baedf75..d139e3643ef7 100644 --- a/code/modules/cm_marines/orbital_cannon.dm +++ b/code/modules/cm_marines/orbital_cannon.dm @@ -187,7 +187,7 @@ GLOBAL_LIST(ob_type_fuel_requirements) var/ares_message = "Shell chambered." if(misfuel) message += " It is misfueled by [misfuel] units!" - ares_message += " It is misfueled by [misfuel] units!" + ares_message += "Fuel imbalance detected!" message_admins(message, x, y, z) log_ares_bombardment(user, lowertext(tray.warhead.name), ares_message) From e856d2e4d9a2bebd9f47dea12b214bfe33ef9d77 Mon Sep 17 00:00:00 2001 From: Drathek <76988376+Drulikar@users.noreply.github.com> Date: Fri, 19 Apr 2024 22:03:03 -0700 Subject: [PATCH 3/3] Update code/modules/cm_marines/orbital_cannon.dm --- code/modules/cm_marines/orbital_cannon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cm_marines/orbital_cannon.dm b/code/modules/cm_marines/orbital_cannon.dm index d139e3643ef7..ce69115cee48 100644 --- a/code/modules/cm_marines/orbital_cannon.dm +++ b/code/modules/cm_marines/orbital_cannon.dm @@ -187,7 +187,7 @@ GLOBAL_LIST(ob_type_fuel_requirements) var/ares_message = "Shell chambered." if(misfuel) message += " It is misfueled by [misfuel] units!" - ares_message += "Fuel imbalance detected!" + ares_message += " Fuel imbalance detected!" message_admins(message, x, y, z) log_ares_bombardment(user, lowertext(tray.warhead.name), ares_message)