From 962c2f592884935c8b7effb4d8d3bd1531fd4eff Mon Sep 17 00:00:00 2001
From: Will <7099514+Willburd@users.noreply.github.com>
Date: Fri, 10 Oct 2025 01:47:00 -0400
Subject: [PATCH] Deconflicts Tea (#11803)

---
 .../reactions/distilling/hot_drinks.dm        | 32 +++++++++
 .../reagents/reactions/instant/drinks.dm      | 67 -------------------
 vorestation.dme                               |  1 +
 3 files changed, 33 insertions(+), 67 deletions(-)
 create mode 100644 modular_chomp/code/modules/reagents/reactions/distilling/hot_drinks.dm

diff --git a/modular_chomp/code/modules/reagents/reactions/distilling/hot_drinks.dm b/modular_chomp/code/modules/reagents/reactions/distilling/hot_drinks.dm
new file mode 100644
index 0000000000..ec470bc64f
--- /dev/null
+++ b/modular_chomp/code/modules/reagents/reactions/distilling/hot_drinks.dm
@@ -0,0 +1,32 @@
+/decl/chemical_reaction/distilling/drinks/cherrytea
+	name = REAGENT_CHERRYTEA
+	id = REAGENT_ID_CHERRYTEA
+	result = REAGENT_ID_CHERRYTEA
+	required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_CHERRYJELLY = 1)
+	result_amount = 6
+
+/decl/chemical_reaction/distilling/drinks/watermelontea
+	name = REAGENT_WATERMELONTEA
+	id = REAGENT_ID_WATERMELONTEA
+	result = REAGENT_ID_WATERMELONTEA
+	required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_WATERMELONJUICE = 1)
+	result_amount = 6
+
+/decl/chemical_reaction/distilling/drinks/matcha_latte
+	name = REAGENT_MATCHALATTE
+	id = REAGENT_ID_MATCHALATTE
+	result = REAGENT_ID_MATCHALATTE
+	required_reagents = list (REAGENT_ID_MATCHAPOWDER = 1, REAGENT_ID_MILK = 5)
+	result_amount = 5
+
+/decl/chemical_reaction/distilling/drinks/greenteafresh
+	id = REAGENT_ID_FRESHTEAGREEN
+	result = REAGENT_ID_FRESHTEAGREEN
+	required_reagents = list (REAGENT_ID_TEALEAVESGREEN = 1, REAGENT_ID_WATER = 9)
+	result_amount = 10
+
+/decl/chemical_reaction/distilling/drinks/matcha
+	id = REAGENT_ID_MATCHA
+	result = REAGENT_ID_MATCHA
+	required_reagents = list (REAGENT_ID_MATCHAPOWDER = 1, REAGENT_ID_WATER = 2)
+	result_amount = 2
diff --git a/modular_chomp/code/modules/reagents/reactions/instant/drinks.dm b/modular_chomp/code/modules/reagents/reactions/instant/drinks.dm
index 7d9e0eed73..9a2ff98a59 100644
--- a/modular_chomp/code/modules/reagents/reactions/instant/drinks.dm
+++ b/modular_chomp/code/modules/reagents/reactions/instant/drinks.dm
@@ -1,64 +1,3 @@
-/decl/chemical_reaction/instant/drinks/minttea
-	name = REAGENT_MINTTEA
-	id = REAGENT_ID_MINTTEA
-	result = REAGENT_ID_MINTTEA
-	required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_MINT = 1)
-	result_amount = 6
-
-/decl/chemical_reaction/instant/drinks/lemontea
-	name = REAGENT_LEMONTEA
-	id = REAGENT_ID_LEMONTEA
-	result = REAGENT_ID_LEMONTEA
-	required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_LEMONJUICE = 1)
-	result_amount = 6
-
-/decl/chemical_reaction/instant/drinks/limetea
-	name = REAGENT_LIMETEA
-	id = REAGENT_ID_LIMETEA
-	result = REAGENT_ID_LIMETEA
-	required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_LIMEJUICE = 1)
-	result_amount = 6
-
-/decl/chemical_reaction/instant/drinks/orangetea
-	name = REAGENT_ORANGETEA
-	id = REAGENT_ID_ORANGETEA
-	result = REAGENT_ID_ORANGETEA
-	required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_ORANGEJUICE = 1)
-	result_amount = 6
-
-/decl/chemical_reaction/instant/drinks/berrytea
-	name = REAGENT_BERRYTEA
-	id = REAGENT_ID_BERRYTEA
-	result = REAGENT_ID_BERRYTEA
-	required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_BERRYJUICE = 1)
-	result_amount = 6
-
-/decl/chemical_reaction/instant/drinks/cherrytea
-	name = REAGENT_CHERRYTEA
-	id = REAGENT_ID_CHERRYTEA
-	result = REAGENT_ID_CHERRYTEA
-	required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_CHERRYJELLY = 1)
-	result_amount = 6
-
-/decl/chemical_reaction/instant/drinks/watermelontea
-	name = REAGENT_WATERMELONTEA
-	id = REAGENT_ID_WATERMELONTEA
-	result = REAGENT_ID_WATERMELONTEA
-	required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_WATERMELONJUICE = 1)
-	result_amount = 6
-
-/decl/chemical_reaction/instant/tea/matcha_latte
-	id = REAGENT_ID_MATCHALATTE
-	result = REAGENT_ID_MATCHALATTE
-	required_reagents = list (REAGENT_ID_MATCHAPOWDER = 1, REAGENT_ID_MILK = 5)
-	result_amount = 5
-
-/decl/chemical_reaction/instant/freshtea/green
-	id = REAGENT_ID_FRESHTEAGREEN
-	result = REAGENT_ID_FRESHTEAGREEN
-	required_reagents = list (REAGENT_ID_TEALEAVESGREEN = 1, REAGENT_ID_WATER = 9)
-	result_amount = 10
-
 /decl/chemical_reaction/instant/instantteapowder/green
 	id = REAGENT_ID_INSTANTTEAPOWDERGREEN
 	result = REAGENT_ID_INSTANTTEAPOWDERGREEN
@@ -71,12 +10,6 @@
 	required_reagents = list (REAGENT_ID_INSTANTTEAPOWDERGREEN = 1, REAGENT_ID_WATER = 9)
 	result_amount = 10
 
-/decl/chemical_reaction/instant/matcha
-	id = REAGENT_ID_MATCHA
-	result = REAGENT_ID_MATCHA
-	required_reagents = list (REAGENT_ID_MATCHAPOWDER = 1, REAGENT_ID_WATER = 2)
-	result_amount = 2
-
 /decl/chemical_reaction/instant/drinks/spiderdrink
 	name = REAGENT_SPIDERDRINK
 	id = REAGENT_ID_SPIDERDRINK
diff --git a/vorestation.dme b/vorestation.dme
index 8bafc80f38..848b86a7a7 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -5335,6 +5335,7 @@
 #include "modular_chomp\code\modules\projectiles\precursor\tyr.dm"
 #include "modular_chomp\code\modules\reagents\machinery\dispenser\chem_synthesizer_ch.dm"
 #include "modular_chomp\code\modules\reagents\reactions\distilling\distilling.dm"
+#include "modular_chomp\code\modules\reagents\reactions\distilling\hot_drinks.dm"
 #include "modular_chomp\code\modules\reagents\reactions\instant\drinks.dm"
 #include "modular_chomp\code\modules\reagents\reactions\instant\instant.dm"
 #include "modular_chomp\code\modules\reagents\reagents\food_drinks.dm"