Vinegar, Mayonnaise, Ketchunaise (#13288)

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

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.

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.
 

Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml

@@ -69,6 +69,7 @@
       - DrinkMojito
       - DrinkNTCahors
       - DrinkPatronGlass
+      - DrinkPoscaGlass
       - DrinkRedMeadGlass
       - DrinkRewriter
       - DrinkRootBeerFloatGlass

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

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

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

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

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:

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

Resources/Textures/Objects/Consumable/Drinks/glass_light_yellow.rsi/meta.json

@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, modified by lapatison", "states": [{"name": "icon"}]}