From d6c4f3118fa8cfcd829271df174cf55518cfb377 Mon Sep 17 00:00:00 2001 From: mhamster <81412348+mhamsterr@users.noreply.github.com> Date: Sat, 18 Feb 2023 04:57:14 +0700 Subject: [PATCH] Add atmosian plushie (#14062) --- .../Components/SpaceVillainArcadeComponent.cs | 2 +- Resources/Prototypes/Catalog/Fills/Crates/fun.yml | 5 ++++- .../Entities/Markers/Spawners/Random/toy.yml | 1 + .../Prototypes/Entities/Objects/Fun/toys.yml | 10 ++++++++++ Resources/Textures/Objects/Fun/toys.rsi/meta.json | 3 +++ .../Objects/Fun/toys.rsi/plushie_atmosian.png | Bin 0 -> 937 bytes 6 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/plushie_atmosian.png 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 0000000000000000000000000000000000000000..1a29d9ca564a2451a738a5a5abbeb4d4f4bd136f GIT binary patch literal 937 zcmV;a16KTrP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D10+dAK~z{r?Ui3h zQ*ji>k2;VB%Z4*t5h;yjL8cgtX;%19H0;5Lz?Tw&2#V@02^E4IWlu$aAcVkr5qz+J z7(rM$%mxvX6?L0hXs&X#)<_6uw|&p zvB54YA=B0oG<0T029UIGFs7`Cwv?G@Z$pIRs~vfUO&9{n-5U#JIrKo5zmKqD{jiJV z7rkbFlB=RcwxYVg!JgWnvYJom^Ata*hF%l8OC=6;S5NY~?Yxy0G#(BsQ37jTjBNR4 zUF|Sr0LeSMRw+C4soy=OLa=(F_Big1ZgW!zoU4jmyNMr$Z46zZs?Rn1w7q&2;_V^FLn!pq>q9orl(CPt%?Ik2Tw@ zYX*SR>6ACGi|`EO=9ekEvy8s>vu4?9$>;NtBuTo?HdFx|j$uQx#v z)a7!K-|wgD>T2E>1Ofq8hr_`Nj8s7LLuG4hGt;}FawjWHs1b&cRPdx*qJ0DBC~)c| z4GxDibEGw}tIA2A!r#dM@&onV4DtS^Iwva9IqUf1{n(_@0)Dv}ICP!EwAr ziHM$^xyXsGxR3H0H^!cM`U|<%7xLb6>r%SaFJ)#x^uFj|12wH|qWw*Yn}XKXR@Ua` zW>$b1`B+gxZ!dMQ2|-3JNR?dl8bcQhCjRB@_Qc;U1`spQ?v=><-peKy?Tkr2WSV3!Y~k*NJmNoaF3+GbY^Vv<;j{n%01jnXNoGw=04e|g00;m8000000Mb*F00000 LNkvXXu0mjf3WTM; literal 0 HcmV?d00001 -- 2.52.0