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

Express Console Supremacy #2994

Merged
merged 15 commits into from
Jul 16, 2024
Merged

Conversation

FalloutFalcon
Copy link
Member

About The Pull Request

Cuts out the old cargo console the express was a subtype, combining behaviors so there is only one.
I would like to add the shopping list feature back so we can pool shipments together since most of our packs are now 1 item.

Why It's Good For The Game

Easier code managment

Changelog

🆑
refactor: refactored express console to not be a subtype of the cargo console and replacing it.
/:cl:

@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. DME Edit TGUI Code change Watch something violently break. labels May 15, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label May 20, 2024
Copy link
Contributor

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label May 31, 2024
@FalloutFalcon FalloutFalcon marked this pull request as ready for review May 31, 2024 12:34
@FalloutFalcon FalloutFalcon requested a review from a team as a code owner May 31, 2024 12:34
@FalloutFalcon FalloutFalcon added the Test Merge Required They'll have to do it for free. label May 31, 2024
@FalloutFalcon FalloutFalcon added Test Merged They've done it for free. and removed Test Merge Required They'll have to do it for free. labels Jun 8, 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 Jun 12, 2024
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jun 18, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jul 3, 2024
Copy link
Contributor

github-actions bot commented Jul 3, 2024

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jul 3, 2024
@rye-rice rye-rice added this pull request to the merge queue Jul 11, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jul 11, 2024
@rye-rice rye-rice added this pull request to the merge queue Jul 12, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jul 12, 2024
@rye-rice rye-rice added this pull request to the merge queue Jul 16, 2024
Merged via the queue into shiptest-ss13:master with commit c600289 Jul 16, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Jul 20, 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

Cuts out the old cargo console the express was a subtype, combining
behaviors so there is only one.
I would like to add the shopping list feature back so we can pool
shipments together since most of our packs are now 1 item.
<!-- 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
Easier code managment

<!-- 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:
refactor: refactored express console to not be a subtype of the cargo
console and replacing it.
/: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. -->
FalloutFalcon added a commit to FalloutFalcon/ShiptestF that referenced this pull request Aug 30, 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

Cuts out the old cargo console the express was a subtype, combining
behaviors so there is only one.
I would like to add the shopping list feature back so we can pool
shipments together since most of our packs are now 1 item.
<!-- 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
Easier code managment

<!-- 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:
refactor: refactored express console to not be a subtype of the cargo
console and replacing it.
/: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. -->
FalloutFalcon pushed a commit to FalloutFalcon/ShiptestF that referenced this pull request Aug 30, 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. DME Edit Map Change Tile placing is hard. Thank you for your service. Test Merged They've done it for free. TGUI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants