diff --git a/Resources/Audio/_Sunrise/Voice/Moth/moth_severe_cough.ogg b/Resources/Audio/_Sunrise/Voice/Moth/moth_severe_cough.ogg new file mode 100644 index 0000000000..00bc9aa5ea Binary files /dev/null and b/Resources/Audio/_Sunrise/Voice/Moth/moth_severe_cough.ogg differ diff --git a/Resources/Audio/_Sunrise/Voice/Tajaran/attributions.yml b/Resources/Audio/_Sunrise/Voice/Tajaran/attributions.yml new file mode 100644 index 0000000000..285d74f6a5 --- /dev/null +++ b/Resources/Audio/_Sunrise/Voice/Tajaran/attributions.yml @@ -0,0 +1,9 @@ +- files: ["tajaran_hisses.ogg"] + license: "Custom" + copyright: "taken from zvukipro.com and redacted @banumbas(github)" + source: https://zvukipro.com/jivotnie/1241-zvuki-pumy.html + +- files: ["tajaran_growl.ogg"] + license: "Custom" + copyright: "taken from zvukipro.com" + source: https://zvukipro.com/jivotnie/2307-zvuki-dalnevostochnogo-leoparda.html diff --git a/Resources/Audio/_Sunrise/Voice/Tajaran/tajaran_growl.ogg b/Resources/Audio/_Sunrise/Voice/Tajaran/tajaran_growl.ogg new file mode 100644 index 0000000000..edcb2d8e5c Binary files /dev/null and b/Resources/Audio/_Sunrise/Voice/Tajaran/tajaran_growl.ogg differ diff --git a/Resources/Audio/_Sunrise/Voice/Tajaran/tajaran_hisses.ogg b/Resources/Audio/_Sunrise/Voice/Tajaran/tajaran_hisses.ogg new file mode 100644 index 0000000000..727f5d0880 Binary files /dev/null and b/Resources/Audio/_Sunrise/Voice/Tajaran/tajaran_hisses.ogg differ diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml index 86777e8bce..2d3846243d 100644 --- a/Resources/Prototypes/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml @@ -439,6 +439,10 @@ collection: BikeHorn Gasp: collection: MaleGasp + # Sunrise-Start + SevereCough: + path: /Audio/_Sunrise/Voice/Moth/moth_severe_cough.ogg + # Sunrise-End DefaultDeathgasp: collection: MothDeathGasp diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/tajaran.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/tajaran.yml index 8a0256c093..91da8d6976 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/tajaran.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/tajaran.yml @@ -18,7 +18,7 @@ - type: Hunger - type: Speech speechVerb: Felinid - allowedEmotes: ['Mew', 'Meow', 'Hisses', 'Purr'] + allowedEmotes: ['Mew', 'Meow', 'Hisses', 'Purr', 'Growl'] - type: Thirst dehydrationDamage: types: @@ -40,9 +40,9 @@ Slash: 2 - type: Vocal sounds: - Male: MaleFelinid - Female: FemaleFelinid - Unsexed: MaleFelinid + Male: MaleTajaran + Female: FemaleTajaran + Unsexed: MaleTajaran - type: Temperature heatDamageThreshold: 400 coldDamageThreshold: 200 diff --git a/Resources/Prototypes/_Sunrise/Voice/speech_emote_sounds.yml b/Resources/Prototypes/_Sunrise/Voice/speech_emote_sounds.yml index 2058bd6387..d32b4e0d7b 100644 --- a/Resources/Prototypes/_Sunrise/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/_Sunrise/Voice/speech_emote_sounds.yml @@ -27,6 +27,8 @@ collection: FelinidPurrs Growl: collection: FelinidGrowls + SevereCough: + collection: MaleSevereCough - type: emoteSounds id: FemaleFelinid @@ -57,6 +59,73 @@ collection: FelinidPurrs Growl: collection: FelinidGrowls + SevereCough: + collection: FemaleSevereCough + +- type: emoteSounds + id: MaleTajaran + params: + variation: 0.125 + sounds: + Scream: + collection: FelinidScreams + Laugh: + collection: MaleLaugh + Sneeze: + collection: MaleSneezes + Cough: + collection: MaleCoughs + Sigh: + collection: MaleSigh + Crying: + collection: MaleCry + Whistle: + collection: Whistles + Mew: + collection: FelinidMews + Meow: + collection: FelinidMeows + Hisses: + path: /Audio/_Sunrise/Voice/Tajaran/tajaran_hisses.ogg + Purr: + collection: FelinidPurrs + Growl: + path: /Audio/_Sunrise/Voice/Tajaran/tajaran_growl.ogg + SevereCough: + collection: MaleSevereCough + +- type: emoteSounds + id: FemaleTajaran + params: + variation: 0.125 + sounds: + Scream: + collection: FelinidScreams + Laugh: + collection: FemaleLaugh + Sneeze: + collection: FemaleSneezes + Cough: + collection: FemaleCoughs + Sigh: + collection: FemaleSigh + Crying: + collection: FemaleCry + Whistle: + collection: Whistles + Mew: + collection: FelinidMews + Meow: + collection: FelinidMeows + Hisses: + path: /Audio/_Sunrise/Voice/Tajaran/tajaran_hisses.ogg + Purr: + collection: FelinidPurrs + Growl: + path: /Audio/_Sunrise/Voice/Tajaran/tajaran_growl.ogg + SevereCough: + collection: FemaleSevereCough + - type: emoteSounds id: UnisexSwine @@ -85,6 +154,8 @@ collection: MaleCry Whistle: collection: Whistles + SevereCough: + collection: MaleSevereCough params: variation: 0.125