|
25 | 25 | //Mixer for dispencing drinks |
26 | 26 | var/obj/item/reagent_containers/mixer |
27 | 27 |
|
28 | | - var/list/drink_list |
29 | | - var/list/mixer_list |
30 | | - |
31 | 28 | /obj/machinery/food_cart_TGUI/ui_interact(mob/user, datum/tgui/ui) |
32 | 29 | ui = SStgui.try_update_ui(user, src, ui) |
33 | 30 | if(!ui) |
|
39 | 36 | var/list/data = list() |
40 | 37 | data["food"] = list() |
41 | 38 | data["storage"] = list() |
42 | | - |
43 | | - drink_list = reagents.reagent_list |
44 | | - mixer_list = mixer.reagents.reagent_list |
45 | | - |
| 39 | + |
46 | 40 | //Loop through food list for data to send to food tab |
47 | 41 | for(var/item_detail in food_ui_list) |
48 | 42 | //Create needed list and variable for geting data for UI |
|
66 | 60 | data["food"] += list(details) |
67 | 61 |
|
68 | 62 | //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) |
70 | 64 | var/list/details = list() |
71 | 65 |
|
72 | 66 | //Get information for UI |
|
78 | 72 | data["mainDrinks"] += list(details) |
79 | 73 |
|
80 | 74 | //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) |
82 | 76 | var/list/details = list() |
83 | 77 |
|
84 | 78 | //Get information for UI |
|
89 | 83 | //Add to drink list |
90 | 84 | data["mixerDrinks"] += list(details) |
91 | 85 |
|
| 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 | + |
92 | 93 | //Get content and capacity data |
93 | 94 | //Have to subtract contents.len by 1 due to reagents container being in contents |
94 | 95 | data["contents_length"] = contents.len - 1 |
|
0 commit comments