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

NSF Wasp: New NSFD Decoration and Tweaks #1259

Merged
merged 4 commits into from
Apr 26, 2024

Conversation

Deeeeja
Copy link
Contributor

@Deeeeja Deeeeja commented Apr 22, 2024

About the PR

Visually updates the Wasp to the new NFSD colours and alters it to comply with mapping guidelines, Part of #1230.

Changes

The Wasp needed to be updated, in addition to this the following has been altered / fixed:

  • Moved the Wasp to the Security subfolder
  • Most if not all under wall wiring has been removed in favour of running them under airlocks
  • Both internal thruster areas are now accessible via an internal airlock for easier thruster maintenance
  • All custom fills for containers have been removed
  • Changed some tiling in the prison cell to be less ugly and monotone
  • Replaced weapons crates in favour of Weapon racks (The Swat crate was kept due to this being a prison ship)
  • Reduced the price of the ship from $145,700 to $135000 since the ship appraises to about $120,000 (I'm happy to change this)

How to test

Buy the Ship in game at the NSFD outpost

Media

Weapons replaced with Weapon racks:

image

Main Room with new paint job and prototypes:

image

Thruster Access:

image

Prison Cell tile changes:

image

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

Breaking changes

Changelog
🆑

  • tweak: Tweaked the NSF Wasp and changed it to the new NSFD colours

@github-actions github-actions bot added the No C# label Apr 22, 2024
@Deeeeja
Copy link
Contributor Author

Deeeeja commented Apr 22, 2024

@dvir001 I believe I have included the change that you requested. I'm guessing you were asking for the Prisoner Job spawn with a normal latejoin spawn near the top of the ship?

@dvir001
Copy link
Contributor

dvir001 commented Apr 22, 2024

@dvir001 I believe I have included the change that you requested. I'm guessing you were asking for the Prisoner Job spawn with a normal latejoin spawn near the top of the ship?

Can you also uncomment the one line on prisoner job to allow it to spawn on latejoin job spawn in this PR.

@Deeeeja
Copy link
Contributor Author

Deeeeja commented Apr 22, 2024

Can you also uncomment the one line on prisoner job to allow it to spawn on latejoin job spawn in this PR.

Done. I tested it and the prisoners now spawn in the right location

@github-actions github-actions bot added the Merge Conflict This PR has conflicts that prevent merging label Apr 23, 2024
Copy link
Contributor

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

@MagnusCrowe
Copy link
Contributor

Fix the merge conflicts and I'll come back to this one.

@github-actions github-actions bot removed the Merge Conflict This PR has conflicts that prevent merging label Apr 25, 2024
@dvir001 dvir001 self-requested a review April 26, 2024 20:48
@github-actions github-actions bot added the Status: Needs Review This PR is awaiting reviews label Apr 26, 2024
Copy link
Contributor

@dvir001 dvir001 left a comment

Choose a reason for hiding this comment

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

Cool

Will need more edits after in some other PR but this is good edit.

@dvir001 dvir001 merged commit 099a8e0 into new-frontiers-14:master Apr 26, 2024
13 checks passed
FrontierATC added a commit that referenced this pull request Apr 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
No C# Status: Needs Review This PR is awaiting reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants