From 3457729ba4cbb12d64e261f5728a7959e513cfb1 Mon Sep 17 00:00:00 2001
From: Interrobang01 <113810873+Interrobang01@users.noreply.github.com>
Date: Wed, 9 Aug 2023 18:38:36 -0700
Subject: [PATCH] Added Mustard (#18930)

---
 .../meta/consumable/food/condiments.ftl       |   3 +++
 .../Inventories/condiments.yml                |   1 +
 .../Consumable/Food/Containers/condiments.yml |  25 ++++++++++++++++++
 .../Reagents/Consumable/Food/condiments.yml   |  10 +++++++
 .../Prototypes/Recipes/Reactions/food.yml     |  11 ++++++++
 .../Consumable/Food/condiments.rsi/meta.json  |   3 +++
 .../Food/condiments.rsi/packet-mustard.png    | Bin 0 -> 289 bytes
 7 files changed, 53 insertions(+)
 create mode 100644 Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-mustard.png

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 44c9c031d7..a448b45a10 100644
--- a/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl
@@ -25,6 +25,9 @@ reagent-desc-ketchunaise = So-called Russian dressing, popular among Space Ameri
 reagent-name-mayo = mayonnaise
 reagent-desc-mayo = Creamy sauce, made from oil, egg, and some (edible) acid.
 
+reagent-name-mustard = mustard
+reagent-desc-mustard = Basic yellow mustard, made from the seeds of the mustard plant.
+
 reagent-name-vinaigrette = vinaigrette
 reagent-desc-vinaigrette = A basic salad dressing made with oil, vinegar and seasoning.
 
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml
index c099492b51..70924a1e6e 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml
@@ -7,6 +7,7 @@
     FoodCondimentPacketHorseradish: 5
     FoodCondimentPacketHotsauce: 5
     FoodCondimentPacketKetchup: 5
+    FoodCondimentPacketMustard: 5
     FoodCondimentPacketPepper: 5
     FoodCondimentPacketSalt: 5
     FoodCondimentPacketSoy: 5
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
index fbbdcdf0d4..577f18abd0 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
@@ -234,6 +234,31 @@
     maxFillLevels: 2
     fillBaseName: packet-solid-
 
+- type: entity
+  parent: BaseFoodCondimentPacket
+  id: FoodCondimentPacketMustard
+  name: mustard
+  description: A condiment made from the ground-up seeds of the Mustard plant.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: Mustard
+          Quantity: 10
+  - type: Sprite
+    layers:
+      - state: packet-solid-2
+        map: ["enum.SolutionContainerLayers.Fill"]
+        visible: true
+      - state: packet-layer
+  - type: Icon
+    state: packet-mustard
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 2
+    fillBaseName: packet-solid-
+
 - type: entity
   parent: BaseFoodCondimentPacket
   id: FoodCondimentPacketPepper
diff --git a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
index f5bde4ac21..f7e0e1da8e 100644
--- a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
@@ -88,6 +88,16 @@
   color: "#f9f5e5"
   recognizable: true
 
+- type: reagent
+  id: Mustard
+  name: reagent-name-mustard
+  group: Foods
+  desc: reagent-desc-mustard
+  physicalDesc: reagent-physical-desc-thick
+  flavor: sour
+  color: "#ffdb58"
+  recognizable: true
+
 - type: reagent
   id: Vinaigrette
   name: reagent-name-vinaigrette
diff --git a/Resources/Prototypes/Recipes/Reactions/food.yml b/Resources/Prototypes/Recipes/Reactions/food.yml
index 365edcdb34..2ef1cf2dab 100644
--- a/Resources/Prototypes/Recipes/Reactions/food.yml
+++ b/Resources/Prototypes/Recipes/Reactions/food.yml
@@ -174,6 +174,17 @@
   products:
     Mayo: 15
 
+# Gas not included
+- type: reaction
+  id: CookingMustard
+  reactants:
+    Bleach:
+      amount: 1
+    Ammonia:
+      amount: 1
+  products:
+    Mustard: 2
+
 - type: reaction
   id: CookingKetchunaise
   reactants:
diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/meta.json
index cd02b0bed0..bcba1b89ba 100644
--- a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/meta.json
@@ -88,6 +88,9 @@
     {
       "name": "packet-ketchup"
     },
+    {
+      "name": "packet-mustard"
+    },
     {
       "name": "packet-mixed"
     },
diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-mustard.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-mustard.png
new file mode 100644
index 0000000000000000000000000000000000000000..285d20fb17b8a1a3cf2ec21ffcbecfb3a4865ec0
GIT binary patch
literal 289
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;5JVe$B+p3WC_;A2_ijBitKW>RbS-geYFyr
zE~zvMtNS(RIxj!T*b^{IgW*$Z(2jdgrzB{u;LzH@b$g+<y1M(MnJTRZHm9FI@TJpx
zzM%offhV4fDwYmjTn|70Ywa&dl+bEX^4C$&W+`ASa%xy(vS9HkZc#@DZriwDOBrJt
z)@3qCOH9g4Fkv~t)u_GQJ~=@^L7m0pl#v3%sV;^2O*+oYJ<m3!Fn+nkKUWUyM5ap&
b%*+h87dHjw_{Zb{eZb)9>gTe~DWM4fKeJsf

literal 0
HcmV?d00001