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 some balloons for CPR : one is for when it's a success and the other is when it's a failure. #5918

Merged
merged 6 commits into from
Mar 20, 2024
Merged

add some balloons for CPR : one is for when it's a success and the other is when it's a failure. #5918

merged 6 commits into from
Mar 20, 2024

Conversation

Huffie56
Copy link
Contributor

@Huffie56 Huffie56 commented Mar 10, 2024 •
edited
Loading

About the pull request

adding balloons to show when you are successful with your CPR or if your not.

I am not sure about the text.

Explain why it's good for the game

Give feedback without needing to look at chat box

Testing Photographs and Procedure

Screenshots & Videos

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

Changelog

🆑
qol: add some balloons for CPR : one is for when it's a success and the other is when it's a failure.
/:cl:

@github-actions github-actions bot added the Quality of Life Make the game harder to play label Mar 10, 2024
Julien and others added 2 commits March 13, 2024 10:52
fix?
7fb9191
@Huffie56
Update human_attackhand.dm
79b5835 
fix it??? no idea;;;;;;;
@Huffie56
Copy link
Contributor Author

oh that worked i guess i just need to test it out now....

@Huffie56 Huffie56 marked this pull request as ready for review March 17, 2024 10:06
@Huffie56 Huffie56 requested a review from SabreML March 20, 2024 10:52
SabreML
SabreML reviewed Mar 20, 2024
View reviewed changes
Copy link
Member

@SabreML SabreML left a comment

Choose a reason for hiding this comment

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

Thanks! Last thing, to get the balloon alert onto its own line.

code/modules/mob/living/carbon/human/human_attackhand.dm Outdated Show resolved Hide resolved
code/modules/mob/living/carbon/human/human_attackhand.dm Outdated Show resolved Hide resolved
@Huffie56 @SabreML
Apply suggestions from code review
5eaed50 
fbefisjgpojog

Co-authored-by: SabreML <[email protected]>
SabreML
SabreML approved these changes Mar 20, 2024
View reviewed changes
Copy link
Member

@SabreML SabreML left a comment

Choose a reason for hiding this comment

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

The unit test failure isn't anything from the PR, just a 503 error from one of the CI steps. I can re-run them a bit later to see if it's fixed itself.

@SabreML SabreML added this pull request to the merge queue Mar 20, 2024
Merged via the queue into cmss13-devs:master with commit 761d2b4 Mar 20, 2024
26 checks passed
cm13-github added a commit that referenced this pull request Mar 20, 2024
@cm13-github
Automatic changelog for PR #5918 [ci skip]
7576a25
@Huffie56 Huffie56 deleted the qol_cpr_balloons branch March 20, 2024 23:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SabreML SabreML SabreML approved these changes

Assignees
No one assigned
Labels
Quality of Life Make the game harder to play
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Huffie56 @SabreML