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

McDelivery Shuttle with McCargo shipyard #843

Merged
merged 30 commits into from
Jan 21, 2024

Conversation

dvir001
Copy link
Contributor

@dvir001 dvir001 commented Jan 7, 2024

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

  • I have added screenshots/videos to this PR showcasing its changes ingame,

image

image

image

Breaking changes

N/A

Changelog
🆑 dvir01

  • add: Added the McDelivery to the McCargo on ship shipyard, now you can do your fast food delivery with your very own fast food delivery ship.

@github-actions github-actions bot added Map-Shuttle Map - Shuttle No C# labels Jan 7, 2024
@MagnusCrowe
Copy link
Contributor

image
Add a poster or a cargo banner.

@dvir001
Copy link
Contributor Author

dvir001 commented Jan 8, 2024

Updated

@github-actions github-actions bot added the Status: Needs Review This PR is awaiting reviews label Jan 9, 2024
Copy link
Contributor

github-actions bot commented Jan 13, 2024

RSI Diff Bot; head commit 675c734 merging into 428bada
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_NF/Clothing/Head/Hoods/mccargocrown.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Objects/Storage/Happyhonk/cargo.rsi

State Old New Status
box-inhand-left Added
box-inhand-right Added
box-open Added
box Added

Edit: diff updated after 675c734

@dvir001
Copy link
Contributor Author

dvir001 commented Jan 13, 2024

Now its actually done.

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 This PR has conflicts that prevent merging label Jan 14, 2024
@github-actions 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
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 This PR has conflicts that prevent merging label Jan 15, 2024
@MagnusCrowe MagnusCrowe merged commit a35c3a8 into new-frontiers-14:master Jan 21, 2024
12 of 13 checks passed
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
Map-Shuttle Map - Shuttle No C# Sprites Status: Needs Review This PR is awaiting reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants