Makes more items recyclable. (#35800)

* Makes more items recyclable.

* Added newlines

* Fixed material issues which were NOT MY FAULT

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>

diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
index e4e1372f89a77b0a644ab138a5bd0b9af5f87bd3..f85cf2de7e8d02a4c892cc562dc55debf314d2b6 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -137,6 +137,10 @@
     tags:
     - PetWearable
     - WhitelistChameleon
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 50
+      Plastic: 50
 
 - type: entity
   parent: ClothingMaskBreathMedical

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
index 9dd386426cb8777cfcaf3bcaea6b1192ed55b2dd..373430c255aab795764fb167222bc07754e8440b 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -53,6 +53,9 @@
     sprite: Objects/Consumable/Drinks/golden_cup.rsi
   - type: StaticPrice
     price: 125
+  - type: PhysicalComposition
+    materialComposition:
+      Gold: 100
 
 - type: entity
   parent: DrinkBaseCup

diff --git a/Resources/Prototypes/Entities/Objects/Devices/wristwatch.yml b/Resources/Prototypes/Entities/Objects/Devices/wristwatch.yml
index 7fbb4aecf6152f152ff9a9f03014293dbbee744b..5153c9dc3998108d6f6f00051ea6e5a21f14c713 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Devices/wristwatch.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/wristwatch.yml
@@ -38,6 +38,9 @@
       behaviors:
       - !type:DoActsBehavior
         acts: [ "Breakage" ]
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 300
 
 - type: entity
   id: WristwatchGold
@@ -57,3 +60,6 @@
     sprite: Objects/Devices/goldwatch.rsi
   - type: StaticPrice
     price: 500 #if you ever increase the price of kidneys, increase this too.
+  - type: PhysicalComposition
+    materialComposition:
+      Gold: 500

diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
index a6ab09699fb03db8d1742adeb9c78ebcc83cd65c..676b875039eadf5effed9bbfcb59c113b24b0ab6 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -238,7 +238,10 @@
             max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
-
+  - type: PhysicalComposition
+    materialComposition:
+      Glass: 500
+      Steel: 200
 - type: entity
   name: broken floodlight
   id: FloodlightBroken
@@ -288,3 +291,7 @@
         density: 50
         mask:
         - HighImpassable
+  - type: PhysicalComposition
+    materialComposition:
+      Glass: 500
+      Steel: 200

diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index 7974d70a27aaa4fe777f05f67e449a0980d17a13..c6f7e0e4056565e09725ec7c3fb313c667086235 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -49,7 +49,8 @@
           Quantity: 1
   - type: Item
     size: Tiny
-
+  - type: PhysicalComposition
+  
 - type: entity
   name: paper
   parent: BasePaper

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
index bc78ab5911f7bdc272042cd1af3cd2f5a21baa56..1777d8675c752f922a133721117f90ef6e9f60d1 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -37,6 +37,7 @@
         blacklist:
           tags:
           - Book
+    - type: PhysicalComposition
 
 - type: entity
   parent: SeedBase

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
index 727c75c8794906e1b6e783e7e09d9428ccc581cf..d152bb908e93726589b5271db746af45bde57a28 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
@@ -19,6 +19,9 @@
         Slash: 6
   - type: Item
     sprite: Objects/Tools/Hydroponics/hoe.rsi
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 100
 
 - type: entity
   name: plant clippers
@@ -40,6 +43,9 @@
   - type: Item
     sprite: Objects/Tools/Hydroponics/clippers.rsi
     storedRotation: -90
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 100
 
 - type: entity
   name: scythe
@@ -64,6 +70,10 @@
     - back
   - type: StaticPrice
     price: 40
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 100
+      Plastic: 100
 
 - type: entity
   name: hatchet
@@ -87,6 +97,9 @@
         Piercing: 2
   - type: Item
     sprite: Objects/Tools/Hydroponics/hatchet.rsi
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 100
 
 - type: entity
   name: spade
@@ -112,6 +125,9 @@
     sprite: Objects/Tools/Hydroponics/spade.rsi
   - type: Shovel
     speedModifier: 0.75 # slower at digging than a full-sized shovel
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 100
 
 - type: entity
   name: plant bag

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index ccb79008105a930c11d137aedfbf25a056c9ea6b..6a7234b810bb372a8338e2864bab9027cbbb3ca8 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -250,6 +250,9 @@
       types:
         Blunt: 3
   - type: Plunger
+  - type: PhysicalComposition
+    materialComposition:
+      Wood: 100
 
 - type: entity
   name: golden plunger

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
index ad0eeccc7d21bceb7d0f7586ecfbde1c5a2a45c2..f23e0964c13c3959ad237b159ac9bee943d6af9f 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
@@ -24,3 +24,6 @@
         Piercing: 6
     soundHit:
       path: "/Audio/Weapons/bladeslice.ogg"
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 200

diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index 7cc09a90081c8d84e48d0b82ca9f5f9f8a9f2ced..0ccc42f54aca3c9259a8bd1f7f3d0b330d0c8d06 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -311,6 +311,7 @@
   - type: Tag
     tags:
     - Dropper
+  - type: PhysicalComposition
 
 - type: entity
   name: borgdropper

diff --git a/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml b/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml
index 4b46a9335389ec37211793782b9800118e110c58..323e13102fc35df74fb7fb67381b45859596b816 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml
@@ -25,3 +25,4 @@
           - Item
         tags:
           - Structure
+    - type: PhysicalComposition

diff --git a/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml b/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml
index 86163aad67c9cd7a90d4ba49af8e1930a4d38cce..f5e05b4e285b86f04fdf290514ba6394f7f794c7 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml
@@ -19,6 +19,7 @@
       doAfter: 1
       removeOnInteract: true
     - type: Clickable
+    - type: PhysicalComposition
 # TODO: Add stack sprites + visuals.
 
 - type: entity
@@ -42,6 +43,7 @@
       doAfter: 1
       removeOnInteract: true
     - type: Clickable
+    - type: PhysicalComposition
 # TODO: Add stack sprites + visuals.
 
 - type: entity

diff --git a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
index c35d67e7eb4adcea59c4e84731036a31c9572791..66da03cbba13ed773d13507c9a2c9aa6ce506195 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
@@ -88,6 +88,7 @@
     radius: 1.1 #smallest possible
     color: orange
   - type: ItemTogglePointLight
+  - type: PhysicalComposition
 
 - type: entity
   name: cheap lighter

diff --git a/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml b/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml
index ad31a6ec02d197bb1fc48fab5d1bf6a15b61fa8e..679c6f22fe2869cbba65ef34a0faf68e8f1b703c 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml
@@ -32,3 +32,6 @@
       mix: '#947507'
   - type: StaticPrice
     price: 40
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 100

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
index 911cf30680bcf132eeefd2ff217d432242f4d7cd..597df3f83efdf0819b96a032db5cdbc5b3d43b12 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -35,6 +35,10 @@
     sprite: Objects/Weapons/Melee/pickaxe.rsi
     storedRotation: -45
   - type: UseDelay
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 100
+      Wood: 100
 
 - type: entity
   name: mining drill