Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 5c366f9

Browse files
Fixed drink list update bug
1 parent 240ef00 commit 5c366f9

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

code/modules/food_and_drinks/kitchen_machinery/food_cart_TGUI.dm

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
//Mixer for dispencing drinks
2626
var/obj/item/reagent_containers/mixer
2727

28-
var/list/drink_list
29-
var/list/mixer_list
30-
3128
/obj/machinery/food_cart_TGUI/ui_interact(mob/user, datum/tgui/ui)
3229
ui = SStgui.try_update_ui(user, src, ui)
3330
if(!ui)
@@ -39,10 +36,7 @@
3936
var/list/data = list()
4037
data["food"] = list()
4138
data["storage"] = list()
42-
43-
drink_list = reagents.reagent_list
44-
mixer_list = mixer.reagents.reagent_list
45-
39+
4640
//Loop through food list for data to send to food tab
4741
for(var/item_detail in food_ui_list)
4842
//Create needed list and variable for geting data for UI
@@ -66,7 +60,7 @@
6660
data["food"] += list(details)
6761

6862
//Loop through drink list for data to send to cart's reagent storage tab
69-
for(var/datum/reagent/drink in drink_list)
63+
for(var/datum/reagent/drink in reagents.reagent_list)
7064
var/list/details = list()
7165

7266
//Get information for UI
@@ -78,7 +72,7 @@
7872
data["mainDrinks"] += list(details)
7973

8074
//Loop through drink list for data to send to cart's reagent mixer tab
81-
for(var/datum/reagent/drink in mixer_list)
75+
for(var/datum/reagent/drink in mixer.reagents.reagent_list)
8276
var/list/details = list()
8377

8478
//Get information for UI
@@ -89,6 +83,13 @@
8983
//Add to drink list
9084
data["mixerDrinks"] += list(details)
9185

86+
//Force respective data lists to be empty if condition met to fix updating bug
87+
//Thanks bug eating lizard and offbeatwitch for helping solve this
88+
if(reagents.reagent_list.len == 0)
89+
data["mainDrinks"] = list()
90+
if(mixer.reagents.reagent_list.len == 0)
91+
data["mixerDrinks"] = list()
92+
9293
//Get content and capacity data
9394
//Have to subtract contents.len by 1 due to reagents container being in contents
9495
data["contents_length"] = contents.len - 1

0 commit comments

Comments
 (0)