swap carp and carp plushie sprites (april 1) (#26080)

* add plushie textures

* swap carp and plushie sprites

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

Resources/Prototypes/Entities/Mobs/NPCs/carp.yml

@@ -1,8 +1,8 @@
 - type: entity
-  name: space carp
+  name: carp plushie
   id: BaseMobCarp
   parent: [ SimpleSpaceMobBase, FlyingMobBase, MobCombat ]
-  description: It's a space carp.
+  description: An adorable stuffed toy that resembles the monstrous space carp.
   abstract: true
   components:
     - type: InputMover
@@ -18,10 +18,10 @@
         - SimpleHostile
     - type: Sprite
       drawdepth: Mobs
-      sprite: Mobs/Aliens/Carps/space.rsi
+      sprite: Objects/Fun/toys.rsi
       layers:
       - map: [ "enum.DamageStateVisualLayers.Base" ]
-        state: alive
+        state: carpplush
     - type: CombatMode
     - type: Physics
     - type: Fixtures
@@ -45,11 +45,11 @@
     - type: DamageStateVisuals
       states:
         Alive:
-          Base: alive
-          BaseUnshaded: mouth
+          Base: carpplush
+          BaseUnshaded: carpplush_mouth
         Dead:
-          Base: dead
-          BaseUnshaded: dead_mouth
+          Base: carpplush
+          BaseUnshaded: carpplush_mouth
     - type: Butcherable
       spawned:
         - id: FoodMeatFish
@@ -87,36 +87,36 @@
   - type: Sprite
     layers:
     - map: [ "enum.DamageStateVisualLayers.Base" ]
-      state: alive
+      state: carpplush
     - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
-      state: mouth
+      state: carpplush_mouth
       shader: unshaded
   - type: RandomSprite
     available:
     - enum.DamageStateVisualLayers.Base:
-        alive: Rainbow
+        carpplush: Rainbow
       enum.DamageStateVisualLayers.BaseUnshaded:
-        mouth: ""
+        carpplush_mouth: ""
 
 - type: entity
-  name: magicarp
+  name: magicarp plushie
   parent: BaseMobCarp
   id: MobCarpMagic
-  description: Looks like some kind of fish. Might be magical.
+  description: Looks like some kind of fish plushie. Might be magical.
   components:
     - type: Sprite
-      sprite: Mobs/Aliens/Carps/magic.rsi
+      sprite: Objects/Fun/magicplush.rsi
     - type: TypingIndicator
       proto: guardian
 
 - type: entity
-  name: holocarp
+  name: holocarp plushie
   parent: BaseMobCarp
   id: MobCarpHolo
-  description: Carp made out of holographic energies. Sadly for you, it is very much real.
+  description: Plush carp made out of holographic energies. Luckily for you, it is very much real.
   components:
     - type: Sprite
-      sprite: Mobs/Aliens/Carps/holo.rsi
+      sprite: Objects/Fun/holoplush.rsi
     - type: Physics
     - type: Fixtures
       fixtures:
@@ -135,8 +135,8 @@
 - type: entity
   parent: MobCarp
   id: MobCarpRainbow
-  name: rainbow carp
-  description: Wow such a shiny fishie!
+  name: rainbow carp plushie
+  description: Wow such a shiny fish plushie!
   components:
   - type: PointLight
     radius: 1.5
@@ -152,7 +152,6 @@
     - type: SalvageMobRestrictions
 
 - type: entity
-  name: space carp
   id: MobCarpDragon
   suffix: DragonBrood
   parent: MobCarp

Resources/Prototypes/Entities/Objects/Fun/toys.yml

@@ -490,11 +490,16 @@
 - type: entity
   parent: BasePlushie
   id: PlushieCarp
-  name: carp plushie
-  description: An adorable stuffed toy that resembles the monstrous space carp.
+  name: space carp
+  description: It's a space carp.
   components:
   - type: Sprite
-    state: carpplush
+    sprite: Mobs/Aliens/Carps/space.rsi
+    layers:
+    - state: alive
+      color: '#BB07F6'
+    - state: mouth
+      shader: unshaded
   - type: Item
     heldPrefix: carpplush
     storedRotation: -90

Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml

@@ -154,7 +154,7 @@
   parent: PlushieCarp
   id: DehydratedSpaceCarp
   name: dehydrated space carp
-  description: Looks like a plush toy carp, but just add water and it becomes a real-life space carp!
+  description: Looks like a regular space carp, but just add water and it becomes a real-life carp plushie!
   components:
   - type: SolutionContainerManager
     solutions:

Resources/Textures/Objects/Fun/holoplush.rsi/meta.json

@@ -0,0 +1,35 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Based on tgstation carpplush sprite, modified by deltanedas (github) for SS14.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "carpplush",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "carpplush_mouth"
+    }
+  ]
+}

Resources/Textures/Objects/Fun/magicplush.rsi/meta.json

@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Based on tgstation carpplush sprite, modified by deltanedas (github) for SS14.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "carpplush"
+    },
+    {
+      "name": "carpplush_mouth"
+    }
+  ]
+}

Resources/Textures/Objects/Fun/toys.rsi/meta.json

@@ -26,6 +26,9 @@
         {
             "name": "carpplush"
         },
+        {
+            "name": "carpplush_mouth"
+        },
         {
             "name": "narplush"
         },