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

New Icon: Red Skull for players dead from Hardcore trait/mode #4099

Merged
merged 2 commits into from
Aug 8, 2023

Conversation

blackdragonTOW
Copy link
Contributor

@blackdragonTOW blackdragonTOW commented Aug 3, 2023

About the pull request

Adds a red skull to differentiate between HC death and normal perma.

Explain why it's good for the game

Medhud and OOC observers can tell very quickly when they watch someone die if they were HC or not. This adds a bit of cool factor to things, and removes ambiguity for those who have that info immediately on hand anyway.

Testing Photographs and Procedure

Verified both with hardcore trait and gamemode enabled. Xenos also should still only see the white skull and will not get extra info.

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
ui: Hardcore deaths are now marked with a unique red skull
imageadd: Red skull added for hardcore deaths
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. UI deletes nanoui/html labels Aug 3, 2023
@blackdragonTOW
Copy link
Contributor Author

Evidently that sprite sheet had a dupe on it that got in before we had a dupe check linter

Copy link
Contributor

@FransFeiffer FransFeiffer left a comment

Choose a reason for hiding this comment

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

Sprite fine, sprite aproved

@FransFeiffer FransFeiffer added the Sprites Approved confirmed no stray pixels label Aug 5, 2023
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 8, 2023
@cm13-github
Copy link
Contributor

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

@blackdragonTOW blackdragonTOW reopened this Aug 8, 2023
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Aug 8, 2023
@cm13-github
Copy link
Contributor

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

@morrowwolf morrowwolf added this pull request to the merge queue Aug 8, 2023
Merged via the queue into cmss13-devs:master with commit a68173b Aug 8, 2023
30 of 33 checks passed
cm13-github added a commit that referenced this pull request Aug 8, 2023
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
None yet
Development

Successfully merging this pull request may close these issues.

4 participants