Allow more items to be recycled (#24435)

Give more items a PhysicalComposition for recycling
2024-04-29 03:36:11 +00:00
parent 1eb81427d3
commit 5118865d47
14 changed files with 47 additions and 2 deletions
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -281,6 +281,9 @@
    size: Tiny
  - type: IdentityBlocker
    coverage: MOUTH
+  - type: PhysicalComposition
+    materialComposition:
+      Plastic: 25

 - type: entity
  parent: ClothingMaskBase
--- a/Resources/Prototypes/Entities/Objects/Devices/geiger.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/geiger.yml
@@ -31,4 +31,7 @@
            Med: {state: geiger_on_med}
            High: {state: geiger_on_high}
            Extreme: {state: geiger_on_ext}
+    - type: PhysicalComposition
+      materialComposition:
+        Plastic: 100

--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -54,6 +54,9 @@
        enabled:
          True: { state: fire_extinguisher_closed }
          False: { state: fire_extinguisher_open }
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 100

 - type: entity
  name: extinguisher spray
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -30,6 +30,9 @@
        maxVol: 100
  - type: UseDelay
    delay: 1
+  - type: PhysicalComposition
+    materialComposition:
+      Plastic: 50
  - type: Tag
    tags:
      - Mop
@@ -103,6 +106,9 @@
      coefficients:
        Blunt: 0.95
        Slash: 0.95
+  - type: PhysicalComposition
+    materialComposition:
+      Plastic: 50
  - type: Tag
    tags:
      - WetFloorSign
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml
@@ -15,6 +15,9 @@
    size: Large
    sprite: Objects/Specific/Medical/firstaidkits.rsi
    heldPrefix: firstaid
+  - type: PhysicalComposition
+    materialComposition:
+      Plastic: 150
  - type: Tag
    tags:
    - Medkit
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -162,6 +162,9 @@
    solution: beaker
  - type: StaticPrice
    price: 10
+  - type: PhysicalComposition
+    materialComposition:
+      Glass: 50
  - type: SolutionContainerVisuals
    maxFillLevels: 6
    fillBaseName: beaker
@@ -210,6 +213,9 @@
    fillBaseName: beakerlarge
    inHandsMaxFillLevels: 4
    inHandsFillBaseName: -fill-
+  - type: PhysicalComposition
+    materialComposition:
+      Glass: 100
  - type: StaticPrice
    price: 20

--- a/Resources/Prototypes/Entities/Objects/Tools/appraisal.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/appraisal.yml
@@ -17,6 +17,9 @@
    quickEquip: false
    slots:
    - Belt
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 250
  - type: Tag
    tags:
    - AppraisalTool
--- a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
@@ -26,6 +26,9 @@
    price: 0
  - type: StackPrice
    price: 1
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 15

 - type: entity
  id: CableHVStack
--- a/Resources/Prototypes/Entities/Objects/Tools/gps.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gps.yml
@@ -12,6 +12,10 @@
  - type: Item
    sprite: Objects/Devices/gps.rsi
  - type: HandheldGPS
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 400
+      Glass: 150
  - type: Tag
    tags:
    - GPS
--- a/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml
@@ -19,5 +19,9 @@
        base:
          On: { state: tray-on }
          Off: { state: tray-off }
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 400
+      Glass: 150
  - type: StaticPrice
    price: 60
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
@@ -36,6 +36,9 @@
    node: bat
  - type: UseDelay
    delay: 1
+  - type: PhysicalComposition
+    materialComposition:
+      Wood: 250
  - type: Tag
    tags:
    - BaseballBat
--- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
@@ -79,6 +79,10 @@
    explosionType: Default
    intensitySlope: 1.5
    maxIntensity: 200
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 100
+      Plastic: 100
  - type: GuideHelp
    guides:
    - Security
--- a/Resources/Prototypes/Recipes/Lathes/janitorial.yml
+++ b/Resources/Prototypes/Recipes/Lathes/janitorial.yml
@@ -18,7 +18,7 @@
  result: Bucket
  completetime: 2
  materials:
-    Steel: 100
+    Plastic: 100

 - type: latheRecipe
  id: WetFloorSign
--- a/Resources/Prototypes/Recipes/Lathes/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/medical.yml
@@ -106,7 +106,7 @@
  result: ClothingMaskSterile
  completetime: 2
  materials:
-    Plastic: 100
+    Plastic: 50

 - type: latheRecipe
  id: DiseaseSwab