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

Templar and Hospitaller tweak #1239

Merged
merged 10 commits into from
Apr 20, 2024

Conversation

Kesiath
Copy link
Contributor

@Kesiath Kesiath commented Apr 19, 2024

About the PR

Basic rework for Templar and Hospitaller to bring them the updated sprites from NFSD changes, as well as making a couple needed changes.

Why / Balance

Hospitaller didn't have a pressurized internal which made medicine harder, this changes that. Also Templar gains access to a fax machine finally.

Media

image
image

Changelog
🆑

  • tweak: Changed the Hospitaller and Templar to include NFSD changes.

@github-actions github-actions bot added the No C# label Apr 19, 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 S: Merge Conflict This PR has conflicts that prevent merging label Apr 20, 2024
@github-actions github-actions bot removed the S: Merge Conflict This PR has conflicts that prevent merging label Apr 20, 2024
@dvir001 dvir001 self-requested a review April 20, 2024 01:16
@github-actions github-actions bot added the S: Needs Review This PR is awaiting reviews label Apr 20, 2024
@dvir001 dvir001 merged commit b8e0510 into new-frontiers-14:master Apr 20, 2024
12 checks passed
FrontierATC added a commit that referenced this pull request Apr 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
No C# S: Needs Review This PR is awaiting reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants