Cherry-picked commit f8305a2 from space-wizards/space-station-14/master

Simple-Station · Mar 15, 2024 · fe63d7d · fe63d7d
1 parent 3bf08c7
commit fe63d7d
Show file tree

Hide file tree

Showing 8 changed files with 408 additions and 320 deletions.
diff --git 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
@@ -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
@@ -506,6 +506,38 @@
     tags:
     - PlushieCarp # DeltaV - fish labeler craft
 
+- 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
@@ -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
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/magicplush.png b/Resources/Textures/Objects/Fun/toys.rsi/magicplush.png