From: mhamster <81412348+mhamsterr@users.noreply.github.com>
Date: Fri, 17 Feb 2023 21:57:14 +0000 (+0700)
Subject: Add atmosian plushie (#14062)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=d6c4f3118fa8cfcd829271df174cf55518cfb377;p=space-station-14.git

Add atmosian plushie (#14062)
---

diff --git a/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs b/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs
index 9b1124accb..ad31b81c6f 100644
--- a/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs
+++ b/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs
@@ -57,7 +57,7 @@ namespace Content.Server.Arcade.Components
             "ToyMouse", "ToyAi", "ToyNuke", "ToyAssistant", "ToyGriffin", "ToyHonk", "ToyIan",
             "ToyMarauder", "ToyMauler", "ToyGygax", "ToyOdysseus", "ToyOwlman", "ToyDeathRipley",
             "ToyPhazon", "ToyFireRipley", "ToyReticence", "ToyRipley", "ToySeraph", "ToyDurand", "ToySkeleton",
-            "FoamCrossbow", "RevolverCapGun", "PlushieLizard", "PlushieSpaceLizard",
+            "FoamCrossbow", "RevolverCapGun", "PlushieLizard", "PlushieAtmosian", "PlushieSpaceLizard",
             "PlushieNuke", "PlushieCarp", "PlushieRatvar", "PlushieNar", "PlushieSnake", "Basketball", "Football",
             "PlushieRouny", "PlushieBee", "PlushieSlime", "BalloonCorgi", "ToySword", "CrayonBox", "BoxDonkSoftBox", "BoxCartridgeCap",
             "HarmonicaInstrument", "OcarinaInstrument", "RecorderInstrument", "GunpetInstrument", "BirdToyInstrument"
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
index ae51a5773a..815dcf90cd 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -28,6 +28,9 @@
         amount: 1
       - id: PlushieSharkBlue
         amount: 1
+      - id: PlushieAtmosian
+        amount: 1
+
 
 - type: entity
   id: CrateFunInstruments
@@ -158,7 +161,7 @@
         amount: 4
       - id: KnifePlastic
         amount: 1
-        
+
 - type: entity
   id: CrateFunSyndicateSegway
   parent: CrateLivestock
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
index 491292ab98..9b89f3faac 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
@@ -14,6 +14,7 @@
       rareChance: 0.03
       prototypes:
         - PlushieBee
+        - PlushieAtmosian
         - PlushieNuke
         - PlushieLizard
         - PlushieNar
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index a4315a16e6..ab5a8968c1 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -282,6 +282,16 @@
   - type: MeleeWeapon
     soundHit:
       path: /Audio/Voice/Vox/shriek1.ogg
+
+- type: entity
+  parent: BasePlushie
+  id: PlushieAtmosian
+  name: atmosian plushie
+  description: An adorable stuffed toy that resembles a brave atmosian. Unfortunately, he won't fix those depressurizations for you.
+  components:
+  - type: Sprite
+    state: plushie_atmosian
+
 ## Figurines
 
 - type: entity
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
index e38c0abff1..82d3a0a13c 100644
--- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
@@ -34,6 +34,9 @@
         {
             "name": "plushie_nuke"
         },
+        {
+            "name": "plushie_atmosian"
+        },
         {
             "name": "plushie_slime"
         },
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_atmosian.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_atmosian.png
new file mode 100644
index 0000000000..1a29d9ca56
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushie_atmosian.png differ