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

Infection icon now has lower alpha if the human is dead #6254

Merged
merged 4 commits into from
May 10, 2024

Conversation

ihatethisengine
Copy link
Contributor

@ihatethisengine ihatethisengine commented May 7, 2024

About the pull request

So this was bothering me for a long time and now I finally found a simple solution.

I cannot make 5 new sprites to display that hugged person is dead.

I cannot change the color of the sprite, as you need to know which hive larva belongs to.

But I can lower alpha! Simple solution.

Explain why it's good for the game

Makes it less confusing for both xenos and observers to figure if the hugged person is dead. Sometimes xenos ignore people who stepped in a resin trap because they assume that the person is dead, why would the person be lying in the middle of nowhere otherwise?

Testing Photographs and Procedure

2024-05-07_06-35-46
2024-05-07_06-33-55

Changelog

🆑 ihatethisengine
add: Infection icon now has lower alpha if the human is dead
/:cl:

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

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

@github-actions github-actions bot added the Feature Feature coder badge label May 7, 2024
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label May 7, 2024
@cm13-github
Copy link
Contributor

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

@ihatethisengine
Copy link
Contributor Author

Unreal conflict with my own PR

@ihatethisengine
Copy link
Contributor Author

Thanks for helping me with the conflict, web-editor 🙄

@HeresKozmos
Copy link
Contributor

Pretty neat.

Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

This needs to also reset the alpha if they then are revived. Simple solution would be to else set the alpha to full.

@Drulikar Drulikar marked this pull request as draft May 10, 2024 05:05
@ihatethisengine ihatethisengine marked this pull request as ready for review May 10, 2024 10:12
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

I will note is also leaves the death icon transparent if they are a xeno host, but this is probably fine.
image

@Drulikar Drulikar added this pull request to the merge queue May 10, 2024
Merged via the queue into cmss13-devs:master with commit 2d59dcf May 10, 2024
27 checks passed
cm13-github added a commit that referenced this pull request May 10, 2024
github-merge-queue bot pushed a commit that referenced this pull request May 13, 2024
# About the pull request
Fixes potential bugs with #6254

# Explain why it's good for the game
Fixes potential bugs with #6254


# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

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

</details>


# Changelog
:cl: ihatethisengine
fix: fixed potential bugs with transparent infection icon
/:cl:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants