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.

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

Energy Bayonet #3674

Merged
merged 5 commits into from
Nov 3, 2024
Merged

Energy Bayonet #3674

merged 5 commits into from
Nov 3, 2024

Conversation

Erikafox
Copy link
Contributor

About The Pull Request

saw this in the attachments sprite file. implemented it. Scarborough guns can use it right now.

Changelog

🆑
add: Energy Bayonets

/:cl:

@github-actions github-actions bot added DME Edit Code change Watch something violently break. labels Oct 30, 2024
@Apogee-dev
Copy link
Contributor

Apogee-dev commented Oct 31, 2024

You should probably let SolCon guns like the Claris use this too, considering solcon has energy halberds and actually invented energy blades in the lore.

That, and energy bayonet Clarises are just cool as hell

@Erikafox
Copy link
Contributor Author

oh yeah sure ill do that tomorrow

@thgvr thgvr added this pull request to the merge queue Nov 3, 2024
Merged via the queue into shiptest-ss13:master with commit 02205bb Nov 3, 2024
16 checks passed
MrCat15352 pushed a commit to MrCat15352/MrCat that referenced this pull request Dec 27, 2024
## About The Pull Request
saw this in the attachments sprite file. implemented it. Scarborough
guns can use it right now.

## Changelog

:cl:
add: Energy Bayonets

/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: Bjarl <94164348+Bjarl@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants