From: dontbetank <59025279+dontbetank@users.noreply.github.com>
Date: Wed, 29 Mar 2023 22:36:54 +0000 (+0300)
Subject: plushie (#14962)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=81a2b293170a5a71b4e0738d88746f4a7ba96181;p=space-station-14.git

plushie (#14962)
---

diff --git a/Resources/Audio/Items/Toys/toy_rustle.ogg b/Resources/Audio/Items/Toys/toy_rustle.ogg
new file mode 100644
index 0000000000..de8b37d0ca
Binary files /dev/null and b/Resources/Audio/Items/Toys/toy_rustle.ogg differ
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 84b41d07ee..7a3882c484 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -129,6 +129,66 @@
     soundHit:
       path: /Audio/Items/Toys/muffled_weh.ogg
 
+- type: entity
+  parent: BasePlushie
+  id: PlushieDiona
+  name: diona plushie
+  description: An adorable stuffed toy that resembles a diona. Love water and cuddles. Do not wet!
+  components:
+    - type: Sprite
+      layers:
+        - state: plushie_diona
+        - state: plushie_diona1
+          map: [ "enum.SolutionContainerLayers.Fill" ]
+          visible: false
+    - type: EmitSoundOnUse
+      sound:
+        path: /Audio/Items/Toys/toy_rustle.ogg
+    - type: EmitSoundOnLand
+      sound:
+        path: /Audio/Items/Toys/toy_rustle.ogg
+    - type: EmitSoundOnActivate
+      sound:
+        path: /Audio/Items/Toys/toy_rustle.ogg
+    - type: MeleeWeapon
+      soundHit:
+        path: /Audio/Items/Toys/toy_rustle.ogg
+    - type: SolutionContainerManager
+      solutions:
+        plushie:
+          maxVol: 1
+    - type: RefillableSolution
+      solution: plushie
+    - type: SolutionContainerVisuals
+      maxFillLevels: 1
+      fillBaseName: plushie_diona
+      changeColor: false
+    - type: Appearance
+    - type: Reactive
+      reactions:
+        - reagents: [ Water ]
+          methods: [ Touch ]
+          effects:
+            - !type:AddToSolutionReaction
+              solution: plushie
+    - type: Fixtures
+      fixtures:
+        - shape:
+            !type:PhysShapeAabb
+            bounds: "-0.3,-0.3,0.3,0.3"
+          density: 15
+          mask:
+            - ItemMask
+        - shape:
+            !type:PhysShapeAabb
+            bounds: "-0.3,-0.3,0.3,0.3"
+          id: "rehydrate"
+          hard: false
+          layer:
+            - LowImpassable
+    - type: CollisionWake
+      enabled: false
+
 - type: entity
   parent: BasePlushie
   id: PlushieSharkBlue
@@ -588,7 +648,7 @@
       revolver-ammo: !type:Container
 
 - type: entity
-  parent: RevolverCapGun 
+  parent: RevolverCapGun
   id: RevolverCapGunFake
   name: cap gun
   description: Looks almost like the real thing! Ages 8 and up.
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
index 82d3a0a13c..b07a96aa74 100644
--- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "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",
+  "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 ",
   "size": {
     "x": 32,
     "y": 32
@@ -46,6 +46,12 @@
         {
             "name": "plushie_vox"
         },
+        {
+            "name": "plushie_diona"
+        },
+        {
+            "name": "plushie_diona1"
+        },
         {
             "name": "doll"
         },
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_diona.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_diona.png
new file mode 100644
index 0000000000..195cca1362
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushie_diona.png differ
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_diona1.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_diona1.png
new file mode 100644
index 0000000000..b6bd6a0bb7
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushie_diona1.png differ