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.

Sign up for GitHub

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

Jump to bottom

Add clearer defib cooldowns! #31251

Merged
merged 6 commits into from
Dec 20, 2024
Merged

Add clearer defib cooldowns! #31251

merged 6 commits into from
Dec 20, 2024
+20 −52

Conversation

beck-thompson
Copy link
Contributor

@beck-thompson beck-thompson commented Aug 21, 2024 •
edited by slarticodefast
Loading

About the PR

Instead of using that super small LED, the defib system now uses the UseDelaySystem so you can easily see how long the cooldown is. I was planning on doing more stuff but ended up hating it but didn't want this to go to waste because its a lot nicer than the invisible cool down.

Technical details

Insteand of using its own home brew update stuff the defib system now just uses the UseDelaySystem. Its a little weird because the default one is used by the two handed component (Why does it use the default??) so I have to use a new DelayId.

This PR also shouldn't interfere with #30044 because its all shared stuff.

Media

2024-08-20.22-11-48.mp4

Requirements

  • I have read and I am following the Pull Request Guidelines. I understand that not doing so may get my pr closed at maintainer’s discretion
  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Removed DefibrillatorVisuals.

Changelog
🆑 Beck Thompson

  • tweak: Defibrillator cooldowns are now clearly visible.

@github-actions github-actions bot added S: Needs Review Status: Requires additional reviews before being fully accepted Changes: Sprites Changes: Might require knowledge of spriting or visual design. labels Aug 21, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 21, 2024 •
edited
Loading

RSI Diff Bot; head commit 07e2818 merging into 1419b88
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Specific/Medical/defib.rsi

State Old New Status
screen Modified
ready Removed

Edit: diff updated after 07e2818

EmoGarbage404
EmoGarbage404 previously requested changes Aug 22, 2024
View reviewed changes
Content.Server/Medical/DefibrillatorSystem.cs Outdated Show resolved Hide resolved
@SlamBamActionman SlamBamActionman added the S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. label Nov 14, 2024
@ScarKy0 ScarKy0 added P2: Raised Priority: Item has a raised priority, indicating it might get increased maintainer attention. T: New Feature Type: New feature or content, or extending existing content D3: Low Difficulty: Some codebase knowledge required. A: General Interactions Area: General in-game interactions that don't relate to another area. A: Medical Area: Medical department, including Chemistry T: Visual Change Type: Deals with changes to art, sprites or other visuals in the game. and removed S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. labels Nov 18, 2024
@TheShuEd TheShuEd added the S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. label Dec 20, 2024
beck-thompson
beck-thompson commented Dec 20, 2024
View reviewed changes
Content.Shared/Medical/DefibrillatorComponent.cs Outdated
/// <summary>
/// Cooldown after using the defibrillator.
/// </summary>
[DataField("zapDelay")]
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm not kidding this is one of the most embarrassing mistakes I've ever made

@github-actions github-actions bot added the size/S Denotes a PR that changes 10-99 lines. label Dec 20, 2024
@slarticodefast
Copy link
Member

Thank you for your contribution!

@slarticodefast slarticodefast merged commit a0a4057 into space-wizards:master Dec 20, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slarticodefast slarticodefast slarticodefast left review comments

@TheShuEd TheShuEd TheShuEd approved these changes

@EmoGarbage404 EmoGarbage404 EmoGarbage404 left review comments

@Jezithyr Jezithyr Awaiting requested review from Jezithyr Jezithyr is a code owner

Assignees

@TheShuEd TheShuEd

Labels
A: General Interactions Area: General in-game interactions that don't relate to another area. A: Medical Area: Medical department, including Chemistry Changes: Sprites Changes: Might require knowledge of spriting or visual design. D3: Low Difficulty: Some codebase knowledge required. P2: Raised Priority: Item has a raised priority, indicating it might get increased maintainer attention. S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. S: Needs Review Status: Requires additional reviews before being fully accepted size/S Denotes a PR that changes 10-99 lines. T: New Feature Type: New feature or content, or extending existing content T: Visual Change Type: Deals with changes to art, sprites or other visuals in the game.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@beck-thompson @slarticodefast @TheShuEd @EmoGarbage404 @SlamBamActionman @ScarKy0