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

Hospitaller (Update) #910

Merged
merged 4 commits into from
Jan 29, 2024
Merged

Hospitaller (Update) #910

merged 4 commits into from
Jan 29, 2024

Conversation

TsjipTsjip
Copy link
Contributor

About the PR

  • Replace locker with custom fill with a HarsuitFilled locker. Add lecter and two mags to this new locker. (Customfill)

Why / Balance

Ship guidelines.

EXCEPTIONS REQUESTED:

  • NFSD weapons on NFSD ships are not accounted for in current mapping guidelines.

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Changelog

No CL.

@github-actions github-actions bot added Map-Shuttle Map - Shuttle No C# labels Jan 24, 2024
@TsjipTsjip TsjipTsjip mentioned this pull request Jan 24, 2024
Open
69 tasks
@TsjipTsjip
Copy link
Contributor Author

Original ship owner: @Kesiath

@github-actions github-actions bot added the Status: Needs Review This PR is awaiting reviews label Jan 24, 2024
@dvir001 dvir001 changed the title Hospitaller rework Hospitaller (Update) Jan 25, 2024
@github-actions github-actions bot added the Merge Conflict This PR has conflicts that prevent merging label Jan 28, 2024
@github-actions GitHub Actions
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 28, 2024
@dvir001
Copy link
Contributor

dvir001 commented Jan 28, 2024

Fixed the rest of the issues

image

@dvir001 dvir001 self-requested a review January 28, 2024 23:48
@dvir001 dvir001 merged commit 3fe2005 into new-frontiers-14:master Jan 29, 2024
10 of 11 checks passed
@TsjipTsjip TsjipTsjip deleted the hospitaller-rework branch February 18, 2024 17:36
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

@MagnusCrowe MagnusCrowe Awaiting requested review from MagnusCrowe

Assignees
No one assigned
Labels
Map-Shuttle Map - Shuttle No C# Status: Needs Review This PR is awaiting reviews
Projects
None yet
Milestone
No milestone
Development

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