From cb9b57adccaaa0ddd81b200ff27804f5dce7550c Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Wed, 19 Jul 2017 23:50:05 +0200 Subject: [PATCH] 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