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

Service & Instrument Loadout Groups #906

Merged
merged 2 commits into from
Sep 11, 2024

Conversation

gluesniffler
Copy link
Contributor

Description

This PR creates Loadout Groups specific to Service jobs, and provides a discount on all service loadout items in return for having the group limit behavior. Also adds significant discounts to all instruments for musicians in exchange for only being able to pick up to 3.


Changelog

🆑 Mocho

  • add: Service Job related items are now part of a Service loadout group, and have all been significantly discounted.
  • tweak: Musicians now have significant discounts on all instruments in loadouts, but can only take a maximum of 3.

@github-actions github-actions bot added the Changes: YML Changes any yml files label Sep 11, 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 Status: Merge Conflict FIX YOUR PR AAAGH label Sep 11, 2024
@VMSolidus
Copy link
Member

Damnit github it's literally one file conflicting, whyyyyy
Just let me resolve it in the web editor!

@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Sep 11, 2024
@VMSolidus VMSolidus merged commit 069c187 into Simple-Station:master Sep 11, 2024
11 checks passed
SimpleStation14 added a commit that referenced this pull request Sep 11, 2024
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: YML Changes any yml files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants