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 0000000000..df983ddb73 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/beachb-inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/beachb-inhand-right.png b/Resources/Textures/Objects/Fun/toys.rsi/beachb-inhand-right.png new file mode 100644 index 0000000000..df983ddb73 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/beachb-inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/beachball.png b/Resources/Textures/Objects/Fun/toys.rsi/beachball.png new file mode 100644 index 0000000000..dc7b94dab4 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/beachball.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json index f6af02149a..7304e6d459 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", + "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", "size": { "x": 32, "y": 32 @@ -330,6 +330,17 @@ { "name": "orb-inhand-right", "directions": 4 + }, + { + "name": "beachball" + }, + { + "name": "beachb-inhand-left", + "directions": 4 + }, + { + "name": "beachb-inhand-right", + "directions": 4 } ] }