From d621880a562c8293b11a1a36f3cfd74c3b199b7b Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Wed, 28 Sep 2022 19:30:17 +1300
Subject: [PATCH] Fix carp sprites (#11572)

---
 .../Prototypes/Entities/Mobs/NPCs/carp.yml    | 49 +++++++++----------
 1 file changed, 22 insertions(+), 27 deletions(-)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
index bbcaefdfe0..5dc8abf93c 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -15,20 +15,10 @@
     - type: Sprite
       drawdepth: Mobs
       netsync: false
+      sprite: Mobs/Aliens/Carps/space.rsi
       layers:
-        - map: [ "enum.DamageStateVisualLayers.Base" ]
-          state: base
-          sprite: Mobs/Aliens/Carps/space.rsi
-        - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
-          state: mouth
-          sprite: Mobs/Aliens/Carps/space.rsi
-          shader: unshaded
-    - type: RandomSprite
-      available:
-        - enum.DamageStateVisualLayers.Base:
-            base: Rainbow
-          enum.DamageStateVisualLayers.BaseUnshaded:
-            mouth: ""
+      - map: [ "enum.DamageStateVisualLayers.Base" ]
+        state: base
     - type: CombatMode
       disarmAction:
         enabled: false
@@ -82,41 +72,46 @@
       tags:
         - Carp
         - DoorBumpOpener
+    - type: ReplacementAccent
+      accent: genericAggressive
 
 - type: entity
   parent: BaseMobCarp
   id: MobCarp
   components:
-    - type: ReplacementAccent
-      accent: genericAggressive
+  - type: Sprite
+    layers:
+    - map: [ "enum.DamageStateVisualLayers.Base" ]
+      state: base
+    - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
+      state: mouth
+      shader: unshaded
+  - type: RandomSprite
+    available:
+    - enum.DamageStateVisualLayers.Base:
+        base: Rainbow
+      enum.DamageStateVisualLayers.BaseUnshaded:
+        mouth: ""
 
 - type: entity
   name: magicarp
-  parent: MobCarp
+  parent: BaseMobCarp
   id: MobCarpMagic
   description: Looks like some kind of fish. Might be magical.
   components:
     - type: Sprite
-      drawdepth: Mobs
-      layers:
-        - map: [ "enum.DamageStateVisualLayers.Base" ]
-          state: base
-          sprite: Mobs/Aliens/Carps/magic.rsi
+      sprite: Mobs/Aliens/Carps/magic.rsi
     - type: TypingIndicator
       proto: guardian
 
 - type: entity
   name: holocarp
-  parent: MobCarp
+  parent: BaseMobCarp
   id: MobCarpHolo
   description: Carp made out of holographic energies. Sadly for you, it is very much real.
   components:
     - type: Sprite
-      drawdepth: Mobs
-      layers:
-        - map: [ "enum.DamageStateVisualLayers.Base" ]
-          state: base
-          sprite: Mobs/Aliens/Carps/holo.rsi
+      sprite: Mobs/Aliens/Carps/holo.rsi
     - type: Physics
     - type: Fixtures
       fixtures: