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

Ports "Ports "Revives "Adds sound effects to surgeries"" and others" and "Adds medical sounds" #1317

Merged
merged 3 commits into from
Aug 17, 2022

Conversation

nmajask
Copy link
Contributor

@nmajask nmajask commented Jul 8, 2022

About The Pull Request

Ports two (2) PRs from yogs and bay (technically they are both ports from yogs but shhhh), those being "Ports "Revives "Adds sound effects to surgeries"" and others" #14390 by some idiot and "Adds medical sounds" #21268 by comma. In short, adds surgery sounds to most surgery steps and when applying bruise packs/ointment. Also adds sounds for starting surgeries for some nice feedback for when a surgery is/isn't started. May be a bit loud, so I can make it quieter if needed. Bone sounds are from freesound.org.

Why It's Good For The Game

More sounds good, and makes surgery a little more involving than just clicking on the horizontal person.

Changelog

🆑 maxspells, TheBoondock, MrMelbert, comma, nmajask
soundadd: added sounds to surgery steps
soundadd: added sound effects to a bunch of medical items
spellcheck: fixed revive surgery saying "shock body" instead of "shock brain"
/:cl:

@github-actions github-actions bot added Deprecated Modularization Sound USSR Anthem 2.66 MB file. labels Jul 8, 2022
Fikou
Fikou previously requested changes Jul 8, 2022
Copy link
Contributor

@Fikou Fikou left a comment

Choose a reason for hiding this comment

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

remove all shiptest edits and move the files out of the whitesands folder

@ZephyrTFA ZephyrTFA requested a review from Fikou July 9, 2022 01:17
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jul 21, 2022
@github-actions
Copy link
Contributor

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

1 similar comment
@github-actions
Copy link
Contributor

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jul 23, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Aug 7, 2022

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 14 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale All falls to entropy eventually. label Aug 7, 2022
Copy link
Member

@MarkSuckerberg MarkSuckerberg left a comment

Choose a reason for hiding this comment

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

Sorry we've been dragging our feet on this... I'll get it testmerged.

@MarkSuckerberg MarkSuckerberg added the Test Merge Candidate You do it for free. label Aug 11, 2022
@nmajask
Copy link
Contributor Author

nmajask commented Aug 11, 2022

Sorry we've been dragging our feet on this... I'll get it testmerged.

all good, as long as its merged eventually

@github-actions github-actions bot removed the Stale All falls to entropy eventually. label Aug 12, 2022
@MarkSuckerberg MarkSuckerberg merged commit 8d8b4ad into shiptest-ss13:master Aug 17, 2022
@ZephyrTFA ZephyrTFA removed the Test Merge Candidate You do it for free. label Sep 8, 2022
Yellow-Mushroom pushed a commit to Yellow-Mushroom/Shiptest that referenced this pull request Sep 11, 2022
Yellow-Mushroom pushed a commit to Yellow-Mushroom/Shiptest that referenced this pull request Sep 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Sound USSR Anthem 2.66 MB file.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants