From 2a422c0af843ae4df3fbd41f51bf7a1f4507eef4 Mon Sep 17 00:00:00 2001
From: mirrorcult <lunarautomaton6@gmail.com>
Date: Sat, 12 Mar 2022 14:41:55 -0700
Subject: [PATCH] Physical desc fixes (#7093)

---
 .../Chemistry/Reagent/ReagentPrototype.cs        | 12 ++++++------
 .../Reagents/Consumable/Food/condiments.yml      | 16 ++++++++--------
 .../Reagents/Consumable/Food/ingredients.yml     |  8 ++++++--
 Resources/Prototypes/Reagents/narcotics.yml      |  2 +-
 4 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
index 67de4275ae..81cb7b2fba 100644
--- a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
+++ b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
@@ -28,8 +28,8 @@ namespace Content.Shared.Chemistry.Reagent
         [DataField("id", required: true)]
         public string ID { get; } = default!;
 
-        [DataField("name")]
-        public string Name { get; } = string.Empty;
+        [DataField("name", required: true)]
+        public string Name { get; } = default!;
 
         [DataField("group")]
         public string Group { get; } = "Unknown";
@@ -41,11 +41,11 @@ namespace Content.Shared.Chemistry.Reagent
         [DataField("abstract")]
         public bool Abstract { get; private set; }
 
-        [DataField("desc")]
-        public string Description { get; } = string.Empty;
+        [DataField("desc", required: true)]
+        public string Description { get; } = default!;
 
-        [DataField("physicalDesc")]
-        public string PhysicalDescription { get; } = string.Empty;
+        [DataField("physicalDesc", required: true)]
+        public string PhysicalDescription { get; } = default!;
 
         [DataField("color")]
         public Color SubstanceColor { get; } = Color.White;
diff --git a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
index 09ea7ef1cc..aca470909b 100644
--- a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
@@ -3,7 +3,7 @@
   name: Astrotame
   group: Foods
   desc: The sweetness of a thousand sugars but none of the calories.
-#  physicalDesc:
+  physicalDesc: sugary
   color: aquamarine
 
 - type: reagent
@@ -11,7 +11,7 @@
   name: BBQ sauce
   group: Foods
   desc: Hand wipes not included.
-  physicalDesc: Gloopy.
+  physicalDesc: gloopy # splurgy
   color: darkred
 
 - type: reagent
@@ -19,7 +19,7 @@
   name: corn oil
   group: Foods
   desc: Corn oil, A delicious oil used in cooking. Made from corn.
-#  physicalDesc:
+  physicalDesc: oily
   color: yellow
 
 - type: reagent
@@ -27,7 +27,7 @@
   name: frostoil
   group: Foods
   desc: Leaves the tongue numb in its passage.
-#  physicalDesc:
+  physicalDesc: cold
   color: skyblue
 
 - type: reagent
@@ -35,7 +35,7 @@
   name: horseradish sauce
   group: Foods
   desc: Smelly horseradish sauce.
-  physicalDesc: Overpowering.
+  physicalDesc: overpowering
   color: gray
 
 - type: reagent
@@ -43,7 +43,7 @@
   name: hotsauce
   group: Foods
   desc: Burns so good.
-#  physicalDesc:
+  physicalDesc: spicy
   color: red
 
 - type: reagent
@@ -51,7 +51,7 @@
   name: ketchup
   group: Foods
   desc: Made from pureed tomatoes and flavored with spices.
-#  physicalDesc:
+  physicalDesc: tangy
   color: red
 
 - type: reagent
@@ -59,7 +59,7 @@
   name: soy sauce
   group: Foods
   desc: A salty soy-based flavoring.
-#  physicalDesc:
+  physicalDesc: salty
   color: saddlebrown
 
 - type: reagent
diff --git a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml
index 680763f036..32d5285ce1 100644
--- a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml
@@ -29,6 +29,7 @@
   name: universal enzyme
   group: Foods
   desc: Used in cooking various dishes.
+  physicalDesc: chalky
   color: "#009900"
   metabolisms:
     Food:
@@ -54,7 +55,7 @@
   name: sugar
   group: Foods
   desc: Tasty spacey sugar!
-  physicalDesc:
+  physicalDesc: sweet
   color: white
   metabolisms:
     Food:
@@ -67,7 +68,7 @@
   name: black pepper
   group: Foods
   desc: Often used to flavor food or make people sneeze.
-  physicalDesc: Grainy.
+  physicalDesc: grainy
   color: black
   metabolisms:
     Food:
@@ -80,6 +81,7 @@
   name: vinegar
   group: Foods
   desc: Often used to flavor food.
+  physicalDesc: sour
   color: tan
   metabolisms:
     Food:
@@ -92,6 +94,7 @@
   name: rice
   group: Foods
   desc: Hard, small white grains.
+  physicalDesc: chewy
   color: white
   metabolisms:
     Food:
@@ -103,6 +106,7 @@
   name: olive oil
   group: Foods
   desc: Viscous and fragrant.
+  physicalDesc: oily
   color: olive
   metabolisms:
     Food:
diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml
index 6502db22ff..ae5b19ca25 100644
--- a/Resources/Prototypes/Reagents/narcotics.yml
+++ b/Resources/Prototypes/Reagents/narcotics.yml
@@ -45,7 +45,7 @@
   name: ephedrine
   group: Narcotics
   desc: Increases stun resistance and movement speed, giving you hand cramps. Overdose deals toxin damage and inhibits breathing.
-  physicalDesc: Bone white
+  physicalDesc: powdery
   color: "#D2FFFA"
   boilingPoint: 255.0
   meltingPoint: 36.0