diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm index b0ac9d20d6c..bebef085297 100644 --- a/code/modules/food_and_drinks/food/customizables.dm +++ b/code/modules/food_and_drinks/food/customizables.dm @@ -89,6 +89,7 @@ basename = "personal pizza" snack_overlays = 0 top = 0 + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1) /obj/item/reagent_containers/food/snacks/customizable/pasta name = "spaghetti" @@ -107,6 +108,7 @@ basename = "bread" snack_overlays = 0 top = 0 + tastes = list("bread" = 10) /obj/item/reagent_containers/food/snacks/customizable/cook/pie name = "pie" @@ -116,6 +118,7 @@ basename = "pie" snack_overlays = 0 top = 0 + tastes = list("pie" = 1) /obj/item/reagent_containers/food/snacks/customizable/cook/cake name = "cake" @@ -125,6 +128,7 @@ basename = "cake" snack_overlays = 0 top = 0 + tastes = list("cake" = 1) /obj/item/reagent_containers/food/snacks/customizable/cook/jelly name = "jelly" @@ -152,6 +156,7 @@ basename = "kebab" snack_overlays = 0 top = 0 + tastes = list("meat" = 3, "metal" = 1) /obj/item/reagent_containers/food/snacks/customizable/cook/salad name = "salad" @@ -161,6 +166,7 @@ basename = "salad" snack_overlays = 0 top = 0 + tastes = list("leaves" = 1) /obj/item/reagent_containers/food/snacks/customizable/cook/waffles name = "waffles" @@ -170,6 +176,7 @@ basename = "waffles" snack_overlays = 0 top = 0 + tastes = list("waffles" = 1) /obj/item/reagent_containers/food/snacks/customizable/candy/cookie name = "cookie" @@ -179,6 +186,7 @@ basename = "cookie" snack_overlays = 0 top = 0 + tastes = list("cookie" = 1) /obj/item/reagent_containers/food/snacks/customizable/candy/cotton name = "flavored cotton candy" @@ -308,6 +316,7 @@ snack_overlays = 0 trash = /obj/item/trash/bowl top = 0 + tastes = list("soup" = 1) /obj/item/reagent_containers/food/snacks/customizable/burger name = "burger bun" @@ -316,6 +325,7 @@ baseicon = "burgercustom" basename = "burger" toptype = new /obj/item/reagent_containers/food/snacks/bun() + tastes = list("bun" = 4) /obj/item/reagent_containers/food/snacks/customizable/attackby(obj/item/I, mob/user, params) if(contents.len > sandwich_limit) diff --git a/code/modules/food_and_drinks/food/foods/baked_goods.dm b/code/modules/food_and_drinks/food/foods/baked_goods.dm index 0746f37d113..961cb77115f 100644 --- a/code/modules/food_and_drinks/food/foods/baked_goods.dm +++ b/code/modules/food_and_drinks/food/foods/baked_goods.dm @@ -12,6 +12,7 @@ bitesize = 3 filling_color = "#FFD675" list_reagents = list("nutriment" = 20, "oculine" = 10, "vitamin" = 5) + tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1) /obj/item/reagent_containers/food/snacks/carrotcakeslice name = "carrot cake slice" @@ -19,6 +20,8 @@ icon_state = "carrotcake_slice" trash = /obj/item/trash/plate filling_color = "#FFD675" + tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1) + /obj/item/reagent_containers/food/snacks/sliceable/braincake name = "brain cake" @@ -29,6 +32,7 @@ filling_color = "#E6AEDB" bitesize = 3 list_reagents = list("protein" = 10, "nutriment" = 10, "mannitol" = 10, "vitamin" = 5) + tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1) /obj/item/reagent_containers/food/snacks/braincakeslice name = "brain cake slice" @@ -36,6 +40,7 @@ icon_state = "braincakeslice" trash = /obj/item/trash/plate filling_color = "#E6AEDB" + tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1) /obj/item/reagent_containers/food/snacks/sliceable/cheesecake name = "cheese cake" @@ -46,6 +51,7 @@ filling_color = "#FAF7AF" bitesize = 3 list_reagents = list("nutriment" = 20, "vitamin" = 5) + tastes = list("cake" = 4, "cream cheese" = 3) /obj/item/reagent_containers/food/snacks/cheesecakeslice name = "cheese cake slice" @@ -53,6 +59,7 @@ icon_state = "cheesecake_slice" trash = /obj/item/trash/plate filling_color = "#FAF7AF" + tastes = list("cake" = 4, "cream cheese" = 3) /obj/item/reagent_containers/food/snacks/sliceable/plaincake name = "vanilla cake" @@ -63,6 +70,7 @@ bitesize = 3 filling_color = "#F7EDD5" list_reagents = list("nutriment" = 20, "vitamin" = 5) + tastes = list("cake" = 5, "vanilla" = 1, "sweetness" = 2) /obj/item/reagent_containers/food/snacks/plaincakeslice name = "vanilla cake slice" @@ -70,6 +78,7 @@ icon_state = "plaincake_slice" trash = /obj/item/trash/plate filling_color = "#F7EDD5" + tastes = list("cake" = 5, "vanilla" = 1, "sweetness" = 2) /obj/item/reagent_containers/food/snacks/sliceable/orangecake name = "orange cake" @@ -80,6 +89,7 @@ bitesize = 3 filling_color = "#FADA8E" list_reagents = list("nutriment" = 20, "vitamin" = 5) + tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2) /obj/item/reagent_containers/food/snacks/orangecakeslice name = "orange cake slice" @@ -87,6 +97,7 @@ icon_state = "orangecake_slice" trash = /obj/item/trash/plate filling_color = "#FADA8E" + tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2) /obj/item/reagent_containers/food/snacks/sliceable/bananacake name = "banana cake" @@ -97,6 +108,7 @@ bitesize = 3 filling_color = "#FADA8E" list_reagents = list("nutriment" = 20, "vitamin" = 5) + tastes = list("cake" = 5, "sweetness" = 2, "banana" = 2) /obj/item/reagent_containers/food/snacks/bananacakeslice name = "banana cake slice" @@ -104,6 +116,7 @@ icon_state = "bananacake_slice" trash = /obj/item/trash/plate filling_color = "#FADA8E" + tastes = list("cake" = 5, "sweetness" = 2, "banana" = 2) /obj/item/reagent_containers/food/snacks/sliceable/limecake name = "lime cake" @@ -114,6 +127,7 @@ slices_num = 5 filling_color = "#CBFA8E" list_reagents = list("nutriment" = 20, "vitamin" = 5) + tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2) /obj/item/reagent_containers/food/snacks/limecakeslice name = "lime cake slice" @@ -121,6 +135,7 @@ icon_state = "limecake_slice" trash = /obj/item/trash/plate filling_color = "#CBFA8E" + tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2) /obj/item/reagent_containers/food/snacks/sliceable/lemoncake name = "lemon cake" @@ -131,6 +146,7 @@ bitesize = 3 filling_color = "#FAFA8E" list_reagents = list("nutriment" = 20, "vitamin" = 5) + tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2) /obj/item/reagent_containers/food/snacks/lemoncakeslice name = "lemon cake slice" @@ -138,6 +154,7 @@ icon_state = "lemoncake_slice" trash = /obj/item/trash/plate filling_color = "#FAFA8E" + tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2) /obj/item/reagent_containers/food/snacks/sliceable/chocolatecake name = "chocolate cake" @@ -148,6 +165,7 @@ bitesize = 3 filling_color = "#805930" list_reagents = list("nutriment" = 20, "vitamin" = 5) + tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4) /obj/item/reagent_containers/food/snacks/chocolatecakeslice name = "chocolate cake slice" @@ -155,6 +173,7 @@ icon_state = "chocolatecake_slice" trash = /obj/item/trash/plate filling_color = "#805930" + tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4) /obj/item/reagent_containers/food/snacks/sliceable/birthdaycake name = "birthday cake" @@ -165,6 +184,7 @@ filling_color = "#FFD6D6" bitesize = 3 list_reagents = list("nutriment" = 20, "sprinkles" = 10, "vitamin" = 5) + tastes = list("cake" = 5, "sweetness" = 1) /obj/item/reagent_containers/food/snacks/birthdaycakeslice name = "birthday cake slice" @@ -172,6 +192,7 @@ icon_state = "birthdaycakeslice" trash = /obj/item/trash/plate filling_color = "#FFD6D6" + tastes = list("cake" = 5, "sweetness" = 1) /obj/item/reagent_containers/food/snacks/sliceable/applecake name = "apple cake" @@ -182,13 +203,14 @@ bitesize = 3 filling_color = "#EBF5B8" list_reagents = list("nutriment" = 20, "vitamin" = 5) + tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1) /obj/item/reagent_containers/food/snacks/applecakeslice name = "apple cake slice" desc = "A slice of heavenly cake." icon_state = "applecakeslice" trash = /obj/item/trash/plate - filling_color = "#EBF5B8" + filling_color = "#EBF5B8"tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1) ////////////////////// @@ -202,6 +224,7 @@ bitesize = 1 filling_color = "#DBC94F" list_reagents = list("nutriment" = 1, "sugar" = 3, "hot_coco" = 5 ) + tastes = list("cookie" = 1, "crunchy chocolate" = 1) /obj/item/reagent_containers/food/snacks/fortunecookie name = "fortune cookie" @@ -210,12 +233,14 @@ filling_color = "#E8E79E" list_reagents = list("nutriment" = 3) trash = /obj/item/paper/fortune + tastes = list("cookie" = 1) /obj/item/reagent_containers/food/snacks/sugarcookie name = "sugar cookie" desc = "Just like your little sister used to make." icon_state = "sugarcookie" list_reagents = list("nutriment" = 1, "sugar" = 3) + tastes = list("sweetness" = 1) ////////////////////// @@ -230,6 +255,7 @@ filling_color = "#FBFFB8" bitesize = 3 list_reagents = list("nutriment" = 6, "banana" = 5, "vitamin" = 2) + tastes = list("pie" = 1) /obj/item/reagent_containers/food/snacks/pie/throw_impact(atom/hit_atom) ..() @@ -245,6 +271,7 @@ filling_color = "#948051" bitesize = 3 list_reagents = list("nutriment" = 10, "vitamin" = 2) + tastes = list("pie" = 1, "meat" = 1) /obj/item/reagent_containers/food/snacks/tofupie name = "tofu-pie" @@ -254,6 +281,7 @@ filling_color = "#FFFEE0" bitesize = 3 list_reagents = list("nutriment" = 10, "vitamin" = 2) + tastes = list("pie" = 1, "tofu" = 1) /obj/item/reagent_containers/food/snacks/amanita_pie name = "amanita pie" @@ -262,6 +290,7 @@ filling_color = "#FFCCCC" bitesize = 4 list_reagents = list("nutriment" = 6, "amanitin" = 3, "psilocybin" = 1, "vitamin" = 4) + tastes = list("pie" = 1, "mushroom" = 1) /obj/item/reagent_containers/food/snacks/plump_pie name = "plump pie" @@ -270,6 +299,7 @@ filling_color = "#B8279B" bitesize = 3 list_reagents = list("nutriment" = 10, "vitamin" = 2) + tastes = list("pie" = 1, "mushroom" = 1) /obj/item/reagent_containers/food/snacks/plump_pie/New() ..() @@ -285,6 +315,8 @@ trash = /obj/item/trash/plate filling_color = "#43DE18" list_reagents = list("nutriment" = 10, "vitamin" = 2) + tastes = list("pie" = 1, "meat" = 1, "acid" = 1) + /obj/item/reagent_containers/food/snacks/applepie name = "apple pie" @@ -293,6 +325,8 @@ filling_color = "#E0EDC5" bitesize = 3 list_reagents = list("nutriment" = 10, "vitamin" = 2) + tastes = list("pie" = 1, "apple" = 1) + /obj/item/reagent_containers/food/snacks/cherrypie name = "cherry pie" @@ -301,6 +335,7 @@ filling_color = "#FF525A" bitesize = 3 list_reagents = list("nutriment" = 10, "vitamin" = 2) + tastes = list("pie" = 1, "cherries" = 1) /obj/item/reagent_containers/food/snacks/sliceable/pumpkinpie name = "pumpkin pie" @@ -311,6 +346,7 @@ bitesize = 3 filling_color = "#F5B951" list_reagents = list("nutriment" = 20, "vitamin" = 5) + tastes = list("pie" = 1, "pumpkin" = 1) /obj/item/reagent_containers/food/snacks/pumpkinpieslice name = "pumpkin pie slice" @@ -318,7 +354,7 @@ icon_state = "pumpkinpieslice" trash = /obj/item/trash/plate filling_color = "#F5B951" - + tastes = list("pie" = 1, "pumpkin" = 1) ////////////////////// // Donuts // @@ -333,6 +369,7 @@ var/extra_reagent = null filling_color = "#D2691E" var/randomized_sprinkles = 1 + tastes = list("donut" = 1) /obj/item/reagent_containers/food/snacks/donut/New() ..() @@ -353,6 +390,7 @@ name = "chaos donut" desc = "Like life, it never quite tastes the same." bitesize = 10 + tastes = list("donut" = 3, "chaos" = 1) /obj/item/reagent_containers/food/snacks/donut/chaos/New() ..() @@ -369,6 +407,7 @@ desc = "You jelly?" icon_state = "jdonut1" extra_reagent = "berryjuice" + tastes = list("jelly" = 1, "donut" = 3) /obj/item/reagent_containers/food/snacks/donut/jelly/New() ..() @@ -403,6 +442,7 @@ icon_state = "muffin" filling_color = "#E0CF9B" list_reagents = list("nutriment" = 6) + tastes = list("muffin" = 1) /obj/item/reagent_containers/food/snacks/berryclafoutis name = "berry clafoutis" @@ -411,6 +451,8 @@ trash = /obj/item/trash/plate bitesize = 3 list_reagents = list("nutriment" = 10, "berryjuice" = 5, "vitamin" = 2) + tastes = list("pie" = 1, "blackberries" = 1) + /obj/item/reagent_containers/food/snacks/poppypretzel name = "poppy pretzel" @@ -418,6 +460,7 @@ icon_state = "poppypretzel" filling_color = "#916E36" list_reagents = list("nutriment" = 5) + tastes = list("pretzel" = 1) /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit name = "plump helmet biscuit" @@ -425,6 +468,7 @@ icon_state = "phelmbiscuit" filling_color = "#CFB4C4" list_reagents = list("nutriment" = 5) + tastes = list("mushroom" = 1, "biscuit" = 1) /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit/New() ..() @@ -441,6 +485,8 @@ filling_color = "#FFFF00" bitesize = 3 list_reagents = list("nutriment" = 8, "gold" = 5, "vitamin" = 4) + tastes = list("pie" = 1, "apple" = 1, "expensive metal" = 1) + /obj/item/reagent_containers/food/snacks/cracker name = "cracker" @@ -449,3 +495,4 @@ bitesize = 1 filling_color = "#F5DEB8" list_reagents = list("nutriment" = 1) + tastes = list("cracker" = 1) diff --git a/code/modules/food_and_drinks/food/foods/bread.dm b/code/modules/food_and_drinks/food/foods/bread.dm index c841f8d65fa..d888a532c01 100644 --- a/code/modules/food_and_drinks/food/foods/bread.dm +++ b/code/modules/food_and_drinks/food/foods/bread.dm @@ -11,6 +11,7 @@ slices_num = 5 filling_color = "#FF7575" list_reagents = list("protein" = 20, "nutriment" = 10, "vitamin" = 5) + tastes = list("bread" = 10, "meat" = 10) /obj/item/reagent_containers/food/snacks/meatbreadslice name = "meatbread slice" @@ -27,6 +28,7 @@ slices_num = 5 filling_color = "#8AFF75" list_reagents = list("protein" = 20, "nutriment" = 10, "vitamin" = 5) + tastes = list("bread" = 10, "acid" = 10) /obj/item/reagent_containers/food/snacks/xenomeatbreadslice name = "xenomeatbread slice" @@ -42,6 +44,7 @@ slice_path = /obj/item/reagent_containers/food/snacks/spidermeatbreadslice slices_num = 5 list_reagents = list("protein" = 20, "nutriment" = 10, "toxin" = 15, "vitamin" = 5) + tastes = list("bread" = 10, "cobwebs" = 5) /obj/item/reagent_containers/food/snacks/spidermeatbreadslice name = "spider meat bread slice" @@ -58,6 +61,7 @@ slices_num = 5 filling_color = "#EDE5AD" list_reagents = list("banana" = 20, "nutriment" = 20) + tastes = list("bread" = 10) /obj/item/reagent_containers/food/snacks/bananabreadslice name = "Banana-nut bread slice" @@ -65,6 +69,7 @@ icon_state = "bananabreadslice" trash = /obj/item/trash/plate filling_color = "#EDE5AD" + tastes = list("bread" = 10) /obj/item/reagent_containers/food/snacks/sliceable/tofubread name = "Tofubread" @@ -74,6 +79,7 @@ slices_num = 5 filling_color = "#F7FFE0" list_reagents = list("nutriment" = 20, "vitamin" = 5) + tastes = list("bread" = 10, "tofu" = 10) /obj/item/reagent_containers/food/snacks/tofubreadslice name = "Tofubread slice" @@ -90,6 +96,7 @@ slices_num = 6 filling_color = "#FFE396" list_reagents = list("nutriment" = 10) + tastes = list("bread" = 10) /obj/item/reagent_containers/food/snacks/breadslice name = "Bread slice" @@ -98,6 +105,7 @@ trash = /obj/item/trash/plate filling_color = "#D27332" list_reagents = list("nutriment" = 2, "bread" = 5) + tastes = list("bread" = 10) /obj/item/reagent_containers/food/snacks/sliceable/creamcheesebread name = "Cream Cheese Bread" @@ -107,6 +115,7 @@ slices_num = 5 filling_color = "#FFF896" list_reagents = list("nutriment" = 20, "vitamin" = 5) + tastes = list("bread" = 10, "cheese" = 10) /obj/item/reagent_containers/food/snacks/creamcheesebreadslice name = "Cream Cheese Bread slice" @@ -115,6 +124,7 @@ trash = /obj/item/trash/plate filling_color = "#FFF896" list_reagents = list("nutriment" = 4, "vitamin" = 1) + tastes = list("bread" = 10, "cheese" = 10) ////////////////////// @@ -127,6 +137,8 @@ icon = 'icons/obj/food/food_ingredients.dmi' icon_state = "bun" list_reagents = list("nutriment" = 1) + tastes = list("bun" = 1) + /obj/item/reagent_containers/food/snacks/flatbread name = "flatbread" @@ -134,6 +146,7 @@ icon = 'icons/obj/food/food_ingredients.dmi' icon_state = "flatbread" list_reagents = list("nutriment" = 6, "vitamin" = 1) + tastes = list("bread" = 2) /obj/item/reagent_containers/food/snacks/baguette name = "baguette" @@ -142,6 +155,7 @@ filling_color = "#E3D796" bitesize = 3 list_reagents = list("nutriment" = 6, "vitamin" = 1) + tastes = list("bread" = 2) /obj/item/reagent_containers/food/snacks/twobread name = "Two Bread" @@ -150,6 +164,7 @@ filling_color = "#DBCC9A" bitesize = 3 list_reagents = list("nutriment" = 2, "vitamin" = 2) + tastes = list("bread" = 2) /obj/item/reagent_containers/food/snacks/jelliedtoast name = "Jellied Toast" @@ -158,6 +173,7 @@ trash = /obj/item/trash/plate filling_color = "#B572AB" bitesize = 3 + tastes = list("toast" = 1, "jelly" = 1) /obj/item/reagent_containers/food/snacks/jelliedtoast/cherry list_reagents = list("nutriment" = 1, "cherryjelly" = 5, "vitamin" = 2) @@ -173,6 +189,7 @@ filling_color = "#FF00F7" bitesize = 4 list_reagents = list("nutriment" = 8, "psilocybin" = 2, "vitamin" = 2) + tastes = list("waffle" = 1, "mushrooms" = 1) /obj/item/reagent_containers/food/snacks/waffles name = "waffles" diff --git a/code/modules/food_and_drinks/food/foods/candy.dm b/code/modules/food_and_drinks/food/foods/candy.dm index fb5ea043839..77519d9160e 100644 --- a/code/modules/food_and_drinks/food/foods/candy.dm +++ b/code/modules/food_and_drinks/food/foods/candy.dm @@ -12,6 +12,7 @@ desc = "It's placeholder flavored. This shouldn't be seen." icon = 'icons/obj/food/candy.dmi' icon_state = "candy" + tastes = list("candy" = 1) // *********************************************************** // Candy Ingredients / Flavorings / Byproduct @@ -23,6 +24,7 @@ icon_state = "chocolatebar" filling_color = "#7D5F46" list_reagents = list("nutriment" = 2, "chocolate" = 4) + tastes = list("chocolate" = 1) /obj/item/reagent_containers/food/snacks/candy/caramel name = "caramel" @@ -107,6 +109,7 @@ icon_state = "candycorn" filling_color = "#FFFCB0" list_reagents = list("nutriment" = 4, "sugar" = 2) + tastes = list("candy corn" = 1) // *********************************************************** // Candy Products (plain / unflavored) @@ -130,6 +133,7 @@ bitesize = 3 junkiness = 25 list_reagents = list("nutriment" = 1, "chocolate" = 1) + tastes = list("chocolate" = 1) /obj/item/reagent_containers/food/snacks/candy/candycane @@ -177,6 +181,8 @@ icon_state = "candy_cash" filling_color = "#302000" list_reagents = list("nutriment" = 2, "chocolate" = 4) + tastes = list("chocolate" = 1) + /obj/item/reagent_containers/food/snacks/candy/coin name = "chocolate coin" @@ -185,6 +191,8 @@ filling_color = "#302000" bitesize = 3 list_reagents = list("nutriment" = 2, "chocolate" = 4) + tastes = list("chocolate" = 1) + /obj/item/reagent_containers/food/snacks/candy/gum name = "bubblegum" diff --git a/code/modules/food_and_drinks/food/foods/desserts.dm b/code/modules/food_and_drinks/food/foods/desserts.dm index ff99efd07be..9e8ded0bd1b 100644 --- a/code/modules/food_and_drinks/food/foods/desserts.dm +++ b/code/modules/food_and_drinks/food/foods/desserts.dm @@ -10,6 +10,7 @@ icon_state = "icecream_cone" bitesize = 3 list_reagents = list("nutriment" = 1, "sugar" = 1) + tastes = list("ice cream" = 1) /obj/item/reagent_containers/food/snacks/icecream/New() ..() @@ -61,6 +62,7 @@ trash = /obj/item/trash/snack_bowl filling_color = "#FFFBDB" list_reagents = list("nutriment" = 7, "vitamin" = 2) + tastes = list("rice" = 1, "sweetness" = 1) /obj/item/reagent_containers/food/snacks/spacylibertyduff name = "Spacy Liberty Duff" @@ -70,6 +72,7 @@ filling_color = "#42B873" bitesize = 3 list_reagents = list("nutriment" = 6, "psilocybin" = 6) + tastes = list("jelly" = 1, "mushroom" = 1) /obj/item/reagent_containers/food/snacks/amanitajelly name = "Amanita Jelly" @@ -79,6 +82,7 @@ filling_color = "#ED0758" bitesize = 3 list_reagents = list("nutriment" = 6, "amanitin" = 6, "psilocybin" = 3) + tastes = list("jelly" = 1, "mushroom" = 1) /obj/item/reagent_containers/food/snacks/candiedapple name = "Candied Apple" @@ -87,6 +91,7 @@ filling_color = "#F21873" bitesize = 3 list_reagents = list("nutriment" = 3, "sugar" = 2) + tastes = list("apple" = 2, "sweetness" = 2) /obj/item/reagent_containers/food/snacks/mint name = "mint" diff --git a/code/modules/food_and_drinks/food/foods/ethnic.dm b/code/modules/food_and_drinks/food/foods/ethnic.dm index 9404992f5eb..79e7cc8a4fb 100644 --- a/code/modules/food_and_drinks/food/foods/ethnic.dm +++ b/code/modules/food_and_drinks/food/foods/ethnic.dm @@ -9,6 +9,7 @@ icon_state = "taco" bitesize = 3 list_reagents = list("nutriment" = 7, "vitamin" = 1) + tastes = list("taco" = 4, "meat" = 2, "cheese" = 2, "lettuce" = 1) /obj/item/reagent_containers/food/snacks/burrito name = "burrito" @@ -17,6 +18,8 @@ trash = /obj/item/trash/plate filling_color = "#A36A1F" list_reagents = list("nutriment" = 4, "vitamin" = 1) + tastes = list("torilla" = 2, "meat" = 3) + /obj/item/reagent_containers/food/snacks/chimichanga name = "chimichanga" @@ -34,6 +37,7 @@ filling_color = "#A36A1F" bitesize = 4 list_reagents = list("nutriment" = 8, "capsaicin" = 6) + tastes = list("hot peppers" = 1, "meat" = 3, "cheese" = 1, "sour cream" = 1) /obj/item/reagent_containers/food/snacks/cornchips name = "corn chips" @@ -55,6 +59,7 @@ icon_state = "chinese1" junkiness = 25 list_reagents = list("nutriment" = 1, "beans" = 3, "msg" = 4, "sugar" = 2) + tastes = list("noodle" = 1, "vegetables" = 1) /obj/item/reagent_containers/food/snacks/chinese/sweetsourchickenball name = "sweet & sour chicken balls" @@ -62,6 +67,7 @@ icon_state = "chickenball" junkiness = 25 list_reagents = list("nutriment" = 2, "msg" = 4, "sugar" = 2) + tastes = list("chicken" = 1, "sweetness" = 1) /obj/item/reagent_containers/food/snacks/chinese/tao name = "Admiral Yamamoto carp" @@ -69,6 +75,7 @@ icon_state = "chinese2" junkiness = 25 list_reagents = list("nutriment" = 1, "protein" = 1, "msg" = 4, "sugar" = 4) + tastes = list("chicken" = 1) /obj/item/reagent_containers/food/snacks/chinese/newdles name = "chinese newdles" @@ -76,6 +83,7 @@ icon_state = "chinese3" junkiness = 25 list_reagents = list("nutriment" = 1, "msg" = 4, "sugar" = 3) + tastes = list("noodles" = 1) /obj/item/reagent_containers/food/snacks/chinese/rice name = "fried rice" @@ -83,6 +91,7 @@ icon_state = "chinese4" junkiness = 20 list_reagents = list("nutriment" = 1, "rice" = 3, "msg" = 4, "sugar" = 2) + tastes = list("rice" = 1) ////////////////////// @@ -96,6 +105,7 @@ trash = /obj/item/trash/snack_bowl filling_color = "#F0F2E4" list_reagents = list("nutriment" = 5) + taste = list("custard" = 1) /obj/item/reagent_containers/food/snacks/yakiimo name = "yaki imo" @@ -104,6 +114,7 @@ trash = /obj/item/trash/plate list_reagents = list("nutriment" = 5, "vitamin" = 4) filling_color = "#8B1105" + tastes = list("sweet potato" = 1) ////////////////////// diff --git a/code/modules/food_and_drinks/food/foods/ingredients.dm b/code/modules/food_and_drinks/food/foods/ingredients.dm index 7dda7c0a1c0..8ab0ba3c5ce 100644 --- a/code/modules/food_and_drinks/food/foods/ingredients.dm +++ b/code/modules/food_and_drinks/food/foods/ingredients.dm @@ -10,6 +10,7 @@ filling_color = "#FFFEE0" bitesize = 3 list_reagents = list("plantmatter" = 2) + tastes = list("tofu" = 1) /obj/item/reagent_containers/food/snacks/fried_tofu name = "fried tofu" @@ -18,6 +19,7 @@ filling_color = "#FFFEE0" bitesize = 3 list_reagents = list("plantmatter" = 3) + tastes = list("tofu" = 1) /obj/item/reagent_containers/food/snacks/soydope name = "soy dope" @@ -26,6 +28,7 @@ trash = /obj/item/trash/plate filling_color = "#C4BF76" list_reagents = list("nutriment" = 2) + tastes = list("soy" = 1) ////////////////////// @@ -40,12 +43,14 @@ slices_num = 5 filling_color = "#FFF700" list_reagents = list("nutriment" = 15, "vitamin" = 5, "cheese" = 20) + tastes = list("cheese" = 1) /obj/item/reagent_containers/food/snacks/cheesewedge name = "cheese wedge" desc = "A wedge of delicious Cheddar. The cheese wheel it was cut from can't have gone far." icon_state = "cheesewedge" filling_color = "#FFF700" + tastes = list("cheese" = 1) /obj/item/reagent_containers/food/snacks/weirdcheesewedge name = "weird cheese" @@ -66,6 +71,7 @@ filling_color = "#E0D7C5" bitesize = 6 list_reagents = list("plantmatter" = 3, "vitamin" = 1) + tastes = list("mushroom" = 1) /obj/item/reagent_containers/food/snacks/tomatomeat name = "tomato slice" @@ -74,18 +80,21 @@ filling_color = "#DB0000" bitesize = 6 list_reagents = list("protein" = 2) + tastes = list("tomato" = 1) /obj/item/reagent_containers/food/snacks/watermelonslice name = "watermelon slice" desc = "A slice of watery goodness." icon_state = "watermelonslice" filling_color = "#FF3867" + tastes = list("watermelon" = 1) /obj/item/reagent_containers/food/snacks/pineappleslice name = "pineapple slices" desc = "Rings of pineapple." icon_state = "pineappleslice" filling_color = "#e5b437" + tastes = list("pineapple" = 1) ////////////////////// @@ -98,6 +107,7 @@ icon = 'icons/obj/food/food_ingredients.dmi' icon_state = "dough" list_reagents = list("nutriment" = 6) + tastes = list("dough" = 1) // Dough + rolling pin = flat dough /obj/item/reagent_containers/food/snacks/dough/attackby(obj/item/I, mob/user, params) @@ -120,6 +130,8 @@ slice_path = /obj/item/reagent_containers/food/snacks/doughslice slices_num = 3 list_reagents = list("nutriment" = 6) + tastes = list("dough" = 1) + /obj/item/reagent_containers/food/snacks/doughslice name = "dough slice" @@ -127,6 +139,7 @@ icon = 'icons/obj/food/food_ingredients.dmi' icon_state = "doughslice" list_reagents = list("nutriment" = 1) + tastes = list("dough" = 1) ///cookies by Ume @@ -138,6 +151,8 @@ desc = "The base for tasty cookies." icon_state = "cookiedough" list_reagents = list("nutriment" = 5, "sugar" = 5) + tastes = list("dough" = 1, "sugar" = 1) + /obj/item/reagent_containers/food/snacks/cookiedough/update_icon() if(flat) @@ -193,6 +208,7 @@ icon = 'icons/obj/food/food_ingredients.dmi' icon_state = "unbaked_cookies_choco" list_reagents = list("nutriment" = 5, "sugar" = 5, "chocolate" = 5) + tastes = list("dough" = 1, "sugar" = 1, "chocolate" = 1) ////////////////////// // Chocolate // @@ -204,6 +220,7 @@ icon_state = "chocolatebar" filling_color = "#7D5F46" list_reagents = list("nutriment" = 2, "sugar" = 2, "cocoa" = 2) + tastes = list("chocolate" = 1) ///Chocolate crumbles/pile /obj/item/reagent_containers/food/snacks/chocolatebar/attackby(obj/item/I, mob/user, params) @@ -224,6 +241,7 @@ icon_state = "cocoa" filling_color = "#7D5F46" list_reagents = list("chocolate" = 5) + tastes = list("chocolate" = 1) ////////////////////// @@ -236,3 +254,4 @@ icon = 'icons/obj/wizard.dmi' icon_state = "ectoplasm" list_reagents = list("ectoplasm" = 10) + tastes = list("spookiness" = 1) diff --git a/code/modules/food_and_drinks/food/foods/junkfood.dm b/code/modules/food_and_drinks/food/foods/junkfood.dm index 3fa20f0d1c3..ad174fcaddd 100644 --- a/code/modules/food_and_drinks/food/foods/junkfood.dm +++ b/code/modules/food_and_drinks/food/foods/junkfood.dm @@ -12,6 +12,7 @@ filling_color = "#E8C31E" junkiness = 20 list_reagents = list("nutriment" = 1, "sodiumchloride" = 1, "sugar" = 3) + tastes = list("crisps" = 1) /obj/item/reagent_containers/food/snacks/sosjerky name = "Scaredy's Private Reserve Beef Jerky" @@ -21,6 +22,7 @@ filling_color = "#631212" junkiness = 25 list_reagents = list("protein" = 1, "sugar" = 3) + tastes = list("chewy beef" = 1) /obj/item/reagent_containers/food/snacks/pistachios name = "pistachios" @@ -30,6 +32,7 @@ filling_color = "#BAD145" junkiness = 20 list_reagents = list("plantmatter" = 2, "sodiumchloride" = 1, "sugar" = 4) + tastes = list("pistachios" = 1) /obj/item/reagent_containers/food/snacks/no_raisin name = "4no Raisins" @@ -39,6 +42,7 @@ filling_color = "#343834" junkiness = 25 list_reagents = list("plantmatter" = 2, "sugar" = 4) + tastes = list("dried raisins" = 1) /obj/item/reagent_containers/food/snacks/spacetwinkie name = "Space Twinkie" @@ -47,6 +51,7 @@ filling_color = "#FFE591" junkiness = 25 list_reagents = list("sugar" = 4) + tastes = list("twinkies" = 1) /obj/item/reagent_containers/food/snacks/cheesiehonkers name = "Cheesie Honkers" @@ -56,6 +61,7 @@ filling_color = "#FFA305" junkiness = 25 list_reagents = list("nutriment" = 1, "fake_cheese" = 2, "sugar" = 3) + tastes = list("cheese" = 1, "crisps" = 2) /obj/item/reagent_containers/food/snacks/syndicake name = "Syndi-Cakes" @@ -65,6 +71,7 @@ trash = /obj/item/trash/syndi_cakes bitesize = 3 list_reagents = list("nutriment" = 4, "salglu_solution" = 5) + tastes = list("sweetness" = 3, "cake" = 1) /obj/item/reagent_containers/food/snacks/tastybread name = "bread tube" @@ -74,6 +81,7 @@ filling_color = "#A66829" junkiness = 20 list_reagents = list("nutriment" = 2, "sugar" = 4) + tastes = list("bread" = 1) ////////////////////// diff --git a/code/modules/food_and_drinks/food/foods/meat.dm b/code/modules/food_and_drinks/food/foods/meat.dm index eb9569ad356..63d6d2b2195 100644 --- a/code/modules/food_and_drinks/food/foods/meat.dm +++ b/code/modules/food_and_drinks/food/foods/meat.dm @@ -11,6 +11,7 @@ filling_color = "#FF1C1C" bitesize = 3 list_reagents = list("protein" = 3) + tastes = list("meat" = 1) /obj/item/reagent_containers/food/snacks/meat/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/kitchen/knife) || istype(W, /obj/item/scalpel)) @@ -30,6 +31,7 @@ name = "-meat" var/subjectname = "" var/subjectjob = null + tastes = list("tender meat" = 1) /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct name = "meat product" @@ -83,6 +85,7 @@ filling_color = "#DB0000" bitesize = 3 list_reagents = list("protein" = 12, "morphine" = 5, "vitamin" = 2) + tastes = list("meat" = 1, "salmon" = 1) /obj/item/reagent_containers/food/snacks/xenomeat name = "meat" @@ -91,6 +94,7 @@ filling_color = "#43DE18" bitesize = 6 list_reagents = list("protein" = 3, "vitamin" = 1) + tastes = list("meat" = 1, "acid" = 1) /obj/item/reagent_containers/food/snacks/spidermeat name = "spider meat" @@ -98,6 +102,7 @@ icon_state = "spidermeat" bitesize = 3 list_reagents = list("protein" = 3, "toxin" = 3, "vitamin" = 1) + tastes = list("cobwebs" = 1)) /obj/item/reagent_containers/food/snacks/lizardmeat name = "mutant lizard meat" @@ -118,12 +123,14 @@ desc = "God's gift to man in uncooked form." icon_state = "raw_bacon" list_reagents = list("nutriment" = 1, "porktonium" = 10) + tastes = list("bacon" = 1) /obj/item/reagent_containers/food/snacks/spidereggs name = "spider eggs" desc = "A cluster of juicy spider eggs. A great side dish for when you don't care about your health." icon_state = "spidereggs" list_reagents = list("protein" = 2, "toxin" = 2) + tastes = list("cobwebs" = 1) /obj/item/reagent_containers/food/snacks/goliath name = "goliath meat" @@ -148,12 +155,14 @@ filling_color = "#7A3D11" bitesize = 3 list_reagents = list("nutriment" = 5) + tastes = list("meat" = 1) /obj/item/reagent_containers/food/snacks/bacon name = "bacon" desc = "It looks crispy and tastes amazing! Mmm... Bacon." icon_state = "bacon2" list_reagents = list("nutriment" = 4, "porktonium" = 10, "msg" = 4) + tastes = list("bacon" = 1) /obj/item/reagent_containers/food/snacks/telebacon name = "tele bacon" @@ -161,6 +170,7 @@ icon_state = "bacon" var/obj/item/radio/beacon/bacon/baconbeacon list_reagents = list("nutriment" = 4, "porktonium" = 10) + tastes = list("bacon" = 1) /obj/item/reagent_containers/food/snacks/telebacon/New() ..() @@ -177,6 +187,7 @@ icon_state = "meatball" filling_color = "#DB0000" list_reagents = list("protein" = 4, "vitamin" = 1) + tastes = list("meat" = 1) /obj/item/reagent_containers/food/snacks/sausage name = "sausage" @@ -184,6 +195,7 @@ icon_state = "sausage" filling_color = "#DB0000" list_reagents = list("protein" = 6, "vitamin" = 1, "porktonium" = 10) + tastes = list("meat" = 1) /obj/item/reagent_containers/food/snacks/cutlet name = "cutlet" @@ -191,6 +203,7 @@ icon = 'icons/obj/food/food_ingredients.dmi' icon_state = "cutlet" list_reagents = list("protein" = 2) + tastes = list("meat" = 1) /obj/item/reagent_containers/food/snacks/spidereggsham name = "green eggs and ham" @@ -199,6 +212,7 @@ trash = /obj/item/trash/plate bitesize = 4 list_reagents = list("nutriment" = 6) + tastes = list("cobwebs" = 1, "the colour green" = 1) /obj/item/reagent_containers/food/snacks/boiledspiderleg name = "boiled spider leg" @@ -207,6 +221,7 @@ trash = /obj/item/trash/plate bitesize = 3 list_reagents = list("nutriment" = 3, "capsaicin" = 2) + tastes = list("cobwebs" = 1, "hot peppers" = 1) /obj/item/reagent_containers/food/snacks/wingfangchu name = "wing fang chu" @@ -215,6 +230,7 @@ trash = /obj/item/trash/snack_bowl filling_color = "#43DE18" list_reagents = list("nutriment" = 6, "soysauce" = 5, "vitamin" = 2) + tastes = list("soy" = 1) /obj/item/reagent_containers/food/snacks/goliath_steak name = "goliath steak" @@ -223,6 +239,7 @@ icon_state = "goliathsteak" trash = null list_reagents = list("protein" = 6, "vitamin" = 2) + tastes = list("meat" = 1) ////////////////////// // Cubes // @@ -237,6 +254,7 @@ var/faction var/datum/species/monkey_type = /datum/species/monkey list_reagents = list("nutriment" = 2) + tastes = list("the jungle" = 1, "bananas" = 1) /obj/item/reagent_containers/food/snacks/monkeycube/water_act(volume, temperature, source, method = TOUCH) . = ..() @@ -293,6 +311,8 @@ icon_state = "egg" filling_color = "#FDFFD1" list_reagents = list("protein" = 1, "egg" = 5) + tastes = list("egg" = 1) + /obj/item/reagent_containers/food/snacks/egg/throw_impact(atom/hit_atom) ..() @@ -366,6 +386,7 @@ filling_color = "#FFDF78" bitesize = 1 list_reagents = list("nutriment" = 3, "egg" = 5) + tastes = list("egg" = 1, "salt" = 1, "pepper" = 1) /obj/item/reagent_containers/food/snacks/boiledegg name = "boiled egg" @@ -389,6 +410,7 @@ filling_color = "#FFF9A8" list_reagents = list("nutriment" = 8, "vitamin" = 1) bitesize = 1 + tastes = list("egg" = 1, "cheese" = 1) /obj/item/reagent_containers/food/snacks/benedict name = "eggs benedict" @@ -396,6 +418,7 @@ icon_state = "benedict" bitesize = 3 list_reagents = list("nutriment" = 6, "egg" = 3, "vitamin" = 4) + tastes = list("egg" = 1, "bacon" = 1, "bun" = 1) ////////////////////// @@ -408,6 +431,7 @@ icon_state = "hotdog" bitesize = 3 list_reagents = list("nutriment" = 6, "ketchup" = 3, "vitamin" = 3) + tastes = list("bun" = 3, "meat" = 2) /obj/item/reagent_containers/food/snacks/meatbun name = "meat bun" @@ -415,6 +439,7 @@ icon_state = "meatbun" bitesize = 6 list_reagents = list("nutriment" = 6, "vitamin" = 2) + tastes = list("bun" = 3, "meat" = 2) /obj/item/reagent_containers/food/snacks/sliceable/turkey name = "turkey" @@ -423,6 +448,7 @@ slice_path = /obj/item/reagent_containers/food/snacks/turkeyslice slices_num = 6 list_reagents = list("protein" = 24, "nutriment" = 18, "vitamin" = 5) + tastes = list("turkey" = 2, "stuffing" = 2) /obj/item/reagent_containers/food/snacks/turkeyslice name = "turkey serving" @@ -430,6 +456,7 @@ icon_state = "turkeyslice" trash = /obj/item/trash/plate filling_color = "#B97A57" + tastes = list("turkey" = 1) /obj/item/reagent_containers/food/snacks/organ name = "organ" diff --git a/code/modules/food_and_drinks/food/foods/misc.dm b/code/modules/food_and_drinks/food/foods/misc.dm index 4845fe4d608..1fcd4a52c18 100644 --- a/code/modules/food_and_drinks/food/foods/misc.dm +++ b/code/modules/food_and_drinks/food/foods/misc.dm @@ -10,6 +10,7 @@ trash = /obj/item/trash/plate filling_color = "#4D2F5E" list_reagents = list("nutriment" = 6, "vitamin" = 2) + tastes = list("eggplant" = 2, "cheese" = 2) /obj/item/reagent_containers/food/snacks/soylentgreen name = "soylent green" @@ -18,6 +19,7 @@ trash = /obj/item/trash/waffles filling_color = "#B8E6B5" list_reagents = list("nutriment" = 10, "vitamin" = 1) + tastes = list("waffles" = 7, "people" = 1) /obj/item/reagent_containers/food/snacks/soylentviridians name = "soylent virdians" @@ -26,6 +28,7 @@ trash = /obj/item/trash/waffles filling_color = "#E6FA61" list_reagents = list("nutriment" = 10, "vitamin" = 1) + tastes = list("waffles" = 10) /obj/item/reagent_containers/food/snacks/monkeysdelight name = "monkey's delight" @@ -35,6 +38,7 @@ filling_color = "#5C3C11" bitesize = 6 list_reagents = list("nutriment" = 10, "banana" = 5, "vitamin" = 5) + tastes = list("banana" = 1, "the jungle" = 1) /obj/item/reagent_containers/food/snacks/dionaroast name = "roast diona" @@ -43,6 +47,7 @@ trash = /obj/item/trash/plate filling_color = "#75754B" list_reagents = list("plantmatter" = 4, "nutriment" = 2, "radium" = 2, "vitamin" = 4) + tastes = list("chewy vegetables" = 1) /obj/item/reagent_containers/food/snacks/tofurkey name = "tofurkey" @@ -51,6 +56,7 @@ filling_color = "#FFFEE0" bitesize = 3 list_reagents = list("nutriment" = 12, "ether" = 3) + tastes = list("tofu" = 1) ////////////////////// @@ -65,6 +71,7 @@ filling_color = "#468C00" bitesize = 3 list_reagents = list("nutriment" = 8, "omnizine" = 8, "vitamin" = 6) + tastes = list("divinity" = 1, "lettuce" = 1) /obj/item/reagent_containers/food/snacks/herbsalad name = "herb salad" @@ -74,6 +81,7 @@ filling_color = "#76B87F" bitesize = 3 list_reagents = list("nutriment" = 8, "vitamin" = 2) + tastes = list("lettuce" = 1, "apple" = 1) /obj/item/reagent_containers/food/snacks/validsalad name = "valid salad" @@ -83,6 +91,7 @@ filling_color = "#76B87F" bitesize = 3 list_reagents = list("nutriment" = 8, "salglu_solution" = 5, "vitamin" = 2) + tastes = list("fried potato" = 1, "lettuce" = 1, "meat" = 1, "valids" = 1) ////////////////////// @@ -95,6 +104,7 @@ icon_state = "donkpocket" filling_color = "#DEDEAB" list_reagents = list("nutriment" = 4) + tastes = list("meat" = 2, "dough" = 2, "laziness" = 1) /obj/item/reagent_containers/food/snacks/warmdonkpocket name = "warm Donk-pocket" @@ -102,6 +112,7 @@ icon_state = "donkpocket" filling_color = "#DEDEAB" list_reagents = list("nutriment" = 4) + tastes = list("meat" = 2, "dough" = 2, "laziness" = 1) /obj/item/reagent_containers/food/snacks/warmdonkpocket/Post_Consume(mob/living/M) M.reagents.add_reagent("omnizine", 15) @@ -140,6 +151,7 @@ icon_state = "boiledrorocore" bitesize = 3 list_reagents = list("slimejelly" = 5) + tastes = list("jelly" = 3) /obj/item/reagent_containers/food/snacks/popcorn name = "Popcorn" @@ -150,6 +162,7 @@ filling_color = "#FFFAD4" bitesize = 0.1 //this snack is supposed to be eating during looooong time. And this it not dinner food! --rastaf0 list_reagents = list("nutriment" = 2) + tastes = list("popcorn" = 3, "butter" = 1) /obj/item/reagent_containers/food/snacks/popcorn/New() ..() diff --git a/code/modules/food_and_drinks/food/foods/pasta.dm b/code/modules/food_and_drinks/food/foods/pasta.dm index 36c340656e3..356b4b4bb67 100644 --- a/code/modules/food_and_drinks/food/foods/pasta.dm +++ b/code/modules/food_and_drinks/food/foods/pasta.dm @@ -10,6 +10,7 @@ icon_state = "spaghetti" filling_color = "#EDDD00" list_reagents = list("nutriment" = 1, "vitamin" = 1) + tastes = list("raw pasta" = 1) /obj/item/reagent_containers/food/snacks/macaroni name = "macaroni twists" @@ -18,6 +19,7 @@ icon_state = "macaroni" filling_color = "#EDDD00" list_reagents = list("nutriment" = 1, "vitamin" = 1) + tastes = list("raw pasta" = 1) ////////////////////// @@ -32,6 +34,7 @@ trash = /obj/item/trash/plate filling_color = "#FCEE81" list_reagents = list("nutriment" = 2, "vitamin" = 1) + tastes = list("pasta" = 1) /obj/item/reagent_containers/food/snacks/pastatomato name = "spaghetti" @@ -42,6 +45,7 @@ filling_color = "#DE4545" bitesize = 4 list_reagents = list("nutriment" = 6, "tomatojuice" = 10, "vitamin" = 4) + tastes = list("pasta" = 1, "tomato" = 1) /obj/item/reagent_containers/food/snacks/meatballspaghetti name = "spaghetti & meatballs" @@ -51,6 +55,7 @@ trash = /obj/item/trash/plate filling_color = "#DE4545" list_reagents = list("nutriment" = 8, "synaptizine" = 5, "vitamin" = 4) + tastes = list("pasta" = 1, "tomato" = 1, "meat" = 1) /obj/item/reagent_containers/food/snacks/spesslaw name = "Spesslaw" @@ -59,6 +64,7 @@ icon_state = "spesslaw" filling_color = "#DE4545" list_reagents = list("nutriment" = 8, "synaptizine" = 10, "vitamin" = 6) + tastes = list("pasta" = 1, "tomato" = 1, "meat" = 2) /obj/item/reagent_containers/food/snacks/macncheese name = "mac n cheese" @@ -68,3 +74,4 @@ icon_state = "macncheese" filling_color = "#ffe45d" list_reagents = list("nutriment" = 5, "vitamin" = 2, "cheese" = 4) + tastes = list("pasta" = 1, "cheese" = 1, "comfort" = 1) diff --git a/code/modules/food_and_drinks/food/foods/pizza.dm b/code/modules/food_and_drinks/food/foods/pizza.dm index aabd47194ce..1e116f8a830 100644 --- a/code/modules/food_and_drinks/food/foods/pizza.dm +++ b/code/modules/food_and_drinks/food/foods/pizza.dm @@ -7,6 +7,7 @@ icon = 'icons/obj/food/pizza.dmi' slices_num = 6 filling_color = "#BAA14C" + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1) /obj/item/reagent_containers/food/snacks/sliceable/pizza/margherita name = "margherita pizza" @@ -22,6 +23,7 @@ icon_state = "pizzamargheritaslice" filling_color = "#BAA14C" list_reagents = list("nutriment" = 5) + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1) /obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza name = "meat pizza" @@ -29,6 +31,7 @@ icon_state = "meatpizza" slice_path = /obj/item/reagent_containers/food/snacks/meatpizzaslice list_reagents = list("protein" = 30, "tomatojuice" = 6, "vitamin" = 8) + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1) /obj/item/reagent_containers/food/snacks/meatpizzaslice name = "meat pizza slice" @@ -36,6 +39,7 @@ icon = 'icons/obj/food/pizza.dmi' icon_state = "meatpizzaslice" filling_color = "#BAA14C" + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1) /obj/item/reagent_containers/food/snacks/sliceable/pizza/mushroompizza name = "mushroom pizza" @@ -43,6 +47,8 @@ icon_state = "mushroompizza" slice_path = /obj/item/reagent_containers/food/snacks/mushroompizzaslice list_reagents = list("plantmatter" = 30, "vitamin" = 5) + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "mushroom" = 1) + /obj/item/reagent_containers/food/snacks/mushroompizzaslice name = "mushroom pizza slice" @@ -50,6 +56,7 @@ icon = 'icons/obj/food/pizza.dmi' icon_state = "mushroompizzaslice" filling_color = "#BAA14C" + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "mushroom" = 1) /obj/item/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza name = "vegetable pizza" @@ -57,6 +64,8 @@ icon_state = "vegetablepizza" slice_path = /obj/item/reagent_containers/food/snacks/vegetablepizzaslice list_reagents = list("plantmatter" = 25, "tomatojuice" = 6, "oculine" = 12, "vitamin" = 5) + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "carrot" = 1, "vegetables" = 1) + /obj/item/reagent_containers/food/snacks/vegetablepizzaslice name = "vegetable pizza slice" @@ -64,6 +73,7 @@ icon = 'icons/obj/food/pizza.dmi' icon_state = "vegetablepizzaslice" filling_color = "#BAA14C" + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "carrot" = 1, "vegetables" = 1) /obj/item/reagent_containers/food/snacks/sliceable/pizza/hawaiianpizza name = "Hawaiian pizza" @@ -71,6 +81,7 @@ icon_state = "hawaiianpizza" //NEEDED slice_path = /obj/item/reagent_containers/food/snacks/hawaiianpizzaslice list_reagents = list("protein" = 15, "tomatojuice" = 6, "plantmatter" = 20, "pineapplejuice" = 6, "vitamin" = 5) + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 1) /obj/item/reagent_containers/food/snacks/hawaiianpizzaslice name = "Hawaiian pizza slice" @@ -78,6 +89,7 @@ icon = 'icons/obj/food/pizza.dmi' icon_state = "hawaiianpizzaslice" filling_color = "#e5b437" + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 1) /obj/item/reagent_containers/food/snacks/sliceable/pizza/macpizza name = "mac n cheese pizza" @@ -86,6 +98,7 @@ slice_path = /obj/item/reagent_containers/food/snacks/macpizzaslice list_reagents = list("nutriment" = 40, "vitamin" = 5) //More nutriment because carbs, but it's not any more vitaminicious filling_color = "#ffe45d" + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 2, "pasta" = 1) /obj/item/reagent_containers/food/snacks/macpizzaslice name = "mac n cheese pizza slice" @@ -93,6 +106,7 @@ icon = 'icons/obj/food/pizza.dmi' icon_state = "macpizzaslice" filling_color = "#ffe45d" + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 2, "pasta" = 1) ////////////////////// diff --git a/code/modules/food_and_drinks/food/foods/sandwiches.dm b/code/modules/food_and_drinks/food/foods/sandwiches.dm index 43f1b31df0e..216e56af9f9 100644 --- a/code/modules/food_and_drinks/food/foods/sandwiches.dm +++ b/code/modules/food_and_drinks/food/foods/sandwiches.dm @@ -10,6 +10,7 @@ filling_color = "#F2B6EA" bitesize = 3 list_reagents = list("nutriment" = 6, "prions" = 10, "vitamin" = 1) + tastes = list("bun" = 4, "brains" = 2) /obj/item/reagent_containers/food/snacks/ghostburger name = "ghost burger" @@ -18,6 +19,7 @@ filling_color = "#FFF2FF" bitesize = 3 list_reagents = list("nutriment" = 6, "vitamin" = 1) + tastes = list("bun" = 4, "ectoplasm" = 2) /obj/item/reagent_containers/food/snacks/human var/hname = "" @@ -30,6 +32,7 @@ icon_state = "hburger" bitesize = 3 list_reagents = list("nutriment" = 6, "vitamin" = 1) + tastes = list("bun" = 4, "tender meat" = 2) /obj/item/reagent_containers/food/snacks/cheeseburger name = "cheeseburger" @@ -37,6 +40,7 @@ icon_state = "cheeseburger" bitesize = 3 list_reagents = list("nutriment" = 6, "vitamin" = 1) + tastes = list("bun" = 4, "meat" = 1, "cheese" = 1) /obj/item/reagent_containers/food/snacks/monkeyburger name = "burger" @@ -45,6 +49,7 @@ filling_color = "#D63C3C" bitesize = 3 list_reagents = list("nutriment" = 6, "vitamin" = 1) + tastes = list("bun" = 4, "meat" = 1, "the jungle" = 1) /obj/item/reagent_containers/food/snacks/tofuburger name = "tofu burger" @@ -53,6 +58,7 @@ filling_color = "#FFFEE0" bitesize = 3 list_reagents = list("nutriment" = 6, "vitamin" = 1) + tastes = list("bun" = 4, "tofu" = 4) /obj/item/reagent_containers/food/snacks/roburger name = "roburger" @@ -61,6 +67,7 @@ filling_color = "#CCCCCC" bitesize = 3 list_reagents = list("nutriment" = 6, "nanomachines" = 10, "vitamin" = 1) + tastes = list("bun" = 4, "lettuce" = 2, "sludge" = 1) /obj/item/reagent_containers/food/snacks/roburgerbig name = "roburger" @@ -70,6 +77,7 @@ volume = 120 bitesize = 3 list_reagents = list("nutriment" = 6, "nanomachines" = 70, "vitamin" = 5) + tastes = list("bun" = 4, "lettuce" = 2, "sludge" = 2) /obj/item/reagent_containers/food/snacks/xenoburger name = "xenoburger" @@ -78,6 +86,7 @@ filling_color = "#43DE18" bitesize = 3 list_reagents = list("nutriment" = 6, "vitamin" = 1) + tastes = list("bun" = 4, "acid" = 4) /obj/item/reagent_containers/food/snacks/clownburger name = "clown burger" @@ -86,6 +95,7 @@ filling_color = "#FF00FF" bitesize = 3 list_reagents = list("nutriment" = 6, "vitamin" = 1) + tastes = list("bun" = 4, "banana" = 1, "magic" = 2) /obj/item/reagent_containers/food/snacks/mimeburger name = "mime burger" @@ -94,6 +104,7 @@ filling_color = "#FFFFFF" bitesize = 3 list_reagents = list("nutriment" = 6, "vitamin" = 1) + tastes = list("bun" = 4, "silence" = 2) /obj/item/reagent_containers/food/snacks/baseballburger name = "home run baseball burger" @@ -102,6 +113,7 @@ filling_color = "#CD853F" bitesize = 3 list_reagents = list("nutriment" = 6, "vitamin" = 1) + tastes = list("bun" = 4) /obj/item/reagent_containers/food/snacks/spellburger name = "spell burger" @@ -110,6 +122,7 @@ filling_color = "#D505FF" bitesize = 3 list_reagents = list("nutriment" = 6, "vitamin" = 1) + tastes = list("bun" = 4, "magic" = 2) /obj/item/reagent_containers/food/snacks/bigbiteburger name = "BigBite burger" @@ -118,6 +131,7 @@ filling_color = "#E3D681" bitesize = 3 list_reagents = list("nutriment" = 10, "vitamin" = 2) + tastes = list("bun" = 4, "meat" = 2, "cheese" = 2, "type two diabetes" = 10) /obj/item/reagent_containers/food/snacks/superbiteburger name = "SuperBite burger" @@ -126,6 +140,7 @@ filling_color = "#CCA26A" bitesize = 7 list_reagents = list("nutriment" = 40, "vitamin" = 5) + tastes = list("bun" = 4, "meat" = 2, "cheese" = 2, "type two diabetes" = 10) /obj/item/reagent_containers/food/snacks/jellyburger name = "jelly burger" @@ -133,6 +148,7 @@ icon_state = "jellyburger" filling_color = "#B572AB" bitesize = 3 + tastes = list("bun" = 4, "jelly" = 2) /obj/item/reagent_containers/food/snacks/jellyburger/slime list_reagents = list("nutriment" = 6, "slimejelly" = 5, "vitamin" = 1) @@ -152,6 +168,7 @@ trash = /obj/item/trash/plate filling_color = "#D9BE29" list_reagents = list("nutriment" = 6, "vitamin" = 1) + tastes = list("meat" = 2, "cheese" = 1, "bread" = 2, "lettuce" = 1) /obj/item/reagent_containers/food/snacks/toastedsandwich name = "toasted sandwich" @@ -160,6 +177,7 @@ trash = /obj/item/trash/plate filling_color = "#D9BE29" list_reagents = list("nutriment" = 6, "carbon" = 2) + tastes = list("toast" = 1) /obj/item/reagent_containers/food/snacks/grilledcheese name = "grilled cheese sandwich" @@ -168,6 +186,7 @@ trash = /obj/item/trash/plate filling_color = "#D9BE29" list_reagents = list("nutriment" = 7, "vitamin" = 1) //why make a regualr sandwhich when you can make grilled cheese, with this nutriment value? + tastes = list("toast" = 1, "grilled cheese" = 1) /obj/item/reagent_containers/food/snacks/jellysandwich name = "jelly sandwich" @@ -176,6 +195,7 @@ trash = /obj/item/trash/plate filling_color = "#9E3A78" bitesize = 3 + tastes = list("toast" = 1, "jelly" = 1) /obj/item/reagent_containers/food/snacks/jellysandwich/slime list_reagents = list("nutriment" = 2, "slimejelly" = 5, "vitamin" = 2) @@ -188,9 +208,11 @@ desc = "Something seems to be wrong with this, you can't quite figure what. Maybe it's his moustache." icon_state = "notasandwich" list_reagents = list("nutriment" = 6, "vitamin" = 6) + tastes = list("nothing suspicious" = 1) /obj/item/reagent_containers/food/snacks/wrap name = "egg wrap" desc = "The precursor to Pigs in a Blanket." icon_state = "wrap" list_reagents = list("nutriment" = 5) + tastes = list("egg" = 1) diff --git a/code/modules/food_and_drinks/food/foods/seafood.dm b/code/modules/food_and_drinks/food/foods/seafood.dm index 9e4407d9602..4947644bdd4 100644 --- a/code/modules/food_and_drinks/food/foods/seafood.dm +++ b/code/modules/food_and_drinks/food/foods/seafood.dm @@ -7,6 +7,7 @@ filling_color = "#FFDEFE" bitesize = 6 list_reagents = list("protein" = 3, "carpotoxin" = 2, "vitamin" = 2) + tastes = list("white fish" = 1) /obj/item/reagent_containers/food/snacks/salmonmeat name = "raw salmon" @@ -16,6 +17,7 @@ filling_color = "#FFDEFE" bitesize = 6 list_reagents = list("protein" = 3, "vitamin" = 2) + tastes = list("raw salmon" = 1) /obj/item/reagent_containers/food/snacks/salmonsteak name = "salmon steak" @@ -26,6 +28,7 @@ filling_color = "#7A3D11" bitesize = 3 list_reagents = list("nutriment" = 4, "vitamin" = 2) + tastes = list("cooked salmon" = 1) /obj/item/reagent_containers/food/snacks/catfishmeat name = "raw catfish" @@ -35,6 +38,7 @@ filling_color = "#FFDEFE" bitesize = 6 list_reagents = list("protein" = 3, "vitamin" = 2) + tastes = list("catfish" = 1) /obj/item/reagent_containers/food/snacks/fishfingers name = "fish fingers" @@ -44,6 +48,7 @@ filling_color = "#FFDEFE" bitesize = 1 list_reagents = list("nutriment" = 4) + tastes = list("fish" = 1, "bread" = 1) /obj/item/reagent_containers/food/snacks/fishburger name = "Fillet-O-Carp sandwich" @@ -53,6 +58,7 @@ filling_color = "#FFDEFE" bitesize = 3 list_reagents = list("nutriment" = 6, "vitamin" = 1) + tastes = list("bun" = 4, "fish" = 4) /obj/item/reagent_containers/food/snacks/cubancarp name = "Cuban carp" @@ -63,6 +69,7 @@ filling_color = "#E9ADFF" bitesize = 3 list_reagents = list("nutriment" = 6, "capsaicin" = 1) + tastes = list("fish" = 4, "batter" = 1, "hot peppers" = 1) /obj/item/reagent_containers/food/snacks/fishandchips name = "fish and chips" @@ -72,6 +79,7 @@ filling_color = "#E3D796" bitesize = 3 list_reagents = list("nutriment" = 6) + tastes = list("fish" = 1, "chips" = 1) /obj/item/reagent_containers/food/snacks/sashimi name = "carp sashimi" @@ -80,6 +88,7 @@ icon_state = "sashimi" bitesize = 3 list_reagents = list("nutriment" = 6, "capsaicin" = 5) + tastes = list("raw carp" = 1, "hot peppers" = 1) /obj/item/reagent_containers/food/snacks/fried_shrimp name = "fried shrimp" @@ -88,6 +97,7 @@ icon_state = "shrimp_fried" bitesize = 3 list_reagents = list("nutriment" = 2) + tastes = list("shrimp" = 1, "bread crumbs" = 1) /obj/item/reagent_containers/food/snacks/boiled_shrimp name = "boiled shrimp" @@ -96,6 +106,7 @@ icon_state = "shrimp_cooked" bitesize = 3 list_reagents = list("nutriment" = 2) + tastes = list("shrimp" = 1) /obj/item/reagent_containers/food/snacks/shrimp_skewer name = "shrimp skewer" @@ -105,6 +116,7 @@ icon_state = "shrimpskewer" bitesize = 3 list_reagents = list("nutriment" = 8) + tastes = list("shrimp" = 4) /obj/item/reagent_containers/food/snacks/fish_skewer name = "fish skewer" @@ -114,6 +126,7 @@ icon_state = "fishskewer" bitesize = 3 list_reagents = list("protein" = 6, "vitamin" = 4) + tastes = list("shrimp" = 1, "batter" = 1) /obj/item/reagent_containers/food/snacks/sliceable/Ebi_maki name = "ebi makiroll" @@ -124,6 +137,7 @@ slices_num = 4 bitesize = 3 list_reagents = list("nutriment" = 8) + tastes = list("shrimp" = 1, "rice" = 1, "seaweed" = 1) /obj/item/reagent_containers/food/snacks/sushi_Ebi name = "ebi sushi" @@ -132,6 +146,7 @@ icon_state = "sushi_Ebi" bitesize = 3 list_reagents = list("nutriment" = 2) + tastes = list("shrimp" = 1, "rice" = 1, "seaweed" = 1) /obj/item/reagent_containers/food/snacks/sliceable/Ikura_maki name = "ikura makiroll" @@ -142,6 +157,7 @@ slices_num = 4 bitesize = 3 list_reagents = list("nutriment" = 8, "protein" = 4) + tastes = list("salmon roe" = 1, "rice" = 1, "seaweed" = 1) /obj/item/reagent_containers/food/snacks/sushi_Ikura name = "ikura sushi" @@ -150,16 +166,18 @@ icon_state = "sushi_Ikura" bitesize = 3 list_reagents = list("nutriment" = 2, "protein" = 1) + tastes = list("salmon roe" = 1, "rice" = 1, "seaweed" = 1) /obj/item/reagent_containers/food/snacks/sliceable/Sake_maki name = "sake makiroll" - desc = "A large unsliced roll of Ebi Sushi." + desc = "A large unsliced roll of Sake Sushi." icon = 'icons/obj/food/seafood.dmi' icon_state = "Sake_maki" slice_path = /obj/item/reagent_containers/food/snacks/sushi_Sake slices_num = 4 bitesize = 3 list_reagents = list("nutriment" = 8) + tastes = list("raw salmon" = 1, "rice" = 1, "seaweed" = 1) /obj/item/reagent_containers/food/snacks/sushi_Sake name = "sake sushi" @@ -168,6 +186,7 @@ icon_state = "sushi_Sake" bitesize = 3 list_reagents = list("nutriment" = 2) + tastes = list("raw salmon" = 1, "rice" = 1, "seaweed" = 1) /obj/item/reagent_containers/food/snacks/sliceable/SmokedSalmon_maki name = "smoked salmon makiroll" @@ -178,6 +197,7 @@ slices_num = 4 bitesize = 3 list_reagents = list("nutriment" = 8) + tastes = list("smoked salmon" = 1, "rice" = 1, "seaweed" = 1)) /obj/item/reagent_containers/food/snacks/sushi_SmokedSalmon name = "smoked salmon sushi" @@ -186,6 +206,7 @@ icon_state = "sushi_SmokedSalmon" bitesize = 3 list_reagents = list("nutriment" = 2) + tastes = list("smoked salmon" = 1, "rice" = 1, "seaweed" = 1) /obj/item/reagent_containers/food/snacks/sliceable/Tamago_maki name = "tamago makiroll" @@ -196,6 +217,7 @@ slices_num = 4 bitesize = 3 list_reagents = list("nutriment" = 8) + tastes = list("egg" = 1, "rice" = 1, "seaweed" = 1) /obj/item/reagent_containers/food/snacks/sushi_Tamago name = "tamago sushi" @@ -204,6 +226,7 @@ icon_state = "sushi_Tamago" bitesize = 3 list_reagents = list("nutriment" = 2) + tastes = list("egg" = 1, "rice" = 1, "seaweed" = 1) /obj/item/reagent_containers/food/snacks/sliceable/Inari_maki name = "inari makiroll" @@ -214,6 +237,7 @@ slices_num = 4 bitesize = 3 list_reagents = list("nutriment" = 8) + tastes = list("fried tofu" = 1, "rice" = 1, "seaweed" = 1) /obj/item/reagent_containers/food/snacks/sushi_Inari name = "inari sushi" @@ -222,6 +246,7 @@ icon_state = "sushi_Inari" bitesize = 3 list_reagents = list("nutriment" = 2) + tastes = list("fried tofu" = 1, "rice" = 1, "seaweed" = 1) /obj/item/reagent_containers/food/snacks/sliceable/Masago_maki name = "masago makiroll" @@ -232,6 +257,7 @@ slices_num = 4 bitesize = 3 list_reagents = list("nutriment" = 8, "protein" = 4) + tastes = list("goldfish roe" = 1, "rice" = 1, "seaweed" = 1) /obj/item/reagent_containers/food/snacks/sushi_Masago name = "masago sushi" @@ -240,6 +266,7 @@ icon_state = "sushi_Masago" bitesize = 3 list_reagents = list("nutriment" = 2, "protein" = 1) + tastes = list("goldfish roe" = 1, "rice" = 1, "seaweed" = 1) /obj/item/reagent_containers/food/snacks/sliceable/Tobiko_maki name = "tobiko makiroll" @@ -250,6 +277,7 @@ slices_num = 4 bitesize = 3 list_reagents = list("nutriment" = 8, "protein" = 4) + tastes = list("shark roe" = 1, "rice" = 1, "seaweed" = 1) /obj/item/reagent_containers/food/snacks/sushi_Tobiko name = "tobiko sushi" @@ -258,6 +286,7 @@ icon_state = "sushi_Masago" bitesize = 3 list_reagents = list("nutriment" = 2, "protein" = 1) + tastes = list("shark roe" = 1, "rice" = 1, "seaweed" = 1) /obj/item/reagent_containers/food/snacks/sliceable/TobikoEgg_maki name = "tobiko and egg makiroll" @@ -268,6 +297,7 @@ slices_num = 4 bitesize = 3 list_reagents = list("nutriment" = 8, "protein" = 4) + tastes = list("shark roe" = 1, "rice" = 1, "egg" = 1, "seaweed" = 1) /obj/item/reagent_containers/food/snacks/sushi_TobikoEgg name = "tobiko and egg sushi" @@ -276,6 +306,7 @@ icon_state = "sushi_TobikoEgg" bitesize = 3 list_reagents = list("nutriment" = 2, "protein" = 1) + tastes = list("shark roe" = 1, "rice" = 1, "egg" = 1, "seaweed" = 1) /obj/item/reagent_containers/food/snacks/sliceable/Tai_maki name = "tai makiroll" @@ -286,6 +317,7 @@ slices_num = 4 bitesize = 3 list_reagents = list("nutriment" = 8) + tastes = list("catfish" = 1, "rice" = 1, "seaweed" = 1) /obj/item/reagent_containers/food/snacks/sushi_Tai name = "tai sushi" @@ -294,6 +326,7 @@ icon_state = "sushi_Tai" bitesize = 3 list_reagents = list("nutriment" = 2) + tastes = list("catfish" = 1, "rice" = 1, "seaweed" = 1) /obj/item/reagent_containers/food/snacks/sushi_Unagi name = "unagi sushi" @@ -302,3 +335,4 @@ icon_state = "sushi_Hokki" bitesize = 3 list_reagents = list("nutriment" = 2) + tastes = list("grilled eel" = 1, "seaweed" = 1) diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index f02a8400bb4..e03ee49f6cb 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -785,7 +785,7 @@ var/const/INGEST = 2 trans_data["viruses"] = temp return trans_data -/datum/reagents/proc/generate_taste_message(minimum_percent=15) +/datum/reagents/proc/generate_0(minimum_percent=15) // the lower the minimum percent, the more sensitive the message is. var/list/out = list() var/list/tastes = list() //descriptor = strength