From 05d79667bbfed160a6f119152ab27cbc8d9bba78 Mon Sep 17 00:00:00 2001 From: RedBookcase Date: Sun, 20 Apr 2025 04:53:37 -0700 Subject: [PATCH] Makes more items recyclable. (#35800) * Makes more items recyclable. * Added newlines * Fixed material issues which were NOT MY FAULT --------- Co-authored-by: RedBookcase --- .../Prototypes/Entities/Clothing/Masks/masks.yml | 4 ++++ .../Objects/Consumable/Drinks/drinks_cups.yml | 3 +++ .../Entities/Objects/Devices/wristwatch.yml | 6 ++++++ .../Entities/Objects/Misc/fluff_lights.yml | 9 ++++++++- .../Prototypes/Entities/Objects/Misc/paper.yml | 3 ++- .../Objects/Specific/Hydroponics/seeds.yml | 1 + .../Objects/Specific/Hydroponics/tools.yml | 16 ++++++++++++++++ .../Objects/Specific/Janitorial/janitor.yml | 3 +++ .../Entities/Objects/Specific/Service/barber.yml | 3 +++ .../Entities/Objects/Specific/chemistry.yml | 1 + .../Entities/Objects/Tools/hand_labeler.yml | 1 + .../Entities/Objects/Tools/inflatable_wall.yml | 2 ++ .../Entities/Objects/Tools/lighters.yml | 1 + .../Entities/Objects/Tools/spray_painter.yml | 3 +++ .../Entities/Objects/Weapons/Melee/mining.yml | 4 ++++ 15 files changed, 58 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index e4e1372f89..f85cf2de7e 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml index 9dd386426c..373430c255 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Devices/wristwatch.yml b/Resources/Prototypes/Entities/Objects/Devices/wristwatch.yml index 7fbb4aecf6..5153c9dc39 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml index a6ab09699f..676b875039 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index 7974d70a27..c6f7e0e405 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index bc78ab5911..1777d8675c 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml index 727c75c879..d152bb908e 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml index ccb7900810..6a7234b810 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml index ad0eeccc7d..f23e0964c1 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index 7cc09a9008..0ccc42f54a 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml b/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml index 4b46a93353..323e13102f 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml b/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml index 86163aad67..f5e05b4e28 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml index c35d67e7eb..66da03cbba 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml b/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml index ad31a6ec02..679c6f22fe 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml index 911cf30680..597df3f83e 100644 --- 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 -- 2.51.2