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.

Sign up for GitHub

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

Jump to bottom

Tide cleanup #2593

Merged
merged 10 commits into from
Jan 3, 2025
Merged

Tide cleanup #2593

merged 10 commits into from
Jan 3, 2025
+1,111 −1,379

Conversation

Carolyn3114
Copy link
Contributor

About the PR

guidebook entry and slight cleanup to tide

Why / Balance

it was old and had no guidebook

How to test

Media

Screenshot 2024-12-20 000414

Requirements

Breaking changes

Changelog

@github-actions github-actions bot added Docs Improvements or additions to documentation Map-Shuttle Map - Shuttle No C# Sprites FTL labels Dec 20, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 20, 2024 •
edited
Loading

RSI Diff Bot; head commit fda2c48 merging into 4d61eac
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi

State Old New Status
tide Added

Edit: diff updated after fda2c48

@dvir001 dvir001 added the Ship Contribution Freeze In effect from 2024-10-14 'til it ends, see https://discord.com/channels/1123826877245694004/1129270 label Dec 20, 2024
@github-actions github-actions bot added the Status: Needs Review This PR is awaiting reviews label Dec 20, 2024
dvir001
dvir001 requested changes Dec 22, 2024
View reviewed changes
Resources/Locale/en-US/_NF/guidebook/guides.ftl Outdated Show resolved Hide resolved
Resources/Maps/_NF/Shuttles/Scrap/tide.yml Show resolved Hide resolved
Resources/Prototypes/_NF/Guidebook/shipyard.yml Outdated Show resolved Hide resolved
Resources/Prototypes/_NF/Guidebook/shipyard.yml Outdated Show resolved Hide resolved
Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml Outdated Show resolved Hide resolved
Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml Outdated Show resolved Hide resolved
Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json Outdated Show resolved Hide resolved
@dvir001 dvir001 added Status: Awaiting Changes This PR has changes that need to be made before merging Status: DO NOT MERGE and removed Status: Needs Review This PR is awaiting reviews labels Dec 22, 2024
@dvir001 dvir001 marked this pull request as draft December 25, 2024 21:08
@dvir001 dvir001 marked this pull request as ready for review January 3, 2025 15:29
@dvir001 dvir001 removed the Status: Awaiting Changes This PR has changes that need to be made before merging label Jan 3, 2025
@dvir001
Copy link
Contributor

dvir001 commented Jan 3, 2025 •
edited
Loading

Fixed all the naming issues, fixed the grid by re saving it.
Overall all are small changed, going to merge it ones tests pass

@dvir001 dvir001 merged commit 8941726 into new-frontiers-14:master Jan 3, 2025
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dvir001 dvir001 dvir001 approved these changes

@arimah arimah Awaiting requested review from arimah

@MagnusCrowe MagnusCrowe Awaiting requested review from MagnusCrowe

Assignees
No one assigned
Labels
Docs Improvements or additions to documentation FTL Map-Shuttle Map - Shuttle No C# Ship Contribution Freeze In effect from 2024-10-14 'til it ends, see https://discord.com/channels/1123826877245694004/1129270 Sprites
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Carolyn3114 @dvir001