From 259d66e77e3bdbf287c0ae6ce5e1a9485ceb2c3b Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Sat, 20 Mar 2021 07:08:54 +0100 Subject: [PATCH] expands the list of orderable objects for space-italian and space-french customer_data datums. (#57546) --- code/game/objects/items/food/frozen.dm | 1 + code/game/objects/items/food/meat.dm | 1 + code/game/objects/items/food/misc.dm | 1 + code/game/objects/items/food/pastries.dm | 1 + .../food_and_drinks/restaurant/customers/_customer.dm | 6 +++--- .../modules/reagents/chemistry/reagents/alcohol_reagents.dm | 4 ++++ 6 files changed, 11 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/food/frozen.dm b/code/game/objects/items/food/frozen.dm index c01bbcbdb7c..d7a82a57c6c 100644 --- a/code/game/objects/items/food/frozen.dm +++ b/code/game/objects/items/food/frozen.dm @@ -282,3 +282,4 @@ tastes = list("chopped hazelnuts", "waffle") food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/hot_coco = 4, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 4, /datum/reagent/consumable/sugar = 2) foodtypes = DAIRY | SUGAR + venue_value = FOOD_PRICE_NORMAL diff --git a/code/game/objects/items/food/meat.dm b/code/game/objects/items/food/meat.dm index c99c30d60c4..909b75a76a7 100644 --- a/code/game/objects/items/food/meat.dm +++ b/code/game/objects/items/food/meat.dm @@ -503,6 +503,7 @@ food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/consumable/tomatojuice = 10) tastes = list("meat" = 3, "pasta" = 3, "tomato" = 2, "cheese" = 2) foodtypes = MEAT | DAIRY | GRAIN + venue_value = FOOD_PRICE_NORMAL //////////////////////////////////////////// KEBABS AND OTHER SKEWERS //////////////////////////////////////////// diff --git a/code/game/objects/items/food/misc.dm b/code/game/objects/items/food/misc.dm index 695f0e74c86..eab7b67c621 100644 --- a/code/game/objects/items/food/misc.dm +++ b/code/game/objects/items/food/misc.dm @@ -288,6 +288,7 @@ tastes = list("eggplant" = 3, "cheese" = 1) foodtypes = VEGETABLES | DAIRY w_class = WEIGHT_CLASS_SMALL + venue_value = FOOD_PRICE_NORMAL /obj/item/food/tortilla name = "tortilla" diff --git a/code/game/objects/items/food/pastries.dm b/code/game/objects/items/food/pastries.dm index 7bdde56b896..65fe33a8f70 100644 --- a/code/game/objects/items/food/pastries.dm +++ b/code/game/objects/items/food/pastries.dm @@ -855,6 +855,7 @@ tastes = list("pastry" = 1) foodtypes = GRAIN | DAIRY | SUGAR w_class = WEIGHT_CLASS_TINY + venue_value = FOOD_PRICE_CHEAP // Pastry base, 3u of sugar and a single. fucking. unit. of. milk. really? #undef DONUT_SPRINKLE_CHANCE diff --git a/code/modules/food_and_drinks/restaurant/customers/_customer.dm b/code/modules/food_and_drinks/restaurant/customers/_customer.dm index e69d42db2b1..010f7ed177d 100644 --- a/code/modules/food_and_drinks/restaurant/customers/_customer.dm +++ b/code/modules/food_and_drinks/restaurant/customers/_customer.dm @@ -96,8 +96,8 @@ second_warning_line = "Last warning! Do not touch my spaghet." self_defense_line = "I'm going to knead you like mama kneaded her delicious meatballs!" orderable_objects = list( - /datum/venue/restaurant = list(/obj/item/food/spaghetti/pastatomato = 20, /obj/item/food/spaghetti/copypasta = 6, /obj/item/food/spaghetti/meatballspaghetti = 4, /obj/item/food/pizza/vegetable = 2, /obj/item/food/pizza/mushroom = 2, /obj/item/food/pizza/meat = 2, /obj/item/food/pizza/margherita = 2), - /datum/venue/bar = list(/datum/reagent/consumable/ethanol/fanciulli = 5, /datum/reagent/consumable/ethanol/branca_menta = 3, /datum/reagent/consumable/ethanol/beer = 10, /datum/reagent/consumable/lemonade = 8, /datum/reagent/consumable/ethanol/godfather = 5)) + /datum/venue/restaurant = list(/obj/item/food/spaghetti/pastatomato = 20, /obj/item/food/spaghetti/copypasta = 6, /obj/item/food/spaghetti/meatballspaghetti = 4, /obj/item/food/spaghetti/butternoodles = 4, /obj/item/food/pizza/vegetable = 2, /obj/item/food/pizza/mushroom = 2, /obj/item/food/pizza/meat = 2, /obj/item/food/pizza/margherita = 2, /obj/item/food/lasagna = 4, /obj/item/food/cannoli = 3, /obj/item/food/eggplantparm = 3, /obj/item/food/cornuto = 2), + /datum/venue/bar = list(/datum/reagent/consumable/ethanol/fanciulli = 5, /datum/reagent/consumable/ethanol/branca_menta = 3, /datum/reagent/consumable/ethanol/beer = 5, , /datum/reagent/consumable/lemonade = 8, /datum/reagent/consumable/ethanol/godfather = 5, /datum/reagent/consumable/ethanol/wine = 3, /datum/reagent/consumable/ethanol/grappa = 3, /datum/reagent/consumable/ethanol/amaretto = 3)) /datum/customer_data/french @@ -117,7 +117,7 @@ speech_sound = 'sound/creatures/tourist/tourist_talk_french.ogg' orderable_objects = list( /datum/venue/restaurant = list(/obj/item/food/baguette = 20, /obj/item/food/garlicbread = 5, /obj/item/food/soup/onion = 4, /obj/item/food/pie/berryclafoutis = 2, /obj/item/food/omelette = 15), - /datum/venue/bar = list(/datum/reagent/consumable/ethanol/champagne = 15, /datum/reagent/consumable/ethanol/mojito = 5, /datum/reagent/consumable/ethanol/sidecar = 5, /datum/reagent/consumable/ethanol/between_the_sheets = 4, /datum/reagent/consumable/ethanol/beer = 10)) + /datum/venue/bar = list(/datum/reagent/consumable/ethanol/champagne = 10, /datum/reagent/consumable/ethanol/cognac = 5, /datum/reagent/consumable/ethanol/mojito = 5, /datum/reagent/consumable/ethanol/sidecar = 5, /datum/reagent/consumable/ethanol/between_the_sheets = 4, /datum/reagent/consumable/ethanol/beer = 5, /datum/reagent/consumable/ethanol/wine = 5)) /datum/customer_data/french/get_overlays(mob/living/simple_animal/robot_customer/customer) if(customer.ai_controller.blackboard[BB_CUSTOMER_LEAVING]) diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 4f35153f560..e55b09ef8a6 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -388,6 +388,7 @@ All effects don't start immediately, but rather get worse over time; the rate is shot_glass_icon_state = "shotglassred" ph = 3.45 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + glass_price = DRINK_PRICE_STOCK /datum/reagent/consumable/ethanol/wine/on_merge(data) . = ..() @@ -423,6 +424,7 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_desc = "A fine drink originally made to prevent waste by using the leftovers from winemaking." ph = 3.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + glass_price = DRINK_PRICE_STOCK /datum/reagent/consumable/ethanol/amaretto name = "Amaretto" @@ -435,6 +437,7 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_desc = "A sweet and syrupy looking drink." shot_glass_icon_state = "shotglassgold" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + glass_price = DRINK_PRICE_STOCK /datum/reagent/consumable/ethanol/cognac name = "Cognac" @@ -448,6 +451,7 @@ All effects don't start immediately, but rather get worse over time; the rate is shot_glass_icon_state = "shotglassbrown" ph = 3.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + glass_price = DRINK_PRICE_STOCK /datum/reagent/consumable/ethanol/absinthe name = "Absinthe"