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

Commit c733ad9

Browse files
StorageStats type now gets storage data
1 parent 190dc06 commit c733ad9

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

code/modules/food_and_drinks/kitchen_machinery/food_cart_TGUI.dm

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
/obj/machinery/food_cart_TGUI/ui_data(mob/user)
3535
//Define variables from UI
3636
var/list/data = list()
37-
data["food"] = list()
38-
data["storage"] = list()
37+
//data["food"] = list()
38+
//data["storage"] = list()
3939

4040
//Loop through food list for data to send to food tab
4141
for(var/item_detail in food_ui_list)
@@ -91,17 +91,19 @@
9191
data["mixerDrinks"] = list()
9292

9393
//Get content and capacity data
94+
var/list/storageDetails = list()
9495
//Have to subtract contents.len by 1 due to reagents container being in contents
95-
data["contents_length"] = contents.len - 1
96-
data["storage_capacity"] = contents_capacity
97-
data["glass_quantity"] = glass_quantity
98-
data["glass_capacity"] = glass_capacity
99-
data["dispence_options"] = transfer_list
100-
data["dispence_selected"] = selected_transfer
96+
storageDetails["contents_length"] = contents.len - 1
97+
storageDetails["storage_capacity"] = contents_capacity
98+
storageDetails["glass_quantity"] = glass_quantity
99+
storageDetails["glass_capacity"] = glass_capacity
100+
storageDetails["dispence_options"] = transfer_list
101+
storageDetails["dispence_selected"] = selected_transfer
101102
//Add the total_volumne of both cart and mixer storage for quantity
102-
data["drink_quantity"] = mixer.reagents.total_volume + reagents.total_volume
103-
data["drink_capacity"] = reagent_capacity
103+
storageDetails["drink_quantity"] = mixer.reagents.total_volume + reagents.total_volume
104+
storageDetails["drink_capacity"] = reagent_capacity
104105

106+
data["storage"] += list(storageDetails)
105107
//Send stored information to UI
106108
return data
107109

tgui/packages/tgui/interfaces/FoodCart.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,6 @@ const MainDrinkRow = (props, context) => {
349349
const { act, data } = useBackend<Data>(context);
350350
// Get drink information for cart's container from data
351351
const { mainDrinks = [] } = data;
352-
const { storage } = data;
353352

354353
if(mainDrinks.length > 0) {
355354
return (
@@ -370,7 +369,7 @@ const MainDrinkRow = (props, context) => {
370369
</Table.Cell>
371370
<Table.Cell>
372371
<ProgressBar
373-
value={reagent.drink_quantity/storage.drink_capacity}>
372+
value={reagent.drink_quantity/200}>
374373
{reagent.drink_quantity}u
375374
</ProgressBar>
376375
</Table.Cell>

0 commit comments

Comments
 (0)