TajaranNewEmotes+Sounds

Resources/Audio/SS220/Emotes/Tajaran/attribution.yml

@@ -0,0 +1,4 @@
+- files: ["tajaran_meow.ogg","annoyed_tajaran_meow"]
+  license: "CC-BY-SA-3.0"
+  copyright: 'by ParadiseSS13'
+  source: "https://github.com/ss220club/Paradise-SS220/pull/1560/commits/d6ba9a1d09a65321e3e47eb781cd492abf1814b6"

Resources/Locale/ru-RU/ss220/emotes.ftl

@@ -16,3 +16,5 @@ chat-emote-name-giggle = хихиканье
 chat-emote-msg-giggle = хихикает!
 chat-emote-name-hiss = шипение
 chat-emote-msg-hiss = шипит!
+chat-emote-name-mrow = раздражённое мяуканье
+chat-emote-msg-mrow = раздражённо мяукает

Resources/Prototypes/SS220/Entities/Mobs/Species/tajaran.yml

@@ -34,13 +34,13 @@
     action: ActionToggleWaggingTajaran
   - type: Vocal
     sounds:
-      Male: MaleFelinid
-      Female: FemaleFelinid
-      Unsexed: MaleFelinid
+      Male: MaleTajaran
+      Female: FemaleTajaran
+      Unsexed: MaleTajaran
   - type: Speech
     speechSounds: Alto
     speechVerb: Tajaran
-    allowedEmotes: ['Growl','Purr','Hiss']
+    allowedEmotes: ['Growl','Purr','Hiss','Meow','Mrow']
   - type: DamageOnHighSpeedImpact
     damage:
       types:

Resources/Prototypes/SS220/SoundCollections/emotes.yml

@@ -295,3 +295,13 @@
   id: FelinidPurrs
   files:
   - /Audio/Voice/Felinid/cat_purr1.ogg
+
+- type: soundCollection
+  id: TajaranMeows
+  files:
+  - /Audio/SS220/Emotes/Tajaran/tajaran_meow.ogg
+
+- type: soundCollection
+  id: TajaranAnnoyedMeows
+  files:
+  - /Audio/SS220/Emotes/Tajaran/annoyed_tajaran_meow.ogg

Resources/Prototypes/SS220/Voice/speech_emote_sounds.yml

@@ -182,3 +182,83 @@
     Purr:
       collection: FelinidPurrs
 # Cat emotes end
+
+- type: emoteSounds
+  id: MaleTajaran
+  params:
+    variation: 0.125
+  sounds:
+    Scream:
+      collection: FelinidScreams
+    Laugh:
+      collection: MaleLaugh
+    Giggle:
+      collection: MaleLaugh
+    Cough:
+      collection: MaleCoughs
+    Yawn:
+      collection: MaleYawn
+    Sigh:
+      collection: MaleSigh
+    Crying:
+      collection: MaleCry
+    Whistle:
+      collection: Whistles                                                                      
+    Hiss:
+      collection: FelinidHisses
+    Meow:
+      collection: TajaranMeows
+    Mrow:
+      collection: TajaranAnnoyedMeows
+    Mew:
+      collection: FelinidMews
+    Growl:
+      collection: FelinidGrowls
+    Purr:
+      collection: FelinidPurrs
+    DefaultDeathgasp:
+      collection: Deathgasp
+    Gasp:
+      collection: Gasp
+    CritGasp:
+      collection: MaleCritGasp
+
+- type: emoteSounds
+  id: FemaleTajaran
+  params:
+    variation: 0.125
+  sounds:
+    Scream:
+      collection: FelinidScreams
+    Laugh:
+      collection: FemaleLaugh
+    Giggle:
+      collection: FemaleLaugh
+    Cough:
+      collection: FemaleCoughs 
+    Yawn:
+      collection: FemaleYawn  
+    Sigh:
+      collection: FemaleSigh
+    Crying:
+      collection: FemaleCry
+    Whistle:
+      collection: Whistles                           
+    Hiss:
+      collection: FelinidHisses
+    Meow:
+      collection: TajaranMeows
+    Mrow:
+      collection: TajaranAnnoyedMeows
+    Mew:
+      collection: FelinidMews
+    Growl:
+      collection: FelinidGrowls
+    Purr:
+      collection: FelinidPurrs
+    DefaultDeathgasp:
+      collection: Deathgasp
+    Gasp:
+      collection: Gasp
+    CritGasp:
+      collection: FemaleCritGasp

Resources/Prototypes/SS220/Voice/speech_emotes.yml

@@ -186,3 +186,22 @@
     - мурчит!
 
   ## spo9k vocal emotes end
+
+- type: emote
+  id: Mrow
+  name: chat-emote-name-mrow
+  available: false
+  whitelist:
+    components:
+    - Vocal
+  blacklist:
+    components:
+    - BorgChassis
+  chatMessages: [chat-emote-msg-mrow]
+  chatTriggers:
+    - раздражённо мяукает
+    - раздраженно мяукает
+    - раздраженный мяу
+    - раздражённый мяу
+    - недовольно мяукает
+    - недовольный мяу