Merge remote-tracking branch 'upstream/stable' into ed-29-10-2024-upstream
# Conflicts: # Content.Server/Chat/Managers/ChatSanitizationManager.cs # Content.Server/Temperature/Systems/TemperatureSystem.cs # Content.Shared/Localizations/ContentLocalizationManager.cs
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -312,6 +312,31 @@
|
||||
- щёлкнула пальцами
|
||||
# CP14-RU-Localization-End
|
||||
|
||||
- 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
|
||||
|
||||
Reference in New Issue
Block a user