From 24ae961d9140d4a0bbd5db317ce728ade6d4e0fd Mon Sep 17 00:00:00 2001
From: BioMass <155424652+Tetronamecronicus@users.noreply.github.com>
Date: Tue, 21 May 2024 23:57:39 +0300
Subject: [PATCH] GhostFixCM

---
 .../Entities/Mobs/Player/admin_ghost.yml      |  23 ++++++++++--------
 .../ghost_admin.rsi/{aghost1.png => 1.png}    | Bin
 .../ghost_admin.rsi/{aghost3.png => 2.png}    | Bin
 .../ghost_admin.rsi/{aghost4.png => 3.png}    | Bin
 .../ghost_admin.rsi/{aghost5.png => 4.png}    | Bin
 .../ghost_admin.rsi/{aghost6.png => 5.png}    | Bin
 .../Mobs/Ghosts/ghost_admin.rsi/meta.json     |  10 ++++----
 7 files changed, 18 insertions(+), 15 deletions(-)
 rename Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/{aghost1.png => 1.png} (100%)
 rename Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/{aghost3.png => 2.png} (100%)
 rename Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/{aghost4.png => 3.png} (100%)
 rename Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/{aghost5.png => 4.png} (100%)
 rename Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/{aghost6.png => 5.png} (100%)

diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index d29ea5fe831..1156352e608 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -7,10 +7,10 @@
   - type: Sprite
     overrideContainerOcclusion: true # Ghosts always show up regardless of where they're contained.
     drawdepth: Ghosts
-    sprite: SimpleStation14/Mobs/Ghosts/ghost_admin.rsi  
+    sprite: SimpleStation14/Mobs/Ghosts/ghost_admin.rsi
     color: "#888888"
     layers:
-    - state: aghost1
+    - state: "1"
       shader: unshaded
   - type: Eye
     visMask:
@@ -37,6 +37,9 @@
   - type: Physics
     ignorePaused: true
     bodyType: Kinematic
+  - type: CustomGhosts
+    maxRandomIndex: 5
+    ckeys: ""
   - type: Body
     prototype: Aghost
   - type: Access
@@ -104,14 +107,14 @@
   - type: InventorySlots
   - type: Loadout
     prototypes: [ MobAghostGear ]
-  - type: RandomSprite
-    available:
-      - 0:
-          aghost1: ""                               
-          aghost3: ""           
-          aghost4: ""           
-          aghost5: "" 
-          aghost6: "" 
+  #- type: RandomSprite
+  #  available:
+  #    - 0:
+  #        aghost1: ""
+  #        aghost3: ""
+  #        aghost4: ""
+  #        aghost5: ""
+  #        aghost6: ""
 
 - type: entity
   id: ActionAGhostShowSolar
diff --git a/Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/aghost1.png b/Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/1.png
similarity index 100%
rename from Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/aghost1.png
rename to Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/1.png
diff --git a/Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/aghost3.png b/Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/2.png
similarity index 100%
rename from Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/aghost3.png
rename to Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/2.png
diff --git a/Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/aghost4.png b/Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/3.png
similarity index 100%
rename from Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/aghost4.png
rename to Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/3.png
diff --git a/Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/aghost5.png b/Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/4.png
similarity index 100%
rename from Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/aghost5.png
rename to Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/4.png
diff --git a/Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/aghost6.png b/Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/5.png
similarity index 100%
rename from Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/aghost6.png
rename to Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/5.png
diff --git a/Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/meta.json b/Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/meta.json
index d06ff5ffdff..dcb201e132f 100644
--- a/Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/meta.json
+++ b/Resources/Textures/SimpleStation14/Mobs/Ghosts/ghost_admin.rsi/meta.json
@@ -8,7 +8,7 @@
     "copyright": "Made by Pspritechologist? ; aghost3-5 by GeneralGaws ; aghost6 by MOYAMAMA",
     "states": [
         {
-            "name": "aghost1",
+            "name": "1",
             "directions": 4
         },
         {
@@ -16,19 +16,19 @@
             "directions": 4
         },
 	{
-	    "name": "aghost3",
+	    "name": "2",
             "directions": 4
 	},
 	{
-	    "name": "aghost4",
+	    "name": "3",
             "directions": 4
 	},
 	{
-	    "name": "aghost5",
+	    "name": "4",
             "directions": 4
 	},
         {
-            "name": "aghost6",
+            "name": "5",
             "delays": [
 		   [
                    0.1,