-
Notifications
You must be signed in to change notification settings - Fork 524
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
McDelivery Shuttle with McCargo shipyard #843
Merged
MagnusCrowe
merged 30 commits into
new-frontiers-14:master
from
dvir001:2024-01-05-McDelivery
Jan 21, 2024
Merged
McDelivery Shuttle with McCargo shipyard #843
MagnusCrowe
merged 30 commits into
new-frontiers-14:master
from
dvir001:2024-01-05-McDelivery
Jan 21, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Updated |
…ontier-station-14 into 2024-01-05-McDelivery
RSI Diff Bot; head commit 675c734 merging into 428bada Resources/Textures/_NF/Clothing/Head/Hoods/mccargocrown.rsi
Resources/Textures/_NF/Objects/Storage/Happyhonk/cargo.rsi
|
Now its actually done. |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
the
Merge Conflict
This PR has conflicts that prevent merging
label
Jan 14, 2024
github-actions
bot
added
Merge Conflict
This PR has conflicts that prevent merging
and removed
Merge Conflict
This PR has conflicts that prevent merging
labels
Jan 14, 2024
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
removed
the
Merge Conflict
This PR has conflicts that prevent merging
label
Jan 15, 2024
MagnusCrowe
approved these changes
Jan 21, 2024
FrontierATC
added a commit
that referenced
this pull request
Jan 21, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If #858 or #846 get added before im going to edit the McDelivery again, but nothing critical for this pr.
About the PR
Added the McDelivery and the McCargo shipyard
Allowing for a dedicated food delivery solution.
Small changes to McCargo
Why / Balance
Fast food.
Technical details
.yml
Mapping
Media
Breaking changes
N/A
Changelog
🆑 dvir01