From 32747f5cbe6a4b4e5185fe31a9aaafddbb041e4f Mon Sep 17 00:00:00 2001 From: keslik Date: Tue, 7 Jan 2025 12:28:11 +0300 Subject: [PATCH 1/4] Tweak: size --- Resources/Prototypes/_White/Ghosts/custom_ghosts.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml b/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml index 558ae3349d..0e4aa303af 100644 --- a/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml +++ b/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml @@ -501,3 +501,4 @@ alpha: 0.9 ghostName: Шарки ghostDescription: Буль-буль. + size: 0.7, 0.7 From 1d89533709f2d191994ec55d81e09d11a4ab57fd Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Tue, 7 Jan 2025 13:12:21 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=A1=D0=9B=D0=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Body/Systems/RespiratorSystem.cs | 37 ++++++++++++++----- Resources/Locale/ru-RU/_white/cpr/cpr.ftl | 2 + 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs index 20945ca3d7..231aba96e2 100644 --- a/Content.Server/Body/Systems/RespiratorSystem.cs +++ b/Content.Server/Body/Systems/RespiratorSystem.cs @@ -301,22 +301,41 @@ public sealed class RespiratorSystem : EntitySystem if (targetState.CurrentState != MobState.Critical) return false; + if (_inventorySystem.TryGetSlotEntity(user, "head", out var helmetUidUser) && + EntityManager.TryGetComponent(helmetUidUser, out var blockerHelmetUser) && + blockerHelmetUser.Enabled) + { + _popupSystem.PopupEntity(Loc.GetString("cpr-helmet-block-user"), user, user); + return false; + } + + if (_inventorySystem.TryGetSlotEntity(target, "head", out var helmetUidTarget) && + EntityManager.TryGetComponent(helmetUidTarget, out var blockerHelmetTarget) && + blockerHelmetTarget.Enabled) + { + _popupSystem.PopupEntity( + Loc.GetString("cpr-helmet-block-target", ("target", Identity.Entity(target, EntityManager))), target, user); + return false; + } + if (_inventorySystem.TryGetSlotEntity(user, "mask", out var maskUidUser) && - EntityManager.TryGetComponent(maskUidUser, out var blockerUser) && - blockerUser.Enabled) + EntityManager.TryGetComponent(maskUidUser, out var blockerMaskUser) && + blockerMaskUser.Enabled) { _popupSystem.PopupEntity(Loc.GetString("cpr-mask-block-user"), user, user); return false; } - if (!_inventorySystem.TryGetSlotEntity(target, "mask", out var maskUidTarget) || - !EntityManager.TryGetComponent(maskUidTarget, out var blockerTarget) || - !blockerTarget.Enabled) - return true; + if (_inventorySystem.TryGetSlotEntity(target, "mask", out var maskUidTarget) && + EntityManager.TryGetComponent(maskUidTarget, out var blockerMaskTarget) && + blockerMaskTarget.Enabled) + { + _popupSystem.PopupEntity( + Loc.GetString("cpr-mask-block-target", ("target", Identity.Entity(target, EntityManager))), target, user); + return false; + } - _popupSystem.PopupEntity( - Loc.GetString("cpr-mask-block-target", ("target", Identity.Entity(target, EntityManager))), target, user); - return false; + return true; } private void DoCPR(EntityUid target, RespiratorComponent comp, EntityUid user) diff --git a/Resources/Locale/ru-RU/_white/cpr/cpr.ftl b/Resources/Locale/ru-RU/_white/cpr/cpr.ftl index a0f3489c61..1c063e7319 100644 --- a/Resources/Locale/ru-RU/_white/cpr/cpr.ftl +++ b/Resources/Locale/ru-RU/_white/cpr/cpr.ftl @@ -1,4 +1,6 @@ cpr-too-late = { CAPITALIZE($target) } мертво +cpr-helmet-block-user = Не могу сделать СЛР в шлеме +cpr-helmet-block-target = Сначала нужно снять шлем с { $target } cpr-mask-block-user = Не могу сделать СЛР в маске cpr-mask-block-target = Сначала нужно снять маску с { $target } cpr-failed = Не удалось произвести СЛР From 44d41cab68b44790c62f4fb8c59a70ba3267c7f9 Mon Sep 17 00:00:00 2001 From: RavmorganButOnCocaine Date: Tue, 7 Jan 2025 19:15:59 +0000 Subject: [PATCH 3/4] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index d3c2469178..8d28c66abe 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -1,16 +1,4 @@ Entries: -- author: Aviu - changes: - - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u043C\u043E\u0436\u043D\u043E\ - \ \u043F\u0440\u0435\u0432\u0440\u0430\u0442\u0438\u0442\u044C \u0432\u043E\u0434\ - \u0443 \u0432 \u0441\u0432\u044F\u0442\u0443\u044E \u0432\u043E\u0434\u0443\ - \ \u0438\u043B\u0438 \u043A\u0440\u043E\u0432\u044C \u0432 \u0432\u0438\u043D\ - \u043E \u0432 \u043B\u044E\u0431\u043E\u043C \u043A\u043E\u043D\u0442\u0435\u0439\ - \u043D\u0435\u0440\u0435." - type: Fix - id: 154 - time: '2024-02-23T16:06:36.0000000+00:00' - url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/105 - author: Remuchi changes: - message: "\u0424\u0438\u043A\u0441 \u0432\u0441\u043A\u0440\u044B\u0442\u0438\u044F\ @@ -8912,3 +8900,14 @@ id: 653 time: '2025-01-06T21:03:52.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/874 +- author: BIG_Zi_348 + changes: + - message: "\u0428\u043B\u0435\u043C\u044B \u0442\u0435\u043F\u0435\u0440\u044C\ + \ \u043C\u043E\u0433\u0443\u0442 \u0431\u043B\u043E\u043A\u0438\u0440\u043E\u0432\ + \u0430\u0442\u044C \u0443\u0441\u043B\u043E\u0432\u0438\u044F \u0434\u043B\u044F\ + \ \u043F\u0440\u043E\u0432\u0435\u0434\u0435\u043D\u0438\u044F \u0421\u041B\u0420\ + ." + type: Tweak + id: 654 + time: '2025-01-07T19:14:55.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/876 From 42109149c235ab6d83cb135dde6f8b968f4729c4 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Tue, 7 Jan 2025 22:26:55 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D0=9F=20-=20=D0=9F=D1=80=D0=BE=D0=B2=D0=BE?= =?UTF-8?q?=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Client/Wires/UI/WiresMenu.cs | 27 +++++++------------ .../wires/components/wires-component.ftl | 6 +++++ 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/Content.Client/Wires/UI/WiresMenu.cs b/Content.Client/Wires/UI/WiresMenu.cs index 3b2eb4ee56..68101a50da 100644 --- a/Content.Client/Wires/UI/WiresMenu.cs +++ b/Content.Client/Wires/UI/WiresMenu.cs @@ -40,7 +40,7 @@ namespace Content.Client.Wires.UI IoCManager.InjectDependencies(this); Owner = owner; - var rootContainer = new LayoutContainer {Name = "WireRoot"}; + var rootContainer = new LayoutContainer { Name = "WireRoot" }; AddChild(rootContainer); MouseFilter = MouseFilterMode.Stop; @@ -104,9 +104,9 @@ namespace Content.Client.Wires.UI VerticalAlignment = VAlignment.Bottom }; - wrappingHBox.AddChild(new Control {MinSize = new Vector2(20, 0)}); + wrappingHBox.AddChild(new Control { MinSize = new Vector2(20, 0) }); wrappingHBox.AddChild(_wiresHBox); - wrappingHBox.AddChild(new Control {MinSize = new Vector2(20, 0)}); + wrappingHBox.AddChild(new Control { MinSize = new Vector2(20, 0) }); bottomWrap.AddChild(bottomPanel); @@ -201,7 +201,7 @@ namespace Content.Client.Wires.UI var middle = new PanelContainer { - PanelOverride = new StyleBoxFlat {BackgroundColor = Color.FromHex("#3C4841")}, + PanelOverride = new StyleBoxFlat { BackgroundColor = Color.FromHex("#3C4841") }, Children = { new BoxContainer @@ -224,13 +224,13 @@ namespace Content.Client.Wires.UI _topContainer.AddChild(new PanelContainer { MinSize = new Vector2(0, 2), - PanelOverride = new StyleBoxFlat {BackgroundColor = Color.FromHex("#525252ff")} + PanelOverride = new StyleBoxFlat { BackgroundColor = Color.FromHex("#525252ff") } }); _topContainer.AddChild(middle); _topContainer.AddChild(new PanelContainer { MinSize = new Vector2(0, 2), - PanelOverride = new StyleBoxFlat {BackgroundColor = Color.FromHex("#525252ff")} + PanelOverride = new StyleBoxFlat { BackgroundColor = Color.FromHex("#525252ff") } }); CloseButton.OnPressed += _ => Close(); SetSize = new Vector2(320, 200); @@ -583,28 +583,21 @@ namespace Content.Client.Wires.UI VerticalAlignment = VAlignment.Center, }); hBox.AddChild(lightContainer); - hBox.AddChild(new Control {MinSize = new Vector2(6, 0)}); + hBox.AddChild(new Control { MinSize = new Vector2(6, 0) }); AddChild(hBox); } } private sealed class HelpPopup : Popup { - private const string Text = "Click on the gold contacts with a multitool in hand to pulse their wire.\n" + - "Click on the wires with a pair of wirecutters in hand to cut/mend them.\n\n" + - "The lights at the top show the state of the machine, " + - "messing with wires will probably do stuff to them.\n" + - "Wire layouts are different each round, " + - "but consistent between machines of the same type."; - public HelpPopup() { var label = new RichTextLabel(); - label.SetMessage(Text); + label.SetMessage(Loc.GetString("wires-menu-help-popup")); AddChild(new PanelContainer { - StyleClasses = {ExamineSystem.StyleClassEntityTooltip}, - Children = {label} + StyleClasses = { ExamineSystem.StyleClassEntityTooltip }, + Children = { label } }); } } diff --git a/Resources/Locale/ru-RU/wires/components/wires-component.ftl b/Resources/Locale/ru-RU/wires/components/wires-component.ftl index 6d0ba06f5d..2f805010e9 100644 --- a/Resources/Locale/ru-RU/wires/components/wires-component.ftl +++ b/Resources/Locale/ru-RU/wires/components/wires-component.ftl @@ -12,3 +12,9 @@ wires-component-on-examine-panel-closed = [color=lightgray]Техническа wires-menu-name-label = Провода wires-menu-dead-beef-text = DEAD-BEEF +wires-menu-help-popup = + Кликайте на позолоченные контакты рукой с мультитулом чтобы подавать импульсы на соответствующие провода. + Кликайте на провода рукой с кусачками чтобы перерезать или соединять их. + + Индикаторы в верхней части показывают состояние устройства, и вмешательство в провода, наверняка, что-то с устройством сделает. + Расположение проводов в каждом раунде разное, но при этом одинаковое для устройств одного типа.