diff --git a/Resources/Audio/_Floof/Voice/Vulpkanin/attritbutions.yml b/Resources/Audio/_Floof/Voice/Vulpkanin/attritbutions.yml new file mode 100644 index 00000000000..8d48d99bb5d --- /dev/null +++ b/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 diff --git a/Resources/Audio/_Floof/Voice/Vulpkanin/vulpscream1.ogg b/Resources/Audio/_Floof/Voice/Vulpkanin/vulpscream1.ogg new file mode 100644 index 00000000000..2f76639d13d Binary files /dev/null and b/Resources/Audio/_Floof/Voice/Vulpkanin/vulpscream1.ogg differ diff --git a/Resources/Audio/_Floof/Voice/Vulpkanin/vulpscream2.ogg b/Resources/Audio/_Floof/Voice/Vulpkanin/vulpscream2.ogg new file mode 100644 index 00000000000..594e25f47e9 Binary files /dev/null and b/Resources/Audio/_Floof/Voice/Vulpkanin/vulpscream2.ogg differ diff --git a/Resources/Audio/_Floof/Voice/Vulpkanin/vulpscream3.ogg b/Resources/Audio/_Floof/Voice/Vulpkanin/vulpscream3.ogg new file mode 100644 index 00000000000..6d66c4a6e1f Binary files /dev/null and b/Resources/Audio/_Floof/Voice/Vulpkanin/vulpscream3.ogg differ diff --git a/Resources/Audio/_Floof/Voice/Vulpkanin/vulpscream4.ogg b/Resources/Audio/_Floof/Voice/Vulpkanin/vulpscream4.ogg new file mode 100644 index 00000000000..594cc082bcf Binary files /dev/null and b/Resources/Audio/_Floof/Voice/Vulpkanin/vulpscream4.ogg differ diff --git a/Resources/Audio/_Floof/Voice/Vulpkanin/vulpscream5.ogg b/Resources/Audio/_Floof/Voice/Vulpkanin/vulpscream5.ogg new file mode 100644 index 00000000000..fc755173b33 Binary files /dev/null and b/Resources/Audio/_Floof/Voice/Vulpkanin/vulpscream5.ogg differ diff --git a/Resources/Audio/_Impstation/Effects/Emotes/attributions.yml b/Resources/Audio/_Impstation/Effects/Emotes/attributions.yml index c75a230139e..109a0eb50db 100644 --- a/Resources/Audio/_Impstation/Effects/Emotes/attributions.yml +++ b/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/" diff --git a/Resources/Audio/_Impstation/Effects/Emotes/blink2.ogg b/Resources/Audio/_Impstation/Effects/Emotes/blink2.ogg new file mode 100644 index 00000000000..5f0601519bc Binary files /dev/null and b/Resources/Audio/_Impstation/Effects/Emotes/blink2.ogg differ diff --git a/Resources/Locale/en-US/_Floof/chat/emotes.ftl b/Resources/Locale/en-US/_Floof/chat/emotes.ftl new file mode 100644 index 00000000000..6a2527e7168 --- /dev/null +++ b/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! diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 71f602a5c72..546b6d2fe17 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index 095818627bb..b6a7e390194 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml index f4a78cc3ea0..33ba813da8a 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml index 4535a0302fd..4d09edd4645 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml index 2f9770832e2..333786dd79a 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml +++ b/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 diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml index 134716721b0..4eeb2a78c08 100644 --- a/Resources/Prototypes/Voice/speech_emote_sounds.yml +++ b/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: diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index 59c66ce1b49..46135e068cb 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/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 diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml index 9be73f46210..8f9a88988c9 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml +++ b/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 diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/_DV/Entities/Mobs/Species/vulpkanin.yml index 4c4c26ee0bf..ee14ac75ea1 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Species/vulpkanin.yml +++ b/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 diff --git a/Resources/Prototypes/_DV/SoundCollections/vulpkanin.yml b/Resources/Prototypes/_DV/SoundCollections/vulpkanin.yml index c0091431a14..92d7bf40f65 100644 --- a/Resources/Prototypes/_DV/SoundCollections/vulpkanin.yml +++ b/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 diff --git a/Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml index 15b15f45dc5..c0c71663acc 100644 --- a/Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml +++ b/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: diff --git a/Resources/Prototypes/_DV/Voice/speech_emotes.yml b/Resources/Prototypes/_DV/Voice/speech_emotes.yml index 0ad77d9b6fd..f4c764fa696 100644 --- a/Resources/Prototypes/_DV/Voice/speech_emotes.yml +++ b/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 diff --git a/Resources/Prototypes/_Floof/Entities/Mobs/Species/resomi.yml b/Resources/Prototypes/_Floof/Entities/Mobs/Species/resomi.yml index a3376340835..b07cbd7c465 100644 --- a/Resources/Prototypes/_Floof/Entities/Mobs/Species/resomi.yml +++ b/Resources/Prototypes/_Floof/Entities/Mobs/Species/resomi.yml @@ -44,11 +44,11 @@ - type: Speech speechVerb: Parrot speechSounds: MaleAvali - #- type: Vocal - # sounds: - # Male: MaleAvali - # Unsexed: MaleAvali - # Female: FemaleAvali + - type: Vocal # Floofstation - uncommented + sounds: + Male: RMCMaleAvali + Unsexed: RMCMaleAvali + Female: RMCFemaleAvali - type: Hands handDisplacement: sizeMaps: @@ -206,12 +206,13 @@ #- type: DamageForceSay # Floofstation - added unqiue pain messages # forceSayStringPrefix: damage-force-say-resomi- # forceSayStringCount: 4 # Default is 7. I was not creative enough to come up with 7 right now. Send help. - #- type: Tag - # tags: - # - CanPilot - # - FootstepSound - # - DoorBumpOpener - # - ResomiEmotes + - type: Tag # Floofstation - uncommented + tags: + - CanPilot + - FootstepSound + - DoorBumpOpener + - AnomalyHost + - ResomiEmotes - type: entity diff --git a/Resources/Prototypes/_Floof/Entities/Mobs/Species/shadowkin.yml b/Resources/Prototypes/_Floof/Entities/Mobs/Species/shadowkin.yml index 7691745915d..98d1c9538ea 100644 --- a/Resources/Prototypes/_Floof/Entities/Mobs/Species/shadowkin.yml +++ b/Resources/Prototypes/_Floof/Entities/Mobs/Species/shadowkin.yml @@ -115,6 +115,8 @@ - CanPilot - FootstepSound - DoorBumpOpener + - AnomalyHost + - ShadowkinEmotes - type: LanguageKnowledge speaks: - TauCetiBasic diff --git a/Resources/Prototypes/_Floof/tags.yml b/Resources/Prototypes/_Floof/Tags/assorted.yml similarity index 100% rename from Resources/Prototypes/_Floof/tags.yml rename to Resources/Prototypes/_Floof/Tags/assorted.yml diff --git a/Resources/Prototypes/_Floof/Tags/emote-tags.yml b/Resources/Prototypes/_Floof/Tags/emote-tags.yml new file mode 100644 index 00000000000..1bab4c109db --- /dev/null +++ b/Resources/Prototypes/_Floof/Tags/emote-tags.yml @@ -0,0 +1,34 @@ +# The process of adding one of these tags is as follows: +# 1. Define a new tag prototype +# 2. Go to the species base mob prototype (e.g. BaseMobMoth) +# 3. Check if it already has a TagComponent +# 4.1. If it doesn't, then go to the parent of the mob (usually BaseMobSpeciesOrganic) and check if it has a TagComponent, repeat until you find it +# 4.2. Copy the tag component from the first parent that defines it onto the base mob. +# 5. Add the tag to the TagComponent +# +# I won't bother adding such tags for all species specifically because it requires overriding the parent's TagComponent, +# and that can and WILL cause issues if upstream decides to add new tags to species mobs. + +- type: Tag + id: HarpyEmotes + +- type: Tag + id: VulpEmotes + +- type: Tag + id: ShadowkinEmotes + +- type: Tag + id: UnathiEmotes + +- type: Tag + id: MothEmotes + +- type: Tag + id: KitsuneEmotes + +- type: Tag + id: ResomiEmotes + +- type: Tag + id: SlimeEmotes diff --git a/Resources/Prototypes/_Floof/Voice/Emotes/vulpkanin.yml b/Resources/Prototypes/_Floof/Voice/Emotes/vulpkanin.yml new file mode 100644 index 00000000000..2f5038e42b5 --- /dev/null +++ b/Resources/Prototypes/_Floof/Voice/Emotes/vulpkanin.yml @@ -0,0 +1,96 @@ +- type: emote + id: Gekker + name: chat-emote-name-gekker + category: Vocal + icon: Interface/Emotes/laugh.png + whitelist: + tags: + - VulpEmotes + - KitsuneEmotes + blacklist: + tags: + - SiliconEmotes + components: + - BorgChassis + chatMessages: [ chat-emote-msg-gekker ] + chatTriggers: + - gekkers + +- type: emote + id: Yip + name: chat-emote-name-yip + category: Vocal + icon: Interface/Emotes/laugh.png + whitelist: + tags: # Note: under the hood, it is used by both vulps and kitsunes. + - UnathiEmotes + - VulpEmotes + - KitsuneEmotes + blacklist: + tags: + - SiliconEmotes + components: + - BorgChassis + chatMessages: [ chat-emote-msg-yip ] + chatTriggers: + - yip + - yips + +- type: emote + id: Yap + name: chat-emote-name-yap + category: Vocal + icon: Interface/Emotes/laugh.png + whitelist: + tags: + - VulpEmotes + - KitsuneEmotes + blacklist: + tags: + - SiliconEmotes + components: + - BorgChassis + chatMessages: [ chat-emote-msg-yap ] + chatTriggers: + - yap + - yaps + +# This is a new whine. The old one was renamed to @whimper. For comparison, the old whine (whimper) is a long dog whine, while this is a short fox whine. +- type: emote + id: Whine + name: chat-emote-name-whine + category: Vocal + icon: _DV/Interface/Emotes/whine.png + whitelist: + tags: + - VulpEmotes + - KitsuneEmotes + - HarpyEmotes + blacklist: + tags: + - SiliconEmotes + components: + - BorgChassis + chatMessages: [ chat-emote-msg-whine ] + chatTriggers: + - whines + - whine + +- type: emote + id: Whimper + name: chat-emote-name-whimper + icon: _DV/Interface/Emotes/whine.png + category: Vocal + whitelist: + tags: + - VulpEmotes + - HarpyEmotes + - KitsuneEmotes + blacklist: + components: + - BorgChassis + chatMessages: ["chat-emote-msg-whimper"] + chatTriggers: + - whimpers + - whimper + diff --git a/Resources/Prototypes/_Floof/Voice/SoundCollections/harpy.yml b/Resources/Prototypes/_Floof/Voice/SoundCollections/harpy.yml new file mode 100644 index 00000000000..4df9a5188d7 --- /dev/null +++ b/Resources/Prototypes/_Floof/Voice/SoundCollections/harpy.yml @@ -0,0 +1,8 @@ +- type: soundCollection + id: HarpyCoos + files: + - /Audio/_Floof/Voice/Harpy/harpy_coo1.ogg + - /Audio/_Floof/Voice/Harpy/harpy_coo2.ogg + - /Audio/_Floof/Voice/Harpy/harpy_coo3.ogg + - /Audio/_Floof/Voice/Harpy/harpy_coo4.ogg + - /Audio/_Floof/Voice/Harpy/harpy_coo5.ogg diff --git a/Resources/Prototypes/_Floof/Voice/SoundCollections/reptilian.yml b/Resources/Prototypes/_Floof/Voice/SoundCollections/reptilian.yml new file mode 100644 index 00000000000..1ab5ed9b7a0 --- /dev/null +++ b/Resources/Prototypes/_Floof/Voice/SoundCollections/reptilian.yml @@ -0,0 +1,9 @@ +- type: soundCollection + id: ReptilianYip + files: + - /Audio/_Floof/Voice/Reptilian/yip.ogg + +- type: soundCollection + id: ReptilianHiss + files: + - /Audio/_Floof/Voice/Reptilian/hiss.ogg diff --git a/Resources/Prototypes/_Floof/Voice/SoundCollections/resomi.yml b/Resources/Prototypes/_Floof/Voice/SoundCollections/resomi.yml new file mode 100644 index 00000000000..209732c93e2 --- /dev/null +++ b/Resources/Prototypes/_Floof/Voice/SoundCollections/resomi.yml @@ -0,0 +1,4 @@ +- type: soundCollection + id: ResomiChirps + files: + - /Audio/_DV/Voice/Harpy/chirp1.ogg diff --git a/Resources/Prototypes/_Floof/Voice/SoundCollections/rodentia.yml b/Resources/Prototypes/_Floof/Voice/SoundCollections/rodentia.yml new file mode 100644 index 00000000000..2a046828807 --- /dev/null +++ b/Resources/Prototypes/_Floof/Voice/SoundCollections/rodentia.yml @@ -0,0 +1,5 @@ +- type: soundCollection + id: RodentiaScreams + files: + - /Audio/_Floof/Voice/Rodentia/Rat_Scream_01.ogg + diff --git a/Resources/Prototypes/_Floof/Voice/SoundCollections/vulpkanin.yml b/Resources/Prototypes/_Floof/Voice/SoundCollections/vulpkanin.yml new file mode 100644 index 00000000000..852cb429972 --- /dev/null +++ b/Resources/Prototypes/_Floof/Voice/SoundCollections/vulpkanin.yml @@ -0,0 +1,48 @@ +- type: soundCollection + id: VulpkaninScreams + files: + - /Audio/_Floof/Voice/Vulpkanin/vulpscream1.ogg + - /Audio/_Floof/Voice/Vulpkanin/vulpscream2.ogg + - /Audio/_Floof/Voice/Vulpkanin/vulpscream3.ogg + - /Audio/_Floof/Voice/Vulpkanin/vulpscream4.ogg + - /Audio/_Floof/Voice/Vulpkanin/vulpscream5.ogg + +- type: soundCollection + id: VulpkaninWhimpers # Renamed to whimper + files: + - /Audio/_DV/Voice/Vulpkanin/dog_whine.ogg + +# Fox squeak +- type: soundCollection + id: VulpkaninYips + files: + - /Audio/Animals/fox_squeak.ogg + +# Rest of the Fox sound collection +- type: soundCollection + id: VulpkaninWhines + files: + - /Audio/Animals/fox1.ogg + - /Audio/Animals/fox2.ogg + - /Audio/Animals/fox3.ogg + - /Audio/Animals/fox4.ogg + - /Audio/Animals/fox5.ogg + - /Audio/Animals/fox6.ogg + - /Audio/Animals/fox7.ogg + - /Audio/Animals/fox8.ogg + - /Audio/Animals/fox9.ogg + - /Audio/Animals/fox10.ogg + - /Audio/Animals/fox11.ogg + - /Audio/Animals/fox12.ogg + - /Audio/Animals/fox13.ogg + - /Audio/Animals/fox14.ogg + +- type: soundCollection + id: VulpkaninYap + files: + - /Audio/_Floof/Voice/Vulpkanin/yap.ogg + +- type: soundCollection + id: VulpkaninGekker + files: + - /Audio/_Floof/Voice/Vulpkanin/gekker.ogg diff --git a/Resources/Prototypes/_Floof/Voice/animal_emote_sounds.yml b/Resources/Prototypes/_Floof/Voice/animal_emote_sounds.yml new file mode 100644 index 00000000000..33c94e20f26 --- /dev/null +++ b/Resources/Prototypes/_Floof/Voice/animal_emote_sounds.yml @@ -0,0 +1,41 @@ +- type: emoteSounds + id: Fox + params: + variation: 0.125 + sounds: + Scream: + collection: VulpkaninScreams + Gekker: #Floof + collection: VulpkaninGekker + Yap: #Floof + collection: VulpkaninYap + Yip: + collection: VulpkaninYips + Whine: + collection: VulpkaninWhines + Growl: + collection: VulpkaninGrowls + Snarl: + collection: VulpkaninSnarls + Bark: + collection: VulpkaninBarks # Foxes do in fact bark. + +- type: emoteSounds + id: Dog + params: + variation: 0.125 + sounds: + Scream: + collection: VulpkaninScreams + Yap: #Floof + collection: VulpkaninYap + Growl: + collection: VulpkaninGrowls + Snarl: + collection: VulpkaninSnarls + Bark: + collection: VulpkaninBarks + Whimper: # Floof - old whine renamed to whimper + collection: VulpkaninWhimpers + Howl: + collection: VulpkaninHowls diff --git a/Resources/Prototypes/_Floof/Voice/base_speech_emote_sounds.yml b/Resources/Prototypes/_Floof/Voice/base_speech_emote_sounds.yml new file mode 100644 index 00000000000..6291d122f2e --- /dev/null +++ b/Resources/Prototypes/_Floof/Voice/base_speech_emote_sounds.yml @@ -0,0 +1,56 @@ +# These are additions to upstream sounds. +# Upstream sound collections are set to inherit from these. +- type: emoteSounds + id: KitsuneFloofstation + abstract: true + sounds: + Whine: + collection: VulpkaninWhines + Whimper: + collection: VulpkaninWhimpers + Gekker: + collection: VulpkaninGekker + Yap: + collection: VulpkaninYap + Yip: + collection: VulpkaninYips + +- type: emoteSounds + id: VulpkaninFloofstation + abstract: true + sounds: + Scream: + collection: VulpkaninScreams + Whine: + collection: VulpkaninWhines + Whimper: + collection: VulpkaninWhimpers + Gekker: + collection: VulpkaninGekker + Yap: + collection: VulpkaninYap + Yip: + collection: VulpkaninYips + +- type: emoteSounds + id: HarpyFloofstation + abstract: true + sounds: + Coo: + collection: HarpyCoos + +- type: emoteSounds + id: ReptilianFloofstation + abstract: true + sounds: + Yip: + collection: ReptilianYip + +- type: emoteSounds + id: ResomiFloofstation + abstract: true + sounds: + Coo: + collection: HarpyCoos + Chirp: + collection: ResomiChirps diff --git a/Resources/Prototypes/_Impstation/SoundCollections/emotes.yml b/Resources/Prototypes/_Impstation/SoundCollections/emotes.yml index 6d18cab23c6..1cd136cf219 100644 --- a/Resources/Prototypes/_Impstation/SoundCollections/emotes.yml +++ b/Resources/Prototypes/_Impstation/SoundCollections/emotes.yml @@ -2,6 +2,7 @@ id: Blinks files: - /Audio/_Impstation/Effects/Emotes/blink.ogg + - /Audio/_Impstation/Effects/Emotes/blink2.ogg # Floofstation - type: soundCollection id: VoxHiss diff --git a/Resources/Prototypes/_RMC14/Voice/Avali/avali_emote_sounds.yml b/Resources/Prototypes/_RMC14/Voice/Avali/avali_emote_sounds.yml index 9b9ebc7b1eb..a94015e0ca7 100644 --- a/Resources/Prototypes/_RMC14/Voice/Avali/avali_emote_sounds.yml +++ b/Resources/Prototypes/_RMC14/Voice/Avali/avali_emote_sounds.yml @@ -10,6 +10,7 @@ - type: emoteSounds #parent: [RMCUnisexAvali, RMCMaleHuman] # DeltaV - no inheritence id: RMCMaleAvali + parent: [ResomiFloofstation] # Floofstation # Begin DeltaV Additions sounds: Scream: @@ -45,6 +46,7 @@ - type: emoteSounds #parent: [RMCUnisexAvali, RMCFemaleHuman] # DeltaV - no inheritence id: RMCFemaleAvali + parent: [ResomiFloofstation] # Floofstation # Begin DeltaV Additions sounds: Scream: