From 39bb452aae5617f970a24c0108cff540c089d52e Mon Sep 17 00:00:00 2001 From: iertis Date: Fri, 15 Nov 2024 17:57:53 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9A=D1=83=D1=87=D0=B0=20=D0=BC=D0=B5=D0=BB?= =?UTF-8?q?=D0=BA=D0=B8=D1=85=20=D1=84=D0=B8=D0=BA=D1=81=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Chat/Managers/ChatSanitizationManager.cs | 1 - .../en-US/_strings/_sunrise/chat/emotes.ftl | 1 + .../Inventories/atmosdrobe.yml | 1 + Resources/Prototypes/Traits/speech.yml | 2 ++ Resources/Prototypes/Voice/speech_emotes.yml | 3 +++ .../Entities/Mobs/Species/vulpkanin.yml | 2 +- .../Specific/Engineering/material_bag.yml | 4 ++++ .../_Sunrise/Voice/speech_emote_sounds.yml | 4 ++++ .../_Sunrise/Voice/speech_emotes.yml | 21 +++++++++++++++++++ 9 files changed, 37 insertions(+), 2 deletions(-) diff --git a/Content.Server/Chat/Managers/ChatSanitizationManager.cs b/Content.Server/Chat/Managers/ChatSanitizationManager.cs index 34889ae90e2..45d6edcfc76 100644 --- a/Content.Server/Chat/Managers/ChatSanitizationManager.cs +++ b/Content.Server/Chat/Managers/ChatSanitizationManager.cs @@ -26,7 +26,6 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager { "рофл", "chatsan-laughs" }, { "яхз", "chatsan-shrugs" }, { ":0", "chatsan-surprised" }, - { ":р", "chatsan-stick-out-tongue" }, // cyrillic р { "кек", "chatsan-laughs" }, { "T_T", "chatsan-cries" }, { "Т_Т", "chatsan-cries" }, // cyrillic T diff --git a/Resources/Locale/en-US/_strings/_sunrise/chat/emotes.ftl b/Resources/Locale/en-US/_strings/_sunrise/chat/emotes.ftl index d1973d7b320..d9a0de77d59 100644 --- a/Resources/Locale/en-US/_strings/_sunrise/chat/emotes.ftl +++ b/Resources/Locale/en-US/_strings/_sunrise/chat/emotes.ftl @@ -9,3 +9,4 @@ chat-emote-name-meows = Мяукать chat-emote-name-vomit = Тошнота chat-emote-name-headache = Головная боль chat-emote-name-insult = Инсульт +chat-emote-name-whines = Скулить diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml index 72864ba851f..66494a3da8d 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml @@ -4,6 +4,7 @@ ClothingBackpackDuffelAtmospherics: 2 ClothingBackpackSatchelAtmospherics: 2 ClothingBackpackAtmospherics: 2 + MaterialBag: 3 # Sunrise-edit ClothingUniformJumpsuitAtmos: 3 ClothingUniformJumpskirtAtmos: 3 ClothingUniformJumpsuitAtmosCasual: 3 diff --git a/Resources/Prototypes/Traits/speech.yml b/Resources/Prototypes/Traits/speech.yml index 133bee67def..f9d4d430cd8 100644 --- a/Resources/Prototypes/Traits/speech.yml +++ b/Resources/Prototypes/Traits/speech.yml @@ -10,6 +10,8 @@ - type: Accentless removes: - type: OwOAccent # Sunrise-traits + - type: VulpaAccent # Sunrise-traits + - type: TajaranAccent # Sunrise-traits - type: LizardAccent - type: MothAccent - type: ReplacementAccent diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index 90cad270a8e..fe2e344041a 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -365,6 +365,9 @@ - gasp - gasps - gasped +#Sunrise-start + - задыхается +#Sunrise-end - type: emote id: DefaultDeathgasp diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/vulpkanin.yml index 86dd10445bc..b7a251cd71c 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/vulpkanin.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/vulpkanin.yml @@ -8,7 +8,7 @@ - type: Absorbable - type: Speech speechVerb: Vulpkanin - allowedEmotes: ['Growl', 'Bark', 'Howl'] + allowedEmotes: ['Growl', 'Bark', 'Howl', 'Whines'] - type: HumanoidAppearance species: Vulpkanin - type: Icon diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Engineering/material_bag.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Engineering/material_bag.yml index c0d33d4d146..ffa97d13b91 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Engineering/material_bag.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Engineering/material_bag.yml @@ -29,6 +29,10 @@ - RawMaterial - Tile - PowerCell + - PowerCellSmall + - Ingot + - DoorElectronics + - AirAlarmElectronics - CapacitorStockPart - MicroManipulatorStockPart - MatterBinStockPart diff --git a/Resources/Prototypes/_Sunrise/Voice/speech_emote_sounds.yml b/Resources/Prototypes/_Sunrise/Voice/speech_emote_sounds.yml index 6ec79fdf025..c2d6c74e5ff 100644 --- a/Resources/Prototypes/_Sunrise/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/_Sunrise/Voice/speech_emote_sounds.yml @@ -11,6 +11,8 @@ collection: MaleSneezes Cough: collection: MaleCoughs + Sigh: + collection: MaleSigh Crying: collection: MaleCry Whistle: @@ -39,6 +41,8 @@ collection: FemaleSneezes Cough: collection: FemaleCoughs + Sigh: + collection: FemaleSigh Crying: collection: FemaleCry Whistle: diff --git a/Resources/Prototypes/_Sunrise/Voice/speech_emotes.yml b/Resources/Prototypes/_Sunrise/Voice/speech_emotes.yml index 421f37488c8..61aefdf73d5 100644 --- a/Resources/Prototypes/_Sunrise/Voice/speech_emotes.yml +++ b/Resources/Prototypes/_Sunrise/Voice/speech_emotes.yml @@ -207,3 +207,24 @@ name: chat-emote-name-insult category: Vocal chatMessages: [инсульт] + +- type: emote + id: Whines + name: chat-emote-name-whines + category: Vocal + available: false + icon: Interface/Emotes/cry.png + whitelist: + components: + - Vocal + blacklist: + components: + - BorgChassis + chatMessages: ["chat-emote-msg-whines"] + chatTriggers: + - скулит. + - скулит! + - скулить. + - скулить! + - скулит + - скулить