From 309fa1af7057ce44591ec2c56eb62dd71d2bfc55 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Mon, 26 Jun 2023 05:07:01 +0300 Subject: [PATCH] Add beachball and basketball tweaks (#17285) * comit * fix comit * Update meta.json * Update SpaceVillainArcadeComponent.cs * aaa * updatey * update desc --- .../SpaceVillainArcadeComponent.cs | 2 +- .../Prototypes/Catalog/Fills/Crates/fun.yml | 1 + .../Prototypes/Entities/Objects/Fun/toys.yml | 18 ++++++++++++++++++ .../Fun/toys.rsi/beachb-inhand-left.png | Bin 0 -> 957 bytes .../Fun/toys.rsi/beachb-inhand-right.png | Bin 0 -> 957 bytes .../Objects/Fun/toys.rsi/beachball.png | Bin 0 -> 1048 bytes .../Textures/Objects/Fun/toys.rsi/meta.json | 13 ++++++++++++- 7 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/beachb-inhand-left.png create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/beachb-inhand-right.png create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/beachball.png diff --git a/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeComponent.cs b/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeComponent.cs index c11851af57..8c3979f287 100644 --- a/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeComponent.cs +++ b/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeComponent.cs @@ -101,7 +101,7 @@ public sealed class SpaceVillainArcadeComponent : SharedSpaceVillainArcadeCompon "FoamCrossbow", "RevolverCapGun", "PlushieHampter", "PlushieLizard", "PlushieAtmosian", "PlushieSpaceLizard", "PlushieNuke", "PlushieCarp", "PlushieRatvar", "PlushieNar", "PlushieSnake", "Basketball", "Football", "PlushieRouny", "PlushieBee", "PlushieSlime", "BalloonCorgi", "ToySword", "CrayonBox", "BoxDonkSoftBox", "BoxCartridgeCap", - "HarmonicaInstrument", "OcarinaInstrument", "RecorderInstrument", "GunpetInstrument", "BirdToyInstrument", "PlushieXeno" + "HarmonicaInstrument", "OcarinaInstrument", "RecorderInstrument", "GunpetInstrument", "BirdToyInstrument", "PlushieXeno", "BeachBall" }; /// diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 36121f2a06..eb320441f4 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -261,3 +261,4 @@ - id: VehicleUnicycleFolded - id: ClothingShoesClownLarge - id: ClothingHeadHatMagician + - id: BeachBall diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 2f1321bae8..c298c7b27b 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -816,6 +816,8 @@ size: 24 sprite: Objects/Fun/toys.rsi heldPrefix: bask + - type: TileFrictionModifier + modifier: 0.01 - type: entity parent: BaseItem @@ -831,6 +833,22 @@ sprite: Objects/Fun/toys.rsi heldPrefix: footb +- type: entity + parent: BaseItem + id: BeachBall + name: beach ball + description: The simple beach ball is one of Nanotrasen's most popular products. 'Why do we make beach balls? Because we can! (TM)' - Nanotrasen + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: beachball + - type: Item + size: 24 + sprite: Objects/Fun/toys.rsi + heldPrefix: beachb + - type: TileFrictionModifier + modifier: 0.01 + - type: entity parent: BaseItem id: BalloonSyn diff --git a/Resources/Textures/Objects/Fun/toys.rsi/beachb-inhand-left.png b/Resources/Textures/Objects/Fun/toys.rsi/beachb-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..df983ddb73a1cb7c9a1a097e98b03f8de115fe28 GIT binary patch literal 957 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 Sw^#}Q0000