Species emotes port

Resources/Audio/_Floof/Voice/Vulpkanin/attritbutions.yml

@@ -0,0 +1,6 @@
+- files: [vulpscream1, vulpscream2, vulpscream3, vulpscream4, vulpscream5]
+  copyright: 'inspectorj'
+  license: https://www.soundsnap.com/licence
+  source: https://www.soundsnap.com
+
+# gekker and yap have unknown origin

Resources/Audio/_Impstation/Effects/Emotes/attributions.yml

@@ -1,5 +1,6 @@
 - files:
   - blink.ogg
+  - blink2.ogg
   license: "CC0-1.0"
-  copyright: "Made by Rarenth on freesound.org."
+  copyright: "Made by Rarenth on freesound.org, blink2 is a variation in pitch."
   source: "https://freesound.org/people/Rarenth/sounds/787959/"

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

@@ -0,0 +1,11 @@
+chat-emote-name-yap = Yap
+chat-emote-name-yip = Yip
+chat-emote-name-gekker = Gekker
+chat-emote-name-whimper = Whimper
+chat-emote-name-whine = Whine
+
+chat-emote-msg-yip = yips!
+chat-emote-msg-yap = yaps!
+chat-emote-msg-gekker = gekkers!
+chat-emote-msg-hiss = hisses!
+chat-emote-msg-whimper = whimpers!

Resources/Prototypes/Entities/Mobs/NPCs/animals.yml

@@ -3264,6 +3264,11 @@
   - type: Tag
     tags:
     - VimPilot
+    - VulpEmotes # Floofstation
+  - type: Emoting # Floofstation
+  - type: Vocal # Floofstation
+    sounds:
+      Unsexed: Fox
   - type: LanguageKnowledge # Floofstation - FOX!!!!! garryap yipruff!!!!!
     speaks:
     - Fox
@@ -3342,6 +3347,10 @@
       amount: 2
 #  - type: ReplacementAccent # Floofstation
 #    accent: dog
+  - type: Emoting # Floofstation
+  - type: Vocal # Floofstation
+    sounds:
+      Unsexed: Dog
   - type: LanguageKnowledge # Floofstation - this one is usually a pet so they understand tau ceti
     speaks:
     - Dog
@@ -3351,6 +3360,7 @@
   - type: Tag
     tags:
     - VimPilot
+    - VulpEmotes # Floof
 
 - type: entity
   name: corrupted corgi

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

@@ -224,10 +224,10 @@
   - type: CanEscapeInventory # Carrying system from nyanotrasen.
   - type: Tag
     tags:
-    - CanPilot
+    - CanPilot # MAKE SURE TO UPDATE FLOOFSTATION SPECIES TAGS IF THESE EVER CHANGE
     - FootstepSound
     - DoorBumpOpener
-    - AnomalyHost
+    - AnomalyHost # MAKE SURE TO UPDATE FLOOFSTATION SPECIES TAGS IF THESE EVER CHANGE
   - type: PotentialPsionic # DeltaV - organic species can all be psionic
   - type: FootPrints # DeltaV port from EE, blood splatter
   - type: Targeting # Shitmed Change

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

@@ -187,6 +187,13 @@
             state: shoes
   - type: CosmicMarkVisuals # DeltaV - cosmic cult
     subtleState: moth
+  - type: Tag # Floofstation
+    tags:
+    - CanPilot
+    - FootstepSound
+    - DoorBumpOpener
+    - AnomalyHost
+    - MothEmotes # Added
 
 - type: entity
   parent: BaseSpeciesDummy

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

@@ -111,6 +111,13 @@
   - type: FootPrints # DeltaV port from EE, blood splatter
     leftBarePrint: "footprint-left-bare-lizard"
     rightBarePrint: "footprint-right-bare-lizard"
+  - type: Tag # Floofstation
+    tags:
+    - CanPilot
+    - FootstepSound
+    - DoorBumpOpener
+    - AnomalyHost
+    - UnathiEmotes # Added
 
 - type: entity
   parent: BaseSpeciesDummy

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

@@ -135,6 +135,13 @@
   - type: FootPrints # DeltaV port from EE, blood splatter
     leftBarePrint: "footprint-left-bare-slime"
     rightBarePrint: "footprint-right-bare-slime"
+  - type: Tag # Floofstation
+    tags:
+    - CanPilot
+    - FootstepSound
+    - DoorBumpOpener
+    - AnomalyHost
+    - SlimeEmotes # Added
 
 - type: entity
   parent: MobHumanDummy

Resources/Prototypes/Voice/speech_emote_sounds.yml

@@ -89,6 +89,7 @@
 
 - type: emoteSounds
   id: MaleReptilian
+  parent: [ReptilianFloofstation] # Floofstation
   params:
     variation: 0.125
   sounds:
@@ -127,6 +128,7 @@
 
 - type: emoteSounds
   id: FemaleReptilian
+  parent: [ReptilianFloofstation] # Floofstation
   params:
     variation: 0.125
   sounds:
@@ -154,7 +156,7 @@
     Sigh:
       collection: FemaleSigh
     Yawn:
-      collection: FemaleYawn 
+      collection: FemaleYawn
     # End DeltaV Additions
     Gasp:
       collection: FemaleGasp
@@ -280,7 +282,7 @@
       collection: Weh
     Hew:
       collection: Hew
-    Gasp: 
+    Gasp:
       collection: VoxGasp # DeltaV - Combined upstream and our sounds
     DefaultDeathgasp:
       collection: VoxDeathgasp # DeltaV - Combined upstream and our sounds
@@ -495,7 +497,7 @@
     Ping:
       path: /Audio/Effects/Cargo/ping.ogg
     Boop: # DeltaV (EE)
-      path: /Audio/_EE/Voice/IPC/beep_500.ogg      
+      path: /Audio/_EE/Voice/IPC/beep_500.ogg
     Whirr: # DeltaV (EE)
       collection: IPCWhirrs
       params:
@@ -523,7 +525,7 @@
     Ping:
       path: /Audio/Effects/Cargo/ping.ogg
     Boop: # DeltaV (EE)
-      path: /Audio/_EE/Voice/IPC/beep_500.ogg      
+      path: /Audio/_EE/Voice/IPC/beep_500.ogg
     Whirr: # DeltaV (EE)
       collection: IPCWhirrs
       params:
@@ -551,7 +553,7 @@
     Ping:
       collection: XenoborgPing
     Boop: # DeltaV (EE)
-      path: /Audio/_EE/Voice/IPC/beep_500.ogg      
+      path: /Audio/_EE/Voice/IPC/beep_500.ogg
     Whirr: # DeltaV (EE)
       collection: IPCWhirrs
       params:

Resources/Prototypes/Voice/speech_emotes.yml

@@ -322,8 +322,8 @@
     components:
     - MobState
   chatMessages: ["chat-emote-msg-deathgasp"]
-  # chatTriggers: # DeltaV - Remove from the emote wheel
-  # - deathgasp
+  chatTriggers: # DeltaV - Remove from the emote wheel # Floofstation - add back
+  - deathgasp
 
 - type: emote
   id: MonkeyDeathgasp

Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml

@@ -161,6 +161,7 @@
     - DoorBumpOpener
     - AnomalyHost
     - OviniaEmotes
+    - HarpyEmotes # Floofstation
   - type: FootPrints # DeltaV port from EE, blood splatter
     leftBarePrint: "footprint-left-bare-lizard" # DeltaV port from EE, blood splatter
     rightBarePrint: "footprint-right-bare-lizard" # DeltaV port from EE, blood splatter

Resources/Prototypes/_DV/Entities/Mobs/Species/vulpkanin.yml

@@ -110,6 +110,13 @@
   - type: Temperature
     heatDamageThreshold: 315 # 10 lower than base
     coldDamageThreshold: 220 # 40 lower than base, very insulating fur
+  - type: Tag # Floofstation
+    tags:
+    - CanPilot
+    - FootstepSound
+    - DoorBumpOpener
+    - AnomalyHost
+    - VulpEmotes # Added
 
 - type: entity
   save: false

Resources/Prototypes/_DV/SoundCollections/vulpkanin.yml

@@ -22,10 +22,11 @@
   - /Audio/_DV/Voice/Vulpkanin/dog_snarl2.ogg
   - /Audio/_DV/Voice/Vulpkanin/dog_snarl3.ogg
 
-- type: soundCollection
-  id: VulpkaninWhines
-  files:
-  - /Audio/_DV/Voice/Vulpkanin/dog_whine.ogg
+# Moved to Floofstation namespace
+#- type: soundCollection
+#  id: VulpkaninWhines
+#  files:
+#  - /Audio/_DV/Voice/Vulpkanin/dog_whine.ogg
 
 - type: soundCollection
   id: VulpkaninHowls

Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml

@@ -1,6 +1,7 @@
 # species
 - type: emoteSounds
   id: SoundsHarpy
+  parent: [HarpyFloofstation] # Floofstation
   params:
     variation: 0.125
   sounds:
@@ -77,6 +78,7 @@
 
 - type: emoteSounds
   id: SoundsHarpyMale
+  parent: [HarpyFloofstation] # Floofstation
   params:
     variation: 0.125
   sounds:
@@ -163,6 +165,7 @@
 
 - type: emoteSounds
   id: SoundsHarpyFemale
+  parent: [HarpyFloofstation] # Floofstation
   params:
     variation: 0.125
   sounds:
@@ -249,11 +252,12 @@
 
 - type: emoteSounds
   id: MaleVulpkanin
+  parent: [VulpkaninFloofstation] # Floofstation
   params:
     variation: 0.125
   sounds:
-    Scream:
-      collection: MaleScreams
+#    Scream: # Floofstation - overridden in parent
+#      collection: MaleScreams
     Laugh:
       collection: MaleLaugh
     Sneeze:
@@ -280,8 +284,8 @@
       collection: VulpkaninSnarls
     Bark:
       collection: VulpkaninBarks
-    Whine:
-      collection: VulpkaninWhines
+#    Whine: # Floofstation - overridden in parent
+#      collection: VulpkaninWhines
     Howl:
       collection: VulpkaninHowls
     Awoo:
@@ -295,11 +299,12 @@
 
 - type: emoteSounds
   id: FemaleVulpkanin
+  parent: [VulpkaninFloofstation] # Floofstation
   params:
     variation: 0.125
   sounds:
-    Scream:
-      collection: FemaleScreams
+#    Scream: # Floofstation - overridden in parent
+#      collection: FemaleScreams
     Laugh:
       collection: FemaleLaugh
     Sneeze:
@@ -326,8 +331,8 @@
       collection: VulpkaninSnarls
     Bark:
       collection: VulpkaninBarks
-    Whine:
-      collection: VulpkaninWhines
+#    Whine: # Floofstation - overridden in parent
+#      collection: VulpkaninWhines
     Howl:
       collection: VulpkaninHowls
     Awoo:
@@ -363,7 +368,7 @@
     variation: 0.125
   sounds:
     Scream:
-      path: /Audio/Animals/mouse_squeak.ogg
+      collection: RodentiaScreams # Floofstation
     Laugh:
       collection: MaleLaugh
     Sneeze:
@@ -399,7 +404,7 @@
     variation: 0.125
   sounds:
     Scream:
-      path: /Audio/Animals/mouse_squeak.ogg
+      collection: RodentiaScreams # Floofstation
     Laugh:
       collection: FemaleLaugh
     Sneeze:
@@ -563,6 +568,7 @@
 
 - type: emoteSounds
   id: MaleKitsune
+  parent: [KitsuneFloofstation] # Floofstation
   params:
     variation: 0.125
   sounds:
@@ -601,6 +607,7 @@
 
 - type: emoteSounds
   id: FemaleKitsune
+  parent: [KitsuneFloofstation] # Floofstation
   params:
     variation: 0.125
   sounds:

Resources/Prototypes/_DV/Voice/speech_emotes.yml

@@ -174,24 +174,25 @@
     - snarled
     - snarling
 
-- type: emote
-  id: Whine
-  name: delta-chat-emote-name-whine
-  icon: _DV/Interface/Emotes/whine.png
-  category: Vocal
-  available: false
-  whitelist:
-    components:
-    - Vocal
-  blacklist:
-    components:
-    - BorgChassis
-  chatMessages: ["chat-emote-msg-whine"]
-  chatTriggers:
-    - whine
-    - whines
-    - whined
-    - whining
+# Moved to Floofstation namespace
+#- type: emote
+#  id: Whine
+#  name: delta-chat-emote-name-whine
+#  icon: _DV/Interface/Emotes/whine.png
+#  category: Vocal
+#  available: false
+#  whitelist:
+#    components:
+#    - Vocal
+#  blacklist:
+#    components:
+#    - BorgChassis
+#  chatMessages: ["chat-emote-msg-whine"]
+#  chatTriggers:
+#    - whine
+#    - whines
+#    - whined
+#    - whining
 
 - type: emote
   id: Howl