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

Add medical HUD icon if the body has died recently enough to be defibbed #38909

Merged
merged 2 commits into from Jul 5, 2018

Conversation

Mothblocks
Copy link
Member

[Changelogs]:

🆑
imageadd: Medical HUDs will now show an icon if the body has died recently enough to be defibbed
/:cl:

[why]: Health analyzers already will tell you this, so this just makes it easier. I read this on the "Minor Suggestions" thread. I'm no spriter, so feel free to tell me if my icon sucks. I had to add an "addtimer" to the death proc because med_hud_set_status isn't called anymore after death.

@IconDiffBot
Copy link

IconDiffBot commented Jul 4, 2018

Icons with diff:

icons/mob/hud.dmi
Key Old New Status
huddefib[5] huddefib[5] Created
huddefib[2] huddefib[2] Created
huddefib[3] huddefib[3] Created
huddefib huddefib Created
huddefib[4] huddefib[4] Created
huddefib[1] huddefib[1] Created

@tgstation-server tgstation-server added the Sprites A bikeshed full of soulless bikes. label Jul 4, 2018
@XDTM
Copy link
Contributor

XDTM commented Jul 4, 2018

Icon is fine, but the color implies the corpse is healthy, maybe a pulsing red might be more appropriate, or a blue line on black

@Mothblocks
Copy link
Member Author

I was thinking that the background color was bad for what it means. I'll try a pulsing red background and send a video of it to see if I can make it any better.

@XDTM
Copy link
Contributor

XDTM commented Jul 4, 2018

i suggest you try the light blue on black first, it's closer to the death icon while red might look more like deep crit now that i think about it

@Mothblocks
Copy link
Member Author

As in the line is light blue and the background is black?

@XDTM
Copy link
Contributor

XDTM commented Jul 4, 2018

Exactly

By the way, to show an animation you just need to export it as a gif in byond

@Mothblocks
Copy link
Member Author

Mothblocks commented Jul 4, 2018

defib
@XDTM How about this?

EDIT: Tested this in game and I personally like it better. Pushing.

@XDTM
Copy link
Contributor

XDTM commented Jul 4, 2018

I agree, looks good

@SpaceManiac
Copy link
Contributor

What's the deal with there being timeofdeath AND tod vars?

Which of the two does fake death set? Is someone faking death going to appear defibbable forever?

@XDTM
Copy link
Contributor

XDTM commented Jul 5, 2018

Fakedeath sets tod to the moment it is applied, so it looks like someone just died

@SpaceManiac
Copy link
Contributor

SpaceManiac commented Jul 5, 2018

Based on a quick read fakedeath does not set timeofdeath (it does set tod) so a fake death will never look defibbable.

@Mothblocks
Copy link
Member Author

@SpaceManiac Then it'll never look defibbable on a medical analyzer either, as that's where I copied the code from.

@@ -175,6 +175,11 @@
if(has_trait(TRAIT_XENO_HOST))
holder.icon_state = "hudxeno"
else if(stat == DEAD || (has_trait(TRAIT_FAKEDEATH)))
if(tod)
Copy link
Contributor

Choose a reason for hiding this comment

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

tod

@ExcessiveUseOfCobblestone
Copy link
Contributor

If you're not actually dead will it let you defib anyways? I would imagine the safeties will let you meta it anywho.

@XDTM
Copy link
Contributor

XDTM commented Jul 5, 2018

Yeah but i'm sure there's plenty of methods anyway that don't require a defib

Copy link
Contributor

@SpaceManiac SpaceManiac left a comment

Choose a reason for hiding this comment

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

works in testing

@SpaceManiac SpaceManiac merged commit 5421671 into tgstation:master Jul 5, 2018
ghost referenced this pull request in HippieStation/HippieStationdeprecated2020 Jul 5, 2018
…bed (#38909)

Health analyzers already will tell you this, so this just makes it easier. I
read this on the "Minor Suggestions" thread. I'm no spriter, so feel free to
tell me if my icon sucks. I had to add an "addtimer" to the death proc because
med_hud_set_status isn't called anymore after death.
@Mothblocks Mothblocks deleted the huddefib branch July 6, 2018 07:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants