add more carp plushies (#26081)

* carp plushie textures

* add the plushies

* add plushies to spawners

* rainbow carp and make special plushies rarer

---------

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

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
index 70341cb019fe46eebbcaaec3f0e08d678ed00997..bf9ac2f436e6e00a9297625d0e709f5b070e4748 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -112,6 +112,16 @@
           prob: 0.44
         - id: PlushieCarp
           prob: 0.2
+          orGroup: carp
+        - id: PlushieHolocarp
+          prob: 0.05
+          orGroup: carp
+        - id: PlushieMagicarp
+          prob: 0.05
+          orGroup: carp
+        - id: PlushieRainbowCarp
+          prob: 0.03
+          orGroup: carp
         - id: PlushieSlime
           prob: 0.2
         - id: PlushieSnake
@@ -205,6 +215,16 @@
           prob: 0.44
         - id: PlushieCarp
           prob: 0.2
+          orGroup: carp
+        - id: PlushieHolocarp
+          prob: 0.05
+          orGroup: carp
+        - id: PlushieMagicarp
+          prob: 0.05
+          orGroup: carp
+        - id: PlushieRainbowCarp
+          prob: 0.03
+          orGroup: carp
         - id: PlushieSlime
           prob: 0.2
         - id: PlushieSnake

diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
index 5087e53980f80c2b1ad7a8d3085720a5986686e0..8fdc4793513c1688f01a27869b1427580c2d0788 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
@@ -68,6 +68,12 @@
         orGroup: GiftPool
       - id: PlushieCarp
         orGroup: GiftPool
+      - id: PlushieMagicarp
+        orGroup: GiftPool
+      - id: PlushieHolocarp
+        orGroup: GiftPool
+      - id: PlushieRainbowCarp
+        orGroup: GiftPool
       - id: PlushieSlime
         orGroup: GiftPool
       - id: PlushieSnake

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 902735bb303ad5e24e6921b01ce8a79e14cbcd55..d36b4b292c2b0ad23646ad2f9e4b32ce3831585f 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -521,6 +521,38 @@
     angle: 0
     animation: WeaponArcBite # Rrrr!
 
+- type: entity
+  parent: PlushieCarp
+  id: PlushieMagicarp
+  name: magicarp plushie
+  description: An adorable stuffed toy resembling the exceedingly rare magicarp.
+  components:
+  - type: Sprite
+    state: magicplush
+
+- type: entity
+  parent: PlushieCarp
+  id: PlushieRainbowCarp
+  name: rainbow carp plushie
+  description: An adorable stuffed toy resembling the legendary rainbow carp.
+  components:
+  - type: Sprite
+    state: rainbowcarpplush
+  - type: PointLight
+    radius: 1.5
+    energy: 2
+  - type: RgbLightController
+    layers: [ 0 ]
+
+- type: entity
+  parent: PlushieCarp
+  id: PlushieHolocarp
+  name: holocarp plushie
+  description: A holographic stuffed toy resembling science's nemesis - the holocarp.
+  components:
+  - type: Sprite
+    state: holoplush
+
 - type: entity
   parent: BasePlushie
   id: PlushieSlime

diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
index d2ba7cd544a15abb32ba789f9730adb982559cfd..85f6dc689413d0f2531f95fc6e004e664e4b1a8f 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
@@ -63,6 +63,9 @@
     - PlushieSpaceLizard
     - PlushieNuke
     - PlushieCarp
+    - PlushieMagicarp
+    - PlushieHolocarp
+    - PlushieRainbowCarp
     - PlushieRatvar
     - PlushieNar
     - PlushieSnake

diff --git a/Resources/Textures/Objects/Fun/toys.rsi/holoplush.png b/Resources/Textures/Objects/Fun/toys.rsi/holoplush.png
new file mode 100644 (file)
index 0000000..811bf9e
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/holoplush.png differ

diff --git a/Resources/Textures/Objects/Fun/toys.rsi/magicplush.png b/Resources/Textures/Objects/Fun/toys.rsi/magicplush.png
new file mode 100644 (file)
index 0000000..950de93
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/magicplush.png differ

diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
index ef50532eba797805156bf2fa7fb10255f9c4be1e..fc92a479367fcb00cb0609485856772b48749399 100644 (file)
--- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
@@ -1,328 +1,355 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003, holoplush and magicplush modified by deltanedas (github)",
   "size": {
     "x": 32,
     "y": 32
   },
-    "states": [
-        {
-            "name": "plushie_ratvar"
-        },
-        {
-            "name": "plushie_penguin"
-        },
-            {
-            "name": "plushie_moth"
-        },
-        {
-            "name": "plushie_rouny",
-            "directions": 4
-        },
-        {
-            "name": "plushie_spacelizard"
-        },
-        {
-            "name": "carpplush"
-        },
-        {
-            "name": "narplush"
-        },
-        {
-            "name": "plushie_h"
-        },
-        {
-            "name": "bee-equipped-HELMET",
-            "directions": 4
-        },
-        {
-            "name": "bee-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "bee-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "plushie_hampter"
-        },
-        {
-            "name": "plushie_arachnid"
-        },
-        {
-            "name": "plushie_lizard"
-        },
-        {
-            "name": "plushie_lizard_mirrored"
-        },
-        {
-            "name": "plushie_lamp"
-        },
-        {
-            "name": "plushie_nuke"
-        },
-        {
-            "name": "plushie_atmosian"
-        },
-        {
-            "name": "plushie_slime"
-        },
-        {
-            "name": "plushie_snake"
-        },
-        {
-            "name": "plushie_vox"
-        },
-        {
-            "name": "plushie_diona"
-        },
-        {
-            "name": "plushie_human"
-        },
-        {
-            "name": "plushie_diona1"
-        },
-        {
-            "name": "plushie_xeno"
-        },
-        {
-            "name": "carpplush-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "carpplush-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "AI"
-        },
-        {
-            "name": "base"
-        },
-        {
-            "name": "bolt-closed"
-        },
-        {
-            "name": "bolt-open"
-        },
-        {
-            "name": "foamblade"
-        },
-        {
-            "name": "foamcrossbow"
-        },
-        {
-            "name": "foamdart"
-        },
-        {
-            "name": "foambox"
-        },
-        {
-            "name": "ian"
-        },
-        {
-            "name": "nuketoy"
-        },
-        {
-            "name": "snappop"
-        },
-        {
-            "name": "spbox"
-        },
-        {
-            "name": "toy_mouse"
-        },
-        {
-            "name": "mouse-equipped-HELMET",
-            "directions": 4
-        },
-        {
-            "name": "capbullet"
-        },
-        {
-            "name": "foamcrossbow-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "foamcrossbow-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "capgun-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "capgun-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "foamblade-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "foamblade-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "corgib-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "corgib-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "ntb-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "ntb-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "synb-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "synb-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "synb"
-        },
-               {
-                       "name": "ntb"
-               },
-        {
-            "name": "corgib"
-        },
-        {
-            "name": "football"
-        },
-        {
-            "name": "footb-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "footb-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "basketball"
-        },
-        {
-            "name": "bask-inhand-right",
-            "directions": 4,
-            "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,
-                    0.1
-                ],
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "bask-inhand-left",
-            "directions": 4,
-            "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,
-                    0.1
-                ],
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "singularitytoy",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "orb",
-            "delays": [
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "orb-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "orb-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "beachball"
-        },
-        {
-            "name": "beachb-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "beachb-inhand-right",
-            "directions": 4
-        }
-    ]
+  "states": [
+    {
+      "name": "plushie_ratvar"
+    },
+    {
+      "name": "plushie_penguin"
+    },
+    {
+      "name": "plushie_moth"
+    },
+    {
+      "name": "plushie_rouny",
+      "directions": 4
+    },
+    {
+      "name": "plushie_spacelizard"
+    },
+    {
+      "name": "carpplush"
+    },
+    {
+      "name": "holoplush",
+      "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": "magicplush"
+    },
+    {
+      "name": "rainbowcarpplush"
+    },
+    {
+      "name": "narplush"
+    },
+    {
+      "name": "plushie_h"
+    },
+    {
+      "name": "bee-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "bee-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "bee-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "plushie_hampter"
+    },
+    {
+      "name": "plushie_arachnid"
+    },
+    {
+      "name": "plushie_lizard"
+    },
+    {
+      "name": "plushie_lizard_mirrored"
+    },
+    {
+      "name": "plushie_lamp"
+    },
+    {
+      "name": "plushie_nuke"
+    },
+    {
+      "name": "plushie_atmosian"
+    },
+    {
+      "name": "plushie_slime"
+    },
+    {
+      "name": "plushie_snake"
+    },
+    {
+      "name": "plushie_vox"
+    },
+    {
+      "name": "plushie_diona"
+    },
+    {
+      "name": "plushie_human"
+    },
+    {
+      "name": "plushie_diona1"
+    },
+    {
+      "name": "plushie_xeno"
+    },
+    {
+      "name": "carpplush-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "carpplush-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "AI"
+    },
+    {
+      "name": "base"
+    },
+    {
+      "name": "bolt-closed"
+    },
+    {
+      "name": "bolt-open"
+    },
+    {
+      "name": "foamblade"
+    },
+    {
+      "name": "foamcrossbow"
+    },
+    {
+      "name": "foamdart"
+    },
+    {
+      "name": "foambox"
+    },
+    {
+      "name": "ian"
+    },
+    {
+      "name": "nuketoy"
+    },
+    {
+      "name": "snappop"
+    },
+    {
+      "name": "spbox"
+    },
+    {
+      "name": "toy_mouse"
+    },
+    {
+      "name": "mouse-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "capbullet"
+    },
+    {
+      "name": "foamcrossbow-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "foamcrossbow-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "capgun-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "capgun-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "foamblade-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "foamblade-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "corgib-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "corgib-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "ntb-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "ntb-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "synb-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "synb-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "synb"
+    },
+    {
+      "name": "ntb"
+    },
+    {
+      "name": "corgib"
+    },
+    {
+      "name": "football"
+    },
+    {
+      "name": "footb-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "footb-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "basketball"
+    },
+    {
+      "name": "bask-inhand-right",
+      "directions": 4,
+      "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,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "bask-inhand-left",
+      "directions": 4,
+      "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,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "singularitytoy",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "orb",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "orb-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "orb-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "beachball"
+    },
+    {
+      "name": "beachb-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "beachb-inhand-right",
+      "directions": 4
+    }
+  ]
 }

diff --git a/Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush.png b/Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush.png
new file mode 100644 (file)
index 0000000..2897243
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush.png differ