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

Mercenary QOL #621

Merged
merged 32 commits into from
Dec 11, 2023
Merged

Mercenary QOL #621

merged 32 commits into from
Dec 11, 2023

Conversation

dvir001
Copy link
Contributor

@dvir001 dvir001 commented Nov 29, 2023

About the PR

Why / Balance

Mercenary got full gear now.
Mercenary rank, to use for lockers and airlocks.
Mercenary rank added to all security members
All items with Merc in entity name updated to Mercenary
Every single O2+N2 tanks been replaced with a single Air tank in all lockers to save on entity spam.
Mercenary vest nerfed to match security vests
Mercenary jumpsuit got a tracker added
Added VendPrice to Pinpointer, Disabler & HandHeldMassScanner to allow ship selling to not go up (Price stay same on vending machines)
Added Mercenary locker
Added all mercenary cloth to the VendingMachineBountyVend vendor
Added bounty hunter cloth to the VendingMachineBountyVend vendor
Removed detective gear from the RepDrobe vendor (Reporter Vend)

Technical details

.yml

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame,

Breaking changes

N/A

Changelog
🆑 dvir01, ErhardSteinhauer

  • tweak: The mercenary job has received improvement, new gear, new locker, and new access.

@dvir001 dvir001 marked this pull request as ready for review December 2, 2023 01:53
@github-actions github-actions bot added the Merge Conflict This PR has conflicts that prevent merging label Dec 4, 2023
Copy link
Contributor

github-actions bot commented Dec 4, 2023

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 Dec 4, 2023
@RealIHaveANameOfficial
Copy link
Contributor

I feel like switching out o2/n2 to airtanks should probably be a separate PR, but it's a good change anyway

@dvir001
Copy link
Contributor Author

dvir001 commented Dec 6, 2023

I feel like switching out o2/n2 to airtanks should probably be a separate PR, but it's a good change anyway

Keep in mind with how things are im already forced to "fix" merge conflicts issues that are 2 lines every single time im doing big changes that collide, this is just to allow me to not need to do this yet again. X_X

@Cheackraze
Copy link
Member

@dvir001 were you waiting for textures to finish this one?

@dvir001
Copy link
Contributor Author

dvir001 commented Dec 10, 2023

@dvir001 were you waiting for textures to finish this one?

Working on it now.

@github-actions github-actions bot added the Merge Conflict This PR has conflicts that prevent merging label Dec 10, 2023
Copy link
Contributor

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

@github-actions github-actions bot added Merge Conflict This PR has conflicts that prevent merging and removed Merge Conflict This PR has conflicts that prevent merging labels Dec 10, 2023
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 Dec 10, 2023
Copy link
Contributor

github-actions bot commented Dec 10, 2023

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

Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/mercenary.rsi

State Old New Status
equipped-OUTERCLOTHING Modified

Resources/Textures/_NF/Structures/Storage/closet.rsi

State Old New Status
generic Added
generic_door Added
locked Added
unlocked Added
welded Added

Edit: diff updated after 06b3fe4

@dvir001
Copy link
Contributor Author

dvir001 commented Dec 10, 2023

@dvir001 were you waiting for textures to finish this one?

Done

@Cheackraze Cheackraze merged commit 6bcb40f into new-frontiers-14:master Dec 11, 2023
10 of 11 checks passed
FrontierATC added a commit that referenced this pull request Dec 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants