From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Fri, 11 Apr 2025 00:54:24 +0000 (-0400)
Subject: Add Aluminum Source (Cans) (#36449)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=2769de7b5ddfd54a97780d309d31de4957305ee6;p=space-station-14.git

Add Aluminum Source (Cans) (#36449)

* aluminium cans

* shhhhh
---

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
index c1a6adbb68..d933cbcd1b 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -14,11 +14,19 @@
         - ReagentId: Cola
           Quantity: 30
         maxVol: 30
+      grindable:
+        reagents: # 5u -> 1/2 steel sheet (10u)
+        - ReagentId: Aluminium # Fun fact: soda can makeup is approx. 75% aluminium and 25% tin/iron.
+          Quantity: 4
+        - ReagentId: Iron
+          Quantity: 1
   - type: MixableSolution
     solution: drink
   - type: SolutionTransfer
     canChangeTransferAmount: true
     maxTransferAmount: 15
+  - type: Extractable
+    grindableSolutionName: grindable
   - type: UserInterface
     interfaces:
       enum.TransferAmountUiKey.Key:
@@ -81,6 +89,12 @@
         reagents:
         - ReagentId: Cola
           Quantity: 30
+      grindable:
+        reagents:
+        - ReagentId: Aluminium
+          Quantity: 4
+        - ReagentId: Iron
+          Quantity: 1
   - type: Tag
     tags:
     - Cola
@@ -101,6 +115,12 @@
     solutions:
       drink:
         maxVol: 30
+      grindable:
+        reagents:
+        - ReagentId: Aluminium
+          Quantity: 4
+        - ReagentId: Iron
+          Quantity: 1
   - type: Openable
     opened: true
   - type: Sprite
@@ -129,6 +149,12 @@
         reagents:
         - ReagentId: IcedTea
           Quantity: 30
+      grindable:
+        reagents:
+        - ReagentId: Aluminium
+          Quantity: 4
+        - ReagentId: Iron
+          Quantity: 1
   - type: Sprite
     sprite: Objects/Consumable/Drinks/ice_tea_can.rsi
   - type: Item
@@ -147,6 +173,12 @@
         reagents:
         - ReagentId: LemonLime
           Quantity: 30
+      grindable:
+        reagents:
+        - ReagentId: Aluminium
+          Quantity: 4
+        - ReagentId: Iron
+          Quantity: 1
   - type: Sprite
     sprite: Objects/Consumable/Drinks/lemon-lime.rsi
   - type: Item
@@ -165,6 +197,12 @@
         reagents:
         - ReagentId: LemonLimeCranberry
           Quantity: 30
+      grindable:
+        reagents:
+        - ReagentId: Aluminium
+          Quantity: 4
+        - ReagentId: Iron
+          Quantity: 1
   - type: Sprite
     sprite: Objects/Consumable/Drinks/lemon-lime-cranberry.rsi
   - type: Item
@@ -216,6 +254,12 @@
         reagents:
         - ReagentId: GrapeSoda
           Quantity: 30
+      grindable:
+        reagents:
+        - ReagentId: Aluminium
+          Quantity: 4
+        - ReagentId: Iron
+          Quantity: 1
   - type: Sprite
     sprite: Objects/Consumable/Drinks/purple_can.rsi
   - type: Item
@@ -234,6 +278,12 @@
         reagents:
         - ReagentId: RootBeer
           Quantity: 30
+      grindable:
+        reagents:
+        - ReagentId: Aluminium
+          Quantity: 4
+        - ReagentId: Iron
+          Quantity: 1
   - type: Sprite
     sprite: Objects/Consumable/Drinks/rootbeer.rsi
   - type: Item
@@ -255,6 +305,12 @@
         reagents:
         - ReagentId: SodaWater
           Quantity: 30
+      grindable:
+        reagents:
+        - ReagentId: Aluminium
+          Quantity: 4
+        - ReagentId: Iron
+          Quantity: 1
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/sodawater.rsi
@@ -272,6 +328,12 @@
         reagents:
         - ReagentId: SpaceMountainWind
           Quantity: 30
+      grindable:
+        reagents:
+        - ReagentId: Aluminium
+          Quantity: 4
+        - ReagentId: Iron
+          Quantity: 1
   - type: Sprite
     sprite: Objects/Consumable/Drinks/space_mountain_wind.rsi
   - type: Item
@@ -290,6 +352,12 @@
         reagents:
         - ReagentId: SpaceUp
           Quantity: 30
+      grindable:
+        reagents:
+        - ReagentId: Aluminium
+          Quantity: 4
+        - ReagentId: Iron
+          Quantity: 1
   - type: Sprite
     sprite: Objects/Consumable/Drinks/space-up.rsi
   - type: Item
@@ -308,6 +376,12 @@
         reagents:
         - ReagentId: SolDry
           Quantity: 30
+      grindable:
+        reagents:
+        - ReagentId: Aluminium
+          Quantity: 4
+        - ReagentId: Iron
+          Quantity: 1
   - type: Sprite
     sprite: Objects/Consumable/Drinks/sol_dry.rsi
   - type: Item
@@ -326,6 +400,12 @@
         reagents:
         - ReagentId: Starkist
           Quantity: 30
+      grindable:
+        reagents:
+        - ReagentId: Aluminium
+          Quantity: 4
+        - ReagentId: Iron
+          Quantity: 1
   - type: Sprite
     sprite: Objects/Consumable/Drinks/starkist.rsi
   - type: Item
@@ -344,6 +424,12 @@
         reagents:
         - ReagentId: TonicWater
           Quantity: 30
+      grindable:
+        reagents:
+        - ReagentId: Aluminium
+          Quantity: 4
+        - ReagentId: Iron
+          Quantity: 1
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/tonic.rsi
@@ -361,6 +447,12 @@
         reagents:
         - ReagentId: FourteenLoko
           Quantity: 30
+      grindable:
+        reagents:
+        - ReagentId: Aluminium
+          Quantity: 4
+        - ReagentId: Iron
+          Quantity: 1
   - type: Sprite
     sprite: Objects/Consumable/Drinks/fourteen_loko.rsi
   - type: Item
@@ -379,6 +471,12 @@
         reagents:
         - ReagentId: ChangelingSting
           Quantity: 30
+      grindable:
+        reagents:
+        - ReagentId: Aluminium
+          Quantity: 4
+        - ReagentId: Iron
+          Quantity: 1
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/changelingsting.rsi
@@ -398,6 +496,12 @@
         reagents:
         - ReagentId: DrGibb
           Quantity: 30
+      grindable:
+        reagents:
+        - ReagentId: Aluminium
+          Quantity: 4
+        - ReagentId: Iron
+          Quantity: 1
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/dr_gibb.rsi
@@ -421,6 +525,12 @@
           Quantity: 20
         - ReagentId: Ice
           Quantity: 5
+      grindable:
+        reagents:
+        - ReagentId: Aluminium
+          Quantity: 4
+        - ReagentId: Iron
+          Quantity: 1
   - type: Tag
     tags:
     - DrinkCan
@@ -443,6 +553,12 @@
         reagents:
         - ReagentId: EnergyDrink
           Quantity: 30
+      grindable:
+        reagents:
+        - ReagentId: Aluminium
+          Quantity: 4
+        - ReagentId: Iron
+          Quantity: 1
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/energy_drink.rsi
@@ -515,6 +631,12 @@
         reagents:
         - ReagentId: ShamblersJuice
           Quantity: 30
+      grindable:
+        reagents:
+        - ReagentId: Aluminium
+          Quantity: 4
+        - ReagentId: Iron
+          Quantity: 1
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/shamblersjuice.rsi
@@ -534,6 +656,12 @@
         reagents:
         - ReagentId: PwrGame
           Quantity: 30
+      grindable:
+        reagents:
+        - ReagentId: Aluminium
+          Quantity: 4
+        - ReagentId: Iron
+          Quantity: 1
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/pwrgame.rsi
@@ -553,6 +681,12 @@
         reagents:
         - ReagentId: Beer
           Quantity: 30
+      grindable:
+        reagents:
+        - ReagentId: Aluminium
+          Quantity: 4
+        - ReagentId: Iron
+          Quantity: 1
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/beer_can.rsi
@@ -575,6 +709,12 @@
         reagents:
         - ReagentId: Wine
           Quantity: 30
+      grindable:
+        reagents:
+        - ReagentId: Aluminium
+          Quantity: 4
+        - ReagentId: Iron
+          Quantity: 1
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/wine_can.rsi