Skip to content

Commit

Permalink
Merge branch 'master' into Languages
Browse files Browse the repository at this point in the history
  • Loading branch information
FoxxoTrystan committed May 3, 2024
2 parents 875cf7b + b68ed3c commit 5201873
Show file tree
Hide file tree
Showing 3 changed files with 153 additions and 34 deletions.
18 changes: 9 additions & 9 deletions Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,25 @@
collection: HarpyGrowls
Purr:
collection: HarpyPurrs
Ring:
HarpyRing:
collection: HarpyRings
HonkHarpy:
HarpyHonk:
collection: HarpyHonks
Pew:
HarpyPew:
collection: HarpyPews
Bang:
HarpyBang:
collection: HarpyBangs
Beep:
HarpyBeep:
collection: HarpyBeeps
Rev:
HarpyRev:
collection: HarpyRevs
# Click:
# collection: HarpyClicks
Click:
collection: HarpyClicks
Chitter:
collection: HarpyChitter
Squeak:
collection: HarpySqueak
Caw:
HarpyCaw:
collection: HarpyCaws
Chirp:
collection: HarpyChirps
Expand Down
151 changes: 128 additions & 23 deletions Resources/Prototypes/DeltaV/Voice/speech_emotes.yml
Original file line number Diff line number Diff line change
@@ -1,138 +1,243 @@
# Harpy
- type: emote
id: HonkHarpy
id: HarpyHonk
category: Vocal
chatMessages: [honks.]
chatTriggers:
- honk
- honk.
- honk!
- honk?
- honks
- honks.
- honks!
- honks?
- honking
- honking.
- honking!
- honking?
- honked
- honked.
- honked!
- honked?

- type: emote
id: Ring
id: HarpyRing
category: Vocal
chatMessages: [rings.]
chatTriggers:
- ring
- ring.
- ring!
- ring?
- rings
- rings.
- rings!
- rings?
- ringing
- ringing.
- ringing!
- ringing?
- ringed
- ringed.
- ringed!
- ringed?
- rang
- rang.
- rang!
- rang?

- type: emote
id: Pew
id: HarpyPew
category: Vocal
chatMessages: [pews.]
chatTriggers:
- pew
- pew.
- pews.
- pew!
- pew?
- pews
- pews.
- pews!
- pews?
- pewpew
- pewpew.
- pewpew!
- pewpew?

- type: emote
id: Bang
id: HarpyBang
category: Vocal
chatMessages: [bangs.]
chatTriggers:
- bangs.
- bang
- bang.
- bang!
- bang?
- bangs
- bangs.
- bangs!
- bangs?
- banging
- banging.
- banging!
- banging?
- banged
- banged.
- banged!
- banged?

- type: emote
id: Beep
id: HarpyBeep
category: Vocal
chatMessages: [beeps.]
chatTriggers:
- beeps.
- beep
- beep.
- beep!
- beep?
- beeps
- beeps.
- beeps!
- beeps?
- beeping
- beeping.
- beeping!
- beeping?
- beeped
- beeped.
- beeped!
- beeped?

- type: emote
id: Rev
id: HarpyRev
category: Vocal
chatMessages: [revs.]
chatTriggers:
- revs.
- rev
- rev.
- rev!
- rev?
- revs
- revs.
- revs!
- revs?
- revving
- revving.
- revving!
- revving?
- revved

#- type: emote
# id: Click
# category: Vocal
# chatMessages: [clicks.]
# chatTriggers:
# - clicks.
# - click.
# - click!
# - clicking.
# - clicked.
- revved.
- revved!
- revved?

- type: emote
id: Caw
id: HarpyCaw
category: Vocal
chatMessages: [caws.]
chatTriggers:
- caws.
- caw
- caw.
- caw!
- caw?
- caws
- caws.
- caws!
- caws?
- cawing
- cawing.
- cawing!
- cawing?
- cawed
- cawed.
- cawed!
- cawed?

#Vulpkanin
- type: emote
id: Bark
category: Vocal
chatMessages: [barks.]
chatTriggers:
- bark
- bark.
- bark!
- bark?
- barks
- barks.
- barks!
- barks?
- barked
- barked.
- barked!
- barked?
- barking
- barking.
- barking!
- barking?

- type: emote
id: Snarl
category: Vocal
chatMessages: [snarls.]
chatTriggers:
- snarl
- snarl.
- snarl!
- snarl?
- snarls
- snarls.
- snarls!
- snarls?
- snarled
- snarled.
- snarled!
- snarled?
- snarling
- snarling.
- snarling!
- snarling?

- type: emote
id: Whine
category: Vocal
chatMessages: [whines.]
chatTriggers:
- whine
- whine.
- whine!
- whine?
- whines
- whines.
- whines!
- whines?
- whined
- whined.
- whined!
- whined?
- whining
- whining.
- whining!
- whining?

- type: emote
id: Howl
category: Vocal
chatMessages: [howls.]
chatTriggers:
- howl
- howl.
- howl!
- howl?
- howls
- howls.
- howls!
- howls?
- howling
- howling.
- howling!
- howling?
- howled
- howled.
- howling!
- howling?
18 changes: 16 additions & 2 deletions Resources/Prototypes/Voice/speech_emotes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,19 @@
- click
- click.
- click!
- click?
- clicks
- clicks.
- clicks!
- clicks?
- clicked
- clicked.
- clicked!
- clicked?
- clicking
- clicking.
- clicking!
- clicking?

# hand emotes
- type: emote
Expand Down Expand Up @@ -253,14 +263,18 @@
chatMessages: [chirps!]
chatTriggers:
- chirp
- chirp!
- chirp.
- chirp!
- chirp?
- chirps
- churps.
- chirps.
- chirps!
- chirps?
- chirped
- chirped.
- chirped!
- chirped?
- chirping
- chirping.
- chirping!
- chirping?

0 comments on commit 5201873

Please sign in to comment.