From f976ca027087819df1083452e750a4a757e41ed8 Mon Sep 17 00:00:00 2001 From: lzk228 <124214523+lzk228@users.noreply.github.com> Date: Mon, 8 May 2023 01:50:08 +0300 Subject: [PATCH] Add xeno plushie (#16228) --- .../Components/SpaceVillainArcadeComponent.cs | 2 +- .../Prototypes/Catalog/Fills/Crates/fun.yml | 4 ++++ .../Prototypes/Entities/Objects/Fun/toys.yml | 22 ++++++++++++++++++ .../Textures/Objects/Fun/toys.rsi/meta.json | 5 +++- .../Objects/Fun/toys.rsi/plushie_xeno.png | Bin 0 -> 1038 bytes 5 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/plushie_xeno.png diff --git a/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs b/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs index ad31b81c6f..3b54f82dda 100644 --- a/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs +++ b/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs @@ -60,7 +60,7 @@ namespace Content.Server.Arcade.Components "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" + "HarmonicaInstrument", "OcarinaInstrument", "RecorderInstrument", "GunpetInstrument", "BirdToyInstrument", "PlushieXeno" }; [DataField("rewardMinAmount")] diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index d1d9c89cd1..9f9605951c 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -16,8 +16,12 @@ - id: PlushieRouny - id: PlushieRatvar - id: PlushieSharkBlue + orGroup: PlushieShark + - id: PlushieSharkGrey + orGroup: PlushieShark - id: PlushieAtmosian - id: PlushieDiona + - id: PlushieXeno - type: entity id: CrateFunInstrumentsVariety diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index a79048620e..4358dc0546 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -363,6 +363,27 @@ - type: Sprite state: plushie_atmosian +- type: entity + parent: BasePlushie + id: PlushieXeno + name: xeno plushie + description: An adorable stuffed toy that resembles a scary xenomorf. You're lucky it's just a toy. + components: + - type: Sprite + state: plushie_xeno + - type: EmitSoundOnUse + sound: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: MeleeWeapon + soundHit: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + ## Figurines - type: entity @@ -906,3 +927,4 @@ - type: Tag tags: - ClownRecorder + diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json index 48a4eb52ac..188836c3a3 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) ", + "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", "size": { "x": 32, "y": 32 @@ -53,6 +53,9 @@ { "name": "plushie_diona1" }, + { + "name": "plushie_xeno" + }, { "name": "doll" }, diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_xeno.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_xeno.png new file mode 100644 index 0000000000000000000000000000000000000000..7ca78f2d49f909e4e0e1f84bd6d4e271bcfeee09 GIT binary patch literal 1038 zcmV+p1o8WcP)Px&$Vo&&R9J=Wmr-xqHWYo-}V$u8xkUFD;y9Q<|odb91w7 zqE3PMApm(XBLt7usWeT+e13y>0q-4c8&Ju3{&M*soM1aSHu$~b09vO~Z#Vq<%kONf zE#5msT9i^q%joLno1^V|7J$5%F`Zrj2*8^+fA*_x+kl85A}FQ$3*hpnYeH~G+w|lX z#Nt)8mP5)9Lu6koNi-q&lX;(|fmnQ7Z2`J|t8r@&i#u2I_;o>=TIGHHV*v7Eh6pGH z+iE*n^{^n&X+Y#?@fUpsN+HsAAY!2*h^Tx;g7-C_zdUpW&J^$FKOuJNmCQ`2>n+#U zuK@_5V?rhH_os(_(!I1t`CseGVQX)w&1qWB^H`Y1?qt^Y=isYTM8kF=m2uTY3BLJ@@w?0aSc;wgrb9PEq_!nwq#m zLU3qpMq>bF`9-GFi=J-hI^U?Ovdpku`29Ty5nECvM zs#?o*deJY!+Fae;eqcVo8SS2D8Hmmo(eHLZ077u&`Q`53k3g;0E9UbX?(aX2m^c>S z{R$#&bzNcYln{LX1vpoeBpR(#%JNG;@9OFmRaN#N7-;RV4JSpI7c;VKLep#oU^cs^ zt~V!vTAQ<4El5+NymxYS^@_T#A~3ZnS6G`<*PD?TPckr|OaaoiVMKXdZ~EVH3_2ld zZPe}%g4RZb;CAeMyMU7bqIi@_5NZ3(1v=`Dv1~SvXl+Q6ge1}NRSCh-wn2H zh!NWWCk`ZeF~b-OAR?_yCY|{hV{xt~&o4<5jWL!G9LCtu>WYg?w$)m^ZzKdK*5b9>7rzMCY5$u6uQFHjmx20qw)_SY)+Y^dJCiR&aOwp`RZeG0|GJA)E(rb@dA9 z`Wq7;#t>wT<#N9>78jS;Y;WInQ&O%UVJFO!MwDd}wOl?Bg6|!UjPnyJQ`64&ebC|4-F+UHMHo}YJo9UIoBOR^5POuz4Pfb zRl)nGZAOR3=tDQliy2y*(TR6h{8)~|JpamHvs1SFe;kW{0MZ>zt^C40k^lez07*qo IM6N<$g4~$yc>n+a literal 0 HcmV?d00001 -- 2.51.2