From 5a5e39f47d6a362e1f32e49920689d76598e401d Mon Sep 17 00:00:00 2001 From: CMDR-Piboy314 <92357316+CMDR-Piboy314@users.noreply.github.com> Date: Sat, 4 Nov 2023 01:07:16 -0400 Subject: [PATCH] Added a penguin plushie! (#21097) --- Resources/Prototypes/Catalog/Fills/Crates/fun.yml | 1 + .../Prototypes/Entities/Objects/Fun/toys.yml | 9 +++++++++ .../Structures/Machines/Computers/arcades.yml | 3 ++- Resources/Textures/Objects/Fun/toys.rsi/meta.json | 7 +++++-- .../Objects/Fun/toys.rsi/plushie_penguin.png | Bin 0 -> 448 bytes 5 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/plushie_penguin.png diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 1526cf0f63..862423864e 100644 --- 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 49ef8faddd..91b968ae3c 100644 --- 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 ab2bdb2c5d..3e91e929d4 100644 --- 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 a5f1211666..7ab46a3108 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, 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 index 0000000000000000000000000000000000000000..979af83fa9562ca2ca2eb706fbbe4fafa9c4de6e GIT binary patch literal 448 zcmV;x0YCnUP)Px$dPzhYakC$y;wad;Z-7uzU##hG%J6i_ET06Dh-9Pa30tYA4wS-~FWHKo| zZ>d1jG-DwIz7ye&vIjx647|<|+qP4ijtH$^;B|&5dO4evGA%5GKnMX4ml07IkgR?% z7$Bu22!f11DINp?wr!^(%I<=86D9?h#Zr&q-xTnCF$=M7x*1Po1*7rZs qiRN#?jl)K6EQHXyifd|Wew|Nq5sY&dh4SG50000b*b! literal 0 HcmV?d00001 -- 2.51.2