Add atmosian plushie (#14062)

diff --git a/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs b/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs
index 9b1124accb35b5e2fb4d4c181d9025c17ad9074d..ad31b81c6fddbb3b68dac4a7a209f96a06793125 100644 (file)
--- 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 ae51a5773a2c2a2faa65d3b54406fef1a72a441f..815dcf90cd21a9c91a240a636b140743f815830d 100644 (file)
--- 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 491292ab98471aef03ddab6b4ca7f1398c116712..9b89f3faaceef45caf79165a6e8c434ae748be05 100644 (file)
--- 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 a4315a16e686187c300bf4fead6d9e2b970d49a1..ab5a8968c1b8f5a12a51d0f07f99d7f32db7d2b8 100644 (file)
--- 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 e38c0abff19fd2524520fc284fc5710b3c4521c2..82d3a0a13cdd1cc5cfeab1a120ae74c630b62ab1 100644 (file)
--- 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 (file)
index 0000000..1a29d9c
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushie_atmosian.png differ