diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index 28242033e79..0e1e9b1a106 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -1,6 +1,6 @@ - type: entity name: cardboard box - parent: BoxBase + parent: [BoxBase, RecyclableItemCardboard] # Frontier: added RecyclableItemCardboard id: BoxCardboard description: A cardboard box for storing things. components: diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index ec1a82dcd14..bf67d8ecb33 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -1,5 +1,5 @@ - type: entity - parent: [Clothing, ContentsExplosionResistanceBase] + parent: [Clothing, ContentsExplosionResistanceBase, RecyclableItemClothBasic] # Frontier: added RecyclableItemClothBasic id: ClothingBackpack name: backpack description: You wear this on your back and put items into it. diff --git a/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml index 76af5067aea..39d5fcc05dd 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: Clothing + parent: [Clothing, RecyclableItemClothBasic] # Frontier: added RecyclableItemClothBasic id: ClothingBeltBase components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml index 7c69f23a0ef..afb206c6194 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: Clothing + parent: [Clothing, RecyclableItemClothDevice] # Frontier: added RecyclableItemClothDevice id: ClothingHeadset name: headset description: An updated, modular intercom that fits over the head. Takes encryption keys. diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml b/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml index b31f821629d..52aaa8d8726 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: Clothing + parent: [Clothing, RecyclableItemClothDevice] # Frontier: added RecyclableItemClothDevice id: ClothingEyesBase components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml index bb494ffda41..e4c892924cf 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: Clothing + parent: [Clothing, RecyclableItemClothSmall] # Frontier: added RecyclableItemClothSmall id: ClothingHandsBase components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml index 46fe9ef09df..86c781ddb4d 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: Clothing + parent: [Clothing, RecyclableItemClothSmall] # Frontier: added RecyclableItemClothSmall id: ClothingHeadBase components: - type: Clothing diff --git a/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml b/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml index ac8984a4196..b945c223179 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: Clothing + parent: [Clothing, RecyclableItemClothDevice] # Frontier: added RecyclableItemClothDevice id: ClothingMaskBase components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml b/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml index 608f061dd89..cd8fa87d087 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: Clothing + parent: [Clothing, RecyclableItemClothSmall] # Frontier: added RecyclableItemClothSmall id: ClothingNeckBase components: - type: Item diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 7657812f78f..4c757ea4cad 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -3,7 +3,7 @@ #Basic armor vest - type: entity - parent: [ClothingOuterBaseMedium, AllowSuitStorageClothing, BaseC1Contraband] # Frontier: BaseRestrictedContraband