diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 02fffadc03cb18..eea4bb00742878 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -155,6 +155,8 @@ Quantity: 4 - ReagentId: Vitamin Quantity: 2 + - ReagentId: Potassium + Quantity: 3 - type: Sprite sprite: Objects/Specific/Hydroponics/banana.rsi - type: Produce diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index 45d59c2877d545..efc886db664c9a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -144,6 +144,17 @@ - type: Sprite state: energybar-open - type: Item + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Sugar + Quantity: 5 + - ReagentId: Nutriment + Quantity: 10 + - type: Extractable + grinableSolutionName: food - type: entity name: popcorn @@ -206,6 +217,17 @@ state: syndicakes - type: Item - type: Food + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Sugar + Quantity: 5 + - ReagentId: Nutriment + Quantity: 10 + - type: Extractable + grinableSolutionName: food trash: FoodPacketSyndiTrash - type: entity @@ -276,10 +298,13 @@ - type: SolutionContainerManager solutions: food: - maxVol: 1 reagents: - ReagentId: Nutriment Quantity: 1 + - ReagentId: Sugar + Quantity: 3 + - type: Extractable + grinableSolutionName: food - type: Item sprite: Objects/Consumable/Food/snacks.rsi heldPrefix: packet diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index a0db6663dde2cf..3793a1b2645b69 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -224,6 +224,14 @@ - type: PhysicalComposition materialComposition: Steel: 25 + - type: SolutionContainerManager + solutions: + pen: + reagents: + - ReagentId: Iodine + Quantity: 5 + - type: Extractable + grinableSolutionName: pen - type: entity name: Cybersun pen diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml index a6d1ed80ca5549..9d538c4ae8bef4 100644 --- a/Resources/Prototypes/Entities/Objects/Power/lights.yml +++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml @@ -63,6 +63,14 @@ materialComposition: Glass: 25 - type: SpaceGarbage + - type: SolutionContainerManager + solutions: + glowstick: + reagents: + - ReagentId: Nitrogen + Quantity: 15 + - type: Extractable + grindableSolutionName: glowstick - type: entity parent: BaseLightbulb diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml index 8ea097e4793e2a..d54f802c73c76a 100644 --- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml @@ -23,8 +23,8 @@ - type: Extractable juiceSolution: reagents: - - ReagentId: Zinc - Quantity: 5 + - ReagentId: Lithium + Quantity: 15 - type: Tag tags: - DroneUsable diff --git a/Resources/Prototypes/Entities/Objects/Specific/atmos.yml b/Resources/Prototypes/Entities/Objects/Specific/atmos.yml index ff946aefe91ce1..41c787c56b8453 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/atmos.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/atmos.yml @@ -35,3 +35,11 @@ materialComposition: Steel: 400 Glass: 100 + - type: SolutionContainerManager + solutions: + gasanalyser: + reagents: + - ReagentId: Mercury + Quantity: 15 + - type: Extractable + grindableSolutionName: gasanalyser diff --git a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml index 3d7041829c9b33..e848991331cc85 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml @@ -61,6 +61,16 @@ startValue: 5.0 endValue: 1.5 property: Radius + - type: SolutionContainerManager + solutions: + glowstick: + reagents: + - ReagentId: Oxygen + Quantity: 10 + - ReagentId: Hydrogen + Quantity: 10 + - type: Extractable + grindableSolutionName: glowstick - type: entity name: red glowstick diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml index fd7e185cb027ba..274d1da44a45f1 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/matches.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/matches.yml @@ -40,6 +40,14 @@ unlitIcon: match_unlit litIcon: match_lit burntIcon: match_burnt + - type: SolutionContainerManager + solutions: + match: + reagents: + - ReagentId: Phosphorus + Quantity: 2 + - type: Extractable + grinableSolutionName: match - type: entity parent: Matchstick @@ -51,6 +59,14 @@ - state: match_burnt - type: Matchstick state: Burnt + - type: SolutionContainerManager + solutions: + match: + reagents: + - ReagentId: Carbon + Quantity: 5 + - type: Extractable + grinableSolutionName: match - type: entity name: match box