# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
updat?

@@ -2,0 +2,4 @@
+# SPDX-FileCopyrightText: 2025 Shaman
+# SPDX-FileCopyrightText: 2025 pocl v
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later

@@ -62,0 +66,4 @@
+# SPDX-FileCopyrightText: 2025 pocl v
+# SPDX-FileCopyrightText: 2025 portfiend
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later

@@ -28,2 +28,4 @@
   products:
     FeverDream: 5
+
+# SPDX-License-Identifier: AGPL-3.0-or-later

@@ -7,2 +4,3 @@
-flavor-complex-thavenbad = like you need to pretend you like it
 flavor-complex-allulalo = like hand sanitizer
+
+flavor-base-drinkdrink = like dogshit

@@ -9,0 +8,4 @@
+flavor-base-kingsoda = like you're a champion
+flavor-complex-feverdream = like you're losing your mind
+flavor-complex-genderfluid = transitional
+flavor-complex-grease = tastes thick, slimy, and a bit bitter

@@ -3,0 +17,4 @@
+reagent-desc-thumperdrink = A delicious blend of fruit juice and liquor, from the shelves of the Uthani homeworld to a bar counter near you.
+
+reagent-name-moscowmule = moscow mule
+reagent-desc-moscowmule = A fresh and sparkly cocktail, with just the right kick of ginger to wake you from your stupor. If it's not in copper, why even bother?

@@ -1,2 +1,9 @@
-reagent-name-feverdream = fever dream
-reagent-desc-feverdream = A creamy, hallucinogenic cocktail of exotic blood, absinthe, and champagne, topped with frothed egg whites. Unpalatable if mixed incorrectly, and traditionally served with a thaven good luck charm. Open your eyes.
+

@@ -0,0 +1,12 @@
+

@@ -3,0 +3,4 @@
+
+
+reagent-physical-desc-evil = evil
+reagent-physical-desc-thegrease = really greasy

@@ -30,0 +41,4 @@
+- type: flavor
+  id: evil
+  flavorType: Base
+  description: flavor-base-evil

@@ -0,0 +55,4 @@
+  id: LiquidLunch
+  name: reagent-name-liquidlunch
+  parent: BaseDrink
+  slippery: false