Add the White Gilgamesh (#16378)

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

@@ -25,7 +25,6 @@
       - DrinkBarefootGlass
       - DrinkBeerglass
       - DrinkBerryJuice
-      - DrinkBilkGlass
       - DrinkBlackRussianGlass
       - DrinkBlueCuracaoGlass
       - DrinkBloodyMaryGlass

Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml

@@ -397,23 +397,6 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/berryjuice.rsi
 
-- type: entity
-  parent: DrinkGlassBase
-  id: DrinkBilkGlass
-  name: bilk
-  description: A brew of milk and beer. For those alcoholics who fear osteoporosis.
-  components:
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 30
-        reagents:
-        - ReagentId: Bilk
-          Quantity: 30
-  - type: Drink
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/glass_brown.rsi
-
 - type: entity
   parent: DrinkGlassBase
   id: DrinkBlackRussianGlass

Resources/Prototypes/Flavors/flavors.yml

@@ -799,6 +799,11 @@
   flavorType: Complex
   description: flavor-complex-themartinez
 
+- type: flavor
+  id: white-gilgamesh
+  flavorType: Complex
+  description: flavor-complex-white-gilgamesh
+
 - type: flavor
   id: plastic
   flavorType: Complex
@@ -808,7 +813,7 @@
   id: glue
   flavorType: Complex
   description: flavor-complex-glue
-  
+
 - type: flavor
   id: rocksandstones
   flavorType: Complex

Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml

@@ -545,18 +545,6 @@
         reagent: Ethanol
         amount: 0.15
 
-- type: reagent
-  id: Bilk
-  name: reagent-name-bilk
-  parent: BaseDrink
-  desc: reagent-desc-bilk
-  physicalDesc: reagent-physical-desc-bilky
-  flavor: alcohol
-  color: "#895C4C"
-  metamorphicSprite:
-    sprite: Objects/Consumable/Drinks/glass_brown.rsi
-    state: icon
-
 - type: reagent
   id: BlackRussian
   name: reagent-name-black-russian

Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml

@@ -418,3 +418,17 @@
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/the_martinez.rsi
     state: icon
+
+- type: reagent
+  id: WhiteGilgamesh
+  name: reagent-name-white-gilgamesh
+  parent: BaseDrink
+  desc: reagent-desc-white-gilgamesh
+  physicalDesc: reagent-physical-desc-creamy
+  flavor: white-gilgamesh
+  color: "#e5d27e"
+  metabolisms:
+    Drink:
+      effects:
+        - !type:SatiateThirst
+          factor: 1

Resources/Prototypes/Recipes/Reactions/drinks.yml

@@ -126,16 +126,6 @@
   products:
     BeepskySmash: 2
 
-- type: reaction
-  id: Bilk
-  reactants:
-    Beer:
-      amount: 1
-    Milk:
-      amount: 1
-  products:
-    Bilk: 2
-
 - type: reaction
   id: BlackRussian
   reactants:
@@ -879,6 +869,16 @@
   products:
     TheMartinez: 6
 
+- type: reaction
+  id: WhiteGilgamesh
+  reactants:
+    Beer:
+      amount: 2
+    Milk:
+      amount: 1
+  products:
+    WhiteGilgamesh: 3
+
 - type: reaction
   id: Cola
   reactants:
@@ -891,4 +891,4 @@
     Sugar:
       amount: 1
   products:
-    Cola: 4
+    Cola: 4