Extractable items for Ghetto Chemistry (#209)

Workbench-Team · Aug 1, 2023 · da07d2c · da07d2c
1 parent 31fd0b9
commit da07d2c
Show file tree

Hide file tree

Showing 8 changed files with 80 additions and 3 deletions.
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -155,6 +155,8 @@
           Quantity: 4
         - ReagentId: Vitamin
           Quantity: 2
+        - ReagentId: Potassium
+          Quantity: 3
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/banana.rsi
   - type: Produce

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -144,6 +144,17 @@
   - type: Sprite
     state: energybar-open
   - type: Item
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 30
+        reagents:
+        - ReagentId: Sugar
+          Quantity: 5
+        - ReagentId: Nutriment
+          Quantity: 10
+  - type: Extractable
+    grinableSolutionName: food
 
 - type: entity
   name: popcorn
@@ -206,6 +217,17 @@
     state: syndicakes
   - type: Item
   - type: Food
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 30
+        reagents:
+        - ReagentId: Sugar
+          Quantity: 5
+        - ReagentId: Nutriment
+          Quantity: 10
+  - type: Extractable
+    grinableSolutionName: food
     trash: FoodPacketSyndiTrash
 
 - type: entity
@@ -276,10 +298,13 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 1
         reagents:
         - ReagentId: Nutriment
           Quantity: 1
+        - ReagentId: Sugar
+          Quantity: 3
+  - type: Extractable
+    grinableSolutionName: food
   - type: Item
     sprite: Objects/Consumable/Food/snacks.rsi
     heldPrefix: packet

diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -224,6 +224,14 @@
   - type: PhysicalComposition
     materialComposition:
       Steel: 25
+  - type: SolutionContainerManager
+    solutions:
+      pen:
+        reagents:
+         - ReagentId: Iodine
+           Quantity: 5
+  - type: Extractable
+    grinableSolutionName: pen
 
 - type: entity
   name: Cybersun pen

diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml
@@ -63,6 +63,14 @@
     materialComposition:
       Glass: 25
   - type: SpaceGarbage
+  - type: SolutionContainerManager
+    solutions:
+      glowstick:
+        reagents:
+          - ReagentId: Nitrogen
+            Quantity: 15
+  - type: Extractable
+    grindableSolutionName: glowstick
 
 - type: entity
   parent: BaseLightbulb

diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
@@ -23,8 +23,8 @@
   - type: Extractable
     juiceSolution:
       reagents:
-        - ReagentId: Zinc
-          Quantity: 5
+        - ReagentId: Lithium
+          Quantity: 15
   - type: Tag
     tags:
       - DroneUsable

diff --git a/Resources/Prototypes/Entities/Objects/Specific/atmos.yml b/Resources/Prototypes/Entities/Objects/Specific/atmos.yml
@@ -35,3 +35,11 @@
     materialComposition:
       Steel: 400
       Glass: 100
+  - type: SolutionContainerManager
+    solutions:
+      gasanalyser:
+        reagents:
+        - ReagentId: Mercury
+          Quantity: 15
+  - type: Extractable
+    grindableSolutionName: gasanalyser
diff --git a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
@@ -61,6 +61,16 @@
           startValue: 5.0
           endValue: 1.5
           property: Radius
+    - type: SolutionContainerManager
+      solutions:
+        glowstick:
+          reagents:
+          - ReagentId: Oxygen
+            Quantity: 10
+          - ReagentId: Hydrogen
+            Quantity: 10
+    - type: Extractable
+      grindableSolutionName: glowstick
 
 - type: entity
   name: red glowstick

diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
@@ -40,6 +40,14 @@
     unlitIcon: match_unlit
     litIcon: match_lit
     burntIcon: match_burnt
+  - type: SolutionContainerManager
+    solutions:
+      match:
+        reagents:
+        - ReagentId: Phosphorus
+          Quantity: 2
+  - type: Extractable
+    grinableSolutionName: match
 
 - type: entity
   parent: Matchstick
@@ -51,6 +59,14 @@
       - state: match_burnt
   - type: Matchstick
     state: Burnt
+  - type: SolutionContainerManager
+    solutions:
+      match:
+        reagents:
+        - ReagentId: Carbon
+          Quantity: 5
+  - type: Extractable
+    grinableSolutionName: match
 
 - type: entity
   name: match box