Finished purge and transfer functions

Author: Scrambledeggs00

code/modules/food_and_drinks/kitchen_machinery/food_cart_TGUI.dm

@@ -21,7 +21,7 @@
 	//List of transfer amounts for reagents
 	var/list/transfer_list = list(5, 10, 15, 20, 30, 50)
 	//What transfer amount is currently selected
-	var/selected_transfer = null
+	var/selected_transfer = 0
 	//Mixer for dispencing drinks
 	var/obj/item/reagent_containers/mixer
 
@@ -105,15 +105,25 @@
 		return
 
 	switch(action)
+		//Dispense food item
 		if("dispense")
 			var/itemPath = text2path(params["itemPath"])
 			dispense_item(itemPath)
-		if("amount")
+		//Change selected_transfer
+		if("transferNum")
 			selected_transfer = params["dispenceAmount"]
+		//Remove reagent from cart
 		if("purge")
-			return
+			reagents.remove_reagent(text2path(params["itemPath"]), selected_transfer)
+		//Add reagent to mixer
 		if("addMixer")
-			src.reagents.trans_id_to(mixer, text2path(params["itemPath"]),selected_transfer)
+			src.reagents.trans_id_to(mixer, text2path(params["itemPath"]), selected_transfer)
+		//Return reagent to storage
+		if("transferBack")
+			mixer.reagents.trans_id_to(src, text2path(params["itemPath"]), selected_transfer)
+		//Pour glass
+		if("pour")
+			pour_glass()
 
 
 /obj/machinery/food_cart_TGUI/Initialize(mapload)
@@ -178,7 +188,20 @@
 	else
 		//Warn about full capacity
 		user.balloon_alert(user, "No space!")
-		
+
+/obj/machinery/food_cart_TGUI/proc/pour_glass(mob/user = usr)
+	//Check if there are any glasses in storage
+	if(glass_quantity > 0)
+		glass_quantity -= 0
+		//Create new glass
+		var/obj/item/reagent_containers/food/drinks/drinkingglass/drink = new(loc)
+		//Move all reagents in mixer to glass
+		mixer.reagents.trans_to(drink, mixer.reagents.total_volume)
+		//Attempt to put glass into user's hand
+		user.put_in_hands(drink)
+	else
+		user.balloon_alert(user, "No Drinking Glasses!")
+
 /obj/machinery/food_cart_TGUI/proc/find_amount(obj/item/counting_item, target_name = null, list/target_list = null)
 	var/amount = 0
 

tgui/packages/tgui/interfaces/FoodCart.tsx

@@ -1,11 +1,12 @@
 import { storage } from 'common/storage';
 import { capitalize } from 'common/string';
+import { Fragment } from 'inferno';
 import { useBackend, useLocalState } from '../backend';
 import { Button, Section, Table, Tabs, Box, TextArea, Stack, Tooltip, Flex } from '../components';
 import { Window } from '../layouts';
 import { resolveAsset } from './../assets';
 
-// Store data for cones and scoops within Data
+// Store data for UI elements within Data
 type Data = {
   tabs: Tab[];
 }
@@ -39,6 +40,7 @@ type MixerDrinkStats = {
   drink_type_path: string;
 }
 
+// Stats for all storage information
 type StorageStats = {
   contents_length: number;
   storage_capacity: number;
@@ -328,7 +330,7 @@ const DrinkTransferRow = (props, context) => {
             content={amount}
             textAlign="center"
             selected={amount === dispence_selected}
-            onClick={() => act("amount", {
+            onClick={() => act("transferNum", {
               dispenceAmount: amount,
             })}/>
         </Flex.Item>
@@ -375,7 +377,7 @@ const MainDrinkRow = (props, context) => {
                 content="Purge"
                 textAlign="center"
                 fontSize="16px"
-                // Dissable if there is none of the reagent in storage
+                // Disable if there is none of the reagent in storage
                 disabled={(
                   reagent.drink_quantity === 0
                 )}
@@ -430,56 +432,54 @@ const MixerDrinkRow = (props, context) => {
   if(mixerDrinks.length > 0) {
     return (
       // Create Table for horizontal format
-      <Table>
+      <Table
+      direction="column">
         {/* Use map to create dynamic rows based on the contents of drinks, with drink being the individual item and its stats */}
         {mixerDrinks.map(reagent => (
           // Start row for holding ui elements and given data
           <Table.Row
+          direction="row"
           key={reagent.drink_name}
           fontSize="14px">
-              <Table.Cell
-                bold>
-                {/* Get name */}
-                {capitalize(reagent.drink_name)}
-              </Table.Cell>
-              <Table.Cell
-                textAlign="right">
-                {/* Get amount of reagent in storage */}
-                {reagent.drink_quantity}u
-              </Table.Cell>
-              <Table.Cell>
-                {/* Make dispense button */}
-                <Button
-                fluid
-                content="Transfer Back"
-                textAlign="center"
-                fontSize="16px"
-                // Dissable if there is none of the reagent in storage
-                disabled={(
-                  reagent.drink_quantity === 0
-                )}
-                onClick={() => act("transferBack", {
-                  itemPath: reagent.drink_type_path,
-                })}
-                />
-              </Table.Cell>
-              <Table.Cell>
-                <Button
-                fluid
-                content="Pour in glass"
-                textAlign="center"
-                fontSize="16px"
-                // Dissable if there is none of the reagent in storage
-                disabled={(
-                  reagent.drink_quantity === 0
-                )}
-                onClick={() => act("pour", {
-                  itemPath: reagent.drink_type_path,
-                })}
-                />
-              </Table.Cell>
+            <Table.Cell
+            bold>
+              {/* Get name */}
+               {capitalize(reagent.drink_name)}
+            </Table.Cell>
+            <Table.Cell
+            textAlign="left">
+              {/* Get amount of reagent in storage */}
+              {reagent.drink_quantity}u
+            </Table.Cell>
+            <Table.Cell>
+              {/* Make dispense button */}
+              <Button
+              fluid
+              content="Transfer Back"
+              textAlign="center"
+              fontSize="16px"
+              width="175px"
+              // Disable if there is none of the reagent in storage
+              disabled={(
+                reagent.drink_quantity === 0
+              )}
+              onClick={() => act("transferBack", {
+                itemPath: reagent.drink_type_path,
+              })}
+              />
+            </Table.Cell>
           </Table.Row>
-      ))}
+        ))}
+        <Table.Row
+        align="center">
+          <Button
+          fluid
+          content="Pour glass"
+          textAlign="center"
+          fontSize="16px"
+          onClick={() => act("pour")}
+          />
+        </Table.Row>
       </Table>
     );
   } else {