diff --git a/Resources/Audio/Voice/Reptilian/attritbutions.yml b/Resources/Audio/Voice/Reptilian/attritbutions.yml index 7e8b2a0ce39..7fa86b2ebfc 100644 --- a/Resources/Audio/Voice/Reptilian/attritbutions.yml +++ b/Resources/Audio/Voice/Reptilian/attritbutions.yml @@ -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 index 00000000000..e4bf25f7b8d Binary files /dev/null and b/Resources/Audio/Voice/Reptilian/reptilian_tailthump.ogg differ diff --git a/Resources/Locale/en-US/chat/emotes.ftl b/Resources/Locale/en-US/chat/emotes.ftl index 4e26752c4b4..998ed4d4e10 100644 --- a/Resources/Locale/en-US/chat/emotes.ftl +++ b/Resources/Locale/en-US/chat/emotes.ftl @@ -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 @@ -41,6 +42,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. diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 15274abf986..4826d0ea8b7 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1427,11 +1427,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 diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml index b27b4c6029d..bdcd94ce2e1 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml @@ -29,6 +29,7 @@ - type: Speech speechSounds: Lizard speechVerb: Reptilian + allowedEmotes: ['Thump'] - type: TypingIndicator proto: lizard - type: Vocal @@ -36,6 +37,8 @@ Male: MaleReptilian Female: FemaleReptilian Unsexed: MaleReptilian + - type: BodyEmotes + soundsId: ReptilianBodyEmotes - type: Damageable damageContainer: Biological damageModifierSet: Scale diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml index 717460ee18b..722f3486211 100644 --- a/Resources/Prototypes/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml @@ -476,6 +476,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 diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index d4968996cdd..fc4df09d9f6 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -196,6 +196,31 @@ - snaps its fingers - snaps its' 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 diff --git a/Resources/Textures/Interface/Emotes/attributions.yml b/Resources/Textures/Interface/Emotes/attributions.yml index 125651e4194..57a4a73b7e9 100644 --- a/Resources/Textures/Interface/Emotes/attributions.yml +++ b/Resources/Textures/Interface/Emotes/attributions.yml @@ -53,42 +53,47 @@ - files: ["deathgasp.png"] license: "CC-BY-SA-3.0" - copyright: "Modified from scream.png by TyAshley (AllenTheGreat)" - source: "https://github.com/TyAshley" + copyright: "Created by Sarahon" + source: "https://github.com/Sarahon" - files: ["honk.png"] license: "CC-BY-SA-3.0" - copyright: "Modified from existing bikehorn texture (icon.png) by TyAshley (AllenTheGreat)" + copyright: "Modified from existing bikehorn texture (icon.png) by TyAshley (AllenTheGreat) & Sarahon" source: "https://github.com/TyAshley" - files: ["laugh.png"] license: "CC-BY-SA-3.0" - copyright: "Modified from scream.png by TyAshley (AllenTheGreat)" - source: "https://github.com/TyAshley" + copyright: "Created by Sarahon" + source: "https://github.com/Sarahon" - files: ["ping.png"] license: "CC-BY-SA-3.0" - copyright: "Created by TyAshley (AllenTheGreat) at commit 7f6c7cd82943dbc9a1fe8a79d6a924ac600b3fdb" + copyright: "Created by TyAshley (AllenTheGreat) at commit 7f6c7cd82943dbc9a1fe8a79d6a924ac600b3fdb. Modified by Sarahon" source: "https://github.com/TyAshley" - files: ["salute.png"] license: "CC-BY-SA-3.0" - copyright: "Modified from scream.png by TyAshley (AllenTheGreat)" - source: "https://github.com/TyAshley" + copyright: "Created by Sarahon" + source: "https://github.com/Sarahon" + +- files: ["scream.png"] + license: "CC-BY-SA-3.0" + copyright: "Created by lzk228(discord 455630609641897984), based on sprite by Sarahon" + source: "https://github.com/lzk228" - files: ["sigh.png"] license: "CC-BY-SA-3.0" - copyright: "Created by TyAshley (AllenTheGreat) at commit 7f6c7cd82943dbc9a1fe8a79d6a924ac600b3fdb" - source: "https://github.com/TyAshley" + copyright: "Created by Sarahon" + source: "https://github.com/Sarahon" - files: ["snap.png"] license: "CC-BY-SA-3.0" - copyright: "Created by TyAshley (AllenTheGreat) at commit 7f6c7cd82943dbc9a1fe8a79d6a924ac600b3fdb" - source: "https://github.com/TyAshley" + copyright: "Created by Sarahon" + source: "https://github.com/Sarahon" - files: ["squeak.png"] license: "CC-BY-SA-3.0" - copyright: "Modified from mouse-0.png by TyAshley (AllenTheGreat)" + copyright: "Modified from mouse-0.png by TyAshley (AllenTheGreat) & Sarahon" source: "https://github.com/TyAshley" - files: ["squish.png"] @@ -115,3 +120,8 @@ license: "CC-BY-SA-3.0" copyright: "Created by TyAshley (AllenTheGreat) at commit 7f6c7cd82943dbc9a1fe8a79d6a924ac600b3fdb" source: "https://github.com/TyAshley" + +- 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 index 00000000000..75405a67bab Binary files /dev/null and b/Resources/Textures/Interface/Emotes/tailslap.png differ