From 68b3c7a5206d63c3590f3c2be36d6df909cd161e Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C4=81da?= <ss.adasts@gmail.com>
Date: Wed, 8 Oct 2025 08:48:00 -0500
Subject: [PATCH] Clean up bucket.yml (#40772)

SMASH that bucket

Co-authored-by: iaada <iaada@users.noreply.github.com>
---
 .../Drinks/drinks_base_materials.yml          | 28 +++++++++++
 .../Entities/Objects/Tools/bucket.yml         | 46 ++-----------------
 2 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base_materials.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base_materials.yml
index 7db03edbf5..43df992b2a 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base_materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base_materials.yml
@@ -117,6 +117,34 @@
     materialComposition:
       Plastic: 25
 
+# Strong plastic
+- type: entity
+  abstract: true
+  parent: DrinkBaseMaterialPlastic
+  id: DrinkBaseMaterialStrongPlastic
+  components:
+  - type: Destructible
+    thresholds:
+    - trigger: # Overkill threshold
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 20 # can take a few more hits than basic plastic
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalCrunch # TODO a plastic break collection
+      - !type:SpillBehavior { }
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: PhysicalComposition
+    materialComposition:
+      Plastic: 100
+
 # Fragile cardboard
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
index c62b178366..3c95afe69e 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
@@ -1,22 +1,13 @@
 - type: entity
-  parent: DrinkBase
+  parent: [ DrinkBaseMaterialStrongPlastic, DrinkBase, DrinkVisualsFill ]
   id: Bucket
   name: bucket
   description: It's a boring old bucket.
   components:
-  - type: Clickable
   - type: Edible
-    edible: Drink
-    solution: bucket
-    destroyOnEmpty: false
     utensil: Spoon
   - type: Sprite
     sprite: Objects/Tools/bucket.rsi
-    layers:
-    - state: icon
-    - map: ["enum.SolutionContainerLayers.Fill"]
-      state: fill-1
-      visible: false
   - type: Item
     size: Normal
   - type: Clothing
@@ -26,50 +17,23 @@
     quickEquip: false
   - type: SolutionContainerManager
     solutions:
-      bucket:
+      drink:
         maxVol: 250
-  - type: MixableSolution
-    solution: bucket
   - type: SolutionTransfer
     transferAmount: 100
     maxTransferAmount: 100
     minTransferAmount: 10
-    canChangeTransferAmount: true
-  - type: UserInterface
-    interfaces:
-      enum.TransferAmountUiKey.Key:
-        type: TransferAmountBoundUserInterface
-  - type: MeleeWeapon
-    soundNoDamage:
-      path: "/Audio/Effects/Fluids/splat.ogg"
-    damage:
-      types:
-        Blunt: 0
-  - type: Spillable
-    solution: bucket
   - type: SpillWhenWorn
-    solution: bucket
-  - type: DrawableSolution
-    solution: bucket
-  - type: RefillableSolution
-    solution: bucket
-  - type: DrainableSolution
-    solution: bucket
-  - type: SolutionItemStatus
-    solution: bucket
-  - type: Appearance
+    solution: drink
   - type: SolutionContainerVisuals
     maxFillLevels: 3
-    fillBaseName: fill-
-  - type: ExaminableSolution
-    solution: bucket
+    inHandsFillBaseName: null
   - type: Tag
     tags:
       - Bucket
   - type: PhysicalComposition
     materialComposition:
       Plastic: 50
-  - type: DnaSubstanceTrace
 
 - type: entity
   parent: Bucket
@@ -79,5 +43,5 @@
   components:
   - type: SolutionContainerManager
     solutions:
-      bucket:
+      drink:
         maxVol: 500
-- 
2.51.2