Emotion (#17187)

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"

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/"

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"

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

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

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

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!
+