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

Human bursting sounds + sprite, new hugging sounds #6824

Merged
merged 8 commits into from
Oct 28, 2024
Merged

Human bursting sounds + sprite, new hugging sounds #6824

merged 8 commits into from
Oct 28, 2024

Conversation

Blundir
Copy link
Contributor

@Blundir Blundir commented Jul 30, 2024 •
edited
Loading

About the pull request

Gives pre burst sound to humans and yautja, restores long broken overlay of larva bursting, gives yautja unique after burst gore marks, adds new hugging sounds.

dreamseeker_3L5aomqUIQ.online-video-cutter.com.mp4

All the sounds are from here tgstation/TerraGov-Marine-Corps#3046

Explain why it's good for the game

More immersion = good.

Testing Photographs and Procedure

dreamseeker_Vkpzst09zd.mp4
dreamseeker_5g5oKfEg4A.mp4
dreamseeker_WGzC0mK5tq.mp4
dreamseeker_1fwOMzi9Va.mp4
dreamseeker_JQRNRedccm.mp4

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

Changelog

🆑
fix: fixed larva bursting on mob image not working
soundadd: new hugging sounds to humans
soundadd: bursting screams to humans and yautja
imageadd: added yautja bursting and afterburst gore icons
/:cl:

@Blundir Blundir requested a review from fira as a code owner July 30, 2024 14:39
@Blundir Blundir changed the title Larva bursting sound + sprite, new hugging sounds Human bursting sounds + sprite, new hugging sounds Jul 30, 2024
@github-actions github-actions bot added Sprites Remove the soul from the game. Sound Blast 5 minutes of bass boosted music to our players Fix Fix one bug, make ten more labels Jul 30, 2024
@RainbowStalin
Copy link

Thats haunting. 10/10

@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 5, 2024
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Aug 6, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

cm13-github added a commit that referenced this pull request Aug 13, 2024
@cm13-github
TGS Test Merge (#6824)
d0021ae
@cm13-issue-bot cm13-issue-bot mentioned this pull request Aug 13, 2024
Open
cm13-github added a commit that referenced this pull request Aug 13, 2024
@cm13-github
TGS Test Merge (#6824)
662c24a
@efzapa
Copy link
Contributor

efzapa commented Aug 13, 2024

this needs to if possible not be a usable emote, hearing this shit spammed in briefing is just pain

@Blundir
Copy link
Contributor Author

Blundir commented Aug 13, 2024

this needs to if possible not be a usable emote, hearing this shit spammed in briefing is just pain

i already fixed it, nobody just retmed it

cm13-github added a commit that referenced this pull request Aug 13, 2024
@cm13-github
TGS Test Merge (#6824)
7acc26c
cm13-github added a commit that referenced this pull request Aug 13, 2024
@cm13-github
TGS Test Merge (#6824)
afee518
cm13-github added a commit that referenced this pull request Aug 14, 2024
@cm13-github
TGS Test Merge (#6824)
08f61d9
This was referenced Aug 14, 2024
Open
Open
@GoodWheatley GoodWheatley mentioned this pull request Aug 14, 2024
Open
3 tasks
cm13-github added a commit that referenced this pull request Aug 14, 2024
@cm13-github
TGS Test Merge (#6824)
4c65131
@drawsstuff
Copy link

Oh hey! I made these ages ago for TGMC!

I still have a TON of unused sound files I was planning on implementing, including some additional burst sounds, but a lot of them got declined because the general conscientious at TGMC at the time was to move away from a horror atmosphere and that they weren't "thematically appropriate". If you're interested, please, hit me up! CM was still closed source at the time, otherwise I would pr'd them in a heartbeat!

cm13-github added a commit that referenced this pull request Aug 15, 2024
@cm13-github
TGS Test Merge (#6824)
5df53ff
cm13-github added a commit that referenced this pull request Aug 31, 2024
@cm13-github
TGS Test Merge (#6824)
4b1933b
cm13-github added a commit that referenced this pull request Aug 31, 2024
@cm13-github
TGS Test Merge (#6824)
1273f8f
cm13-github added a commit that referenced this pull request Aug 31, 2024
@cm13-github
TGS Test Merge (#6824)
1200dae
@cm13-issue-bot cm13-issue-bot mentioned this pull request Aug 31, 2024
Open
@professionallyretarded professionallyretarded mentioned this pull request Aug 31, 2024
Open
3 tasks
This was referenced Sep 1, 2024
Open
Closed
cm13-github added a commit that referenced this pull request Sep 2, 2024
@cm13-github
TGS Test Merge (#6824)
5c505d6
This was referenced Sep 2, 2024
Open
Open
Closed
Open
Open
cm13-github added a commit that referenced this pull request Sep 3, 2024
@cm13-github
TGS Test Merge (#6824)
86607aa
cm13-github added a commit that referenced this pull request Sep 3, 2024
@cm13-github
TGS Test Merge (#6824)
1a2c361
cm13-github added a commit that referenced this pull request Sep 3, 2024
@cm13-github
TGS Test Merge (#6824)
a8d7d36
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Oct 5, 2024
@cm13-github
Copy link
Contributor

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

@Dutch-VanDerLinde Dutch-VanDerLinde mentioned this pull request Oct 9, 2024
Merged
2 tasks
nauticall
nauticall approved these changes Oct 22, 2024
View reviewed changes
Copy link
Contributor

@nauticall nauticall left a comment

Choose a reason for hiding this comment

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

pritess

@nauticall nauticall added the Sprites Approved confirmed no stray pixels label Oct 22, 2024
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Oct 28, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@harryob harryob added this pull request to the merge queue Oct 28, 2024
Merged via the queue into cmss13-devs:master with commit 2aec1b3 Oct 28, 2024
27 checks passed
cmss13-ci bot added a commit that referenced this pull request Oct 28, 2024
@cmss13-ci
Automatic changelog for PR #6824 [ci skip]
380f17e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nauticall nauticall nauticall approved these changes

@harryob harryob harryob approved these changes

@kiVts kiVts kiVts approved these changes

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

Assignees
No one assigned
Labels
Fix Fix one bug, make ten more Sound Blast 5 minutes of bass boosted music to our players Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@Blundir @RainbowStalin @cm13-github @efzapa @drawsstuff @kiVts @Git-Nivrak @harryob @nauticall