diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs index 0eff811fa4..34b3a1189b 100644 --- a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs +++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs @@ -42,7 +42,7 @@ namespace Content.Client.Options.UI.Tabs var id = 0; foreach (var layout in Enum.GetValues(typeof(ScreenType))) { - var name = layout.ToString()!; + var name = Loc.GetString($"ui-options-hud-type-{layout!.ToString()!.ToLower()}"); HudLayoutOption.AddItem(name, id); if (name == hudLayout) { diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs index 16ed57fb12..670d44e3c0 100644 --- a/Content.Server/Connection/ConnectionManager.cs +++ b/Content.Server/Connection/ConnectionManager.cs @@ -55,7 +55,6 @@ namespace Content.Server.Connection private ISawmill _sawmill = default!; //WD-EDIT - [Dependency] private readonly GameTicker _gameTicker = default!; [Dependency] private readonly SponsorsManager _sponsorsManager = default!; //WD-EDIT @@ -268,8 +267,9 @@ namespace Content.Server.Connection var adminData = await _dbManager.GetAdminDataForAsync(userId); var havePriorityJoin = _sponsorsManager.TryGetInfo(userId, out var sponsorData) && sponsorData.HavePriorityJoin; - var wasInGame = _gameTicker.PlayerGameStatuses.TryGetValue(userId, out var status) && - status == PlayerGameStatus.JoinedGame; + var wasInGame = EntitySystem.TryGet(out var gameTicker) && + gameTicker.PlayerGameStatuses.TryGetValue(userId, out var status) && + status == PlayerGameStatus.JoinedGame; return adminData != null || havePriorityJoin || wasInGame; diff --git a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl index baf61827a6..9afe0d4e72 100644 --- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl +++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl @@ -260,6 +260,9 @@ ui-options-net-pvs-leave-tooltip = This limits the rate at which the client will stuttering when walking around, but could occasionally lead to mispredicts and other issues. +ui-options-hud-type-default = Default +ui-options-hud-type-separated = Separated + ## Toggle window console command cmd-options-desc = Opens options menu, optionally with a specific tab selected. cmd-options-help = Usage: options [tab] diff --git a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl index d07cacc339..8c6878f397 100644 --- a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl +++ b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl @@ -46,7 +46,9 @@ ui-options-show-looc-on-head = Показывать LOOC-чат над голо ui-options-fancy-speech = Показывать имена в облачках с текстом ui-options-fancy-name-background = Добавить фон облачкам с текстом ui-options-enable-color-name = Окрашивать имена в чате +ui-options-colorblind-friendly = Режим для дальтоников ui-options-reduced-motion = Снижение интенсивности визуальных эффектов +ui-options-chat-window-opacity = Полупрозрачность окна чата ui-options-screen-shake-intensity = Интенсивность дрожания экрана ui-options-screen-shake-percent = { TOSTRING($intensity, "P0") } ui-options-vsync = Вертикальная синхронизация @@ -263,6 +265,9 @@ ui-options-net-pvs-leave-tooltip = уменьшить "захлебывания" при ходьбе, но иногда может привести к неправильным предугадываниям и другим проблемам. +ui-options-hud-type-default = Компактный +ui-options-hud-type-separated = Обычный + ## Toggle window console command cmd-options-desc = Открывает меню опций, опционально с конкретно выбранной вкладкой. cmd-options-help = Использование: options [tab] diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/evaprisoner.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/evaprisoner.rsi/meta.json index 7751d91f5e..6fe527ec0b 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/evaprisoner.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/evaprisoner.rsi/meta.json @@ -25,14 +25,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "open-inhand-left", - "directions": 4 - }, - { - "name": "open-inhand-right", - "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Misc/books.rsi/meta.json b/Resources/Textures/Objects/Misc/books.rsi/meta.json index be4ef5f04c..7288accada 100644 --- a/Resources/Textures/Objects/Misc/books.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/books.rsi/meta.json @@ -169,9 +169,6 @@ { "name": "summon_book" }, - { - "name": "book_science" - }, { "name": "icon_medical_cross" },