From 58e5aa91daa6294323cd453b6eb6d630f07a8724 Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Wed, 19 Jul 2017 11:11:13 +0200 Subject: [PATCH 01/27] adds the food types --- code/modules/food_and_drinks/food.dm | 3 +- .../food_and_drinks/food/customizables.dm | 9 +++- code/modules/food_and_drinks/food/snacks.dm | 11 +++- .../food_and_drinks/food/snacks/dough.dm | 11 +++- .../food_and_drinks/food/snacks/meat.dm | 36 +++++++++++++ .../food_and_drinks/food/snacks_bread.dm | 20 +++++++ .../food_and_drinks/food/snacks_burgers.dm | 31 +++++++++++ .../food_and_drinks/food/snacks_cake.dm | 28 ++++++++++ .../food_and_drinks/food/snacks_egg.dm | 6 +++ .../food_and_drinks/food/snacks_meat.dm | 24 +++++++++ .../food_and_drinks/food/snacks_other.dm | 53 ++++++++++++++++++- .../food_and_drinks/food/snacks_pastry.dm | 33 ++++++++++++ .../food_and_drinks/food/snacks_pie.dm | 22 ++++++++ .../food_and_drinks/food/snacks_pizza.dm | 17 ++++++ .../food_and_drinks/food/snacks_salad.dm | 13 +++++ .../food/snacks_sandwichtoast.dm | 12 +++++ .../food_and_drinks/food/snacks_soup.dm | 22 ++++++++ .../food_and_drinks/food/snacks_spaghetti.dm | 9 ++++ .../food_and_drinks/food/snacks_vend.dm | 8 +++ .../kitchen_machinery/deep_fryer.dm | 1 + .../kitchen_machinery/icecream_vat.dm | 1 + .../recipes/tablecraft/recipes_burger.dm | 2 +- code/modules/hydroponics/grown/ambrosia.dm | 1 + code/modules/hydroponics/grown/apple.dm | 2 + code/modules/hydroponics/grown/banana.dm | 1 + code/modules/hydroponics/grown/beans.dm | 4 +- code/modules/hydroponics/grown/berries.dm | 7 +++ code/modules/hydroponics/grown/cannabis.dm | 1 + code/modules/hydroponics/grown/cereals.dm | 4 ++ code/modules/hydroponics/grown/chili.dm | 3 ++ code/modules/hydroponics/grown/citrus.dm | 2 + .../hydroponics/grown/cocoa_vanilla.dm | 4 +- code/modules/hydroponics/grown/corn.dm | 3 +- code/modules/hydroponics/grown/eggplant.dm | 4 +- code/modules/hydroponics/grown/flowers.dm | 1 + code/modules/hydroponics/grown/kudzu.dm | 3 +- code/modules/hydroponics/grown/melon.dm | 1 + code/modules/hydroponics/grown/misc.dm | 3 ++ code/modules/hydroponics/grown/mushrooms.dm | 4 +- code/modules/hydroponics/grown/potato.dm | 3 +- code/modules/hydroponics/grown/pumpkin.dm | 2 + code/modules/hydroponics/grown/root.dm | 4 ++ code/modules/hydroponics/grown/tomato.dm | 3 +- 43 files changed, 417 insertions(+), 15 deletions(-) diff --git a/code/modules/food_and_drinks/food.dm b/code/modules/food_and_drinks/food.dm index 9d39e51e632..98fbdc436fb 100644 --- a/code/modules/food_and_drinks/food.dm +++ b/code/modules/food_and_drinks/food.dm @@ -6,8 +6,9 @@ volume = 50 //Sets the default container amount for all food items. container_type = INJECTABLE resistance_flags = FLAMMABLE + var/foodtype /obj/item/weapon/reagent_containers/food/New() ..() pixel_x = rand(-5, 5) //Randomizes postion slightly. - pixel_y = rand(-5, 5) \ No newline at end of file + pixel_y = rand(-5, 5) diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm index f2047ac092a..40b1833f71d 100644 --- a/code/modules/food_and_drinks/food/customizables.dm +++ b/code/modules/food_and_drinks/food/customizables.dm @@ -53,6 +53,7 @@ ingredients += S mix_filling_color(S) S.reagents.trans_to(src,min(S.reagents.total_volume, 15)) //limit of 15, we don't want our custom food to be completely filled by just one ingredient with large reagent volume. + src.foodtype |= S.foodtype update_overlays(S) to_chat(user, "You add the [I.name] to the [name].") update_name(S) @@ -158,6 +159,7 @@ ingredients_placement = INGREDIENTS_STACKPLUSTOP icon = 'icons/obj/food/burgerbread.dmi' icon_state = "bun" + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/customizable/bread @@ -167,6 +169,7 @@ slices_num = 5 icon = 'icons/obj/food/burgerbread.dmi' icon_state = "tofubread" + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/customizable/cake @@ -176,6 +179,7 @@ slices_num = 5 icon = 'icons/obj/food/piecake.dmi' icon_state = "plaincake" + foodtype = GRAIN | DAIRY /obj/item/weapon/reagent_containers/food/snacks/customizable/kebab @@ -187,7 +191,6 @@ ingMax = 6 icon_state = "rod" - /obj/item/weapon/reagent_containers/food/snacks/customizable/pasta name = "spaghetti" desc = "Noodles. With stuff. Delicious." @@ -195,6 +198,7 @@ ingMax = 6 icon = 'icons/obj/food/pizzaspaghetti.dmi' icon_state = "spaghettiboiled" + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/customizable/pie @@ -202,6 +206,7 @@ ingMax = 6 icon = 'icons/obj/food/piecake.dmi' icon_state = "pie" + foodtype = GRAIN | DAIRY /obj/item/weapon/reagent_containers/food/snacks/customizable/pizza @@ -213,6 +218,7 @@ slices_num = 6 icon = 'icons/obj/food/pizzaspaghetti.dmi' icon_state = "pizzamargherita" + foodtype = GRAIN | DAIRY /obj/item/weapon/reagent_containers/food/snacks/customizable/salad @@ -231,6 +237,7 @@ icon = 'icons/obj/food/burgerbread.dmi' icon_state = "breadslice" var/finished = 0 + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/customizable/sandwich/initialize_custom_food(obj/item/weapon/reagent_containers/BASE, obj/item/I, mob/user) icon_state = BASE.icon_state diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index 25b7b991445..0d9ad07c48c 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -68,7 +68,6 @@ if(junkiness && M.satiety < -150 && M.nutrition > NUTRITION_LEVEL_STARVING + 50 ) to_chat(M, "You don't feel like eating any more junk food at the moment.") return 0 - else if(fullness <= 50) to_chat(M, "You hungrily [eatverb] some of \the [src] and gobble it down!") else if(fullness > 50 && fullness < 150) @@ -104,8 +103,16 @@ if(M.satiety > -200) M.satiety -= junkiness playsound(M.loc,'sound/items/eatfood.ogg', rand(10,50), 1) + var/fraction = min(bitesize / reagents.total_volume, 1) + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(foodtype & H.dna.species.toxic_food) + M << "What the hell was that thing?!" + M.adjust_disgust(25 + 30 * fraction) + else if(foodtype & H.dna.species.disliked_food) + M << "That didn't taste very good..." + M.adjust_disgust(11 + 15 * fraction) if(reagents.total_volume) - var/fraction = min(bitesize/reagents.total_volume, 1) reagents.reaction(M, INGEST, fraction) reagents.trans_to(M, bitesize) bitecount++ diff --git a/code/modules/food_and_drinks/food/snacks/dough.dm b/code/modules/food_and_drinks/food/snacks/dough.dm index 73e99c9d1de..59a9f972efb 100644 --- a/code/modules/food_and_drinks/food/snacks/dough.dm +++ b/code/modules/food_and_drinks/food/snacks/dough.dm @@ -11,6 +11,8 @@ list_reagents = list("nutriment" = 6) w_class = WEIGHT_CLASS_NORMAL tastes = list("dough" = 1) + w_class = 3 + foodtype = GRAIN // Dough + rolling pin = flat dough @@ -38,6 +40,7 @@ list_reagents = list("nutriment" = 6) w_class = WEIGHT_CLASS_NORMAL tastes = list("dough" = 1) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/pizzabread name = "pizza bread" @@ -48,6 +51,7 @@ list_reagents = list("nutriment" = 7) w_class = WEIGHT_CLASS_NORMAL tastes = list("bread" = 1) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/doughslice @@ -58,6 +62,7 @@ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/bun filling_color = "#CD853F" tastes = list("dough" = 1) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/bun @@ -69,6 +74,7 @@ custom_food_type = /obj/item/weapon/reagent_containers/food/snacks/customizable/burger filling_color = "#CD853F" tastes = list("bun" = 1) // the bun tastes of bun. + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/cakebatter name = "cake batter" @@ -79,6 +85,7 @@ list_reagents = list("nutriment" = 9) w_class = WEIGHT_CLASS_NORMAL tastes = list("batter" = 1) + foodtype = GRAIN | DAIRY // Cake batter + rolling pin = pie dough /obj/item/weapon/reagent_containers/food/snacks/cakebatter/attackby(obj/item/I, mob/user, params) @@ -103,6 +110,7 @@ list_reagents = list("nutriment" = 9) w_class = WEIGHT_CLASS_NORMAL tastes = list("dough" = 1) + foodtype = GRAIN | DAIRY /obj/item/weapon/reagent_containers/food/snacks/rawpastrybase name = "raw pastry base" @@ -113,6 +121,7 @@ filling_color = "#CD853F" list_reagents = list("nutriment" = 1) tastes = list("raw pastry" = 1) + foodtype = GRAIN | DAIRY /obj/item/weapon/reagent_containers/food/snacks/pastrybase name = "pastry base" @@ -122,4 +131,4 @@ list_reagents = list("nutriment" = 1) filling_color = "#CD853F" tastes = list("pastry" = 1) - + foodtype = GRAIN | DAIRY diff --git a/code/modules/food_and_drinks/food/snacks/meat.dm b/code/modules/food_and_drinks/food/snacks/meat.dm index c1b5a55ac06..78d5ab9ac90 100644 --- a/code/modules/food_and_drinks/food/snacks/meat.dm +++ b/code/modules/food_and_drinks/food/snacks/meat.dm @@ -14,6 +14,7 @@ slices_num = 3 filling_color = "#FF0000" tastes = list("meat" = 1) + foodtype = MEAT | RAW /obj/item/weapon/reagent_containers/food/snacks/meat/slab/initialize_slice(obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/slice, reagents_per_slice) ..() @@ -36,6 +37,7 @@ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain/human slice_path = /obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/plain/human tastes = list("tender meat" = 1) + foodtype = MEAT | RAW | GROSS /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/initialize_slice(obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/plain/human/slice, reagents_per_slice) ..() @@ -62,6 +64,7 @@ list_reagents = list("nutriment" = 3, "slimejelly" = 3) filling_color = "#00FFFF" tastes = list("slime" = 1, "jelly" = 1) + foodtype = MEAT | RAW | TOXIC /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/golem icon_state = "golemmeat" @@ -69,35 +72,41 @@ list_reagents = list("nutriment" = 3, "iron" = 3) filling_color = "#A9A9A9" tastes = list("rock" = 1) + foodtype = MEAT | RAW | GROSS /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/golem/adamantine icon_state = "agolemmeat" desc = "From the slime pen to the rune to the kitchen, science." filling_color = "#66CDAA" + foodtype = MEAT | RAW | GROSS /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard icon_state = "lizardmeat" desc = "Delicious dino damage" filling_color = "#6B8E23" tastes = list("meat" = 4, "scales" = 1) + foodtype = MEAT | RAW /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/plant icon_state = "plantmeat" desc = "All the joys of healthy eating with all the fun of cannibalism." filling_color = "#E9967A" tastes = list("salad" = 1, "wood" = 1) + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/shadow icon_state = "shadowmeat" desc = "Ow, the edge" filling_color = "#202020" tastes = list("darkness" = 1, "meat" = 1) + foodtype = MEAT | RAW /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/fly icon_state = "flymeat" desc = "Nothing says tasty like maggot filled radioactive mutant flesh." list_reagents = list("nutriment" = 3, "uranium" = 3) tastes = list("maggots" = 1, "the inside of a reactor" = 1) + foodtype = MEAT | RAW | GROSS /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton name = "-bone" @@ -106,6 +115,7 @@ filling_color = "#F0F0F0" tastes = list("bone" = 1) slice_path = null //can't slice a bone into cutlets + foodtype = GROSS /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/zombie name = " meat (rotten)" @@ -113,6 +123,7 @@ desc = "Halfway to becoming fertilizer for your garden." filling_color = "#6B8E23" tastes = list("brains" = 1, "meat" = 1) + foodtype = RAW | MEAT | TOXIC @@ -122,22 +133,27 @@ /obj/item/weapon/reagent_containers/food/snacks/meat/slab/synthmeat name = "synthmeat" desc = "A synthetic slab of meat." + foodtype = RAW | MEAT //hurr durr chemicals we're harmed in the production of this meat thus its non-vegan. /obj/item/weapon/reagent_containers/food/snacks/meat/slab/meatproduct name = "meat product" desc = "A slab of station reclaimed and chemically processed meat product." + foodtype = RAW | MEAT /obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey name = "monkey meat" + foodtype = RAW | MEAT /obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi name = "corgi meat" desc = "Tastes like... well you know..." tastes = list("meat" = 4, "a fondness for wearing hats" = 1) + foodtype = RAW | MEAT | GROSS /obj/item/weapon/reagent_containers/food/snacks/meat/slab/pug name = "pug meat" desc = "Tastes like... well you know..." + foodtype = RAW | MEAT | GROSS /obj/item/weapon/reagent_containers/food/snacks/meat/slab/killertomato name = "killer tomato meat" @@ -148,6 +164,7 @@ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/steak/killertomato slice_path = /obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/killertomato tastes = list("tomato" = 1) + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/meat/slab/bear name = "bear meat" @@ -158,6 +175,7 @@ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/steak/bear slice_path = /obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/bear tastes = list("meat" = 1, "salmon" = 1) + foodtype = RAW | MEAT /obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno @@ -170,6 +188,7 @@ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/steak/xeno slice_path = /obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/xeno tastes = list("meat" = 1, "acid" = 1) + foodtype = RAW | MEAT /obj/item/weapon/reagent_containers/food/snacks/meat/slab/spider name = "spider meat" @@ -180,6 +199,7 @@ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/steak/spider slice_path = /obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/spider tastes = list("cobwebs" = 1) + foodtype = RAW | MEAT | TOXIC /obj/item/weapon/reagent_containers/food/snacks/meat/slab/goliath @@ -188,6 +208,7 @@ list_reagents = list("nutriment" = 3, "toxin" = 5) icon_state = "goliathmeat" tastes = list("meat" = 1) + foodtype = RAW | MEAT | TOXIC /obj/item/weapon/reagent_containers/food/snacks/meat/slab/goliath/burn() visible_message("[src] finishes cooking!") @@ -202,6 +223,7 @@ icon_state = "meatwheat_clump" bitesize = 4 tastes = list("meat" = 1, "wheat" = 1) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/meat/rawbacon name = "raw piece of bacon" @@ -212,6 +234,7 @@ list_reagents = list("nutriment" = 1) filling_color = "#B22222" tastes = list("bacon" = 1) + foodtype = RAW | MEAT /obj/item/weapon/reagent_containers/food/snacks/meat/bacon name = "piece of bacon" @@ -221,6 +244,7 @@ bonus_reagents = list("nutriment" = 1, "vitamin" = 1) filling_color = "#854817" tastes = list("bacon" = 1) + foodtype = MEAT ////////////////////////////////////// MEAT STEAKS /////////////////////////////////////////////////////////// @@ -233,16 +257,20 @@ bonus_reagents = list("nutriment" = 2, "vitamin" = 1) trash = /obj/item/trash/plate filling_color = "#B22222" + foodtype = MEAT tastes = list("meat" = 1) /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain + foodtype = MEAT /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain/human tastes = list("tender meat" = 1) + foodtype = MEAT | GROSS /obj/item/weapon/reagent_containers/food/snacks/meat/steak/killertomato name = "killer tomato steak" tastes = list("tomato" = 1) + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/meat/steak/bear name = "bear steak" @@ -263,6 +291,7 @@ icon_state = "goliathsteak" trash = null tastes = list("meat" = 1, "rock" = 1) + foodtype = MEAT //////////////////////////////// MEAT CUTLETS /////////////////////////////////////////////////////// @@ -278,6 +307,7 @@ filling_color = "#B22222" tastes = list("meat" = 1) var/meat_type = "meat" + foodtype = MEAT | RAW /obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/initialize_cooked_food(obj/item/weapon/reagent_containers/food/snacks/S, cooking_efficiency) ..() @@ -285,10 +315,12 @@ /obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/plain + foodtype = MEAT /obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/plain/human cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/plain/human tastes = list("tender meat" = 1) + foodtype = MEAT | RAW | GROSS /obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/plain/human/initialize_cooked_food(obj/item/weapon/reagent_containers/food/snacks/S, cooking_efficiency) ..() @@ -301,6 +333,7 @@ name = "raw killer tomato cutlet" cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/killertomato tastes = list("tomato" = 1) + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/bear name = "raw bear cutlet" @@ -328,15 +361,18 @@ bonus_reagents = list("nutriment" = 1, "vitamin" = 1) filling_color = "#B22222" tastes = list("meat" = 1) + foodtype = MEAT /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/plain /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/plain/human tastes = list("tender meat" = 1) + foodtype = MEAT | GROSS /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/killertomato name = "killer tomato cutlet" tastes = list("tomato" = 1) + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/bear name = "bear cutlet" diff --git a/code/modules/food_and_drinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/snacks_bread.dm index b76b896803f..16d11c5f293 100644 --- a/code/modules/food_and_drinks/food/snacks_bread.dm +++ b/code/modules/food_and_drinks/food/snacks_bread.dm @@ -4,6 +4,7 @@ volume = 80 slices_num = 5 tastes = list("bread" = 10) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/breadslice @@ -14,6 +15,7 @@ list_reagents = list("nutriment" = 2) slot_flags = SLOT_HEAD customfoodfilling = 0 //to avoid infinite bread-ception + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/store/bread/plain name = "bread" @@ -24,12 +26,14 @@ custom_food_type = /obj/item/weapon/reagent_containers/food/snacks/customizable/bread slice_path = /obj/item/weapon/reagent_containers/food/snacks/breadslice/plain tastes = list("bread" = 10) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/breadslice/plain name = "bread slice" desc = "A slice of home." icon_state = "breadslice" customfoodfilling = 1 + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/store/bread/meat name = "meatbread loaf" @@ -39,11 +43,13 @@ bonus_reagents = list("nutriment" = 5, "vitamin" = 10) list_reagents = list("nutriment" = 30, "vitamin" = 5) tastes = list("bread" = 10, "meat" = 10) + foodtype = GRAIN | MEAT /obj/item/weapon/reagent_containers/food/snacks/breadslice/meat name = "meatbread slice" desc = "A slice of delicious meatbread." icon_state = "meatbreadslice" + foodtype = GRAIN | MEAT /obj/item/weapon/reagent_containers/food/snacks/store/bread/xenomeat name = "xenomeatbread loaf" @@ -53,6 +59,7 @@ bonus_reagents = list("nutriment" = 5, "vitamin" = 10) list_reagents = list("nutriment" = 30, "vitamin" = 5) tastes = list("bread" = 10, "acid" = 10) + foodtype = GRAIN | MEAT /obj/item/weapon/reagent_containers/food/snacks/breadslice/xenomeat name = "xenomeatbread slice" @@ -60,6 +67,7 @@ icon_state = "xenobreadslice" filling_color = "#32CD32" list_reagents = list("nutriment" = 6, "vitamin" = 1) + foodtype = GRAIN | MEAT /obj/item/weapon/reagent_containers/food/snacks/store/bread/spidermeat name = "spider meat loaf" @@ -69,6 +77,7 @@ bonus_reagents = list("nutriment" = 5, "vitamin" = 10) list_reagents = list("nutriment" = 30, "toxin" = 15, "vitamin" = 5) tastes = list("bread" = 10, "cobwebs" = 5) + foodtype = GRAIN | MEAT | TOXIC /obj/item/weapon/reagent_containers/food/snacks/breadslice/spidermeat name = "spider meat bread slice" @@ -76,6 +85,7 @@ icon_state = "xenobreadslice" filling_color = "#7CFC00" list_reagents = list("nutriment" = 6, "toxin" = 3, "vitamin" = 1) + foodtype = GRAIN | MEAT | TOXIC /obj/item/weapon/reagent_containers/food/snacks/store/bread/banana name = "banana-nut bread" @@ -85,6 +95,7 @@ bonus_reagents = list("nutriment" = 5, "banana" = 20) list_reagents = list("nutriment" = 20, "banana" = 20) tastes = list("bread" = 10) // bananjuice will also flavour + foodtype = GRAIN | FRUIT /obj/item/weapon/reagent_containers/food/snacks/breadslice/banana @@ -93,6 +104,7 @@ icon_state = "bananabreadslice" filling_color = "#FFD700" list_reagents = list("nutriment" = 4, "banana" = 4) + foodtype = GRAIN | FRUIT /obj/item/weapon/reagent_containers/food/snacks/store/bread/tofu name = "Tofubread" @@ -102,6 +114,7 @@ bonus_reagents = list("nutriment" = 5, "vitamin" = 10) list_reagents = list("nutriment" = 20, "vitamin" = 5) tastes = list("bread" = 10, "tofu" = 10) + foodtype = GRAIN | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/breadslice/tofu name = "tofubread slice" @@ -109,6 +122,7 @@ icon_state = "tofubreadslice" filling_color = "#FF8C00" list_reagents = list("nutriment" = 4, "vitamin" = 1) + foodtype = GRAIN | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/store/bread/creamcheese name = "cream cheese bread" @@ -118,6 +132,7 @@ bonus_reagents = list("nutriment" = 5, "vitamin" = 5) list_reagents = list("nutriment" = 20, "vitamin" = 5) tastes = list("bread" = 10, "cheese" = 10) + foodtype = GRAIN | DAIRY /obj/item/weapon/reagent_containers/food/snacks/breadslice/creamcheese name = "cream cheese bread slice" @@ -125,6 +140,7 @@ icon_state = "creamcheesebreadslice" filling_color = "#FF8C00" list_reagents = list("nutriment" = 4, "vitamin" = 1) + foodtype = GRAIN | DAIRY /obj/item/weapon/reagent_containers/food/snacks/store/bread/mimana name = "mimana bread" @@ -134,6 +150,7 @@ bonus_reagents = list("nutriment" = 5, "vitamin" = 5) list_reagents = list("nutriment" = 20, "mutetoxin" = 5, "nothing" = 5, "vitamin" = 5) tastes = list("bread" = 10, "silence" = 10) + foodtype = GRAIN | FRUIT /obj/item/weapon/reagent_containers/food/snacks/breadslice/mimana name = "mimana bread slice" @@ -141,11 +158,13 @@ icon_state = "mimanabreadslice" filling_color = "#C0C0C0" list_reagents = list("nutriment" = 2, "mutetoxin" = 1, "nothing" = 1, "vitamin" = 1) + foodtype = GRAIN | FRUIT /obj/item/weapon/reagent_containers/food/snacks/breadslice/custom name = "bread slice" icon_state = "tofubreadslice" filling_color = "#FFFFFF" + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/baguette name = "baguette" @@ -157,6 +176,7 @@ bitesize = 3 w_class = WEIGHT_CLASS_NORMAL tastes = list("bread" = 1) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/deepfryholder name = "Deep Fried Foods Holder Obj" diff --git a/code/modules/food_and_drinks/food/snacks_burgers.dm b/code/modules/food_and_drinks/food/snacks_burgers.dm index 16e96435d25..5c1f3b0da3c 100644 --- a/code/modules/food_and_drinks/food/snacks_burgers.dm +++ b/code/modules/food_and_drinks/food/snacks_burgers.dm @@ -5,11 +5,13 @@ bitesize = 3 list_reagents = list("nutriment" = 6, "vitamin" = 1) tastes = list("bun" = 4) + foodtype = GRAIN | MEAT /obj/item/weapon/reagent_containers/food/snacks/burger/plain name = "burger" desc = "The cornerstone of every nutritious breakfast." bonus_reagents = list("vitamin" = 1) + foodtype = GRAIN | MEAT /obj/item/weapon/reagent_containers/food/snacks/burger/human var/subjectname = "" @@ -17,6 +19,7 @@ name = "human burger" desc = "A bloody burger." bonus_reagents = list("vitamin" = 4) + foodtype = MEAT | GRAIN | GROSS /obj/item/weapon/reagent_containers/food/snacks/burger/human/CheckParts(list/parts_list) ..() @@ -35,6 +38,7 @@ name = "corgi burger" desc = "You monster." bonus_reagents = list("vitamin" = 1) + foodtype = GRAIN | MEAT | GROSS /obj/item/weapon/reagent_containers/food/snacks/burger/appendix name = "appendix burger" @@ -42,6 +46,7 @@ bonus_reagents = list("nutriment" = 6, "vitamin" = 6) icon_state = "appendixburger" tastes = list("bun" = 4, "grass" = 2) + foodtype = GRAIN | MEAT | GROSS /obj/item/weapon/reagent_containers/food/snacks/burger/fish name = "fillet -o- carp sandwich" @@ -49,6 +54,7 @@ icon_state = "fishburger" bonus_reagents = list("nutriment" = 2, "vitamin" = 3) tastes = list("bun" = 4, "fish" = 4) + foodtype = GRAIN | MEAT /obj/item/weapon/reagent_containers/food/snacks/burger/tofu name = "tofu burger" @@ -56,6 +62,7 @@ icon_state = "tofuburger" bonus_reagents = list("nutriment" = 2, "vitamin" = 2) tastes = list("bun" = 4, "tofu" = 4) + foodtype = GRAIN | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/burger/roburger name = "roburger" @@ -64,6 +71,7 @@ bonus_reagents = list("nutriment" = 2, "nanomachines" = 2, "vitamin" = 5) list_reagents = list("nutriment" = 6, "nanomachines" = 5, "vitamin" = 1) tastes = list("bun" = 4, "lettuce" = 2, "sludge" = 1) + foodtype = GRAIN | TOXIC /obj/item/weapon/reagent_containers/food/snacks/burger/roburgerbig name = "roburger" @@ -73,6 +81,7 @@ bonus_reagents = list("nutriment" = 5, "nanomachines" = 70, "vitamin" = 10) list_reagents = list("nutriment" = 6, "nanomachines" = 70, "vitamin" = 5) tastes = list("bun" = 4, "lettuce" = 2, "sludge" = 1) + foodtype = GRAIN | TOXIC /obj/item/weapon/reagent_containers/food/snacks/burger/xeno name = "xenoburger" @@ -80,24 +89,28 @@ icon_state = "xburger" bonus_reagents = list("nutriment" = 2, "vitamin" = 6) tastes = list("bun" = 4, "acid" = 4) + foodtype = GRAIN | MEAT /obj/item/weapon/reagent_containers/food/snacks/burger/bearger name = "bearger" desc = "Best served rawr." icon_state = "bearger" bonus_reagents = list("nutriment" = 3, "vitamin" = 6) + foodtype = GRAIN | MEAT /obj/item/weapon/reagent_containers/food/snacks/burger/clown name = "clown burger" desc = "This tastes funny..." icon_state = "clownburger" bonus_reagents = list("nutriment" = 4, "vitamin" = 6, "banana" = 6) + foodtype = GRAIN | FRUIT /obj/item/weapon/reagent_containers/food/snacks/burger/mime name = "mime burger" desc = "Its taste defies language." icon_state = "mimeburger" bonus_reagents = list("nutriment" = 4, "vitamin" = 6, "nothing" = 6) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/burger/brain name = "brainburger" @@ -106,6 +119,7 @@ bonus_reagents = list("nutriment" = 6, "mannitol" = 6, "vitamin" = 5) list_reagents = list("nutriment" = 6, "mannitol" = 5, "vitamin" = 1) tastes = list("bun" = 4, "brains" = 2) + foodtype = GRAIN | MEAT | GROSS /obj/item/weapon/reagent_containers/food/snacks/burger/ghost name = "ghost burger" @@ -113,6 +127,7 @@ alpha = 125 bonus_reagents = list("nutriment" = 5, "vitamin" = 12) tastes = list("bun" = 4, "ectoplasm" = 2) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/burger/red name = "red burger" @@ -120,6 +135,7 @@ icon_state = "cburger" color = "#DA0000FF" bonus_reagents = list("redcrayonpowder" = 10, "vitamin" = 5) + foodtype = GRAIN | MEAT /obj/item/weapon/reagent_containers/food/snacks/burger/orange name = "orange burger" @@ -127,6 +143,7 @@ icon_state = "cburger" color = "#FF9300FF" bonus_reagents = list("orangecrayonpowder" = 10, "vitamin" = 5) + foodtype = GRAIN | MEAT /obj/item/weapon/reagent_containers/food/snacks/burger/yellow name = "yellow burger" @@ -134,6 +151,7 @@ icon_state = "cburger" color = "#FFF200FF" bonus_reagents = list("yellowcrayonpowder" = 10, "vitamin" = 5) + foodtype = GRAIN | MEAT /obj/item/weapon/reagent_containers/food/snacks/burger/green name = "green burger" @@ -141,6 +159,7 @@ icon_state = "cburger" color = "#A8E61DFF" bonus_reagents = list("greencrayonpowder" = 10, "vitamin" = 5) + foodtype = GRAIN | MEAT /obj/item/weapon/reagent_containers/food/snacks/burger/blue name = "blue burger" @@ -148,6 +167,7 @@ icon_state = "cburger" color = "#00B7EFFF" bonus_reagents = list("bluecrayonpowder" = 10, "vitamin" = 5) + foodtype = GRAIN | MEAT /obj/item/weapon/reagent_containers/food/snacks/burger/purple name = "purple burger" @@ -155,6 +175,7 @@ icon_state = "cburger" color = "#DA00FFFF" bonus_reagents = list("purplecrayonpowder" = 10, "vitamin" = 5) + foodtype = GRAIN | MEAT /obj/item/weapon/reagent_containers/food/snacks/burger/spell name = "spell burger" @@ -162,6 +183,7 @@ icon_state = "spellburger" bonus_reagents = list("nutriment" = 6, "vitamin" = 10) tastes = list("bun" = 4, "magic" = 2) + foodtype = GRAIN | MEAT /obj/item/weapon/reagent_containers/food/snacks/burger/bigbite name = "big bite burger" @@ -170,20 +192,24 @@ bonus_reagents = list("vitamin" = 6) list_reagents = list("nutriment" = 10, "vitamin" = 2) w_class = WEIGHT_CLASS_NORMAL + foodtype = GRAIN | MEAT /obj/item/weapon/reagent_containers/food/snacks/burger/jelly name = "jelly burger" desc = "Culinary delight..?" icon_state = "jellyburger" tastes = list("bun" = 4, "jelly" = 2) + foodtype = GRAIN | MEAT /obj/item/weapon/reagent_containers/food/snacks/burger/jelly/slime bonus_reagents = list("slimejelly" = 5, "vitamin" = 5) list_reagents = list("nutriment" = 6, "slimejelly" = 5, "vitamin" = 1) + foodtype = GRAIN | TOXIC /obj/item/weapon/reagent_containers/food/snacks/burger/jelly/cherry bonus_reagents = list("cherryjelly" = 5, "vitamin" = 5) list_reagents = list("nutriment" = 6, "cherryjelly" = 5, "vitamin" = 1) + foodtype = GRAIN | FRUIT /obj/item/weapon/reagent_containers/food/snacks/burger/superbite name = "super bite burger" @@ -195,6 +221,7 @@ bitesize = 7 volume = 100 tastes = list("bun" = 4, "type two diabetes" = 10) + foodtype = GRAIN | MEAT /obj/item/weapon/reagent_containers/food/snacks/burger/fivealarm name = "five alarm burger" @@ -202,18 +229,21 @@ icon_state = "fivealarmburger" bonus_reagents = list("nutriment" = 2, "vitamin" = 5) list_reagents = list("nutriment" = 6, "capsaicin" = 5, "condensedcapsaicin" = 5, "vitamin" = 1) + foodtype = GRAIN | MEAT /obj/item/weapon/reagent_containers/food/snacks/burger/rat name = "rat burger" desc = "Pretty much what you'd expect..." icon_state = "ratburger" bonus_reagents = list("nutriment" = 1, "vitamin" = 1) + foodtype = GRAIN | MEAT | GROSS /obj/item/weapon/reagent_containers/food/snacks/burger/baseball name = "home run baseball burger" desc = "It's still warm. The steam coming off of it looks like baseball." icon_state = "baseball" bonus_reagents = list("nutriment" = 1, "vitamin" = 1) + foodtype = GRAIN | GROSS /obj/item/weapon/reagent_containers/food/snacks/burger/baconburger name = "bacon burger" @@ -221,3 +251,4 @@ icon_state = "baconburger" bonus_reagents = list("nutriment" = 8, "vitamin" = 1) tastes = list("bun" = 4, "bacon" = 2) + foodtype = GRAIN | MEAT \ No newline at end of file diff --git a/code/modules/food_and_drinks/food/snacks_cake.dm b/code/modules/food_and_drinks/food/snacks_cake.dm index 2cac29be965..d4a3e710a8e 100644 --- a/code/modules/food_and_drinks/food/snacks_cake.dm +++ b/code/modules/food_and_drinks/food/snacks_cake.dm @@ -6,6 +6,7 @@ volume = 80 list_reagents = list("nutriment" = 20, "vitamin" = 5) tastes = list("cake" = 1) + foodtype = GRAIN | DAIRY /obj/item/weapon/reagent_containers/food/snacks/cakeslice icon = 'icons/obj/food/piecake.dmi' @@ -13,6 +14,7 @@ list_reagents = list("nutriment" = 4, "vitamin" = 1) customfoodfilling = 0 //to avoid infinite cake-ception tastes = list("cake" = 1) + foodtype = GRAIN | DAIRY /obj/item/weapon/reagent_containers/food/snacks/store/cake/plain name = "vanilla cake" @@ -21,6 +23,7 @@ custom_food_type = /obj/item/weapon/reagent_containers/food/snacks/customizable/cake bonus_reagents = list("nutriment" = 10, "vitamin" = 2) tastes = list("vanilla" = 1, "sweetness" = 2,"cake" = 5) + foodtype = GRAIN | DAIRY /obj/item/weapon/reagent_containers/food/snacks/cakeslice/plain name = "vanilla cake slice" @@ -29,6 +32,7 @@ filling_color = "#FFD700" customfoodfilling = 1 tastes = list("vanilla" = 1, "sweetness" = 2,"cake" = 5) + foodtype = GRAIN | DAIRY /obj/item/weapon/reagent_containers/food/snacks/store/cake/carrot name = "carrot cake" @@ -39,6 +43,7 @@ bonus_reagents = list("nutriment" = 3, "oculine" = 5, "vitamin" = 10) list_reagents = list("nutriment" = 20, "oculine" = 10, "vitamin" = 5) tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1) + foodtype = GRAIN | DAIRY | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/cakeslice/carrot name = "carrot cake slice" @@ -47,6 +52,7 @@ filling_color = "#FFA500" list_reagents = list("nutriment" = 4, "oculine" = 2, "vitamin" = 1) tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1) + foodtype = GRAIN | DAIRY | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/store/cake/brain @@ -58,6 +64,7 @@ bonus_reagents = list("nutriment" = 5, "mannitol" = 10, "vitamin" = 10) list_reagents = list("nutriment" = 20, "mannitol" = 10, "vitamin" = 5) tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1) + foodtype = GRAIN | DAIRY | MEAT | GROSS /obj/item/weapon/reagent_containers/food/snacks/cakeslice/brain @@ -67,6 +74,7 @@ filling_color = "#FF69B4" list_reagents = list("nutriment" = 4, "mannitol" = 2, "vitamin" = 1) tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1) + foodtype = GRAIN | DAIRY | MEAT | GROSS /obj/item/weapon/reagent_containers/food/snacks/store/cake/cheese name = "cheese cake" @@ -76,6 +84,7 @@ slices_num = 5 bonus_reagents = list("vitamin" = 10) tastes = list("cake" = 4, "cream cheese" = 3) + foodtype = GRAIN | DAIRY /obj/item/weapon/reagent_containers/food/snacks/cakeslice/cheese @@ -84,6 +93,7 @@ icon_state = "cheesecake_slice" filling_color = "#FFFACD" tastes = list("cake" = 4, "cream cheese" = 3) + foodtype = GRAIN | DAIRY /obj/item/weapon/reagent_containers/food/snacks/store/cake/orange @@ -94,6 +104,7 @@ slices_num = 5 bonus_reagents = list("nutriment" = 3, "vitamin" = 10) tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2) + foodtype = GRAIN | DAIRY | FRUIT /obj/item/weapon/reagent_containers/food/snacks/cakeslice/orange name = "orange cake slice" @@ -101,6 +112,7 @@ icon_state = "orangecake_slice" filling_color = "#FFA500" tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2) + foodtype = GRAIN | DAIRY | FRUIT /obj/item/weapon/reagent_containers/food/snacks/store/cake/lime name = "lime cake" @@ -110,6 +122,7 @@ slices_num = 5 bonus_reagents = list("nutriment" = 3, "vitamin" = 10) tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2) + foodtype = GRAIN | DAIRY | FRUIT /obj/item/weapon/reagent_containers/food/snacks/cakeslice/lime name = "lime cake slice" @@ -117,6 +130,7 @@ icon_state = "limecake_slice" filling_color = "#00FF00" tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2) + foodtype = GRAIN | DAIRY | FRUIT /obj/item/weapon/reagent_containers/food/snacks/store/cake/lemon @@ -127,6 +141,7 @@ slices_num = 5 bonus_reagents = list("nutriment" = 3, "vitamin" = 10) tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2) + foodtype = GRAIN | DAIRY | FRUIT /obj/item/weapon/reagent_containers/food/snacks/cakeslice/lemon @@ -135,6 +150,7 @@ icon_state = "lemoncake_slice" filling_color = "#FFEE00" tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2) + foodtype = GRAIN | DAIRY | FRUIT /obj/item/weapon/reagent_containers/food/snacks/store/cake/chocolate @@ -145,6 +161,7 @@ slices_num = 5 bonus_reagents = list("nutriment" = 3, "vitamin" = 10) tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4) + foodtype = GRAIN | DAIRY | JUNKFOOD /obj/item/weapon/reagent_containers/food/snacks/cakeslice/chocolate @@ -153,6 +170,7 @@ icon_state = "chocolatecake_slice" filling_color = "#A0522D" tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4) + foodtype = GRAIN | DAIRY | JUNKFOOD /obj/item/weapon/reagent_containers/food/snacks/store/cake/birthday @@ -164,6 +182,7 @@ bonus_reagents = list("nutriment" = 7, "sprinkles" = 10, "vitamin" = 5) list_reagents = list("nutriment" = 20, "sprinkles" = 10, "vitamin" = 5) tastes = list("cake" = 5, "sweetness" = 1) + foodtype = GRAIN | DAIRY | JUNKFOOD /obj/item/weapon/reagent_containers/food/snacks/cakeslice/birthday name = "birthday cake slice" @@ -172,6 +191,7 @@ filling_color = "#DC143C" list_reagents = list("nutriment" = 4, "sprinkles" = 2, "vitamin" = 1) tastes = list("cake" = 5, "sweetness" = 1) + foodtype = GRAIN | DAIRY | JUNKFOOD /obj/item/weapon/reagent_containers/food/snacks/store/cake/apple @@ -182,6 +202,7 @@ slices_num = 5 bonus_reagents = list("nutriment" = 3, "vitamin" = 10) tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1) + foodtype = GRAIN | DAIRY | FRUIT /obj/item/weapon/reagent_containers/food/snacks/cakeslice/apple name = "apple cake slice" @@ -189,11 +210,13 @@ icon_state = "applecakeslice" filling_color = "#FF4500" tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1) + foodtype = GRAIN | DAIRY | FRUIT /obj/item/weapon/reagent_containers/food/snacks/cakeslice/custom name = "cake slice" icon_state = "plaincake_slice" filling_color = "#FFFFFF" + foodtype = GRAIN | DAIRY /obj/item/weapon/reagent_containers/food/snacks/store/cake/slimecake name = "Slime cake" @@ -202,6 +225,7 @@ slice_path = /obj/item/weapon/reagent_containers/food/snacks/cakeslice/slimecake bonus_reagents = list("nutriment" = 1, "vitamin" = 3) tastes = list("cake" = 5, "sweetness" = 1, "slime" = 1) + foodtype = GRAIN | DAIRY /obj/item/weapon/reagent_containers/food/snacks/cakeslice/slimecake name = "slime cake slice" @@ -209,6 +233,7 @@ icon_state = "slimecake_slice" filling_color = "#00FFFF" tastes = list("cake" = 5, "sweetness" = 1, "slime" = 1) + foodtype = GRAIN | DAIRY /obj/item/weapon/reagent_containers/food/snacks/store/cake/pumpkinspice name = "pumpkin spice cake" @@ -217,6 +242,7 @@ slice_path = /obj/item/weapon/reagent_containers/food/snacks/cakeslice/pumpkinspice bonus_reagents = list("nutriment" = 3, "vitamin" = 5) tastes = list("cake" = 5, "sweetness" = 1, "pumpkin" = 1) + foodtype = GRAIN | DAIRY | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/cakeslice/pumpkinspice name = "pumpkin spice cake slice" @@ -224,3 +250,5 @@ icon_state = "pumpkinspicecakeslice" filling_color = "#FFD700" tastes = list("cake" = 5, "sweetness" = 1, "pumpkin" = 1) + + foodtype = GRAIN | DAIRY | VEGETABLES diff --git a/code/modules/food_and_drinks/food/snacks_egg.dm b/code/modules/food_and_drinks/food/snacks_egg.dm index a0b2b34740d..c7420925957 100644 --- a/code/modules/food_and_drinks/food/snacks_egg.dm +++ b/code/modules/food_and_drinks/food/snacks_egg.dm @@ -18,6 +18,7 @@ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/boiledegg filling_color = "#F0E68C" tastes = list("egg" = 1) + foodtype = MEAT /obj/item/weapon/reagent_containers/food/snacks/egg/throw_impact(atom/hit_atom) if(!..()) //was it caught by a mob? @@ -90,6 +91,7 @@ filling_color = "#FFFFF0" list_reagents = list("nutriment" = 3) tastes = list("egg" = 4, "salt" = 1, "pepper" = 1) + foodtype = MEAT | FRIED /obj/item/weapon/reagent_containers/food/snacks/boiledegg name = "boiled egg" @@ -99,6 +101,7 @@ filling_color = "#FFFFF0" list_reagents = list("nutriment" = 2, "vitamin" = 1) tastes = list("egg" = 1) + foodtype = MEAT /obj/item/weapon/reagent_containers/food/snacks/omelette //FUCK THIS name = "omelette du fromage" @@ -110,6 +113,7 @@ bitesize = 1 w_class = WEIGHT_CLASS_NORMAL tastes = list("egg" = 1, "cheese" = 1) + foodtype = MEAT /obj/item/weapon/reagent_containers/food/snacks/omelette/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/kitchen/fork)) @@ -138,3 +142,5 @@ w_class = WEIGHT_CLASS_NORMAL list_reagents = list("nutriment" = 6, "vitamin" = 4) tastes = list("egg" = 1, "bacon" = 1, "bun" = 1) + + foodtype = MEAT diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm index e050ecd72b1..79fa03cc94a 100644 --- a/code/modules/food_and_drinks/food/snacks_meat.dm +++ b/code/modules/food_and_drinks/food/snacks_meat.dm @@ -13,6 +13,7 @@ filling_color = "#CD853F" list_reagents = list("nutriment" = 6, "capsaicin" = 1) tastes = list("fish" = 4, "batter" = 1, "hot peppers" = 1) + foodtype = MEAT /obj/item/weapon/reagent_containers/food/snacks/carpmeat name = "carp fillet" @@ -22,6 +23,7 @@ bitesize = 6 filling_color = "#FA8072" tastes = list("fish" = 1) + foodtype = MEAT /obj/item/weapon/reagent_containers/food/snacks/carpmeat/New() ..() @@ -40,6 +42,7 @@ bitesize = 1 filling_color = "#CD853F" tastes = list("fish" = 1, "breadcrumbs" = 1) + foodtype = MEAT /obj/item/weapon/reagent_containers/food/snacks/fishandchips name = "fish and chips" @@ -49,6 +52,7 @@ list_reagents = list("nutriment" = 6) filling_color = "#FA8072" tastes = list("fish" = 1, "chips" = 1) + foodtype = MEAT | VEGETABLES | FRIED ////////////////////////////////////////////MEATS AND ALIKE//////////////////////////////////////////// @@ -59,6 +63,7 @@ list_reagents = list("nutriment" = 2) filling_color = "#F0E68C" tastes = list("tofu" = 1) + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/spiderleg name = "spider leg" @@ -68,6 +73,7 @@ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/boiledspiderleg filling_color = "#000000" tastes = list("cobwebs" = 1) + foodtype = MEAT | TOXIC /obj/item/weapon/reagent_containers/food/snacks/cornedbeef name = "corned beef and cabbage" @@ -77,6 +83,7 @@ bonus_reagents = list("nutriment" = 1, "vitamin" = 4) list_reagents = list("nutriment" = 5) tastes = list("meat" = 1, "cabbage" = 1) + foodtype = MEAT | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/bearsteak name = "Filet migrawr" @@ -86,6 +93,7 @@ bonus_reagents = list("nutriment" = 2, "vitamin" = 6) list_reagents = list("nutriment" = 2, "vitamin" = 5, "manlydorf" = 5) tastes = list("meat" = 1, "salmon" = 1) + foodtype = MEAT | ALCOHOL /obj/item/weapon/reagent_containers/food/snacks/faggot name = "faggot" @@ -94,6 +102,7 @@ list_reagents = list("nutriment" = 4, "vitamin" = 1) filling_color = "#800000" tastes = list("meat" = 1) + foodtype = MEAT /obj/item/weapon/reagent_containers/food/snacks/sausage name = "sausage" @@ -103,6 +112,7 @@ bonus_reagents = list("nutriment" = 1, "vitamin" = 1) list_reagents = list("nutriment" = 6, "vitamin" = 1) tastes = list("meat" = 1) + foodtype = MEAT /obj/item/weapon/reagent_containers/food/snacks/sausage/New() ..() @@ -114,30 +124,35 @@ w_class = WEIGHT_CLASS_NORMAL list_reagents = list("nutriment" = 8) tastes = list("meat" = 3, "metal" = 1) + foodtype = MEAT /obj/item/weapon/reagent_containers/food/snacks/kebab/human name = "human-kebab" desc = "A human meat, on a stick." bonus_reagents = list("nutriment" = 1, "vitamin" = 6) tastes = list("tender meat" = 3, "metal" = 1) + foodtype = MEAT | GROSS /obj/item/weapon/reagent_containers/food/snacks/kebab/monkey name = "meat-kebab" desc = "Delicious meat, on a stick." bonus_reagents = list("nutriment" = 1, "vitamin" = 2) tastes = list("meat" = 3, "metal" = 1) + foodtype = MEAT /obj/item/weapon/reagent_containers/food/snacks/kebab/tofu name = "tofu-kebab" desc = "Vegan meat, on a stick." bonus_reagents = list("nutriment" = 1) tastes = list("tofu" = 3, "metal" = 1) + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/kebab/tail name = "lizard-tail kebab" desc = "Severed lizard tail on a stick." bonus_reagents = list("nutriment" = 1, "vitamin" = 4) tastes = list("meat" = 8, "metal" = 4, "scales" = 1) + foodtype = MEAT /obj/item/weapon/reagent_containers/food/snacks/rawkhinkali name = "raw khinkali" @@ -146,6 +161,7 @@ list_reagents = list("nutriment" = 1, "vitamin" = 1) cooked_type = /obj/item/weapon/reagent_containers/food/snacks/khinkali tastes = list("meat" = 1, "onions" = 1, "garlic" = 1) + foodtype = MEAT /obj/item/weapon/reagent_containers/food/snacks/khinkali name = "khinkali" @@ -155,6 +171,7 @@ bitesize = 3 filling_color = "#F0F0F0" tastes = list("meat" = 1, "onions" = 1, "garlic" = 1) + foodtype = MEAT /obj/item/weapon/reagent_containers/food/snacks/monkeycube name = "monkey cube" @@ -164,6 +181,7 @@ list_reagents = list("nutriment" = 2) filling_color = "#CD853F" tastes = list("the jungle" = 1, "bananas" = 1) + foodtype = MEAT /obj/item/weapon/reagent_containers/food/snacks/monkeycube/proc/Expand() visible_message("[src] expands!") @@ -179,6 +197,7 @@ filling_color = "#FFA07A" list_reagents = list("nutriment" = 8, "capsaicin" = 6) tastes = list("hot peppers" = 1, "meat" = 3, "cheese" = 1, "sour cream" = 1) + foodtype = MEAT /obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat name = "stewed soy meat" @@ -189,6 +208,7 @@ list_reagents = list("nutriment" = 8) filling_color = "#D2691E" tastes = list("soy" = 1, "vegetables" = 1) + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat/New() ..() @@ -203,6 +223,7 @@ list_reagents = list("nutriment" = 3, "capsaicin" = 2) filling_color = "#000000" tastes = list("hot peppers" = 1, "cobwebs" = 1) + foodtype = MEAT /obj/item/weapon/reagent_containers/food/snacks/spidereggsham name = "green eggs and ham" @@ -214,6 +235,7 @@ bitesize = 4 filling_color = "#7FFF00" tastes = list("meat" = 1, "the colour green" = 1) + foodtype = MEAT /obj/item/weapon/reagent_containers/food/snacks/sashimi name = "carp sashimi" @@ -223,6 +245,7 @@ list_reagents = list("nutriment" = 6, "capsaicin" = 5) filling_color = "#FA8072" tastes = list("fish" = 1, "hot peppers" = 1) + foodtype = MEAT | TOXIC /obj/item/weapon/reagent_containers/food/snacks/nugget name = "chicken nugget" @@ -230,6 +253,7 @@ bonus_reagents = list("nutriment" = 1, "vitamin" = 1) list_reagents = list("nutriment" = 2) tastes = list("\"chicken\"" = 1) + foodtype = MEAT /obj/item/weapon/reagent_containers/food/snacks/nugget/New() ..() diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index 3cce0f46c99..2a1920a04e7 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -10,6 +10,7 @@ list_reagents = list("nutriment" = 15, "vitamin" = 5) w_class = WEIGHT_CLASS_NORMAL tastes = list("cheese" = 1) + foodtype = DAIRY /obj/item/weapon/reagent_containers/food/snacks/cheesewedge name = "cheese wedge" @@ -18,6 +19,7 @@ filling_color = "#FFD700" list_reagents = list("nutriment" = 3, "vitamin" = 1) tastes = list("cheese" = 1) + foodtype = DAIRY /obj/item/weapon/reagent_containers/food/snacks/watermelonslice name = "watermelon slice" @@ -25,22 +27,27 @@ icon_state = "watermelonslice" filling_color = "#FF1493" tastes = list("watermelon" = 1) + foodtype = FRUIT /obj/item/weapon/reagent_containers/food/snacks/candy_corn name = "candy corn" desc = "It's a handful of candy corn. Can be stored in a detective's hat." + junkiness = 20 icon_state = "candy_corn" list_reagents = list("nutriment" = 4, "sugar" = 2) filling_color = "#FF8C00" tastes = list("candy corn" = 1) + foodtype = JUNKFOOD /obj/item/weapon/reagent_containers/food/snacks/chocolatebar name = "chocolate bar" desc = "Such, sweet, fattening food." + junkiness = 20 icon_state = "chocolatebar" list_reagents = list("nutriment" = 2, "sugar" = 2, "cocoa" = 2) filling_color = "#A0522D" tastes = list("chocolate" = 1) + foodtype = JUNKFOOD /obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice name = "huge mushroom slice" @@ -48,16 +55,19 @@ icon_state = "hugemushroomslice" list_reagents = list("nutriment" = 3, "vitamin" = 1) tastes = list("mushroom" = 1) + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/popcorn name = "popcorn" desc = "Now let's find some cinema." + junkiness = 4 icon_state = "popcorn" trash = /obj/item/trash/popcorn list_reagents = list("nutriment" = 2) bitesize = 0.1 //this snack is supposed to be eating during looooong time. And this it not dinner food! --rastaf0 filling_color = "#FFEFD5" tastes = list("popcorn" = 3, "butter" = 1) + foodtype = JUNKFOOD /obj/item/weapon/reagent_containers/food/snacks/popcorn/New() ..() @@ -71,6 +81,7 @@ list_reagents = list("nutriment" = 6) filling_color = "#D2B48C" tastes = list("potato" = 1) + foodtype = VEGETABLES | DAIRY /obj/item/weapon/reagent_containers/food/snacks/fries name = "space fries" @@ -80,6 +91,7 @@ list_reagents = list("nutriment" = 4) filling_color = "#FFD700" tastes = list("fries" = 3, "salt" = 1) + foodtype = VEGETABLES | GRAIN | FRIED /obj/item/weapon/reagent_containers/food/snacks/tatortot name = "tator tot" @@ -88,6 +100,7 @@ list_reagents = list("nutriment" = 4) filling_color = "FFD700" tastes = list("potato" = 3, "valids" = 1) + foodtype = FRIED | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/soydope name = "soy dope" @@ -97,6 +110,7 @@ list_reagents = list("nutriment" = 2) filling_color = "#DEB887" tastes = list("soy" = 1) + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/cheesyfries name = "cheesy fries" @@ -107,6 +121,7 @@ list_reagents = list("nutriment" = 6) filling_color = "#FFD700" tastes = list("fries" = 3, "cheese" = 1) + foodtype = VEGETABLES | GRAIN /obj/item/weapon/reagent_containers/food/snacks/badrecipe name = "burned mess" @@ -114,6 +129,7 @@ icon_state = "badrecipe" list_reagents = list("bad_food" = 30) filling_color = "#8B4513" + foodtype = GROSS /obj/item/weapon/reagent_containers/food/snacks/carrotfries name = "carrot fries" @@ -123,16 +139,19 @@ list_reagents = list("nutriment" = 3, "oculine" = 3, "vitamin" = 2) filling_color = "#FFA500" tastes = list("carrots" = 3, "salt" = 1) + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/candiedapple name = "candied apple" desc = "An apple coated in sugary sweetness." icon_state = "candiedapple" bitesize = 3 + junkiness = 5 bonus_reagents = list("nutriment" = 2, "sugar" = 3) list_reagents = list("nutriment" = 3, "sugar" = 2) filling_color = "#FF4500" tastes = list("apple" = 2, "sweetness" = 2) + foodtype = JUNKFOOD | FRUIT /obj/item/weapon/reagent_containers/food/snacks/mint name = "mint" @@ -151,6 +170,7 @@ list_reagents = list("nutriment" = 5) filling_color = "#F0E68C" tastes = list("egg" = 1) + foodtype = MEAT | GRAIN /obj/item/weapon/reagent_containers/food/snacks/beans name = "tin of beans" @@ -160,6 +180,7 @@ list_reagents = list("nutriment" = 10) filling_color = "#B22222" tastes = list("beans" = 1) + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/spidereggs name = "spider eggs" @@ -168,6 +189,7 @@ list_reagents = list("nutriment" = 2, "toxin" = 2) filling_color = "#008000" tastes = list("cobwebs" = 1) + foodtype = MEAT | TOXIC /obj/item/weapon/reagent_containers/food/snacks/chococoin name = "chocolate coin" @@ -177,6 +199,7 @@ list_reagents = list("nutriment" = 3, "cocoa" = 1) filling_color = "#A0522D" tastes = list("chocolate" = 1) + foodtype = JUNKFOOD /obj/item/weapon/reagent_containers/food/snacks/fudgedice name = "fudge dice" @@ -187,6 +210,7 @@ filling_color = "#A0522D" trash = /obj/item/weapon/dice/fudge tastes = list("fudge" = 1) + foodtype = JUNKFOOD /obj/item/weapon/reagent_containers/food/snacks/chocoorange name = "chocolate orange" @@ -196,6 +220,7 @@ list_reagents = list("nutriment" = 3, "sugar" = 1) filling_color = "#A0522D" tastes = list("chocolate" = 3, "oranges" = 1) + foodtype = JUNKFOOD /obj/item/weapon/reagent_containers/food/snacks/eggplantparm name = "eggplant parmigiana" @@ -206,6 +231,7 @@ list_reagents = list("nutriment" = 6, "vitamin" = 2) filling_color = "#BA55D3" tastes = list("eggplant" = 3, "cheese" = 1) + foodtype = VEGETABLES | DAIRY /obj/item/weapon/reagent_containers/food/snacks/tortilla name = "tortilla" @@ -215,6 +241,7 @@ list_reagents = list("nutriment" = 3, "vitamin" = 1) filling_color = "#FFEFD5" tastes = list("tortilla" = 1) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/burrito name = "burrito" @@ -224,6 +251,7 @@ list_reagents = list("nutriment" = 4, "vitamin" = 1) filling_color = "#FFEFD5" tastes = list("torilla" = 2, "meat" = 3) + foodtype = GRAIN | MEAT /obj/item/weapon/reagent_containers/food/snacks/cheesyburrito name = "cheesy burrito" @@ -233,6 +261,7 @@ list_reagents = list("nutriment" = 4, "vitamin" = 2) filling_color = "#FFD800" tastes = list("torilla" = 2, "meat" = 3, "cheese" = 1) + foodtype = GRAIN | MEAT | DAIRY /obj/item/weapon/reagent_containers/food/snacks/carneburrito name = "carne asada burrito" @@ -242,6 +271,7 @@ list_reagents = list("nutriment" = 5, "vitamin" = 1) filling_color = "#A0522D" tastes = list("torilla" = 2, "meat" = 4) + foodtype = GRAIN | MEAT /obj/item/weapon/reagent_containers/food/snacks/fuegoburrito name = "fuego plasma burrito" @@ -251,6 +281,7 @@ list_reagents = list("nutriment" = 4, "capsaicin" = 5, "vitamin" = 3) filling_color = "#FF2000" tastes = list("torilla" = 2, "meat" = 3, "hot peppers" = 1) + foodtype = GRAIN | MEAT /obj/item/weapon/reagent_containers/food/snacks/yakiimo name = "yaki imo" @@ -260,6 +291,7 @@ list_reagents = list("nutriment" = 5, "vitamin" = 4) filling_color = "#8B1105" tastes = list("sweet potato" = 1) + foodtype = GRAIN | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/roastparsnip name = "roast parsnip" @@ -269,6 +301,7 @@ list_reagents = list("nutriment" = 3, "vitamin" = 4) filling_color = "#FF5500" tastes = list("parsnip" = 1) + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/melonfruitbowl name = "melon fruit bowl" @@ -279,6 +312,7 @@ filling_color = "#FF5500" w_class = WEIGHT_CLASS_NORMAL tastes = list("melon" = 1) + foodtype = FRUIT /obj/item/weapon/reagent_containers/food/snacks/spacefreezy name = "space freezy" @@ -288,6 +322,7 @@ list_reagents = list("nutriment" = 6, "bluecherryjelly" = 5, "vitamin" = 4) filling_color = "#87CEFA" tastes = list("blue cherries" = 2, "ice cream" = 2) + foodtype = FRUIT | DAIRY /obj/item/weapon/reagent_containers/food/snacks/sundae name = "sundae" @@ -297,6 +332,7 @@ list_reagents = list("nutriment" = 6, "banana" = 5, "vitamin" = 2) filling_color = "#FFFACD" tastes = list("ice cream" = 1, "banana" = 1) + foodtype = FRUIT | DAIRY /obj/item/weapon/reagent_containers/food/snacks/honkdae name = "honkdae" @@ -306,6 +342,7 @@ list_reagents = list("nutriment" = 6, "banana" = 10, "vitamin" = 4) filling_color = "#FFFACD" tastes = list("ice cream" = 1, "banana" = 1, "a bad joke" = 1) + foodtype = FRUIT | DAIRY /obj/item/weapon/reagent_containers/food/snacks/nachos name = "nachos" @@ -315,6 +352,7 @@ list_reagents = list("nutriment" = 6, "vitamin" = 2) filling_color = "#F4A460" tastes = list("nachos" = 1) + foodtype = VEGETABLES | FRIED /obj/item/weapon/reagent_containers/food/snacks/cheesynachos name = "cheesy nachos" @@ -324,6 +362,7 @@ list_reagents = list("nutriment" = 6, "vitamin" = 3) filling_color = "#FFD700" tastes = list("nachos" = 2, "cheese" = 1) + foodtype = VEGETABLES | FRIED | DAIRY /obj/item/weapon/reagent_containers/food/snacks/cubannachos name = "cuban nachos" @@ -333,6 +372,7 @@ list_reagents = list("nutriment" = 7, "capsaicin" = 8, "vitamin" = 4) filling_color = "#DC143C" tastes = list("nachos" = 2, "hot pepper" = 1) + foodtype = VEGETABLES | FRIED | DAIRY /obj/item/weapon/reagent_containers/food/snacks/melonkeg name = "melon keg" @@ -344,6 +384,7 @@ volume = 80 bitesize = 5 tastes = list("grain alcohol" = 1, "fruit" = 1) + foodtype = FRUIT | ALCOHOL /obj/item/weapon/reagent_containers/food/snacks/honeybar name = "honey nut bar" @@ -353,6 +394,7 @@ list_reagents = list("nutriment" = 5, "honey" = 5) filling_color = "#F2CE91" tastes = list("oats" = 3, "nuts" = 2, "honey" = 1) + foodtype = FRUIT /obj/item/weapon/reagent_containers/food/snacks/stuffedlegion name = "stuffed legion" @@ -361,6 +403,7 @@ bonus_reagents = list("vitamin" = 3, "capsaicin" = 1, "tricordrazine" = 5) list_reagents = list("nutriment" = 5, "vitamin" = 5, "capsaicin" = 2, "tricordrazine" = 10) tastes = list("death" = 2, "rock" = 1, "meat" = 1, "hot peppers" = 1) + foodtype = MEAT /obj/item/weapon/reagent_containers/food/snacks/powercrepe @@ -376,6 +419,7 @@ attack_verb = list("slapped", "slathered") w_class = WEIGHT_CLASS_BULKY tastes = list("cherry" = 1, "crepe" = 1) + foodtype = GRAIN | FRUIT /obj/item/weapon/reagent_containers/food/snacks/lollipop name = "lollipop" @@ -386,6 +430,7 @@ var/mutable_appearance/head var/headcolor = rgb(0, 0, 0) tastes = list("candy" = 1) + foodtype = JUNKFOOD /obj/item/weapon/reagent_containers/food/snacks/lollipop/New() ..() @@ -425,6 +470,7 @@ icon_state = "gumball" list_reagents = list("sugar" = 5, "bicaridine" = 2, "kelotane" = 2) //Kek tastes = list("candy") + foodtype = JUNKFOOD /obj/item/weapon/reagent_containers/food/snacks/gumball/New() ..() @@ -453,6 +499,7 @@ list_reagents = list("nutriment" = 4, "vitamin" = 2) filling_color = "F0D830" tastes = list("taco" = 4, "meat" = 2, "cheese" = 2, "lettuce" = 1) + foodtype = MEAT | DAIRY | GRAIN | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/taco/plain desc = "A traditional taco with meat and cheese, minus the rabbit food." @@ -460,6 +507,7 @@ bonus_reagents = list("nutriment" = 2, "vitamin" = 2) list_reagents = list("nutriment" = 3, "vitamin" = 1) tastes = list("taco" = 4, "meat" = 2, "cheese" = 2) + foodtype = MEAT | DAIRY | GRAIN /obj/item/weapon/reagent_containers/food/snacks/branrequests name = "Bran Requests Cereal" @@ -468,6 +516,7 @@ list_reagents = list("nutriment" = 3, "vitamin" = 2, "sodiumchloride" = 5) bonus_reagents = list("sodiumchloride" = 10) tastes = list("bran" = 4, "raisins" = 3, "salt" = 1) + foodtype = GRAIN | FRUIT /obj/item/weapon/reagent_containers/food/snacks/butter name = "stick of butter" @@ -476,6 +525,7 @@ list_reagents = list("nutriment" = 5) filling_color = "#FFD700" tastes = list("butter" = 1) + foodtype = DAIRY /obj/item/weapon/reagent_containers/food/snacks/onionrings name = "onion rings" @@ -484,4 +534,5 @@ list_reagents = list("nutriment" = 3) filling_color = "#C0C9A0" gender = PLURAL - tastes = list("batter" = 3, "onion" = 1) \ No newline at end of file + tastes = list("batter" = 3, "onion" = 1) + foodtype = VEGETABLES \ No newline at end of file diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm index 6081838669c..17750f15322 100644 --- a/code/modules/food_and_drinks/food/snacks_pastry.dm +++ b/code/modules/food_and_drinks/food/snacks_pastry.dm @@ -7,11 +7,13 @@ desc = "Goes great with Robust Coffee." icon_state = "donut1" bitesize = 5 + junkiness = 10 bonus_reagents = list("sugar" = 1) list_reagents = list("nutriment" = 3, "sugar" = 2) var/extra_reagent = null filling_color = "#D2691E" tastes = list("donut" = 1) + foodtype = JUNKFOOD | GRAIN | FRIED /obj/item/weapon/reagent_containers/food/snacks/donut/Initialize() . = ..() @@ -47,6 +49,7 @@ bonus_reagents = list("sugar" = 1, "vitamin" = 1) extra_reagent = "berryjuice" tastes = list("jelly" = 1, "donut" = 3) + foodtype = JUNKFOOD | GRAIN | FRIED | FRUIT /obj/item/weapon/reagent_containers/food/snacks/donut/jelly/Initialize() . = ..() @@ -64,12 +67,14 @@ desc = "You jelly?" icon_state = "jdonut1" extra_reagent = "slimejelly" + foodtype = JUNKFOOD | GRAIN | FRIED | TOXIC /obj/item/weapon/reagent_containers/food/snacks/donut/jelly/cherryjelly name = "jelly donut" desc = "You jelly?" icon_state = "jdonut1" extra_reagent = "cherryjelly" + foodtype = JUNKFOOD | GRAIN | FRIED | FRUIT ////////////////////////////////////////////MUFFINS//////////////////////////////////////////// @@ -81,12 +86,14 @@ list_reagents = list("nutriment" = 6) filling_color = "#F4A460" tastes = list("muffin" = 1) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/muffin/berry name = "berry muffin" icon_state = "berrymuffin" desc = "A delicious and spongy little cake, with berries." tastes = list("muffin" = 3, "berry" = 1) + foodtype = GRAIN | FRUIT /obj/item/weapon/reagent_containers/food/snacks/muffin/booberry name = "booberry muffin" @@ -94,6 +101,7 @@ alpha = 125 desc = "My stomach is a graveyard! No living being can quench my bloodthirst!" tastes = list("muffin" = 3, "spookiness" = 1) + foodtype = GRAIN | FRUIT /obj/item/weapon/reagent_containers/food/snacks/chawanmushi name = "chawanmushi" @@ -103,6 +111,7 @@ list_reagents = list("nutriment" = 5) filling_color = "#FFE4E1" tastes = list("custard" = 1) + foodtype = GRAIN | MEAT | VEGETABLES ////////////////////////////////////////////WAFFLES//////////////////////////////////////////// @@ -115,6 +124,7 @@ list_reagents = list("nutriment" = 8, "vitamin" = 1) filling_color = "#D2691E" tastes = list("waffles" = 1) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/soylentgreen name = "\improper Soylent Green" @@ -125,6 +135,7 @@ list_reagents = list("nutriment" = 10, "vitamin" = 1) filling_color = "#9ACD32" tastes = list("waffles" = 7, "people" = 1) + foodtype = GRAIN | GROSS | MEAT /obj/item/weapon/reagent_containers/food/snacks/soylenviridians name = "\improper Soylent Virdians" @@ -135,6 +146,7 @@ list_reagents = list("nutriment" = 10, "vitamin" = 1) filling_color = "#9ACD32" tastes = list("waffles" = 7, "the colour green" = 1) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/rofflewaffles name = "roffle waffles" @@ -146,6 +158,7 @@ list_reagents = list("nutriment" = 8, "mushroomhallucinogen" = 2, "vitamin" = 2) filling_color = "#00BFFF" tastes = list("waffle" = 1, "mushrooms" = 1) + foodtype = GRAIN | VEGETABLES | TOXIC ////////////////////////////////////////////OTHER//////////////////////////////////////////// @@ -153,11 +166,13 @@ name = "cookie" desc = "COOKIE!!!" icon_state = "COOKIE!!!" + junkiness = 5 bitesize = 1 bonus_reagents = list("nutriment" = 1) list_reagents = list("nutriment" = 1) filling_color = "#F0E68C" tastes = list("cookie" = 1) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/donkpocket name = "\improper Donk-pocket" @@ -167,6 +182,7 @@ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/donkpocket/warm filling_color = "#CD853F" tastes = list("meat" = 2, "dough" = 2, "laziness" = 1) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/donkpocket/warm name = "warm Donk-pocket" @@ -174,6 +190,7 @@ bonus_reagents = list("omnizine" = 3) list_reagents = list("nutriment" = 4, "omnizine" = 3) tastes = list("meat" = 2, "dough" = 2, "laziness" = 1) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/dankpocket name = "\improper Dank-pocket" @@ -182,6 +199,7 @@ list_reagents = list("lipolicide" = 3, "space_drugs" = 3, "nutriment" = 4) filling_color = "#00FF00" tastes = list("meat" = 2, "dough" = 2) + foodtype = GRAIN | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/fortunecookie name = "fortune cookie" @@ -191,6 +209,7 @@ list_reagents = list("nutriment" = 3) filling_color = "#F4A460" tastes = list("cookie" = 1) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/poppypretzel name = "poppy pretzel" @@ -200,6 +219,7 @@ list_reagents = list("nutriment" = 5) filling_color = "#F0E68C" tastes = list("pretzel" = 1) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit name = "plump helmet biscuit" @@ -209,6 +229,7 @@ list_reagents = list("nutriment" = 5) filling_color = "#F0E68C" tastes = list("mushroom" = 1, "biscuit" = 1) + foodtype = GRAIN | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit/Initialize() var/fey = prob(10) @@ -229,6 +250,7 @@ list_reagents = list("nutriment" = 1) filling_color = "#F0E68C" tastes = list("cracker" = 1) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/hotdog name = "hotdog" @@ -239,6 +261,7 @@ list_reagents = list("nutriment" = 6, "ketchup" = 3, "vitamin" = 3) filling_color = "#8B0000" tastes = list("bun" = 3, "meat" = 2) + foodtype = GRAIN | MEAT | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/meatbun name = "meat bun" @@ -248,6 +271,7 @@ list_reagents = list("nutriment" = 6, "vitamin" = 2) filling_color = "#8B0000" tastes = list("bun" = 3, "meat" = 2) + foodtype = GRAIN | MEAT | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/khachapuri name = "khachapuri" @@ -256,6 +280,7 @@ list_reagents = list("nutriment" = 12, "vitamin" = 2) filling_color = "#FFFF4D" tastes = list("bread" = 1, "egg" = 1, "cheese" = 1) + foodtype = GRAIN | MEAT | DAIRY /obj/item/weapon/reagent_containers/food/snacks/sugarcookie @@ -266,6 +291,7 @@ list_reagents = list("nutriment" = 3, "sugar" = 3) filling_color = "#CD853F" tastes = list("sweetness" = 1) + foodtype = GRAIN | JUNKFOOD /obj/item/weapon/reagent_containers/food/snacks/chococornet name = "chocolate cornet" @@ -275,6 +301,7 @@ list_reagents = list("nutriment" = 5, "vitamin" = 1) filling_color = "#FFE4C4" tastes = list("biscuit" = 3, "chocolate" = 1) + foodtype = GRAIN | JUNKFOOD /obj/item/weapon/reagent_containers/food/snacks/oatmealcookie name = "oatmeal cookie" @@ -284,6 +311,7 @@ list_reagents = list("nutriment" = 5, "vitamin" = 1) filling_color = "#D2691E" tastes = list("cookie" = 2, "oat" = 1) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/raisincookie name = "raisin cookie" @@ -293,6 +321,7 @@ list_reagents = list("nutriment" = 5, "vitamin" = 1) filling_color = "#F0E68C" tastes = list("cookie" = 1, "raisins" = 1) + foodtype = GRAIN | FRUIT /obj/item/weapon/reagent_containers/food/snacks/cherrycupcake name = "cherry cupcake" @@ -302,6 +331,7 @@ list_reagents = list("nutriment" = 5, "vitamin" = 1) filling_color = "#F0E68C" tastes = list("cake" = 3, "cherry" = 1) + foodtype = GRAIN | FRUIT /obj/item/weapon/reagent_containers/food/snacks/bluecherrycupcake name = "blue cherry cupcake" @@ -311,6 +341,7 @@ list_reagents = list("nutriment" = 5, "vitamin" = 1) filling_color = "#F0E68C" tastes = list("cake" = 3, "blue cherry" = 1) + foodtype = GRAIN | FRUIT /obj/item/weapon/reagent_containers/food/snacks/honeybun name = "honey bun" @@ -320,3 +351,5 @@ list_reagents = list("nutriment" = 5, "honey" = 5) filling_color = "#F2CE91" tastes = list("pastry" = 1, "sweetness" = 1) + foodtype = GRAIN + diff --git a/code/modules/food_and_drinks/food/snacks_pie.dm b/code/modules/food_and_drinks/food/snacks_pie.dm index 94c8e54f154..5def5a8f85d 100644 --- a/code/modules/food_and_drinks/food/snacks_pie.dm +++ b/code/modules/food_and_drinks/food/snacks_pie.dm @@ -7,6 +7,7 @@ volume = 80 list_reagents = list("nutriment" = 10, "vitamin" = 2) tastes = list("pie" = 1) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/pie/plain name = "plain pie" @@ -15,6 +16,7 @@ custom_food_type = /obj/item/weapon/reagent_containers/food/snacks/customizable/pie bonus_reagents = list("nutriment" = 8, "vitamin" = 1) tastes = list("pie" = 1) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/pie/cream name = "banana cream pie" @@ -24,6 +26,7 @@ bonus_reagents = list("nutriment" = 2, "vitamin" = 2) list_reagents = list("nutriment" = 6, "banana" = 5, "vitamin" = 2) tastes = list("pie" = 1) + foodtype = GRAIN | DAIRY /obj/item/weapon/reagent_containers/food/snacks/pie/cream/throw_impact(atom/hit_atom) if(!..()) //was it caught by a mob? @@ -53,6 +56,7 @@ bonus_reagents = list("nutriment" = 1, "vitamin" = 2) list_reagents = list("nutriment" = 10, "berryjuice" = 5, "vitamin" = 2) tastes = list("pie" = 1, "blackberries" = 1) + foodtype = GRAIN | FRUIT /obj/item/weapon/reagent_containers/food/snacks/pie/bearypie name = "beary pie" @@ -61,6 +65,7 @@ bonus_reagents = list("nutriment" = 2, "vitamin" = 3) list_reagents = list("nutriment" = 2, "vitamin" = 3) tastes = list("pie" = 1, "meat" = 1, "salmon" = 1) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/pie/meatpie name = "meat-pie" @@ -68,6 +73,7 @@ desc = "An old barber recipe, very delicious!" bonus_reagents = list("nutriment" = 1, "vitamin" = 5) tastes = list("pie" = 1, "meat" = 1) + foodtype = GRAIN | MEAT /obj/item/weapon/reagent_containers/food/snacks/pie/tofupie @@ -76,6 +82,7 @@ desc = "A delicious tofu pie." bonus_reagents = list("nutriment" = 1, "vitamin" = 2) tastes = list("pie" = 1, "tofu" = 1) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/pie/amanita_pie @@ -86,6 +93,7 @@ bonus_reagents = list("nutriment" = 1, "vitamin" = 4) list_reagents = list("nutriment" = 6, "amatoxin" = 3, "mushroomhallucinogen" = 1, "vitamin" = 4) tastes = list("pie" = 1, "mushroom" = 1) + foodtype = GRAIN | VEGETABLES | TOXIC | GROSS /obj/item/weapon/reagent_containers/food/snacks/pie/plump_pie @@ -94,6 +102,7 @@ icon_state = "plump_pie" bonus_reagents = list("nutriment" = 1, "vitamin" = 4) tastes = list("pie" = 1, "mushroom" = 1) + foodtype = GRAIN | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/pie/plump_pie/New() @@ -105,6 +114,7 @@ ..() if(fey) reagents.add_reagent("omnizine", 5) + foodtype = GRAIN | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/pie/xemeatpie @@ -114,6 +124,7 @@ trash = /obj/item/trash/plate bonus_reagents = list("nutriment" = 1, "vitamin" = 5) tastes = list("pie" = 1, "meat" = 1, "acid" = 1) + foodtype = GRAIN | MEAT /obj/item/weapon/reagent_containers/food/snacks/pie/applepie @@ -122,6 +133,7 @@ icon_state = "applepie" bonus_reagents = list("nutriment" = 1, "vitamin" = 3) tastes = list("pie" = 1, "apple" = 1) + foodtype = GRAIN | FRUIT @@ -131,6 +143,7 @@ icon_state = "cherrypie" bonus_reagents = list("nutriment" = 1, "vitamin" = 2) tastes = list("pie" = 7, "Nicole Paige Brooks" = 2) + foodtype = GRAIN | FRUIT /obj/item/weapon/reagent_containers/food/snacks/pie/pumpkinpie @@ -141,6 +154,7 @@ slices_num = 5 bonus_reagents = list("nutriment" = 1, "vitamin" = 5) tastes = list("pie" = 1, "pumpkin" = 1) + foodtype = GRAIN | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice name = "pumpkin pie slice" @@ -151,6 +165,7 @@ filling_color = "#FFA500" list_reagents = list("nutriment" = 2) tastes = list("pie" = 1, "pumpkin" = 1) + foodtype = GRAIN | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/pie/appletart name = "golden apple streusel tart" @@ -159,6 +174,7 @@ bonus_reagents = list("nutriment" = 1, "vitamin" = 4) list_reagents = list("nutriment" = 8, "gold" = 5, "vitamin" = 4) tastes = list("pie" = 1, "apple" = 1, "expensive metal" = 1) + foodtype = GRAIN | FRUIT /obj/item/weapon/reagent_containers/food/snacks/pie/grapetart name = "grape tart" @@ -167,6 +183,7 @@ bonus_reagents = list("nutriment" = 1, "vitamin" = 4) list_reagents = list("nutriment" = 4, "vitamin" = 4) tastes = list("pie" = 1, "grape" = 1) + foodtype = GRAIN | FRUIT /obj/item/weapon/reagent_containers/food/snacks/pie/blumpkinpie name = "blumpkin pie" @@ -176,6 +193,7 @@ slices_num = 5 bonus_reagents = list("nutriment" = 3, "vitamin" = 6) tastes = list("pie" = 1, "a mouthful of pool water" = 1) + foodtype = GRAIN | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/blumpkinpieslice name = "blumpkin pie slice" @@ -186,6 +204,7 @@ filling_color = "#1E90FF" list_reagents = list("nutriment" = 2) tastes = list("pie" = 1, "a mouthful of pool water" = 1) + foodtype = GRAIN | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/pie/dulcedebatata name = "dulce de batata" @@ -195,6 +214,7 @@ slices_num = 5 bonus_reagents = list("nutriment" = 4, "vitamin" = 8) tastes = list("jelly" = 1, "sweet potato" = 1) + foodtype = GRAIN | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/dulcedebatataslice name = "dulce de batata slice" @@ -205,6 +225,7 @@ filling_color = "#8B4513" list_reagents = list("nutriment" = 2) tastes = list("jelly" = 1, "sweet potato" = 1) + foodtype = GRAIN | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/pie/frostypie name = "frosty pie" @@ -212,3 +233,4 @@ icon_state = "frostypie" bonus_reagents = list("nutriment" = 4, "vitamin" = 6) tastes = list("mint" = 1, "pie" = 1) + foodtype = GRAIN | FRUIT diff --git a/code/modules/food_and_drinks/food/snacks_pizza.dm b/code/modules/food_and_drinks/food/snacks_pizza.dm index ab476c10441..f171f153813 100644 --- a/code/modules/food_and_drinks/food/snacks_pizza.dm +++ b/code/modules/food_and_drinks/food/snacks_pizza.dm @@ -8,10 +8,12 @@ volume = 80 list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 5) tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1) + foodtype = GRAIN | DAIRY | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/pizzaslice icon = 'icons/obj/food/pizzaspaghetti.dmi' list_reagents = list("nutriment" = 5) + foodtype = GRAIN | DAIRY | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/pizza/margherita name = "margherita" @@ -20,6 +22,7 @@ slice_path = /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/margherita bonus_reagents = list("nutriment" = 5, "vitamin" = 5) tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1) + foodtype = GRAIN | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/margherita name = "margherita slice" @@ -27,6 +30,7 @@ icon_state = "pizzamargheritaslice" filling_color = "#FFA500" tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1) + foodtype = GRAIN | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/pizza/meat name = "meatpizza" @@ -36,6 +40,7 @@ bonus_reagents = list("nutriment" = 5, "vitamin" = 8) list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 8) tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1) + foodtype = GRAIN | VEGETABLES| DAIRY | MEAT /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/meat name = "meatpizza slice" @@ -43,6 +48,7 @@ icon_state = "meatpizzaslice" filling_color = "#A52A2A" tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY | MEAT /obj/item/weapon/reagent_containers/food/snacks/pizza/mushroom name = "mushroom pizza" @@ -52,6 +58,7 @@ bonus_reagents = list("nutriment" = 5, "vitamin" = 5) list_reagents = list("nutriment" = 30, "vitamin" = 5) tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "mushroom" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/mushroom name = "mushroom pizza slice" @@ -59,6 +66,7 @@ icon_state = "mushroompizzaslice" filling_color = "#FFE4C4" tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "mushroom" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY /obj/item/weapon/reagent_containers/food/snacks/pizza/vegetable name = "vegetable pizza" @@ -68,6 +76,7 @@ bonus_reagents = list("nutriment" = 5, "vitamin" = 5) list_reagents = list("nutriment" = 25, "tomatojuice" = 6, "oculine" = 12, "vitamin" = 5) tastes = list("crust" = 1, "tomato" = 2, "cheese" = 1, "carrot" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/vegetable name = "vegetable pizza slice" @@ -75,6 +84,7 @@ icon_state = "vegetablepizzaslice" filling_color = "#FFA500" tastes = list("crust" = 1, "tomato" = 2, "cheese" = 1, "carrot" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY /obj/item/weapon/reagent_containers/food/snacks/pizza/donkpocket name = "donkpocket pizza" @@ -84,6 +94,7 @@ bonus_reagents = list("nutriment" = 5, "vitamin" = 5) list_reagents = list("nutriment" = 25, "tomatojuice" = 6, "omnizine" = 10, "vitamin" = 5) tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1, "laziness" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/donkpocket name = "donkpocket pizza slice" @@ -91,6 +102,7 @@ icon_state = "donkpocketpizzaslice" filling_color = "#FFA500" tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1, "laziness" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD /obj/item/weapon/reagent_containers/food/snacks/pizza/dank name = "dank pizza" @@ -100,6 +112,7 @@ bonus_reagents = list("nutriment" = 2, "vitamin" = 6) list_reagents = list("nutriment" = 25, "doctorsdelight" = 5, "tomatojuice" = 6, "vitamin" = 5) tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1) + foodtype = GRAIN | VEGETABLES | FRUIT | DAIRY /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/dank name = "dank pizza slice" @@ -107,6 +120,7 @@ icon_state = "dankpizzaslice" filling_color = "#2E8B57" tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1) + foodtype = GRAIN | VEGETABLES | FRUIT | DAIRY /obj/item/weapon/reagent_containers/food/snacks/pizza/sassysage name = "sassysage pizza" @@ -115,6 +129,7 @@ slice_path = /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/sassysage bonus_reagents = list("nutriment" = 6, "vitamin" = 6) tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/sassysage name = "sassysage pizza slice" @@ -122,8 +137,10 @@ icon_state = "sassysagepizzaslice" filling_color = "#FF4500" tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1) + foodtype = GRAIN | VEGETABLES | DAIRY /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/custom name = "pizza slice" icon_state = "pizzamargheritaslice" filling_color = "#FFFFFF" + foodtype = GRAIN | VEGETABLES diff --git a/code/modules/food_and_drinks/food/snacks_salad.dm b/code/modules/food_and_drinks/food/snacks_salad.dm index f167452ef0a..324b69e53f7 100644 --- a/code/modules/food_and_drinks/food/snacks_salad.dm +++ b/code/modules/food_and_drinks/food/snacks_salad.dm @@ -7,6 +7,7 @@ w_class = WEIGHT_CLASS_NORMAL list_reagents = list("nutriment" = 7, "vitamin" = 2) tastes = list("leaves" = 1) + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/salad/New() ..() @@ -19,6 +20,7 @@ bonus_reagents = list("omnizine" = 2, "vitamin" = 6) list_reagents = list("nutriment" = 8, "omnizine" = 8, "vitamin" = 6) tastes = list("leaves" = 1) + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/salad/herbsalad name = "herb salad" @@ -27,6 +29,7 @@ bonus_reagents = list("vitamin" = 4) list_reagents = list("nutriment" = 8, "vitamin" = 2) tastes = list("leaves" = 1, "apple" = 1) + foodtype = VEGETABLES | FRUIT /obj/item/weapon/reagent_containers/food/snacks/salad/validsalad name = "valid salad" @@ -35,6 +38,7 @@ bonus_reagents = list("doctorsdelight" = 5, "vitamin" = 4) list_reagents = list("nutriment" = 8, "doctorsdelight" = 5, "vitamin" = 2) tastes = list("leaves" = 1, "potato" = 1, "meat" = 1, "valids" = 1) + foodtype = VEGETABLES | MEAT | FRIED | JUNKFOOD | FRUIT /obj/item/weapon/reagent_containers/food/snacks/salad/oatmeal name = "oatmeal" @@ -43,6 +47,7 @@ bonus_reagents = list("nutriment" = 4, "vitamin" = 4) list_reagents = list("nutriment" = 7, "milk" = 10, "vitamin" = 2) tastes = list("oats" = 1, "milk" = 1) + foodtype = DAIRY | GRAIN /obj/item/weapon/reagent_containers/food/snacks/salad/fruit name = "fruit salad" @@ -50,6 +55,7 @@ icon_state = "fruitsalad" bonus_reagents = list("nutriment" = 2, "vitamin" = 4) tastes = list("fruit" = 1) + foodtype = FRUIT /obj/item/weapon/reagent_containers/food/snacks/salad/jungle name = "jungle salad" @@ -58,6 +64,7 @@ bonus_reagents = list("nutriment" = 4, "vitamin" = 4) list_reagents = list("nutriment" = 7, "banana" = 5, "vitamin" = 4) tastes = list("fruit" = 1, "the jungle" = 1) + foodtype = FRUIT /obj/item/weapon/reagent_containers/food/snacks/salad/citrusdelight name = "citrus delight" @@ -66,6 +73,7 @@ bonus_reagents = list("nutriment" = 4, "vitamin" = 4) list_reagents = list("nutriment" = 7, "vitamin" = 5) tastes = list("sourness" = 1, "leaves" = 1) + foodtype = FRUIT /obj/item/weapon/reagent_containers/food/snacks/salad/ricebowl name = "ricebowl" @@ -74,6 +82,7 @@ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/salad/boiledrice list_reagents = list("nutriment" = 4) tastes = list("rice" = 1) + foodtype = GRAIN | RAW /obj/item/weapon/reagent_containers/food/snacks/salad/boiledrice name = "boiled rice" @@ -82,6 +91,7 @@ bonus_reagents = list("nutriment" = 1, "vitamin" = 1) list_reagents = list("nutriment" = 5, "vitamin" = 1) tastes = list("rice" = 1) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/salad/ricepudding name = "rice pudding" @@ -89,6 +99,7 @@ icon_state = "ricepudding" bonus_reagents = list("nutriment" = 4, "vitamin" = 2) tastes = list("rice" = 1, "sweetness" = 1) + foodtype = GRAIN | DAIRY /obj/item/weapon/reagent_containers/food/snacks/salad/ricepork name = "rice and pork" @@ -96,6 +107,7 @@ icon_state = "riceporkbowl" bonus_reagents = list("nutriment" = 4, "vitamin" = 4) tastes = list("rice" = 1, "meat" = 1) + foodtype = GRAIN | MEAT /obj/item/weapon/reagent_containers/food/snacks/salad/eggbowl name = "egg bowl" @@ -103,3 +115,4 @@ icon_state = "eggbowl" bonus_reagents = list("nutriment" = 4, "vitamin" = 4) tastes = list("rice" = 1, "egg" = 1) + foodtype = GRAIN | MEAT //EGG = MEAT -NinjaNomNom 2017 diff --git a/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm b/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm index 9618ad28754..45551e086f5 100644 --- a/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm +++ b/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm @@ -8,6 +8,7 @@ list_reagents = list("nutriment" = 6, "vitamin" = 1) cooked_type = /obj/item/weapon/reagent_containers/food/snacks/toastedsandwich tastes = list("meat" = 2, "cheese" = 1, "bread" = 2, "lettuce" = 1) + foodtype = GRAIN | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/toastedsandwich name = "toasted sandwich" @@ -18,6 +19,7 @@ bonus_reagents = list("nutriment" = 1, "carbon" = 2) list_reagents = list("nutriment" = 6, "carbon" = 2) tastes = list("toast" = 1) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/grilledcheese name = "grilled cheese sandwich" @@ -28,6 +30,7 @@ bonus_reagents = list("nutriment" = 1, "vitamin" = 1) list_reagents = list("nutriment" = 7, "vitamin" = 1) tastes = list("toast" = 1, "cheese" = 1) + foodtype = GRAIN | DAIRY /obj/item/weapon/reagent_containers/food/snacks/jellysandwich name = "jelly sandwich" @@ -37,14 +40,17 @@ trash = /obj/item/trash/plate bitesize = 3 tastes = list("bread" = 1, "jelly" = 1) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/slime bonus_reagents = list("slimejelly" = 5, "vitamin" = 2) list_reagents = list("nutriment" = 2, "slimejelly" = 5, "vitamin" = 2) + foodtype = GRAIN | TOXIC /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/cherry bonus_reagents = list("cherryjelly" = 5, "vitamin" = 2) list_reagents = list("nutriment" = 2, "cherryjelly" = 5, "vitamin" = 2) + foodtype = GRAIN | FRUIT /obj/item/weapon/reagent_containers/food/snacks/icecreamsandwich name = "icecream sandwich" @@ -54,6 +60,7 @@ bonus_reagents = list("nutriment" = 1, "ice" = 2) list_reagents = list("nutriment" = 2, "ice" = 2) tastes = list("ice cream" = 1) + foodtype = GRAIN | DAIRY /obj/item/weapon/reagent_containers/food/snacks/notasandwich name = "not-a-sandwich" @@ -64,6 +71,7 @@ bonus_reagents = list("vitamin" = 6) list_reagents = list("nutriment" = 6, "vitamin" = 6) tastes = list("nothing suspicious" = 1) + foodtype = GRAIN | GROSS /obj/item/weapon/reagent_containers/food/snacks/jelliedtoast name = "jellied toast" @@ -73,14 +81,17 @@ trash = /obj/item/trash/plate bitesize = 3 tastes = list("toast" = 1, "jelly" = 1) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/cherry bonus_reagents = list("cherryjelly" = 5, "vitamin" = 2) list_reagents = list("nutriment" = 1, "cherryjelly" = 5, "vitamin" = 2) + foodtype = GRAIN | FRUIT /obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/slime bonus_reagents = list("slimejelly" = 5, "vitamin" = 2) list_reagents = list("nutriment" = 1, "slimejelly" = 5, "vitamin" = 2) + foodtype = GRAIN | TOXIC /obj/item/weapon/reagent_containers/food/snacks/twobread name = "two bread" @@ -90,3 +101,4 @@ bonus_reagents = list("nutriment" = 1, "vitamin" = 2) list_reagents = list("nutriment" = 2, "vitamin" = 2) tastes = list("bread" = 2) + foodtype = GRAIN diff --git a/code/modules/food_and_drinks/food/snacks_soup.dm b/code/modules/food_and_drinks/food/snacks_soup.dm index e11231fdfc6..b36b3ba5af9 100644 --- a/code/modules/food_and_drinks/food/snacks_soup.dm +++ b/code/modules/food_and_drinks/food/snacks_soup.dm @@ -6,6 +6,7 @@ volume = 80 list_reagents = list("nutriment" = 8, "water" = 5, "vitamin" = 4) tastes = list("tasteless soup" = 1) + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/soup/New() ..() @@ -27,6 +28,7 @@ if(wish_true) reagents.add_reagent("nutriment", 9) reagents.add_reagent("vitamin", 1) + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/soup/meatball name = "meatball soup" @@ -34,6 +36,7 @@ icon_state = "meatballsoup" bonus_reagents = list("nutriment" = 1, "vitamin" = 5) tastes = list("meat" = 1) + foodtype = MEAT /obj/item/weapon/reagent_containers/food/snacks/soup/slime name = "slime soup" @@ -42,6 +45,7 @@ bonus_reagents = list("nutriment" = 1, "slimejelly" = 5, "vitamin" = 5) list_reagents = list("nutriment" = 5, "slimejelly" = 5, "water" = 5, "vitamin" = 4) tastes = list("slime" = 1) + foodtype = TOXIC /obj/item/weapon/reagent_containers/food/snacks/soup/blood name = "tomato soup" @@ -50,6 +54,7 @@ bonus_reagents = list("nutriment" = 1, "vitamin" = 6) list_reagents = list("nutriment" = 2, "blood" = 10, "water" = 5, "vitamin" = 4) tastes = list("iron" = 1) + foodtype = GROSS /obj/item/weapon/reagent_containers/food/snacks/soup/wingfangchu name = "wing fang chu" @@ -59,6 +64,7 @@ bonus_reagents = list("nutriment" = 1, "vitamin" = 2) list_reagents = list("nutriment" = 6, "soysauce" = 5, "vitamin" = 2) tastes = list("soy" = 1) + foodtype = MEAT /obj/item/weapon/reagent_containers/food/snacks/soup/clownstears name = "clown's tears" @@ -67,6 +73,7 @@ bonus_reagents = list("nutriment" = 1, "banana" = 5, "vitamin" = 8) list_reagents = list("nutriment" = 4, "banana" = 5, "water" = 5, "vitamin" = 8) tastes = list("a bad joke" = 1) + foodtype = FRUIT /obj/item/weapon/reagent_containers/food/snacks/soup/vegetable name = "vegetable soup" @@ -74,6 +81,7 @@ icon_state = "vegetablesoup" bonus_reagents = list("nutriment" = 1, "vitamin" = 4) tastes = list("vegetables" = 1) + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/soup/nettle name = "nettle soup" @@ -81,6 +89,7 @@ icon_state = "nettlesoup" bonus_reagents = list("nutriment" = 1, "omnizine" = 5, "vitamin" = 5) tastes = list("nettles" = 1) + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/soup/mystery name = "mystery soup" @@ -103,6 +112,7 @@ bonus_reagents = list("nutriment" = 1, "tomatojuice" = 2, "vitamin" = 2) list_reagents = list("nutriment" = 5, "capsaicin" = 1, "tomatojuice" = 2, "vitamin" = 2) tastes = list("hot peppers" = 1) + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/soup/coldchili name = "cold chili" @@ -111,6 +121,7 @@ bonus_reagents = list("nutriment" = 1, "tomatojuice" = 2, "vitamin" = 2) list_reagents = list("nutriment" = 5, "frostoil" = 1, "tomatojuice" = 2, "vitamin" = 2) tastes = list("tomato" = 1, "mint" = 1) + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/soup/monkeysdelight name = "monkey's delight" @@ -119,6 +130,7 @@ bonus_reagents = list("nutriment" = 1, "vitamin" = 5) list_reagents = list("nutriment" = 10, "banana" = 5, "vitamin" = 5) tastes = list("the jungle" = 1, "banana" = 1) + foodtype = FRUIT /obj/item/weapon/reagent_containers/food/snacks/soup/tomato name = "tomato soup" @@ -127,6 +139,7 @@ bonus_reagents = list("nutriment" = 1, "tomatojuice" = 10, "vitamin" = 3) list_reagents = list("nutriment" = 5, "tomatojuice" = 10, "vitamin" = 3) tastes = list("tomato" = 1) + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/soup/tomato/eyeball name = "eyeball soup" @@ -134,6 +147,7 @@ icon_state = "eyeballsoup" bonus_reagents = list("nutriment" = 1, "liquidgibs" = 3) tastes = list("tomato" = 1, "squirming" = 1) + foodtype = MEAT | GROSS /obj/item/weapon/reagent_containers/food/snacks/soup/milo name = "milosoup" @@ -141,6 +155,7 @@ icon_state = "milosoup" bonus_reagents = list("nutriment" = 1, "vitamin" = 3) tastes = list("milo" = 1) // wtf is milo + foodtype = GROSS /obj/item/weapon/reagent_containers/food/snacks/soup/mushroom name = "chantrelle soup" @@ -149,12 +164,14 @@ bonus_reagents = list("nutriment" = 1, "vitamin" = 5) list_reagents = list("nutriment" = 8, "vitamin" = 4) tastes = list("mushroom" = 1) + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/soup/beet name = "beet soup" desc = "Wait, how do you spell it again..?" icon_state = "beetsoup" bonus_reagents = list("nutriment" = 1, "vitamin" = 5) + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/soup/beet/New() ..() @@ -170,6 +187,7 @@ bonus_reagents = list("nutriment" = 1, "vitamin" = 5) list_reagents = list("nutriment" = 6, "mushroomhallucinogen" = 6) tastes = list("jelly" = 1, "mushroom" = 1) + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/soup/amanitajelly name = "amanita jelly" @@ -179,6 +197,7 @@ bonus_reagents = list("nutriment" = 1, "vitamin" = 5) list_reagents = list("nutriment" = 6, "mushroomhallucinogen" = 3, "amatoxin" = 6) tastes = list("jelly" = 1, "mushroom" = 1) + foodtype = VEGETABLES | TOXIC /obj/item/weapon/reagent_containers/food/snacks/soup/stew name = "stew" @@ -189,6 +208,7 @@ bitesize = 7 volume = 100 tastes = list("tomato" = 1, "carrot" = 1) + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/soup/sweetpotato name = "sweet potato soup" @@ -196,6 +216,7 @@ icon_state = "sweetpotatosoup" bonus_reagents = list("nutriment" = 4, "vitamin" = 5) tastes = list("sweet potato" = 1) + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/soup/beet/red name = "red beet soup" @@ -203,3 +224,4 @@ icon_state = "redbeetsoup" bonus_reagents = list("nutriment" = 4, "vitamin" = 6) tastes = list("beet" = 1) + foodtype = VEGETABLES diff --git a/code/modules/food_and_drinks/food/snacks_spaghetti.dm b/code/modules/food_and_drinks/food/snacks_spaghetti.dm index 8cd46659182..e137d9702cc 100644 --- a/code/modules/food_and_drinks/food/snacks_spaghetti.dm +++ b/code/modules/food_and_drinks/food/snacks_spaghetti.dm @@ -8,6 +8,7 @@ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/boiledspaghetti filling_color = "#F0E68C" tastes = list("pasta" = 1) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/boiledspaghetti name = "boiled spaghetti" @@ -20,6 +21,7 @@ custom_food_type = /obj/item/weapon/reagent_containers/food/snacks/customizable/pasta filling_color = "#F0E68C" tastes = list("pasta" = 1) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/pastatomato name = "spaghetti" @@ -32,6 +34,7 @@ list_reagents = list("nutriment" = 6, "tomatojuice" = 10, "vitamin" = 4) filling_color = "#DC143C" tastes = list("pasta" = 1, "tomato" = 1) + foodtype = GRAIN | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/copypasta name = "copypasta" @@ -44,6 +47,7 @@ list_reagents = list("nutriment" = 12, "tomatojuice" = 20, "vitamin" = 8) filling_color = "#DC143C" tastes = list("pasta" = 1, "tomato" = 1) + foodtype = GRAIN | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/meatballspaghetti name = "spaghetti and meatballs" @@ -55,6 +59,7 @@ list_reagents = list("nutriment" = 8, "vitamin" = 4) filling_color = "#F0E68C" tastes = list("pasta" = 1, "tomato" = 1, "meat" = 1) + foodtype = GRAIN | MEAT /obj/item/weapon/reagent_containers/food/snacks/spesslaw name = "spesslaw" @@ -66,6 +71,7 @@ list_reagents = list("nutriment" = 8, "vitamin" = 6) filling_color = "#F0E68C" tastes = list("pasta" = 1, "tomato" = 1, "meat" = 1) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/chowmein name = "chow mein" @@ -76,6 +82,7 @@ bonus_reagents = list("nutriment" = 3, "vitamin" = 4) list_reagents = list("nutriment" = 7, "vitamin" = 6) tastes = list("noodle" = 1, "tomato" = 1) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/snacks/beefnoodle name = "beef noodle" @@ -85,6 +92,7 @@ trash = /obj/item/weapon/reagent_containers/glass/bowl bonus_reagents = list("nutriment" = 5, "vitamin" = 6, "liquidgibs" = 3) tastes = list("noodle" = 1, "meat" = 1) + foodtype = GRAIN | MEAT /obj/item/weapon/reagent_containers/food/snacks/butternoodles name = "butter noodles" @@ -94,3 +102,4 @@ trash = /obj/item/trash/plate bonus_reagents = list("nutriment" = 8, "vitamin" = 1) tastes = list("noodle" = 1, "butter" = 1) + foodtype = GRAIN | DAIRY diff --git a/code/modules/food_and_drinks/food/snacks_vend.dm b/code/modules/food_and_drinks/food/snacks_vend.dm index 200659ac0eb..ddf21c33384 100644 --- a/code/modules/food_and_drinks/food/snacks_vend.dm +++ b/code/modules/food_and_drinks/food/snacks_vend.dm @@ -11,6 +11,7 @@ junkiness = 25 filling_color = "#D2691E" tastes = list("candy" = 1) + foodtype = JUNKFOOD /obj/item/weapon/reagent_containers/food/snacks/sosjerky name = "\improper Scaredy's Private Reserve Beef Jerky" @@ -21,6 +22,7 @@ junkiness = 25 filling_color = "#8B0000" tastes = list("dried meat" = 1) + foodtype = JUNKFOOD | MEAT /obj/item/weapon/reagent_containers/food/snacks/sosjerky/healthy name = "homemade beef jerky" @@ -38,6 +40,7 @@ junkiness = 20 filling_color = "#FFD700" tastes = list("salt" = 1, "crisps" = 1) + foodtype = JUNKFOOD | FRIED /obj/item/weapon/reagent_containers/food/snacks/no_raisin name = "4no raisins" @@ -48,12 +51,14 @@ junkiness = 25 filling_color = "#8B0000" tastes = list("dried raisins" = 1) + foodtype = JUNKFOOD | FRUIT /obj/item/weapon/reagent_containers/food/snacks/no_raisin/healthy name = "homemade raisins" desc = "homemade raisins, the best in all of spess." list_reagents = list("nutriment" = 3, "vitamin" = 2) junkiness = 0 + foodtype = FRUIT /obj/item/weapon/reagent_containers/food/snacks/spacetwinkie name = "space twinkie" @@ -62,6 +67,7 @@ list_reagents = list("sugar" = 4) junkiness = 25 filling_color = "#FFD700" + foodtype = JUNKFOOD | GRAIN /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers name = "cheesie honkers" @@ -72,6 +78,7 @@ junkiness = 25 filling_color = "#FFD700" tastes = list("cheese" = 5, "crisps" = 2) + foodtype = JUNKFOOD | DAIRY /obj/item/weapon/reagent_containers/food/snacks/syndicake name = "syndi-cakes" @@ -81,3 +88,4 @@ list_reagents = list("nutriment" = 4, "doctorsdelight" = 5) filling_color = "#F5F5DC" tastes = list("sweetness" = 3, "cake" = 1) + foodtype = GRAIN | FRUIT | VEGETABLES diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm index e21bda82ed1..977f13a6369 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm @@ -112,6 +112,7 @@ insert ascii eagle on american flag background here S.name = "the physical manifestation of the very concept of fried foods" S.desc = "A heavily fried...something. Who can tell anymore?" S.filling_color = S.color + S.foodtype |= FRIED if(istype(frying, /obj/item/weapon/reagent_containers/food/snacks/)) qdel(frying) else diff --git a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm index b5c02946e74..64f1fbca9c2 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm @@ -177,6 +177,7 @@ var/ice_creamed = 0 var/cone_type bitesize = 3 + foodtype = DAIRY /obj/item/weapon/reagent_containers/food/snacks/icecream/Initialize() . = ..() diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm index 4a150faad77..313199c0536 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm @@ -248,7 +248,7 @@ /datum/crafting_recipe/food/ratburger name = "Rat burger" reqs = list( - /obj/item/trash/deadmouse = 1, + /obj/item/weapon/reagent_containers/food/snacks/deadmouse = 1, /obj/item/weapon/reagent_containers/food/snacks/bun = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/rat diff --git a/code/modules/hydroponics/grown/ambrosia.dm b/code/modules/hydroponics/grown/ambrosia.dm index 51b8f3c43ef..702302dadfc 100644 --- a/code/modules/hydroponics/grown/ambrosia.dm +++ b/code/modules/hydroponics/grown/ambrosia.dm @@ -7,6 +7,7 @@ slot_flags = SLOT_HEAD filling_color = "#008000" bitesize_mod = 2 + foodtype = VEGETABLES // Ambrosia Vulgaris /obj/item/seeds/ambrosia diff --git a/code/modules/hydroponics/grown/apple.dm b/code/modules/hydroponics/grown/apple.dm index 4d4712e0931..f5b4e7ab765 100644 --- a/code/modules/hydroponics/grown/apple.dm +++ b/code/modules/hydroponics/grown/apple.dm @@ -23,6 +23,7 @@ icon_state = "apple" filling_color = "#FF4500" bitesize = 100 // Always eat the apple in one bite + foodtype = FRUIT // Posioned Apple /obj/item/seeds/apple/poisoned @@ -33,6 +34,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/apple/poisoned seed = /obj/item/seeds/apple/poisoned + foodtype = FRUIT | TOXIC // Gold Apple /obj/item/seeds/apple/gold diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm index 91b096bc389..e2dce252e75 100644 --- a/code/modules/hydroponics/grown/banana.dm +++ b/code/modules/hydroponics/grown/banana.dm @@ -23,6 +23,7 @@ trash = /obj/item/weapon/grown/bananapeel filling_color = "#FFFF00" bitesize = 5 + foodtype = FRUIT /obj/item/weapon/reagent_containers/food/snacks/grown/banana/suicide_act(mob/user) user.visible_message("[user] is aiming [src] at [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide!") diff --git a/code/modules/hydroponics/grown/beans.dm b/code/modules/hydroponics/grown/beans.dm index 277dfd06298..756c23ff14e 100644 --- a/code/modules/hydroponics/grown/beans.dm +++ b/code/modules/hydroponics/grown/beans.dm @@ -25,6 +25,7 @@ icon_state = "soybeans" filling_color = "#F0E68C" bitesize_mod = 2 + foodtype = VEGETABLES // Koibean /obj/item/seeds/soya/koi @@ -45,4 +46,5 @@ desc = "Something about these seems fishy." icon_state = "koibeans" filling_color = "#F0E68C" - bitesize_mod = 2 \ No newline at end of file + bitesize_mod = 2 + foodtype = VEGETABLES diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm index 6ab8a98ac6b..b12685557e6 100644 --- a/code/modules/hydroponics/grown/berries.dm +++ b/code/modules/hydroponics/grown/berries.dm @@ -25,6 +25,7 @@ gender = PLURAL filling_color = "#FF00FF" bitesize_mod = 2 + foodtype = FRUIT // Poison Berries /obj/item/seeds/berry/poison @@ -44,6 +45,7 @@ desc = "Taste so good, you could die!" icon_state = "poisonberrypile" filling_color = "#C71585" + foodtype = FRUIT | TOXIC // Death Berries /obj/item/seeds/berry/death @@ -65,6 +67,7 @@ desc = "Taste so good, you could die!" icon_state = "deathberrypile" filling_color = "#708090" + foodtype = FRUIT | TOXIC // Glow Berries /obj/item/seeds/berry/glow @@ -88,6 +91,7 @@ icon_state = "glowberrypile" filling_color = "#7CFC00" origin_tech = "plasmatech=6" + foodtype = FRUIT // Cherries /obj/item/seeds/cherry @@ -117,6 +121,7 @@ gender = PLURAL filling_color = "#FF0000" bitesize_mod = 2 + foodtype = FRUIT // Blue Cherries /obj/item/seeds/cherry/blue @@ -137,6 +142,7 @@ icon_state = "bluecherry" filling_color = "#6495ED" bitesize_mod = 2 + foodtype = FRUIT // Grapes /obj/item/seeds/grape @@ -167,6 +173,7 @@ dried_type = /obj/item/weapon/reagent_containers/food/snacks/no_raisin/healthy filling_color = "#FF1493" bitesize_mod = 2 + foodtype = FRUIT // Green Grapes /obj/item/seeds/grape/green diff --git a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm index 2788e0ba132..0afb4d4d9cd 100644 --- a/code/modules/hydroponics/grown/cannabis.dm +++ b/code/modules/hydroponics/grown/cannabis.dm @@ -90,6 +90,7 @@ icon_state = "cannabis" filling_color = "#00FF00" bitesize_mod = 2 + foodtype = VEGETABLES //i dont really know what else weed could be to be honest /obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/rainbow diff --git a/code/modules/hydroponics/grown/cereals.dm b/code/modules/hydroponics/grown/cereals.dm index 66c5a17a841..0a6e0d255dc 100644 --- a/code/modules/hydroponics/grown/cereals.dm +++ b/code/modules/hydroponics/grown/cereals.dm @@ -21,6 +21,7 @@ icon_state = "wheat" filling_color = "#F0E68C" bitesize_mod = 2 + foodtype = GRAIN // Oat /obj/item/seeds/wheat/oat @@ -40,6 +41,7 @@ icon_state = "oat" filling_color = "#556B2F" bitesize_mod = 2 + foodtype = GRAIN // Rice /obj/item/seeds/wheat/rice @@ -60,6 +62,7 @@ icon_state = "rice" filling_color = "#FAFAD2" bitesize_mod = 2 + foodtype = GRAIN //Meatwheat - grows into synthetic meat /obj/item/seeds/wheat/meat @@ -79,6 +82,7 @@ filling_color = rgb(150, 0, 0) bitesize_mod = 2 seed = /obj/item/seeds/wheat/meat + foodtype = MEAT | GRAIN /obj/item/weapon/reagent_containers/food/snacks/grown/meatwheat/attack_self(mob/living/user) user.visible_message("[user] crushes [src] into meat.", "You crush [src] into something that resembles meat.") diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm index 7707a4d4385..3ac72acd122 100644 --- a/code/modules/hydroponics/grown/chili.dm +++ b/code/modules/hydroponics/grown/chili.dm @@ -25,6 +25,7 @@ icon_state = "chilipepper" filling_color = "#FF0000" bitesize_mod = 2 + foodtype = VEGETABLES // Ice Chili /obj/item/seeds/chili/ice @@ -49,6 +50,7 @@ filling_color = "#0000CD" bitesize_mod = 2 origin_tech = "biotech=4" + foodtype = VEGETABLES // Ghost Chili /obj/item/seeds/chili/ghost @@ -75,6 +77,7 @@ filling_color = "#F8F8FF" bitesize_mod = 4 origin_tech = "biotech=4;magnets=5" + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/attack_hand(mob/user) ..() diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm index 133d0d71f41..a6e7ef92110 100644 --- a/code/modules/hydroponics/grown/citrus.dm +++ b/code/modules/hydroponics/grown/citrus.dm @@ -5,6 +5,7 @@ desc = "It's so sour, your face will twist." icon_state = "lime" bitesize_mod = 2 + foodtype = FRUIT // Lime /obj/item/seeds/lime @@ -104,6 +105,7 @@ desc = "Made for burning houses down." icon_state = "firelemon" bitesize_mod = 2 + foodtype = FRUIT /obj/item/weapon/reagent_containers/food/snacks/grown/firelemon/attack_self(mob/living/user) var/area/A = get_area(user) diff --git a/code/modules/hydroponics/grown/cocoa_vanilla.dm b/code/modules/hydroponics/grown/cocoa_vanilla.dm index 6e04bdaf97d..35fb9b1eaf1 100644 --- a/code/modules/hydroponics/grown/cocoa_vanilla.dm +++ b/code/modules/hydroponics/grown/cocoa_vanilla.dm @@ -25,6 +25,7 @@ icon_state = "cocoapod" filling_color = "#FFD700" bitesize_mod = 2 + foodtype = VEGETABLES // Vanilla Pod /obj/item/seeds/cocoapod/vanillapod @@ -43,4 +44,5 @@ name = "vanilla pod" desc = "Fattening... Mmmmm... vanilla." icon_state = "vanillapod" - filling_color = "#FFD700" \ No newline at end of file + filling_color = "#FFD700" + foodtype = VEGETABLES diff --git a/code/modules/hydroponics/grown/corn.dm b/code/modules/hydroponics/grown/corn.dm index 59e7a0c0085..9c0a12bc4b7 100644 --- a/code/modules/hydroponics/grown/corn.dm +++ b/code/modules/hydroponics/grown/corn.dm @@ -24,6 +24,7 @@ filling_color = "#FFFF00" trash = /obj/item/weapon/grown/corncob bitesize_mod = 2 + foodtype = VEGETABLES /obj/item/weapon/grown/corncob name = "corn cob" @@ -79,4 +80,4 @@ snap_pops -= 1 if(!snap_pops) new /obj/item/weapon/grown/corncob(user.loc) - qdel(src) \ No newline at end of file + qdel(src) diff --git a/code/modules/hydroponics/grown/eggplant.dm b/code/modules/hydroponics/grown/eggplant.dm index 8ec46ff77de..1cad3917f2f 100644 --- a/code/modules/hydroponics/grown/eggplant.dm +++ b/code/modules/hydroponics/grown/eggplant.dm @@ -22,6 +22,7 @@ icon_state = "eggplant" filling_color = "#800080" bitesize_mod = 2 + foodtype = FRUIT // Egg-Plant /obj/item/seeds/eggplant/eggy @@ -41,4 +42,5 @@ icon_state = "eggyplant" trash = /obj/item/weapon/reagent_containers/food/snacks/egg filling_color = "#F8F8FF" - bitesize_mod = 2 \ No newline at end of file + bitesize_mod = 2 + foodtype = MEAT diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index 881e47238e4..9d1e3037ad7 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -25,6 +25,7 @@ slot_flags = SLOT_HEAD filling_color = "#FF6347" bitesize_mod = 3 + foodtype = VEGETABLES | GROSS // Lily /obj/item/seeds/poppy/lily diff --git a/code/modules/hydroponics/grown/kudzu.dm b/code/modules/hydroponics/grown/kudzu.dm index 45269743a5d..ad32be14d55 100644 --- a/code/modules/hydroponics/grown/kudzu.dm +++ b/code/modules/hydroponics/grown/kudzu.dm @@ -99,4 +99,5 @@ desc = "Pueraria Virallis: An invasive species with vines that rapidly creep and wrap around whatever they contact." icon_state = "kudzupod" filling_color = "#6B8E23" - bitesize_mod = 2 \ No newline at end of file + bitesize_mod = 2 + foodtype = VEGETABLES | GROSS diff --git a/code/modules/hydroponics/grown/melon.dm b/code/modules/hydroponics/grown/melon.dm index 4c6fa15b04f..3cbbe494519 100644 --- a/code/modules/hydroponics/grown/melon.dm +++ b/code/modules/hydroponics/grown/melon.dm @@ -25,6 +25,7 @@ w_class = WEIGHT_CLASS_NORMAL filling_color = "#008000" bitesize_mod = 3 + foodtype = FRUIT // Holymelon /obj/item/seeds/watermelon/holy diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm index f96f7d821b0..cc750e61001 100644 --- a/code/modules/hydroponics/grown/misc.dm +++ b/code/modules/hydroponics/grown/misc.dm @@ -54,6 +54,7 @@ icon_state = "cabbage" filling_color = "#90EE90" bitesize_mod = 2 + foodtype = VEGETABLES // Sugarcane @@ -79,6 +80,7 @@ icon_state = "sugarcane" filling_color = "#FFD700" bitesize_mod = 2 + foodtype = VEGETABLES // Gatfruit @@ -109,6 +111,7 @@ origin_tech = "combat=6" trash = /obj/item/weapon/gun/ballistic/revolver bitesize_mod = 2 + foodtype = FRUIT //Cherry Bombs /obj/item/seeds/cherry/bomb diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm index 18f6353ba23..62bdacda88d 100644 --- a/code/modules/hydroponics/grown/mushrooms.dm +++ b/code/modules/hydroponics/grown/mushrooms.dm @@ -1,6 +1,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom name = "mushroom" bitesize_mod = 2 + foodtype = VEGETABLES // Reishi @@ -22,6 +23,8 @@ growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi' reagents_add = list("morphine" = 0.35, "charcoal" = 0.35, "nutriment" = 0) + + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi seed = /obj/item/seeds/reishi name = "reishi" @@ -29,7 +32,6 @@ icon_state = "reishi" filling_color = "#FF4500" - // Fly Amanita /obj/item/seeds/amanita name = "pack of fly amanita mycelium" diff --git a/code/modules/hydroponics/grown/potato.dm b/code/modules/hydroponics/grown/potato.dm index 12d8e46ccd3..95cadfe9798 100644 --- a/code/modules/hydroponics/grown/potato.dm +++ b/code/modules/hydroponics/grown/potato.dm @@ -25,6 +25,7 @@ icon_state = "potato" filling_color = "#E9967A" bitesize = 100 + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/grown/potato/wedges @@ -61,4 +62,4 @@ seed = /obj/item/seeds/potato/sweet name = "sweet potato" desc = "It's sweet." - icon_state = "sweetpotato" \ No newline at end of file + icon_state = "sweetpotato" diff --git a/code/modules/hydroponics/grown/pumpkin.dm b/code/modules/hydroponics/grown/pumpkin.dm index 1354edbcaa1..4e7bc179d39 100644 --- a/code/modules/hydroponics/grown/pumpkin.dm +++ b/code/modules/hydroponics/grown/pumpkin.dm @@ -23,6 +23,7 @@ icon_state = "pumpkin" filling_color = "#FFA500" bitesize_mod = 2 + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(W.is_sharp()) @@ -52,3 +53,4 @@ icon_state = "blumpkin" filling_color = "#87CEFA" bitesize_mod = 2 + foodtype = VEGETABLES \ No newline at end of file diff --git a/code/modules/hydroponics/grown/root.dm b/code/modules/hydroponics/grown/root.dm index 7794148f0e0..7a4547bd1de 100644 --- a/code/modules/hydroponics/grown/root.dm +++ b/code/modules/hydroponics/grown/root.dm @@ -21,6 +21,7 @@ icon_state = "carrot" filling_color = "#FFA500" bitesize_mod = 2 + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/grown/carrot/attackby(obj/item/I, mob/user, params) if(I.is_sharp()) @@ -50,6 +51,7 @@ desc = "Closely related to carrots." icon_state = "parsnip" bitesize_mod = 2 + foodtype = VEGETABLES // White-Beet @@ -75,6 +77,7 @@ icon_state = "whitebeet" filling_color = "#F4A460" bitesize_mod = 2 + foodtype = VEGETABLES // Red Beet /obj/item/seeds/redbeet @@ -98,3 +101,4 @@ desc = "You can't beat red beet." icon_state = "redbeet" bitesize_mod = 2 + foodtype = VEGETABLES diff --git a/code/modules/hydroponics/grown/tomato.dm b/code/modules/hydroponics/grown/tomato.dm index 4a8faa6829b..24780216a20 100644 --- a/code/modules/hydroponics/grown/tomato.dm +++ b/code/modules/hydroponics/grown/tomato.dm @@ -22,6 +22,7 @@ splat_type = /obj/effect/decal/cleanable/tomato_smudge filling_color = "#FF6347" bitesize_mod = 2 + foodtype = VEGETABLES // Blood Tomato /obj/item/seeds/tomato/blood @@ -43,7 +44,7 @@ splat_type = /obj/effect/gibspawner/generic filling_color = "#FF0000" origin_tech = "biotech=5" - + foodtype = VEGETABLES | GROSS // Blue Tomato /obj/item/seeds/tomato/blue From 2312ff09bea0438febe8aa1f0a9dc3efb377f25c Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Wed, 19 Jul 2017 11:19:52 +0200 Subject: [PATCH 02/27] Fixing conflicts --- code/__DEFINES/food.dm | 11 ++++++ code/_onclick/hud/alert.dm | 15 ++++++++ .../game/objects/effects/spawners/lootdrop.dm | 2 +- .../items/weapons/grenades/chem_grenade.dm | 18 +++++++++ .../food_and_drinks/food/snacks_other.dm | 1 + code/modules/hydroponics/grown/mushrooms.dm | 1 + .../mob/living/carbon/human/examine.dm | 7 ++++ .../modules/mob/living/carbon/status_procs.dm | 37 +++++++++++++++++++ code/modules/mob/living/death.dm | 1 + .../living/simple_animal/friendly/mouse.dm | 10 +++-- code/modules/mob/mob_defines.dm | 1 + code/modules/mob/status_procs.dm | 8 ++++ .../chemistry/reagents/medicine_reagents.dm | 1 + code/modules/surgery/organs/organ_internal.dm | 1 + 14 files changed, 110 insertions(+), 4 deletions(-) create mode 100644 code/__DEFINES/food.dm diff --git a/code/__DEFINES/food.dm b/code/__DEFINES/food.dm new file mode 100644 index 00000000000..b7d52cca4c7 --- /dev/null +++ b/code/__DEFINES/food.dm @@ -0,0 +1,11 @@ +#define MEAT 1 +#define VEGETABLES 2 +#define RAW 4 +#define JUNKFOOD 8 +#define GRAIN 16 +#define FRUIT 32 +#define DAIRY 64 +#define FRIED 128 +#define ALCOHOL 256 +#define GROSS 512 +#define TOXIC 1024 diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index b944f327547..44cc12ff1d4 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -166,6 +166,21 @@ desc = "You're severely malnourished. The hunger pains make moving around a chore." icon_state = "starving" +/obj/screen/alert/gross + name = "Grossed out." + desc = "That was kind of gross..." + icon_state = "gross" + +/obj/screen/alert/verygross + name = "Very grossed out." + desc = "I'm not feeling very well.." + icon_state = "gross2" + +/obj/screen/alert/disgusted + name = "DISGUSTED" + desc = "ABSOLUTELY DISGUSTIN'" + icon_state = "gross3" + /obj/screen/alert/hot name = "Too Hot" desc = "You're flaming hot! Get somewhere cooler and take off any insulating clothing like a fire suit." diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index a9798800a0d..edff2653ca1 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -46,7 +46,7 @@ /obj/item/trash/cheesie = 1, /obj/item/trash/candy = 1, /obj/item/trash/chips = 1, - /obj/item/trash/deadmouse = 1, + /obj/item/weapon/reagent_containers/food/snacks/deadmouse = 1, /obj/item/trash/pistachios = 1, /obj/item/trash/plate = 1, /obj/item/trash/popcorn = 1, diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 0dcdf1d7b66..63c64f16d01 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -548,6 +548,24 @@ beakers += B1 beakers += B2 +/obj/item/weapon/grenade/chem_grenade/pukonium + name = "pukonium grenade" + desc = "Filled with some of the most rancid stuff ever, will probably make anyone within a mile of it dry heave." + stage = READY + +/obj/item/weapon/grenade/chem_grenade/pukonium/New() + ..() + var/obj/item/weapon/reagent_containers/glass/beaker/large/B1 = new(src) + var/obj/item/weapon/reagent_containers/glass/beaker/large/B2 = new(src) + + B1.reagents.add_reagent("pukonium", 60) + B1.reagents.add_reagent("potassium", 40) + B2.reagents.add_reagent("phosphorus", 40) + B2.reagents.add_reagent("sugar", 40) + + beakers += B1 + beakers += B2 + #undef EMPTY #undef WIRED #undef READY diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index 2a1920a04e7..0ef06108f96 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -161,6 +161,7 @@ trash = /obj/item/trash/plate list_reagents = list("minttoxin" = 1) filling_color = "#800000" + foodtype = TOXIC /obj/item/weapon/reagent_containers/food/snacks/eggwrap name = "egg wrap" diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm index 62bdacda88d..088a9aa144c 100644 --- a/code/modules/hydroponics/grown/mushrooms.dm +++ b/code/modules/hydroponics/grown/mushrooms.dm @@ -25,6 +25,7 @@ + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi seed = /obj/item/seeds/reishi name = "reishi" diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index b6b4a2e78c2..5dd0bf69f4c 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -225,6 +225,13 @@ else msg += "[t_He] [t_is] quite chubby.\n" + if(disgust >= DISGUST_LEVEL_DISGUSTED) + msg += "[t_He] looks disgusted.\n" + else if(disgust >= DISGUST_LEVEL_VERYGROSS) + msg += "[t_He] looks really grossed out.\n" + else if(disgust >= DISGUST_LEVEL_GROSS) + msg += "[t_He] looks a bit grossed out.\n" + if(blood_volume < BLOOD_VOLUME_SAFE) msg += "[t_He] [t_has] pale skin.\n" diff --git a/code/modules/mob/living/carbon/status_procs.dm b/code/modules/mob/living/carbon/status_procs.dm index 85fd7c2b963..e44508aa18b 100644 --- a/code/modules/mob/living/carbon/status_procs.dm +++ b/code/modules/mob/living/carbon/status_procs.dm @@ -63,6 +63,43 @@ clear_fullscreen("high") clear_alert("high") +/mob/living/carbon/adjust_disgust(amount) + var/old_disgust = disgust + if(amount>0) + disgust = min(disgust+amount, DISGUST_LEVEL_MAXEDOUT) + switch(disgust) + if(0 to DISGUST_LEVEL_GROSS) + clear_alert("disgust") + if(DISGUST_LEVEL_GROSS to DISGUST_LEVEL_VERYGROSS) + throw_alert("disgust", /obj/screen/alert/gross) + if(DISGUST_LEVEL_VERYGROSS to DISGUST_LEVEL_DISGUSTED) + throw_alert("disgust", /obj/screen/alert/verygross) + if(DISGUST_LEVEL_DISGUSTED to INFINITY) + throw_alert("disgust", /obj/screen/alert/disgusted) + + else if(old_disgust) + disgust = max(disgust+amount, 0) + switch(disgust) + if(0 to DISGUST_LEVEL_GROSS) + clear_alert("disgust") + if(DISGUST_LEVEL_GROSS to DISGUST_LEVEL_VERYGROSS) + throw_alert("disgust", /obj/screen/alert/gross) + if(DISGUST_LEVEL_VERYGROSS to DISGUST_LEVEL_DISGUSTED) + throw_alert("disgust", /obj/screen/alert/verygross) + if(DISGUST_LEVEL_DISGUSTED to INFINITY) + throw_alert("disgust", /obj/screen/alert/disgusted) + +/mob/living/carbon/set_disgust(amount) + disgust = amount + switch(disgust) + if(0 to DISGUST_LEVEL_GROSS) + clear_alert("disgust") + if(DISGUST_LEVEL_GROSS to DISGUST_LEVEL_VERYGROSS) + throw_alert("disgust", /obj/screen/alert/gross) + if(DISGUST_LEVEL_VERYGROSS to DISGUST_LEVEL_DISGUSTED) + throw_alert("disgust", /obj/screen/alert/verygross) + if(DISGUST_LEVEL_DISGUSTED to INFINITY) + throw_alert("disgust", /obj/screen/alert/disgusted) /mob/living/carbon/cure_blind() if(disabilities & BLIND) diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm index 0fd86ed02eb..69b3d750961 100644 --- a/code/modules/mob/living/death.dm +++ b/code/modules/mob/living/death.dm @@ -61,6 +61,7 @@ if(!gibbed) GLOB.dead_mob_list += src set_drugginess(0) + set_disgust(0) SetSleeping(0, 0) blind_eyes(1) reset_perspective(null) diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index d8545e8849d..13719d57b65 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -42,7 +42,7 @@ /mob/living/simple_animal/mouse/death(gibbed, toast) if(!ckey) ..(1) - var/obj/item/trash/deadmouse/M = new(src.loc) + var/obj/item/weapon/reagent_containers/food/snacks/deadmouse/M = new(src.loc) M.icon_state = icon_dead M.name = name if(toast) @@ -100,8 +100,12 @@ response_harm = "splats" gold_core_spawnable = 0 -/obj/item/trash/deadmouse +/obj/item/weapon/reagent_containers/food/snacks/deadmouse name = "dead mouse" - desc = "It looks like somebody dropped the bass on it." + desc = "It looks like somebody dropped the bass on it. A lizard's favorite meal." icon = 'icons/mob/animal.dmi' icon_state = "mouse_gray_dead" + bitesize = 3 + eatverb = "devours" + list_reagents = list("nutriment" = 3, "vitamin" = 2) + foodtype = GROSS | MEAT | RAW diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index c9272c8d6bb..9f44a0ad711 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -46,6 +46,7 @@ var/cultslurring = 0 //Carbon var/real_name = null var/druggy = 0 //Carbon + var/disgust = 0 //Carbon var/confused = 0 //Carbon var/resting = 0 //Carbon var/lying = 0 diff --git a/code/modules/mob/status_procs.dm b/code/modules/mob/status_procs.dm index f25a01b9feb..bd938cf5980 100644 --- a/code/modules/mob/status_procs.dm +++ b/code/modules/mob/status_procs.dm @@ -219,6 +219,14 @@ /mob/proc/set_drugginess(amount) return +/////////////////////////////////// GROSSED OUT //////////////////////////////////// + +/mob/proc/adjust_disgust(amount) + return + +/mob/proc/set_disgust(amount) + return + /////////////////////////////////// BLIND DISABILITY //////////////////////////////////// /mob/proc/cure_blind() //when we want to cure the BLIND disability only. diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index adf7292a560..57a7f3445dd 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -52,6 +52,7 @@ M.SetUnconscious(0, 0) M.silent = 0 M.dizziness = 0 + M.disgust = 0 M.drowsyness = 0 M.stuttering = 0 M.slurring = 0 diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index 12fdadaeb1a..d63eb283c5d 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -74,6 +74,7 @@ icon_state = "appendix" icon = 'icons/obj/surgery.dmi' list_reagents = list("nutriment" = 5) + foodtype = RAW | MEAT | GROSS /obj/item/organ/Destroy() From e39d5d871fbd73b4887c89d50f07936121728f2b Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Wed, 19 Jul 2017 11:43:55 +0200 Subject: [PATCH 03/27] me making this port work https://www.oranges.net.nz/~oranges/webm/stuck_pancake.webm --- code/__DEFINES/mobs.dm | 6 ++++++ .../objects/items/weapons/storage/bags.dm | 2 +- .../mob/living/carbon/human/species.dm | 2 ++ .../carbon/human/species_types/flypeople.dm | 1 + .../carbon/human/species_types/humans.dm | 3 ++- .../carbon/human/species_types/jellypeople.dm | 3 ++- .../human/species_types/lizardpeople.dm | 1 + .../carbon/human/species_types/podpeople.dm | 1 + .../carbon/human/species_types/skeletons.dm | 3 ++- .../carbon/human/species_types/synths.dm | 2 +- .../carbon/human/species_types/zombies.dm | 1 + icons/mob/screen_alert.dmi | Bin 103553 -> 104755 bytes tgstation.dme | 1 + 13 files changed, 21 insertions(+), 5 deletions(-) diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 2b0e8ee74ad..bff067dce1f 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -65,6 +65,12 @@ #define NUTRITION_LEVEL_HUNGRY 250 #define NUTRITION_LEVEL_STARVING 150 +//Disgust levels for humans +#define DISGUST_LEVEL_MAXEDOUT 150 +#define DISGUST_LEVEL_DISGUSTED 75 +#define DISGUST_LEVEL_VERYGROSS 50 +#define DISGUST_LEVEL_GROSS 25 + //Slime evolution threshold. Controls how fast slimes can split/grow #define SLIME_EVOLUTION_THRESHOLD 10 diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 433cbd5084b..ddb55f56975 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -374,5 +374,5 @@ max_combined_w_class = 200 w_class = WEIGHT_CLASS_TINY preposition = "in" - can_hold = list(/obj/item/slime_extract, /obj/item/weapon/reagent_containers/syringe, /obj/item/weapon/reagent_containers/glass/beaker, /obj/item/weapon/reagent_containers/glass/bottle, /obj/item/weapon/reagent_containers/blood, /obj/item/weapon/reagent_containers/hypospray/medipen, /obj/item/trash/deadmouse, /obj/item/weapon/reagent_containers/food/snacks/monkeycube) + can_hold = list(/obj/item/slime_extract, /obj/item/weapon/reagent_containers/syringe, /obj/item/weapon/reagent_containers/glass/beaker, /obj/item/weapon/reagent_containers/glass/bottle, /obj/item/weapon/reagent_containers/blood, /obj/item/weapon/reagent_containers/hypospray/medipen, /obj/item/weapon/reagent_containers/food/snacks/deadmouse, /obj/item/weapon/reagent_containers/food/snacks/monkeycube) resistance_flags = FLAMMABLE diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index a2fa6e22a87..c41aa330179 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -29,6 +29,8 @@ var/exotic_bloodtype = "" //If your race uses a non standard bloodtype (A+, O-, AB-, etc) var/meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human //What the species drops on gibbing var/skinned_type = null + var/disliked_food = GROSS + var/toxic_food = TOXIC var/list/no_equip = list() // slots the race can't equip stuff to var/nojumpsuit = 0 // this is sorta... weird. it basically lets you equip stuff that usually needs jumpsuits without one, like belts and pockets and ids var/blacklisted = 0 //Flag to exclude from green slime core species. diff --git a/code/modules/mob/living/carbon/human/species_types/flypeople.dm b/code/modules/mob/living/carbon/human/species_types/flypeople.dm index 804f9bf3a20..769811398a0 100644 --- a/code/modules/mob/living/carbon/human/species_types/flypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/flypeople.dm @@ -6,6 +6,7 @@ mutantliver = /obj/item/organ/liver/fly mutantstomach = /obj/item/organ/stomach/fly meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/fly + disliked_food = null /datum/species/fly/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H) if(chem.id == "pestkiller") diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm index 43516eaec94..cc2b7b03b85 100644 --- a/code/modules/mob/living/carbon/human/species_types/humans.dm +++ b/code/modules/mob/living/carbon/human/species_types/humans.dm @@ -7,6 +7,7 @@ default_features = list("mcolor" = "FFF", "tail_human" = "None", "ears" = "None", "wings" = "None") use_skintones = 1 skinned_type = /obj/item/stack/sheet/animalhide/human + disliked_food = GROSS | RAW /datum/species/human/qualifies_for_rank(rank, list/features) @@ -28,4 +29,4 @@ datum/species/human/on_species_gain(mob/living/carbon/human/H, datum/species/old if(H.dna.features["tail_human"] == "Cat") var/tail = /obj/item/organ/tail/cat mutant_organs += tail - ..() \ No newline at end of file + ..() diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index 59647632c0e..3f838d5bac9 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -9,6 +9,7 @@ exotic_blood = "slimejelly" damage_overlay_type = "" var/datum/action/innate/regenerate_limbs/regenerate_limbs + toxic_food = MEAT | VEGETABLES | GRAIN | FRUIT | DAIRY /datum/species/jelly/on_species_loss(mob/living/carbon/C) if(regenerate_limbs) @@ -324,4 +325,4 @@ M.transfer_to(dupe) dupe.visible_message("[dupe] blinks and looks \ around.", - "...and move this one instead.") \ No newline at end of file + "...and move this one instead.") diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index 4c6a06a17a8..2991ae3eb83 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -16,6 +16,7 @@ meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard skinned_type = /obj/item/stack/sheet/animalhide/lizard exotic_bloodtype = "L" + disliked_food = FRUIT /datum/species/lizard/after_equip_job(datum/job/J, mob/living/carbon/human/H) H.grant_language(/datum/language/draconic) diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm index 79e2ac23e74..6453cd6762c 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -10,6 +10,7 @@ burnmod = 1.25 heatmod = 1.5 meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/plant + disliked_food = VEGETABLES | FRUIT | GRAIN //They think plant murder is wrong. /datum/species/pod/on_species_gain(mob/living/carbon/C, datum/species/old_species) . = ..() diff --git a/code/modules/mob/living/carbon/human/species_types/skeletons.dm b/code/modules/mob/living/carbon/human/species_types/skeletons.dm index 3065bdf32b5..f43611cd234 100644 --- a/code/modules/mob/living/carbon/human/species_types/skeletons.dm +++ b/code/modules/mob/living/carbon/human/species_types/skeletons.dm @@ -8,4 +8,5 @@ meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton species_traits = list(NOBREATH,RESISTHOT,RESISTCOLD,RESISTPRESSURE,NOBLOOD,RADIMMUNE,VIRUSIMMUNE,PIERCEIMMUNE,NOHUNGER,EASYDISMEMBER,EASYLIMBATTACHMENT) mutant_organs = list(/obj/item/organ/tongue/bone) - damage_overlay_type = ""//let's not show bloody wounds or burns over bones. \ No newline at end of file + damage_overlay_type = ""//let's not show bloody wounds or burns over bones. + disliked_food = null diff --git a/code/modules/mob/living/carbon/human/species_types/synths.dm b/code/modules/mob/living/carbon/human/species_types/synths.dm index 490181920bd..04d6462b053 100644 --- a/code/modules/mob/living/carbon/human/species_types/synths.dm +++ b/code/modules/mob/living/carbon/human/species_types/synths.dm @@ -118,4 +118,4 @@ else return ..() else - return ..() \ No newline at end of file + return ..() diff --git a/code/modules/mob/living/carbon/human/species_types/zombies.dm b/code/modules/mob/living/carbon/human/species_types/zombies.dm index e75f862f586..10ef5aada1f 100644 --- a/code/modules/mob/living/carbon/human/species_types/zombies.dm +++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm @@ -9,6 +9,7 @@ species_traits = list(NOBREATH,RESISTCOLD,RESISTPRESSURE,NOBLOOD,RADIMMUNE,NOZOMBIE,EASYDISMEMBER,EASYLIMBATTACHMENT) mutant_organs = list(/obj/item/organ/tongue/zombie) var/static/list/spooks = list('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg','sound/hallucinations/veryfar_noise.ogg','sound/hallucinations/wail.ogg') + disliked_food = null /datum/species/zombie/infectious name = "Infectious Zombie" diff --git a/icons/mob/screen_alert.dmi b/icons/mob/screen_alert.dmi index afc3c4f815ef9b7891df4f19dc854fee10482f50..d6a420d365e0cb833f88cf709c455b32463a403c 100644 GIT binary patch delta 19562 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 Sna>y(IIJxlE>u}~$NmT5@H@`{ delta 18348 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%0A2C+9lb`R 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 M07*qoM6N<$f{nsn+yDRo diff --git a/tgstation.dme b/tgstation.dme index 8c13f0dfb52..0028fe336cc 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -36,6 +36,7 @@ #include "code\__DEFINES\DNA.dm" #include "code\__DEFINES\events.dm" #include "code\__DEFINES\flags.dm" +#include "code\__DEFINES\food.dm" #include "code\__DEFINES\hud.dm" #include "code\__DEFINES\inventory.dm" #include "code\__DEFINES\is_helpers.dm" From f972b02e8603d9d7d2b6d972d903d4f34067f85c Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Wed, 19 Jul 2017 12:18:35 +0200 Subject: [PATCH 04/27] makes disgust effects work and adds pukonium --- code/modules/food_and_drinks/food/snacks.dm | 4 ++-- code/modules/mob/living/carbon/human/life.dm | 20 +++++++++++++++++++ .../chemistry/reagents/other_reagents.dm | 11 ++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index 0d9ad07c48c..117ffb48203 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -107,10 +107,10 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M if(foodtype & H.dna.species.toxic_food) - M << "What the hell was that thing?!" + to_chat(M,"What the hell was that thing?!") M.adjust_disgust(25 + 30 * fraction) else if(foodtype & H.dna.species.disliked_food) - M << "That didn't taste very good..." + to_chat(M,"That didn't taste very good...") M.adjust_disgust(11 + 15 * fraction) if(reagents.total_volume) reagents.reaction(M, INGEST, fraction) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 418d213139c..383f124fe15 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -424,4 +424,24 @@ All effects don't start immediately, but rather get worse over time; the rate is if(drunkenness >= 101) adjustToxLoss(4) //Let's be honest you shouldn't be alive by now + if(disgust) + var/pukeprob = 5 + 0.1 * disgust + if(disgust >= DISGUST_LEVEL_GROSS) + if(prob(25)) + stuttering += 1 + confused += 2 + if(prob(10) && !stat) + to_chat(src, "You feel kind of iffy...") + jitteriness = max(jitteriness - 3, 0) + if(disgust >= DISGUST_LEVEL_VERYGROSS) + if(prob(pukeprob)) //iT hAndLeS mOrE ThaN PukInG + confused += 2.5 + stuttering += 1 + vomit(10, 0, 1, 0, 1, 0) + Dizzy(5) + if(disgust >= DISGUST_LEVEL_DISGUSTED) + if(prob(50)) + blur_eyes(3) //We need to add more shit down here + + #undef HUMAN_MAX_OXYLOSS diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index bd659d95cde..b4c6d24c1ae 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -1630,3 +1630,14 @@ description = "blue sparkles that get everywhere" color = "#4040FF" //A blueish color glitter_type = /obj/effect/decal/cleanable/glitter/blue + +/datum/reagent/pukonium + name = "pukonium" + id = "pukonium" + description = "Vile liquid that is refined in the faraway lands of Ko-Der-Bus" + color = "360f0f" + metabolization_rate = 5 + +/datum/reagent/pukonium/on_mob_life(mob/living/M) + M.adjust_disgust(10) + ..() From b3613e19744cab0d6afd5f3f3237536890ba371c Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Wed, 19 Jul 2017 12:55:50 +0200 Subject: [PATCH 05/27] aheal fix and disgust trickle --- code/modules/mob/living/carbon/life.dm | 4 +++- code/modules/mob/living/living.dm | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index a1b894e4f07..61b362f0497 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -379,6 +379,9 @@ if(druggy) adjust_drugginess(-1) + if(disgust) + adjust_disgust(-1) + if(hallucination) spawn handle_hallucinations() hallucination = max(hallucination-2,0) @@ -434,4 +437,3 @@ adjustToxLoss(8) if(prob(30)) to_chat(src, "You feel confused and nauseous...")//actual symptoms of liver failure - diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 81d0314e67b..59191100c25 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -374,6 +374,7 @@ setBrainLoss(0) setStaminaLoss(0, 0) SetUnconscious(0, FALSE) + se SetStun(0, FALSE) SetKnockdown(0, FALSE) SetSleeping(0, FALSE) From 760099b63015e704e02bff41582ddefd14c01121 Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Wed, 19 Jul 2017 12:56:20 +0200 Subject: [PATCH 06/27] fuck --- code/modules/mob/living/living.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 59191100c25..4adc078ec12 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -374,7 +374,7 @@ setBrainLoss(0) setStaminaLoss(0, 0) SetUnconscious(0, FALSE) - se + set_disgust(0) SetStun(0, FALSE) SetKnockdown(0, FALSE) SetSleeping(0, FALSE) From 6a3c14143b2f039543e768c8e996356deaec9fb1 Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Wed, 19 Jul 2017 13:33:29 +0200 Subject: [PATCH 07/27] replaces some referenes to dead mouses --- _maps/map_files/Deltastation/DeltaStation2.dmm | 2 +- _maps/map_files/PubbyStation/PubbyStation.dmm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index a6b334314c1..9981d7634e7 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -18280,7 +18280,7 @@ /area/security/prison) "aLB" = ( /obj/structure/table, -/obj/item/trash/deadmouse{ +/obj/item/weapon/reagent_containers/food/snacks/deadmouse{ pixel_y = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 3debe76dcaf..4298573889b 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -18833,7 +18833,7 @@ "aOW" = ( /obj/structure/kitchenspike, /obj/item/device/assembly/mousetrap, -/obj/item/trash/deadmouse, +/obj/item/weapon/reagent_containers/food/snacks/deadmouse, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) "aOX" = ( @@ -25784,7 +25784,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/item/trash/deadmouse, +/obj/item/weapon/reagent_containers/food/snacks/deadmouse, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, @@ -35519,7 +35519,7 @@ /area/maintenance/department/engine) "byd" = ( /obj/structure/closet/masks, -/obj/item/trash/deadmouse, +/obj/item/weapon/reagent_containers/food/snacks/deadmouse, /obj/effect/landmark/revenantspawn, /turf/open/floor/plating, /area/maintenance/department/engine) From 758e0c3807fd3791e082d79f4d3fed3d2907ab5c Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Wed, 19 Jul 2017 13:37:10 +0200 Subject: [PATCH 08/27] fixes w class that I missed during porting --- code/modules/food_and_drinks/food/snacks/dough.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/food_and_drinks/food/snacks/dough.dm b/code/modules/food_and_drinks/food/snacks/dough.dm index 59a9f972efb..9ef23900023 100644 --- a/code/modules/food_and_drinks/food/snacks/dough.dm +++ b/code/modules/food_and_drinks/food/snacks/dough.dm @@ -11,7 +11,6 @@ list_reagents = list("nutriment" = 6) w_class = WEIGHT_CLASS_NORMAL tastes = list("dough" = 1) - w_class = 3 foodtype = GRAIN From 2471c9c7081493e56ff1eeb66095bc844a032bf1 Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Wed, 19 Jul 2017 13:46:45 +0200 Subject: [PATCH 09/27] Removes junkiness from chef's food and fixes random foodtypes var appearing --- code/modules/food_and_drinks/food/snacks_other.dm | 7 +------ code/modules/food_and_drinks/food/snacks_pastry.dm | 3 --- code/modules/food_and_drinks/food/snacks_pie.dm | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index 0ef06108f96..6ae1cc9249c 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -31,8 +31,6 @@ /obj/item/weapon/reagent_containers/food/snacks/candy_corn name = "candy corn" - desc = "It's a handful of candy corn. Can be stored in a detective's hat." - junkiness = 20 icon_state = "candy_corn" list_reagents = list("nutriment" = 4, "sugar" = 2) filling_color = "#FF8C00" @@ -42,7 +40,6 @@ /obj/item/weapon/reagent_containers/food/snacks/chocolatebar name = "chocolate bar" desc = "Such, sweet, fattening food." - junkiness = 20 icon_state = "chocolatebar" list_reagents = list("nutriment" = 2, "sugar" = 2, "cocoa" = 2) filling_color = "#A0522D" @@ -60,7 +57,6 @@ /obj/item/weapon/reagent_containers/food/snacks/popcorn name = "popcorn" desc = "Now let's find some cinema." - junkiness = 4 icon_state = "popcorn" trash = /obj/item/trash/popcorn list_reagents = list("nutriment" = 2) @@ -146,7 +142,6 @@ desc = "An apple coated in sugary sweetness." icon_state = "candiedapple" bitesize = 3 - junkiness = 5 bonus_reagents = list("nutriment" = 2, "sugar" = 3) list_reagents = list("nutriment" = 3, "sugar" = 2) filling_color = "#FF4500" @@ -536,4 +531,4 @@ filling_color = "#C0C9A0" gender = PLURAL tastes = list("batter" = 3, "onion" = 1) - foodtype = VEGETABLES \ No newline at end of file + foodtype = VEGETABLES diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm index 17750f15322..2564e662dff 100644 --- a/code/modules/food_and_drinks/food/snacks_pastry.dm +++ b/code/modules/food_and_drinks/food/snacks_pastry.dm @@ -7,7 +7,6 @@ desc = "Goes great with Robust Coffee." icon_state = "donut1" bitesize = 5 - junkiness = 10 bonus_reagents = list("sugar" = 1) list_reagents = list("nutriment" = 3, "sugar" = 2) var/extra_reagent = null @@ -166,7 +165,6 @@ name = "cookie" desc = "COOKIE!!!" icon_state = "COOKIE!!!" - junkiness = 5 bitesize = 1 bonus_reagents = list("nutriment" = 1) list_reagents = list("nutriment" = 1) @@ -352,4 +350,3 @@ filling_color = "#F2CE91" tastes = list("pastry" = 1, "sweetness" = 1) foodtype = GRAIN - diff --git a/code/modules/food_and_drinks/food/snacks_pie.dm b/code/modules/food_and_drinks/food/snacks_pie.dm index 5def5a8f85d..557fe788000 100644 --- a/code/modules/food_and_drinks/food/snacks_pie.dm +++ b/code/modules/food_and_drinks/food/snacks_pie.dm @@ -114,7 +114,6 @@ ..() if(fey) reagents.add_reagent("omnizine", 5) - foodtype = GRAIN | VEGETABLES /obj/item/weapon/reagent_containers/food/snacks/pie/xemeatpie From 4e44b0d17e568700ec19c33613e30cb0cd892d9f Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Wed, 19 Jul 2017 13:47:08 +0200 Subject: [PATCH 10/27] Ko-Der-Buus --- code/modules/reagents/chemistry/reagents/other_reagents.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index b4c6d24c1ae..394000291b3 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -1634,7 +1634,7 @@ /datum/reagent/pukonium name = "pukonium" id = "pukonium" - description = "Vile liquid that is refined in the faraway lands of Ko-Der-Bus" + description = "Vile liquid that is refined in the faraway lands of Ko-Der-Buus" color = "360f0f" metabolization_rate = 5 From 047fa92e451bba19fd297fb83d442857b7915f9f Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Wed, 19 Jul 2017 13:50:12 +0200 Subject: [PATCH 11/27] fixes description --- code/modules/food_and_drinks/food/snacks_other.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index 6ae1cc9249c..2c8957546f0 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -31,6 +31,7 @@ /obj/item/weapon/reagent_containers/food/snacks/candy_corn name = "candy corn" + desc = "It's a handful of candy corn. Can be stored in a detective's hat." icon_state = "candy_corn" list_reagents = list("nutriment" = 4, "sugar" = 2) filling_color = "#FF8C00" From a820649120517f33864a599f07bf4bf367b84f58 Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Wed, 19 Jul 2017 15:03:56 +0200 Subject: [PATCH 12/27] >implying --- code/modules/food_and_drinks/food/customizables.dm | 2 +- code/modules/mob/living/simple_animal/friendly/mouse.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm index 40b1833f71d..6c9e1e4e7ba 100644 --- a/code/modules/food_and_drinks/food/customizables.dm +++ b/code/modules/food_and_drinks/food/customizables.dm @@ -53,7 +53,7 @@ ingredients += S mix_filling_color(S) S.reagents.trans_to(src,min(S.reagents.total_volume, 15)) //limit of 15, we don't want our custom food to be completely filled by just one ingredient with large reagent volume. - src.foodtype |= S.foodtype + foodtype |= S.foodtype update_overlays(S) to_chat(user, "You add the [I.name] to the [name].") update_name(S) diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index 13719d57b65..9efb7463534 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -42,7 +42,7 @@ /mob/living/simple_animal/mouse/death(gibbed, toast) if(!ckey) ..(1) - var/obj/item/weapon/reagent_containers/food/snacks/deadmouse/M = new(src.loc) + var/obj/item/weapon/reagent_containers/food/snacks/deadmouse/M = new(loc) M.icon_state = icon_dead M.name = name if(toast) From 4c7a7ad9535b37813847769c68c8261cf13645d5 Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Wed, 19 Jul 2017 15:23:44 +0200 Subject: [PATCH 13/27] adds liked foods --- code/modules/food_and_drinks/food/snacks.dm | 3 +++ code/modules/mob/living/carbon/human/species.dm | 1 + .../modules/mob/living/carbon/human/species_types/flypeople.dm | 1 + code/modules/mob/living/carbon/human/species_types/golems.dm | 2 ++ code/modules/mob/living/carbon/human/species_types/humans.dm | 1 + .../mob/living/carbon/human/species_types/jellypeople.dm | 1 + .../mob/living/carbon/human/species_types/lizardpeople.dm | 1 + .../modules/mob/living/carbon/human/species_types/plasmamen.dm | 2 ++ .../modules/mob/living/carbon/human/species_types/podpeople.dm | 1 + .../modules/mob/living/carbon/human/species_types/skeletons.dm | 1 + code/modules/mob/living/carbon/human/species_types/zombies.dm | 1 + 11 files changed, 15 insertions(+) diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index 117ffb48203..76ecac0918e 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -112,6 +112,9 @@ else if(foodtype & H.dna.species.disliked_food) to_chat(M,"That didn't taste very good...") M.adjust_disgust(11 + 15 * fraction) + else if(foodtype & H.dna.species.liked_food) + to_chat(M,"I love this taste!") + M.adjust_disgust(-5 + -2.5 * fraction) if(reagents.total_volume) reagents.reaction(M, INGEST, fraction) reagents.trans_to(M, bitesize) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index c41aa330179..235b03c8b10 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -29,6 +29,7 @@ var/exotic_bloodtype = "" //If your race uses a non standard bloodtype (A+, O-, AB-, etc) var/meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human //What the species drops on gibbing var/skinned_type = null + var/liked_food = null var/disliked_food = GROSS var/toxic_food = TOXIC var/list/no_equip = list() // slots the race can't equip stuff to diff --git a/code/modules/mob/living/carbon/human/species_types/flypeople.dm b/code/modules/mob/living/carbon/human/species_types/flypeople.dm index 769811398a0..07a6ddee473 100644 --- a/code/modules/mob/living/carbon/human/species_types/flypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/flypeople.dm @@ -7,6 +7,7 @@ mutantstomach = /obj/item/organ/stomach/fly meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/fly disliked_food = null + liked_food = GROSS /datum/species/fly/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H) if(chem.id == "pestkiller") diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index 48b245f97e7..affd78f39e3 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -22,6 +22,8 @@ limbs_id = "golem" fixed_mut_color = "aaa" var/info_text = "As an Iron Golem, you don't have any special traits." + disliked_food = FRUIT | VEGETABLES + liked_food = MEAT | GROSS var/prefix = "Iron" var/list/special_names diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm index cc2b7b03b85..60d61e2e6f0 100644 --- a/code/modules/mob/living/carbon/human/species_types/humans.dm +++ b/code/modules/mob/living/carbon/human/species_types/humans.dm @@ -8,6 +8,7 @@ use_skintones = 1 skinned_type = /obj/item/stack/sheet/animalhide/human disliked_food = GROSS | RAW + liked_food = JUNKFOOD | FRIED /datum/species/human/qualifies_for_rank(rank, list/features) diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index 3f838d5bac9..e10791532e9 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -10,6 +10,7 @@ damage_overlay_type = "" var/datum/action/innate/regenerate_limbs/regenerate_limbs toxic_food = MEAT | VEGETABLES | GRAIN | FRUIT | DAIRY + liked_food = TOXIC /datum/species/jelly/on_species_loss(mob/living/carbon/C) if(regenerate_limbs) diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index 2991ae3eb83..2f8fbe25a0b 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -17,6 +17,7 @@ skinned_type = /obj/item/stack/sheet/animalhide/lizard exotic_bloodtype = "L" disliked_food = FRUIT + liked_food = GROSS | MEAT /datum/species/lizard/after_equip_job(datum/job/J, mob/living/carbon/human/H) H.grant_language(/datum/language/draconic) diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm index 6ac2934ea42..e3e6f1a0f23 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -17,6 +17,8 @@ speedmod = 1 damage_overlay_type = ""//let's not show bloody wounds or burns over bones. var/internal_fire = FALSE //If the bones themselves are burning clothes won't help you much + disliked_food = GRAIN + liked_food = VEGETABLES /datum/species/plasmaman/spec_life(mob/living/carbon/human/H) var/datum/gas_mixture/environment = H.loc.return_air() diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm index 6453cd6762c..b55e99f39af 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -11,6 +11,7 @@ heatmod = 1.5 meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/plant disliked_food = VEGETABLES | FRUIT | GRAIN //They think plant murder is wrong. + liked_food = GROSS | MEAT | DAIRY /datum/species/pod/on_species_gain(mob/living/carbon/C, datum/species/old_species) . = ..() diff --git a/code/modules/mob/living/carbon/human/species_types/skeletons.dm b/code/modules/mob/living/carbon/human/species_types/skeletons.dm index f43611cd234..63213243c67 100644 --- a/code/modules/mob/living/carbon/human/species_types/skeletons.dm +++ b/code/modules/mob/living/carbon/human/species_types/skeletons.dm @@ -10,3 +10,4 @@ mutant_organs = list(/obj/item/organ/tongue/bone) damage_overlay_type = ""//let's not show bloody wounds or burns over bones. disliked_food = null + liked_food = GROSS | MEAT | RAW diff --git a/code/modules/mob/living/carbon/human/species_types/zombies.dm b/code/modules/mob/living/carbon/human/species_types/zombies.dm index 10ef5aada1f..3889c22d0ee 100644 --- a/code/modules/mob/living/carbon/human/species_types/zombies.dm +++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm @@ -10,6 +10,7 @@ mutant_organs = list(/obj/item/organ/tongue/zombie) var/static/list/spooks = list('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg','sound/hallucinations/veryfar_noise.ogg','sound/hallucinations/wail.ogg') disliked_food = null + liked_food = GROSS | MEAT | RAW /datum/species/zombie/infectious name = "Infectious Zombie" From 0f38f3c092fae971ab851c656f4dbc4ac79557e0 Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Wed, 19 Jul 2017 18:19:05 +0200 Subject: [PATCH 14/27] pls nerf --- .../mob/living/carbon/human/species_types/jellypeople.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index e10791532e9..91cf2152062 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -9,7 +9,7 @@ exotic_blood = "slimejelly" damage_overlay_type = "" var/datum/action/innate/regenerate_limbs/regenerate_limbs - toxic_food = MEAT | VEGETABLES | GRAIN | FRUIT | DAIRY + toxic_food = MEAT | DAIRY liked_food = TOXIC /datum/species/jelly/on_species_loss(mob/living/carbon/C) From 76d574f1d156a61478263234ccaa393a3c8b6f99 Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Wed, 19 Jul 2017 22:16:52 +0200 Subject: [PATCH 15/27] moves disgust to stomach --- code/modules/mob/living/carbon/human/life.dm | 20 ------------ .../mob/living/carbon/human/species.dm | 32 +++++++++++++++++++ code/modules/mob/living/carbon/life.dm | 3 -- .../modules/mob/living/carbon/status_procs.dm | 31 ++---------------- code/modules/surgery/organs/stomach.dm | 7 +++- 5 files changed, 40 insertions(+), 53 deletions(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 383f124fe15..418d213139c 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -424,24 +424,4 @@ All effects don't start immediately, but rather get worse over time; the rate is if(drunkenness >= 101) adjustToxLoss(4) //Let's be honest you shouldn't be alive by now - if(disgust) - var/pukeprob = 5 + 0.1 * disgust - if(disgust >= DISGUST_LEVEL_GROSS) - if(prob(25)) - stuttering += 1 - confused += 2 - if(prob(10) && !stat) - to_chat(src, "You feel kind of iffy...") - jitteriness = max(jitteriness - 3, 0) - if(disgust >= DISGUST_LEVEL_VERYGROSS) - if(prob(pukeprob)) //iT hAndLeS mOrE ThaN PukInG - confused += 2.5 - stuttering += 1 - vomit(10, 0, 1, 0, 1, 0) - Dizzy(5) - if(disgust >= DISGUST_LEVEL_DISGUSTED) - if(prob(50)) - blur_eyes(3) //We need to add more shit down here - - #undef HUMAN_MAX_OXYLOSS diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 235b03c8b10..c3e0de4509d 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -924,6 +924,38 @@ else H.throw_alert("nutrition", /obj/screen/alert/starving) +/datum/species/proc/handle_disgust(mob/living/carbon/human/H) + if(H.disgust) + var/pukeprob = 5 + 0.1 * H.disgust + if(H.disgust >= DISGUST_LEVEL_GROSS) + if(prob(25)) + H.stuttering += 1 + H.confused += 2 + if(prob(10) && !H.stat) + to_chat(H, "You feel kind of iffy...") + H.jitteriness = max(H.jitteriness - 3, 0) + if(H.disgust >= DISGUST_LEVEL_VERYGROSS) + if(prob(pukeprob)) //iT hAndLeS mOrE ThaN PukInG + H.confused += 2.5 + H.stuttering += 1 + H.vomit(10, 0, 1, 0, 1, 0) + H.Dizzy(5) + if(H.disgust >= DISGUST_LEVEL_DISGUSTED) + if(prob(50)) + H.blur_eyes(3) //We need to add more shit down here + + H.adjust_disgust(-1) + + switch(H.disgust) + if(0 to DISGUST_LEVEL_GROSS) + H.clear_alert("disgust") + if(DISGUST_LEVEL_GROSS to DISGUST_LEVEL_VERYGROSS) + H.throw_alert("disgust", /obj/screen/alert/gross) + if(DISGUST_LEVEL_VERYGROSS to DISGUST_LEVEL_DISGUSTED) + H.throw_alert("disgust", /obj/screen/alert/verygross) + if(DISGUST_LEVEL_DISGUSTED to INFINITY) + H.throw_alert("disgust", /obj/screen/alert/disgusted) + /datum/species/proc/update_health_hud(mob/living/carbon/human/H) return 0 diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 61b362f0497..19c494538fb 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -379,9 +379,6 @@ if(druggy) adjust_drugginess(-1) - if(disgust) - adjust_disgust(-1) - if(hallucination) spawn handle_hallucinations() hallucination = max(hallucination-2,0) diff --git a/code/modules/mob/living/carbon/status_procs.dm b/code/modules/mob/living/carbon/status_procs.dm index e44508aa18b..64aa364711e 100644 --- a/code/modules/mob/living/carbon/status_procs.dm +++ b/code/modules/mob/living/carbon/status_procs.dm @@ -5,7 +5,7 @@ /mob/living/carbon/damage_eyes(amount) var/obj/item/organ/eyes/eyes = getorganslot("eyes_sight") if (!eyes) - return + return if(amount>0) eyes.eye_damage = amount if(eyes.eye_damage > 20) @@ -17,7 +17,7 @@ /mob/living/carbon/set_eye_damage(amount) var/obj/item/organ/eyes/eyes = getorganslot("eyes_sight") if (!eyes) - return + return eyes.eye_damage = max(amount,0) if(eyes.eye_damage > 20) if(eyes.eye_damage > 30) @@ -67,39 +67,12 @@ var/old_disgust = disgust if(amount>0) disgust = min(disgust+amount, DISGUST_LEVEL_MAXEDOUT) - switch(disgust) - if(0 to DISGUST_LEVEL_GROSS) - clear_alert("disgust") - if(DISGUST_LEVEL_GROSS to DISGUST_LEVEL_VERYGROSS) - throw_alert("disgust", /obj/screen/alert/gross) - if(DISGUST_LEVEL_VERYGROSS to DISGUST_LEVEL_DISGUSTED) - throw_alert("disgust", /obj/screen/alert/verygross) - if(DISGUST_LEVEL_DISGUSTED to INFINITY) - throw_alert("disgust", /obj/screen/alert/disgusted) else if(old_disgust) disgust = max(disgust+amount, 0) - switch(disgust) - if(0 to DISGUST_LEVEL_GROSS) - clear_alert("disgust") - if(DISGUST_LEVEL_GROSS to DISGUST_LEVEL_VERYGROSS) - throw_alert("disgust", /obj/screen/alert/gross) - if(DISGUST_LEVEL_VERYGROSS to DISGUST_LEVEL_DISGUSTED) - throw_alert("disgust", /obj/screen/alert/verygross) - if(DISGUST_LEVEL_DISGUSTED to INFINITY) - throw_alert("disgust", /obj/screen/alert/disgusted) /mob/living/carbon/set_disgust(amount) disgust = amount - switch(disgust) - if(0 to DISGUST_LEVEL_GROSS) - clear_alert("disgust") - if(DISGUST_LEVEL_GROSS to DISGUST_LEVEL_VERYGROSS) - throw_alert("disgust", /obj/screen/alert/gross) - if(DISGUST_LEVEL_VERYGROSS to DISGUST_LEVEL_DISGUSTED) - throw_alert("disgust", /obj/screen/alert/verygross) - if(DISGUST_LEVEL_DISGUSTED to INFINITY) - throw_alert("disgust", /obj/screen/alert/disgusted) /mob/living/carbon/cure_blind() if(disabilities & BLIND) diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm index 74bc7821b0a..1d3038e6eb2 100755 --- a/code/modules/surgery/organs/stomach.dm +++ b/code/modules/surgery/organs/stomach.dm @@ -13,6 +13,11 @@ if(istype(H)) H.dna.species.handle_digestion(H) + H.dna.species.handle_disgust(H) + +/obj/item/organ/stomach/Remove() + ..() + H.clear_alert("disgust") /obj/item/organ/stomach/fly name = "insectoid stomach" @@ -21,5 +26,5 @@ /obj/item/organ/stomach/plasmaman name = "digestive crystal" - icon_state = "pstomach" + icon_state = "pstomach" desc = "A strange crystal that is responsible for metabolizing the unseen energy force that feeds plasmamen." From 85bbc2460e9453011fba95b15e04b4b0df8df3c2 Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Wed, 19 Jul 2017 22:17:35 +0200 Subject: [PATCH 16/27] woops --- code/modules/surgery/organs/stomach.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm index 1d3038e6eb2..aa3cb2f5e3f 100755 --- a/code/modules/surgery/organs/stomach.dm +++ b/code/modules/surgery/organs/stomach.dm @@ -17,7 +17,10 @@ /obj/item/organ/stomach/Remove() ..() - H.clear_alert("disgust") + var/mob/living/carbon/human/H = owner + + if(istype(H)) + H.clear_alert("disgust") /obj/item/organ/stomach/fly name = "insectoid stomach" From 49638035e4a157b6be14ed8dd90eef58476fb99f Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Wed, 19 Jul 2017 22:40:17 +0200 Subject: [PATCH 17/27] removes nulls, fixes some likes/dislikes and adds metabolism rates --- .../mob/living/carbon/human/species.dm | 20 +++++++++---------- .../carbon/human/species_types/golems.dm | 2 -- .../carbon/human/species_types/podpeople.dm | 4 ++-- code/modules/surgery/organs/stomach.dm | 5 +++-- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index c3e0de4509d..ed9697e9410 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -10,9 +10,9 @@ /datum/species - var/id = null // if the game needs to manually check your race to do something not included in a proc here, it will use this - var/limbs_id = null //this is used if you want to use a different species limb sprites. Mainly used for angels as they look like humans. - var/name = null // this is the fluff name. these will be left generic (such as 'Lizardperson' for the lizard race) so servers can change them to whatever + var/id // if the game needs to manually check your race to do something not included in a proc here, it will use this + var/limbs_id //this is used if you want to use a different species limb sprites. Mainly used for angels as they look like humans. + var/name // this is the fluff name. these will be left generic (such as 'Lizardperson' for the lizard race) so servers can change them to whatever var/roundstart = 0 // can this mob be chosen at roundstart? (assuming the config option is checked?) var/default_color = "#FFF" // if alien colors are disabled, this is the color that will be used by that race @@ -21,21 +21,21 @@ var/face_y_offset = 0 var/hair_y_offset = 0 - var/hair_color = null // this allows races to have specific hair colors... if null, it uses the H's hair/facial hair colors. if "mutcolor", it uses the H's mutant_color + var/hair_color // this allows races to have specific hair colors... if null, it uses the H's hair/facial hair colors. if "mutcolor", it uses the H's mutant_color var/hair_alpha = 255 // the alpha used by the hair. 255 is completely solid, 0 is transparent. var/use_skintones = 0 // does it use skintones or not? (spoiler alert this is only used by humans) var/exotic_blood = "" // If your race wants to bleed something other than bog standard blood, change this to reagent id. var/exotic_bloodtype = "" //If your race uses a non standard bloodtype (A+, O-, AB-, etc) var/meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human //What the species drops on gibbing - var/skinned_type = null - var/liked_food = null + var/skinned_type + var/liked_food var/disliked_food = GROSS var/toxic_food = TOXIC var/list/no_equip = list() // slots the race can't equip stuff to var/nojumpsuit = 0 // this is sorta... weird. it basically lets you equip stuff that usually needs jumpsuits without one, like belts and pockets and ids var/blacklisted = 0 //Flag to exclude from green slime core species. - var/dangerous_existence = null //A flag for transformation spells that tells them "hey if you turn a person into one of these without preperation, they'll probably die!" + var/dangerous_existence //A flag for transformation spells that tells them "hey if you turn a person into one of these without preperation, they'll probably die!" var/say_mod = "says" // affects the speech message var/list/default_features = list() // Default mutant bodyparts for this species. Don't forget to set one for every mutant bodypart you allow this species to have. var/list/mutant_bodyparts = list() // Parts of the body that are diferent enough from the standard human model that they cause clipping with some equipment @@ -71,7 +71,7 @@ var/obj/item/organ/eyes/mutanteyes = /obj/item/organ/eyes var/obj/item/organ/ears/mutantears = /obj/item/organ/ears - var/obj/item/mutanthands = null + var/obj/item/mutanthands var/obj/item/organ/tongue/mutanttongue = /obj/item/organ/tongue var/obj/item/organ/liver/mutantliver @@ -924,7 +924,7 @@ else H.throw_alert("nutrition", /obj/screen/alert/starving) -/datum/species/proc/handle_disgust(mob/living/carbon/human/H) +/datum/species/proc/handle_disgust(mob/living/carbon/human/H, var/metabolism_rate) if(H.disgust) var/pukeprob = 5 + 0.1 * H.disgust if(H.disgust >= DISGUST_LEVEL_GROSS) @@ -944,7 +944,7 @@ if(prob(50)) H.blur_eyes(3) //We need to add more shit down here - H.adjust_disgust(-1) + H.adjust_disgust(-1 * metabolism_rate) switch(H.disgust) if(0 to DISGUST_LEVEL_GROSS) diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index affd78f39e3..48b245f97e7 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -22,8 +22,6 @@ limbs_id = "golem" fixed_mut_color = "aaa" var/info_text = "As an Iron Golem, you don't have any special traits." - disliked_food = FRUIT | VEGETABLES - liked_food = MEAT | GROSS var/prefix = "Iron" var/list/special_names diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm index b55e99f39af..d3b8949ce2c 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -10,8 +10,8 @@ burnmod = 1.25 heatmod = 1.5 meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/plant - disliked_food = VEGETABLES | FRUIT | GRAIN //They think plant murder is wrong. - liked_food = GROSS | MEAT | DAIRY + disliked_food = MEAT | DAIRY + liked_food = VEGETABLES | FRUIT | GRAIN /datum/species/pod/on_species_gain(mob/living/carbon/C, datum/species/old_species) . = ..() diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm index aa3cb2f5e3f..de119099605 100755 --- a/code/modules/surgery/organs/stomach.dm +++ b/code/modules/surgery/organs/stomach.dm @@ -7,18 +7,19 @@ slot = "stomach" attack_verb = list("gored", "squished", "slapped", "digested") desc = "Onaka ga suite imasu." + var/disgustmetabolism = 1 /obj/item/organ/stomach/on_life() var/mob/living/carbon/human/H = owner if(istype(H)) H.dna.species.handle_digestion(H) - H.dna.species.handle_disgust(H) + H.dna.species.handle_disgust(H, disgustmetabolism) /obj/item/organ/stomach/Remove() ..() var/mob/living/carbon/human/H = owner - + if(istype(H)) H.clear_alert("disgust") From 1a70b6fe1cb5202d63ffcd024b024cc5e88cbd39 Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Wed, 19 Jul 2017 23:02:35 +0200 Subject: [PATCH 18/27] makes up for the more frequent checks --- code/modules/mob/living/carbon/human/species.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index ed9697e9410..988dd06df89 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -926,9 +926,9 @@ /datum/species/proc/handle_disgust(mob/living/carbon/human/H, var/metabolism_rate) if(H.disgust) - var/pukeprob = 5 + 0.1 * H.disgust + var/pukeprob = 5 + 0.05 * H.disgust if(H.disgust >= DISGUST_LEVEL_GROSS) - if(prob(25)) + if(prob(10)) H.stuttering += 1 H.confused += 2 if(prob(10) && !H.stat) @@ -941,10 +941,10 @@ H.vomit(10, 0, 1, 0, 1, 0) H.Dizzy(5) if(H.disgust >= DISGUST_LEVEL_DISGUSTED) - if(prob(50)) + if(prob(25)) H.blur_eyes(3) //We need to add more shit down here - H.adjust_disgust(-1 * metabolism_rate) + H.adjust_disgust(-0.5 * metabolism_rate) switch(H.disgust) if(0 to DISGUST_LEVEL_GROSS) From cb9b57adccaaa0ddd81b200ff27804f5dce7550c Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Wed, 19 Jul 2017 23:50:05 +0200 Subject: [PATCH 19/27] drinks and stuff --- code/__DEFINES/food.dm | 5 ++- code/modules/food_and_drinks/drinks/drinks.dm | 43 +++++++++++++++--- .../food_and_drinks/drinks/drinks/bottle.dm | 10 +++++ code/modules/food_and_drinks/food/snacks.dm | 2 +- .../food_and_drinks/food/snacks_cake.dm | 44 +++++++++---------- .../food_and_drinks/food/snacks_egg.dm | 1 + .../food_and_drinks/food/snacks_meat.dm | 2 +- .../food_and_drinks/food/snacks_other.dm | 26 +++++------ .../food_and_drinks/food/snacks_pastry.dm | 28 ++++++------ .../food_and_drinks/food/snacks_pie.dm | 20 ++++----- .../food/snacks_sandwichtoast.dm | 4 +- .../food_and_drinks/food/snacks_soup.dm | 6 +-- .../food_and_drinks/food/snacks_vend.dm | 10 ++--- code/modules/hydroponics/grown/misc.dm | 4 +- 14 files changed, 124 insertions(+), 81 deletions(-) diff --git a/code/__DEFINES/food.dm b/code/__DEFINES/food.dm index b7d52cca4c7..2d6ba0d9460 100644 --- a/code/__DEFINES/food.dm +++ b/code/__DEFINES/food.dm @@ -7,5 +7,6 @@ #define DAIRY 64 #define FRIED 128 #define ALCOHOL 256 -#define GROSS 512 -#define TOXIC 1024 +#define SUGAR 512 +#define GROSS 1024 +#define TOXIC 2048 diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index b776ed29207..8a83712811d 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -29,7 +29,7 @@ if(!canconsume(M, user)) return 0 - + if (!is_open_container()) to_chat(user, "[src]'s lid hasn't been opened!") return 0 @@ -45,7 +45,19 @@ return // The drink might be empty after the delay, such as by spam-feeding M.visible_message("[user] feeds the contents of [src] to [M].", "[user] feeds the contents of [src] to [M].") add_logs(user, M, "fed", reagentlist(src)) + var/fraction = min(gulp_size/reagents.total_volume, 1) + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(foodtype & H.dna.species.toxic_food) + to_chat(M,"What the hell is this?!") + M.adjust_disgust(25 + 30 * fraction) + else if(foodtype & H.dna.species.disliked_food) + to_chat(M,"That didn't taste very good...") + M.adjust_disgust(11 + 15 * fraction) + else if(foodtype & H.dna.species.liked_food) + to_chat(M,"I love this taste!") + M.adjust_disgust(-5 + -2.5 * fraction) reagents.reaction(M, INGEST, fraction) reagents.trans_to(M, gulp_size) playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1) @@ -54,7 +66,7 @@ /obj/item/weapon/reagent_containers/food/drinks/afterattack(obj/target, mob/user , proximity) if(!proximity) return if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us. - + if (!is_open_container()) to_chat(user, "[target]'s tab isn't open!") return @@ -95,10 +107,10 @@ to_chat(user, "You heat [src] with [I].") reagents.handle_reactions() ..() - - + + //////////////////////////////////////////////////////////////////////////////// @@ -197,18 +209,21 @@ name = "Dutch Hot Coco" desc = "Made in Space South America." list_reagents = list("hot_coco" = 30, "sugar" = 5) + foodtype = SUGAR /obj/item/weapon/reagent_containers/food/drinks/dry_ramen name = "Cup Ramen" desc = "Just add 10ml of water, self heats! A taste that reminds you of your school years." icon_state = "ramen" list_reagents = list("dry_ramen" = 30) + foodtype = GRAIN /obj/item/weapon/reagent_containers/food/drinks/beer name = "Space Beer" desc = "Beer. In space." icon_state = "beer" list_reagents = list("beer" = 30) + foodtype = GRAIN | ALCOHOL /obj/item/weapon/reagent_containers/food/drinks/ale name = "Magm-Ale" @@ -216,6 +231,7 @@ icon_state = "alebottle" item_state = "beer" list_reagents = list("ale" = 30) + foodtype = GRAIN | ALCOHOL /obj/item/weapon/reagent_containers/food/drinks/sillycup name = "paper cup" @@ -244,26 +260,32 @@ icon_state = "orangebox" name = "orange juice box" desc = "A great source of vitamins. Stay healthy!" + foodtype = FRUIT if("milk") icon_state = "milkbox" name = "carton of milk" desc = "An excellent source of calcium for growing space explorers." + foodtype = DAIRY if("applejuice") icon_state = "juicebox" name = "apple juice box" desc = "Sweet apple juice. Don't be late for school!" + foodtype = FRUIT if("grapejuice") icon_state = "grapebox" name = "grape juice box" desc = "Tasty grape juice in a fun little container. Non-alcoholic!" + foodtype = FRUIT if("chocolate_milk") icon_state = "chocolatebox" name = "carton of chocolate milk" desc = "Milk for cool kids!" + foodtype = SUGAR if("eggnog") icon_state = "nog2" name = "carton of eggnog" desc = "For enjoying the most wonderful time of the year." + foodtype = MEAT else icon_state = "juicebox" name = "small carton" @@ -328,7 +350,7 @@ name = "soda can" container_type = 0 spillable = FALSE - + /obj/item/weapon/reagent_containers/food/drinks/soda_cans/attack(mob/M, mob/user) if(M == user && !src.reagents.total_volume && user.a_intent == INTENT_HARM && user.zone_selected == "head") user.visible_message("[user] crushes the can of [src] on [user.p_their()] forehead!", "You crush the can of [src] on your forehead.") @@ -337,7 +359,7 @@ crushed_can.icon_state = icon_state qdel(src) ..() - + /obj/item/weapon/reagent_containers/food/drinks/soda_cans/attack_self(mob/user) if(!is_open_container()) @@ -353,12 +375,14 @@ desc = "Cola. in space." icon_state = "cola" list_reagents = list("cola" = 30) + foodtype = SUGAR /obj/item/weapon/reagent_containers/food/drinks/soda_cans/tonic name = "T-Borg's Tonic Water" desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away." icon_state = "tonic" list_reagents = list("tonic" = 50) + foodtype = ALCOHOL /obj/item/weapon/reagent_containers/food/drinks/soda_cans/sodawater name = "Soda Water" @@ -371,6 +395,7 @@ desc = "You wanted ORANGE. It gave you Lemon Lime." icon_state = "lemon-lime" list_reagents = list("lemon_lime" = 30) + foodtype = FRUIT /obj/item/weapon/reagent_containers/food/drinks/soda_cans/lemon_lime/New() ..() @@ -381,30 +406,35 @@ desc = "Tastes like a hull breach in your mouth." icon_state = "space-up" list_reagents = list("space_up" = 30) + foodtype = SUGAR | JUNKFOOD /obj/item/weapon/reagent_containers/food/drinks/soda_cans/starkist name = "Star-kist" desc = "The taste of a star in liquid form. And, a bit of tuna...?" icon_state = "starkist" list_reagents = list("cola" = 15, "orangejuice" = 15) + foodtype = SUGAR | FRUIT | JUNKFOOD /obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_mountain_wind name = "Space Mountain Wind" desc = "Blows right through you like a space wind." icon_state = "space_mountain_wind" list_reagents = list("spacemountainwind" = 30) + foodtype = SUGAR | JUNKFOOD /obj/item/weapon/reagent_containers/food/drinks/soda_cans/thirteenloko name = "Thirteen Loko" desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkeness, or even death. Please Drink Responsibly." icon_state = "thirteen_loko" list_reagents = list("thirteenloko" = 30) + foodtype = SUGAR | JUNKFOOD /obj/item/weapon/reagent_containers/food/drinks/soda_cans/dr_gibb name = "Dr. Gibb" desc = "A delicious mixture of 42 different flavors." icon_state = "dr_gibb" list_reagents = list("dr_gibb" = 30) + foodtype = SUGAR | JUNKFOOD /obj/item/weapon/reagent_containers/food/drinks/soda_cans/pwr_game name = "Pwr Game" @@ -417,6 +447,7 @@ desc = "~Shake me up some of that Shambler's Juice!~" icon_state = "shamblers" list_reagents = list("shamblers" = 30) + foodtype = SUGAR | JUNKFOOD /obj/item/weapon/reagent_containers/food/drinks/soda_cans/air name = "Canned Air" diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index ce42cf7005a..6e2bdaf5841 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -11,6 +11,7 @@ item_state = "broken_beer" //Generic held-item sprite until unique ones are made. var/const/duration = 13 //Directly relates to the 'knockdown' duration. Lowered by armor (i.e. helmets) var/isGlass = 1 //Whether the 'bottle' is made of glass or not so that milk cartons dont shatter when someone gets hit by it + foodtype = ALCOHOL /obj/item/weapon/reagent_containers/food/drinks/bottle/throw_impact(atom/target,mob/thrower) ..() @@ -172,6 +173,7 @@ desc = "A bottle filled with nothing." icon_state = "bottleofnothing" list_reagents = list("nothing" = 100) + foodtype = null /obj/item/weapon/reagent_containers/food/drinks/bottle/patron name = "Wrapp Artiste Patron" @@ -190,6 +192,7 @@ desc = "A flask of the chaplain's holy water." icon_state = "holyflask" list_reagents = list("holywater" = 100) + foodtype = null /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater/hell desc = "A flask of holy water...it's been sitting in the Necropolis a while though." @@ -206,6 +209,7 @@ desc = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936, HONK." icon_state = "kahluabottle" list_reagents = list("kahlua" = 100) + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/drinks/bottle/goldschlager name = "College Girl Goldschlager" @@ -224,6 +228,7 @@ desc = "A faint aura of unease and asspainery surrounds the bottle." icon_state = "winebottle" list_reagents = list("wine" = 100) + foodtype = FRUIT | ALCOHOL /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe name = "Extra-Strong Absinthe" @@ -283,6 +288,7 @@ desc = "An alcoholic beverage from Space China, made by infusing lizard tails in ethanol. Inexplicably popular among command staff." icon_state = "lizardwine" list_reagents = list("lizardwine" = 100) + foodtype = FRUIT | ALCOHOL /obj/item/weapon/reagent_containers/food/drinks/bottle/hcider name = "Jian Hard Cider" @@ -306,6 +312,7 @@ item_state = "carton" isGlass = 0 list_reagents = list("orangejuice" = 100) + foodtype = FRUIT /obj/item/weapon/reagent_containers/food/drinks/bottle/cream name = "Milk Cream" @@ -314,6 +321,7 @@ item_state = "carton" isGlass = 0 list_reagents = list("cream" = 100) + foodtype = DAIRY /obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice name = "Tomato Juice" @@ -322,6 +330,7 @@ item_state = "carton" isGlass = 0 list_reagents = list("tomatojuice" = 100) + foodtype = VEGETABLES /obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice name = "Lime Juice" @@ -330,6 +339,7 @@ item_state = "carton" isGlass = 0 list_reagents = list("limejuice" = 100) + foodtype = FRUIT ////////////////////////// MOLOTOV /////////////////////// diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index 76ecac0918e..feebf71066e 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -107,7 +107,7 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M if(foodtype & H.dna.species.toxic_food) - to_chat(M,"What the hell was that thing?!") + to_chat(M,"What the hell was that thing?!") M.adjust_disgust(25 + 30 * fraction) else if(foodtype & H.dna.species.disliked_food) to_chat(M,"That didn't taste very good...") diff --git a/code/modules/food_and_drinks/food/snacks_cake.dm b/code/modules/food_and_drinks/food/snacks_cake.dm index d4a3e710a8e..674c273de6a 100644 --- a/code/modules/food_and_drinks/food/snacks_cake.dm +++ b/code/modules/food_and_drinks/food/snacks_cake.dm @@ -23,7 +23,7 @@ custom_food_type = /obj/item/weapon/reagent_containers/food/snacks/customizable/cake bonus_reagents = list("nutriment" = 10, "vitamin" = 2) tastes = list("vanilla" = 1, "sweetness" = 2,"cake" = 5) - foodtype = GRAIN | DAIRY + foodtype = GRAIN | DAIRY | SUGAR /obj/item/weapon/reagent_containers/food/snacks/cakeslice/plain name = "vanilla cake slice" @@ -32,7 +32,7 @@ filling_color = "#FFD700" customfoodfilling = 1 tastes = list("vanilla" = 1, "sweetness" = 2,"cake" = 5) - foodtype = GRAIN | DAIRY + foodtype = GRAIN | DAIRY | SUGAR /obj/item/weapon/reagent_containers/food/snacks/store/cake/carrot name = "carrot cake" @@ -43,7 +43,7 @@ bonus_reagents = list("nutriment" = 3, "oculine" = 5, "vitamin" = 10) list_reagents = list("nutriment" = 20, "oculine" = 10, "vitamin" = 5) tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1) - foodtype = GRAIN | DAIRY | VEGETABLES + foodtype = GRAIN | DAIRY | VEGETABLES | SUGAR /obj/item/weapon/reagent_containers/food/snacks/cakeslice/carrot name = "carrot cake slice" @@ -52,7 +52,7 @@ filling_color = "#FFA500" list_reagents = list("nutriment" = 4, "oculine" = 2, "vitamin" = 1) tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1) - foodtype = GRAIN | DAIRY | VEGETABLES + foodtype = GRAIN | DAIRY | VEGETABLES | SUGAR /obj/item/weapon/reagent_containers/food/snacks/store/cake/brain @@ -64,7 +64,7 @@ bonus_reagents = list("nutriment" = 5, "mannitol" = 10, "vitamin" = 10) list_reagents = list("nutriment" = 20, "mannitol" = 10, "vitamin" = 5) tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1) - foodtype = GRAIN | DAIRY | MEAT | GROSS + foodtype = GRAIN | DAIRY | MEAT | GROSS | SUGAR /obj/item/weapon/reagent_containers/food/snacks/cakeslice/brain @@ -74,7 +74,7 @@ filling_color = "#FF69B4" list_reagents = list("nutriment" = 4, "mannitol" = 2, "vitamin" = 1) tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1) - foodtype = GRAIN | DAIRY | MEAT | GROSS + foodtype = GRAIN | DAIRY | MEAT | GROSS | SUGAR /obj/item/weapon/reagent_containers/food/snacks/store/cake/cheese name = "cheese cake" @@ -104,7 +104,7 @@ slices_num = 5 bonus_reagents = list("nutriment" = 3, "vitamin" = 10) tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2) - foodtype = GRAIN | DAIRY | FRUIT + foodtype = GRAIN | DAIRY | FRUIT | SUGAR /obj/item/weapon/reagent_containers/food/snacks/cakeslice/orange name = "orange cake slice" @@ -112,7 +112,7 @@ icon_state = "orangecake_slice" filling_color = "#FFA500" tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2) - foodtype = GRAIN | DAIRY | FRUIT + foodtype = GRAIN | DAIRY | FRUIT | SUGAR /obj/item/weapon/reagent_containers/food/snacks/store/cake/lime name = "lime cake" @@ -122,7 +122,7 @@ slices_num = 5 bonus_reagents = list("nutriment" = 3, "vitamin" = 10) tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2) - foodtype = GRAIN | DAIRY | FRUIT + foodtype = GRAIN | DAIRY | FRUIT | SUGAR /obj/item/weapon/reagent_containers/food/snacks/cakeslice/lime name = "lime cake slice" @@ -130,7 +130,7 @@ icon_state = "limecake_slice" filling_color = "#00FF00" tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2) - foodtype = GRAIN | DAIRY | FRUIT + foodtype = GRAIN | DAIRY | FRUIT | SUGAR /obj/item/weapon/reagent_containers/food/snacks/store/cake/lemon @@ -141,7 +141,7 @@ slices_num = 5 bonus_reagents = list("nutriment" = 3, "vitamin" = 10) tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2) - foodtype = GRAIN | DAIRY | FRUIT + foodtype = GRAIN | DAIRY | FRUIT | SUGAR /obj/item/weapon/reagent_containers/food/snacks/cakeslice/lemon @@ -150,7 +150,7 @@ icon_state = "lemoncake_slice" filling_color = "#FFEE00" tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2) - foodtype = GRAIN | DAIRY | FRUIT + foodtype = GRAIN | DAIRY | FRUIT | SUGAR /obj/item/weapon/reagent_containers/food/snacks/store/cake/chocolate @@ -161,7 +161,7 @@ slices_num = 5 bonus_reagents = list("nutriment" = 3, "vitamin" = 10) tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4) - foodtype = GRAIN | DAIRY | JUNKFOOD + foodtype = GRAIN | DAIRY | JUNKFOOD | SUGAR /obj/item/weapon/reagent_containers/food/snacks/cakeslice/chocolate @@ -170,7 +170,7 @@ icon_state = "chocolatecake_slice" filling_color = "#A0522D" tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4) - foodtype = GRAIN | DAIRY | JUNKFOOD + foodtype = GRAIN | DAIRY | JUNKFOOD | SUGAR /obj/item/weapon/reagent_containers/food/snacks/store/cake/birthday @@ -182,7 +182,7 @@ bonus_reagents = list("nutriment" = 7, "sprinkles" = 10, "vitamin" = 5) list_reagents = list("nutriment" = 20, "sprinkles" = 10, "vitamin" = 5) tastes = list("cake" = 5, "sweetness" = 1) - foodtype = GRAIN | DAIRY | JUNKFOOD + foodtype = GRAIN | DAIRY | JUNKFOOD | SUGAR /obj/item/weapon/reagent_containers/food/snacks/cakeslice/birthday name = "birthday cake slice" @@ -191,7 +191,7 @@ filling_color = "#DC143C" list_reagents = list("nutriment" = 4, "sprinkles" = 2, "vitamin" = 1) tastes = list("cake" = 5, "sweetness" = 1) - foodtype = GRAIN | DAIRY | JUNKFOOD + foodtype = GRAIN | DAIRY | JUNKFOOD | SUGAR /obj/item/weapon/reagent_containers/food/snacks/store/cake/apple @@ -202,7 +202,7 @@ slices_num = 5 bonus_reagents = list("nutriment" = 3, "vitamin" = 10) tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1) - foodtype = GRAIN | DAIRY | FRUIT + foodtype = GRAIN | DAIRY | FRUIT | SUGAR /obj/item/weapon/reagent_containers/food/snacks/cakeslice/apple name = "apple cake slice" @@ -210,7 +210,7 @@ icon_state = "applecakeslice" filling_color = "#FF4500" tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1) - foodtype = GRAIN | DAIRY | FRUIT + foodtype = GRAIN | DAIRY | FRUIT | SUGAR /obj/item/weapon/reagent_containers/food/snacks/cakeslice/custom name = "cake slice" @@ -225,7 +225,7 @@ slice_path = /obj/item/weapon/reagent_containers/food/snacks/cakeslice/slimecake bonus_reagents = list("nutriment" = 1, "vitamin" = 3) tastes = list("cake" = 5, "sweetness" = 1, "slime" = 1) - foodtype = GRAIN | DAIRY + foodtype = GRAIN | DAIRY | SUGAR /obj/item/weapon/reagent_containers/food/snacks/cakeslice/slimecake name = "slime cake slice" @@ -233,7 +233,7 @@ icon_state = "slimecake_slice" filling_color = "#00FFFF" tastes = list("cake" = 5, "sweetness" = 1, "slime" = 1) - foodtype = GRAIN | DAIRY + foodtype = GRAIN | DAIRY | SUGAR /obj/item/weapon/reagent_containers/food/snacks/store/cake/pumpkinspice name = "pumpkin spice cake" @@ -242,7 +242,7 @@ slice_path = /obj/item/weapon/reagent_containers/food/snacks/cakeslice/pumpkinspice bonus_reagents = list("nutriment" = 3, "vitamin" = 5) tastes = list("cake" = 5, "sweetness" = 1, "pumpkin" = 1) - foodtype = GRAIN | DAIRY | VEGETABLES + foodtype = GRAIN | DAIRY | VEGETABLES | SUGAR /obj/item/weapon/reagent_containers/food/snacks/cakeslice/pumpkinspice name = "pumpkin spice cake slice" @@ -251,4 +251,4 @@ filling_color = "#FFD700" tastes = list("cake" = 5, "sweetness" = 1, "pumpkin" = 1) - foodtype = GRAIN | DAIRY | VEGETABLES + foodtype = GRAIN | DAIRY | VEGETABLES | SUGAR diff --git a/code/modules/food_and_drinks/food/snacks_egg.dm b/code/modules/food_and_drinks/food/snacks_egg.dm index c7420925957..68cdcb7b7e1 100644 --- a/code/modules/food_and_drinks/food/snacks_egg.dm +++ b/code/modules/food_and_drinks/food/snacks_egg.dm @@ -9,6 +9,7 @@ list_reagents = list("nutriment" = 4, "sugar" = 2, "cocoa" = 2) filling_color = "#A0522D" tastes = list("chocolate" = 4, "sweetness" = 1) + foodtype = JUNKFOOD | SUGAR /obj/item/weapon/reagent_containers/food/snacks/egg name = "egg" diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm index 79fa03cc94a..4c9e69ed458 100644 --- a/code/modules/food_and_drinks/food/snacks_meat.dm +++ b/code/modules/food_and_drinks/food/snacks_meat.dm @@ -181,7 +181,7 @@ list_reagents = list("nutriment" = 2) filling_color = "#CD853F" tastes = list("the jungle" = 1, "bananas" = 1) - foodtype = MEAT + foodtype = MEAT | SUGAR /obj/item/weapon/reagent_containers/food/snacks/monkeycube/proc/Expand() visible_message("[src] expands!") diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index 2c8957546f0..8ebdbe00a0f 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -36,7 +36,7 @@ list_reagents = list("nutriment" = 4, "sugar" = 2) filling_color = "#FF8C00" tastes = list("candy corn" = 1) - foodtype = JUNKFOOD + foodtype = JUNKFOOD | SUGAR /obj/item/weapon/reagent_containers/food/snacks/chocolatebar name = "chocolate bar" @@ -45,7 +45,7 @@ list_reagents = list("nutriment" = 2, "sugar" = 2, "cocoa" = 2) filling_color = "#A0522D" tastes = list("chocolate" = 1) - foodtype = JUNKFOOD + foodtype = JUNKFOOD | SUGAR /obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice name = "huge mushroom slice" @@ -147,7 +147,7 @@ list_reagents = list("nutriment" = 3, "sugar" = 2) filling_color = "#FF4500" tastes = list("apple" = 2, "sweetness" = 2) - foodtype = JUNKFOOD | FRUIT + foodtype = JUNKFOOD | FRUIT | SUGAR /obj/item/weapon/reagent_containers/food/snacks/mint name = "mint" @@ -157,7 +157,7 @@ trash = /obj/item/trash/plate list_reagents = list("minttoxin" = 1) filling_color = "#800000" - foodtype = TOXIC + foodtype = TOXIC | SUGAR /obj/item/weapon/reagent_containers/food/snacks/eggwrap name = "egg wrap" @@ -196,7 +196,7 @@ list_reagents = list("nutriment" = 3, "cocoa" = 1) filling_color = "#A0522D" tastes = list("chocolate" = 1) - foodtype = JUNKFOOD + foodtype = JUNKFOOD | SUGAR /obj/item/weapon/reagent_containers/food/snacks/fudgedice name = "fudge dice" @@ -207,7 +207,7 @@ filling_color = "#A0522D" trash = /obj/item/weapon/dice/fudge tastes = list("fudge" = 1) - foodtype = JUNKFOOD + foodtype = JUNKFOOD | SUGAR /obj/item/weapon/reagent_containers/food/snacks/chocoorange name = "chocolate orange" @@ -217,7 +217,7 @@ list_reagents = list("nutriment" = 3, "sugar" = 1) filling_color = "#A0522D" tastes = list("chocolate" = 3, "oranges" = 1) - foodtype = JUNKFOOD + foodtype = JUNKFOOD | SUGAR /obj/item/weapon/reagent_containers/food/snacks/eggplantparm name = "eggplant parmigiana" @@ -288,7 +288,7 @@ list_reagents = list("nutriment" = 5, "vitamin" = 4) filling_color = "#8B1105" tastes = list("sweet potato" = 1) - foodtype = GRAIN | VEGETABLES + foodtype = GRAIN | VEGETABLES | SUGAR /obj/item/weapon/reagent_containers/food/snacks/roastparsnip name = "roast parsnip" @@ -329,7 +329,7 @@ list_reagents = list("nutriment" = 6, "banana" = 5, "vitamin" = 2) filling_color = "#FFFACD" tastes = list("ice cream" = 1, "banana" = 1) - foodtype = FRUIT | DAIRY + foodtype = FRUIT | DAIRY | SUGAR /obj/item/weapon/reagent_containers/food/snacks/honkdae name = "honkdae" @@ -339,7 +339,7 @@ list_reagents = list("nutriment" = 6, "banana" = 10, "vitamin" = 4) filling_color = "#FFFACD" tastes = list("ice cream" = 1, "banana" = 1, "a bad joke" = 1) - foodtype = FRUIT | DAIRY + foodtype = FRUIT | DAIRY | SUGAR /obj/item/weapon/reagent_containers/food/snacks/nachos name = "nachos" @@ -391,7 +391,7 @@ list_reagents = list("nutriment" = 5, "honey" = 5) filling_color = "#F2CE91" tastes = list("oats" = 3, "nuts" = 2, "honey" = 1) - foodtype = FRUIT + foodtype = FRUIT | SUGAR /obj/item/weapon/reagent_containers/food/snacks/stuffedlegion name = "stuffed legion" @@ -416,7 +416,7 @@ attack_verb = list("slapped", "slathered") w_class = WEIGHT_CLASS_BULKY tastes = list("cherry" = 1, "crepe" = 1) - foodtype = GRAIN | FRUIT + foodtype = GRAIN | FRUIT | SUGAR /obj/item/weapon/reagent_containers/food/snacks/lollipop name = "lollipop" @@ -427,7 +427,7 @@ var/mutable_appearance/head var/headcolor = rgb(0, 0, 0) tastes = list("candy" = 1) - foodtype = JUNKFOOD + foodtype = JUNKFOOD | SUGAR /obj/item/weapon/reagent_containers/food/snacks/lollipop/New() ..() diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm index 2564e662dff..8f52a5b40dc 100644 --- a/code/modules/food_and_drinks/food/snacks_pastry.dm +++ b/code/modules/food_and_drinks/food/snacks_pastry.dm @@ -12,7 +12,7 @@ var/extra_reagent = null filling_color = "#D2691E" tastes = list("donut" = 1) - foodtype = JUNKFOOD | GRAIN | FRIED + foodtype = JUNKFOOD | GRAIN | FRIED | SUGAR /obj/item/weapon/reagent_containers/food/snacks/donut/Initialize() . = ..() @@ -48,7 +48,7 @@ bonus_reagents = list("sugar" = 1, "vitamin" = 1) extra_reagent = "berryjuice" tastes = list("jelly" = 1, "donut" = 3) - foodtype = JUNKFOOD | GRAIN | FRIED | FRUIT + foodtype = JUNKFOOD | GRAIN | FRIED | FRUIT | SUGAR /obj/item/weapon/reagent_containers/food/snacks/donut/jelly/Initialize() . = ..() @@ -66,7 +66,7 @@ desc = "You jelly?" icon_state = "jdonut1" extra_reagent = "slimejelly" - foodtype = JUNKFOOD | GRAIN | FRIED | TOXIC + foodtype = JUNKFOOD | GRAIN | FRIED | TOXIC | SUGAR /obj/item/weapon/reagent_containers/food/snacks/donut/jelly/cherryjelly name = "jelly donut" @@ -85,14 +85,14 @@ list_reagents = list("nutriment" = 6) filling_color = "#F4A460" tastes = list("muffin" = 1) - foodtype = GRAIN + foodtype = GRAIN | SUGAR /obj/item/weapon/reagent_containers/food/snacks/muffin/berry name = "berry muffin" icon_state = "berrymuffin" desc = "A delicious and spongy little cake, with berries." tastes = list("muffin" = 3, "berry" = 1) - foodtype = GRAIN | FRUIT + foodtype = GRAIN | FRUIT | SUGAR /obj/item/weapon/reagent_containers/food/snacks/muffin/booberry name = "booberry muffin" @@ -100,7 +100,7 @@ alpha = 125 desc = "My stomach is a graveyard! No living being can quench my bloodthirst!" tastes = list("muffin" = 3, "spookiness" = 1) - foodtype = GRAIN | FRUIT + foodtype = GRAIN | FRUIT | SUGAR /obj/item/weapon/reagent_containers/food/snacks/chawanmushi name = "chawanmushi" @@ -123,7 +123,7 @@ list_reagents = list("nutriment" = 8, "vitamin" = 1) filling_color = "#D2691E" tastes = list("waffles" = 1) - foodtype = GRAIN + foodtype = GRAIN | SUGAR /obj/item/weapon/reagent_containers/food/snacks/soylentgreen name = "\improper Soylent Green" @@ -157,7 +157,7 @@ list_reagents = list("nutriment" = 8, "mushroomhallucinogen" = 2, "vitamin" = 2) filling_color = "#00BFFF" tastes = list("waffle" = 1, "mushrooms" = 1) - foodtype = GRAIN | VEGETABLES | TOXIC + foodtype = GRAIN | VEGETABLES | TOXIC | SUGAR ////////////////////////////////////////////OTHER//////////////////////////////////////////// @@ -170,7 +170,7 @@ list_reagents = list("nutriment" = 1) filling_color = "#F0E68C" tastes = list("cookie" = 1) - foodtype = GRAIN + foodtype = GRAIN | SUGAR /obj/item/weapon/reagent_containers/food/snacks/donkpocket name = "\improper Donk-pocket" @@ -207,7 +207,7 @@ list_reagents = list("nutriment" = 3) filling_color = "#F4A460" tastes = list("cookie" = 1) - foodtype = GRAIN + foodtype = GRAIN | SUGAR /obj/item/weapon/reagent_containers/food/snacks/poppypretzel name = "poppy pretzel" @@ -217,7 +217,7 @@ list_reagents = list("nutriment" = 5) filling_color = "#F0E68C" tastes = list("pretzel" = 1) - foodtype = GRAIN + foodtype = GRAIN | SUGAR /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit name = "plump helmet biscuit" @@ -289,7 +289,7 @@ list_reagents = list("nutriment" = 3, "sugar" = 3) filling_color = "#CD853F" tastes = list("sweetness" = 1) - foodtype = GRAIN | JUNKFOOD + foodtype = GRAIN | JUNKFOOD | SUGAR /obj/item/weapon/reagent_containers/food/snacks/chococornet name = "chocolate cornet" @@ -329,7 +329,7 @@ list_reagents = list("nutriment" = 5, "vitamin" = 1) filling_color = "#F0E68C" tastes = list("cake" = 3, "cherry" = 1) - foodtype = GRAIN | FRUIT + foodtype = GRAIN | FRUIT | SUGAR /obj/item/weapon/reagent_containers/food/snacks/bluecherrycupcake name = "blue cherry cupcake" @@ -339,7 +339,7 @@ list_reagents = list("nutriment" = 5, "vitamin" = 1) filling_color = "#F0E68C" tastes = list("cake" = 3, "blue cherry" = 1) - foodtype = GRAIN | FRUIT + foodtype = GRAIN | FRUIT | SUGAR /obj/item/weapon/reagent_containers/food/snacks/honeybun name = "honey bun" diff --git a/code/modules/food_and_drinks/food/snacks_pie.dm b/code/modules/food_and_drinks/food/snacks_pie.dm index 557fe788000..422e681cbe9 100644 --- a/code/modules/food_and_drinks/food/snacks_pie.dm +++ b/code/modules/food_and_drinks/food/snacks_pie.dm @@ -26,7 +26,7 @@ bonus_reagents = list("nutriment" = 2, "vitamin" = 2) list_reagents = list("nutriment" = 6, "banana" = 5, "vitamin" = 2) tastes = list("pie" = 1) - foodtype = GRAIN | DAIRY + foodtype = GRAIN | DAIRY | SUGAR /obj/item/weapon/reagent_containers/food/snacks/pie/cream/throw_impact(atom/hit_atom) if(!..()) //was it caught by a mob? @@ -56,7 +56,7 @@ bonus_reagents = list("nutriment" = 1, "vitamin" = 2) list_reagents = list("nutriment" = 10, "berryjuice" = 5, "vitamin" = 2) tastes = list("pie" = 1, "blackberries" = 1) - foodtype = GRAIN | FRUIT + foodtype = GRAIN | FRUIT | SUGAR /obj/item/weapon/reagent_containers/food/snacks/pie/bearypie name = "beary pie" @@ -65,7 +65,7 @@ bonus_reagents = list("nutriment" = 2, "vitamin" = 3) list_reagents = list("nutriment" = 2, "vitamin" = 3) tastes = list("pie" = 1, "meat" = 1, "salmon" = 1) - foodtype = GRAIN + foodtype = GRAIN | SUGAR /obj/item/weapon/reagent_containers/food/snacks/pie/meatpie name = "meat-pie" @@ -132,7 +132,7 @@ icon_state = "applepie" bonus_reagents = list("nutriment" = 1, "vitamin" = 3) tastes = list("pie" = 1, "apple" = 1) - foodtype = GRAIN | FRUIT + foodtype = GRAIN | FRUIT | SUGAR @@ -142,7 +142,7 @@ icon_state = "cherrypie" bonus_reagents = list("nutriment" = 1, "vitamin" = 2) tastes = list("pie" = 7, "Nicole Paige Brooks" = 2) - foodtype = GRAIN | FRUIT + foodtype = GRAIN | FRUIT | SUGAR /obj/item/weapon/reagent_containers/food/snacks/pie/pumpkinpie @@ -173,7 +173,7 @@ bonus_reagents = list("nutriment" = 1, "vitamin" = 4) list_reagents = list("nutriment" = 8, "gold" = 5, "vitamin" = 4) tastes = list("pie" = 1, "apple" = 1, "expensive metal" = 1) - foodtype = GRAIN | FRUIT + foodtype = GRAIN | FRUIT | SUGAR /obj/item/weapon/reagent_containers/food/snacks/pie/grapetart name = "grape tart" @@ -182,7 +182,7 @@ bonus_reagents = list("nutriment" = 1, "vitamin" = 4) list_reagents = list("nutriment" = 4, "vitamin" = 4) tastes = list("pie" = 1, "grape" = 1) - foodtype = GRAIN | FRUIT + foodtype = GRAIN | FRUIT | SUGAR /obj/item/weapon/reagent_containers/food/snacks/pie/blumpkinpie name = "blumpkin pie" @@ -213,7 +213,7 @@ slices_num = 5 bonus_reagents = list("nutriment" = 4, "vitamin" = 8) tastes = list("jelly" = 1, "sweet potato" = 1) - foodtype = GRAIN | VEGETABLES + foodtype = GRAIN | VEGETABLES | SUGAR /obj/item/weapon/reagent_containers/food/snacks/dulcedebatataslice name = "dulce de batata slice" @@ -224,7 +224,7 @@ filling_color = "#8B4513" list_reagents = list("nutriment" = 2) tastes = list("jelly" = 1, "sweet potato" = 1) - foodtype = GRAIN | VEGETABLES + foodtype = GRAIN | VEGETABLES | SUGAR /obj/item/weapon/reagent_containers/food/snacks/pie/frostypie name = "frosty pie" @@ -232,4 +232,4 @@ icon_state = "frostypie" bonus_reagents = list("nutriment" = 4, "vitamin" = 6) tastes = list("mint" = 1, "pie" = 1) - foodtype = GRAIN | FRUIT + foodtype = GRAIN | FRUIT | SUGAR diff --git a/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm b/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm index 45551e086f5..f1b9febf821 100644 --- a/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm +++ b/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm @@ -86,12 +86,12 @@ /obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/cherry bonus_reagents = list("cherryjelly" = 5, "vitamin" = 2) list_reagents = list("nutriment" = 1, "cherryjelly" = 5, "vitamin" = 2) - foodtype = GRAIN | FRUIT + foodtype = GRAIN | FRUIT | SUGAR /obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/slime bonus_reagents = list("slimejelly" = 5, "vitamin" = 2) list_reagents = list("nutriment" = 1, "slimejelly" = 5, "vitamin" = 2) - foodtype = GRAIN | TOXIC + foodtype = GRAIN | TOXIC | SUGAR /obj/item/weapon/reagent_containers/food/snacks/twobread name = "two bread" diff --git a/code/modules/food_and_drinks/food/snacks_soup.dm b/code/modules/food_and_drinks/food/snacks_soup.dm index b36b3ba5af9..2e7e5389151 100644 --- a/code/modules/food_and_drinks/food/snacks_soup.dm +++ b/code/modules/food_and_drinks/food/snacks_soup.dm @@ -45,7 +45,7 @@ bonus_reagents = list("nutriment" = 1, "slimejelly" = 5, "vitamin" = 5) list_reagents = list("nutriment" = 5, "slimejelly" = 5, "water" = 5, "vitamin" = 4) tastes = list("slime" = 1) - foodtype = TOXIC + foodtype = TOXIC | SUGAR /obj/item/weapon/reagent_containers/food/snacks/soup/blood name = "tomato soup" @@ -73,7 +73,7 @@ bonus_reagents = list("nutriment" = 1, "banana" = 5, "vitamin" = 8) list_reagents = list("nutriment" = 4, "banana" = 5, "water" = 5, "vitamin" = 8) tastes = list("a bad joke" = 1) - foodtype = FRUIT + foodtype = FRUIT | SUGAR /obj/item/weapon/reagent_containers/food/snacks/soup/vegetable name = "vegetable soup" @@ -216,7 +216,7 @@ icon_state = "sweetpotatosoup" bonus_reagents = list("nutriment" = 4, "vitamin" = 5) tastes = list("sweet potato" = 1) - foodtype = VEGETABLES + foodtype = VEGETABLES | SUGAR /obj/item/weapon/reagent_containers/food/snacks/soup/beet/red name = "red beet soup" diff --git a/code/modules/food_and_drinks/food/snacks_vend.dm b/code/modules/food_and_drinks/food/snacks_vend.dm index ddf21c33384..8485e879f9b 100644 --- a/code/modules/food_and_drinks/food/snacks_vend.dm +++ b/code/modules/food_and_drinks/food/snacks_vend.dm @@ -11,7 +11,7 @@ junkiness = 25 filling_color = "#D2691E" tastes = list("candy" = 1) - foodtype = JUNKFOOD + foodtype = JUNKFOOD | SUGAR /obj/item/weapon/reagent_containers/food/snacks/sosjerky name = "\improper Scaredy's Private Reserve Beef Jerky" @@ -22,7 +22,7 @@ junkiness = 25 filling_color = "#8B0000" tastes = list("dried meat" = 1) - foodtype = JUNKFOOD | MEAT + foodtype = JUNKFOOD | MEAT | SUGAR /obj/item/weapon/reagent_containers/food/snacks/sosjerky/healthy name = "homemade beef jerky" @@ -51,7 +51,7 @@ junkiness = 25 filling_color = "#8B0000" tastes = list("dried raisins" = 1) - foodtype = JUNKFOOD | FRUIT + foodtype = JUNKFOOD | FRUIT | SUGAR /obj/item/weapon/reagent_containers/food/snacks/no_raisin/healthy name = "homemade raisins" @@ -67,7 +67,7 @@ list_reagents = list("sugar" = 4) junkiness = 25 filling_color = "#FFD700" - foodtype = JUNKFOOD | GRAIN + foodtype = JUNKFOOD | GRAIN | SUGAR /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers name = "cheesie honkers" @@ -78,7 +78,7 @@ junkiness = 25 filling_color = "#FFD700" tastes = list("cheese" = 5, "crisps" = 2) - foodtype = JUNKFOOD | DAIRY + foodtype = JUNKFOOD | DAIRY | SUGAR /obj/item/weapon/reagent_containers/food/snacks/syndicake name = "syndi-cakes" diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm index cc750e61001..54b53c9a953 100644 --- a/code/modules/hydroponics/grown/misc.dm +++ b/code/modules/hydroponics/grown/misc.dm @@ -80,7 +80,7 @@ icon_state = "sugarcane" filling_color = "#FFD700" bitesize_mod = 2 - foodtype = VEGETABLES + foodtype = VEGETABLES | SUGAR // Gatfruit @@ -167,4 +167,4 @@ plantname = "Fruiting Cactus" product = /obj/item/weapon/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' - growthstages = 2 \ No newline at end of file + growthstages = 2 From fedf7ba7fd494f4f5c41aaad5d04d5e9927766ce Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Thu, 20 Jul 2017 17:10:16 +0200 Subject: [PATCH 20/27] pleases the gods --- .../items/weapons/grenades/chem_grenade.dm | 2 +- code/modules/food_and_drinks/drinks/drinks.dm | 2 +- .../food_and_drinks/drinks/drinks/bottle.dm | 4 +-- code/modules/food_and_drinks/food.dm | 2 +- code/modules/food_and_drinks/food/snacks.dm | 26 +++++++++---------- .../mob/living/carbon/carbon_defines.dm | 4 ++- .../mob/living/carbon/human/species.dm | 2 +- .../modules/mob/living/carbon/status_procs.dm | 3 ++- code/modules/mob/mob_defines.dm | 1 - 9 files changed, 24 insertions(+), 22 deletions(-) diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 63c64f16d01..16e0cb8e77f 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -553,7 +553,7 @@ desc = "Filled with some of the most rancid stuff ever, will probably make anyone within a mile of it dry heave." stage = READY -/obj/item/weapon/grenade/chem_grenade/pukonium/New() +/obj/item/weapon/grenade/chem_grenade/pukonium/Initialize() ..() var/obj/item/weapon/reagent_containers/glass/beaker/large/B1 = new(src) var/obj/item/weapon/reagent_containers/glass/beaker/large/B2 = new(src) diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 8a83712811d..b257276dc00 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -47,7 +47,7 @@ add_logs(user, M, "fed", reagentlist(src)) var/fraction = min(gulp_size/reagents.total_volume, 1) - if(ishuman(M)) + if(iscarbon(M)) var/mob/living/carbon/human/H = M if(foodtype & H.dna.species.toxic_food) to_chat(M,"What the hell is this?!") diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 6e2bdaf5841..ca93ef1adf8 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -173,7 +173,7 @@ desc = "A bottle filled with nothing." icon_state = "bottleofnothing" list_reagents = list("nothing" = 100) - foodtype = null + foodtype = NONE /obj/item/weapon/reagent_containers/food/drinks/bottle/patron name = "Wrapp Artiste Patron" @@ -192,7 +192,7 @@ desc = "A flask of the chaplain's holy water." icon_state = "holyflask" list_reagents = list("holywater" = 100) - foodtype = null + foodtype = NONE /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater/hell desc = "A flask of holy water...it's been sitting in the Necropolis a while though." diff --git a/code/modules/food_and_drinks/food.dm b/code/modules/food_and_drinks/food.dm index 98fbdc436fb..7bab6adcf9c 100644 --- a/code/modules/food_and_drinks/food.dm +++ b/code/modules/food_and_drinks/food.dm @@ -6,7 +6,7 @@ volume = 50 //Sets the default container amount for all food items. container_type = INJECTABLE resistance_flags = FLAMMABLE - var/foodtype + var/foodtype = NONE /obj/item/weapon/reagent_containers/food/New() ..() diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index feebf71066e..2f68240984a 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -103,24 +103,24 @@ if(M.satiety > -200) M.satiety -= junkiness playsound(M.loc,'sound/items/eatfood.ogg', rand(10,50), 1) - var/fraction = min(bitesize / reagents.total_volume, 1) - if(ishuman(M)) - var/mob/living/carbon/human/H = M - if(foodtype & H.dna.species.toxic_food) - to_chat(M,"What the hell was that thing?!") - M.adjust_disgust(25 + 30 * fraction) - else if(foodtype & H.dna.species.disliked_food) - to_chat(M,"That didn't taste very good...") - M.adjust_disgust(11 + 15 * fraction) - else if(foodtype & H.dna.species.liked_food) - to_chat(M,"I love this taste!") - M.adjust_disgust(-5 + -2.5 * fraction) if(reagents.total_volume) + var/fraction = min(bitesize / reagents.total_volume, 1) reagents.reaction(M, INGEST, fraction) reagents.trans_to(M, bitesize) bitecount++ On_Consume() - return 1 + if(iscarbon(M)) + var/mob/living/carbon/human/H = M + if(foodtype & H.dna.species.toxic_food) + to_chat(M,"What the hell was that thing?!") + M.adjust_disgust(25 + 30 * fraction) + else if(foodtype & H.dna.species.disliked_food) + to_chat(M,"That didn't taste very good...") + M.adjust_disgust(11 + 15 * fraction) + else if(foodtype & H.dna.species.liked_food) + to_chat(M,"I love this taste!") + M.adjust_disgust(-5 + -2.5 * fraction) + return 1 return 0 diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index fec1422ff13..a6055c7d70c 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -11,6 +11,8 @@ var/obj/item/handcuffed = null //Whether or not the mob is handcuffed var/obj/item/legcuffed = null //Same as handcuffs but for legs. Bear traps use this. + var/disgust = 0 + //inventory slots var/obj/item/back = null var/obj/item/clothing/mask/wear_mask = null @@ -47,4 +49,4 @@ var/list/hand_bodyparts = list() //a collection of arms (or actually whatever the fug /bodyparts you monsters use to wreck my systems) var/icon_render_key = "" - var/static/list/limb_icon_cache = list() \ No newline at end of file + var/static/list/limb_icon_cache = list() diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 988dd06df89..a2354f320d0 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -29,7 +29,7 @@ var/exotic_bloodtype = "" //If your race uses a non standard bloodtype (A+, O-, AB-, etc) var/meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human //What the species drops on gibbing var/skinned_type - var/liked_food + var/liked_food = NONE var/disliked_food = GROSS var/toxic_food = TOXIC var/list/no_equip = list() // slots the race can't equip stuff to diff --git a/code/modules/mob/living/carbon/status_procs.dm b/code/modules/mob/living/carbon/status_procs.dm index 64aa364711e..52c3f64cedf 100644 --- a/code/modules/mob/living/carbon/status_procs.dm +++ b/code/modules/mob/living/carbon/status_procs.dm @@ -72,7 +72,8 @@ disgust = max(disgust+amount, 0) /mob/living/carbon/set_disgust(amount) - disgust = amount + if(amount >= 0) + disgust = amount /mob/living/carbon/cure_blind() if(disabilities & BLIND) diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 9f44a0ad711..c9272c8d6bb 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -46,7 +46,6 @@ var/cultslurring = 0 //Carbon var/real_name = null var/druggy = 0 //Carbon - var/disgust = 0 //Carbon var/confused = 0 //Carbon var/resting = 0 //Carbon var/lying = 0 From 6c3911c0ba49c1f83322ae897d2ae4d3e9aa6b14 Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Thu, 20 Jul 2017 17:18:21 +0200 Subject: [PATCH 21/27] changes species prefer food types --- .../mob/living/carbon/human/species_types/lizardpeople.dm | 2 +- code/modules/mob/living/carbon/human/species_types/plasmamen.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index 2f8fbe25a0b..473e7099a5c 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -16,7 +16,7 @@ meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard skinned_type = /obj/item/stack/sheet/animalhide/lizard exotic_bloodtype = "L" - disliked_food = FRUIT + disliked_food = GRAIN | DAIRY liked_food = GROSS | MEAT /datum/species/lizard/after_equip_job(datum/job/J, mob/living/carbon/human/H) diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm index e3e6f1a0f23..2aec3df7816 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -17,7 +17,7 @@ speedmod = 1 damage_overlay_type = ""//let's not show bloody wounds or burns over bones. var/internal_fire = FALSE //If the bones themselves are burning clothes won't help you much - disliked_food = GRAIN + disliked_food = FRUIT liked_food = VEGETABLES /datum/species/plasmaman/spec_life(mob/living/carbon/human/H) From e6d95a2beb7c707b62af5270400b8e9cbac18df3 Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Mon, 24 Jul 2017 11:45:03 +0200 Subject: [PATCH 22/27] this kills the proc --- .../mob/living/carbon/human/species.dm | 32 ----------------- code/modules/surgery/organs/stomach.dm | 36 +++++++++++++++++-- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index a2354f320d0..867ac0c48b1 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -924,38 +924,6 @@ else H.throw_alert("nutrition", /obj/screen/alert/starving) -/datum/species/proc/handle_disgust(mob/living/carbon/human/H, var/metabolism_rate) - if(H.disgust) - var/pukeprob = 5 + 0.05 * H.disgust - if(H.disgust >= DISGUST_LEVEL_GROSS) - if(prob(10)) - H.stuttering += 1 - H.confused += 2 - if(prob(10) && !H.stat) - to_chat(H, "You feel kind of iffy...") - H.jitteriness = max(H.jitteriness - 3, 0) - if(H.disgust >= DISGUST_LEVEL_VERYGROSS) - if(prob(pukeprob)) //iT hAndLeS mOrE ThaN PukInG - H.confused += 2.5 - H.stuttering += 1 - H.vomit(10, 0, 1, 0, 1, 0) - H.Dizzy(5) - if(H.disgust >= DISGUST_LEVEL_DISGUSTED) - if(prob(25)) - H.blur_eyes(3) //We need to add more shit down here - - H.adjust_disgust(-0.5 * metabolism_rate) - - switch(H.disgust) - if(0 to DISGUST_LEVEL_GROSS) - H.clear_alert("disgust") - if(DISGUST_LEVEL_GROSS to DISGUST_LEVEL_VERYGROSS) - H.throw_alert("disgust", /obj/screen/alert/gross) - if(DISGUST_LEVEL_VERYGROSS to DISGUST_LEVEL_DISGUSTED) - H.throw_alert("disgust", /obj/screen/alert/verygross) - if(DISGUST_LEVEL_DISGUSTED to INFINITY) - H.throw_alert("disgust", /obj/screen/alert/disgusted) - /datum/species/proc/update_health_hud(mob/living/carbon/human/H) return 0 diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm index de119099605..9f315dbd80f 100755 --- a/code/modules/surgery/organs/stomach.dm +++ b/code/modules/surgery/organs/stomach.dm @@ -7,14 +7,46 @@ slot = "stomach" attack_verb = list("gored", "squished", "slapped", "digested") desc = "Onaka ga suite imasu." - var/disgustmetabolism = 1 + var/disgust_metabolism = 1 /obj/item/organ/stomach/on_life() var/mob/living/carbon/human/H = owner if(istype(H)) H.dna.species.handle_digestion(H) - H.dna.species.handle_disgust(H, disgustmetabolism) + handle_disgust(H) + +/obj/item/organ/proc/handle_disgust(mob/living/carbon/human/H) + if(H.disgust) + var/pukeprob = 5 + 0.05 * H.disgust + if(H.disgust >= DISGUST_LEVEL_GROSS) + if(prob(10)) + H.stuttering += 1 + H.confused += 2 + if(prob(10) && !H.stat) + to_chat(H, "You feel kind of iffy...") + H.jitteriness = max(H.jitteriness - 3, 0) + if(H.disgust >= DISGUST_LEVEL_VERYGROSS) + if(prob(pukeprob)) //iT hAndLeS mOrE ThaN PukInG + H.confused += 2.5 + H.stuttering += 1 + H.vomit(10, 0, 1, 0, 1, 0) + H.Dizzy(5) + if(H.disgust >= DISGUST_LEVEL_DISGUSTED) + if(prob(25)) + H.blur_eyes(3) //We need to add more shit down here + + H.adjust_disgust(-0.5 * disgust_metabolism) + + switch(H.disgust) + if(0 to DISGUST_LEVEL_GROSS) + H.clear_alert("disgust") + if(DISGUST_LEVEL_GROSS to DISGUST_LEVEL_VERYGROSS) + H.throw_alert("disgust", /obj/screen/alert/gross) + if(DISGUST_LEVEL_VERYGROSS to DISGUST_LEVEL_DISGUSTED) + H.throw_alert("disgust", /obj/screen/alert/verygross) + if(DISGUST_LEVEL_DISGUSTED to INFINITY) + H.throw_alert("disgust", /obj/screen/alert/disgusted) /obj/item/organ/stomach/Remove() ..() From 18216bf15c0c706031df42595baea12ca1fc1cee Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Mon, 24 Jul 2017 12:28:27 +0200 Subject: [PATCH 23/27] this revives the proc --- code/modules/surgery/organs/stomach.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm index 9f315dbd80f..a728d9d695a 100755 --- a/code/modules/surgery/organs/stomach.dm +++ b/code/modules/surgery/organs/stomach.dm @@ -16,7 +16,7 @@ H.dna.species.handle_digestion(H) handle_disgust(H) -/obj/item/organ/proc/handle_disgust(mob/living/carbon/human/H) +/obj/item/organ/stomach/proc/handle_disgust(mob/living/carbon/human/H) if(H.disgust) var/pukeprob = 5 + 0.05 * H.disgust if(H.disgust >= DISGUST_LEVEL_GROSS) From 2efdc786811e3792941b666ed2946944a7c073f0 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 29 Jul 2017 03:52:55 +0200 Subject: [PATCH 24/27] this fixes the PR --- .../items/weapons/grenades/chem_grenade.dm | 22 ------------------- code/modules/food_and_drinks/drinks/drinks.dm | 12 +--------- code/modules/food_and_drinks/food.dm | 14 ++++++++++++ code/modules/food_and_drinks/food/snacks.dm | 12 +--------- .../mob/living/carbon/human/examine.dm | 14 ++++++------ .../carbon/human/species_types/skeletons.dm | 2 +- .../carbon/human/species_types/zombies.dm | 2 +- .../chemistry/reagents/other_reagents.dm | 11 ---------- code/modules/surgery/organs/stomach.dm | 4 ++-- 9 files changed, 27 insertions(+), 66 deletions(-) diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 16e0cb8e77f..0db6f104389 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -547,25 +547,3 @@ beakers += B1 beakers += B2 - -/obj/item/weapon/grenade/chem_grenade/pukonium - name = "pukonium grenade" - desc = "Filled with some of the most rancid stuff ever, will probably make anyone within a mile of it dry heave." - stage = READY - -/obj/item/weapon/grenade/chem_grenade/pukonium/Initialize() - ..() - var/obj/item/weapon/reagent_containers/glass/beaker/large/B1 = new(src) - var/obj/item/weapon/reagent_containers/glass/beaker/large/B2 = new(src) - - B1.reagents.add_reagent("pukonium", 60) - B1.reagents.add_reagent("potassium", 40) - B2.reagents.add_reagent("phosphorus", 40) - B2.reagents.add_reagent("sugar", 40) - - beakers += B1 - beakers += B2 - -#undef EMPTY -#undef WIRED -#undef READY diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 99951928ed6..fbc1dccdc55 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -47,17 +47,7 @@ add_logs(user, M, "fed", reagentlist(src)) var/fraction = min(gulp_size/reagents.total_volume, 1) - if(iscarbon(M)) - var/mob/living/carbon/human/H = M - if(foodtype & H.dna.species.toxic_food) - to_chat(M,"What the hell is this?!") - M.adjust_disgust(25 + 30 * fraction) - else if(foodtype & H.dna.species.disliked_food) - to_chat(M,"That didn't taste very good...") - M.adjust_disgust(11 + 15 * fraction) - else if(foodtype & H.dna.species.liked_food) - to_chat(M,"I love this taste!") - M.adjust_disgust(-5 + -2.5 * fraction) + checkLiked(fraction, M) reagents.reaction(M, INGEST, fraction) reagents.trans_to(M, gulp_size) playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1) diff --git a/code/modules/food_and_drinks/food.dm b/code/modules/food_and_drinks/food.dm index 7bab6adcf9c..03f5e79bb02 100644 --- a/code/modules/food_and_drinks/food.dm +++ b/code/modules/food_and_drinks/food.dm @@ -12,3 +12,17 @@ ..() pixel_x = rand(-5, 5) //Randomizes postion slightly. pixel_y = rand(-5, 5) + + +/obj/item/weapon/reagent_containers/food/proc/checkLiked(var/fraction, mob/M) + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(foodtype & H.dna.species.toxic_food) + to_chat(H,"What the hell was that thing?!") + H.adjust_disgust(25 + 30 * fraction) + else if(foodtype & H.dna.species.disliked_food) + to_chat(H,"That didn't taste very good...") + H.adjust_disgust(11 + 15 * fraction) + else if(foodtype & H.dna.species.liked_food) + to_chat(H,"I love this taste!") + H.adjust_disgust(-5 + -2.5 * fraction) diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index 2f68240984a..004a52cb302 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -109,17 +109,7 @@ reagents.trans_to(M, bitesize) bitecount++ On_Consume() - if(iscarbon(M)) - var/mob/living/carbon/human/H = M - if(foodtype & H.dna.species.toxic_food) - to_chat(M,"What the hell was that thing?!") - M.adjust_disgust(25 + 30 * fraction) - else if(foodtype & H.dna.species.disliked_food) - to_chat(M,"That didn't taste very good...") - M.adjust_disgust(11 + 15 * fraction) - else if(foodtype & H.dna.species.liked_food) - to_chat(M,"I love this taste!") - M.adjust_disgust(-5 + -2.5 * fraction) + checkLiked(fraction, M) return 1 return 0 diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 5dd0bf69f4c..7172ecf62a5 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -224,13 +224,13 @@ msg += "[t_He] [t_is] plump and delicious looking - Like a fat little piggy. A tasty piggy.\n" else msg += "[t_He] [t_is] quite chubby.\n" - - if(disgust >= DISGUST_LEVEL_DISGUSTED) - msg += "[t_He] looks disgusted.\n" - else if(disgust >= DISGUST_LEVEL_VERYGROSS) - msg += "[t_He] looks really grossed out.\n" - else if(disgust >= DISGUST_LEVEL_GROSS) - msg += "[t_He] looks a bit grossed out.\n" + switch(disgust) + if(0 to DISGUST_LEVEL_GROSS) + msg += "[t_He] looks a bit grossed out.\n" + if(DISGUST_LEVEL_GROSS to DISGUST_LEVEL_VERYGROSS) + msg += "[t_He] looks really grossed out.\n" + if(DISGUST_LEVEL_VERYGROSS to DISGUST_LEVEL_DISGUSTED) + msg += "[t_He] looks disgusted.\n" if(blood_volume < BLOOD_VOLUME_SAFE) msg += "[t_He] [t_has] pale skin.\n" diff --git a/code/modules/mob/living/carbon/human/species_types/skeletons.dm b/code/modules/mob/living/carbon/human/species_types/skeletons.dm index 63213243c67..d2b8ed6220d 100644 --- a/code/modules/mob/living/carbon/human/species_types/skeletons.dm +++ b/code/modules/mob/living/carbon/human/species_types/skeletons.dm @@ -9,5 +9,5 @@ species_traits = list(NOBREATH,RESISTHOT,RESISTCOLD,RESISTPRESSURE,NOBLOOD,RADIMMUNE,VIRUSIMMUNE,PIERCEIMMUNE,NOHUNGER,EASYDISMEMBER,EASYLIMBATTACHMENT) mutant_organs = list(/obj/item/organ/tongue/bone) damage_overlay_type = ""//let's not show bloody wounds or burns over bones. - disliked_food = null + disliked_food = NONE liked_food = GROSS | MEAT | RAW diff --git a/code/modules/mob/living/carbon/human/species_types/zombies.dm b/code/modules/mob/living/carbon/human/species_types/zombies.dm index 3889c22d0ee..01c63db0c14 100644 --- a/code/modules/mob/living/carbon/human/species_types/zombies.dm +++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm @@ -9,7 +9,7 @@ species_traits = list(NOBREATH,RESISTCOLD,RESISTPRESSURE,NOBLOOD,RADIMMUNE,NOZOMBIE,EASYDISMEMBER,EASYLIMBATTACHMENT) mutant_organs = list(/obj/item/organ/tongue/zombie) var/static/list/spooks = list('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg','sound/hallucinations/veryfar_noise.ogg','sound/hallucinations/wail.ogg') - disliked_food = null + disliked_food = NONE liked_food = GROSS | MEAT | RAW /datum/species/zombie/infectious diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 3f01451ec63..876029e1282 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -1630,14 +1630,3 @@ description = "blue sparkles that get everywhere" color = "#4040FF" //A blueish color glitter_type = /obj/effect/decal/cleanable/glitter/blue - -/datum/reagent/pukonium - name = "pukonium" - id = "pukonium" - description = "Vile liquid that is refined in the faraway lands of Ko-Der-Buus" - color = "360f0f" - metabolization_rate = 5 - -/datum/reagent/pukonium/on_mob_life(mob/living/M) - M.adjust_disgust(10) - ..() diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm index a728d9d695a..e3228fa100a 100755 --- a/code/modules/surgery/organs/stomach.dm +++ b/code/modules/surgery/organs/stomach.dm @@ -49,12 +49,12 @@ H.throw_alert("disgust", /obj/screen/alert/disgusted) /obj/item/organ/stomach/Remove() - ..() var/mob/living/carbon/human/H = owner - if(istype(H)) H.clear_alert("disgust") + ..() + /obj/item/organ/stomach/fly name = "insectoid stomach" icon_state = "stomach-x" //xenomorph liver? It's just a black liver so it fits. From d5a783a7dcef7edb2e1b8b68bd3dde27e4cd02b6 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 31 Jul 2017 20:05:17 +0200 Subject: [PATCH 25/27] adds cooldown of 5 seconds --- code/modules/food_and_drinks/food.dm | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/code/modules/food_and_drinks/food.dm b/code/modules/food_and_drinks/food.dm index 03f5e79bb02..0d11e011dce 100644 --- a/code/modules/food_and_drinks/food.dm +++ b/code/modules/food_and_drinks/food.dm @@ -15,14 +15,16 @@ /obj/item/weapon/reagent_containers/food/proc/checkLiked(var/fraction, mob/M) - if(ishuman(M)) - var/mob/living/carbon/human/H = M - if(foodtype & H.dna.species.toxic_food) - to_chat(H,"What the hell was that thing?!") - H.adjust_disgust(25 + 30 * fraction) - else if(foodtype & H.dna.species.disliked_food) - to_chat(H,"That didn't taste very good...") - H.adjust_disgust(11 + 15 * fraction) - else if(foodtype & H.dna.species.liked_food) - to_chat(H,"I love this taste!") - H.adjust_disgust(-5 + -2.5 * fraction) + if(last_check_time + 50 < world.time) + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(foodtype & H.dna.species.toxic_food) + to_chat(H,"What the hell was that thing?!") + H.adjust_disgust(25 + 30 * fraction) + else if(foodtype & H.dna.species.disliked_food) + to_chat(H,"That didn't taste very good...") + H.adjust_disgust(11 + 15 * fraction) + else if(foodtype & H.dna.species.liked_food) + to_chat(H,"I love this taste!") + H.adjust_disgust(-5 + -2.5 * fraction) + last_check_time = world.time From 99dff181a60f3149e55352ccb4bad9f12f86b8b7 Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Tue, 1 Aug 2017 00:57:13 +0200 Subject: [PATCH 26/27] fix --- code/modules/food_and_drinks/food.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/food_and_drinks/food.dm b/code/modules/food_and_drinks/food.dm index 0d11e011dce..83acdd5fa83 100644 --- a/code/modules/food_and_drinks/food.dm +++ b/code/modules/food_and_drinks/food.dm @@ -15,6 +15,7 @@ /obj/item/weapon/reagent_containers/food/proc/checkLiked(var/fraction, mob/M) + var/last_check_time if(last_check_time + 50 < world.time) if(ishuman(M)) var/mob/living/carbon/human/H = M From 08b77963b00db3ea7889f88308c47f5ceb612f95 Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Wed, 2 Aug 2017 06:05:21 +0200 Subject: [PATCH 27/27] does-the-thing --- code/modules/food_and_drinks/food.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/food.dm b/code/modules/food_and_drinks/food.dm index 83acdd5fa83..2a7ce2e8ec8 100644 --- a/code/modules/food_and_drinks/food.dm +++ b/code/modules/food_and_drinks/food.dm @@ -7,6 +7,7 @@ container_type = INJECTABLE resistance_flags = FLAMMABLE var/foodtype = NONE + var/last_check_time /obj/item/weapon/reagent_containers/food/New() ..() @@ -15,7 +16,6 @@ /obj/item/weapon/reagent_containers/food/proc/checkLiked(var/fraction, mob/M) - var/last_check_time if(last_check_time + 50 < world.time) if(ishuman(M)) var/mob/living/carbon/human/H = M