Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

\ (#352)

Browse Source 
* первый был

* Update drink-component.ftl
This commit is contained in:
rhailrake
2023-08-31 12:57:46 +06:00
committed by Aviu00
parent b8db546c33
commit fb60b31836
5 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Popups/PopupSystem.cs
View File

@@ -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);
}
}

17
Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
View File

@@ -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<MetaDataComponent>(args.User, out var metaDataComponentUser) && TryComp<MetaDataComponent>(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}");

18
Content.Server/White/Other/ExamineSystem/ExamineSystem.cs
View File

@@ -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<string, string>
{
{ "head", "head-" },
@@ -91,19 +98,12 @@ namespace Content.Server.White.Other.ExamineSystem
if (_entityManager.TryGetComponent<MetaDataComponent>(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)

2
Resources/Locale/ru-RU/chat/managers/chat-manager.ftl
View File

@@ -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]

2
Resources/Locale/ru-RU/nutrition/components/drink-component.ftl
View File

@@ -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 }