diff --git a/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl b/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl index 809fbafffd9c..277f747214c7 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl @@ -37,6 +37,9 @@ reagent-desc-vinaigrette = A basic salad dressing made with oil, vinegar and sea reagent-name-soysauce = soy sauce reagent-desc-soysauce = A salty soy-based flavoring. +reagent-name-teriyaki = teriyaki sauce +reagent-desc-teriyaki = A sweet and savory sauce often paired with meat. + reagent-name-table-salt = table salt reagent-desc-table-salt = Commonly known as salt, Sodium Chloride is often used to season food or kill borers instantly. diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml index 70924a1e6e76..2d7fa436326c 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml @@ -11,10 +11,11 @@ FoodCondimentPacketPepper: 5 FoodCondimentPacketSalt: 5 FoodCondimentPacketSoy: 5 + FoodCondimentPacketTeriyaki: 5 FoodCondimentPacketSugar: 5 FoodCondimentPacketCornoil: 5 ForkPlastic: 10 SpoonPlastic: 10 KnifePlastic: 10 FoodPlatePlastic: 10 - FoodPlateSmallPlastic: 10 \ No newline at end of file + FoodPlateSmallPlastic: 10 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml index c7e46d9a94a0..0e46124b1c8b 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml @@ -77,7 +77,9 @@ food: reagents: - ReagentId: Nutriment - Quantity: 5 + Quantity: 3 + - ReagentId: THC + Quantity: 1 - type: Sprite state: dank @@ -96,9 +98,11 @@ food: reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 8 - ReagentId: Omnizine - Quantity: 4 + Quantity: 2 + - ReagentId: THC + Quantity: 5 - type: entity name: spicy-pocket @@ -108,9 +112,16 @@ components: - type: FlavorProfile flavors: - - spicy - meaty - cheap + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: CapsaicinOil + Quantity: 1 - type: Sprite state: plain @@ -130,9 +141,11 @@ food: reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 8 - ReagentId: Omnizine Quantity: 2 + - ReagentId: CapsaicinOil + Quantity: 5 - type: Sprite state: spicy @@ -147,6 +160,14 @@ - meaty - sweet - cheap + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: TeriyakiSauce + Quantity: 1 - type: Sprite state: teriyaki @@ -166,9 +187,11 @@ food: reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 8 - ReagentId: Omnizine Quantity: 2 + - ReagentId: TeriyakiSauce + Quantity: 5 - type: entity name: pizza-pocket @@ -187,7 +210,7 @@ food: reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 8 - type: Sprite state: pizza @@ -208,7 +231,7 @@ food: reagents: - ReagentId: Nutriment - Quantity: 15 + Quantity: 13 - ReagentId: Omnizine Quantity: 2 @@ -227,9 +250,11 @@ food: reagents: - ReagentId: Nutriment - Quantity: 5 + Quantity: 3 - ReagentId: Omnizine - Quantity: 2 + Quantity: 1 + - ReagentId: JuiceBanana + Quantity: 1 - type: Sprite state: banana @@ -248,9 +273,11 @@ food: reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 8 - ReagentId: Omnizine - Quantity: 2 + Quantity: 4 + - ReagentId: JuiceBanana + Quantity: 3 - type: entity name: berry-pocket @@ -260,14 +287,15 @@ components: - type: FlavorProfile flavors: - - sweet - cheap - type: SolutionContainerManager solutions: food: reagents: - ReagentId: Nutriment - Quantity: 5 + Quantity: 4 + - ReagentId: Sugar + Quantity: 1 - type: Sprite state: berry @@ -279,18 +307,17 @@ components: - type: FlavorProfile flavors: - - sweet - cheap - type: SolutionContainerManager solutions: food: reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 9 - ReagentId: Omnizine Quantity: 2 - ReagentId: Sugar - Quantity: 2 + Quantity: 3 - type: entity name: stonk-pocket @@ -302,12 +329,6 @@ flavors: - profits - cheap - - type: SolutionContainerManager - solutions: - food: - reagents: - - ReagentId: Nutriment - Quantity: 5 - type: Sprite state: stonk @@ -323,11 +344,35 @@ - type: SolutionContainerManager solutions: food: + maxVol: 15 reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 3 - ReagentId: Omnizine - Quantity: 2 + Quantity: 1 + - type: RandomFillSolution + solution: food + weightedRandomId: RandomFillStonk + +- type: weightedRandomFillSolution + id: RandomFillStonk + fills: + - quantity: 5 # Average result + weight: 5 + reagents: + - Nutriment + - quantity: 10 # Quality result + weight: 3 + reagents: + - Nutriment + - quantity: 1 # Losing result + weight: 3 + reagents: + - Omnizine + - quantity: 9 # Jackpot + weight: 1 + reagents: + - Omnizine - type: entity name: carp-pocket @@ -344,7 +389,9 @@ food: reagents: - ReagentId: Nutriment - Quantity: 5 + Quantity: 4 + - ReagentId: CarpoToxin + Quantity: 0.5 - type: Sprite state: carp @@ -364,7 +411,9 @@ - ReagentId: Nutriment Quantity: 10 - ReagentId: Omnizine - Quantity: 2 + Quantity: 4 + - ReagentId: CarpoToxin + Quantity: 1 - type: entity name: dink-pocket diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml index bbe5cf244b2a..581cca99ada1 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml @@ -303,6 +303,25 @@ maxFillLevels: 2 fillBaseName: packet-solid- +- type: entity + parent: BaseFoodCondimentPacket + id: FoodCondimentPacketTeriyaki + name: teriyaki sauce + description: A sweet and savory marinade. + components: + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: TeriyakiSauce + Quantity: 10 + - type: Icon + state: packet-soysauce # TODO Make a new sprite? + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 2 + fillBaseName: packet-solid- + - type: entity parent: BaseFoodCondimentPacket id: FoodCondimentPacketSugar diff --git a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml index 19b31b6d250c..d449839e4d19 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml @@ -134,13 +134,30 @@ - !type:SatiateThirst factor: -0.5 # high salt content +- type: reagent + id: TeriyakiSauce + name: reagent-name-teriyaki + group: Foods + desc: reagent-desc-teriyaki + physicalDesc: reagent-physical-desc-salty + flavor: savory + color: saddlebrown + recognizable: true + metabolisms: + Food: + effects: + - !type:SatiateHunger + factor: 0.5 + - !type:SatiateThirst + factor: -0.5 # high salt content + - type: reagent id: TableSalt name: reagent-name-table-salt group: Foods desc: reagent-desc-table-salt physicalDesc: reagent-physical-desc-grainy - flavor: salty + flavor: savory color: "#cfd1d0" recognizable: true boilingPoint: 1465.0 diff --git a/Resources/Prototypes/Recipes/Reactions/food.yml b/Resources/Prototypes/Recipes/Reactions/food.yml index 7d524a9c7ae0..17dbb73a28fc 100644 --- a/Resources/Prototypes/Recipes/Reactions/food.yml +++ b/Resources/Prototypes/Recipes/Reactions/food.yml @@ -304,6 +304,18 @@ products: Soysauce: 3 +- type: reaction + id: CookingTeriyakiSauce + reactants: + Soysauce: + amount: 2 + Sugar: + amount: 1 + Sake: + amount: 1 + products: + TeriyakiSauce: 4 + - type: reaction id: CookingVinaigrette reactants: