Allow recycler to shred clothing (#31518)

* Allow recycler to shred clothing * reduce * change comments * replace ClothMade with Recyclable * Update Resources/Prototypes/Entities/Clothing/Head/hats.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * requested changes --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-05-16 01:44:48 +02:00
parent 9b6697e252
commit 19f9f84a13
14 changed files with 69 additions and 5 deletions
--- a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
@@ -38,6 +38,14 @@
    spawned:
    - id: MaterialCloth1
      amount: 1
  - type: PhysicalComposition # 50% of the amount of cloth you'd obtain upon butchering
    materialComposition:
      Cloth: 50
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - WhitelistChameleon
 # gloves that cover the fingertips and have synthetic fibers
 - type: entity
--- a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml
@@ -28,6 +28,7 @@
    tags:
    - Bandana
    - ClothMade
    - Recyclable
 - type: entity
  parent: [ClothingHeadBandBase, ClothingMaskBandBlack]
--- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -22,8 +22,8 @@
          Quantity: 10
  - type: Tag
    tags:
-      - ClothMade
+    - ClothMade
-      - WhitelistChameleon
+    - WhitelistChameleon
 - type: entity
  abstract: true
@@ -35,10 +35,14 @@
    spawned:
    - id: MaterialCloth1
      amount: 1
  - type: PhysicalComposition # 50% of the amount of cloth you'd obtain upon butchering
    materialComposition:
      Cloth: 50
  - type: Tag
    tags:
-      - ClothMade
+    - ClothMade
-      - WhitelistChameleon
+    - Recyclable
    - WhitelistChameleon
 - type: entity
  abstract: true
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -22,6 +22,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - HamsterWearable
    - WhitelistChameleon
@@ -40,6 +41,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable    
    - WhitelistChameleon
 - type: entity
@@ -55,6 +57,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - HamsterWearable
    - WhitelistChameleon
@@ -97,6 +100,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - HamsterWearable
    - WhitelistChameleon
@@ -113,6 +117,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - HamsterWearable
    - WhitelistChameleon
@@ -129,6 +134,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - HamsterWearable
    - WhitelistChameleon
@@ -145,6 +151,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - HamsterWearable
    - WhitelistChameleon
@@ -232,6 +239,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - HamsterWearable
    - WhitelistChameleon
@@ -288,6 +296,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - HamsterWearable
    - WhitelistChameleon
@@ -304,6 +313,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - HamsterWearable
    - WhitelistChameleon
@@ -342,6 +352,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - HamsterWearable
    - WhitelistChameleon
@@ -358,6 +369,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - HamsterWearable
    - WhitelistChameleon
@@ -419,6 +431,7 @@
    tags:
    - WhitelistChameleon
    - ClothMade
    - Recyclable
  - type: HideLayerClothing
    slots:
    - Hair
@@ -486,6 +499,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - HamsterWearable
    - WhitelistChameleon
@@ -524,6 +538,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - HamsterWearable
    - WhitelistChameleon
@@ -629,6 +644,7 @@
    tags:
    - WhitelistChameleon
    - ClothMade
    - Recyclable
  - type: HideLayerClothing
    slots:
    - Hair
@@ -664,6 +680,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - HamsterWearable
    - WhitelistChameleon
@@ -781,6 +798,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - HamsterWearable
    - WhitelistChameleon
@@ -839,6 +857,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - HamsterWearable
    - WhitelistChameleon
@@ -976,6 +995,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - WhitelistChameleon
    - HamsterWearable
  - type: SentienceTarget
@@ -998,6 +1018,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - WhitelistChameleon
    - HamsterWearable
--- a/Resources/Prototypes/Entities/Clothing/Head/soft.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/soft.yml
@@ -69,6 +69,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - HamsterWearable
    - WhitelistChameleon
@@ -80,6 +81,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - HamsterWearable
    - WhitelistChameleon
@@ -224,6 +226,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - HamsterWearable
    - WhitelistChameleon
@@ -235,6 +238,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - HamsterWearable
    - WhitelistChameleon
@@ -315,6 +319,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - HamsterWearable
    - WhitelistChameleon
@@ -326,5 +331,6 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - HamsterWearable
    - WhitelistChameleon
--- a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml
@@ -31,6 +31,7 @@
    tags:
    - Bandana
    - ClothMade
    - Recyclable
  - type: HideLayerClothing
    slots:
    - Snout
@@ -72,6 +73,7 @@
    tags:
    - WhitelistChameleon
    - ClothMade
    - Recyclable
 - type: entity
  parent: ClothingMaskBandanaBase
--- a/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml
@@ -39,6 +39,9 @@
    spawned:
    - id: MaterialCloth1
      amount: 1
  - type: PhysicalComposition # 50% of the amount of cloth you'd obtain upon butchering
    materialComposition:
      Cloth: 50
  - type: Food
    requiresSpecialDigestion: true
  - type: SolutionContainerManager
@@ -50,4 +53,5 @@
          Quantity: 10
  - type: Tag
    tags:
-      - ClothMade
+    - ClothMade
    - Recyclable
--- a/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml
@@ -16,6 +16,9 @@
    spawned:
    - id: MaterialCloth1
      amount: 2
  - type: PhysicalComposition # 50% of the amount of cloth you'd obtain upon butchering
    materialComposition:
      Cloth: 100
  - type: Food
    requiresSpecialDigestion: true
  - type: SolutionContainerManager
@@ -28,6 +31,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - WhitelistChameleon
 - type: entity
@@ -39,4 +43,5 @@
    tags:
    - Scarf
    - ClothMade
    - Recyclable
    - WhitelistChameleon
--- a/Resources/Prototypes/Entities/Clothing/Neck/ties.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/ties.yml
@@ -13,6 +13,7 @@
    - HamsterWearable
    - WhitelistChameleon
    - ClothMade
    - Recyclable
 - type: entity
  parent: ClothingNeckBase
@@ -38,5 +39,6 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - HamsterWearable
    - WhitelistChameleon
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -33,6 +33,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - WhitelistChameleon
  - type: StaticPrice
    price: 50
--- a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
@@ -22,6 +22,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - WhitelistChameleon
  - type: ProtectedFromStepTriggers
@@ -35,6 +36,9 @@
    spawned:
    - id: MaterialCloth1
      amount: 1
  - type: PhysicalComposition # 50% of the amount of cloth you'd obtain upon butchering
    materialComposition:
      Cloth: 50
 # stuff common to all military boots
 - type: entity
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
@@ -14,6 +14,9 @@
    spawned:
    - id: MaterialCloth1
      amount: 3
  - type: PhysicalComposition # 50% of the amount of cloth you'd obtain upon butchering
    materialComposition:
      Cloth: 150
  - type: Food
    requiresSpecialDigestion: true
  - type: SolutionContainerManager
@@ -26,6 +29,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - WhitelistChameleon
 - type: entity
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -334,6 +334,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - PrisonUniform
    - WhitelistChameleon
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -520,6 +520,7 @@
  - type: Tag
    tags:
    - ClothMade
    - Recyclable
    - PrisonUniform
    - WhitelistChameleon