Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New reptile sounds #32064

Merged
merged 20 commits into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
c8c8876
Adds emotes to the Reptilian species: Tailthump, Hiss
Minemoder5000 Sep 11, 2024
2a42eb3
Adds emotes to the Reptilian species: Tailthump, Hiss
Minemoder5000 Sep 11, 2024
c9c2212
Merge branch 'reptile-sounds' of https://github.com/Minemoder5000/spa…
Minemoder5000 Sep 11, 2024
46b32e5
Added ReptilianBodyEmotes to speech_emote_sounds.yml, yada yada yada
ArtisticRoomba Sep 11, 2024
2cb77cc
Merge remote-tracking branch 'origin/reptile-sounds' into reptile-sounds
ArtisticRoomba Sep 11, 2024
ea9a452
added sound and changed volume
Minemoder5000 Sep 11, 2024
1d55ac8
Merge branch 'reptile-sounds' of https://github.com/Minemoder5000/spa…
Minemoder5000 Sep 11, 2024
61577bd
fix thingies
Minemoder5000 Sep 11, 2024
758e37e
fixed bug with reptilians not being able to do default emotes
ArtisticRoomba Sep 11, 2024
f73937c
Merge remote-tracking branch 'origin/reptile-sounds' into reptile-sounds
ArtisticRoomba Sep 11, 2024
cd5eb21
lowered the volume of the hiss and huff
Minemoder5000 Sep 11, 2024
8a6e6dc
reformat the yml
Minemoder5000 Sep 11, 2024
ebe59f3
Add sigh keywords to the huff
Minemoder5000 Sep 11, 2024
4ef966b
Undo changes to BuildChecker.csproj
Minemoder5000 Sep 11, 2024
02acc65
Add icons to the emotes
Minemoder5000 Sep 12, 2024
399fdec
Remove sigh triggers from the huff emote since it breaks normal sighing.
Minemoder5000 Sep 12, 2024
6a616c8
Remove the Huff and Hiss since i cant find good audio for it
Minemoder5000 Oct 12, 2024
fe3fee4
i forgor
Minemoder5000 Oct 12, 2024
0bf3aa2
Changed attribution
Minemoder5000 Oct 13, 2024
39d2e59
Credit Sarahon for the tailslap
Minemoder5000 Oct 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Resources/Audio/Voice/Reptilian/attritbutions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,8 @@
copyright: '"scream_lizard.ogg" by Skyrat-SS13'
license:
source: https://github.com/Skyrat-SS13/Skyrat-tg/pull/892

- files: [reptilian_tailthump.ogg]
copyright: "Taken from https://freesound.org/"
license: "CC0-1.0"
source: https://freesound.org/people/TylerAM/sounds/389665/
Binary file not shown.
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/chat/emotes.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ chat-emote-name-crying = Crying
chat-emote-name-squish = Squish
chat-emote-name-chitter = Chitter
chat-emote-name-squeak = Squeak
chat-emote-name-thump = Thump Tail
chat-emote-name-click = Click
chat-emote-name-clap = Clap
chat-emote-name-snap = Snap
Expand Down Expand Up @@ -40,6 +41,7 @@ chat-emote-msg-crying = cries.
chat-emote-msg-squish = squishes.
chat-emote-msg-chitter = chitters.
chat-emote-msg-squeak = squeaks.
chat-emote-msg-thump = thumps {POSS-ADJ($entity)} tail.
chat-emote-msg-click = clicks.
chat-emote-msg-clap = claps!
chat-emote-msg-snap = snaps {POSS-ADJ($entity)} fingers.
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1403,11 +1403,14 @@
- type: Speech
speechSounds: Lizard
speechVerb: Reptilian
allowedEmotes: ['Thump']
- type: Vocal
sounds:
Male: MaleReptilian
Female: FemaleReptilian
Unsexed: MaleReptilian
- type: BodyEmotes
soundsId: ReptilianBodyEmotes
- type: TypingIndicator
proto: lizard
- type: InteractionPopup
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,16 @@
- type: Speech
speechSounds: Lizard
speechVerb: Reptilian
allowedEmotes: ['Thump']
- type: TypingIndicator
proto: lizard
- type: Vocal
sounds:
Male: MaleReptilian
Female: FemaleReptilian
Unsexed: MaleReptilian
- type: BodyEmotes
soundsId: ReptilianBodyEmotes
- type: Damageable
damageContainer: Biological
damageModifierSet: Scale
Expand Down
16 changes: 16 additions & 0 deletions Resources/Prototypes/Voice/speech_emote_sounds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,22 @@
path: /Audio/Voice/Diona/diona_salute.ogg
params:
volume: -5

- type: emoteSounds
id: ReptilianBodyEmotes
sounds:
Thump:
path: /Audio/Voice/Reptilian/reptilian_tailthump.ogg
params:
variation: 0.125
Clap:
collection: Claps
Snap:
collection: Snaps
params:
volume: -6
Salute:
collection: Salutes

# mobs
- type: emoteSounds
Expand Down
25 changes: 25 additions & 0 deletions Resources/Prototypes/Voice/speech_emotes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,31 @@
- snapping fingers
- snapped fingers

- type: emote
id: Thump
name: chat-emote-name-thump
category: Hands
slarticodefast marked this conversation as resolved.
Show resolved Hide resolved
available: false
icon: Interface/Emotes/tailslap.png
whitelist:
components:
- Hands
blacklist:
components:
- BorgChassis
chatMessages: ["chat-emote-msg-thump"]
chatTriggers:
- thump
- thumps
- thumping
- thumped
- thump tail
- thumps tail
- thumps their tail
- thumps her tail
- thumps his tail
- thumps its tail

- type: emote
id: Salute
name: chat-emote-name-salute
Expand Down
Binary file added Resources/Textures/Interface/Emotes/tailslap.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading