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

Add more jumpsuit 2 electric boogaloo #540

Merged
merged 2 commits into from
Feb 9, 2025

Conversation

VividPups
Copy link
Contributor

@VividPups VividPups commented Feb 7, 2025

Description

I couldn't figure out how to get the merge conflict to show on my Local so I just made a new branch and fix it that way
Link to the other PR: #520

added the Seclong coat to the loadouts

added the Sec Jumpskirt to the loadouts

added the Courier jumpsuits and jump-skirts to the loadouts added the Engineering and Atmosphere jumpsuits and jumpskirts to the loadouts

was ask VIA the discord saying jumpskirts were not in the loadouts

Changelog

🆑

  • add: Added some standard engineering, logistics, and security outfits to the loadouts, as well as the security longcoat.

@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: YML Changes any yml files labels Feb 7, 2025
@Fansana Fansana merged commit d4f7616 into Fansana:master Feb 9, 2025
10 checks passed
Floof-Station-Bot added a commit that referenced this pull request Feb 9, 2025
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 Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants