From 9fcaa61457f4b2a7e4dfd179248c84101bdb5071 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon, 22 Nov 2021 22:05:13 +0000
Subject: [PATCH] [MIRROR] Fixes a mistake that made space bartenders sad. [MDB
 IGNORE] (#9623)

* Fixes a mistake that made space bartenders sad. (#62978)

* Fixes a mistake that made space bartenders sad.

* Update drinkingglass.dm

* Fixes a mistake that made space bartenders sad.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
---
 .../drinks/drinks/drinkingglass.dm            |   8 ++++----
 icons/obj/reagentfillings.dmi                 | Bin 6470 -> 6470 bytes
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
index 4fe46d79d64..8f74578a618 100644
--- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
@@ -4,7 +4,7 @@
 	icon_state = "glass_empty"
 	base_icon_state = "glass_empty"
 	amount_per_transfer_from_this = 10
-	fill_icon_thresholds = list(1)
+	fill_icon_thresholds = list(0)
 	fill_icon_state = "drinking_glass"
 	volume = 50
 	custom_materials = list(/datum/material/glass=500)
@@ -36,7 +36,7 @@
 	desc = largest_reagent?.glass_desc || initial(desc)
 
 /obj/item/reagent_containers/food/drinks/drinkingglass/update_icon_state()
-	if(!length(reagents.reagent_list))
+	if(!reagents.total_volume)
 		icon_state = base_icon_state
 		return ..()
 
@@ -51,7 +51,7 @@
 		icon_state = base_icon_state
 	return ..()
 
-/obj/item/reagent_containers/food/drinks/proc/get_glass_icon(datum/reagent/largest_reagent)
+/obj/item/reagent_containers/food/drinks/drinkingglass/proc/get_glass_icon(datum/reagent/largest_reagent)
 	return largest_reagent?.glass_icon_state
 
 //Shot glasses!//
@@ -89,7 +89,7 @@
 	else
 		desc = "The challenge is not taking as many as you can, but guessing what it is before you pass out."
 
-/obj/item/reagent_containers/food/drinks/get_glass_icon(datum/reagent/largest_reagent)
+/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/get_glass_icon(datum/reagent/largest_reagent)
 	return largest_reagent?.shot_glass_icon_state
 
 /obj/item/reagent_containers/food/drinks/drinkingglass/filled/soda
diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi
index cf50e9714b9d9de3c21ac228bba7da2600ac2f83..49b5cd81d6724076b7c6287817cb7f27bf36e7de 100644
GIT binary patch
delta 531
zcmV+u0_^?9GR88HIRVy@Ixc^*?m48XNA>gd*ZEzY-p<`$4$=Bi9o7EZx?9awr(PY^
zZriPTwx&<ZmzXHAI;w{cpOWzAp<8JiqB^QgxB3j^c=`OF+pa;lN8xuAzMyck1|-wK
z0hpR;;DAicG;lzsW*RskQ!@=5kg1nh;HiazK?=WNcz&T^pz3cLPC|bu7-$g`L&BNN
zy-jc?3vRkKoZ#HsgeN%nHsJ}*y-j$6*C|nMyl6B)<3+>y883Q!Xu!J`d}w(LIBDZW
z!$B`;)OGv{c0_jW71m?Ocf^0Yeor0zG;yfUPM2Y#%i#RSQ~3b<DnB&oyJRaIXzVJ1
zATk9O4ZA6QUHqu6<1rGodZ51h3xM5pe*v&b?k{+5{gZeBEPubZP%ymcCJaPUXdse8
z1CbOOh@{YMkpO@GMcl|yA>QkWE(3CIW{bRaWV>sy$oomQ$N`%za=vE!++bVs1$r*J
zsN+k|4(u&cptekb)-nZ3%M|D=Q=qa;fyOcg3d<De>sCSC8lf2B9bahRkqZrEQD`9K
zLIdp;8dw&E25Z(^p@D^5XkdpFx(P=|B5i#}M<Q*dMn@uT%|=HeZS_V+B5fT<M<Q)S
zM@J%UZAV8UZIwqyB5l1#M<Vqr9Q_&T(~8*9051_b*m1C<`E7(^1P<@sr;2@4ukR;y
VdOLUj0H>3_lR1$eFtd&VxEA98`gH&R

delta 531
zcmV+u0_^?9GR88HIRV#^Ixc@d_Z-raAJxy-U*~sqdOLT2IYjG6byWLr>uxn$oqBat
zyKT4X*_u8rUt*%f>Zl$*d`iNbhi;{9i0Y^|-Rd)t<K^>zZo3BI9);gg_=3XC8jwr_
z2ViQZfdeu%)4&0lnrYyGOwBZKK&D=1fu|M<1}Xf8;rWGvfvUf0I0=8DV4y`%3<+m4
z_cp<qEV${^aDsDh6Q1DQ+k_`L_cq}PUZ+I4@uJZHjTa5)XT0d`p#kq&@S){4;G~Tg
z4F|oXQP=S+*b&*eS6GiBpAo-y{hT`ZY2r|yoi4*fm%;gur}75&ReosFcga>b(AZT1
zL1YRn8g^6qy7*CB$72#|^+0|12LQY2{s3T;+#m4VdXsnoEPp?@P%ymcCJaPUXdse8
z1CbOOh@{YMkpMsbMcl}vLcG@#T?XX2nJx0xk?pR*BJU^JA`jSXk>_i+&keREU!dor
zi#opa?7-eK1!~I_Xf0Eqv`m4{G6gEj6lg3{ps-AVzHSxNtr3b5-tmP7Zn@Av7KH{v
zE;P_yp@C&lXlr1-6&hH`g$8y=p__1YB+}MrbR^PNYIG#h)@*bn(pGPDB+}M#bR^PN
zbaW)r)^>Cx(pGtNB+}M<bR<$g!qK0RKCOry4e%17gB=Gun%_n!M&K`2?^DG-s@M0E
VI=!8{f2ak%l@c1;oU@JsxE6R^1kV5f