From cce387ea41b12abfe76561126e2bc66a3324ab69 Mon Sep 17 00:00:00 2001
From: Alphas00 <154434082+Alphas00@users.noreply.github.com>
Date: Mon, 18 Nov 2024 12:37:56 +0100
Subject: [PATCH] GS13 drink icons fix

Added a var to consumable reagents that allows drinking glasses to locate icons in the GS13 drinks.dmi file
Fixed icons for oily oafs, glyphid slammer, belly bloats, blobby mary, beltbuster mead, heavy cafe, fruits tea and snakebite
---
 .../food_and_drinks/drinks/drinks/drinkingglass.dm  | 13 +++++++++++++
 .../reagents/chemistry/reagents/dwarverndrinks.dm   |  2 ++
 .../reagents/chemistry/reagents/fatty_drinks.dm     |  6 ++++++
 tgstation.dme                                       |  1 +
 4 files changed, 22 insertions(+)
 create mode 100644 GainStation13/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm

diff --git a/GainStation13/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/GainStation13/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
new file mode 100644
index 0000000000..7007384992
--- /dev/null
+++ b/GainStation13/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
@@ -0,0 +1,13 @@
+/datum/reagent/consumable
+	var/use_gs_icon = FALSE
+
+/obj/item/reagent_containers/food/drinks/drinkingglass/on_reagent_change(changetype)
+	icon = 'icons/obj/drinks.dmi'
+	if(reagents.reagent_list.len)
+		var/datum/reagent/R = reagents.get_master_reagent()
+		if(istype(R, /datum/reagent/consumable))
+			var/datum/reagent/consumable/C = R
+			if(C.use_gs_icon == TRUE)
+				icon = 'GainStation13/icons/obj/drinks.dmi'
+
+	..()
diff --git a/GainStation13/code/modules/reagents/chemistry/reagents/dwarverndrinks.dm b/GainStation13/code/modules/reagents/chemistry/reagents/dwarverndrinks.dm
index 2197581ff8..d99fb8f3bb 100644
--- a/GainStation13/code/modules/reagents/chemistry/reagents/dwarverndrinks.dm
+++ b/GainStation13/code/modules/reagents/chemistry/reagents/dwarverndrinks.dm
@@ -13,6 +13,7 @@
 	shot_glass_icon_state = "shotglassbrown"
 	pH = 4.5
 	value = 0.1
+	use_gs_icon = TRUE
 
 /datum/reagent/consumable/ethanol/glyphid_slammer
 	name = "Glyphid slammer"
@@ -26,3 +27,4 @@
 	shot_glass_icon_state = "shotglassbrown"
 	pH = 4.5
 	value = 0.1
+	use_gs_icon = TRUE
diff --git a/GainStation13/code/modules/reagents/chemistry/reagents/fatty_drinks.dm b/GainStation13/code/modules/reagents/chemistry/reagents/fatty_drinks.dm
index 352e9497b0..bfb459e669 100644
--- a/GainStation13/code/modules/reagents/chemistry/reagents/fatty_drinks.dm
+++ b/GainStation13/code/modules/reagents/chemistry/reagents/fatty_drinks.dm
@@ -11,6 +11,7 @@
 	glass_name = "belly bloats"
 	glass_desc = "The perfect mix to be big and merry with."
 	shot_glass_icon_state = "shotglassbrown"
+	use_gs_icon = TRUE
 
 /datum/reagent/consumable/ethanol/belly_bloats/on_mob_life(mob/living/carbon/M)
 	if(M && M?.client?.prefs.weight_gain_food) // GS13
@@ -30,6 +31,7 @@
 	glass_name = "blobby mary"
 	glass_desc = "For the morbidly obese ladies and gentlemen."
 	shot_glass_icon_state = "shotglassred"
+	use_gs_icon = TRUE
 
 /datum/reagent/consumable/ethanol/blobby_mary/on_mob_life(mob/living/carbon/M)
 	if(M && M?.client?.prefs.weight_gain_food) // GS13
@@ -49,6 +51,7 @@
 	glass_name = "beltbuster mead"
 	glass_desc = "The ambrosia of the blubbery gods."
 	shot_glass_icon_state = "shotglassgold"
+	use_gs_icon = TRUE
 
 /datum/reagent/consumable/ethanol/beltbuster_mead/on_mob_life(mob/living/carbon/M)
 	if(M && M?.client?.prefs.weight_gain_food) // GS13
@@ -67,6 +70,7 @@
 	glass_name = "heavy cafe"
 	glass_desc = "To enjoy slow mornings with."
 	shot_glass_icon_state = "shotglassbrown"
+	use_gs_icon = TRUE
 
 /datum/reagent/consumable/heavy_cafe/on_mob_life(mob/living/carbon/M)
 	M.dizziness = max(0,M.dizziness-5)
@@ -92,6 +96,7 @@
 	glass_name = "fruits tea"
 	glass_desc = "Goes down really easy and stays there for a long time."
 	shot_glass_icon_state = "shotglassgold"
+	use_gs_icon = TRUE
 
 /datum/reagent/consumable/fruits_tea/on_mob_life(mob/living/carbon/M)
 	M.dizziness = max(0,M.dizziness-2)
@@ -118,6 +123,7 @@
 	glass_name = "snakebite"
 	glass_desc = "Won't hurt like a real bite, but you'll still regert drinking this."
 	shot_glass_icon_state = "shotglassgreen"
+	use_gs_icon = TRUE
 
 /datum/reagent/consumable/snakebite/on_mob_life(mob/living/carbon/M)
 	if(M && M?.client?.prefs.weight_gain_food) // GS13
diff --git a/tgstation.dme b/tgstation.dme
index 2a65e728f2..7d93313131 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -3996,6 +3996,7 @@
 #include "GainStation13\code\modules\food_and_drinks\drinks.dm"
 #include "GainStation13\code\modules\food_and_drinks\food.dm"
 #include "GainStation13\code\modules\food_and_drinks\recipes_bigpizza.dm"
+#include "GainStation13\code\modules\food_and_drinks\drinks\drinks\drinkingglass.dm"
 #include "GainStation13\code\modules\food_and_drinks\objects\boxes.dm"
 #include "GainStation13\code\modules\food_and_drinks\objects\candy_flora.dm"
 #include "GainStation13\code\modules\food_and_drinks\recipes\recipes_ported.dm"