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

Fixed the red pixel on the HOS beret #8147

Merged
merged 4 commits into from
Jan 22, 2025

Conversation

Ultimate-Fluff
Copy link
Contributor

@Ultimate-Fluff Ultimate-Fluff commented Jan 18, 2025

This fixes #7873. The red pixel has been removed from the HOS beret on the WEST and the golden pixel has been corrected on the EAST state.

Explain why it's good for the game

Wher dat pixel come from?

Testing Photographs and Procedure

Screenshots & Videos

image

Changelog

🆑
fix: Replaced the red pixel on the HOS's beret with the an appropriate golden pixel.
/:cl:

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

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

@cmss13-ci cmss13-ci bot added Sprites Remove the soul from the game. Fix Fix one bug, make ten more labels Jan 18, 2025
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jan 18, 2025
@cm13-github
Copy link
Contributor

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

@Ultimate-Fluff Ultimate-Fluff changed the title Fixes #7873 Fixes #7873, red pixel on HOS beret fixed Jan 19, 2025
@Ultimate-Fluff Ultimate-Fluff changed the title Fixes #7873, red pixel on HOS beret fixed Fixed the red pixel on the HOS beret Jan 19, 2025
@Blundir Blundir added the Sprites Approved confirmed no stray pixels label Jan 22, 2025
@Blundir Blundir added this pull request to the merge queue Jan 22, 2025
Merged via the queue into cmss13-devs:master with commit 78b70e8 Jan 22, 2025
31 checks passed
cmss13-ci bot added a commit that referenced this pull request Jan 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fix one bug, make ten more Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
Status: Merged
Development

Successfully merging this pull request may close these issues.

Captains Beret has a red pixel on east rotation
3 participants