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>
2025-04-20 04:53:37 -07:00
parent 6622dcafb5
commit 05d79667bb
15 changed files with 58 additions and 2 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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