From 574c088e365faa0af12894c4592e37e362f61eab Mon Sep 17 00:00:00 2001 From: Scrambledeggs <113869252+Scrambledeggs00@users.noreply.github.com> Date: Tue, 9 Jul 2024 08:58:34 -0400 Subject: [PATCH 01/38] Started groundwork for new vat --- .../kitchen_machinery/ice_cream_vat.dm | 76 +++++++++++++++++++ yogstation.dme | 1 + 2 files changed, 77 insertions(+) create mode 100644 code/modules/food_and_drinks/kitchen_machinery/ice_cream_vat.dm diff --git a/code/modules/food_and_drinks/kitchen_machinery/ice_cream_vat.dm b/code/modules/food_and_drinks/kitchen_machinery/ice_cream_vat.dm new file mode 100644 index 000000000000..8c218b492806 --- /dev/null +++ b/code/modules/food_and_drinks/kitchen_machinery/ice_cream_vat.dm @@ -0,0 +1,76 @@ +#define ICE_CREAM_VANILLA 1 +#define ICE_CREAM_CHOCOLATE 2 +#define ICE_CREAM_STRAWBERRY 3 +#define ICE_CREAM_BLUE 4 +#define ICE_CREAM_LEMON 5 +#define ICE_CREAM_CARAMEL 6 +#define ICE_CREAM_BANANA 7 +#define ICE_CREAM_ORANGE 8 +#define ICE_CREAM_PEACH 9 +#define ICE_CREAM_CHERRY_CHOCOLATE 10 +#define ICE_CREAM_MEAT_LOVERS 11 +#define CONE_CAKE 12 +#define CONE_CHOC 13 + +/obj/machinery/ice_cream_vat + name = "ice cream vat" + desc = "Ding-aling ding dong. Get your Nanotrasen-approved ice cream!" + icon = 'icons/obj/kitchen.dmi' + icon_state = "icecream_vat" + density = TRUE + anchored = FALSE + use_power = NO_POWER_USE + layer = BELOW_OBJ_LAYER + max_integrity = 300 + var/selected_ice_cream = ICE_CREAM_VANILLA + var/selected_cone = CONE_CAKE + var/static/list/starting_contents_list = list( + /obj/item/reagent_containers/food/snacks/ice_cream_scoop = 5, + /obj/item/reagent_containers/food/snacks/ice_cream_scoop/vanilla = 5, + /obj/item/reagent_containers/food/snacks/ice_cream_scoop/chocolate = 5, + /obj/item/reagent_containers/food/snacks/ice_cream_scoop/strawberry = 5, + /obj/item/reagent_containers/food/snacks/ice_cream_scoop/blue = 5, + /obj/item/reagent_containers/food/snacks/ice_cream_scoop/lemon_sorbet = 5, + /obj/item/reagent_containers/food/snacks/ice_cream_scoop/caramel = 5, + /obj/item/reagent_containers/food/snacks/ice_cream_scoop/banana = 5, + /obj/item/reagent_containers/food/snacks/ice_cream_scoop/orange_creamsicle = 5, + /obj/item/reagent_containers/food/snacks/ice_cream_scoop/peach = 5, + /obj/item/reagent_containers/food/snacks/ice_cream_scoop/cherry_chocolate = 5, + /obj/item/reagent_containers/food/snacks/ice_cream_scoop/meat = 5, + /obj/item/reagent_containers/food/snacks/ice_cream_cone/cake = 5, + /obj/item/reagent_containers/food/snacks/ice_cream_cone/chocolate = 5) + +/////////////////// +//ICE CREAM CONES// +/////////////////// + +/obj/item/reagent_containers/food/snacks/ice_cream_cone + name = "ice cream cone base" + desc = "Please report this, as this should not meant to be seen." + icon = 'icons/obj/kitchen.dmi' + bitesize = 3 + foodtype = GRAIN + var/ice_creamed = FALSE //FALSE when empty, TRUE when scooped + var/extra_reagent = null //For adding chems to specific cones + var/extra_reagent_amount = 1 //Amount of extra_reagent to add to cone + +/obj/item/reagent_containers/food/snacks/ice_cream_cone/Initialize(mapload) + . = ..() + create_reagents(20) + reagents.add_reagent(/datum/reagent/consumable/nutriment, 4) + if(extra_reagent != null) + reagents.add_reagent(extra_reagent, extra_reagent_amount) + +/obj/item/reagent_containers/food/snacks/ice_cream_cone/cake + name = "cake ice cream cone" + desc = "Delicious cake cone, but no ice cream." + icon_state = "icecream_cone_waffle" + tastes = list("bland" = 6) + extra_reagent = /datum/reagent/consumable/nutriment + +/obj/item/reagent_containers/food/snacks/ice_cream_cone/chocolate + name = "chocolate ice cream cone" + desc = "Delicious chocolate cone, but no ice cream." + icon_state = "icecream_cone_chocolate" + tastes = list("bland" = 4, "chocolate" =6) + extra_reagent = /datum/reagent/consumable/coco diff --git a/yogstation.dme b/yogstation.dme index ed2f9d41c2e1..48ab37f6780a 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -2568,6 +2568,7 @@ #include "code\modules\food_and_drinks\kitchen_machinery\gibber.dm" #include "code\modules\food_and_drinks\kitchen_machinery\griddle.dm" #include "code\modules\food_and_drinks\kitchen_machinery\grill.dm" +#include "code\modules\food_and_drinks\kitchen_machinery\ice_cream_vat.dm" #include "code\modules\food_and_drinks\kitchen_machinery\icecream_vat.dm" #include "code\modules\food_and_drinks\kitchen_machinery\microwave.dm" #include "code\modules\food_and_drinks\kitchen_machinery\monkeyrecycler.dm" From ba478b5b6cfb2622cfc860b069fd460b0e79d5e7 Mon Sep 17 00:00:00 2001 From: Scrambledeggs <113869252+Scrambledeggs00@users.noreply.github.com> Date: Tue, 9 Jul 2024 08:58:59 -0400 Subject: [PATCH 02/38] forgot a space --- code/modules/food_and_drinks/kitchen_machinery/ice_cream_vat.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/kitchen_machinery/ice_cream_vat.dm b/code/modules/food_and_drinks/kitchen_machinery/ice_cream_vat.dm index 8c218b492806..c758bd597783 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/ice_cream_vat.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/ice_cream_vat.dm @@ -72,5 +72,5 @@ name = "chocolate ice cream cone" desc = "Delicious chocolate cone, but no ice cream." icon_state = "icecream_cone_chocolate" - tastes = list("bland" = 4, "chocolate" =6) + tastes = list("bland" = 4, "chocolate" = 6) extra_reagent = /datum/reagent/consumable/coco From ceab8aeefd7cc4da5e872a4a28c631f0eb2127fd Mon Sep 17 00:00:00 2001 From: Scrambledeggs <113869252+Scrambledeggs00@users.noreply.github.com> Date: Tue, 16 Jul 2024 10:19:01 -0400 Subject: [PATCH 03/38] Started on TGUI code --- .../kitchen_machinery/ice_cream_vat.dm | 5 +- tgui/packages/tgui/interfaces/IceCreamVat.tsx | 61 +++++++++++++++++++ 2 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 tgui/packages/tgui/interfaces/IceCreamVat.tsx diff --git a/code/modules/food_and_drinks/kitchen_machinery/ice_cream_vat.dm b/code/modules/food_and_drinks/kitchen_machinery/ice_cream_vat.dm index c758bd597783..3faf60eaa0bb 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/ice_cream_vat.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/ice_cream_vat.dm @@ -10,7 +10,7 @@ #define ICE_CREAM_CHERRY_CHOCOLATE 10 #define ICE_CREAM_MEAT_LOVERS 11 #define CONE_CAKE 12 -#define CONE_CHOC 13 +#define CONE_CHOCOLATE 13 /obj/machinery/ice_cream_vat name = "ice cream vat" @@ -22,6 +22,7 @@ use_power = NO_POWER_USE layer = BELOW_OBJ_LAYER max_integrity = 300 + var/max_storage = 15 var/selected_ice_cream = ICE_CREAM_VANILLA var/selected_cone = CONE_CAKE var/static/list/starting_contents_list = list( @@ -46,7 +47,7 @@ /obj/item/reagent_containers/food/snacks/ice_cream_cone name = "ice cream cone base" - desc = "Please report this, as this should not meant to be seen." + desc = "Please report this, as this should not be seen." icon = 'icons/obj/kitchen.dmi' bitesize = 3 foodtype = GRAIN diff --git a/tgui/packages/tgui/interfaces/IceCreamVat.tsx b/tgui/packages/tgui/interfaces/IceCreamVat.tsx new file mode 100644 index 000000000000..8b9d60e81b8f --- /dev/null +++ b/tgui/packages/tgui/interfaces/IceCreamVat.tsx @@ -0,0 +1,61 @@ +import { capitalize } from 'common/string'; +import { useBackend, useLocalState } from '../backend'; +import { Button, LabeledList, Section, Tabs, Table, Box, TextArea } from '../components'; +import { Window } from '../layouts'; +import { resolveAsset } from './../assets'; + +type VatData = { + item_image: string; + item_name: string; + item_quantity: number; + item_max_quantity: number; + item_type_path: string; +}; + +const VatRow = (props, context) => { + const { act, data } = useBackend(context); + + return ( + + + + + + {data.item_name} + + + + {data.item_quantity}/{data.item_max_quantity} + + + +