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

merged 3 commits into from
Apr 20, 2024

Conversation

realforest2001
Copy link
Member

@realforest2001 realforest2001 commented Apr 16, 2024 •
edited by github-actions bot
Loading

About the pull request

Adds an ARES log for chambering the OB Cannon, and if it has been misfueled or not.

Explain why it's good for the game

Logs who fires it, makes sense to log who loaded it.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
add: Added an ARES Log for chambering the OB Cannon.
/:cl:

@realforest2001 realforest2001 added this to the Project ARES milestone Apr 16, 2024
@github-actions github-actions bot added UI deletes nanoui/html Feature Feature coder badge labels Apr 16, 2024
@realforest2001 realforest2001 mentioned this pull request Apr 16, 2024
Draft
Drulikar
Drulikar approved these changes Apr 20, 2024
View reviewed changes
Copy link
Contributor

@Drulikar Drulikar left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The UI could handle these messages a bit better, but works well enough.

image

code/modules/cm_marines/orbital_cannon.dm Outdated Show resolved Hide resolved
@Drulikar Drulikar enabled auto-merge April 20, 2024 05:03
@Drulikar Drulikar added this pull request to the merge queue Apr 20, 2024
Merged via the queue into cmss13-devs:master with commit c1b8470 Apr 20, 2024
26 checks passed
cm13-github added a commit that referenced this pull request Apr 20, 2024
@cm13-github
Automatic changelog for PR #6157 [ci skip]
4cba226
@realforest2001 realforest2001 deleted the project/ares/obloading branch May 10, 2024 17:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Drulikar Drulikar Drulikar approved these changes

Assignees
No one assigned
Labels
Feature Feature coder badge UI deletes nanoui/html
Projects
None yet
Milestone
Project ARES
Development

Successfully merging this pull request may close these issues.
2 participants
@realforest2001 @Drulikar