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

new jumpsuits to the loadouts #520

Closed
wants to merge 4 commits into from

Conversation

VividPups
Copy link
Contributor

@VividPups VividPups commented Jan 31, 2025

Description

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

Media

N/A

Changelog

🆑

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

added the Seclong coat to the loadouts
added the Sec Jumpskirt to the loadouts
added the Courier jumpsuits and jumpskirts to the loadouts
added the Engineering and Atomsphere jumpsuits and jumpskirts to the loadouts
@github-actions github-actions bot added Changes: YML Changes any yml files Status: Needs Review Someone please review this labels Jan 31, 2025
Fix the Outerware to Uniforms
@Mnemotechnician
Copy link
Collaborator

Please wait for #505 to be merged, this PR will heavily conflict with it since the job loadouts were completely reorganized.

@Mnemotechnician Mnemotechnician added the Status: Requires This requires something else to be done before being resolved label Feb 1, 2025
@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Feb 2, 2025
Copy link
Contributor

github-actions bot commented Feb 2, 2025

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

@VividPups
Copy link
Contributor Author

VividPups commented Feb 2, 2025

You bastards, damn you github

@Mnemotechnician
Copy link
Collaborator

Mnemotechnician commented Feb 2, 2025

Worry not, you just need to move your loadouts to dedicated files (or create new ones)

Also, I updated your changelog to be more concise.

@Fansana
Copy link
Owner

Fansana commented Feb 6, 2025

Please fix the merge conflicts so we can merge this into the update this week

@VividPups
Copy link
Contributor Author

It will be done soon before the update

@VividPups
Copy link
Contributor Author

Im looking at it..and I dont really see any conflicts in it, I would ask for some help looking it and teach me

argag
@VividPups
Copy link
Contributor Author

ummm I couldnt figure it out at all to get the conflicts onto my local so, I just made a new PR

@VividPups VividPups closed this Feb 7, 2025
@VividPups VividPups deleted the Jumpsuit-loadouts branch February 7, 2025 04:44
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: Merge Conflict FIX YOUR PR AAAGH Status: Needs Review Someone please review this Status: Requires This requires something else to be done before being resolved
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants