Added a penguin plushie! (#21097)

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
index 1526cf0f6304e02e0cd171d56a7196228df9eafa..862423864eebd2b6cb9bd7d9b4430f6d0dacde70 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -24,6 +24,7 @@
       - id: PlushieXeno
       - id: PlushieHampter
       - id: PlushieMoth
+      - id: PlushiePenguin
 
 - type: entity
   id: CrateFunInstrumentsVariety

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 49ef8faddde36a79fb1e3d56155f06a6907791ec..91b968ae3c938dd5a3f310057f4a2b263fa1371a 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -1088,3 +1088,12 @@
   - type: MeleeWeapon
     soundHit:
       path: /Audio/Voice/Moth/moth_chitter.ogg
+
+- type: entity
+  parent: BasePlushie
+  id: PlushiePenguin
+  name: penguin plushie
+  description: I use arch btw!
+  components:
+  - type: Sprite
+    state: plushie_penguin

diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
index ab2bdb2c5d885a9a99c5acc1a46072ce1eb5bdc0..3e91e929d49f0e5f5299ec812c073b7672cd71d9 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   abstract: true
   id: ArcadeBase
   description: An arcade cabinet.
@@ -85,6 +85,7 @@
     - BeachBall
     - PlushieMoth
     - PlushieHampter
+    - PlushiePenguin
   - type: WiresPanel
   - type: Wires
     layoutId: Arcade

diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
index a5f1211666fc08cc8e9bad0ff1782200867fba7c..7ab46a310831a3316c03b528511025223079fc3a 100644 (file)
--- 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, 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",
+  "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",
   "size": {
     "x": 32,
     "y": 32
@@ -10,7 +10,10 @@
         {
             "name": "plushie_ratvar"
         },
-           {
+        {
+            "name": "plushie_penguin"
+        },
+                   {
             "name": "plushie_moth"
         },
         {

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