From 60c2228fd5c81647eb0ee249cea5468b2f225b18 Mon Sep 17 00:00:00 2001
From: Alphas00 <154434082+Alphas00@users.noreply.github.com>
Date: Mon, 18 Nov 2024 10:14:07 +0100
Subject: [PATCH 1/2] GS13 plants fix & ported GS13 drink icons

Ported and fixed the icons for blueberries and munchies weed.
All icons for GS13 plants "compressed" into 3 files (seeds, fruits, plants).
Ported sprites for dwarven and fatty drinks (not added in-game yet)

The drinks' sprites have not been added in because of the way drink sprites work. The glass changes its icon state among those in its original icon file. Adding the sprites to those files would cause upstream conflicts
---
 .../code/modules/hydroponics/grown/berries.dm  |   8 +++++++-
 .../code/modules/hydroponics/lipoplant.dm      |  10 +++++-----
 .../code/modules/hydroponics/munchies_weed.dm  |  10 +++++++---
 GainStation13/icons/obj/drinks.dmi             | Bin 891 -> 5070 bytes
 .../icons/obj/hydroponics/growing.dmi          | Bin 0 -> 2401 bytes
 .../icons/obj/hydroponics/harvest.dmi          | Bin 0 -> 1758 bytes
 .../icons/obj/hydroponics/lipo_growing.dmi     | Bin 981 -> 0 bytes
 .../icons/obj/hydroponics/lipo_harvest.dmi     | Bin 649 -> 0 bytes
 .../icons/obj/hydroponics/lipo_seeds.dmi       | Bin 357 -> 0 bytes
 GainStation13/icons/obj/hydroponics/seeds.dmi  | Bin 0 -> 565 bytes
 10 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 GainStation13/icons/obj/hydroponics/growing.dmi
 create mode 100644 GainStation13/icons/obj/hydroponics/harvest.dmi
 delete mode 100644 GainStation13/icons/obj/hydroponics/lipo_growing.dmi
 delete mode 100644 GainStation13/icons/obj/hydroponics/lipo_harvest.dmi
 delete mode 100644 GainStation13/icons/obj/hydroponics/lipo_seeds.dmi
 create mode 100644 GainStation13/icons/obj/hydroponics/seeds.dmi

diff --git a/GainStation13/code/modules/hydroponics/grown/berries.dm b/GainStation13/code/modules/hydroponics/grown/berries.dm
index 263262637b..32f3e7dbca 100644
--- a/GainStation13/code/modules/hydroponics/grown/berries.dm
+++ b/GainStation13/code/modules/hydroponics/grown/berries.dm
@@ -1,7 +1,6 @@
 /obj/item/seeds/berry/blueberry
 	name = "pack of blueberry seeds"
 	desc = "These seeds grow into blueberry bushes."
-	icon_state = "seed-blueberry"
 	species = "blueberry"
 	plantname = "Blueberry Bush"
 	product = /obj/item/reagent_containers/food/snacks/grown/berries/blueberry
@@ -11,11 +10,18 @@
 	yield = 1
 	production = 10
 	rarity = 30
+	icon = 'GainStation13/icons/obj/hydroponics/seeds.dmi'
+	icon_state = "seed-blueberry"
+	growing_icon = 'GainStation13/icons/obj/hydroponics/growing.dmi'
+	icon_grow = "berry-grow" // Uses one growth icons set for all the subtypes
+	icon_dead = "berry-dead" // Same for the dead icon
+	icon_harvest = "blueberry-harvest"
 
 /obj/item/reagent_containers/food/snacks/grown/berries/blueberry
 	seed = /obj/item/seeds/berry/blueberry
 	name = "bunch of blueberries"
 	desc = "Taste so good, you might turn blue!"
+	icon = 'GainStation13/icons/obj/hydroponics/harvest.dmi'
 	icon_state = "blueberrypile"
 	filling_color = "#5d00c7"
 	foodtype = FRUIT
diff --git a/GainStation13/code/modules/hydroponics/lipoplant.dm b/GainStation13/code/modules/hydroponics/lipoplant.dm
index 72c16ca898..4856ec4020 100644
--- a/GainStation13/code/modules/hydroponics/lipoplant.dm
+++ b/GainStation13/code/modules/hydroponics/lipoplant.dm
@@ -1,8 +1,6 @@
 /obj/item/seeds/lipoplant
 	name = "pack of adipolipus"
 	desc = "These seeds grow into a foreign plant."
-	icon = 'GainStation13/icons/obj/hydroponics/lipo_seeds.dmi'
-	icon_state = "lipo_seed"
 	species = "adipolipus"
 	plantname = "Adipolipus"
 	product = /obj/item/reagent_containers/food/snacks/grown/lipofruit
@@ -11,17 +9,19 @@
 	maturation = 8
 	production = 5
 	yield = 1
-	growing_icon = 'GainStation13/icons/obj/hydroponics/lipo_growing.dmi'
+	reagents_add = list(/datum/reagent/consumable/lipoifier = 0.05)
+	icon = 'GainStation13/icons/obj/hydroponics/seeds.dmi'
+	icon_state = "seed-lipo"
+	growing_icon = 'GainStation13/icons/obj/hydroponics/growing.dmi'
 	icon_grow = "lipo-grow" // Uses one growth icons set for all the subtypes
 	icon_dead = "lipo-dead" // Same for the dead icon
 	icon_harvest = "lipo-harvest"
-	reagents_add = list(/datum/reagent/consumable/lipoifier = 0.05)
 
 /obj/item/reagent_containers/food/snacks/grown/lipofruit
 	seed = /obj/item/seeds/lipoplant
 	name = "lipofruit"
 	desc = "A foreign fruit with an hard shell. Perhaps something sharp could open it?"
-	icon = 'GainStation13/icons/obj/hydroponics/lipo_harvest.dmi'
+	icon = 'GainStation13/icons/obj/hydroponics/harvest.dmi'
 	icon_state = "lipo_nut"
 	item_state = "lipo_nut"
 	possible_transfer_amounts = list(5, 10, 15, 20, 25, 30, 50)
diff --git a/GainStation13/code/modules/hydroponics/munchies_weed.dm b/GainStation13/code/modules/hydroponics/munchies_weed.dm
index e6ef646985..28043f6f3d 100644
--- a/GainStation13/code/modules/hydroponics/munchies_weed.dm
+++ b/GainStation13/code/modules/hydroponics/munchies_weed.dm
@@ -8,22 +8,26 @@
 /obj/item/seeds/cannabis/munchies
 	name = "pack of munchies weed seeds"
 	desc = "These seeds grow into munchies weed."
-	icon_state = "seed-munchies"
 	species = "munchycannabis"
 	plantname = "Munchies Weed"
-	icon_grow = "munchycannabis-grow" // Uses one growth icons set for all the subtypes
-	icon_dead = "munchycannabis-dead" // Same for the dead icon
 	product = /obj/item/reagent_containers/food/snacks/grown/cannabis/munchies
 	genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/glow/orange)
 	mutatelist = list()
 	reagents_add = list(/datum/reagent/drug/space_drugs = 0.05,
 						/datum/reagent/drug/munchies = 0.10)
 	rarity = 69
+	icon = 'GainStation13/icons/obj/hydroponics/seeds.dmi'
+	icon_state = "seed-munchies"
+	growing_icon = 'GainStation13/icons/obj/hydroponics/growing.dmi'
+	icon_grow = "munchycannabis-grow" // Uses one growth icons set for all the subtypes
+	icon_dead = "munchycannabis-dead" // Same for the dead icon
+	icon_harvest = "munchycannabis-harvest"
 
 /obj/item/reagent_containers/food/snacks/grown/cannabis/munchies
 	seed = /obj/item/seeds/cannabis/munchies
 	name = "munchies cannabis leaf"
 	desc = "You feel hungry just looking at it."
+	icon = 'GainStation13/icons/obj/hydroponics/harvest.dmi'
 	icon_state = "munchycannabis"
 	wine_power = 90
 
diff --git a/GainStation13/icons/obj/drinks.dmi b/GainStation13/icons/obj/drinks.dmi
index d24ee43bc26c0749e19da8779a9273ccac6d0356..cd1bae219a87350119c76d61e7bc3be5ca33fb1a 100644
GIT binary patch
literal 5070
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
MKGRgJkhci_4{s2^4gdfE

literal 891
zcmV->1BCpEP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(0001fdQ@0+L}hbh
za%pgMX>V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex7wuvIWN;^NFm
z%}mcIfpCgT5=&AQY!#H!GOMb}Gpm%iI8!o<iWO`X47oVdiV|~EA#Aw1;{5!QjN;Us
z5}Znv6<qyX6kL2gxd3n6C?yfCM(_Xt0=P*;K~!jg?U+GGQ*j)}KMR?jG$A51Ryf?i
z(S!tzBAAEKEa)VT0zG&zBCtzG(+Lulrv*a2gSP_3Q&31d^k4+@60{ihw1YE^j4&n=
zIaaU3dz;NX`2UaX54kTq_TF#2-}n3bzTf-5-+K;S*E!5MqFR7zR1HuqKsBlcs1~3a
zRRdHDP>mXyleC$Hxi>ZxKIbT1&H?%LefR@%{K5ukGYPZ5ubXzCw<sRy?lrZkk+Peh
z=?Swx)J?m05C4^3Q@bb5FJyo=lQ26w+yLAedkjElha0ckh5mZ3>?UY>!t89b`J*;}
zn;Wmoh5lkr$^_vxpzmtXBDRglWA=GWG?f(kf;NBK9{!jdzeD6*AP{|M0(^e*tSJ62
zWzh3z95P$zqZ4K8fIxK6;-7w7%x@U<Jh%p#9rV$sLj1yOfN%IFO*gLp`-i_B;&IV*
z!tf1WqG|B#KKv&jo)*q0Y(S{ROD-HPiW&8@KoZJdKcSZM<ibCT`4<i8d{T2jjq4a|
zJyAYgyl({-{L%vC_-m<g)fSFlu6&ixC3|9Hx|LsFe(VMo{8Xd`Y{ZgTc8oUwES8W*
z+JJ`b0dkw)tb^wFaMG+;{jp>gfKb;3ptM^+%77K$T>$F0o2lRIwSsFE8w3gZoy3w^
z<`?V^*!<1q)5oQ9mGmx<@qM&**3Vd5g%C?-3HqId4k!gu9nhF=<@>4S-9T5;`mN9{
zkne!}8X$Z1LBfFf^<^3updkghReKF6JO#?{!2G&ZbkOf4chv5HN<9WWOW8<ja%#75
zz*ziX?Zo4FHtHhMN)7=1_Ov54`HI}?&R_g?@$t0q6bOQ&Fu>5QiLoV*Gg1g-wgB*K
z)J3$Zk#SK0GRTj_7QbbNOz|LL!2gCr|3#>3fNBA%Q8hrd0M)1(pjv=x`~fDr;I3J)
R*F69L002ovPDHLkV1n^dsrvu`

diff --git a/GainStation13/icons/obj/hydroponics/growing.dmi b/GainStation13/icons/obj/hydroponics/growing.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..6636c5175ab3032a075691ab92d4f3e6adacd0d0
GIT binary patch
literal 2401
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
TGLiy-00000NkvXXu0mjft{Pwh

literal 0
HcmV?d00001

diff --git a/GainStation13/icons/obj/hydroponics/harvest.dmi b/GainStation13/icons/obj/hydroponics/harvest.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..c8e3d4d0422b58a829eb63d99130e216f5d14e06
GIT binary patch
literal 1758
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
AJpcdz

literal 0
HcmV?d00001

diff --git a/GainStation13/icons/obj/hydroponics/lipo_growing.dmi b/GainStation13/icons/obj/hydroponics/lipo_growing.dmi
deleted file mode 100644
index 53786034473339c88fb2f4aec9f88891200d0129..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 981
zcmV;`11kK9P)<h;3K|Lk000e1NJLTq003YB003YJ0{{R3)kcR30000{P)t-sz`($%
zFblsn4CPE5|5qX=X+1TQRz0a=9#SwOUpFv@PQbvxSw%l?TU5PtUi48O@RWGtjB(F^
zXJb-Kre;$$UO`rmYDIHYWvF{geO)?fNQ6in^Z)<=0d!JMQvg8b*k%9#0FioBSad{X
zb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1<SI)oD$dN$Q?OMq(KF!UEYD0S$pCVUjkq{7
zQZv&tN+6u#lEji!AX6zPvmjqLy(qujP>G8(C9|j)C}_yVnO2mTn+joLDm5ZrsWI_N
zO^8=&O1x4t;*@427L}zImk_5oB{eYxmr7*?S3ehUOaK5E(Q}{K=sWNL00NasL_t(&
zf$f=#ZtEZrL}L>$R4#TB+j;!|hu&Sl@dJ`Iby0g&MwJp})^qTq%FrGTSy_KhMVUCC
z9n%t00}95DI|=Wv@qWPjO91%**h3&zxCOB55^MnMy96{~=L$&xF~CQk2VFk-JUBrC
zxEOsAIG$J4<X2UgAnhfR;rvP{>nq_O5BZfCj|V`Iz+s{&!4H}cpcMK_`76YH@a^&F
zhX^pFB<E5E@#u;VBjHaN0Ql+ye$WpBxJ?i$bdNaNPRhHBoUi@heRdNnV10`Z6Gnvn
zdVun?va+^`YHoX*9aXI8;<c~$(7lLQ!EQk6Fa4ix6=<XXYJl?71Bd}*8$Uci`RM_~
zfVHh38le0i2e{*1fImU`e*m!m9&kB5rqb(uO3L{Hq*QUfY3FkMO_p9iSCtU+1qe~8
z7@z9*#+@%<H9`4QzqhWj!N-B+1mz#5e*f(MJ^=Vw|8WCgSFi%S@efqL=hmKlJHWU4
z)2&LqKOp-(RsZw$AS)~DKT%yL&j0*ON`U;dgj4|dqAs8Ljxc`qJpk9mW`OcVJ^MP~
z2$f?5z}rCo)1dilETCa*1TfZk0Il28=>*9dUfM{+27qo`0G!WSpU(hj+bDtsG_1a0
z{-tKk8i4r*fHHu1LV>4n0pST0ettI+Fu#i?lqCXK4PppbJfxVfJ97>wr0G}!6xXI{
z>>dK%6pMZjX}a%PN5I#v*Kq)a-Mx9Lkc)ng59VMAR$V{DJ*?c;`&s_-FZkEnZI}@t
zf4JSQQTdkOBv<_&@&Nz@C&&jt1mU@Xu=@jV12F>bPVoR+?`QpfxkI>u9*@4i4@URC
ze?0KB&45wT=7;}>1L`fHj}D#)MlbE&>Fa>3tY4{rl7%$6pu<ih00000NkvXXu0mjf
D@%O!J

diff --git a/GainStation13/icons/obj/hydroponics/lipo_harvest.dmi b/GainStation13/icons/obj/hydroponics/lipo_harvest.dmi
deleted file mode 100644
index ab2326e413665c132bfe73600428b5dd6161ac2f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 649
zcmV;40(Sk0P)<h;3K|Lk000e1NJLTq002M$002M;0{{R3owtGP0001QP)t-s00017
zN=0s4RBc*QX;)BcSW#wFPHR|EYgtnNjVWkWP;6OJ|8D?UML%OwOl4C|XH`#WR#0nL
zQvcw@WmHaRR!?eIQEXXL|K!YNR847CPygxFW>rpPQ%!1DP-Id}XI4*aT2uOI0QF-4
z@Ld2H0sZ0t0004WQchC<K<3zH0001hdQ@0+L}hbha%pgMX>V=-0C=2JR&a84_w-Y6
z@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5DJQcaKR&Ot
zM2U+tC9|j)C}haRnO2mTn+joLC`>LbiBBud$stKYYHmSEB`zJx3a)-GV8;Uh1Km2k
zNb?uq0003zNkl<ZScUDC*;0fs5Jd@Dm=IY;ag>OR%l!X0+6kIMvkttdmGesOsfKiM
ziz4$+LBOtfS(e)cI=)@-8Q&^E2;)5hL}*kH`o4&f>VQLe2y?*WK#bLt3co<7ZvgGE
z9ye{*_eXMzeFBKz89-qR+JW7l=mT~OApf|+GC;oV#-5z?2(AGn=T8RCr9;rN2}Tgu
zBao6Cr2KhC3!bN*kb_S!&(dH|sRd`oUTP{{op%6&xvDB51jeq{Tt?{BMK}coG6HRI
z-2yNS@Etu{G=CexwFqhiHr2$lt7t87ooSR}90R+Kz68EAjlvgS6bqp<nM@}0YuNY0
z3ip3PJlOy7Jm+r)NB<|}-&b63Q2l=~*!`a%2={-2Al&~+f?)s04Uzs&5(NAIiV-~h
jA2&q%KS7cE|8MdEaOfM`;Gy9$00000NkvXXu0mjf8k7=}

diff --git a/GainStation13/icons/obj/hydroponics/lipo_seeds.dmi b/GainStation13/icons/obj/hydroponics/lipo_seeds.dmi
deleted file mode 100644
index 8c24ca7a956c7f2ea04fc3584be41fbecf393861..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 357
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyHUT~%t_KbrSZToBrp9^5QR0f5
z)c<g${boEdUapa@_Ic4E8DRlg5rN4;KB*zTnc)H15kV<IK4~F-sUd#pq5g__A3+u{
zmIV0)GdMiEkp|@CR)s{AxTF>*7iAWdWaj5FFjUM54l5`s{r)Am;N#aPTHd-^=gyoD
z-VkbV(fGk5o%24LCmD)*dUseD2N_>B_EMPhXws2MAqv5o>YEkp_gR>lx^{LOt8QK)
zp^<jt=*+MwGiGxoYHRQKwX>m@jbZn9>HP^kO8h{J<2+p)Lo9mVUa%BuP!MnloU+zY
zWcu&>p-cz0vfs2!v46NH!C~da<(YZP@3(F|pAooY+xBCB8=~YtFfcoC@ch^j(6A+M
zX7k?;1$U*TpOY5ciMV&+BY&ubq{er(ckWxHkA$;$Y3xaT4z!8E)78&qol`;+0Bw_s
A;Q#;t

diff --git a/GainStation13/icons/obj/hydroponics/seeds.dmi b/GainStation13/icons/obj/hydroponics/seeds.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..be7d4c707c096e74f60213639742436018db62be
GIT binary patch
literal 565
zcmV-50?Pe~P)<h;3K|Lk000e1NJLTq002M$002M;0{{R3owtGP0001NP)t-sz`(#M
zFNF#XU;wHB0E_@VN1shtvR!J$0KWhL%m4sb+W-Xr&7@9>YA39OFkJx0z`($%Fbjqz
z3Bo}b)J7WrS0cYQ3|vY@Sw%l?TU2OPP-<9FV^U0IR847DP-|FHWKv9KR8D17PG?n5
zA-9$i00001bW%=J06^y0W&i*Hg?dz2bVOxyV{&P5bZKvH004NLQ&w<tb@%jBaPjrz
zDoZUY&dkqKuvIY8GvMMZ&rB)F0CJ3txHvOXGt)ClAe`co#FA7XQ>i#LHAOcmr!+Mw
zwWz34iHkEOv#1y-VaUaqR+N~V3Spxv&n?YM&d5wHCQfxuW<fqKmC6dPelB2l0|1y?
zH;v?GQ566H0Om<VK~z|U?ULCJgCGz^X|2`@Xj(V4cK`o>?3jqO35*TX#23zeB=-bn
zU@Q>$VzZrNJ&$&C?EN^|Pl;`YDE){{VESON3J%c}r$FNpXq<v9gEr@wKwyFlfIjC=
zfq+PYKmbxo!V`qZC31tsAwoY#ZvYepx&;tmTNwMJ0og*1uJH!}{tuR)fD7~#6Nf+>
zQoDe~2J3lbu$~73fx!Pbp62-V%c`DIdKsFzUssK%K(nr(Rf-}|s_Q6%wm*{uYPei)
zG{ODRE5Z=fFg#xr0n89~u;M?^hRRRC8iQ9q5Fqddo)Q}#L+26300000NkvXXu0mjf
D&EMhn

literal 0
HcmV?d00001


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 2/2] 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"