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

Fixes UI icons staying open and crawl text #6395

Merged
merged 1 commit into from
Apr 21, 2021

Conversation

Semuca
Copy link
Contributor

@Semuca Semuca commented Apr 19, 2021

Purpose

Fixes #6088 and adds crawl text (One of the health rework issues).

Notes:

In UI_ItemSlot.cs, I've moved some duplicate code into it's own function and added a test that checks if the item slot is hidden or not before displaying the placeholderImage, which caused those 'phantom icons' to appear.

Changelog:

CL: Fixed UI icons staying open
CL: Added standing up text

@github-actions github-actions bot added the UI label Apr 19, 2021
@PerfectTangent
Copy link
Contributor

added a test that checks if the item slot is hidden or not before displaying the placeholderImage, which caused those 'phantom icons' to appear.

hell YES!

@github-actions github-actions bot added the Status: Merge Conflicts No one likes conflicts, solve them! label Apr 20, 2021
@Semuca
Copy link
Contributor Author

Semuca commented Apr 20, 2021

This is ready to merge btw

@NoooneyDude
Copy link
Contributor

It isn't now, unfortunately ; ). Merge conflicts - just overwrite my changes and then re-namespace 'em.

@PerfectTangent
Copy link
Contributor

does it fix this line on the health issue?

when you try to get up after crawling, it displays the same text "You try to lie down."

@Semuca
Copy link
Contributor Author

Semuca commented Apr 20, 2021

It isn't now, unfortunately ; ). Merge conflicts - just overwrite my changes and then re-namespace 'em.

Ok, I'll get to that

does it fix this line on the health issue?

when you try to get up after crawling, it displays the same text "You try to lie down."

Yup

@Semuca
Copy link
Contributor Author

Semuca commented Apr 20, 2021

Agh, I surrender to Git. I need some sleep, I'll return tomorrow.

@NoooneyDude NoooneyDude removed the Status: Merge Conflicts No one likes conflicts, solve them! label Apr 21, 2021
@Semuca Semuca closed this Apr 21, 2021
@github-actions github-actions bot removed the UI label Apr 21, 2021
@Semuca Semuca reopened this Apr 21, 2021
@github-actions github-actions bot added the UI label Apr 21, 2021
@Semuca
Copy link
Contributor Author

Semuca commented Apr 21, 2021

I'm not the best at git, but the shenanigans are over now

@NoooneyDude NoooneyDude merged commit 34674be into unitystation:develop Apr 21, 2021
@Semuca Semuca deleted the uifixes branch April 25, 2021 04:55
@PerfectTangent PerfectTangent changed the title UI icons staying open and crawl text Fixes UI icons staying open and crawl text Jan 9, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

UI icons staying open
4 participants