diff --git a/Resources/Audio/ADT/Voice/Slime/attributions.yml b/Resources/Audio/ADT/Voice/Slime/attributions.yml index 36cfc1f6377..bf1f9dffd1a 100644 --- a/Resources/Audio/ADT/Voice/Slime/attributions.yml +++ b/Resources/Audio/ADT/Voice/Slime/attributions.yml @@ -110,10 +110,15 @@ copyright: "mattyharm on freesound.org. Original modified by harpy and fiend." source: "https://freesound.org/people/mattyharm/sounds/432995/" -- files: ["s_bubble.ogg"] +- files: + - s_bubble_1.ogg + - s_bubble_2.ogg + - s_bubble_3.ogg + - s_bubble_4.ogg + - s_bubble_5.ogg license: "CC-BY-4.0" - copyright: "Audiolarx on freesound.org, mixed to mono by DinnerCalzone (github)" - source: "https://freesound.org/people/audiolarx/sounds/263945/" + copyright: "Audiolarx on freesound.org, mixed to mono by orange6775 (discord) and s_bubble_1 by DinnerCalzone (github)" + source: "https://freesound.org/people/audiolarx/" - files: ["s_pop.ogg"] license: "CC0-1.0" diff --git a/Resources/Audio/ADT/Voice/Slime/s_bubble.ogg b/Resources/Audio/ADT/Voice/Slime/s_bubble_1.ogg similarity index 100% rename from Resources/Audio/ADT/Voice/Slime/s_bubble.ogg rename to Resources/Audio/ADT/Voice/Slime/s_bubble_1.ogg diff --git a/Resources/Audio/ADT/Voice/Slime/s_bubble_2.ogg b/Resources/Audio/ADT/Voice/Slime/s_bubble_2.ogg new file mode 100644 index 00000000000..8b7360a333d Binary files /dev/null and b/Resources/Audio/ADT/Voice/Slime/s_bubble_2.ogg differ diff --git a/Resources/Audio/ADT/Voice/Slime/s_bubble_3.ogg b/Resources/Audio/ADT/Voice/Slime/s_bubble_3.ogg new file mode 100644 index 00000000000..aab2939dcdd Binary files /dev/null and b/Resources/Audio/ADT/Voice/Slime/s_bubble_3.ogg differ diff --git a/Resources/Audio/ADT/Voice/Slime/s_bubble_4.ogg b/Resources/Audio/ADT/Voice/Slime/s_bubble_4.ogg new file mode 100644 index 00000000000..95e463c92cb Binary files /dev/null and b/Resources/Audio/ADT/Voice/Slime/s_bubble_4.ogg differ diff --git a/Resources/Audio/ADT/Voice/Slime/s_bubble_5.ogg b/Resources/Audio/ADT/Voice/Slime/s_bubble_5.ogg new file mode 100644 index 00000000000..f898607d107 Binary files /dev/null and b/Resources/Audio/ADT/Voice/Slime/s_bubble_5.ogg differ diff --git a/Resources/Prototypes/ADT/Languages/species-exclusive.yml b/Resources/Prototypes/ADT/Languages/species-exclusive.yml index 59377415bb2..0fc85edda64 100644 --- a/Resources/Prototypes/ADT/Languages/species-exclusive.yml +++ b/Resources/Prototypes/ADT/Languages/species-exclusive.yml @@ -20,27 +20,17 @@ id: Bubblish uiColor: "#61daff" parent: BaseVocalLanguage - speech: !type:Generic - obfuscateSyllables: true + speech: !type:Emotes color: "#61daff" whisperColor: "#5f9db0" replacement: - - блоб - - плоп - - поп - - боп - - буп - - блюп - - бульп - - бульк - - бламп - - блимпаф - - блюмп - - блабл-бламп - - блампи-бламп - - блюм-бламп + - булькает + - бурлит + - пускает пузыри font: Airfool fontSize: 14 + sound: + collection: SlimeBubbles # Spoken by the Novakid race. - type: language diff --git a/Resources/Prototypes/ADT/SoundCollections/emotes.yml b/Resources/Prototypes/ADT/SoundCollections/emotes.yml index 8360971f4b2..41b3e976480 100644 --- a/Resources/Prototypes/ADT/SoundCollections/emotes.yml +++ b/Resources/Prototypes/ADT/SoundCollections/emotes.yml @@ -301,7 +301,11 @@ - type: soundCollection id: SlimeBubbles files: - - /Audio/ADT/Voice/Slime/s_bubble.ogg + - /Audio/ADT/Voice/Slime/s_bubble_1.ogg + - /Audio/ADT/Voice/Slime/s_bubble_2.ogg + - /Audio/ADT/Voice/Slime/s_bubble_3.ogg + - /Audio/ADT/Voice/Slime/s_bubble_4.ogg + - /Audio/ADT/Voice/Slime/s_bubble_5.ogg - type: soundCollection id: MaleSlimeCry diff --git a/Resources/Prototypes/ADT/Voice/speech_emotes.yml b/Resources/Prototypes/ADT/Voice/speech_emotes.yml index 85321707e4e..e2c0574a55f 100644 --- a/Resources/Prototypes/ADT/Voice/speech_emotes.yml +++ b/Resources/Prototypes/ADT/Voice/speech_emotes.yml @@ -386,7 +386,7 @@ chatMessages: [chat-emote-msg-pop] chatTriggers: - чпок - + - чпокает - type: emote id: Bubbles @@ -402,6 +402,8 @@ chatMessages: [chat-emote-msg-bubbles] chatTriggers: - булькает + - бурлит + - пускает пузыри # Shadekin