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 5568777e4f..85715a9ca0 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png differ 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 ecf3129640..2d854b6b48 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed.png differ 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 5eee2abbc1..54938d9b3b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closing.png differ 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 68d40a8586..ec42792e4b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/opening.png differ 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 df7d776c12..62b788cbc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png differ