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

NFSD and Exped ship holopads #2823

Merged
merged 4 commits into from
Feb 1, 2025
Merged

NFSD and Exped ship holopads #2823

merged 4 commits into from
Feb 1, 2025

Conversation

Cheackraze
Copy link
Member

@Cheackraze Cheackraze commented Jan 31, 2025

About the PR

Adds the holopads to NFSD and Exped ships. Nothing crazy at all, a single machine in the bridge for pretty much all of these.

Why / Balance

Doing these in a few large chunks of ships for ease of review while also getting all ships in-use asap

How to test

#2795

Media

Requirements

Breaking changes

Changelog

🆑

  • tweak: added holopads to NFSD and Exped ships

@github-actions github-actions bot added the S: Needs Review This PR is awaiting reviews label Jan 31, 2025
Copy link
Contributor

github-actions bot commented Feb 1, 2025

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

@github-actions github-actions bot added the S: Merge Conflict This PR has conflicts that prevent merging label Feb 1, 2025
@arimah arimah mentioned this pull request Feb 1, 2025
89 tasks
Copy link
Contributor

@arimah arimah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved to be merged once the Wendigo -> Hypnos conflict has been resolved, assuming no further edits. :)

# Conflicts:
#	Resources/Maps/_NF/Shuttles/Nfsd/hypnos.yml
@github-actions github-actions bot removed the S: Merge Conflict This PR has conflicts that prevent merging label Feb 1, 2025
@Cheackraze Cheackraze merged commit 06187f4 into master Feb 1, 2025
15 checks passed
FrontierATC added a commit that referenced this pull request Feb 1, 2025
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# S: Needs Review This PR is awaiting reviews size/M
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants