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 Nanotrasen, Vigilitas and N+S stamps! #3641

Merged
merged 10 commits into from
Nov 2, 2024

Conversation

Sadhorizon
Copy link
Contributor

@Sadhorizon Sadhorizon commented Oct 25, 2024

About The Pull Request

obraz

Maps all that crap on both NT ships and NT ruins.
Generic stamps are for non-command jobs.
NT logo is temporary until the rename happens, so it sucks.

Why It's Good For The Game

Faction stuff or whatever.

Changelog

🆑
add: Added Nanotrasen, Vigilitas and N+S stamps.
/:cl:

@Sadhorizon Sadhorizon requested review from a team as code owners October 25, 2024 16:20
@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. Sprites A bikeshed full of soulless bikes. Ship Ship successfully tested. Code change Watch something violently break. Ruin Ruin successfully tested. labels Oct 25, 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 31, 2024
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Oct 31, 2024
@Apogee-dev
Copy link
Contributor

i'll be real you gotta stop including so many map changes in otherwise micro-PRs adding good flavor content. it's why they end up tied up for so long thanks to conflict concerns. maybe do the map changes in a followup PR in the future

@Apogee-dev Apogee-dev added this pull request to the merge queue Nov 2, 2024
Merged via the queue into shiptest-ss13:master with commit 000a815 Nov 2, 2024
16 checks passed
@Sadhorizon
Copy link
Contributor Author

Suppose I can do that.

MrCat15352 pushed a commit to MrCat15352/MrCat that referenced this pull request Dec 27, 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/fd5c49bf-72e1-49d4-827f-e7182af60792)

Maps all that crap on both NT ships and NT ruins.
**Generic stamps are for non-command jobs.**
NT logo is temporary until the rename happens, so it sucks.
<!-- 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
Faction stuff or whatever.
<!-- 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 Nanotrasen, Vigilitas and N+S stamps.
/: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. -->
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. Ruin Ruin successfully tested. Ship Ship successfully tested. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants