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

Adds NGR stamps and secret docs. #3550

Merged
merged 5 commits into from
Oct 14, 2024

Conversation

Sadhorizon
Copy link
Contributor

@Sadhorizon Sadhorizon commented Oct 13, 2024

About The Pull Request

obraz
obraz

Adds that stuff to the Hyena.

Why It's Good For The Game

There is an NGR combat ship and a Hyena replacement in the works rn. Good time to add some fluff.

Changelog

🆑
add: Added stamps for New Gorlex Republic.
add: Added secret documents for New Gorlex Republic.
/:cl:

@Sadhorizon Sadhorizon requested review from a team as code owners October 13, 2024 10:28
@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Oct 13, 2024
@Apogee-dev
Copy link
Contributor

Apogee-dev commented Oct 14, 2024

As long as this ain't broken, can we speedmerge it? I'd like this one and #3555 merged before we rubber stamp #3554, because it could definitely benefit from both

Copy link
Contributor

@meemofcourse meemofcourse left a comment

Choose a reason for hiding this comment

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

good work on the stamps, especially the ngr one. i just wished they actually worked on main

@meemofcourse meemofcourse added this pull request to the merge queue Oct 14, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Oct 14, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Oct 14, 2024
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Oct 14, 2024
@Sadhorizon
Copy link
Contributor Author

deconflicted

@meemofcourse meemofcourse added this pull request to the merge queue Oct 14, 2024
Merged via the queue into shiptest-ss13:master with commit 02eb678 Oct 14, 2024
14 checks passed
MissyNym pushed a commit to MissyNym/Borktest that referenced this pull request Oct 14, 2024
zimon9 pushed a commit to zimon9/Shiptest-PR-testing that referenced this pull request Oct 29, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

![obraz](https://github.com/user-attachments/assets/1d16e84a-c00b-49ad-8a50-d469bc1d598f)

![obraz](https://github.com/user-attachments/assets/38fa6b7a-65ec-4f8a-a7c4-51a12059a1e8)

Adds that stuff to the Hyena.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
There is an NGR combat ship and a Hyena replacement in the works rn.
Good time to add some fluff.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
add: Added stamps for New Gorlex Republic.
add: Added secret documents for New Gorlex Republic.
/: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. -->
zimon9 pushed a commit to zimon9/Shiptest-PR-testing that referenced this pull request Oct 29, 2024
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. Map Change Tile placing is hard. Thank you for your service. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants