From f21534eefa41c513bd96871d77a85a8d1eb65091 Mon Sep 17 00:00:00 2001 From: lapatison <100279397+lapatison@users.noreply.github.com> Date: Fri, 20 Jan 2023 16:46:42 +0300 Subject: [PATCH] Vinegar, Mayonnaise, Ketchunaise (#13288) --- .../Locale/en-US/flavors/flavor-profiles.ftl | 1 + .../reagents/meta/consumable/drink/drinks.ftl | 3 ++ .../meta/consumable/food/condiments.ftl | 6 +++ .../Random/Food_Drinks/drinks_glass.yml | 1 + .../Objects/Consumable/Drinks/drinks.yml | 17 +++++++ .../Objects/Consumable/Food/ingredients.yml | 29 ++++++------ .../Reagents/Consumable/Drink/drinks.yml | 10 ++++ .../Reagents/Consumable/Food/condiments.yml | 18 +++++++ .../Prototypes/Recipes/Reactions/drinks.yml | 12 +++++ .../Prototypes/Recipes/Reactions/food.yml | 44 ++++++++++++++++++ .../Drinks/glass_light_yellow.rsi/icon.png | Bin 0 -> 315 bytes .../Drinks/glass_light_yellow.rsi/meta.json | 1 + 12 files changed, 128 insertions(+), 14 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_light_yellow.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_light_yellow.rsi/meta.json diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index ae298a7344..1ce4a5eafd 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -38,6 +38,7 @@ flavor-base-creamy = creamy flavor-base-fizzy = fizzy flavor-base-shocking = shocking flavor-base-cheap = cheap +flavor-base-piquant = piquant # lmao flavor-base-terrible = terrible diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl index 09099d96fa..ec5562641a 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl @@ -73,5 +73,8 @@ reagent-desc-hot-ramen = Hot noodles. reagent-name-pilk = pilk reagent-desc-pilk = A sickening mixture of milk and cola. +reagent-name-posca = posca +reagent-desc-posca = Poor warriors' drink from a forgotten era. + reagent-name-kvass = kvass reagent-desc-kvass = A cool refreshing drink with a taste of socialism. 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 4079a0f66c..ed82997b66 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl @@ -19,6 +19,12 @@ reagent-desc-hotsauce = Burns so good. reagent-name-ketchup = ketchup reagent-desc-ketchup = Made from pureed tomatoes and flavored with spices. +reagent-name-ketchunaise = ketchunaise +reagent-desc-ketchunaise = So-called Russian dressing, popular among Space Americans. + +reagent-name-mayo = mayonnaise +reagent-desc-mayo = Creamy sauce, made from oil, egg, and some (edible) acid. + reagent-name-soysauce = soy sauce reagent-desc-soysauce = A salty soy-based flavoring. diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml index 1b29e97cc1..f117655bbe 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml @@ -69,6 +69,7 @@ - DrinkMojito - DrinkNTCahors - DrinkPatronGlass + - DrinkPoscaGlass - DrinkRedMeadGlass - DrinkRewriter - DrinkRootBeerFloatGlass diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index d22d2a3321..d6fe7fe7fb 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -1406,6 +1406,23 @@ - type: Sprite sprite: Objects/Consumable/Drinks/pwineglass.rsi +- type: entity + parent: DrinkGlassBase + id: DrinkPoscaGlass + name: posca glass + description: Poor warriors' drink from a forgotten era. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Posca + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/glass_light_yellow.rsi + - type: entity parent: DrinkGlassBase id: DrinkRedMeadGlass diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index 5f15ae814c..bb4fed694d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -272,20 +272,21 @@ - ReagentId: OilOlive Quantity: 20 -# - type: entity -# parent: ReagentContainerBase -# id: ReagentContainerMayo -# name: mayonnaise -# description: -# components: -# - type: Sprite -# state: mayo -# - type: SolutionContainerManager -# maxVol: 10 -# contents: -# reagents: -# - ReagentId: Mayo -# Quantity: 10 +- type: entity + parent: ReagentContainerBase + id: ReagentContainerMayo + name: mayonnaise + description: Bottle of mayonnaise. + components: + - type: Sprite + state: mayo + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Mayo + Quantity: 20 # - type: entity # parent: ReagentContainerBase diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index 091c1f14b4..b7ae8a59fd 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -322,6 +322,16 @@ - !type:SatiateThirst factor: 1 +- type: reagent + id: Posca + name: reagent-name-posca + parent: BaseDrink + desc: reagent-desc-posca + physicalDesc: reagent-physical-desc-sour + flavor: bitter + color: "#B3B599" + spritePath: glass_light_yellow.rsi + - type: reagent id: KiraSpecial name: reagent-name-kira-special diff --git a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml index 6f2435f0ec..9c0f757860 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml @@ -61,6 +61,24 @@ flavor: tomato color: red +- type: reagent + id: Ketchunaise + name: reagent-name-ketchunaise + group: Foods + desc: reagent-desc-ketchunaise + physicalDesc: reagent-physical-desc-saucey + flavor: piquant + color: "#fba399" + +- type: reagent + id: Mayo + name: reagent-name-mayo + group: Foods + desc: reagent-desc-mayo + physicalDesc: reagent-physical-desc-thick + flavor: sour + color: "#f9f5e5" + - type: reagent id: Soysauce name: reagent-name-soysauce diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index ac6b16a9d8..9b930d07ee 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -432,6 +432,18 @@ products: Patron: 10 +- type: reaction + id: Posca + reactants: + TableSalt: + amount: 1 + Vinegar: + amount: 1 + Water: + amount: 1 + products: + Posca: 3 + - type: reaction id: Rewriter reactants: diff --git a/Resources/Prototypes/Recipes/Reactions/food.yml b/Resources/Prototypes/Recipes/Reactions/food.yml index 8889369fee..c03ac57b2a 100644 --- a/Resources/Prototypes/Recipes/Reactions/food.yml +++ b/Resources/Prototypes/Recipes/Reactions/food.yml @@ -98,6 +98,40 @@ amount: 5 products: Ketchup: 15 + +- type: reaction + id: CookingMayoVinegar + reactants: + Vinegar: + amount: 5 + Oil: + amount: 5 + Egg: + amount: 6 + products: + Mayo: 15 + +- type: reaction + id: CookingMayoLemon + reactants: + JuiceLemon: + amount: 5 + Oil: + amount: 5 + Egg: + amount: 6 + products: + Mayo: 15 + +- type: reaction + id: CookingKetchunaise + reactants: + Ketchup: + amount: 5 + Mayo: + amount: 5 + products: + Ketchunaise: 10 - type: reaction id: CookingBbqSauce @@ -123,6 +157,16 @@ products: Hotsauce: 15 +- type: reaction + id: CookingVinegar + reactants: + Ethanol: + amount: 5 + Oxygen: + amount: 5 + products: + Vinegar: 10 + - type: reaction id: CreateMeatball impact: Low diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_light_yellow.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/glass_light_yellow.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d56cb15e7b09badff5853f3a49a51fa219d05d3a GIT binary patch literal 315 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFfw_%IEF-UCfgJ|U^wi+w5)N9 zOv?8a%x=yJCM;|=EDn&%=w39yoBaS+8fhKTzs_`;6nK&h;f3u&c8l{(oM> z$)(VvjNwekgw`tz%yE1@RzT;S;A*_vJ}pR@x#6sWwzOT{SJB=m(kM=FGrwRaGZOD5Js{7$^*$ Lu6{1-oD!M