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

Adds alot of new Corporate clothes and jackets, laceup shoes updates and new ties. #5437

Merged
merged 10 commits into from
Jan 31, 2024

Conversation

BadAtThisGame302
Copy link
Contributor

@BadAtThisGame302 BadAtThisGame302 commented Jan 13, 2024

About the pull request

PLAN: To replace the current Liaison uniforms with the new ones. FINISHED

Sprites Courtesy of AmoryBlaine on Discord:

  1. Added new ties, updated the red/blue one
  2. Added new brown laceup shoes/Updated black laceup shoes onmob sprite
  3. Added new corporate vests, jackets, bomber jackets and uniforms

Explain why it's good for the game

Alot of new sprites who look amazing, courtesy of AmoryBlaine yet again. Can't thank them enough for these new sprites.

Gives alot more costumization options not only to the Liaison but to also any and all other Corporate Characters/Managers/Employees even Survivors.

Currently REPLACING the current Liaison outfits with these new ones, still keeping them in code but only limited there unless anyone has any objections. (Charcoal and Blazer will be kept due to demand)

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑 BadAtThisGame302, AmoryBlaine
add: Added new brown laceups, adds new ties and tweaks current ones, as well as new suit, bomber, vest, and corporate clothes to the game. Sprites by AmoryBlaine.
imageadd: added six new Corporate clothes sprites (Casual/Ivy/Formal/Black/Brown/Blue), three suit vest sprites (Brown/Tan/Grey), three bomber jacket sprites (Khaki/Red/Grey), and five suit jacket sprites (Khaki/Formal/Black/Brown/Blue).
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Feature Feature coder badge Removal snap labels Jan 13, 2024
@BadAtThisGame302 BadAtThisGame302 changed the title Adds alot of new Corporate clothes and jackets, brown laceup shoes and new ties. Adds alot of new Corporate clothes and jackets, laceup shoes updates and new ties. Jan 13, 2024
@realforest2001 realforest2001 marked this pull request as draft January 13, 2024 03:15
@BadAtThisGame302 BadAtThisGame302 marked this pull request as ready for review January 14, 2024 09:05
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Jan 22, 2024
@Birdtalon Birdtalon removed the Stale beg a maintainer to review your PR label Jan 25, 2024
Copy link
Contributor

@Birdtalon Birdtalon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code

@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jan 30, 2024
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jan 30, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jan 30, 2024
@cm13-github
Copy link
Contributor

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

Copy link
Contributor

@nauticall nauticall left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sprites 🍹

@nauticall nauticall added the Sprites Approved confirmed no stray pixels label Jan 30, 2024
@Birdtalon
Copy link
Contributor

Resolve conflicts and we're good @BadAtThisGame302

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jan 31, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@nauticall nauticall added this pull request to the merge queue Jan 31, 2024
@Birdtalon Birdtalon added the Mapping did you remember to save in tgm format? label Jan 31, 2024
@nauticall nauticall removed this pull request from the merge queue due to a manual request Jan 31, 2024
@nauticall
Copy link
Contributor

please use a more compact changelog next time

@nauticall nauticall added this pull request to the merge queue Jan 31, 2024
Merged via the queue into cmss13-devs:master with commit 0759f52 Jan 31, 2024
26 checks passed
cm13-github added a commit that referenced this pull request Jan 31, 2024
@BadAtThisGame302 BadAtThisGame302 deleted the clothes branch January 31, 2024 16:18
@danma76 danma76 mentioned this pull request Feb 1, 2024
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Mapping did you remember to save in tgm format? Removal snap Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants