From 006c425f19ae91f7393b0bef1ece60987839c413 Mon Sep 17 00:00:00 2001 From: DjfjdfofdjfjD Date: Mon, 31 Jul 2023 20:47:05 +0500 Subject: [PATCH 1/7] god help --- .../Objects/Consumable/Food/produce.yml | 2 ++ .../Objects/Consumable/Food/snacks.yml | 20 ++++++++++++++++++- .../Entities/Objects/Misc/paper.yml | 8 ++++++++ .../Entities/Objects/Power/lights.yml | 8 ++++++++ .../Entities/Objects/Power/powercells.yml | 4 ++-- .../Entities/Objects/Specific/atmos.yml | 8 ++++++++ .../Entities/Objects/Tools/matches.yml | 16 +++++++++++++++ 7 files changed, 63 insertions(+), 3 deletions(-) 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..86042760711620 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -144,6 +144,13 @@ - type: Sprite state: energybar-open - type: Item + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Sugar + Quantity: 5 + grinableSolutionName: food - type: entity name: popcorn @@ -206,6 +213,14 @@ state: syndicakes - type: Item - type: Food + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Sugar + Quantity: 5 + grinableSolutionName: food + - type: Extractable trash: FoodPacketSyndiTrash - type: entity @@ -276,10 +291,13 @@ - type: SolutionContainerManager solutions: food: - maxVol: 1 reagents: - ReagentId: Nutriment Quantity: 1 + - ReagentId: Sugar + Quantity: 3 + grinableSolutionName: food + - type: Extractable - 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..b0ec3be192b787 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..c83ff0f4eb04ed 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: + bulb: + reagents: + - ReagentId: Nitrogen + Quantity: 15 + - type: extractable + grinableSolutionName: bulb - 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..149ddcd1b2056a 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 + grinableSolutionName: gasanalyser diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml index fd7e185cb027ba..2f8c392ec34f1c 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 From 76b515a16da5eea0bad4aad16b42a899d91649ef Mon Sep 17 00:00:00 2001 From: DjfjdfofdjfjD Date: Mon, 31 Jul 2023 20:50:27 +0500 Subject: [PATCH 2/7] i forgor --- .../Prototypes/Entities/Objects/Tools/glowstick.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml index 3d7041829c9b33..89745487e51ef2 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 From f3d5c2ab5a46c751fcc41a228f5cf77dcbc9d775 Mon Sep 17 00:00:00 2001 From: DjfjdfofdjfjD Date: Mon, 31 Jul 2023 21:16:57 +0500 Subject: [PATCH 3/7] Extractable --- .../Prototypes/Entities/Objects/Consumable/Food/snacks.yml | 2 +- Resources/Prototypes/Entities/Objects/Power/lights.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index 86042760711620..f16ed231884cf9 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -296,8 +296,8 @@ Quantity: 1 - ReagentId: Sugar Quantity: 3 - grinableSolutionName: food - type: Extractable + grinableSolutionName: food - type: Item sprite: Objects/Consumable/Food/snacks.rsi heldPrefix: packet diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml index c83ff0f4eb04ed..e67fedd372f1ef 100644 --- a/Resources/Prototypes/Entities/Objects/Power/lights.yml +++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml @@ -69,7 +69,7 @@ reagents: - ReagentId: Nitrogen Quantity: 15 - - type: extractable + - type: Extractable grinableSolutionName: bulb - type: entity From 57128ac52c49d24447cab05ca31f41e38919f715 Mon Sep 17 00:00:00 2001 From: DjfjdfofdjfjD Date: Mon, 31 Jul 2023 21:21:06 +0500 Subject: [PATCH 4/7] mmmhmhm solution --- Resources/Prototypes/Entities/Objects/Misc/paper.yml | 2 +- Resources/Prototypes/Entities/Objects/Power/lights.yml | 2 +- Resources/Prototypes/Entities/Objects/Specific/atmos.yml | 2 +- Resources/Prototypes/Entities/Objects/Tools/glowstick.yml | 2 +- Resources/Prototypes/Entities/Objects/Tools/matches.yml | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index b0ec3be192b787..9938923adf5000 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -225,7 +225,7 @@ materialComposition: Steel: 25 - type: SolutionContainerManager - solutions: + solutions: pen: reagents: - ReagentId: Iodine diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml index e67fedd372f1ef..aaef48497928bf 100644 --- a/Resources/Prototypes/Entities/Objects/Power/lights.yml +++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml @@ -64,7 +64,7 @@ Glass: 25 - type: SpaceGarbage - type: SolutionContainerManager - solutions: + solutions: bulb: reagents: - ReagentId: Nitrogen diff --git a/Resources/Prototypes/Entities/Objects/Specific/atmos.yml b/Resources/Prototypes/Entities/Objects/Specific/atmos.yml index 149ddcd1b2056a..cdd39a51158510 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/atmos.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/atmos.yml @@ -36,7 +36,7 @@ Steel: 400 Glass: 100 - type: SolutionContainerManager - solutions: + solutions: gasanalyser: reagents: - ReagentId: Mercury diff --git a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml index 89745487e51ef2..a607291e3b9406 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml @@ -62,7 +62,7 @@ endValue: 1.5 property: Radius - type: SolutionContainerManager - solutions: + solutions: glowstick: reagents: - ReagentId: Oxygen diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml index 2f8c392ec34f1c..d15175ccb86a4c 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/matches.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/matches.yml @@ -41,7 +41,7 @@ litIcon: match_lit burntIcon: match_burnt - type: SolutionContainerManager - solutions: + solutions: match: reagents: - ReagentId: Phosphorus @@ -60,7 +60,7 @@ - type: Matchstick state: Burnt - type: SolutionContainerManager - solutions: + solutions: match: reagents: - ReagentId: Carbon From 315b2f28a7d9a3d43cb4d8ce17088d81f71258e4 Mon Sep 17 00:00:00 2001 From: DjfjdfofdjfjD Date: Mon, 31 Jul 2023 21:40:51 +0500 Subject: [PATCH 5/7] spacespacepcfdeokfrjmepftab --- .../Prototypes/Entities/Objects/Misc/paper.yml | 8 ++++---- .../Prototypes/Entities/Objects/Power/lights.yml | 10 +++++----- .../Entities/Objects/Specific/atmos.yml | 10 +++++----- .../Entities/Objects/Tools/glowstick.yml | 16 ++++++++-------- .../Entities/Objects/Tools/matches.yml | 16 ++++++++-------- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index 9938923adf5000..3793a1b2645b69 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -226,10 +226,10 @@ Steel: 25 - type: SolutionContainerManager solutions: - pen: - reagents: - - ReagentId: Iodine - Quantity: 5 + pen: + reagents: + - ReagentId: Iodine + Quantity: 5 - type: Extractable grinableSolutionName: pen diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml index aaef48497928bf..b30646bdb76e44 100644 --- a/Resources/Prototypes/Entities/Objects/Power/lights.yml +++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml @@ -65,12 +65,12 @@ - type: SpaceGarbage - type: SolutionContainerManager solutions: - bulb: - reagents: - - ReagentId: Nitrogen - Quantity: 15 + glowstick: + reagents: + - ReagentId: Nitrogen + Quantity: 15 - type: Extractable - grinableSolutionName: bulb + - grindableSolutionName: glowstick - type: entity parent: BaseLightbulb diff --git a/Resources/Prototypes/Entities/Objects/Specific/atmos.yml b/Resources/Prototypes/Entities/Objects/Specific/atmos.yml index cdd39a51158510..522edb5c16266e 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/atmos.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/atmos.yml @@ -37,9 +37,9 @@ Glass: 100 - type: SolutionContainerManager solutions: - gasanalyser: - reagents: - - ReagentId: Mercury - Quantity: 15 + gasanalyser: + reagents: + - ReagentId: Mercury + Quantity: 15 - type: Extractable - grinableSolutionName: gasanalyser + - grindableSolutionName: gasanalyser diff --git a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml index a607291e3b9406..d5ec2735ba087e 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml @@ -61,14 +61,14 @@ startValue: 5.0 endValue: 1.5 property: Radius - - type: SolutionContainerManager - solutions: - glowstick: - reagents: - - ReagentId: Oxygen - Quantity: 10 - - ReagentId: Hydrogen - Quantity: 10 + - type: SolutionContainerManager + solutions: + glowstick: + reagents: + - ReagentId: Oxygen + Quantity: 10 + - ReagentId: Hydrogen + Quantity: 10 - type: Extractable - grindableSolutionName: glowstick diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml index d15175ccb86a4c..274d1da44a45f1 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/matches.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/matches.yml @@ -42,10 +42,10 @@ burntIcon: match_burnt - type: SolutionContainerManager solutions: - match: - reagents: - - ReagentId: Phosphorus - Quantity: 2 + match: + reagents: + - ReagentId: Phosphorus + Quantity: 2 - type: Extractable grinableSolutionName: match @@ -61,10 +61,10 @@ state: Burnt - type: SolutionContainerManager solutions: - match: - reagents: - - ReagentId: Carbon - Quantity: 5 + match: + reagents: + - ReagentId: Carbon + Quantity: 5 - type: Extractable grinableSolutionName: match From a3d3a96422eec90f71eff979116ddb599d84623f Mon Sep 17 00:00:00 2001 From: DjfjdfofdjfjD Date: Tue, 1 Aug 2023 11:12:00 +0500 Subject: [PATCH 6/7] nutriments --- .../Entities/Objects/Consumable/Food/snacks.yml | 9 ++++++++- Resources/Prototypes/Entities/Objects/Specific/atmos.yml | 2 +- .../Prototypes/Entities/Objects/Tools/glowstick.yml | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index f16ed231884cf9..efc886db664c9a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -147,9 +147,13 @@ - type: SolutionContainerManager solutions: food: + maxVol: 30 reagents: - ReagentId: Sugar Quantity: 5 + - ReagentId: Nutriment + Quantity: 10 + - type: Extractable grinableSolutionName: food - type: entity @@ -216,11 +220,14 @@ - type: SolutionContainerManager solutions: food: + maxVol: 30 reagents: - ReagentId: Sugar Quantity: 5 - grinableSolutionName: food + - ReagentId: Nutriment + Quantity: 10 - type: Extractable + grinableSolutionName: food trash: FoodPacketSyndiTrash - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Specific/atmos.yml b/Resources/Prototypes/Entities/Objects/Specific/atmos.yml index 522edb5c16266e..41c787c56b8453 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/atmos.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/atmos.yml @@ -42,4 +42,4 @@ - ReagentId: Mercury Quantity: 15 - type: Extractable - - grindableSolutionName: gasanalyser + grindableSolutionName: gasanalyser diff --git a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml index d5ec2735ba087e..e848991331cc85 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml @@ -69,8 +69,8 @@ Quantity: 10 - ReagentId: Hydrogen Quantity: 10 - - type: Extractable - - grindableSolutionName: glowstick + - type: Extractable + grindableSolutionName: glowstick - type: entity name: red glowstick From f3a0d4e56f10826e479f505488d52dd5c6d643ce Mon Sep 17 00:00:00 2001 From: DjfjdfofdjfjD Date: Tue, 1 Aug 2023 11:14:51 +0500 Subject: [PATCH 7/7] forgor --- Resources/Prototypes/Entities/Objects/Power/lights.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml index b30646bdb76e44..9d538c4ae8bef4 100644 --- a/Resources/Prototypes/Entities/Objects/Power/lights.yml +++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml @@ -70,7 +70,7 @@ - ReagentId: Nitrogen Quantity: 15 - type: Extractable - - grindableSolutionName: glowstick + grindableSolutionName: glowstick - type: entity parent: BaseLightbulb