-
Notifications
You must be signed in to change notification settings - Fork 473
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
Mercenary QOL #621
Conversation
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
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 |
@dvir001 were you waiting for textures to finish this one? |
Working on it now. |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
RSI Diff Bot; head commit 06b3fe4 merging into a508ce1 Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/mercenary.rsi
Resources/Textures/_NF/Structures/Storage/closet.rsi
|
Done |
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 toMercenary
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
vendorAdded bounty hunter cloth to the
VendingMachineBountyVend
vendorRemoved detective gear from the
RepDrobe
vendor (Reporter Vend)Technical details
.yml
Media
Breaking changes
N/A
Changelog
🆑 dvir01, ErhardSteinhauer