From 1ceedd196b55eb46cf2ae097fe9e2f09917c325b Mon Sep 17 00:00:00 2001
From: "Wowzewow (Wezzy)" <42310821+alsoandanswer@users.noreply.github.com>
Date: Sat, 25 Jan 2025 09:26:24 +0800
Subject: [PATCH] Mimosa fix (#20410)

Fixes #20392
---
 .../Chemistry-Reagents-Food-Drinks.dm         | 11 ----
 code/modules/reagents/Chemistry-Recipes.dm    |  7 ---
 html/changelogs/wezzy_mimosafix.yml           | 58 +++++++++++++++++++
 3 files changed, 58 insertions(+), 18 deletions(-)
 create mode 100644 html/changelogs/wezzy_mimosafix.yml

diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
index 84a082f08dd..ebe2486f11d 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
@@ -5677,17 +5677,6 @@
 	glass_desc = "And Our Lady did come down from the mountain, and She was flanked in radiant and ever-burning cosmic fires. And She spoke with the Lady Caladius for what seemed an eternity, \
 	and the Lady Caladius did finally emerge. And we happy few were so blessed as to hear her- the Prophetess Giovanna- say, 'Drink today not as warriors, but as immortals.'."
 
-/singleton/reagent/alcohol/mimosa
-	name = "Mimosa"
-	color = "#d87606"
-	description = "Champagne and orange juice. A festive cocktail usually served at high-end events, such as weddings, business brunch, or even as a first-class drink on passenger transports."
-	strength = 35
-	taste_description = "sparkling orange juice"
-
-	glass_icon_state = "mimosa_glass"
-	glass_name = "glass of Mimosa"
-	glass_desc = "Champagne and orange juice. A festive cocktail usually served at high-end events, such as weddings, business brunch, or even as a first-class drink on passenger transports."
-
 /singleton/reagent/alcohol/lights_edge
 	name = "Light's Edge"
 	color = "#592ada"
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index da83637173d..71b54b0a1ad 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -3175,13 +3175,6 @@
 	required_reagents = list(/singleton/reagent/drink/milk = 1, /singleton/reagent/nutriment/choconutspread = 1, /singleton/reagent/drink/milk/cream = 1)
 	result_amount = 3
 
-/datum/chemical_reaction/drink/drink/mimosa
-	name = "Mimosa"
-	id = "mimosa"
-	result = /singleton/reagent/alcohol/mimosa
-	required_reagents = list(/singleton/reagent/alcohol/champagne = 1, /singleton/reagent/drink/orangejuice = 1)
-	result_amount = 2
-
 /datum/chemical_reaction/drink/lights_edge
 	name = "Light's Edge"
 	id = "lights_edge"
diff --git a/html/changelogs/wezzy_mimosafix.yml b/html/changelogs/wezzy_mimosafix.yml
new file mode 100644
index 00000000000..f26e897ee57
--- /dev/null
+++ b/html/changelogs/wezzy_mimosafix.yml
@@ -0,0 +1,58 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: Wowzewow (Wezzy)
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - bugfix: "Removes duplicate mimosa entry. Fixes invisible mimosa bug."