new-frontiers-14 · ErhardSteinhauer · Oct 9, 2024 · Oct 9, 2024 · Oct 9, 2024 · Oct 10, 2024
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -3,7 +3,7 @@
 
 #Basic armor vest
 - type: entity
-  parent: [ClothingOuterBaseMedium, AllowSuitStorageClothing, BaseC1Contraband] # Frontier: BaseRestrictedContraband<BaseC1Contraband
+  parent: [RecyclableItemClothArmor, ClothingOuterBaseMedium, AllowSuitStorageClothing, BaseC1Contraband] # Frontier: BaseRestrictedContraband<BaseC1Contraband, added RecyclableItemClothArmor
   id: ClothingOuterArmorBasic
   name: armor vest
   description: A standard Type I armored vest that provides decent protection against most types of damage.

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: [ Clothing, AllowSuitStorageClothing ] # Frontier: added AllowSuitStorageClothing as a second parent
+  parent: [ Clothing, AllowSuitStorageClothing, RecyclableItemClothDurable ] # Frontier: added AllowSuitStorageClothing and RecyclableItemClothDurable
   id: ClothingOuterBase
   components:
   - type: Clothing
@@ -45,7 +45,7 @@
 
 - type: entity
   abstract: true
-  parent: [ClothingOuterStorageBase, BaseFoldable]
+  parent: [RecyclableItemClothBasic, ClothingOuterStorageBase, BaseFoldable] # Frontier: added RecyclableItemClothBasic
   id: ClothingOuterStorageFoldableBase
   components:
   - type: Appearance

diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: Clothing
+  parent: [Clothing, RecyclableItemClothSmall] # Frontier: added RecyclableItemClothSmall
   id: ClothingShoesBase
   components:
   - type: Clothing

diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: Clothing
+  parent: [Clothing, RecyclableItemClothBasic] # Frontier: added RecyclableItemClothBasic
   id: UnsensoredClothingUniformBase
   components:
   - type: Sprite

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: DrinkBase
+  parent: [DrinkBase, RecyclableItemCardboard] # Frontier: added RecyclableItemCardboard
   id: DrinkCartonBaseFull
   abstract: true
   suffix: Full

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: DrinkBase
+  parent: [DrinkBase, RecyclableItemPlasticSmall] # Frontier: added RecyclableItemPlasticSmall
   id: DrinkSpaceGlue
   name: space glue tube
   description: High performance glue intended for maintenance of extremely complex mechanical equipment. DON'T DRINK!
@@ -42,7 +42,7 @@
     solution: drink
 
 - type: entity
-  parent: DrinkBase
+  parent: [DrinkBase, RecyclableItemPlasticSmall] # Frontier: added RecyclableItemPlasticSmall
   id: DrinkSpaceLube
   name: space lube tube
   description: High performance lubricant intended for maintenance of extremely complex mechanical equipment.

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -41,7 +41,7 @@
 
 - type: entity
   abstract: true
-  parent: ReagentContainerBase
+  parent: [ReagentContainerBase, RecyclableItemCardboard] # Frontier: added RecyclableItemCardboard
   id: ReagentPacketBase
   components:
   - type: Openable

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -2,7 +2,7 @@
 # For produce that can't be immediately eaten
 
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemOrganicTiny] # Frontier: added RecyclableItemOrganicTiny
   id: ProduceBase
   abstract: true
   components:

diff --git a/Resources/Prototypes/Entities/Objects/Decoration/lidsalami.yml b/Resources/Prototypes/Entities/Objects/Decoration/lidsalami.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: LidSalami
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemPlasticMedium] # Frontier: added RecyclableItemPlasticMedium
   name: salami lid
   description: Ain't gon' fit, won't fit.
   components:

diff --git a/Resources/Prototypes/Entities/Objects/Devices/base_handheld.yml b/Resources/Prototypes/Entities/Objects/Devices/base_handheld.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: [BaseItem, PowerCellSlotSmallItem]
+  parent: [BaseItem, PowerCellSlotSmallItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall
   id: BaseHandheldComputer
   components:
   - type: ActivatableUIRequiresPowerCell

diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
@@ -15,7 +15,7 @@
     price: 2
 
 - type: entity
-  parent: EncryptionKey
+  parent: [EncryptionKey, RecyclableItemDeviceTiny] # Frontier: added RecyclableItemDeviceTiny
   id: EncryptionKeyCommon
   name: common encryption key
   description: An encryption key used by anyone.
@@ -30,7 +30,7 @@
     - state: common_label
 
 - type: entity
-  parent: EncryptionKey # Frontier: removed BaseCargoContraband
+  parent: [EncryptionKey, RecyclableItemDeviceTiny] # Frontier: added RecyclableItemDeviceTiny, removed BaseCargoContraband
   id: EncryptionKeyCargo
   name: cargo encryption key
   suffix: DO NOT MAP # Frontier - Add DO NOT MAP suffix
@@ -103,7 +103,7 @@
     - state: com_label
 
 - type: entity
-  parent: EncryptionKey # Frontier: removed BaseEngineeringContraband
+  parent: [EncryptionKey, RecyclableItemDeviceTiny] # Frontier: added RecyclableItemDeviceTiny, removed BaseEngineeringContraband
   id: EncryptionKeyEngineering
   name: engineering encryption key
   suffix: DO NOT MAP # Frontier - Add DO NOT MAP suffix
@@ -119,7 +119,7 @@
     - state: eng_label
 
 - type: entity
-  parent: EncryptionKey # Frontier: removed BaseMedicalContraband
+  parent: [EncryptionKey, RecyclableItemDeviceTiny] # Frontier: added RecyclableItemDeviceTiny, removed BaseMedicalContraband
   id: EncryptionKeyMedical
   name: medical encryption key
   description: An encryption key used by those who save lives.
@@ -134,7 +134,7 @@
     - state: med_label
 
 - type: entity
-  parent: EncryptionKey # Frontier: removed BaseMedicalScienceContraband
+  parent: [EncryptionKey, RecyclableItemDeviceTiny] # Frontier: added RecyclableItemDeviceTiny, removed BaseMedicalScienceContraband
   id: EncryptionKeyMedicalScience
   name: med-sci encryption key
   suffix: DO NOT MAP # Frontier - Add DO NOT MAP suffix
@@ -151,7 +151,7 @@
     - state: medsci_label
 
 - type: entity
-  parent: EncryptionKey # Frontier: removed BaseScienceContraband
+  parent: [EncryptionKey, RecyclableItemDeviceTiny] # Frontier: added RecyclableItemDeviceTiny, removed BaseScienceContraband
   id: EncryptionKeyScience
   name: science encryption key
   suffix: DO NOT MAP # Frontier - Add DO NOT MAP suffix
@@ -167,7 +167,7 @@
     - state: sci_label
 
 - type: entity
-  parent: EncryptionKey # Frontier: removed BaseScienceContraband
+  parent: [EncryptionKey, RecyclableItemDeviceTiny] # Frontier: added RecyclableItemDeviceTiny, removed BaseScienceContraband
   id: EncryptionKeyRobo
   name: robotech encryption key
   suffix: DO NOT MAP # Frontier - Add DO NOT MAP suffix
@@ -199,7 +199,7 @@
     - state: sec_label
 
 - type: entity
-  parent: EncryptionKey # Frontier: removed BaseCivilianContraband
+  parent: [EncryptionKey, RecyclableItemDeviceTiny] # Frontier: added RecyclableItemDeviceTiny, removed BaseCivilianContraband
   id: EncryptionKeyService
   name: service encryption key
   suffix: DO NOT MAP # Frontier - Add DO NOT MAP suffix
@@ -231,7 +231,7 @@
     - state: synd_label
 
 - type: entity
-  parent: EncryptionKey # Frontier: removed BaseSiliconScienceContraband
+  parent: [EncryptionKey, RecyclableItemDeviceTiny] # Frontier: added RecyclableItemDeviceTiny, removed BaseSiliconScienceContraband
   id: EncryptionKeyBinary
   name: binary translator key
   suffix: DO NOT MAP # Frontier - Add DO NOT MAP suffix

diff --git a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemDeviceComplexNormal] # Frontier: added RecyclableItemDeviceComplexNormal
   id: BaseFlatpack
   name: base flatpack
   description: A flatpack used for constructing something.

diff --git a/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml b/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: forensic scanner
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall
   id: ForensicScanner
   description: A handheld device that can scan objects for fingerprints and fibers.
   components:

diff --git a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall
   id: Holoprojector
   name: holographic sign projector
   description: A handy-dandy holographic projector that displays a janitorial sign.

diff --git a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: mousetrap
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemPlasticSmall] # Frontier: added RecyclableItemPlasticSmall
   id: Mousetrap
   description: Useful for catching rodents sneaking into your kitchen.
   components:

diff --git a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml
@@ -1,7 +1,7 @@
 - type: entity
   name: pinpointer
   description: A handheld tracking device. While typically far more capable, this one has been configured to lock onto certain signals. Keep upright to retain accuracy.
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall
   id: PinpointerBase
   abstract: true
   components:

diff --git a/Resources/Prototypes/Entities/Objects/Devices/radio.yml b/Resources/Prototypes/Entities/Objects/Devices/radio.yml
@@ -1,7 +1,7 @@
 - type: entity
   name: handheld radio
   description: A handy handheld radio.
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall
   id: RadioHandheld
   components:
   - type: TelecomExempt

diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_map.yml b/Resources/Prototypes/Entities/Objects/Devices/station_map.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall
   id: BaseHandheldStationMap
   name: station map
   description: Displays a readout of the current station.

diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemWoodMedium] # Frontier: added RecyclableItemWoodMedium
   id: BaseHandheldInstrument
   description: That's an instrument.
   components:

diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemCardboard] # Frontier: added RecyclableItemCardboard
   id: BaseBoardEntity # Board item
   name: board
   abstract: true
@@ -16,7 +16,7 @@
 
 - type: entity
   id: BaseTabletopPiece # Board piece
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemPlasticTiny] # Frontier: added RecyclableItemPlasticTiny
   abstract: true
   components:
   - type: TabletopDraggable
@@ -39,3 +39,6 @@
   - type: Sprite
     noRot: false
     drawdepth: FloorTiles
+  - type: PhysicalComposition # Frontier
+    materialComposition: # Frontier
+      Cardboard: 100 # Frontier
diff --git a/Resources/Prototypes/Entities/Objects/Fun/dice.yml b/Resources/Prototypes/Entities/Objects/Fun/dice.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemPlasticTiny] # Frontier: added RecyclableItemPlasticTiny
   id: BaseDice
   components:
   - type: Dice

diff --git a/Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml b/Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseStorageItem
+  parent: [BaseStorageItem, RecyclableItemClothSmall] # Frontier: added RecyclableItemClothSmall
   id: DiceBag
   name: bag of dice
   description: Contains all the luck you'll ever need.

diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
@@ -1,7 +1,7 @@
 #HUMANOID FIGURINES
 
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemPlasticTiny] # Frontier: added RecyclableItemPlasticTiny
   id: BaseFigurine
   name: figurine
   description: A small miniature.

diff --git a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemClothBasic] # Frontier: added RecyclableItemClothBasic
   id: BedsheetBase
   name: BedsheetBase
   abstract: true

diff --git a/Resources/Prototypes/Entities/Objects/Misc/books.yml b/Resources/Prototypes/Entities/Objects/Misc/books.yml
@@ -1,9 +1,12 @@
 - type: entity
   name: book
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemPaper] # Frontier: added RecyclableItemPaper
   id: BookBase
   description: A hardcover book.
   components:
+  - type: PhysicalComposition # Frontier
+    materialComposition: # Frontier
+      Paper: 50 # Frontier
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:

diff --git a/Resources/Prototypes/Entities/Objects/Misc/candles.yml b/Resources/Prototypes/Entities/Objects/Misc/candles.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: candle
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemOrganicTiny] # Frontier: added RecyclableItemOrganicTiny
   id: Candle
   description: A thin wick threaded through fat.
   components: