diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 6ef3096495e4..5b36ec3262ed 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -595,10 +595,10 @@ state: blue - type: EmitSoundOnUse sound: - collection: ToySqueak + path: /Audio/Items/Toys/rawr.ogg - type: EmitSoundOnActivate sound: - collection: ToySqueak + path: /Audio/Items/Toys/rawr.ogg - type: EmitSoundOnCollide sound: collection: ToySqueak @@ -607,7 +607,7 @@ collection: ToyFall - type: EmitSoundOnTrigger sound: - collection: ToySqueak + path: /Audio/Items/Toys/rawr.ogg - type: MeleeWeapon wideAnimationRotation: 180 soundHit: diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Species/feroxi.yml b/Resources/Prototypes/_DV/Entities/Mobs/Species/feroxi.yml index c9d6768ce747..137cfe66a734 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Species/feroxi.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Species/feroxi.yml @@ -21,7 +21,7 @@ - type: Speech speechSounds: Tenor speechVerb: Feroxi - allowedEmotes: [ "Gnash" ] + allowedEmotes: [ "Gnash", "Rawr" ] - type: Vocal sounds: Male: MaleFeroxi diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml index 1ba49e4c6e1c..fc3d597d5456 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml @@ -120,7 +120,7 @@ - type: Speech speechSounds: Harpy speechVerb: Harpy - allowedEmotes: ['Squeak', 'Chitter', 'Click', 'Squish', 'Weh'] + allowedEmotes: ['Squeak', 'Chitter', 'Click', 'Squish', 'Weh', 'Rawr'] - type: Vocal sounds: Male: SoundsHarpyMale diff --git a/Resources/Prototypes/_DV/SoundCollections/feroxi.yml b/Resources/Prototypes/_DV/SoundCollections/feroxi.yml index 67e8c474b8c5..e967cad78f3f 100644 --- a/Resources/Prototypes/_DV/SoundCollections/feroxi.yml +++ b/Resources/Prototypes/_DV/SoundCollections/feroxi.yml @@ -2,3 +2,8 @@ id: FeroxiGnashes files: - /Audio/Effects/bite.ogg + +- type: soundCollection + id: FeroxiRawr + files: + - /Audio/Items/Toys/rawr.ogg diff --git a/Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml index c9639ba728b9..e0c6db009843 100644 --- a/Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml @@ -241,6 +241,8 @@ collection: Hew Gnash: collection: FeroxiGnashes + Rawr: + collection: FeroxiRawr # ShibaStation - hehe Gasp: collection: FemaleGasp DefaultDeathgasp: diff --git a/Resources/Prototypes/_DV/Voice/speech_emotes.yml b/Resources/Prototypes/_DV/Voice/speech_emotes.yml index 980c69eceaa1..4a2f0ef7b661 100644 --- a/Resources/Prototypes/_DV/Voice/speech_emotes.yml +++ b/Resources/Prototypes/_DV/Voice/speech_emotes.yml @@ -120,4 +120,27 @@ - gnashed their teeth - gnashed her teeth - gnashed his teeth - - gnashed its teeth \ No newline at end of file + - gnashed its teeth + +- type: emote + id: Rawr + name: delta-chat-emote-name-rawr + category: Vocal + available: false + whitelist: + components: + - Vocal + blacklist: + components: + - BorgChassis + chatMessages: [rawrs.] + chatTriggers: + - rawr + - rawrs + - rawred + - rawring + - grawr + - grawrs + - grawred + - grawring + diff --git a/Resources/Prototypes/_ShibaStation/Voice/harpy_emote_sounds.yml b/Resources/Prototypes/_ShibaStation/Voice/harpy_emote_sounds.yml index 9931d8ee8fd6..739e74ae1791 100644 --- a/Resources/Prototypes/_ShibaStation/Voice/harpy_emote_sounds.yml +++ b/Resources/Prototypes/_ShibaStation/Voice/harpy_emote_sounds.yml @@ -148,7 +148,7 @@ HarpyCaws: collection: HarpyCaws # Rawr - HarpyRawrs: + Rawr: collection: HarpyRawrs # Weh Weh: @@ -316,7 +316,7 @@ HarpyCaws: collection: HarpyCaws # Rawr - HarpyRawrs: + Rawr: collection: HarpyRawrs # Weh Weh: diff --git a/Resources/Prototypes/_ShibaStation/Voice/harpy_speech_emotes.yml b/Resources/Prototypes/_ShibaStation/Voice/harpy_speech_emotes.yml index af5a03fe6652..bfbaa5a6fb95 100644 --- a/Resources/Prototypes/_ShibaStation/Voice/harpy_speech_emotes.yml +++ b/Resources/Prototypes/_ShibaStation/Voice/harpy_speech_emotes.yml @@ -593,18 +593,3 @@ - caw - cawing - cawed - -# Rawrs -- type: emote - id: HarpyRawrs - name: Rawr - category: Vocal - whitelist: - tags: - - HarpyEmotes - chatMessages: [rawrs.] - chatTriggers: - - rawrs - - rawr - - rawring - - rawred