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

Pred cape and armour stuff #7149

Merged
merged 5 commits into from
Oct 14, 2024
Merged

Conversation

Mister-moon1
Copy link
Contributor

@Mister-moon1 Mister-moon1 commented Sep 11, 2024

About the pull request

Adds one new cape able to be used by elites and up, the damaged cape, along with minor changes to the ceremonial cape

Fixed an issue with back plates of armour 5 for all materials except bone being a copy and paste from the chestplate

Explain why it's good for the game

fixes a couple issues, gives more variety to how you can express your character

Testing Photographs and Procedure

Screenshots & Videos

https://imgur.com/BD7hGMe

Changelog

🆑
imageadd: new yautja cape, the damaged cape available to elites +
fix: fixed spriting issues with ceremonial cape and armour 5
/:cl:

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

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

@Mister-moon1 Mister-moon1 reopened this Oct 13, 2024
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Oct 13, 2024
@cm13-github
Copy link
Contributor

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

@Blundir Blundir added the Sprites Approved confirmed no stray pixels label Oct 14, 2024
@Blundir
Copy link
Contributor

Blundir commented Oct 14, 2024

doesn't intervene with what i do

@Blundir Blundir added this pull request to the merge queue Oct 14, 2024
Merged via the queue into cmss13-devs:master with commit 384ee50 Oct 14, 2024
34 of 37 checks passed
cmss13-ci bot added a commit that referenced this pull request Oct 14, 2024
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.

3 participants