From: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Fri, 21 Nov 2025 11:21:30 +0000 (-0800)
Subject: [1984] Beach balls no longer collide with players (#41450)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=7350001598d6dfd3a48f2d2aaec22a2034fd522f;p=space-station-14.git

[1984] Beach balls no longer collide with players (#41450)

* 1984

* me when I'm dumb

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 0d1e7ba019..5e6f64a50f 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -497,60 +497,71 @@
   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/Balls/beach_ball.rsi
-      state: icon
-    - type: Fixtures
-      fixtures:
-        fix1:
-          shape: !type:PhysShapeCircle
-            radius: 0.3
-            position: "0,-0.2"
-          density: 20
-          mask:
-            - ThrownItem
-          restitution: 0.2 # not bouncy
-          friction: 0.2
-    - type: Catchable
-      catchChance: 0.8
-      catchSuccessSound:
-        path: /Audio/Effects/Footsteps/bounce.ogg
-    - type: Item
-      size: Normal
-      sprite: Objects/Fun/Balls/beach_ball.rsi
-    - type: TileFrictionModifier
-      modifier: 0.05
-    - type: TriggerOnCollide
-      fixtureID: fix1
-      keyOut: OnCollide
-    - type: EmitSoundOnTrigger
-      sound:
-        path: /Audio/Effects/Footsteps/bounce.ogg
-      keysIn:
-        - OnCollide
+  - type: Sprite
+    sprite: Objects/Fun/Balls/beach_ball.rsi
+    state: icon
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.3
+          position: "0,-0.2"
+        density: 20
+        mask:
+          - ItemMask
+        restitution: 0.2 # not bouncy
+        friction: 0.2
+  - type: Catchable
+    catchChance: 0.8
+    catchSuccessSound:
+      path: /Audio/Effects/Footsteps/bounce.ogg
+  - type: Item
+    size: Normal
+    sprite: Objects/Fun/Balls/beach_ball.rsi
+  - type: TileFrictionModifier
+    modifier: 0.05
+  - type: TriggerOnCollide
+    fixtureID: fix1
+    keyOut: OnCollide
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/Effects/Footsteps/bounce.ogg
+    keysIn:
+      - OnCollide
 
 - type: entity
   parent: BeachBall
   id: EvilBeachBall
-  suffix: evil
+  suffix: EVIL/ADMEME
   description: Someone's drawn ">:3c" on the side of this beach ball in indelible ink.
   components:
-    - type: LaunchOnTrigger
-      impulse: 100.0
-      keysIn:
-        - OnCollide
-    - type: StaminaDamageOnTrigger
-      stamina: 25.0
-      keysIn:
-        - OnCollide
-      targetUser: true
-    - type: DamageOnTrigger
-      damage:
-        types:
-          Blunt: 20
-      keysIn:
-        - OnCollide
-      targetUser: true
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.3
+          position: "0,-0.2"
+        density: 20
+        mask:
+        - ThrownItem
+        restitution: 0.5 # very bouncy
+        friction: 0.2
+  - type: LaunchOnTrigger
+    impulse: 100.0
+    keysIn:
+      - OnCollide
+  - type: StaminaDamageOnTrigger
+    stamina: 25.0
+    keysIn:
+      - OnCollide
+    targetUser: true
+  - type: DamageOnTrigger
+    damage:
+      types:
+        Blunt: 20
+    keysIn:
+      - OnCollide
+    targetUser: true
 
 - type: entity
   parent: BaseItem