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

Content.Server/_White/Commands/PoshelnahuiCommand.cs

@@ -13,7 +13,7 @@ public sealed class PoshelnahuiCommand : IConsoleCommand
     public string Command => "poshelnahui";
     public string Description => "Close client game lol";
     public string Help => "poshelnahui <ckey>";
-    private readonly List<string> _vip = ["Valtos", "Dosharus", "BIG_Zi_348"];
+    private readonly List<string> _vip = ["Valtos", "SamsungS", "Dosharus", "BIG_Zi_348"];
     public void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         if (args.Length != 1 || string.IsNullOrEmpty(args[0]))

Resources/Prototypes/_White/Ghosts/custom_ghosts.yml

@@ -517,8 +517,8 @@
   ckey: nekovich
   sprite: White/Ghosts/nekovich-ghost.rsi
   alpha: 0.9
-  ghostName: nekovich
-  ghostDescription:  Law's Left Hand.
+  ghostName: Nekovich
+  ghostDescription: Law's Left Hand.
 
 #Feda_Plevajecki
 - type: customGhost
@@ -555,7 +555,7 @@
   sprite: White/Ghosts/deliko-ghost.rsi
   alpha: 0.9
   ghostName: МГЕ Русланчек
-  ghostDescription: Лучше бы ты даже из кроватки не вылезал.
+  ghostDescription: Будешь машинистом в тепловозе.
 
 #Dragon4ik
 - type: customGhost

Resources/Textures/White/Ghosts/17shu-ghost.rsi/meta.json

@@ -9,7 +9,7 @@
   "states": [
     {
       "name": "animated",
-        "delays": [
+      "delays": [
             [
                 0.1,
                 0.1,

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

@@ -3,12 +3,13 @@
   "license": "CC-BY-SA-3.0",
   "copyright": "https://github.com/frosty-dev/white",
   "size": {
-    "x": 96,
-    "y": 96
+    "x": 32,
+    "y": 32
   },
   "states": [
     {
-      "name": "animated"
+      "name": "animated",
+      "directions": 4
     }
   ]
 }

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

@@ -1,15 +1,14 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-"copyright": "Provided by sho",
+  "copyright": "Provided by sho",
   "size": {
-    "x": 64,
-    "y": 64
+    "x": 96,
+    "y": 96
   },
   "states": [
     {
       "name": "animated",
-      "directions": 1,
       "delays": [
           [
               0.2,
@@ -18,10 +17,6 @@
               0.2,
               0.2,
               0.2,
-              0.2,
-              0.2,
-              0.2,
-              0.2,
               0.2
           ]
       ]