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.

Sign up for GitHub

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

Jump to bottom

CO armor resprite #6647

Merged
merged 4 commits into from
Aug 23, 2024
Merged

CO armor resprite #6647

merged 4 commits into from
Aug 23, 2024

Conversation

Blundir
Copy link
Contributor

@Blundir Blundir commented Jul 7, 2024 •
edited by Drulikar
Loading

About the pull request

Gives CO armor an actual non placeholder sprite, that matches helmet, gloves and overall aesthetics.

dreamseeker_s83IOE5iBL

Sprites by Iamtheguy (discord tag)

Changelog

🆑
imageadd: unique non placeholder CO armor sprites
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Mapping did you remember to save in tgm format? labels Jul 7, 2024
@zc-byte-boxer
Copy link
Contributor

Looks really cool. Any thought about adding a camo-comforing version? @Blundir

@Blundir
Copy link
Contributor Author

Blundir commented Jul 7, 2024

Looks really cool. Any thought about adding a camo-comforing version? @Blundir

Not really, CO has none to begin with

@github-actions GitHub Actions
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 Jul 15, 2024
@Drulikar Drulikar added Stale Exempt PR can't go stale and removed Stale beg a maintainer to review your PR labels Jul 15, 2024
@Drulikar Drulikar requested a review from a team July 15, 2024 18:06
@Drulikar
Copy link
Contributor

stale exempt until sprite reviewed.

@Nanu308 Nanu308 removed the Mapping did you remember to save in tgm format? label Jul 18, 2024
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jul 25, 2024
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jul 25, 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 Aug 21, 2024
@cm13-github
Copy link
Contributor

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

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

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

@harryob harryob added Sprites Approved confirmed no stray pixels and removed Stale Exempt PR can't go stale labels Aug 23, 2024
@harryob harryob added this pull request to the merge queue Aug 23, 2024
Merged via the queue into cmss13-devs:master with commit f303352 Aug 23, 2024
27 checks passed
cm13-github added a commit that referenced this pull request Aug 23, 2024
@cm13-github
Automatic changelog for PR #6647 [ci skip]
0fd6d40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@harryob harryob harryob approved these changes

Assignees
No one assigned
Labels
Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Blundir @zc-byte-boxer @Drulikar @cm13-github @harryob @Nanu308