From da942dc7407bd8b04da78518cf4ffdcd024bdf58 Mon Sep 17 00:00:00 2001
From: Darius <5933805+LeDrascol@users.noreply.github.com>
Date: Thu, 19 Jan 2023 02:11:44 -0500
Subject: [PATCH] Remove unnecessary drink icon variables

Removes unnecessary duplicate drink icon definitions for ported TG drink icons that were merged upstream.
---
 .../modules/food_and_drinks/drinks/drinks/bottle.dm    |  3 ---
 .../reagents/chemistry/reagents/alcohol_reagents.dm    | 10 ----------
 2 files changed, 13 deletions(-)

diff --git a/modular_splurt/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/modular_splurt/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index 43a996d228..436ab349f3 100644
--- a/modular_splurt/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/modular_splurt/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -2,14 +2,12 @@
 /obj/item/reagent_containers/food/drinks/bottle/bitters
 	name = "Andromeda Bitters"
 	desc = "An aromatic addition to any drink. Made in New Trinidad, now and forever."
-	icon = 'icons/obj/drinks.dmi'
 	icon_state = "bitters_bottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/bitters = 30)
 
 /obj/item/reagent_containers/food/drinks/bottle/curacao
 	name = "Beekhof Blauw Curaçao"
 	desc = "Still produced on the island of Curaçao, after all these years."
-	icon = 'icons/obj/drinks.dmi'
 	icon_state = "curacao_bottle"
 	volume = 100
 	list_reagents = list(/datum/reagent/consumable/ethanol/curacao = 100)
@@ -17,7 +15,6 @@
 /obj/item/reagent_containers/food/drinks/bottle/navy_rum
 	name = "Pride of the Union Navy-Strength Rum"
 	desc = "Ironically named, given it's made in Bermuda."
-	icon = 'icons/obj/drinks.dmi'
 	icon_state = "navy_rum_bottle"
 	volume = 100
 	list_reagents = list(/datum/reagent/consumable/ethanol/navy_rum = 100)
diff --git a/modular_splurt/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/modular_splurt/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index 3636feb540..2268c26425 100644
--- a/modular_splurt/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/modular_splurt/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -194,7 +194,6 @@
 	color = "#1a5fa1"
 	quality = DRINK_NICE
 	taste_description = "blue orange"
-	glass_icon = 'icons/obj/drinks.dmi'
 	glass_icon_state = "curacao"
 	glass_name = "glass of curaçao"
 	glass_desc = "It's blue, da ba dee."
@@ -217,7 +216,6 @@
 	color = "#1c0000"
 	quality = DRINK_NICE
 	taste_description = "spiced alcohol"
-	glass_icon = 'icons/obj/drinks.dmi'
 	glass_icon_state = "bitters"
 	glass_name = "glass of bitters"
 	glass_desc = "Typically you'd want to mix this with something- but you do you."
@@ -229,7 +227,6 @@
 	color = "#1F0001"
 	quality = DRINK_VERYGOOD
 	taste_description = "haughty arrogance"
-	glass_icon = 'icons/obj/drinks.dmi'
 	glass_icon_state = "admiralty"
 	glass_name = "Admiralty"
 	glass_desc = "Hail to the Admiral, for he brings fair tidings, and rum too."
@@ -241,7 +238,6 @@
 	color = "#8c5046"
 	quality = DRINK_GOOD
 	taste_description = "ginger and rum"
-	glass_icon = 'icons/obj/drinks.dmi'
 	glass_icon_state = "dark_and_stormy"
 	glass_name = "Dark and Stormy"
 	glass_desc = "Thunder and lightning, very very frightening."
@@ -253,7 +249,6 @@
 	color = "#c4b35c"
 	quality = DRINK_VERYGOOD
 	taste_description = "rum and spices"
-	glass_icon = 'icons/obj/drinks.dmi'
 	glass_icon_state = "long_john_silver"
 	glass_name = "Long John Silver"
 	glass_desc = "Named for a famous pirate, who may or may not have been fictional. But hey, why let the truth get in the way of a good yarn?"
@@ -265,7 +260,6 @@
 	color = "#003153"
 	quality = DRINK_VERYGOOD
 	taste_description = "companionship"
-	glass_icon = 'icons/obj/drinks.dmi'
 	glass_icon_state = "long_haul"
 	glass_name = "Long Haul"
 	glass_desc = "A perfect companion for a lonely long haul flight."
@@ -277,7 +271,6 @@
 	color = "#b4abd0"
 	quality = DRINK_FANTASTIC
 	taste_description = "salt and spice"
-	glass_icon = 'icons/obj/drinks.dmi'
 	glass_icon_state = "salt_and_swell"
 	glass_name = "Salt and Swell"
 	glass_desc = "Ah, I do like to be beside the seaside."
@@ -289,7 +282,6 @@
 	color = "#b4abd0"
 	quality = DRINK_VERYGOOD
 	taste_description = "spicy sour cheesy yoghurt"
-	glass_icon = 'icons/obj/drinks.dmi'
 	glass_icon_state = "tich_toch"
 	glass_name = "Tich Toch"
 	glass_desc = "Oh god."
@@ -301,7 +293,6 @@
 	color = "#F4EFE2"
 	quality = DRINK_NICE
 	taste_description = "sour cheesy yoghurt"
-	glass_icon = 'icons/obj/drinks.dmi'
 	glass_icon_state = "tiltaellen"
 	glass_name = "glass of tiltällen"
 	glass_desc = "Eww... it's curdled."
@@ -313,7 +304,6 @@
 	color = "#00bfa3"
 	quality = DRINK_VERYGOOD
 	taste_description = "the tropics"
-	glass_icon = 'icons/obj/drinks.dmi'
 	glass_icon_state = "tropical_storm"
 	glass_name = "Tropical Storm"
 	glass_desc = "Less destructive than the real thing."