From: Hannah Giovanna Dawson Date: Thu, 3 Jul 2025 15:28:44 +0000 (+0100) Subject: Scurrets - Audio Improvements (#38482) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=1bc3d37d40be0cab7378a00e40ba57bfd478b358;p=space-station-14.git Scurrets - Audio Improvements (#38482) * Scurret audio tuning * Add new sfx * Update sneezing sfx * YAML support * Rename a folder --- diff --git a/Resources/Audio/Animals/attributions.yml b/Resources/Audio/Animals/attributions.yml index 59d8bc5a6e..f91d98b974 100644 --- a/Resources/Audio/Animals/attributions.yml +++ b/Resources/Audio/Animals/attributions.yml @@ -162,11 +162,14 @@ - wawa_chatter.ogg - wawa_chillin.ogg - wawa_depression.ogg + - wawa_despair.ogg - wawa_exclaim.ogg - wawa_mock.ogg - wawa_protest.ogg - wawa_question.ogg - wawa_statement.ogg + - wawa_the_end.ogg + - wawa_yawn.ogg copyright: "created by FairlySadPanda" license: "CC-BY-4.0" source: "https://github.com/space-wizards/space-station-14/pull/37936" diff --git a/Resources/Audio/Animals/wawa_achoo.ogg b/Resources/Audio/Animals/wawa_achoo.ogg index 56670c2d05..411c4b5b0a 100644 Binary files a/Resources/Audio/Animals/wawa_achoo.ogg and b/Resources/Audio/Animals/wawa_achoo.ogg differ diff --git a/Resources/Audio/Animals/wawa_chatter.ogg b/Resources/Audio/Animals/wawa_chatter.ogg index 7e2a7ec3ca..5537611307 100644 Binary files a/Resources/Audio/Animals/wawa_chatter.ogg and b/Resources/Audio/Animals/wawa_chatter.ogg differ diff --git a/Resources/Audio/Animals/wawa_chillin.ogg b/Resources/Audio/Animals/wawa_chillin.ogg index 5955fdf967..d548f6a26f 100644 Binary files a/Resources/Audio/Animals/wawa_chillin.ogg and b/Resources/Audio/Animals/wawa_chillin.ogg differ diff --git a/Resources/Audio/Animals/wawa_depression.ogg b/Resources/Audio/Animals/wawa_depression.ogg index 3f8167acb7..d592654a07 100644 Binary files a/Resources/Audio/Animals/wawa_depression.ogg and b/Resources/Audio/Animals/wawa_depression.ogg differ diff --git a/Resources/Audio/Animals/wawa_despair.ogg b/Resources/Audio/Animals/wawa_despair.ogg new file mode 100644 index 0000000000..ce4ecc4db2 Binary files /dev/null and b/Resources/Audio/Animals/wawa_despair.ogg differ diff --git a/Resources/Audio/Animals/wawa_exclaim.ogg b/Resources/Audio/Animals/wawa_exclaim.ogg index 99f280091f..6c9d9dfcd0 100644 Binary files a/Resources/Audio/Animals/wawa_exclaim.ogg and b/Resources/Audio/Animals/wawa_exclaim.ogg differ diff --git a/Resources/Audio/Animals/wawa_mock.ogg b/Resources/Audio/Animals/wawa_mock.ogg index 355c2aa841..6d188ec054 100644 Binary files a/Resources/Audio/Animals/wawa_mock.ogg and b/Resources/Audio/Animals/wawa_mock.ogg differ diff --git a/Resources/Audio/Animals/wawa_protest.ogg b/Resources/Audio/Animals/wawa_protest.ogg index cc1cf60a04..50d52ac27d 100644 Binary files a/Resources/Audio/Animals/wawa_protest.ogg and b/Resources/Audio/Animals/wawa_protest.ogg differ diff --git a/Resources/Audio/Animals/wawa_question.ogg b/Resources/Audio/Animals/wawa_question.ogg index ce9008a5d8..757b86bdfd 100644 Binary files a/Resources/Audio/Animals/wawa_question.ogg and b/Resources/Audio/Animals/wawa_question.ogg differ diff --git a/Resources/Audio/Animals/wawa_statement.ogg b/Resources/Audio/Animals/wawa_statement.ogg index 21f9e8a23e..560df24a80 100644 Binary files a/Resources/Audio/Animals/wawa_statement.ogg and b/Resources/Audio/Animals/wawa_statement.ogg differ diff --git a/Resources/Audio/Animals/wawa_the_end.ogg b/Resources/Audio/Animals/wawa_the_end.ogg new file mode 100644 index 0000000000..9350de1f7c Binary files /dev/null and b/Resources/Audio/Animals/wawa_the_end.ogg differ diff --git a/Resources/Audio/Animals/wawa_yawn.ogg b/Resources/Audio/Animals/wawa_yawn.ogg new file mode 100644 index 0000000000..766c856ff4 Binary files /dev/null and b/Resources/Audio/Animals/wawa_yawn.ogg differ diff --git a/Resources/Audio/Effects/attributions.yml b/Resources/Audio/Effects/attributions.yml index 9cfaa54122..f330220421 100644 --- a/Resources/Audio/Effects/attributions.yml +++ b/Resources/Audio/Effects/attributions.yml @@ -246,3 +246,8 @@ license: "CC-BY-SA-3.0" copyright: "Created by mattroks101 for Bee Station. cig_snuff converted to mono" source: "https://github.com/BeeStation/BeeStation-Hornet/pull/29" + +- files: ["soft_thump.ogg"] + license: "CC-BY-4.0" + copyright: "Clipped by FairlySadPanda (Github) from a sound created by CheChoDj (Freesound)" + source: "https://freesound.org/people/CheChoDj/sounds/609353/" diff --git a/Resources/Audio/Effects/soft_thump.ogg b/Resources/Audio/Effects/soft_thump.ogg new file mode 100644 index 0000000000..2284aad696 Binary files /dev/null and b/Resources/Audio/Effects/soft_thump.ogg differ diff --git a/Resources/Locale/en-US/chat/emotes.ftl b/Resources/Locale/en-US/chat/emotes.ftl index 074ce2a5dc..0944aa48dd 100644 --- a/Resources/Locale/en-US/chat/emotes.ftl +++ b/Resources/Locale/en-US/chat/emotes.ftl @@ -52,6 +52,7 @@ chat-emote-msg-salute = salutes. chat-emote-msg-gasp = gasps. chat-emote-msg-deathgasp = seizes up and falls limp, {POSS-ADJ($entity)} eyes dead and lifeless... chat-emote-msg-deathgasp-monkey = lets out a faint chimper as {SUBJECT($entity)} collapses and stops moving... +chat-emote-msg-deathgasp-scurret = lets out a final 'wa' and falls still... chat-emote-msg-buzz = buzzes! chat-emote-msg-weh = wehs! chat-emote-msg-hew = hews! diff --git a/Resources/Locale/en-US/scurret copy/role.ftl b/Resources/Locale/en-US/scurret/role.ftl similarity index 100% rename from Resources/Locale/en-US/scurret copy/role.ftl rename to Resources/Locale/en-US/scurret/role.ftl diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml b/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml index 458b977827..19ba323a0a 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml @@ -56,7 +56,7 @@ - type: Speech speechVerb: Wawa speechSounds: Wawa - allowedEmotes: ['Thump'] # They're 80% tail + allowedEmotes: ["Thump"] # They're 80% tail - type: TypingIndicator proto: moth - type: InteractionPopup @@ -109,7 +109,9 @@ - type: Hunger baseDecayRate: 0.05 # They get a lil' hungy - type: BodyEmotes # Grants them clapping and so on. - soundsId: GeneralBodyEmotes + soundsId: Scurret + - type: Deathgasp + prototype: ScurretDeathgasp # You monster - type: Tag tags: - DoorBumpOpener diff --git a/Resources/Prototypes/SoundCollections/scurret.yml b/Resources/Prototypes/SoundCollections/scurret.yml index 34c83ed41a..cb0411638b 100644 --- a/Resources/Prototypes/SoundCollections/scurret.yml +++ b/Resources/Prototypes/SoundCollections/scurret.yml @@ -17,3 +17,18 @@ id: WawaScream files: - /Audio/Animals/wawa_protest.ogg + +- type: soundCollection + id: WawaCry + files: + - /Audio/Animals/wawa_despair.ogg + +- type: soundCollection + id: WawaYawn + files: + - /Audio/Animals/wawa_yawn.ogg + +- type: soundCollection + id: WawaDeath + files: + - /Audio/Animals/wawa_the_end.ogg diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml index 8fb4230a5f..0edd18d3ff 100644 --- a/Resources/Prototypes/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml @@ -581,6 +581,20 @@ params: variation: 0.125 sounds: + Thump: + path: /Audio/Effects/soft_thump.ogg + params: + variation: 0.125 + Clap: + collection: Claps + ClapSingle: + collection: ClapSingle + Snap: + collection: Snaps + params: + volume: -6 + Salute: + collection: Salutes Laugh: collection: WawaLaugh Sneeze: @@ -593,3 +607,19 @@ collection: WawaSigh Scream: collection: WawaScream + Yawn: + collection: WawaYawn + Crying: + collection: WawaCry + Snore: + collection: Snores + Weh: + collection: Weh + Hew: + collection: Hew + Honk: + collection: BikeHorn + Gasp: + collection: MaleGasp + DefaultDeathgasp: + collection: WawaDeath diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index 8908752b7a..64f39fe8a3 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -331,6 +331,12 @@ icon: Interface/Emotes/deathgasp.png chatMessages: ["chat-emote-msg-deathgasp-monkey"] +- type: emote + id: ScurretDeathgasp + name: chat-emote-name-deathgasp + icon: Interface/Emotes/deathgasp.png + chatMessages: ["chat-emote-msg-deathgasp-scurret"] + - type: emote id: Buzz name: chat-emote-name-buzz