From 48a7c8f1af6d5d6b678b98077b9a0c2ccf26e5de Mon Sep 17 00:00:00 2001 From: Jabak <163307958+Jabaks@users.noreply.github.com> Date: Thu, 31 Oct 2024 17:38:04 +0300 Subject: [PATCH] Revert "Xui (#154)" This reverts commit 5d68bafd172fbf4074b7bd1660a4c95aa22692f9. --- .../AutoRegenReagentComponent.cs | 5 +- .../AutoRegenReagentSystem.cs | 23 ++-- .../EntitySystems/FireProtectionSystem.cs | 29 ----- .../Examine/GroupExamineComponent.cs | 1 - Resources/Changelog/ChangelogWhite.yml | 121 ++++++++---------- .../ru-RU/_white/info/fire-protection.ftl | 3 - .../_white/locales-new/autotranslate-112.ftl | 4 +- .../_white/locales-new/autotranslate-84.ftl | 4 +- .../ru-RU/blocking/blocking-examine.ftl | 22 +--- Resources/Locale/ru-RU/borg/stack-holder.ftl | 1 - .../components/hypospray-component.ftl | 10 +- .../ru-RU/explosions/explosion-resistance.ftl | 3 +- .../components/research-console-component.ftl | 2 - .../structures/decoration/curtains.ftl | 36 ------ .../structures/machines/artifact_analyzer.ftl | 2 +- Resources/Prototypes/Datasets/Names/clown.yml | 2 +- .../Entities/Clothing/Belt/belts.yml | 54 ++++---- .../Entities/Objects/Shields/shields.yml | 35 ++--- .../Objects/Weapons/Throwable/clusterbang.yml | 6 - Resources/Prototypes/_White/tags.yml | 3 - .../Airlocks/Glass/external.rsi/assembly.png | Bin 1821 -> 1920 bytes .../Airlocks/Glass/external.rsi/closed.png | Bin 1939 -> 1927 bytes .../Airlocks/Glass/external.rsi/closing.png | Bin 3404 -> 3496 bytes .../Airlocks/Glass/external.rsi/opening.png | Bin 3427 -> 3494 bytes .../Standard/external.rsi/assembly.png | Bin 3010 -> 1831 bytes 25 files changed, 117 insertions(+), 249 deletions(-) delete mode 100644 Resources/Locale/ru-RU/_white/info/fire-protection.ftl diff --git a/Content.Server/_White/AutoRegenReagent/AutoRegenReagentComponent.cs b/Content.Server/_White/AutoRegenReagent/AutoRegenReagentComponent.cs index 98e91b4f75..65eac36ab6 100644 --- a/Content.Server/_White/AutoRegenReagent/AutoRegenReagentComponent.cs +++ b/Content.Server/_White/AutoRegenReagent/AutoRegenReagentComponent.cs @@ -1,7 +1,6 @@ using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Reagent; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; -using Robust.Shared.Prototypes; namespace Content.Server._White.AutoRegenReagent { @@ -12,10 +11,10 @@ namespace Content.Server._White.AutoRegenReagent public string? SolutionName = null; // we'll fail during tests otherwise [DataField("reagents", required: true)] - public List> Reagents = default!; + public List Reagents = default!; [DataField] - public ProtoId CurrentReagent = default!; + public string CurrentReagent = ""; [DataField] public int CurrentIndex = 0; diff --git a/Content.Server/_White/AutoRegenReagent/AutoRegenReagentSystem.cs b/Content.Server/_White/AutoRegenReagent/AutoRegenReagentSystem.cs index 9978ab88ce..267842b087 100644 --- a/Content.Server/_White/AutoRegenReagent/AutoRegenReagentSystem.cs +++ b/Content.Server/_White/AutoRegenReagent/AutoRegenReagentSystem.cs @@ -1,11 +1,10 @@ -using Content.Shared.Chemistry.EntitySystems; +using Content.Server.Chemistry.Containers.EntitySystems; using Content.Server.Chemistry.EntitySystems; using Content.Server.Popups; using Content.Shared.Examine; using Content.Shared.Interaction.Events; using Content.Shared.Verbs; using Robust.Shared.Timing; -using Robust.Shared.Prototypes; namespace Content.Server._White.AutoRegenReagent { @@ -14,10 +13,9 @@ namespace Content.Server._White.AutoRegenReagent /// public sealed class AutoRegenReagentSystem : EntitySystem { - [Dependency] private readonly SharedSolutionContainerSystem _solutionSystem = default!; + [Dependency] private readonly SolutionContainerSystem _solutionSystem = default!; [Dependency] private readonly PopupSystem _popups = default!; [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; public override void Initialize() { @@ -47,7 +45,7 @@ namespace Content.Server._White.AutoRegenReagent if (autoComp.Solution == null) return; - _solutionSystem.TryAddReagent(autoComp.Solution.Value, autoComp.CurrentReagent, autoComp.UnitsPerInterval, out _); + _solutionSystem.TryAddReagent(autoComp.Solution.Value, autoComp.CurrentReagent, autoComp.UnitsPerInterval); } } @@ -71,8 +69,7 @@ namespace Content.Server._White.AutoRegenReagent private void OnExamined(EntityUid uid, AutoRegenReagentComponent component, ExaminedEvent args) { - if (_prototypeManager.TryIndex(component.CurrentReagent, out var reagentProto)) - args.PushMarkup(Loc.GetString("reagent-name", ("reagent", reagentProto.LocalizedName))); + args.PushMarkup(Loc.GetString("reagent-name", ("reagent", component.CurrentReagent))); } private void AddSwitchVerb(EntityUid uid, AutoRegenReagentComponent component, @@ -109,7 +106,7 @@ namespace Content.Server._White.AutoRegenReagent component.CurrentReagent = component.Reagents[component.CurrentIndex]; } - private void SwitchReagent(AutoRegenReagentComponent component, EntityUid? user = null) + private string SwitchReagent(AutoRegenReagentComponent component, EntityUid? user = null) { if (component.CurrentIndex + 1 == component.Reagents.Count) component.CurrentIndex = 0; @@ -121,14 +118,10 @@ namespace Content.Server._White.AutoRegenReagent component.CurrentReagent = component.Reagents[component.CurrentIndex]; - if (user == null) - return; - - if (!_prototypeManager.TryIndex(component.CurrentReagent, out var reagentProto)) - return; - - _popups.PopupEntity(Loc.GetString("autoregen-switched", ("reagent", reagentProto.LocalizedName)), user.Value, user.Value); + if (user != null) + _popups.PopupEntity(Loc.GetString("autoregen-switched", ("reagent", component.CurrentReagent)), user.Value, user.Value); + return component.CurrentReagent; } } } diff --git a/Content.Shared/Clothing/EntitySystems/FireProtectionSystem.cs b/Content.Shared/Clothing/EntitySystems/FireProtectionSystem.cs index e1059112fe..6f80bc0588 100644 --- a/Content.Shared/Clothing/EntitySystems/FireProtectionSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/FireProtectionSystem.cs @@ -1,9 +1,6 @@ using Content.Shared.Atmos; using Content.Shared.Clothing.Components; using Content.Shared.Inventory; -using Content.Shared.Examine; // WD -using Content.Shared.Verbs; // WD -using Robust.Shared.Utility; // WD namespace Content.Shared.Clothing.EntitySystems; @@ -12,41 +9,15 @@ namespace Content.Shared.Clothing.EntitySystems; /// public sealed class FireProtectionSystem : EntitySystem { - [Dependency] private readonly ExamineSystemShared _examine = default!; // WD - - private const string IconTexture = "/Textures/Interface/VerbIcons/dot.svg.192dpi.png"; // WD - public override void Initialize() { base.Initialize(); SubscribeLocalEvent>(OnGetProtection); - SubscribeLocalEvent>(OnProtectionVerbExamine); // WD } private void OnGetProtection(Entity ent, ref InventoryRelayedEvent args) { args.Args.Reduce(ent.Comp.Reduction); } - - // WD EDIT START - private void OnProtectionVerbExamine(Entity entity, ref GetVerbsEvent args) - { - if (!args.CanInteract || !args.CanAccess) - return; - - var modifierPercentage = MathF.Round(entity.Comp.Reduction * 100f, 1); - - if (modifierPercentage == float.NegativeZero) - return; - - var msg = new FormattedMessage(); - - msg.AddMarkup(Loc.GetString("fire-protection-examine", ("modifier", modifierPercentage))); - - _examine.AddDetailedExamineVerb(args, entity.Comp, msg, - Loc.GetString("fire-protection-examinable-verb-text"), IconTexture, - Loc.GetString("fire-protection-examinable-verb-message")); - } - // WD EDIT END } diff --git a/Content.Shared/Examine/GroupExamineComponent.cs b/Content.Shared/Examine/GroupExamineComponent.cs index 136ead31fb..f91fd4c4de 100644 --- a/Content.Shared/Examine/GroupExamineComponent.cs +++ b/Content.Shared/Examine/GroupExamineComponent.cs @@ -22,7 +22,6 @@ namespace Content.Shared.Examine { "Armor", "ClothingSpeedModifier", - "FireProtection" // WD }, }, }; diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index d3203e750c..28beb6265a 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -1,4 +1,58 @@ Entries: +- author: RavMorgan + changes: + - message: "\u0420\u0435\u0432\u043E\u043B\u044E\u0446\u0438\u044F \u0442\u0435\u043F\ + \u0435\u0440\u044C \u0431\u0443\u0434\u0435\u0442 \u0432\u044B\u043F\u0430\u0434\ + \u0430\u0442\u044C \u0433\u043E\u0440\u0430\u0437\u0434\u043E \u0440\u0435\u0436\ + \u0435!" + type: Add + id: 82 + time: '2023-02-22T10:26:54.0000000+00:00' +- author: RavMorgan + changes: + - message: "AOE \u0432\u0441\u043F\u044B\u0448\u043A\u0430 \u0431\u043E\u043B\u044C\ + \u0448\u0435 \u043D\u0435 \u043A\u043E\u043D\u0432\u0435\u0440\u0442\u0438\u0440\ + \u0443\u0435\u0442 \u043B\u044E\u0434\u0435\u0439 \u0432 \u0440\u0435\u0432\u0443\ + !" + type: Fix + - message: "\u041A\u0430\u043F\u0438\u0442\u0430\u043D \u0438 \u0434\u0440\u0443\ + \u0433\u0438\u0435 \u0440\u0430\u0431\u044B \u0441\u0438\u0441\u0442\u0435\u043C\ + \u044B \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u043C\u043E\u0433\u0443\ + \u0442 \u043A\u043E\u043D\u0432\u0435\u0440\u0442\u0438\u0440\u043E\u0432\u0430\ + \u0442\u044C \u043B\u044E\u0434\u0435\u0439 \u0432 \u0440\u0435\u0432\u0443!" + type: Fix + id: 83 + time: '2023-02-22T18:17:01.0000000+00:00' +- author: Valtos + changes: + - message: "gTTS \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u043E\u0431\ + \u0440\u0430\u0442\u043D\u043E \u043D\u0430 \u0441\u0432\u0430\u043B\u043A\u0443\ + ." + type: Remove + id: 84 + time: '2023-02-23T15:20:17.0000000+00:00' +- author: KettlebellOfCreation + changes: + - message: "\u0424\u0438\u043A\u0441 \u0414\u0410\u041C\u0430" + type: Add + id: 85 + time: '2023-02-24T22:17:20.0000000+00:00' +- author: RavMorgan + changes: + - message: "\u0426\u0435\u043D\u0430 \u0441\u0438\u0433\u043D\u0443\u043B\u043E\ + \ \u0431\u044B\u043B\u0430 \u043F\u043E\u0432\u044B\u0448\u0435\u043D\u0430\ + \ \u0434\u043E 20!" + type: Add + id: 86 + time: '2023-02-25T20:39:49.0000000+00:00' +- author: RavMorgan + changes: + - message: "\u041C\u044F\u0441\u043D\u0430\u044F \u043F\u0430\u043D\u0435\u043B\u044C\ + \ \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u0434\u043E\u043B\u0436\ + \u043D\u0430 \u043B\u043E\u043C\u0430\u0442\u044C\u0441\u044F!" + type: Add + id: 87 + time: '2023-02-26T09:00:35.0000000+00:00' - author: RavMorgan changes: - message: "\u0414\u0420\u0414 \u0436\u0440\u0430\u043B!" @@ -8720,70 +8774,3 @@ id: 581 time: '2024-10-24T14:15:00.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/744 -- author: BIG_Zi_348 - changes: - - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u0435\u0440\ - \u0435\u0432\u043E\u0434\u044B \u043C\u0435\u043B\u043E\u0447\u0435\u0439." - type: Add - id: 582 - time: '2024-10-24T19:40:04.0000000+00:00' - url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/746 -- author: BIG_Zi_348 - changes: - - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u043F\u0435\u0440\u0435\ - \u0432\u043E\u0434 \u0433\u0438\u043F\u043E\u0441\u043F\u0440\u0435\u044F \u0431\ - \u043E\u0440\u0433\u043E\u0432." - type: Add - id: 583 - time: '2024-10-26T14:54:11.0000000+00:00' - url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/745 -- author: BIG_Zi_348 - changes: - - message: "\u0423\u0432\u0435\u043B\u0438\u0447\u0435\u043D \u0441\u043F\u0438\u0441\ - \u043E\u043A \u043F\u0435\u0440\u0435\u043D\u043E\u0441\u0438\u043C\u044B\u0445\ - \ \u0432\u0435\u0449\u0435\u0439 \u0434\u043B\u044F \u043F\u043E\u044F\u0441\ - \u043E\u0432 \u043E\u0445\u0440\u0430\u043D\u044B." - type: Add - id: 584 - time: '2024-10-26T15:02:01.0000000+00:00' - url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/748 -- author: BIG_Zi_348 - changes: - - message: "\u041F\u0440\u043E\u0432\u0435\u0434\u0451\u043D \u043C\u0435\u043B\u043A\ - \u0438\u0439 \u0440\u0435\u0431\u0430\u043B\u0430\u043D\u0441 \u0449\u0438\u0442\ - \u043E\u0432 \u0421\u0411." - type: Tweak - - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u0435\ - \u0440\u0435\u0432\u043E\u0434\u044B \u0449\u0438\u0442\u043E\u0432." - type: Fix - id: 585 - time: '2024-10-26T15:02:50.0000000+00:00' - url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/749 -- author: BIG_Zi_348 - changes: - - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u043E\u0442\u043E\ - \u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435 \u0437\u0430\u0449\u0438\u0442\ - \u044B \u043E\u0442 \u0433\u043E\u0440\u0435\u043D\u0438\u044F \u0440\u0430\u0437\ - \u043B\u0438\u0447\u043D\u043E\u0439 \u044D\u043A\u0438\u043F\u0438\u0440\u043E\ - \u0432\u043A\u0435." - type: Add - - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u0435\u0440\ - \u0435\u0432\u043E\u0434\u044B \u043C\u0435\u043B\u043E\u0447\u0435\u0439." - type: Add - - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u0435\ - \u0440\u0435\u0432\u043E\u0434\u044B \u043C\u0435\u043B\u043E\u0447\u0435\u0439\ - ." - type: Fix - id: 586 - time: '2024-10-26T17:20:19.0000000+00:00' - url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/747 -- author: BIG_Zi_348 - changes: - - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u043C\u0435\ - \u043B\u043E\u0447\u044C \u0432 \u0442\u0435\u043A\u0441\u0442\u0443\u0440\u0430\ - \u0445 \u0432\u043D\u0435\u0448\u043D\u0438\u0445 \u0441\u0442\u0435\u043A\u043B\ - \u044F\u043D\u043D\u044B\u0445 \u0448\u043B\u044E\u0437\u043E\u0432." - type: Fix - id: 587 - time: '2024-10-27T15:30:41.0000000+00:00' - url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/751 diff --git a/Resources/Locale/ru-RU/_white/info/fire-protection.ftl b/Resources/Locale/ru-RU/_white/info/fire-protection.ftl deleted file mode 100644 index 769b0c77f9..0000000000 --- a/Resources/Locale/ru-RU/_white/info/fire-protection.ftl +++ /dev/null @@ -1,3 +0,0 @@ -fire-protection-examinable-verb-text = Защита -fire-protection-examinable-verb-message = Изучить показатели защиты. -fire-protection-examine = Обеспечивает защиту от огня на [color=yellow]{ $modifier }%[/color]. diff --git a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-112.ftl b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-112.ftl index 32133aaf45..5b7975f23b 100644 --- a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-112.ftl +++ b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-112.ftl @@ -23,8 +23,8 @@ ent-AlwaysPoweredStrobeLight = стробоскоп ent-PoweredStrobeLightEmpty = стробоскоп .desc = УХ?! Извини, я слышу только ВУ-У-У-ВУ-У-У! .suffix = Пустой -ent-MachineAnomalyVesselExperimental = экспериментальный сосуд аномалий - .desc = Передовой сосуд аномалий, обладающий большим потенциалом для исследований, но при этом повышенной нестабильностью и слабым радиоактивным распадом в окружающую среду. +ent-MachineAnomalyVesselExperimental = экспериментальный корабль аномалий + .desc = Передовой корабль аномалий, обладающий большим потенциалом для исследований, но при этом повышенной нестабильностью и слабым радиоактивным распадом в окружающую среду. ent-SyndicateBomb = бомба синдиката .desc = Бомба для оперативников и агентов Синдиката. По-настоящему, никаких тренировок, вперед! ent-DebugHardBomb = отладочная бомба diff --git a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-84.ftl b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-84.ftl index 0bea57ffca..74055d53de 100644 --- a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-84.ftl +++ b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-84.ftl @@ -14,8 +14,8 @@ ent-CircuitImprinterHyperConvectionMachineCircuitboard = плата печата .desc = Печатная плата для печатающего устройства для гиперконвекционных плат. ent-AnomalyVesselCircuitboard = плата сосуда аномалий .desc = Печатная плата для сосуда аномалий. -ent-AnomalyVesselExperimentalCircuitboard = плата экспериментального сосуда аномалий - .desc = Печатная плата для экспериментального сосуда аномалий. +ent-AnomalyVesselExperimentalCircuitboard = плата экспериментального аномального корабля + .desc = Печатная плата для экспериментального аномального корабля. ent-HellfireFreezerMachineCircuitBoard = плата адского морозильника .desc = Выглядит так, будто вы могли бы использовать отвертку, чтобы заменить тип платы. ent-HellfireHeaterMachineCircuitBoard = плата адского нагревателя diff --git a/Resources/Locale/ru-RU/blocking/blocking-examine.ftl b/Resources/Locale/ru-RU/blocking/blocking-examine.ftl index aca9ca8301..303b10655b 100644 --- a/Resources/Locale/ru-RU/blocking/blocking-examine.ftl +++ b/Resources/Locale/ru-RU/blocking/blocking-examine.ftl @@ -2,23 +2,5 @@ blocking-examinable-verb-text = Защита blocking-examinable-verb-message = Изучите значения защиты. blocking-fraction = Он блокирует [color=lightblue]{ $value }%[/color] входящего урона и: -blocking-coefficient-value = - Получает [color=lightblue]{ $value }%[/color] [color=yellow]{ $type -> - *[other] Другого - [Blunt] Тупого - [Slash] Рубящего - [Piercing] Проникающего - [Heat] Теплового - [Radiation] Радиационного - [Caustic] Кислотного - [Cold] Морозного - }[/color] урона. -blocking-reduction-value = - Получает на [color=lightblue]{ $value }[/color] [color=yellow]{ $type -> - *[other] Другого - [Blunt] Тупого - [Slash] Рубящего - [Piercing] Проникающего - [Heat] Теплового - [Radiation] Радиационного - [Caustic] Кислотного - [Cold] Морозного - }[/color] урона меньше. +blocking-coefficient-value = - Отнимает [color=lightblue]{ $value }%[/color] [color=yellow]{ $type }[/color] урона. +blocking-reduction-value = - Отнимает на [color=lightblue]{ $value }[/color] меньше [color=yellow]{ $type }[/color] урона. diff --git a/Resources/Locale/ru-RU/borg/stack-holder.ftl b/Resources/Locale/ru-RU/borg/stack-holder.ftl index 315f2e4969..a66f2936c8 100644 --- a/Resources/Locale/ru-RU/borg/stack-holder.ftl +++ b/Resources/Locale/ru-RU/borg/stack-holder.ftl @@ -2,4 +2,3 @@ stack-holder-empty = Тут пусто. stack-holder = Оно содержит: { $number } { $item }. autoregen-switched = Реагент сменён на { $reagent }. reagent-name = Текущий реагент: { $reagent }. -autoreagent-switch = Сменить реагент diff --git a/Resources/Locale/ru-RU/chemistry/components/hypospray-component.ftl b/Resources/Locale/ru-RU/chemistry/components/hypospray-component.ftl index 91aee995d6..b106125192 100644 --- a/Resources/Locale/ru-RU/chemistry/components/hypospray-component.ftl +++ b/Resources/Locale/ru-RU/chemistry/components/hypospray-component.ftl @@ -1,10 +1,6 @@ ## UI -hypospray-all-mode-text = Только ввод -hypospray-mobs-only-mode-text = Забор и ввод -hypospray-invalid-text = Ошибка -hypospray-volume-label = Объем: [color=white]{$currentVolume}/{$totalVolume}u[/color] - Mode: [color=white]{$modeString}[/color] +hypospray-volume-text = Объем: [color=white]{ $currentVolume }/{ $totalVolume }[/color] ## Entity @@ -15,7 +11,3 @@ hypospray-component-empty-message = Он пустой! hypospray-component-feel-prick-message = Вы чувствуете слабый укольчик! hypospray-component-transfer-already-full-message = { $owner } уже заполнен! hypospray-cant-inject = Нельзя сделать инъекцию в { $target }! - -hypospray-verb-mode-label = Переключить забор из емкостей -hypospray-verb-mode-inject-all = Вы больше не можете производить забор из емкостей. -hypospray-verb-mode-inject-mobs-only = Теперь вы можете производить забор из емкостей. diff --git a/Resources/Locale/ru-RU/explosions/explosion-resistance.ftl b/Resources/Locale/ru-RU/explosions/explosion-resistance.ftl index 696f900ddd..0c025e7b6c 100644 --- a/Resources/Locale/ru-RU/explosions/explosion-resistance.ftl +++ b/Resources/Locale/ru-RU/explosions/explosion-resistance.ftl @@ -1,2 +1 @@ -explosion-resistance-coefficient-value = - [color=orange]Взрывной[/color] урон снижается на [color=lightblue]{ $value }%[/color]. -explosion-resistance-contents-coefficient-value = - [color=orange]Взрывной[/color] урон [color=white]содержимому[/color] снижается на [color=lightblue]{$value}%[/color]. +explosion-resistance-coefficient-value = - [color=orange]Взрывной[/color] урон снижен благодаря [color=lightblue]{ $value }%[/color]. diff --git a/Resources/Locale/ru-RU/research/components/research-console-component.ftl b/Resources/Locale/ru-RU/research/components/research-console-component.ftl index 28c1783eb0..5ad954f8ca 100644 --- a/Resources/Locale/ru-RU/research/components/research-console-component.ftl +++ b/Resources/Locale/ru-RU/research/components/research-console-component.ftl @@ -22,5 +22,3 @@ research-console-menu-server-sync-button = Синхронизировать research-console-menu-server-unlock-button = Изучить research-console-tech-requirements-none = Нет требуемых технологий. research-console-tech-requirements-prototype-name = Требуется: { $prototypeName } - -research-console-unlock-technology-radio-broadcast = Открыто [bold]{$technology}[/bold] за [bold]{$amount}[/bold] очков. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/decoration/curtains.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/decoration/curtains.ftl index 0856e9abd1..d94f43ce30 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/decoration/curtains.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/decoration/curtains.ftl @@ -3,39 +3,3 @@ ent-HospitalCurtains = шторы ent-HospitalCurtainsOpen = { ent-HospitalCurtains } .suffix = Открытый .desc = { ent-HospitalCurtains.desc } -ent-CurtainsBlack = занавеска - .desc = Скрывает то, что другие не должны видеть. -ent-CurtainsBlue = { ent-CurtainsBlack } - .desc = { ent-CurtainsBlack.desc } -ent-CurtainsCyan = { ent-CurtainsBlack } - .desc = { ent-CurtainsBlack.desc } -ent-CurtainsGreen = { ent-CurtainsBlack } - .desc = { ent-CurtainsBlack.desc } -ent-CurtainsOrange = { ent-CurtainsBlack } - .desc = { ent-CurtainsBlack.desc } -ent-CurtainsPink = { ent-CurtainsBlack } - .desc = { ent-CurtainsBlack.desc } -ent-CurtainsPurple = { ent-CurtainsBlack } - .desc = { ent-CurtainsBlack.desc } -ent-CurtainsRed = { ent-CurtainsBlack } - .desc = { ent-CurtainsBlack.desc } -ent-CurtainsWhite = { ent-CurtainsBlack } - .desc = { ent-CurtainsBlack.desc } -ent-CurtainsBlackOpen = { ent-CurtainsBlack } - .desc = { ent-CurtainsBlack.desc } -ent-CurtainsBlueOpen = { ent-CurtainsBlack } - .desc = { ent-CurtainsBlack.desc } -ent-CurtainsCyanOpen = { ent-CurtainsBlack } - .desc = { ent-CurtainsBlack.desc } -ent-CurtainsGreenOpen = { ent-CurtainsBlack } - .desc = { ent-CurtainsBlack.desc } -ent-CurtainsOrangeOpen = { ent-CurtainsBlack } - .desc = { ent-CurtainsBlack.desc } -ent-CurtainsPinkOpen = { ent-CurtainsBlack } - .desc = { ent-CurtainsBlack.desc } -ent-CurtainsPurpleOpen = { ent-CurtainsBlack } - .desc = { ent-CurtainsBlack.desc } -ent-CurtainsRedOpen = { ent-CurtainsBlack } - .desc = { ent-CurtainsBlack.desc } -ent-CurtainsWhiteOpen = { ent-CurtainsBlack } - .desc = { ent-CurtainsBlack.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/artifact_analyzer.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/artifact_analyzer.ftl index 120297c9a4..77d8f8d2ad 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/artifact_analyzer.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/artifact_analyzer.ftl @@ -4,5 +4,5 @@ ent-MachineTraversalDistorter = поперечный искатель .desc = Прибор, способный влиять на открываемые цепочки эффектов артефактов. ent-MachineArtifactCrusher = дробитель артефактов .desc = Лучше не совать в него свои пальцы... -ent-MachineAnomalySynchronizer = синхронизатор аномалий +ent-MachineAnomalySynchronizer = синхронизатор артефактов .desc = Сложное устройство, считывающее изменения в аномальных волнах и преобразующее их в энергетические сигналы. diff --git a/Resources/Prototypes/Datasets/Names/clown.yml b/Resources/Prototypes/Datasets/Names/clown.yml index 11b7f0f44d..6c8680180b 100644 --- a/Resources/Prototypes/Datasets/Names/clown.yml +++ b/Resources/Prototypes/Datasets/Names/clown.yml @@ -25,7 +25,7 @@ - Конго Бонго - Крутой Купер - Хрустящий - - Сын Деда + - Deedum Dedah - Восхитительный Дэн - Динкстер - Дидли Дудл diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 11e89618db..53236744cc 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -182,33 +182,31 @@ sprite: Clothing/Belt/assault.rsi - type: Clothing sprite: Clothing/Belt/assault.rsi - # WD EDIT START (it's already inherited from ClothingBeltSecurity) - # - type: Storage - # whitelist: - # components: - # - Stunbaton - # - FlashOnTrigger - # - SmokeOnTrigger - # - Flash - # - Handcuff - # - BallisticAmmoProvider - # - Ammo - # - type: ItemMapper - # mapLayers: - # flashbang: - # whitelist: - # components: - # - FlashOnTrigger - # stunbaton: - # whitelist: - # components: - # - Stunbaton - # tear_gas_grenade: - # whitelist: - # components: - # - SmokeOnTrigger - # sprite: Clothing/Belt/belt_overlay.rsi - # WD EDIT END + - type: Storage + whitelist: + components: + - Stunbaton + - FlashOnTrigger + - SmokeOnTrigger + - Flash + - Handcuff + - BallisticAmmoProvider + - Ammo + - type: ItemMapper + mapLayers: + flashbang: + whitelist: + components: + - FlashOnTrigger + stunbaton: + whitelist: + components: + - Stunbaton + tear_gas_grenade: + whitelist: + components: + - SmokeOnTrigger + sprite: Clothing/Belt/belt_overlay.rsi - type: Appearance - type: entity @@ -517,8 +515,6 @@ - MagazineMagnum - CombatKnife - Truncheon - - HolofanProjector # WD - - ClusterBang # WD components: - Stunbaton - FlashOnTrigger diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml index 7bcd45592c..c3a0f7203e 100644 --- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml @@ -77,17 +77,17 @@ - type: Blocking passiveBlockModifier: coefficients: - Blunt: 0.6 - Slash: 0.8 - Piercing: 0.9 + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.5 activeBlockModifier: coefficients: - Blunt: 0.5 - Slash: 0.7 - Piercing: 0.8 + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.4 flatReductions: - Blunt: 2 - Slash: 1 + Blunt: 1.5 + Piercing: 1.5 - type: Destructible thresholds: - trigger: @@ -122,7 +122,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 140 + damage: 120 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] @@ -144,21 +144,22 @@ - type: Blocking passiveBlockModifier: coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.6 + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.8 activeBlockModifier: coefficients: - Blunt: 0.85 - Slash: 0.85 - Piercing: 0.5 + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.7 flatReductions: - Piercing: 2 + Blunt: 1.5 + Piercing: 1.5 - type: Destructible thresholds: - trigger: !type:DamageTrigger - damage: 200 + damage: 220 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] # WD end diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml index c1660f47aa..36d4c947fc 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml @@ -16,9 +16,6 @@ - type: ContainerContainer containers: cluster-payload: !type:Container - - type: Tag # WD - tags: - - ClusterBang - type: entity parent: GrenadeBase @@ -51,9 +48,6 @@ - type: ContainerContainer containers: cluster-payload: !type:Container - - type: Tag # WD - tags: - - ClusterBang - type: entity parent: GrenadeBase diff --git a/Resources/Prototypes/_White/tags.yml b/Resources/Prototypes/_White/tags.yml index 382fc950ab..2cb343cffe 100644 --- a/Resources/Prototypes/_White/tags.yml +++ b/Resources/Prototypes/_White/tags.yml @@ -99,6 +99,3 @@ - type: Tag id: BlueMagusArmor - -- type: Tag - id: ClusterBang diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png index 5568777e4f05035a6cb4f68f542c0ca4609132df..85715a9ca06cc344b6309f2b5fca40a1b2d972c8 100644 GIT binary patch delta 1905 zcmV-%2afoi4uB7kB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pM6-h)vR9Hu~S8HrkMHK$-y}R3X`)-l4+q6(9ZNa82EnCIqw$B@AH)z5MUWT_{1Aa?m4AqUJOr%|s%)88QRn@~4MYT$Qpymy7Hc_m3{e|NIyy?m?8&u` z_QSwkEBny>6Hsv$SabSnMCQzbF}rz=dbssCg82q&r+*9iD?)DBm{(kkkyJ_>D6$+j znj01Ceqm!=$HJj=Vm>4x^!gE<(I}K{;qE8`}y0Nu9@$Kx|AJ)@elRW|9-M$$@Q?=*DVN2oFfqEE7g3T%%Us*o#?B z2DZOeg@0SBix7=@V{yRRP%?qHCr!rW@^T4ruJJpt#qlLSoI%w z{pj8Wto%9zAI(=30i~5r=sYBZBp}8}KA0TA&c@kjoE~{2zo_h-qXAqV8n`M~eWz)z zz5VpboK6r*A|4B~#ek^=ERWF~OJ3oUlZ5RaS%0p2xMk5g_F>=bSZ2WG(+&ui6Xy)D zIv{hsqhVH>oN|xkN_9HHzSiGNm*!+1s;*V5Zs@_RMgu!u|7#7for|rbViNpPuB@n- zaPBiFM_*o`Ni`nv;2C%-WpiGwjZ6JD{T0z+HqiGTQ6#F13I3q!mSyLkpJFV zzJFjRP-*&cL3V-byf#{C`m$uUIBB`l$M#Z}oXB$E3vpm?wKD|)8RG8uEXc0N0y}aP zOl4L8NiodP&?pnjV`W8dUgG8+c_w_qH+{$*WKB(tvXzNoVIdX|4q$Pp1Q&DK z*k(vyzpL-{W1f8?l>Zmx zAeV=<1O31ME`j=I=v>^U4%{?1D^cb)PY805%Y$}+9{n*ep!1iit0y$HXJJI0JTr_R zevM}(%GlJG6O$_j#_BL`1{4(q<- zz};6pDG!H!I*W>6Q1>fmE?e8{@~d>-9W2H0@F0A0%*uVBR=v2S2Mw(TI-Z$=I=PU9 zxlJPl)ecY zBO|C=xDa&<7GOqet0tc*w`NE<8|KZ!45qfWwA^!aYB-E~X=9=;ZOo8Fy=gTyP$Fvz z$(2ta_gxHgsmagT1$513kbeXcfuyX`t^)^j*-Rvm=tU!?tRab6Miwywo$Hd zIbxH2efXZ&ZYeVYQ|s$-`pg;GhHlizDR6dyRDLVZ{>)CBIWs*49tlG{^ZM)2wQrv` zOnG`b_(wfgH>)gm=%6i*yO*#uq{c-e({RC+2>6lsxw~6F&*FVvo`1AEi^%l(aJsV- z4T~0~otr9-8k}p<;V3oSwz}F{E&$kKr)&Ry%!x$OgLEL=%`J1)ss-PI%k1Fxu#lv1 zT_E5Pi(w_(k@L(EbF?ZyUz1xhHJV1sTE}%FtIlRupM&^na1hC)i3gtR!>PjxFMrtr zlk?+~IHY6^@a1BQLVu?i*PX?X&c(=}j2==S7JV9{gNjMoG^ylqzuYva!`(t+Nz~^@ zjO4U^k8m9OTGou1Be(N3JMtaY+;|+Zgn?-iMLtmYG$R7;_ma=6E0ryIj@cQ{u}mE$ z-&YRsmo6X}Pyx@*N@tN|2SRMmTHF$hemXH?Bn#(s7ztf zKu}&s>-WmzwAFc>nwG3g7U<3Mdt2bQl%5WsggH&VGJ`y$EYETb$_17=L2|Ye)bYyq rysA*zXCfL`SidhKTuqwOvMl@wRISMhigDX%00000NkvXXu0mjfb$OY; delta 1806 zcmV+p2l4oT51kH>B!3BTNLh0L01m_e01m_fl`9S#000KhNklZTWnlc6^6gH z&zTu}Y{%C$V;iT%=nzMcz-xECv$P)BC({SeOr6~ z|6Xgaz0YD~WJD8*gr?JJUAO6B{o2})ria7&`)}I{D4<97EL}gm+t%NF!`8#Qm)AYC z%hm&5wRGLahc%r}Ya)@*k&zLVL?WTvwrykb^jUU3@&RQRR(6ByLR$pVziuJRufm@$Z6TH1z{JD^l1``fz4yV!wRs&!euz zv){eO&3_6vdOd!9Y7@p7gX@7Y%F%=UU|hDZSV2gHcFU>*&$^2gJcq2i$O2^w4PTxz zc}hqP>8fmBu>!GNj=s`QVaQ`(P7upr&)&R=0{x#66pzpKcQ9XQ-dWBm^SizWc%Zu* z)us0Di+?M^Gw09IVMm&*^i-^azf9%WxJ9@;1-EY8#0H_K9Xfldn^0CIEP?=coD#=J zHZT%T{;H+D>qb?ln44RH<)~?68hr6VL zXCpA1gSnec91!5f>@0J$f8EvF({o?n*Do&2-nxYY%z6%8R;bApvv+&|8(?T&=vh_o z1qC{-5I@Lf{Ry{j&}%}>dQM%q^%}db&sD{$xUag#lC%R00O1h4{Ra!n)axkVRO($; z7=H)ovO;w_jeXU_Tf0W1*dd7Ld>z|1%D3JfB-+--lQM@T{!Jzg{-`cw8V4FAbPrHf zutW%3%8r-UQdr1i8xI*88dA^mNblG|?$9Bo7Z&)@qY2JkE;OA9ON2M4r2&Q7gG5ClbWxHmYJ zu`hIXYN(zK`z-BFmhC<>u~OwW=XR!J=xUA9 z))vAkH{TIeQH8<22&Xci&=ZYvyMIuiI~wKo!a`u(D4W#`k1>w=U@JTx{2fGL##7#dW6#-vyzo=UNLV1S``JRm33Ke+}J z5tyHC2C9NImH>9;I(24dxRS{%N%X?_I9D<5 zd#-WuJVYbP&;GHglA68uFZMohhC*3*C;>+g`l%T}xN=#So#pG6tGG4kSgnq#pPF6# z7@}e2rN3<=nOx7^ zrTpa7SeC`a#01IYdR{uYnUJM;u3(GY1>aKxUQ<83+vZL|IK126>VZ=wj_mR4&+T`D w`d5CbbY3&eFDU!|o+O!E$Hc@0mSyo@jFMJ_*d-iS00000Ne4wvM6N<$f?5cAwg3PC diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed.png index ecf312964027bc1d480dec8449c0b557a47391d2..2d854b6b48be8f72ede7cd6ccf3b9b8054a28c11 100644 GIT binary patch delta 1913 zcmV-<2Zs2Q4~GwsBYy`@NkliLd-v(}uGeXkb>ckNvGZuWb%KFL zr4dL-po%DzBL9HDpjId}Jfun$LMW<)5N+uX_yMXALRFzOP^zj@5m2Q`RftGwl{6%= zr;A^n-wz># zfOG*N6iz)?0EEOByV|j66KYKtwWb23fRcnQu{JbpLRQ4|T(tAteACsPqzL)Q6}Y_s zJebXD!%jV0K)u^VSA{@^fGE$-Y8wk%2nwzSzcmkJEz`Gsxv@8LD=ZH!1&}ceY)&Lr z@o{sM!haVE?Qr2@Uq5Lt-nuyplbxGy1G1f-5LYP>5iAfa!w3a%H0Pupep`lG6Nsgx z5l35uH)t$dQ@B9AOKGWQ5T|vdh2S-(iC=HH7x#8_K&kbKB@vDdUq;4^-$`VMrxoA~ z2DPp?l|qb2PtQ9`c&&FYdUuw7k!Z`^3}_m)%6~m;eZMBe55IKf(jAo`A5Snsxdv2b zTXk3op7+5SBnr0Hch`XL+^1ThPE^Y;b}v6|*)xr|Erua9@;^LLDWt9uFMTeraHPuX>lGprWlObggq z^M5p;?(S|Sl|U+;#^>iN_}r!ps&xt#2y(eBo9Gml78tmdg?0+FWlkyu!w(;?XCvV4 zDTTky%;PWV9O{b;Fv#^nK+3_ymGG1f4BSZl|EyP zqsJcBm|+N9*F{GzhZwsF%YOagde zcnVK`vWUy$^;H?n0!~d%uD`Vae7S404#P_2`?jX=`Niuk)_-$K z@xjYcd*Z&GxHPt~$~($md;Y?xKE|1zB5xN8pUGq}>^K^0l>+~rnbAU7`%kyEp(B~p znlkb2dL6lB3hA_kiP;9k8fm~&ymtJ)9XLPwG4iRD=Ih}1;$kS9e5@7)G)SeQ-wfKt zNfL2WA(zwhd>7p*2YGFBc1iOyeSg4Lh{ZJUl#dZ$aTA{V4E*^|uS4(+#tW=*qY=i+ z^|$Aelu)j#yXK4J0n_Sl<$9iLG_)M}yDYfx7=y8tf5Hey5`J=Q3NJo+6}Cg5r6ue* zd>A_(cmTTw1~hoj;2==1WA~v$*v0+e!EioMbX!*!iiZyA&a^CJ*WtsOZhw1sH&nfj zzCr;@4)EgluWC%j)|XLYlJLhDObEmCqcbyukuzuXSTvhxPEF}CZ$q9Z|E>?_xmksR zUb8vALcp1x##R356heDoTd{~MV`Cc7mOyNr{L4rI)q=ufM-_sDkX^OCr)PP)_#o`! zo`)X7$m!EsFwckK2U@46h2) z#Fcm7#qJ|VLglvg^nf_lMB2&#klT)}TR8zBg}}($Z==6d(!XTO8V9>T0TUhGg~DLt zBO@^4aa=ol79yF{-|Y6$vu9x@656$V7jq4ml&Srz81mVL!63rHliAeBsdbBP3MuB-p^7NkVl_e^99XqtxWA{o%I z3;+wRtAB3dM7YstfDrvxR1lpTHt6Bhg!hy95s}`n!gqVn<3iwev)MA&(uwpoy=~j8 z`09>>=}HA-tT?7S3P%FU|k#eDn+W)^e{qDgyo;km? ziiV5RIa@$Egp?t1@~wUh40y$Ky^{!m7zX|aJ&eJ26RI##00000NkvXXu0mjfdE2B7 delta 1925 zcmV;02YUF250ej&BYyx1a7bBm000XU000XU0RWnu7ytkVMM*?KR9J{ybmG?rD%uh@#LxUC>1q)=!GHEx@r5AD|$hvLM2K){p|OrV4~Za%ah zT1qJ;xOMC{HKEYb)|7&1g)ODnah*7^3cj)Wu)85`*9UdOm9ebY8Z*2E;cw0h${cTqP1@!dM^~a}e}z`CtOxySa~n{#}fYjv~Xu!}|WeuX6awOQh5U(d3K?I6^$fLTl4p8y|gs&c*=2iyUK7nH&?xug= zPGr}fefq6|%cPRRqdjouWGCVT>}^WY=z1thC@xGc=YMJTJgh>q=ThAk%04Zg$3nSG zQx#1W+UgB|oL)c!hp&BSn%RE{ciJsKySN8qj3KaKjB@s5Czya|yP8=p3%QadS5gQJ z8VFkwjTFj4i%CFWYI=)FuvoGzmMjvOSWc{AehHpxX+fNTvu}2i@3wSh1#t{!Zgv(0 zI=2Xl<$u|(X6`ORi|0nZuQWwTukw6_22GB`=45h>9DuLNmpYrVSa$Cdtis(pv$!C% zH9|{!sKlxwB6tX%X0l}@r=|0+G@SI=b zmm418k=9mJ@6Q~FaOm1qn%uevsf_Vl0Fel#s(+PKNr)i8qF>}(-!A%k`hS{iOy8;S z6mr>(>&?#@^TRKHc;$gcNQ7q)n9D(Sw$_H#;B66jA(!1)4YuCAYwy#qp6lDiqF-F? zSKQ_nL#GWu_kz&2sWu7%WP>vAZr>S$15`jBHt*W|^sDb~--&a-a7C8600|HN^jinV ztbgUXGdD+e?k_L4x3xVm_BC=M%-y|<56oGgwByw{=X%hS3oVfD?rsg#kZNe)i;G#l z(9y&~USb0(xjYw?Xg3~n){nPUfp+88tOcq#QTP;SsRD0KDSw?=^j*DYK@f28&~u3TDDo-NDpwTP@o0)4{p(}4)Yr4Aqa&up22>Kv0J)`r&bGuFfYv6D@_!Wk z;Ip5`x3-4n8pH8_UZb-ufxk|&=9U5~IbNO2u>m521)geZ;wP7{*LW`oisAz=Kimoj(}zf^rK%IBM!xaRvvRTyIf{yQ^+5MCOeYiy*oz8;P4h53A*bbX43 z29Jr^0%n~w5MW}qz>&wdaxwD>ZGWj0^Z7ijsTA|e%du{Wuxbnt5$3a5L66ej1yvMRAG!C2(KTS;_X*HqJQiQQY`Y= z&`?M$76I5cIEWMqB+F&C4GywxaFCvX0Zgex&%gjuC}4`km?nh+09%KK=ouJb+y4Eb zQ$W#&x4-`puOFJi4+Iy1eZoyn|g==G5iZf7#w&SYXEEm7Xo{E#S2w1yXo zh~Rc~&>ewn?dZUtnL(4u*u%JxM47Dh^;{nriFYhBK8{rFjN8$%5`PYAuUr=t5m=au z4D&p0jE{%MaB3=MT(Xwi)6*K%urAfO?cqARu1>x^N(RH|94=^_+^fcbKHja=UMna*ap zX$+R|5rabeh7GvZT7O&v<#PCPIdig;n=VK;OMSHMIp2?Mc3hW<|2|H?yT6VT7mI6n z-g!y5S2n0Gq?~}`=l3x%5I#G=|0F$d82u|tV00000 LNkvXXu0mjf)xx!o diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closing.png index 5eee2abbc1185db1a4883387fafe954331c6e4b0..54938d9b3b6d478a598510fc54fd1ce9a2a61fd1 100644 GIT binary patch delta 3495 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 V8h$0%N2&k-002ovPDHLkV1m^;*E0YB delta 3402 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 diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/opening.png index 68d40a8586ba4d0e8deb86b9217449b810d4e52e..ec42792e4b28c45cd344788d75fb49616b1f0bca 100644 GIT binary patch delta 3493 zcmV;W4O;T!8m1eNBYzETNklAf`8ySHE>(8(JqrKb_hi2K%Buy7n8dDh zKBJ43D_7#-p*X%<|11_ltG!3Zs0ULg=f#jtJ6x{Ztnsfc){c_1NFaMMwmXaW; zIu3LJZ=P6&<$o<#VArl)BEORPj7DScrw0YR%EvIL8F=NXFc{;Ye_ol1Mp7DwPhs%u z978&TSB9NVWf%j-RHF>%Q{^RBQ zQRQctJr8*0=`fhAVQJ8h8pR_zVN_>`jwBKCc%XA2@5h`bVh_)nz64N`HS}pBSa^EV3$HD1TrWsP!ne1=`jO zj=C(%AI}4VvMi2#)~RxiuZKf;t7{lnE@SA70t2V}?79~JYvCYb$z02ht10|>`lYzE zz8;+CBN(DFhV|_SGpx^&8)pXbk7&FsJ~0QiH2%Kua!hwvzNO?+_cRE9DaQq5^so%R^~|UH`!U%6&wHjdG!z~9jCzcre_#OQ`ulYib+RX; zZ6{xtGq)B?g&LeB3(VAl<1!DwmtwIECTn&|cABNP zEIk+GD+KP31A~2;eQ?_X`-jILIv*b{x`1MQvR=YukC|0p$}^Zw@f1)xwJAI5T7P^o z1DawC4Kp$;x^00@ZRg{=?g9$%H??=;p=+CQurrxs5Y+Cg(P&|-25@VnQS>20`2ZHr zuEKA3c3?&zn86nV;Pn9S{8ff5Ss1u7n3UVQxV3h~`?0mb;#g?K_kxWSuKuRiEO zx*K>q7Rx&gZVH7s)l>86iQ2Rt&wt5hO-)T);}WW>tFd-?5MP~1%P=#OM%}E`ucgk} z0z*|C@AeL3TXh|hBMHb%H|vb^*M>tFi08ThOXLzRAlv#Z5kClPfNedoqWovOyV)(F z5O-4OX=u$ygZ)+k6fX^2~A8!Lc zP1CS${mpoB%NBqcHsR#E?E)f!Kv6!)))GoCCZz@_`}xHH=(>*jx;n(C=p{rfV$!eB zZ2nZZfMWcq5GUXMSvzCqOhl*PB{VA#5Ugym_;18wjPE~I&;=AyKFmC}|5#BMaCacU zi}BqS$z)k#4}kT8Eyn_X{ePteP_sT$D3XN7{@adnEHK~8+?nR43n+*0wm4b#0MN>X zRJtY@#54Pkp^ydMf7LvEej<@GJGhzmhkZv;$O69{45D3C1uI)DzT2XktP6#255O0_ zy+WyEy{l?!P#*}0k)pz9l1bDBs!(0+L08`>qyo!&%DeBXx!7~`6n`43szkkdI**Ll zZ8MXVEf&8V*|By7&o={CZQE0_iOJxfi)8c7PZ11f1_#BNlpdj%gkze7>*_>0eTysh z4yL?l--8f_16wBbru} z@3v&K#P0x={`^)Q#D9&+ATVwapNm%p&6*A3L6388>jmU&Onlrj1}cSQ)KWb zL+)*C?hQBC3hmgv8w;+MA`y7PVbMiOo4aO>c>@a^zfG;FyXGzC=CqM;Tt*q(G95r%-!)(edGj;#x|jkm~Lh*Q9((XXdwl zE1iUtPkCwbZ-0^mwWmiYpJoHCdFM1YM+pt9ng>&DEX88|Xx)TcV8n<~X8H&sl5mJ4h@Ig)Wu8s!zMOKoTK73x(i z%yIWBj>n%e9|pi>3l@womrNzo11`AkI&{4MK3G+iNPoALVU@E?)Ok&R$Bjgw?b~N$ zaUem@xyQ(M@|im3>I^&{Jyn#i${fFmMEKb*Lf&ax#)~aN#G2B+5w{M5y_lpNp(rKJLdel&Mbv2HC^pVj6y05Cj$sVZHL|vygWBq1dJswd> zTn7Ti+3&}&q5y#a5(K4A`F!AXP+9W7em_R2E|no)O{*WjUzAtPZ%8LcN3)iXhG%y2 z;qnYD#b;wTCY;DDSI##T()2(+ExxnVuR&h{SYGZy| zn|~;GSyK~uGAUeOHeZ=GeLAfV(A{N>&vCMy4yRI8O05s)TQE?7_a>07bVDJ0E{XDmCddaOd!F z*?dw|Nf$`2X96ye+RVo{LKFA?4-bE3Kawei%bFnqlqfWh#A|-6pzyj<*RsZ;Ie)_O zoaH$;9`JYvQ03)#{JkY;X)!|sE0{kXocr+s(Fux(lNAF#(csjdukhh_d&Y9gP;lx{ zS^`%Ys$>n1{c9PPFV70jtx!Ir5NY}=O>1i__I`Q@zr5}z zlX1mc@U*XL6Nq2@OIvKWBe{Gd_Q^ zPqux0Fvpv+9l+jlAgofT@TJDi)vbc38?Cfgmq;e}G$3 zbbr8<1*aB?&v!d4r4)Zkq<_%<^d<7l1PN2e>I03P11u zfGKeSj#Byd2e>X52w!-GLh<=-NxAz2DuJ&k634we8;$sQHt0IsD|3AJiG?CQUXhG% z>6OeEV{XOAYi9U|n_|Vs6VsAP=8FNa;^U`EtoV3KDw%J4J&IYM3V#=v9Uoume4BZ` z;^QlwZx2AF#^;}JzC8fvD?Yx``Nk^fJjTaYI$sO`hm1E~e-l!k|KVh^g&4%*7-v;7 zUo!RwbYsgyhmls@w*V_Xo|we0biQK8$A4nR=esO9@%gB1zGUwYSjRC1KLmx?@$u$& z_)6v*!E;&r14_xcY=6-yxj(>VxzPCLx1jO(c(=Fcl(Rp;O}WtcN_Koa{WZ(YEjldY zG0k0-S^ERrl-&IR=a-*%e*negxUox-!cue;-yd*SVjJ55RXun9*-Acs z-u(fjsL9@?NNtuIpMO^oH+Z%#klLIK{<$ds;{JdOkbiN1z#hf@0TsMIK$h`;#qt_{ TTU=7w00000NkvXXu0mjfp{cux delta 3425 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 DLO9jM diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png index df7d776c12c4b1143356957b7de8fc2963ebee6e..62b788cbc74e3186a576165005c45141e3bcbb13 100644 GIT binary patch delta 843 zcmV-R1GN0Y7pD%8BO3q#b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1+gK^1AoH+01m?e z$8V@)0008~NklU}R!uVP#`y=Kv#4E>0Men}?T)5h%~cFCZu+EW*w%3Px~- zn6S8nBp)LK6Tg6zw2Z8ryu6%(q7smlSCCTxlJd$jDqN~+ObqG*Tq+uxTH4w=I=Xtg zIv}8{s{`ceXlm#i7^*WE8GoC|m_o$O%*@O!K)@2BP*cXr+J?cF$IjjXEbr*#>;eI< zZeSG-?jD}D3|`(o?hZP>I=XIt{&3(2R^i|t5a`9=6%+te0G1Di1BeQsf*_y*unD>$ zp-|0G5E=$n;O)f_9uWz2gRWUrG|UA+;2a$jq6<E*%76K?t{n*Kpq!U4 z+rVz*793x5Vi`z* zt+$=>_LHYJ9e>+=diR;L#|~{?yK&c{Er&LrJHPgVazKzRgOT?|nM;>-PV3CS0(98r zJ@c>52Vo#v=hC(7H;fq6Z{AYTxCHXt?U}d1p47PmV%*lcq@i;6raA-Dy_@${WMpL( z6yWFqgdwAH|K>d=VCKDd^Oi75=6wjsypOmZKLKW5U?lc`>dnQCCHp^n{(^~-0RSyP Vm?_%#)sz4L002ovPDHLkV1o0rgS`L% delta 2032 zcmbVNeM}Q)7_Wf12s1NIQKs=YPy}i3uB9zKC?8S`phe_kR;IvlchE|ES9(_|9de3b zrVAg@D2hRmaIBgJN1f52TEC!>%eu6?QMhwp+ zSs;zf&{0b8_4!L6pd*yvI;k2~8^cMhF4AfuDvL^>L$S~+fw|5AclmNlXfl%1U|%9e;|QwD@66bc9yLt?Rz z;~_#Ohhi~{kYYS1C{!ean{-B2M^k{E5=*1atP{a_KnN#7Cc#E6&C-mP{u}Pe=RaBC)2mib8u_3z2E(KY zhK<Gw-OUJsu+(ZXz+3HYL!sexg{h6FviC zsR#j56f6P@ z#j*sk7?ny;e;JSc1IjlJfw9=Xf(aZ=r%eWo4_RlxGDyfsWq`nBBGGV~)6*v2vfaN? zH`Ho0iegxd!pSI=66B*6>2w4tmg5S9l%)$1B8?DAr2YXyMVcaAm?kG+DJ~)K07N#S zucC3Yy}A?n#6RhCA0Sv`((x09>HibaR37`>+1mn*)G>U$a>nN(p3EAT^g3X)6Htu9 z?LDppaeHY=0vx~B{qG!%@n&mDp7g^dA1&h;jG?)7HXAdMVHteF{7bkZS|1q)6IDn-19cJQ})%~@|&jNu%LzF5kA)v^-CrrD+{K+-0 zyOZl0c~y1(;S+sy`~B3zXJ)*r$p;dTO@q2rbx$`Q9%w6ndH7`Q3T1U?_^zbc1%qD6 zpvAYXH?evUT!9-;85-vLdK~QU-12^qw05Xtua+osCEaof46nd}aBd~gc_7w%pk=0S z&g;gZ@S8r*?+w=AO{~YvAzhuV+7i^{;B&pY;_~Wxe{08`hT>sqP_LJVmqdUqZN9Z? zXYs0%7w-hV`A#-(=TiFiD(gUNRv%((xF(KV~#*VE4j2 z@9p2e0M99}EGrKv@Z{#&s@%noB(}brw7}kY@Y1%lxCk5a3?)ovFw^)Wg7NQ|3TY;LWGT~5Ox@wi@IEVR$Hz6JF+qOSzNq*iA-Wf@iSM-I2o=d3@_IW&?MJrmLUh`^9?k&69 zmy(jZa<^Y;Udr^;XJ763p?JaI(?OTQ-{=QrDWbeLKUU1C?50WrJD)o~h}rNZd6PPn zJDjnuyshv%5Qal`9j8Jh)oNbAP&S#E&eQSA9!N)*H%q6F~xSE*<6Xb$OnatfE z3+&C38uT(5o^+=5tsk@`>vUMvZ0?tL*_9h!p6i+$QF}3mbknTgnB%gQrVE9ix8`lx z#4`8dPaZ0yT~*t1<$1Y97ecAKLs!1JQupiiCua{FXc#)(b=#UUG`!|@Mq@VzT^zCb mc|74pW)uy-A2#&a9>y=ubIqT({;bgc(~gRWQJq+kn*TeRDEa*W