From 5cfcf6db519ebffddbf264f75a435460c616c132 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 17 Oct 2022 20:51:01 +0200 Subject: [PATCH] [MIRROR] Made the Booze-o-Mat use product categories. [MDB IGNORE] (#16929) * Made the Booze-o-Mat use product categories. (#70571) * Made the Booze-o-Mat use product categories. Co-authored-by: lizardqueenlexi <105025397+lizardqueenlexi@users.noreply.github.com> --- code/modules/vending/boozeomat.dm | 96 +++++++++++++++++++------------ 1 file changed, 59 insertions(+), 37 deletions(-) diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm index 5a0bf348574..9615cce10e7 100644 --- a/code/modules/vending/boozeomat.dm +++ b/code/modules/vending/boozeomat.dm @@ -4,44 +4,66 @@ icon_state = "boozeomat" icon_deny = "boozeomat-deny" panel_type = "panel22" - products = list( - /obj/item/reagent_containers/cup/glass/drinkingglass = 30, - /obj/item/reagent_containers/cup/glass/drinkingglass/shotglass = 12, - /obj/item/reagent_containers/cup/glass/flask = 3, - /obj/item/reagent_containers/cup/glass/ice = 10, - /obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice = 4, - /obj/item/reagent_containers/cup/glass/bottle/juice/tomatojuice = 4, - /obj/item/reagent_containers/cup/glass/bottle/juice/limejuice = 4, - /obj/item/reagent_containers/cup/glass/bottle/juice/cream = 4, - /obj/item/reagent_containers/cup/glass/bottle/juice/menthol = 4, - /obj/item/reagent_containers/cup/soda_cans/cola = 8, - /obj/item/reagent_containers/cup/soda_cans/tonic = 8, - /obj/item/reagent_containers/cup/soda_cans/sodawater = 15, - /obj/item/reagent_containers/cup/soda_cans/sol_dry = 8, - /obj/item/reagent_containers/cup/glass/bottle/grenadine = 4, - /obj/item/reagent_containers/cup/glass/bottle/ale = 6, - /obj/item/reagent_containers/cup/glass/bottle/beer = 6, - /obj/item/reagent_containers/cup/glass/bottle/maltliquor = 6, - /obj/item/reagent_containers/cup/glass/bottle/gin = 5, - /obj/item/reagent_containers/cup/glass/bottle/whiskey = 5, - /obj/item/reagent_containers/cup/glass/bottle/tequila = 5, - /obj/item/reagent_containers/cup/glass/bottle/vodka = 5, - /obj/item/reagent_containers/cup/glass/bottle/vermouth = 5, - /obj/item/reagent_containers/cup/glass/bottle/rum = 5, - /obj/item/reagent_containers/cup/glass/bottle/navy_rum = 5, - /obj/item/reagent_containers/cup/glass/bottle/wine = 5, - /obj/item/reagent_containers/cup/glass/bottle/cognac = 5, - /obj/item/reagent_containers/cup/glass/bottle/kahlua = 5, - /obj/item/reagent_containers/cup/glass/bottle/curacao = 5, - /obj/item/reagent_containers/cup/glass/bottle/hcider = 5, - /obj/item/reagent_containers/cup/glass/bottle/absinthe = 5, - /obj/item/reagent_containers/cup/glass/bottle/grappa = 5, - /obj/item/reagent_containers/cup/glass/bottle/amaretto = 5, - /obj/item/reagent_containers/cup/glass/bottle/sake = 5, - /obj/item/reagent_containers/cup/glass/bottle/applejack = 5, - /obj/item/reagent_containers/cup/glass/bottle = 15, - /obj/item/reagent_containers/cup/glass/bottle/small = 15, + + product_categories = list( + list( + "name" = "Alcoholic", + "icon" = "wine-bottle", + "products" = list( + /obj/item/reagent_containers/cup/glass/bottle/curacao = 5, + /obj/item/reagent_containers/cup/glass/bottle/applejack = 5, + /obj/item/reagent_containers/cup/glass/bottle/tequila = 5, + /obj/item/reagent_containers/cup/glass/bottle/rum = 5, + /obj/item/reagent_containers/cup/glass/bottle/cognac = 5, + /obj/item/reagent_containers/cup/glass/bottle/wine = 5, + /obj/item/reagent_containers/cup/glass/bottle/absinthe = 5, + /obj/item/reagent_containers/cup/glass/bottle/vermouth = 5, + /obj/item/reagent_containers/cup/glass/bottle/gin = 5, + /obj/item/reagent_containers/cup/glass/bottle/grenadine = 4, + /obj/item/reagent_containers/cup/glass/bottle/hcider = 5, + /obj/item/reagent_containers/cup/glass/bottle/amaretto = 5, + /obj/item/reagent_containers/cup/glass/bottle/ale = 6, + /obj/item/reagent_containers/cup/glass/bottle/grappa = 5, + /obj/item/reagent_containers/cup/glass/bottle/navy_rum = 5, + /obj/item/reagent_containers/cup/glass/bottle/maltliquor = 6, + /obj/item/reagent_containers/cup/glass/bottle/kahlua = 5, + /obj/item/reagent_containers/cup/glass/bottle/sake = 5, + /obj/item/reagent_containers/cup/glass/bottle/beer = 6, + /obj/item/reagent_containers/cup/glass/bottle/vodka = 5, + /obj/item/reagent_containers/cup/glass/bottle/whiskey = 5, + ), + ), + + list( + "name" = "Non-Alcoholic", + "icon" = "bottle-water", + "products" = list( + /obj/item/reagent_containers/cup/glass/ice = 10, + /obj/item/reagent_containers/cup/glass/bottle/juice/limejuice = 4, + /obj/item/reagent_containers/cup/glass/bottle/juice/menthol = 4, + /obj/item/reagent_containers/cup/glass/bottle/juice/cream = 4, + /obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice = 4, + /obj/item/reagent_containers/cup/glass/bottle/juice/tomatojuice = 4, + /obj/item/reagent_containers/cup/soda_cans/sodawater = 15, + /obj/item/reagent_containers/cup/soda_cans/sol_dry = 8, + /obj/item/reagent_containers/cup/soda_cans/cola = 8, + /obj/item/reagent_containers/cup/soda_cans/tonic = 8, + ), + ), + + list( + "name" = "Glassware", + "icon" = "wine-glass", + "products" = list( + /obj/item/reagent_containers/cup/glass/drinkingglass = 30, + /obj/item/reagent_containers/cup/glass/drinkingglass/shotglass = 12, + /obj/item/reagent_containers/cup/glass/flask = 3, + /obj/item/reagent_containers/cup/glass/bottle = 15, + /obj/item/reagent_containers/cup/glass/bottle/small = 15, + ), + ), ) + contraband = list( /obj/item/reagent_containers/cup/glass/mug/tea = 12, /obj/item/reagent_containers/cup/glass/bottle/fernet = 5,