diff --git a/Resources/Audio/SS220/Emotes/Tajaran/annoyed_tajaran_meow.ogg b/Resources/Audio/SS220/Emotes/Tajaran/annoyed_tajaran_meow.ogg new file mode 100644 index 000000000000..d21126f2575d Binary files /dev/null and b/Resources/Audio/SS220/Emotes/Tajaran/annoyed_tajaran_meow.ogg differ diff --git a/Resources/Audio/SS220/Emotes/Tajaran/attribution.yml b/Resources/Audio/SS220/Emotes/Tajaran/attribution.yml new file mode 100644 index 000000000000..0ff98aed421a --- /dev/null +++ b/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" diff --git a/Resources/Audio/SS220/Emotes/Tajaran/tajaran_meow.ogg b/Resources/Audio/SS220/Emotes/Tajaran/tajaran_meow.ogg new file mode 100644 index 000000000000..0a052cf82fdc Binary files /dev/null and b/Resources/Audio/SS220/Emotes/Tajaran/tajaran_meow.ogg differ diff --git a/Resources/Locale/ru-RU/ss220/emotes.ftl b/Resources/Locale/ru-RU/ss220/emotes.ftl index 49c7486cb7e5..25a9bb354896 100644 --- a/Resources/Locale/ru-RU/ss220/emotes.ftl +++ b/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 = раздражённо мяукает diff --git a/Resources/Prototypes/SS220/Entities/Mobs/Species/tajaran.yml b/Resources/Prototypes/SS220/Entities/Mobs/Species/tajaran.yml index 7a8132aabeef..50ba68cbc5d6 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/Species/tajaran.yml +++ b/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: diff --git a/Resources/Prototypes/SS220/SoundCollections/emotes.yml b/Resources/Prototypes/SS220/SoundCollections/emotes.yml index 3c714606e326..495db3ca1b2e 100644 --- a/Resources/Prototypes/SS220/SoundCollections/emotes.yml +++ b/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 diff --git a/Resources/Prototypes/SS220/Voice/speech_emote_sounds.yml b/Resources/Prototypes/SS220/Voice/speech_emote_sounds.yml index 58450d9ca35a..a12b7e64676e 100644 --- a/Resources/Prototypes/SS220/Voice/speech_emote_sounds.yml +++ b/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 diff --git a/Resources/Prototypes/SS220/Voice/speech_emotes.yml b/Resources/Prototypes/SS220/Voice/speech_emotes.yml index b7cc13fbd83e..a5ca99cb7c4b 100644 --- a/Resources/Prototypes/SS220/Voice/speech_emotes.yml +++ b/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: + - раздражённо мяукает + - раздраженно мяукает + - раздраженный мяу + - раздражённый мяу + - недовольно мяукает + - недовольный мяу