Merge remote-tracking branch 'WD-core/master' into upstream-core

Content.Client/_White/Cult/HellSystem.cs

@@ -23,7 +23,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"));
 

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<HellComponent, ComponentStartup>(PentagramAdded);
+    }
+
+    private void PentagramAdded(EntityUid uid, HellComponent component, ComponentStartup args)
+    {
+        EnsureComp<PacifiedComponent>(uid);
+        EnsureComp<BibleUserComponent>(uid);
+    }
+
+}

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

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