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

another pred mask attachie #8155

Merged
merged 9 commits into from
Jan 23, 2025
Merged

Conversation

Nomoresolvalou
Copy link
Contributor

About the pull request

Title. This time the sprites are by Lat.

Explain why it's good for the game

more customization yummy

Testing Photographs and Procedure

Screenshots & Videos

silver style

image

image

Changelog

🆑Nomoresolvalou, Justlat

imageadd: Added a new mask attachment for predators

/:cl:

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jan 19, 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. UI deletes nanoui/html labels Jan 19, 2025
@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 19, 2025
Copy link
Contributor

@Blundir Blundir left a comment

Choose a reason for hiding this comment

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

please sort the icons in file to the same style of them being sorted in main pred files

@Blundir Blundir marked this pull request as draft January 22, 2025 16:52
@Nomoresolvalou Nomoresolvalou marked this pull request as ready for review January 22, 2025 18:39
@Blundir Blundir added the Sprites Approved confirmed no stray pixels label Jan 23, 2025
@Blundir Blundir added this pull request to the merge queue Jan 23, 2025
Merged via the queue into cmss13-devs:master with commit 95f9e1d Jan 23, 2025
29 checks passed
cmss13-ci bot added a commit that referenced this pull request Jan 23, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game. UI deletes nanoui/html
Projects
Status: Merged
Development

Successfully merging this pull request may close these issues.

3 participants