From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Date: Thu, 11 Sep 2025 10:57:30 +0000 (-0400) Subject: No take; Only throw. (#40143) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=276e4df7499dbc651f8774ce03b42850020c8c05;p=space-station-14.git No take; Only throw. (#40143) * commit atrocities * hail satan * Channel Pavlovian horror * pet kitty cat * Taint universe forever * Assault sensibilities * sully existence * tarnish morality * The degunnening * encratening * Update toys.yml * add few pixels to fix vulp inhands --------- Co-authored-by: ScarKy0 --- diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 6e26006ef1..997b3d91b4 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -414,6 +414,8 @@ - id: ClothingShoesClownLarge - id: ClothingHeadHatMagician - id: BeachBall + - id: TennisBall + amount: 2 - id: ClothingShoesSkates - id: RubberChicken diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index c223efe1a0..bb3829a2dd 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -114,6 +114,7 @@ - id: ToySkeleton - id: Basketball - id: Football + - id: TennisBall - id: BalloonNT - id: BalloonCorgi - id: MysteryFigureBox diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml index de25ec9eb4..5b0c9448a6 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml @@ -100,6 +100,8 @@ orGroup: GiftPool - id: ClothingNeckCloakMoth orGroup: GiftPool + - id: TennisBall + orGroup: GiftPool - id: ToyMouse orGroup: GiftPool - id: ToyAi diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index c1aea7ecd5..0c8ef383c5 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -453,6 +453,47 @@ size: Small sprite: Objects/Fun/Balls/football.rsi +- type: entity + parent: BaseItem + id: TennisBall + name: tennis ball + description: A fuzzy orb of endless betrayal. + components: + - type: Sprite + sprite: Objects/Fun/Balls/tennisball.rsi + state: icon + - type: Fixtures + fixtures: + fix1: + shape: !type:PhysShapeCircle + radius: 0.25 + density: 20 + mask: + - ItemMask + restitution: 0.5 # a little bouncy + friction: 0.2 + - type: Catchable + catchChance: 0.8 + catchSuccessSound: + path: /Audio/Effects/Footsteps/bounce.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/Effects/Footsteps/bounce.ogg + - type: Item + size: Small + sprite: Objects/Fun/Balls/tennisball.rsi + - type: EmitSoundOnUse + sound: + collection: ToySqueak + params: + volume: -4 + - type: UseDelay + - type: Clothing + slots: [mask] + - type: Tag + tags: + - PetWearable + - type: entity parent: BaseItem id: BeachBall diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index cff52ee3a3..4d6738b285 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -971,6 +971,42 @@ types: Piercing: 0 +- type: entity + id: BulletTennis + name: tennis ball + description: A fuzzy orb of endless betrayal. + categories: [ HideSpawnMenu ] + components: + - type: Physics + bodyType: Dynamic + linearDamping: 0 + angularDamping: 0 + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.1,-0.1,0.1,0.1" + hard: false + mask: + - Impassable + - BulletImpassable + - type: Sprite + sprite: Objects/Fun/Balls/tennisball.rsi + layers: + - state: icon + - type: Ammo + muzzleFlash: null + - type: Projectile + deleteOnCollide: true + damage: + types: + Piercing: 0 + soundHit: null + - type: TimedDespawn + lifetime: 10 + + - type: entity id: BulletAcid name: acid spit diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml index 84df160258..27990fb04a 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml @@ -128,6 +128,7 @@ - PlasticBanana - RevolverCapGun - SnapPopBox + - TennisBall - ToyMouse - ToyAi - ToyNuke diff --git a/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-dog.png b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-dog.png new file mode 100644 index 0000000000..7a8d57d65c Binary files /dev/null and b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-dog.png differ diff --git a/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-fox.png b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-fox.png new file mode 100644 index 0000000000..deb668c8df Binary files /dev/null and b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-fox.png differ diff --git a/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-puppy.png b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-puppy.png new file mode 100644 index 0000000000..6ee92fcac6 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-puppy.png differ diff --git a/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-reptilian.png new file mode 100644 index 0000000000..4a2dce685f Binary files /dev/null and b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-vox.png b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..0e7315ac9d Binary files /dev/null and b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..96a574bbfe Binary files /dev/null and b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK.png b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK.png new file mode 100644 index 0000000000..2e909e1a06 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/icon.png b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/icon.png new file mode 100644 index 0000000000..f874ccb247 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/inhand-left.png new file mode 100644 index 0000000000..be1f1252d1 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/inhand-right.png new file mode 100644 index 0000000000..00d9479511 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/meta.json b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/meta.json new file mode 100644 index 0000000000..57651f6be9 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/meta.json @@ -0,0 +1,50 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Created by IproduceWidgets (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-MASK-reptilian", + "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-MASK-dog", + "directions": 4 + }, + { + "name": "equipped-MASK-fox", + "directions": 4 + }, + { + "name": "equipped-MASK-puppy", + "directions": 4 + } + ] +}