From e8aae6e44b0a7a9f4ecd7e9f80ad6359e2fd8e37 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Sun, 29 Dec 2024 23:38:13 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=A2=D1=80=D0=B5=D0=B9=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Client/_White/Cult/HellSystem.cs | 3 ++- Resources/Prototypes/Traits/neutral.yml | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Content.Client/_White/Cult/HellSystem.cs b/Content.Client/_White/Cult/HellSystem.cs index 27fb05a778..c8aae56a24 100644 --- a/Content.Client/_White/Cult/HellSystem.cs +++ b/Content.Client/_White/Cult/HellSystem.cs @@ -1,6 +1,7 @@ using System.Numerics; using Robust.Client.GameObjects; using Robust.Shared.Utility; +using Content.Shared.CombatMode.Pacification; namespace Content.Client._White.Cult; @@ -23,7 +24,7 @@ public sealed class HellSystem : EntitySystem if (sprite.LayerMapTryGet(HellKey.Key, out _)) return; - var adj = sprite.Bounds.Height / 2 + 1.0f/32 * 6.0f; + var adj = sprite.Bounds.Height / 2 + 1.0f / 32 * 6.0f; var layer = sprite.AddLayer(new SpriteSpecifier.Rsi(new ResPath(Rsi), "animated")); diff --git a/Resources/Prototypes/Traits/neutral.yml b/Resources/Prototypes/Traits/neutral.yml index e7dd8bfb3e..ce99af784e 100644 --- a/Resources/Prototypes/Traits/neutral.yml +++ b/Resources/Prototypes/Traits/neutral.yml @@ -17,12 +17,13 @@ - type: ReplacementAccent accent: dwarf -- type: trait - id: Southern - name: trait-southern-name - description: trait-southern-desc - components: - - type: SouthernAccent +# WD impossible to translate +# - type: trait +# id: Southern +# name: trait-southern-name +# description: trait-southern-desc +# components: +# - type: SouthernAccent - type: trait id: Liar @@ -33,9 +34,9 @@ replacementChance: 0.15 accent: liar -- type: trait +- type: trait # WD id: Hell - name: Hell - description: Hell + name: Высшая добродетель + description: Как в страстях, так и в поступках пороки переступают должное либо в сторону избытка, либо в сторону недостатка, добродетель же умеет находить середину и её избирает. components: - type: Hell From a05c43985570130503b3c86ffd8409eb75e9d750 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Sun, 29 Dec 2024 23:49:04 +0300 Subject: [PATCH 2/3] More --- Content.Client/_White/Cult/HellSystem.cs | 1 - Content.Server/_White/Cult/HellSystem.cs | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 Content.Server/_White/Cult/HellSystem.cs diff --git a/Content.Client/_White/Cult/HellSystem.cs b/Content.Client/_White/Cult/HellSystem.cs index c8aae56a24..99de838825 100644 --- a/Content.Client/_White/Cult/HellSystem.cs +++ b/Content.Client/_White/Cult/HellSystem.cs @@ -1,7 +1,6 @@ using System.Numerics; using Robust.Client.GameObjects; using Robust.Shared.Utility; -using Content.Shared.CombatMode.Pacification; namespace Content.Client._White.Cult; diff --git a/Content.Server/_White/Cult/HellSystem.cs b/Content.Server/_White/Cult/HellSystem.cs new file mode 100644 index 0000000000..d34c520034 --- /dev/null +++ b/Content.Server/_White/Cult/HellSystem.cs @@ -0,0 +1,19 @@ +using Content.Shared.CombatMode.Pacification; +using Content.Server.Bible.Components; + +namespace Content.Server._White.Cult; +public sealed class HellSystem : EntitySystem +{ + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(PentagramAdded); + } + + private void PentagramAdded(EntityUid uid, HellComponent component, ComponentStartup args) + { + EnsureComp(uid); + EnsureComp(uid); + } + +} From b983a71188797091d10cc00f94b511fd6fcd5cb5 Mon Sep 17 00:00:00 2001 From: RavmorganButOnCocaine Date: Sun, 29 Dec 2024 20:52:11 +0000 Subject: [PATCH 3/3] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index b27c574eba..435a380e4a 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -1,13 +1,4 @@ Entries: -- author: RavMorgan - changes: - - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0432\u043E\u0437\ - \u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u043C\u0435\u043D\u044F\u0442\ - \u044C \u0441\u043F\u0440\u0430\u0439\u0442 \u043F\u0440\u0438\u0437\u0440\u0430\ - \u043A\u043E\u0432." - type: Add - id: 145 - time: '2023-04-27T14:01:45.0000000+00:00' - author: RavMorgan changes: - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u043F\u0440\u0438\u0437\ @@ -8907,3 +8898,13 @@ id: 644 time: '2024-12-29T14:41:07.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/856 +- author: BIG_Zi_348 + changes: + - message: "\u041F\u0435\u0440\u0435\u0440\u0430\u0431\u043E\u0442\u0430\u043D\u0430\ + \ \u0447\u0435\u0440\u0442\u0430 Hell, \u043A\u043E\u0442\u043E\u0440\u0430\u044F\ + \ \u0434\u0430\u0451\u0442 \u0438\u0433\u0440\u043E\u043A\u0443 \u043D\u0438\ + \u043C\u0431 \u043D\u0430\u0434 \u0433\u043E\u043B\u043E\u0432\u043E\u0439." + type: Tweak + id: 645 + time: '2024-12-29T20:51:07.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/861