Merge pull request #1871 from redmushie/moth-wing-flap

Port moth wing flapping sound from Goobstation

Author: ShadesMars

Resources/Audio/_Starlight/Voice/Moth/attributions.yml

@@ -0,0 +1,5 @@
+- files: 
+    - moth_flapwings.ogg
+  license: "CC0-1.0"
+  copyright: "Originally sourced from https://freesound.org/people/Godowan/sounds/240476/, converted to mono by @deltanedas (GitHub), and leading silence trimmed and slightly amplified by @redmushie (GitHub)"
+  source: "https://freesound.org/people/Godowan/sounds/240476/"

Resources/Audio/_Starlight/Voice/Moth/moth_flapwings.ogg

@@ -13,6 +13,7 @@ chat-emote-name-squawk = Squawk
 chat-emote-name-lizardpurr = Purr
 chat-emote-name-lizardhiss = Hiss
 chat-emote-name-lizardrattle = Rattle
+chat-emote-name-flap-wings = Flap wings
 
 # Emote Messages
 chat-emote-msg-mew = mews
@@ -32,4 +33,5 @@ chat-emote-msg-call = calls
 chat-emote-msg-squawk = squawks
 chat-emote-msg-lurr = purrs
 chat-emote-msg-liss = hisses
-chat-emote-msg-rattle = rattles
+chat-emote-msg-rattle = rattles
+chat-emote-msg-flap-wings = flaps {POSS-ADJ($entity)} wings.

Resources/Locale/en-US/_Starlight/chat/emotes.ftl

@@ -37,7 +37,7 @@
     accent: zombieMoth
   - type: Speech
     speechVerb: Moth
-    allowedEmotes: ['Chitter', 'Squeak']
+    allowedEmotes: ['Chitter', 'Squeak', 'FlapWings']
   - type: TypingIndicator
     proto: moth
   - type: Butcherable
@@ -60,6 +60,8 @@
       Male: UnisexMoth
       Female: UnisexMoth
       Unsexed: UnisexMoth
+  - type: BodyEmotes # Starlight: Add separate sound set for Moth bodies
+    soundsId: MothBodyEmotes
   - type: MovementSpeedModifier
     baseWeightlessAcceleration: 1.5 # Move around more easily in space.
     baseWeightlessFriction: 1

Resources/Prototypes/Entities/Mobs/Species/moth.yml

@@ -757,6 +757,24 @@
     Salute:
       collection: Salutes
 
+# Starlight BEGIN: Moths used to just use GenericBodyEmotes
+- type: emoteSounds
+  id: MothBodyEmotes
+  sounds:
+    FlapWings: # Starlight: Flap wings
+      path: /Audio/_Starlight/Voice/Moth/moth_flapwings.ogg
+    Clap:
+      collection: Claps
+    ClapSingle:
+      collection: ClapSingle
+    Snap:
+      collection: Snaps
+      params:
+        volume: -6
+    Salute:
+      collection: Salutes
+# Starlight END
+
 # mobs
 - type: emoteSounds
   id: Zombie

Resources/Prototypes/Voice/speech_emote_sounds.yml

@@ -356,4 +356,33 @@
   - rattles
   - rattles.
   - rattles!
-  - rattles?
+  - rattles?
+
+- type: emote
+  id: FlapWings
+  name: chat-emote-name-flap-wings
+  category: Hands
+  available: false
+  icon:
+    sprite: Clothing/Neck/Cloaks/moth.rsi
+    state: icon
+  blacklist:
+    components:
+      - BorgChassis
+  chatMessages: ["chat-emote-msg-flap-wings"]
+  chatTriggers:
+    - flaps
+    - flaps.
+    - flaps!
+    - flaps his wings
+    - flaps his wings.
+    - flaps his wings!
+    - flaps her wings
+    - flaps her wings.
+    - flaps her wings!
+    - flaps their wings
+    - flaps their wings.
+    - flaps their wings!
+    - flaps its wings
+    - flaps its wings.
+    - flaps its wings!