diff --git a/Resources/Audio/Effects/Emotes/attributions.yml b/Resources/Audio/Effects/Emotes/attributions.yml index 899aff2acd..0c62b48366 100644 --- a/Resources/Audio/Effects/Emotes/attributions.yml +++ b/Resources/Audio/Effects/Emotes/attributions.yml @@ -18,3 +18,8 @@ license: "CC-BY-4.0" copyright: "Made by TV_LING. Converted from WAV to OGG and downmixed to 1 channel." source: "https://freesound.org/people/TV_LING/sounds/523467/" +- files: + - salute.ogg + license: "CC-BY-SA-3.0" + copyright: "Taken from https://github.com/infinitystation/Baystation12/commit/e639451bef42230a3838c085a6c782376e693499. No changes were made" + source: "https://github.com/infinitystation/Baystation12" diff --git a/Resources/Audio/Effects/Emotes/salute.ogg b/Resources/Audio/Effects/Emotes/salute.ogg new file mode 100644 index 0000000000..90faefb402 Binary files /dev/null and b/Resources/Audio/Effects/Emotes/salute.ogg differ diff --git a/Resources/Audio/Voice/Human/attributions.yml b/Resources/Audio/Voice/Human/attributions.yml index f777bc6194..42672b25ea 100644 --- a/Resources/Audio/Voice/Human/attributions.yml +++ b/Resources/Audio/Voice/Human/attributions.yml @@ -2,3 +2,50 @@ license: "CC-BY-3.0" copyright: "https://github.com/ss220-space/Paradise/" source: "https://github.com/ss220-space/Paradise/commit/89943a231ced9fc8db0aef65ff87093efee16b4e" + +- files: + - whistle_1.ogg + - whistle_2.ogg + - whistle_3.ogg + license: "CC0-1.0" + copyright: "Taken from https://freesound.org/" + source: "https://freesound.org/people/taure/sounds/411638/" + +- files: + - whistle_4.ogg + license: "Custom" + copyright: "Sampling Plus 1.0 license. Taken from https://freesound.org/" + source: "https://freesound.org/people/jackstrebor/sounds/34782/" + +- files: + - cry_male_1 + - cry_male_2 + license: "CC-BY-4.0" + copyright: "Taken from https://freesound.org/. Convert from WAV to OGG, is divided into several parts." + source: "https://freesound.org/people/jacobmathiassen/sounds/254869/" + +- files: + - cry_male_3.ogg + license: "CC0-1.0" + copyright: "Taken from https://freesound.org/" + source: "https://freesound.org/people/scottemoil/sounds/263776/" + +- files: + - cry_male_4.ogg + license: "CC-BY-4.0" + copyright: "Taken from https://freesound.org/. Converted from FLAC to OGG, some part of the sound is taken." + source: "https://freesound.org/people/qubodup/sounds/200428/" + +- files: + - cry_female_1.ogg + - cry_female_2.ogg + license: "CC-BY-NC-3.0" + copyright: "Taken from https://freesound.org/. Convert from WAV to OGG, is divided into several parts." + source: "https://freesound.org/people/Luzanne0/sounds/445299/" + +- files: + - cry_female_3.ogg + - cry_female_4.ogg + license: "CC-BY-NC-4.0" + copyright: "Taken from https://freesound.org/. Convert from WAV to OGG, is divided into several parts." + source: "https://freesound.org/people/Idalize/sounds/408211/" diff --git a/Resources/Audio/Voice/Human/cry_female_1.ogg b/Resources/Audio/Voice/Human/cry_female_1.ogg new file mode 100644 index 0000000000..17fe293073 Binary files /dev/null and b/Resources/Audio/Voice/Human/cry_female_1.ogg differ diff --git a/Resources/Audio/Voice/Human/cry_female_2.ogg b/Resources/Audio/Voice/Human/cry_female_2.ogg new file mode 100644 index 0000000000..13060ee38e Binary files /dev/null and b/Resources/Audio/Voice/Human/cry_female_2.ogg differ diff --git a/Resources/Audio/Voice/Human/cry_female_3.ogg b/Resources/Audio/Voice/Human/cry_female_3.ogg new file mode 100644 index 0000000000..6f6d3a0918 Binary files /dev/null and b/Resources/Audio/Voice/Human/cry_female_3.ogg differ diff --git a/Resources/Audio/Voice/Human/cry_female_4.ogg b/Resources/Audio/Voice/Human/cry_female_4.ogg new file mode 100644 index 0000000000..505449ad73 Binary files /dev/null and b/Resources/Audio/Voice/Human/cry_female_4.ogg differ diff --git a/Resources/Audio/Voice/Human/cry_male_1.ogg b/Resources/Audio/Voice/Human/cry_male_1.ogg new file mode 100644 index 0000000000..d7de7301fe Binary files /dev/null and b/Resources/Audio/Voice/Human/cry_male_1.ogg differ diff --git a/Resources/Audio/Voice/Human/cry_male_2.ogg b/Resources/Audio/Voice/Human/cry_male_2.ogg new file mode 100644 index 0000000000..56d2ec4e84 Binary files /dev/null and b/Resources/Audio/Voice/Human/cry_male_2.ogg differ diff --git a/Resources/Audio/Voice/Human/cry_male_3.ogg b/Resources/Audio/Voice/Human/cry_male_3.ogg new file mode 100644 index 0000000000..cf4234f379 Binary files /dev/null and b/Resources/Audio/Voice/Human/cry_male_3.ogg differ diff --git a/Resources/Audio/Voice/Human/cry_male_4.ogg b/Resources/Audio/Voice/Human/cry_male_4.ogg new file mode 100644 index 0000000000..735873b704 Binary files /dev/null and b/Resources/Audio/Voice/Human/cry_male_4.ogg differ diff --git a/Resources/Audio/Voice/Human/whistle_1.ogg b/Resources/Audio/Voice/Human/whistle_1.ogg new file mode 100644 index 0000000000..eff37a98eb Binary files /dev/null and b/Resources/Audio/Voice/Human/whistle_1.ogg differ diff --git a/Resources/Audio/Voice/Human/whistle_2.ogg b/Resources/Audio/Voice/Human/whistle_2.ogg new file mode 100644 index 0000000000..0bdc0b18df Binary files /dev/null and b/Resources/Audio/Voice/Human/whistle_2.ogg differ diff --git a/Resources/Audio/Voice/Human/whistle_3.ogg b/Resources/Audio/Voice/Human/whistle_3.ogg new file mode 100644 index 0000000000..a11438620e Binary files /dev/null and b/Resources/Audio/Voice/Human/whistle_3.ogg differ diff --git a/Resources/Audio/Voice/Human/whistle_4.ogg b/Resources/Audio/Voice/Human/whistle_4.ogg new file mode 100644 index 0000000000..f1fca8d281 Binary files /dev/null and b/Resources/Audio/Voice/Human/whistle_4.ogg differ diff --git a/Resources/Audio/Voice/Slime/attributions.yml b/Resources/Audio/Voice/Slime/attributions.yml new file mode 100644 index 0000000000..9f2835c39d --- /dev/null +++ b/Resources/Audio/Voice/Slime/attributions.yml @@ -0,0 +1,5 @@ +- files: + - slime_squish.ogg + license: "CC-BY-SA-3.0" + copyright: "Taken from https://github.com/ParadiseSS13/Paradise/commit/60d27e07de73f0fe72f4cff78b9c4100fd1d3b19" + source: "https://github.com/ParadiseSS13/Paradise" diff --git a/Resources/Audio/Voice/Slime/slime_squish.ogg b/Resources/Audio/Voice/Slime/slime_squish.ogg new file mode 100644 index 0000000000..60e118e217 Binary files /dev/null and b/Resources/Audio/Voice/Slime/slime_squish.ogg differ diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml index e69ce1126e..60667aaebf 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml @@ -16,6 +16,11 @@ species: SlimePerson - type: Speech speechSounds: Slime + - type: Vocal + sounds: + Male: UnisexSlime + Female: UnisexSlime + Unsexed: UnisexSlime - type: Damageable damageContainer: Biological damageModifierSet: Slime diff --git a/Resources/Prototypes/SoundCollections/emotes.yml b/Resources/Prototypes/SoundCollections/emotes.yml index 972c49e3c3..19b1b0e33d 100644 --- a/Resources/Prototypes/SoundCollections/emotes.yml +++ b/Resources/Prototypes/SoundCollections/emotes.yml @@ -40,3 +40,37 @@ id: FemaleSigh files: - /Audio/Voice/Human/female_sigh.ogg + +- type: soundCollection + id: Salutes + files: + - /Audio/Effects/Emotes/salute.ogg + +- type: soundCollection + id: MaleCry + files: + - /Audio/Voice/Human/cry_male_1.ogg + - /Audio/Voice/Human/cry_male_2.ogg + - /Audio/Voice/Human/cry_male_3.ogg + - /Audio/Voice/Human/cry_male_4.ogg + +- type: soundCollection + id: FemaleCry + files: + - /Audio/Voice/Human/cry_female_1.ogg + - /Audio/Voice/Human/cry_female_2.ogg + - /Audio/Voice/Human/cry_female_3.ogg + - /Audio/Voice/Human/cry_female_4.ogg + +- type: soundCollection + id: Whistles + files: + - /Audio/Voice/Human/whistle_1.ogg + - /Audio/Voice/Human/whistle_2.ogg + - /Audio/Voice/Human/whistle_3.ogg + - /Audio/Voice/Human/whistle_4.ogg + +- type: soundCollection + id: Squishes + files: + - /Audio/Voice/Slime/slime_squish.ogg diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml index 4cb2df330f..8ed1d72847 100644 --- a/Resources/Prototypes/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml @@ -28,6 +28,10 @@ collection: BikeHorn Sigh: collection: MaleSigh + Crying: + collection: MaleCry + Whistle: + collection: Whistles - type: emoteSounds id: FemaleHuman @@ -58,6 +62,10 @@ collection: CluwneHorn Sigh: collection: FemaleSigh + Crying: + collection: FemaleCry + Whistle: + collection: Whistles - type: emoteSounds id: UnisexReptilian @@ -70,6 +78,18 @@ path: /Audio/Animals/lizard_happy.ogg Honk: collection: BikeHorn + Whistle: + collection: Whistles + Crying: + collection: MaleCry + +- type: emoteSounds + id: UnisexSlime + sounds: + Squish: + collection: Squishes + params: + variation: 0.125 - type: emoteSounds id: UnisexVox @@ -110,6 +130,10 @@ collection: MaleLaugh Honk: collection: BikeHorn + Crying: + collection: MaleCry + Whistle: + collection: Whistles params: variation: 0.125 pitchscale: 0.75 @@ -124,6 +148,8 @@ collection: Snaps params: volume: -6 + Salute: + collection: Salutes - type: emoteSounds id: DionaBodyEmotes diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index 2842e4d28e..f06163c6cc 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -65,6 +65,51 @@ - sighs. - sighed. +- type: emote + id: Whistle + category: Vocal + chatMessages: [whistle] + chatTriggers: + - whistle + - whistle. + - whistle! + - whistles + - whistles. + - whistles! + - whistleblowing + - whistleblowing. + - whistleblowing! + +- type: emote + id: Crying + category: Vocal + chatMessages: [crying] + chatTriggers: + - cry + - cry. + - cry! + - crying + - crying. + - crying! + - cries + - cries. + - cries! + +- type: emote + id: Squish + category: Vocal + chatMessages: [squishing] + chatTriggers: + - squish + - squish. + - squish! + - squishing + - squishing. + - squishing! + - squishes + - squishes. + - squishes! + # hand emotes - type: emote id: Clap @@ -97,3 +142,15 @@ - snapping fingers - snapped fingers +- type: emote + id: Salute + category: Hands + chatMessages: [Salute] + chatTriggers: + - salute + - salute. + - salute! + - salutes + - salutes. + - salutes! +