From 3e1de431ee4eb74c0f559e0da941a3c4cb6fc223 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 3 Jul 2024 18:11:44 +0200 Subject: [PATCH] [MIRROR] New shove sound (#28568) * New shove sound (#84555) ## About The Pull Request New more meaty shove sound effects to give better feedback. Made using sound effects already in-game files (pillowhit and thudwoosh) https://github.com/tgstation/tgstation/assets/42353186/7f5d516e-36e5-4d7d-8272-a24c842e962c Used in: - Random scary maints sounds - Ling tentacle hitting someone - Wrestling off slimes - Shoving (duh) ## Why It's Good For The Game Shoving shares the same sound with two other intents - Grabbing and Hugging. This makes it more different from those two and gives better feedback. Shoving someone wouldn't just make a "woosh" as you apply hefty kinetic force to their body, so slight punchiness to it is good. After brawlening has been merged shoves have become even more dangerous, even if not against the wall. Fights should sound more violent. ## Changelog :cl: DrDiasyl aka DrTuxedo sound: Shoves now produce more meaty sound! /:cl: * New shove sound --------- Co-authored-by: DrTuxedo <42353186+DrDiasyl@users.noreply.github.com> Co-authored-by: SpaceLoveSs13 <68121607+SpaceLoveSs13@users.noreply.github.com> --- code/_globalvars/lists/flavor_misc.dm | 1 + .../antagonists/changeling/powers/mutations.dm | 2 +- code/modules/mob/living/basic/slime/defense.dm | 2 +- code/modules/mob/living/living_defense.dm | 2 +- sound/weapons/shove.ogg | Bin 0 -> 9480 bytes 5 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 sound/weapons/shove.ogg diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index 792d49cfde9..bdd8620d6e5 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -149,6 +149,7 @@ GLOBAL_LIST_INIT(scarySounds, list( 'sound/weapons/armbomb.ogg', 'sound/weapons/taser.ogg', 'sound/weapons/thudswoosh.ogg', + 'sound/weapons/shove.ogg', )) diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm index 1c4fa8c501c..db261c29b54 100644 --- a/code/modules/antagonists/changeling/powers/mutations.dm +++ b/code/modules/antagonists/changeling/powers/mutations.dm @@ -341,7 +341,7 @@ damage = 0 damage_type = BRUTE range = 8 - hitsound = 'sound/weapons/thudswoosh.ogg' + hitsound = 'sound/weapons/shove.ogg' var/chain var/obj/item/ammo_casing/magic/tentacle/source //the item that shot it ///Click params that were used to fire the tentacle shot diff --git a/code/modules/mob/living/basic/slime/defense.dm b/code/modules/mob/living/basic/slime/defense.dm index b747c242019..a3242525170 100644 --- a/code/modules/mob/living/basic/slime/defense.dm +++ b/code/modules/mob/living/basic/slime/defense.dm @@ -19,7 +19,7 @@ return attacker.visible_message(span_warning("[attacker] manages to wrestle \the [defender_slime.name] off!"), span_notice("You manage to wrestle \the [defender_slime.name] off!")) - playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1) + playsound(loc, 'sound/weapons/shove.ogg', 50, TRUE, -1) defender_slime.discipline_slime() diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 74c01b93621..4d9b32ae4bf 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -671,7 +671,7 @@ playsound(target, 'sound/effects/glassbash.ogg', 50, TRUE, -1) else do_attack_animation(target, ATTACK_EFFECT_DISARM) - playsound(target, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1) + playsound(target, 'sound/weapons/shove.ogg', 50, TRUE, -1) if (ishuman(target) && isnull(weapon)) var/mob/living/carbon/human/human_target = target human_target.w_uniform?.add_fingerprint(src) diff --git a/sound/weapons/shove.ogg b/sound/weapons/shove.ogg new file mode 100644 index 0000000000000000000000000000000000000000..eb10eabed26a411317d315764f3fe2b82781d86c GIT binary patch literal 9480 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