diff --git a/Content.Client/Popups/PopupSystem.cs b/Content.Client/Popups/PopupSystem.cs index 46ec696dd5..7090b81f4d 100644 --- a/Content.Client/Popups/PopupSystem.cs +++ b/Content.Client/Popups/PopupSystem.cs @@ -84,7 +84,7 @@ namespace Content.Client.Popups if (isLogging) { - _chatManager.SendMessage($"notice {message}", ChatSelectChannel.Console); + _chatManager.SendMessage($"notice [font size=10][color=#aeabc4]{message}[/color][/font]", ChatSelectChannel.Console); } } diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs index f75dd93e09..86c5de6e1c 100644 --- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs @@ -380,11 +380,18 @@ public sealed class DrinkSystem : EntitySystem } else { - _popup.PopupEntity( - Loc.GetString("drink-component-try-use-drink-success-slurp-taste", ("flavors", flavors)), args.User, - args.User); - _popup.PopupEntity( - Loc.GetString("drink-component-try-use-drink-success-slurp"), args.User, Filter.PvsExcept(args.User), true); + + if (TryComp(args.User, out var metaDataComponentUser) && TryComp(args.Used, out var metaDataComponentUsed)) + { + var userName = metaDataComponentUser.EntityName; + var used = metaDataComponentUsed.EntityName; + + _popup.PopupEntity( + Loc.GetString("drink-component-try-use-drink-success-slurp-taste", ("flavors", flavors)), args.User, + args.User); + + _popup.PopupEntity($"{userName} делает глоток используя {used}", args.User, Filter.PvsExcept(args.User), true); + } // log successful voluntary drinking _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(args.User):target} drank {ToPrettyString(entity.Owner):drink}"); diff --git a/Content.Server/White/Other/ExamineSystem/ExamineSystem.cs b/Content.Server/White/Other/ExamineSystem/ExamineSystem.cs index f947d34d0d..8ae2784e94 100644 --- a/Content.Server/White/Other/ExamineSystem/ExamineSystem.cs +++ b/Content.Server/White/Other/ExamineSystem/ExamineSystem.cs @@ -33,7 +33,7 @@ namespace Content.Server.White.Other.ExamineSystem if (should) { - _consoleHost.RemoteExecuteCommand(actorComponent.PlayerSession, $"notice {message}"); + _consoleHost.RemoteExecuteCommand(actorComponent.PlayerSession, $"notice [font size=10][color=#aeabc4]{message}[/color][/font]"); } } @@ -47,6 +47,13 @@ namespace Content.Server.White.Other.ExamineSystem infoLines.Add($"Это же [bold]{metaDataComponent.EntityName}[/bold]!"); } + var idInfoString = GetInfo(uid); + if (!string.IsNullOrEmpty(idInfoString)) + { + infoLines.Add(idInfoString); + args.PushMarkup(idInfoString); + } + var slotLabels = new Dictionary { { "head", "head-" }, @@ -91,19 +98,12 @@ namespace Content.Server.White.Other.ExamineSystem if (_entityManager.TryGetComponent(slotEntity, out var metaData)) { - var item = $"[color=silver]{Loc.GetString(slotLabel)} [/color][font size=11][bold][color=lightgray]{metaData.EntityName}[/color][/bold][/font]."; + var item = $"{Loc.GetString(slotLabel)} [bold]{metaData.EntityName}[/bold]."; args.PushMarkup(item); infoLines.Add(item); } } - var idInfoString = GetInfo(uid); - if (!string.IsNullOrEmpty(idInfoString)) - { - infoLines.Add(idInfoString); - args.PushMarkup(idInfoString); - } - var combinedInfo = string.Join("\n", infoLines); if (actorComponent != null) diff --git a/Resources/Locale/ru-RU/chat/managers/chat-manager.ftl b/Resources/Locale/ru-RU/chat/managers/chat-manager.ftl index 2335c42c22..63469fca73 100644 --- a/Resources/Locale/ru-RU/chat/managers/chat-manager.ftl +++ b/Resources/Locale/ru-RU/chat/managers/chat-manager.ftl @@ -22,7 +22,7 @@ chat-manager-server-wrap-message = СЕРВЕР: { $message } chat-manager-sender-announcement-wrap-message = [font size=14][bold]Объявление {$sender}:[/font][font size=12] {$message}[/bold][/font] -chat-manager-entity-say-wrap-message = [BubbleHeader][bold]{$entityName}[/bold][/BubbleHeader] {$verb}, [font={$fontType} size={$fontSize}]"[BubbleContent]{$message}[/BubbleContent]"[/font] +chat-manager-entity-say-wrap-message = [BubbleHeader][bold]{$entityName}[/bold][/BubbleHeader] [italic]{$verb}[/italic], [font={$fontType} size={$fontSize}]"[BubbleContent]{$message}[/BubbleContent]"[/font] chat-manager-entity-say-bold-wrap-message = [BubbleHeader][bold]{$entityName}[/bold][/BubbleHeader] {$verb}, [font={$fontType} size={$fontSize}]"[BubbleContent][bold]{$message}[/bold][/BubbleContent]"[/font] chat-manager-entity-whisper-wrap-message = [font size=11][italic][BubbleHeader]{$entityName}[/BubbleHeader] шепчет,"[BubbleContent]{$message}[/BubbleContent]"[/italic][/font] diff --git a/Resources/Locale/ru-RU/nutrition/components/drink-component.ftl b/Resources/Locale/ru-RU/nutrition/components/drink-component.ftl index f1a2855499..1c38e59ae4 100644 --- a/Resources/Locale/ru-RU/nutrition/components/drink-component.ftl +++ b/Resources/Locale/ru-RU/nutrition/components/drink-component.ftl @@ -15,7 +15,7 @@ drink-component-try-use-drink-had-enough = Вы не можете выпить drink-component-try-use-drink-cannot-drink-other = Они не могут ничего пить! drink-component-try-use-drink-had-enough-other = Они не могут выпить больше! drink-component-try-use-drink-success-slurp = Сёрб -drink-component-try-use-drink-success-slurp-taste = Сёрб. { $flavors } +drink-component-try-use-drink-success-slurp-taste = { $flavors } drink-component-force-feed = { CAPITALIZE($user) } пытается вас чем-то напоить! drink-component-force-feed-success = { CAPITALIZE($user) } вас чем-то напоил! { $flavors } drink-component-force-feed-success-user = Вы успешно напоили { $target }