From 276e4df7499dbc651f8774ce03b42850020c8c05 Mon Sep 17 00:00:00 2001 From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Date: Thu, 11 Sep 2025 06:57:30 -0400 Subject: [PATCH] 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 --- .../Prototypes/Catalog/Fills/Crates/fun.yml | 2 + .../Markers/Spawners/Random/maintenance.yml | 1 + .../Entities/Objects/Decoration/present.yml | 2 + .../Prototypes/Entities/Objects/Fun/toys.yml | 41 ++++++++++++++ .../Weapons/Guns/Projectiles/projectiles.yml | 36 +++++++++++++ .../Structures/Machines/Computers/arcades.yml | 1 + .../tennisball.rsi/equipped-MASK-dog.png | Bin 0 -> 203 bytes .../tennisball.rsi/equipped-MASK-fox.png | Bin 0 -> 207 bytes .../tennisball.rsi/equipped-MASK-puppy.png | Bin 0 -> 203 bytes .../equipped-MASK-reptilian.png | Bin 0 -> 200 bytes .../tennisball.rsi/equipped-MASK-vox.png | Bin 0 -> 195 bytes .../equipped-MASK-vulpkanin.png | Bin 0 -> 201 bytes .../Balls/tennisball.rsi/equipped-MASK.png | Bin 0 -> 201 bytes .../Objects/Fun/Balls/tennisball.rsi/icon.png | Bin 0 -> 207 bytes .../Fun/Balls/tennisball.rsi/inhand-left.png | Bin 0 -> 226 bytes .../Fun/Balls/tennisball.rsi/inhand-right.png | Bin 0 -> 224 bytes .../Fun/Balls/tennisball.rsi/meta.json | 50 ++++++++++++++++++ 17 files changed, 133 insertions(+) create mode 100644 Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-dog.png create mode 100644 Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-fox.png create mode 100644 Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-puppy.png create mode 100644 Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-reptilian.png create mode 100644 Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-vox.png create mode 100644 Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-vulpkanin.png create mode 100644 Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK.png create mode 100644 Resources/Textures/Objects/Fun/Balls/tennisball.rsi/icon.png create mode 100644 Resources/Textures/Objects/Fun/Balls/tennisball.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Fun/Balls/tennisball.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Fun/Balls/tennisball.rsi/meta.json 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 0000000000000000000000000000000000000000..7a8d57d65cc5adf3fd86a71b041a3822dc03871f GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=lRRA~)y|s|*P=E;AgKmj$ zBB!hEKPUKavRkw4>c*?mqB`8(v(8@MvPh%DLU8~3IK4Ta4`-Fai>3H_!pq7qZ~goJsS=MWzMCB}{1Pm= vPw-IEEWP@uWh-9kn8wb#!wFPz@qLn>~)y`{)~C_sSWfw~UQ znQKq~D%N*aZiwGx7v{U#`SqfvqX|WoKO{F;2> zS_(5BRc(&def0gcUbW>ajnyXCV#Us~GBE7_%mdKI;Vst01^#P A^Z)<= literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6ee92fcac690f9628279105d806ae723ee5bc71f GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=lRRA~)y|s|9DL{nnfpz)= z%@cd(&+JuSXuP`f)Pj2}X16+A%GsxuCMs(F{QKAX-Oum)?NVm}YORQp?k?H=E?Bzz z%XHQ=hr>(1U1rUR=auu@U0@Txh6$(w1Rj3u-DhHcUw+NseP?eS{vIsZW}$bEuaM_& wNL&7t4YQV=zHhZ)#VZ}t*m-XRfy!&H$S$|DVU>^H{vD*-)78&qol`;+0PhJcypB@f083Zhr?6qRfmRJ0KFZkW#<4gI1=WJ%TK5E(HE&Gi_ radw_Yxvq~%?!;XSeg5%)lqW3Kx9PEAUAiT!6vXv(^>bP0l+XkKh9*p9 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0e7315ac9dff9903f02edbbcdc46f40bf69a49a1 GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=U7jwEAr-gY-dxCgC_#Yjg7zw5 zg+i57j%NopGjW#))dY91ddo0%!h;DR<_G_-;JdI))c4-!^6C1P-(7*aeGI;oc6DgH zue?>%clXZ0~)y`{+4>>$8;!8iDz z=7l@!XSGaz;F&8rts(ZNnkh%f>ebu3n71@2?0H^p{CRSrJqtsF{ML;g^S_${$#$NE zxP7ZO$Fdjv`~L84A?Nq!r!|2lgMiGfsJo3j+c#XDvwZEe_sflV3S<6U7dU>wKlO%D r%T?3ZeOZNzR&BmgQdtxZR?l6_XwzfED#B%S8pQW>^>bP0l+XkK_Qy@U literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2e909e1a060e04f5352986255dbfaab76f3b9d43 GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=6FglULn>~)y`{+4>>$8;!8iDz z=7l@!XSGaz;F&8rts(ZNnkh%f>ebu3n72gEGTHMyebUd9JLH)d4z&M@SbF{Q93UCX zwn6UxmZS0P1%Jvu6j`^v{`*iAXfz0vrN7>H;Fjl!ou4Os{!zH{u*mbXO!FSe99zn_ u)A__A=~MHksLtBvaW_EiKgdlCA6m_AdTdzNzGgfC;(EIJxvX=t>H2y85}Sb4q9e E04d2;!2kdN literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..be1f1252d11c40f2400c5b2de240ccbe51d9e63b GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR0px_iw z7srr_Id5-mP)_R<&ju%7XoBKvKJ|Cyzv)un}d{B3ww zYRe4N0R#(-r~W<|f9;meJLaV6@pmJxopm@_wI^$OeBkj~hi&iDflBHhv7VQ75nf@` Q7y#1Y>FVdQ&MBb@0K2BR0px`7= z7srr_Id5<6