Merge remote-tracking branch 'upstream/master'

Content.Client/_White/Explosion/RMCExplosionShockWaveOverlay.cs

@@ -21,7 +21,7 @@ public sealed class ExplosionShockWaveOverlay : Overlay, IEntityEventSubscriber
     /// <summary>
     ///     Maximum number of distortions that can be shown on screen at a time.
     /// </summary>
-    public const int MaxCount = 30;
+    public const int MaxCount = 15;
 
     public ExplosionShockWaveOverlay()
     {

Resources/Changelog/ChangelogWhite.yml

@@ -1,13 +1,4 @@
 Entries:
-- author: RavMorgan
-  changes:
-  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u043A\u043E\u043C\
-      \u0430\u043D\u0434\u0430 \u0433\u043B\u043E\u0431\u0430\u043B\u044C\u043D\u043E\
-      \u0433\u043E \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u044F \u0437\u0443\
-      \u043C\u0430."
-    type: Add
-  id: 18
-  time: '2022-12-30T10:12:10.0000000+00:00'
 - author: EnefFlow
   changes:
   - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u043F\u0440\u043E\
@@ -8556,3 +8547,11 @@
   id: 517
   time: '2024-08-22T22:55:24.0000000+00:00'
   url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/656
+- author: Spatison
+  changes:
+  - message: "\u041E\u0441\u043B\u0430\u0431\u043B\u0435\u043D\u0430 \u0432\u0437\u0440\
+      \u044B\u0432\u043D\u0430\u044F \u0432\u043E\u043B\u043D\u0430"
+    type: Tweak
+  id: 518
+  time: '2024-08-23T08:38:47.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/660

Resources/Prototypes/_White/Ghosts/custom_ghosts.yml

@@ -482,3 +482,21 @@
   alpha: 0.9
   ghostName: Ярик
   ghostDescription: Дробилка, маска, плащ... Все эти вещи, казалось, сроднились с ним, сопровождая его даже после смерти.
+
+#Jabak
+- type: customGhost
+  id: jabak-ghost
+  ckey: Jabak
+  sprite: White/Ghosts/jabak-ghost.rsi
+  alpha: 0.9
+  ghostName: Жопа
+  ghostDescription: Хуй
+
+#Devf_2
+- type: customGhost
+  id: devf_2-ghost
+  ckey: Devf_2
+  sprite: White/Ghosts/devf_2-ghost.rsi
+  alpha: 0.9
+  ghostName: Devf_2
+  ghostDescription: Aladeen madafaka

Resources/Textures/White/Ghosts/devf_2-ghost.rsi/meta.json

@@ -0,0 +1,15 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Giedi Prime Team",
+    "size": {
+        "x": 64,
+        "y": 64
+    },
+    "states": [
+        {
+            "name": "animated",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/White/Ghosts/lllkjjjklll-ghost.rsi/meta.json

@@ -16,6 +16,8 @@
           0.14,
           0.14,
           0.14,
+          0.14,
+          0.14,
           0.14
         ],
         [
@@ -23,6 +25,8 @@
           0.14,
           0.14,
           0.14,
+          0.14,
+          0.14,
           0.14
         ],
         [
@@ -30,6 +34,8 @@
           0.14,
           0.14,
           0.14,
+          0.14,
+          0.14,
           0.14
         ],
         [
@@ -37,6 +43,8 @@
           0.14,
           0.14,
           0.14,
+          0.14,
+          0.14,
           0.14
         ]
       ]