From eeecf71790d42bb241cf54263be4438907e314fb Mon Sep 17 00:00:00 2001 From: Remuchi Date: Sat, 27 Jan 2024 20:33:56 +0700 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D1=82=D0=B5=D1=81=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.IntegrationTests/Tests/Buckle/BuckleTest.cs | 1 - Content.Shared.Database/LogType.cs | 9 ++++++--- Resources/Prototypes/emotes.yml | 5 ++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs index 37d352bd65..739bd54906 100644 --- a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs +++ b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs @@ -33,7 +33,6 @@ namespace Content.IntegrationTests.Tests.Buckle - type: Body prototype: Human - type: StandingState - - type: InputMover - type: entity name: {StrapDummyId} diff --git a/Content.Shared.Database/LogType.cs b/Content.Shared.Database/LogType.cs index a9c361cfd2..988346892c 100644 --- a/Content.Shared.Database/LogType.cs +++ b/Content.Shared.Database/LogType.cs @@ -9,9 +9,6 @@ public enum LogType Healed = 3, Slip = 4, EventAnnounced = 5, - AspectAnnounced = 86, - AspectStarted = 87, - AspectStopped = 88, EventStarted = 6, EventRan = 16, EventStopped = 7, @@ -98,4 +95,10 @@ public enum LogType /// ChatRateLimited = 87, AtmosTemperatureChanged = 88, + + // WD EDIT + AspectAnnounced = 89, + AspectStarted = 90, + AspectStopped = 91, + // WD EDIT } diff --git a/Resources/Prototypes/emotes.yml b/Resources/Prototypes/emotes.yml index a19ac79310..21bf93e464 100644 --- a/Resources/Prototypes/emotes.yml +++ b/Resources/Prototypes/emotes.yml @@ -62,9 +62,8 @@ chatMessages: [щелкает пальцами] chatTriggers: - щелкает пальцами - - щелкает - - щелкнул - - щелкнула + - щелкнул пальцами + - щелкнула пальцами - щелкунл пальцами - щелкунла пальцами allowMenu: true