]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
New reptile sounds (#32064)
authorMinemoder5000 <minemoder50000@gmail.com>
Wed, 16 Oct 2024 10:04:55 +0000 (03:04 -0700)
committerGitHub <noreply@github.com>
Wed, 16 Oct 2024 10:04:55 +0000 (12:04 +0200)
* Adds emotes to the Reptilian species: Tailthump, Hiss
Todo: Huff

* Adds emotes to the Reptilian species: Tailthump, Hiss
Todo: Huff

* Added ReptilianBodyEmotes to speech_emote_sounds.yml, yada yada yada

* added sound and changed volume

* fix thingies

* fixed bug with reptilians not being able to do default emotes

* lowered the volume of the hiss and huff

* reformat the yml

* Add sigh keywords to the huff

* Undo changes to BuildChecker.csproj

* Add icons to the emotes

* Remove sigh triggers from the huff emote since it breaks normal sighing.

* Remove the Huff and Hiss since i cant find good audio for it

* i forgor

* Changed attribution

* Credit Sarahon for the tailslap

---------

Co-authored-by: nicho <nicholasnewsom577@gmail.com>
Resources/Audio/Voice/Reptilian/attritbutions.yml
Resources/Audio/Voice/Reptilian/reptilian_tailthump.ogg [new file with mode: 0644]
Resources/Locale/en-US/chat/emotes.ftl
Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
Resources/Prototypes/Voice/speech_emote_sounds.yml
Resources/Prototypes/Voice/speech_emotes.yml
Resources/Textures/Interface/Emotes/attributions.yml
Resources/Textures/Interface/Emotes/tailslap.png [new file with mode: 0644]

index 7e8b2a0ce39bbeaefd66f0a5470031f3b1c16061..7fa86b2ebfcbd908f8cb648f6a73c5d30c6d69d8 100644 (file)
@@ -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/
\ No newline at end of file
diff --git a/Resources/Audio/Voice/Reptilian/reptilian_tailthump.ogg b/Resources/Audio/Voice/Reptilian/reptilian_tailthump.ogg
new file mode 100644 (file)
index 0000000..e4bf25f
Binary files /dev/null and b/Resources/Audio/Voice/Reptilian/reptilian_tailthump.ogg differ
index cccb33a1f17b4eed672c651f48f0a77ad74dacb2..8c74acafca2422f40b429f74cc3994ddb5563cbd 100644 (file)
@@ -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
@@ -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.
index d4f2ecd30aef204ab887bb76c060f8552551963b..6ae711a39dd5f5f73dbf59db4380cb7022e4a052 100644 (file)
   - 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
index c023dc1c25243019f0b809dc59c1f58685f3dd21..f172f631c1def3aeb4529d52f309445df4afef09 100644 (file)
@@ -30,6 +30,7 @@
   - type: Speech
     speechSounds: Lizard
     speechVerb: Reptilian
+    allowedEmotes: ['Thump']
   - type: TypingIndicator
     proto: lizard
   - type: Vocal
@@ -37,6 +38,8 @@
       Male: MaleReptilian
       Female: FemaleReptilian
       Unsexed: MaleReptilian
+  - type: BodyEmotes
+    soundsId: ReptilianBodyEmotes
   - type: Damageable
     damageContainer: Biological
     damageModifierSet: Scale
index 8e1f50df395018774dca14c659c5e64ae41d44be..5eda800244f76f23f2f82cd6c9e732b8f5346c5b 100644 (file)
       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
index c39bf1f37919dedbabcb25ce78d59c7dd7d5bfc8..6cd5bcacba447714ebb9615cd58fc490d2dd5639 100644 (file)
     - snapping fingers
     - snapped fingers
 
+- type: emote
+  id: Thump
+  name: chat-emote-name-thump
+  category: Hands
+  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
index 4cb2faa076e794747d3462f7fc8d9bf17f56f14f..55cb19a9d7cf5391369c03ff345b0274453a388f 100644 (file)
   license: "CC-BY-SA-3.0"
   copyright: "Created by Sarahon"
   source: "https://github.com/Sarahon"
+
+- files: ["tailslap.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by Sarahon"
+  source: "https://github.com/Sarahon"
diff --git a/Resources/Textures/Interface/Emotes/tailslap.png b/Resources/Textures/Interface/Emotes/tailslap.png
new file mode 100644 (file)
index 0000000..75405a6
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/tailslap.png differ