Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Project ARES: Orbital Cannon loading log #6157

Merged
merged 3 commits into from
Apr 20, 2024
Merged

Project ARES: Orbital Cannon loading log #6157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86b8f42
log tweak
realforest2001 Apr 16, 2024
dea8dd9
wording
realforest2001 Apr 16, 2024
e856d2e
Update code/modules/cm_marines/orbital_cannon.dm
Drulikar Apr 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/game/machinery/ARES/ARES_procs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
3 changes: 3 additions & 0 deletions code/modules/cm_marines/orbital_cannon.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 += " Fuel imbalance detected!"
message_admins(message, x, y, z)
log_ares_bombardment(user, lowertext(tray.warhead.name), ares_message)

update_icon()

Expand Down
2 changes: 1 addition & 1 deletion code/modules/cm_marines/overwatch.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/AresAdmin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@ const BombardmentLogs = (props, context) => {
User
</Flex.Item>
<Flex.Item width="30rem" textAlign="center">
Coordinates
Details
</Flex.Item>
</Flex>
)}
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/AresInterface.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ const BombardmentLogs = (props) => {
User
</Flex.Item>
<Flex.Item width="30rem" textAlign="center">
Coordinates
Details
</Flex.Item>
</Flex>
)}
Expand Down
Loading