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

Green Beret sprite fix #5566

Merged
merged 6 commits into from
Jan 31, 2024
Merged

Green Beret sprite fix #5566

merged 6 commits into from
Jan 31, 2024

Conversation

Oyu07
Copy link
Contributor

@Oyu07 Oyu07 commented Jan 27, 2024

About the pull request

fixes #3573
Reuses existing rmc beret, which are green. it fits the beret theme, and compared to red beret, it is a great match.

Please do note that black and red beret have weird sprites compared to other beret. This is not the case when worn, however something to note.

Explain why it's good for the game

Invisible sprites are bad

Testing Photographs and Procedure

--Testing--

  • Local Server
  • Character Pref
  • USMC beret, green
  • spawn
Screenshots & Videos

image

image

image

image

Changelog

🆑
fix: character pref Green Beret is no longer invisible
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Fix Fix one bug, make ten more labels Jan 27, 2024
@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.

@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jan 30, 2024
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
@harryob harryob added this pull request to the merge queue Jan 31, 2024
Merged via the queue into cmss13-devs:master with commit 7f2d6bb Jan 31, 2024
26 checks passed
cm13-github added a commit that referenced this pull request Jan 31, 2024
@Oyu07 Oyu07 deleted the green-beret branch January 31, 2024 00:39
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
None yet
Development

Successfully merging this pull request may close these issues.

Green beret on loadout is tan in-game
4 participants