Adds more grindables (#24267)

* Adds more grindables

* fuc

* A

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/base_electronics.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/base_electronics.yml
index d55b5a1098f302ba9ee3dafaa70cab3487a0dd90..ff9f0c32397f1cb167f94d33c61874ca8a31d255 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/base_electronics.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/base_electronics.yml
@@ -17,4 +17,4 @@
       materialComposition:
         Glass: 200
       chemicalComposition:
-        Silicon: 20
+        Silicon: 20
\ No newline at end of file

diff --git a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
index 440bc4dd8a8d8b56dfab2e6e971a6a292b9e20ab..ef511373cf96cae348a260dc0fe058a2081e6b97 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
@@ -57,6 +57,14 @@
     - type: Tag
       tags:
         - DroneUsable
+    - type: Extractable
+      grindableSolutionName: mousetrap
+    - type: SolutionContainerManager
+      solutions:
+        mousetrap:
+          reagents:
+          - ReagentId: Cellulose
+            Quantity: 3 #its probably wooden
 
 - type: entity
   name: mousetrap

diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
index 18590e98dfc783c7c56efaebf6af97b63908ddb9..ec36377cfea8a43f1c228fac39128aa59682ec89 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
@@ -60,7 +60,7 @@
       paper:
         reagents:
         - ReagentId: Cellulose
-          Quantity: 3
+          Quantity: 10
 
 
 - type: entity

diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index 9cfc2c00f2cd7578e383387e02bff77be9a3049e..8af4daef8d82fe7235a16a5c2405b6453fed1525 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -54,7 +54,7 @@
       cardboard:
         reagents:
         - ReagentId: Cellulose
-          Quantity: 6
+          Quantity: 10
 
 - type: entity
   parent: MaterialCardboard

diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index 86dadb8da843064484dd1360fd6c02bf13c0916d..3ea2eb64e0ad472efe4eebf5946ce0e585ebb10e 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -56,6 +56,14 @@
               max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+  - type: Extractable
+    grindableSolutionName: paper
+  - type: SolutionContainerManager
+    solutions:
+      paper:
+        reagents:
+        - ReagentId: Cellulose
+          Quantity: 3
 
 - type: entity
   name: paper scrap
@@ -270,6 +278,16 @@
     damage:
       types:
         Piercing: 3
+  - type: Extractable
+    grindableSolutionName: pen
+  - type: SolutionContainerManager
+    solutions:
+      pen:
+        reagents:
+        - ReagentId: Iron
+          Quantity: 2
+        - ReagentId: Iodine
+          Quantity: 1
 
 #TODO: I want the luxury pen to write a cool font like Merriweather in the future.
 
@@ -406,6 +424,14 @@
         prob: 0.2
       - id: Paper
         prob: 0.2
+  - type: Extractable
+    grindableSolutionName: folder
+  - type: SolutionContainerManager
+    solutions:
+      folder:
+        reagents:
+        - ReagentId: Cellulose
+          Quantity: 4 #a little more rigid then paper so it yields slightly more
 
 - type: entity
   id: BoxFolderRed
@@ -502,6 +528,16 @@
     layers:
     - state: folder-centcom
     - state: folder-base
+  - type: Extractable
+    grindableSolutionName: centcommfolder
+  - type: SolutionContainerManager
+    solutions:
+      centcommfolder:
+        reagents:
+        - ReagentId: Cellulose
+          Quantity: 4
+        - ReagentId: Gold
+          Quantity: 1
 
 - type: entity
   id: BoxFolderClipboard
@@ -561,6 +597,14 @@
     damage:
       types:
         Blunt: 6
+  - type: Extractable
+    grindableSolutionName: clipboard
+  - type: SolutionContainerManager
+    solutions:
+      clipboard:
+        reagents:
+        - ReagentId: Cellulose
+          Quantity: 5
 
 - type: entity
   id: BoxFolderCentComClipboard
@@ -586,6 +630,16 @@
     slots: [belt]
     quickEquip: false
     sprite: Objects/Misc/cc-clipboard.rsi
+  - type: Extractable
+    grindableSolutionName: centcommclipboard
+  - type: SolutionContainerManager
+    solutions:
+      centcommclipboard:
+        reagents:
+        - ReagentId: Cellulose
+          Quantity: 4
+        - ReagentId: Gold
+          Quantity: 1
 
 - type: entity
   id: BoxFolderQmClipboard

diff --git a/Resources/Prototypes/Entities/Objects/Tools/flare.yml b/Resources/Prototypes/Entities/Objects/Tools/flare.yml
index 6ef85c015ee35243632e173979e49fe50abbeaf0..4f09f4d3baf752ec4086ae83f512c57e77dd7807 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/flare.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flare.yml
@@ -71,3 +71,11 @@
         maxDuration: 15.0
         startValue: 10.0
         endValue: 1.0
+  - type: Extractable
+    grindableSolutionName: flare
+  - type: SolutionContainerManager
+    solutions:
+      flare:
+        reagents:
+        - ReagentId: Sulfur
+          Quantity: 15

diff --git a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
index 5aea0d8a2911659c29ffa9193074b110c4735fcd..cdf0c2666323d3f5dde04ad5c0ed8e208b4efc0f 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
@@ -60,6 +60,18 @@
           maxDuration: 10 # 300.0
           startValue: 5.0
           endValue: 1.5
+    - type: Extractable
+      grindableSolutionName: glowstick
+    - type: SolutionContainerManager
+      solutions:
+        glowstick:
+          reagents:
+          - ReagentId: Phenol
+            Quantity: 15
+          - ReagentId: Hydrogen
+            Quantity: 10
+          - ReagentId: Oxygen
+            Quantity: 10
 
 - type: entity
   name: red glowstick

diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
index e8601fcf355dba81f091437caf76c38384607e15..3971352aa11528c009fda9ab8e7e8c2d64a6ae68 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/matches.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
@@ -41,6 +41,14 @@
     unlitIcon: match_unlit
     litIcon: match_lit
     burntIcon: match_burnt
+  - type: Extractable
+    grindableSolutionName: matchstick
+  - type: SolutionContainerManager
+    solutions:
+      matchstick:
+        reagents:
+        - ReagentId: Phosphorus
+          Quantity: 2
 
 - type: entity
   parent: Matchstick