From 9cbee4baf4970b36bd692469f1a4adb526582828 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Mon, 16 Jan 2017 17:07:41 -0600 Subject: [PATCH 1/2] Ports taste --- code/__defines/mobs.dm | 7 + code/modules/hydroponics/grown.dm | 6 +- .../mob/living/carbon/carbon_defines.dm | 5 + .../living/carbon/human/species/species.dm | 2 + code/modules/mob/living/carbon/taste.dm | 60 +++ code/modules/reagents/Chemistry-Holder.dm | 2 +- code/modules/reagents/Chemistry-Reagents.dm | 2 + .../Chemistry-Reagents-Core.dm | 5 + .../Chemistry-Reagents-Dispenser.dm | 27 +- .../Chemistry-Reagents-Food-Drinks.dm | 218 +++++++++- .../Chemistry-Reagents-Medicine.dm | 30 ++ .../Chemistry-Reagents-Other.dm | 24 ++ .../Chemistry-Reagents-Toxins.dm | 39 +- .../reagents/reagent_containers/dropper.dm | 7 +- .../reagent_containers/food/snacks.dm | 376 ++++++++++++------ polaris.dme | 1 + 16 files changed, 670 insertions(+), 141 deletions(-) create mode 100644 code/modules/mob/living/carbon/taste.dm diff --git a/code/__defines/mobs.dm b/code/__defines/mobs.dm index 2797c8c904e..bcd85b53be1 100644 --- a/code/__defines/mobs.dm +++ b/code/__defines/mobs.dm @@ -192,3 +192,10 @@ #define NOMUT 0 #define COLORMUT 1 #define SPECIESMUT 2 + +//carbon taste sensitivity defines, used in mob/living/carbon/proc/ingest +#define TASTE_HYPERSENSITIVE 3 //anything below 5% +#define TASTE_SENSITIVE 2 //anything below 7% +#define TASTE_NORMAL 1 //anything below 15% +#define TASTE_DULL 0.5 //anything below 30% +#define TASTE_NUMB 0.1 //anything below 150% \ No newline at end of file diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 1a89c9c0a43..edc796594c3 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -52,9 +52,13 @@ var/list/reagent_data = seed.chems[rid] if(reagent_data && reagent_data.len) var/rtotal = reagent_data[1] + var/list/data = list() if(reagent_data.len > 1 && potency > 0) rtotal += round(potency/reagent_data[2]) - reagents.add_reagent(rid,max(1,rtotal)) + if(rid == "nutriment") + data[seed.seed_name] = max(1,rtotal) + + reagents.add_reagent(rid,max(1,rtotal),data) update_desc() if(reagents.total_volume > 0) bitesize = 1+round(reagents.total_volume / 2, 1) diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index fa0cf273e25..d6deb9b9649 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -25,3 +25,8 @@ var/pulse = PULSE_NORM //current pulse level var/does_not_breathe = 0 //Used for specific mobs that can't take advantage of the species flags (changelings) + + //these two help govern taste. The first is the last time a taste message was shown to the plaer. + //the second is the message in question. + var/last_taste_time = 0 + var/last_taste_text = "" \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 7b53d862144..6a3b4c7ad1d 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -36,6 +36,8 @@ var/blood_volume = 560 // Initial blood volume. var/hunger_factor = 0.05 // Multiplier for hunger. + var/taste_sensitivity = TASTE_NORMAL // How sensitive the species is to minute tastes. + var/min_age = 17 var/max_age = 70 diff --git a/code/modules/mob/living/carbon/taste.dm b/code/modules/mob/living/carbon/taste.dm new file mode 100644 index 00000000000..29e28a45594 --- /dev/null +++ b/code/modules/mob/living/carbon/taste.dm @@ -0,0 +1,60 @@ +/mob/living/carbon/proc/ingest(var/datum/reagents/from, var/datum/reagents/target, var/amount = 1, var/multiplier = 1, var/copy = 0) //we kind of 'sneak' a proc in here for ingesting stuff so we can play with it. + if(last_taste_time + 50 < world.time) + var/datum/reagents/temp = new(amount) //temporary holder used to analyse what gets transfered. + from.trans_to_holder(temp, amount, multiplier, 1) + + var/text_output = temp.generate_taste_message(src) + if(text_output != last_taste_text || last_taste_time + 100 < world.time) //We dont want to spam the same message over and over again at the person. Give it a bit of a buffer. + to_chat(src, "You can taste [text_output].")//no taste means there are too many tastes and not enough flavor. + + last_taste_time = world.time + last_taste_text = text_output + return from.trans_to_holder(target,amount,multiplier,copy) //complete transfer + +/* what this does: +catalogue the 'taste strength' of each one +calculate text size per text. +*/ +/datum/reagents/proc/generate_taste_message(mob/living/carbon/taster = null) + var/minimum_percent = 15 + if(ishuman(taster)) + var/mob/living/carbon/human/H = taster + minimum_percent = round(15/ (H.isSynthetic() ? TASTE_DULL : H.species.taste_sensitivity)) + + var/list/out = list() + var/list/tastes = list() //descriptor = strength + if(minimum_percent <= 100) + for(var/datum/reagent/R in reagent_list) + if(!R.taste_mult) + continue + if(R.id == "nutriment") //this is ugly but apparently only nutriment (not subtypes) has taste data TODO figure out why + var/list/taste_data = R.get_data() + for(var/taste in taste_data) + if(taste in tastes) + tastes[taste] += taste_data[taste] + else + tastes[taste] = taste_data[taste] + else + var/taste_desc = R.taste_description + var/taste_amount = get_reagent_amount(R.id) * R.taste_mult + if(R.taste_description in tastes) + tastes[taste_desc] += taste_amount + else + tastes[taste_desc] = taste_amount + + //deal with percentages + var/total_taste = 0 + for(var/taste_desc in tastes) + total_taste += tastes[taste_desc] + for(var/taste_desc in tastes) + var/percent = tastes[taste_desc]/total_taste * 100 + if(percent < minimum_percent) + continue + var/intensity_desc = "a hint of" + if(percent > minimum_percent * 2 || percent == 100) + intensity_desc = "the flavor of" + else if(percent > minimum_percent * 3) + intensity_desc = "the strong flavor of" + out += "[intensity_desc] [taste_desc]" + + return english_list(out, "something indescribable") \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index c2b4157ff39..49c1099184c 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -383,7 +383,7 @@ return trans_to_holder(R, amount, multiplier, copy) if(type == CHEM_INGEST) var/datum/reagents/R = C.ingested - return trans_to_holder(R, amount, multiplier, copy) + return C.ingest(src, R, amount, multiplier, copy) if(type == CHEM_TOUCH) var/datum/reagents/R = C.touching return trans_to_holder(R, amount, multiplier, copy) diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 29d997cde59..9e7fbd461f3 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -14,6 +14,8 @@ var/name = "Reagent" var/id = "reagent" var/description = "A non-descript chemical." + var/taste_description = "bitterness" + var/taste_mult = 1 //how this taste compares to others. Higher values means it is more noticable var/datum/reagents/holder = null var/reagent_state = SOLID var/list/data = null diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm index 27f40820e79..f6208f59ff9 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm @@ -2,6 +2,8 @@ data = new/list("donor" = null, "viruses" = null, "species" = "Human", "blood_DNA" = null, "blood_type" = null, "blood_colour" = "#A10808", "resistances" = null, "trace_chem" = null, "antibodies" = list()) name = "Blood" id = "blood" + taste_description = "iron" + taste_mult = 1.3 reagent_state = LIQUID metabolism = REM * 5 mrate_static = TRUE @@ -74,6 +76,7 @@ /datum/reagent/antibodies data = list("antibodies"=list()) name = "Antibodies" + taste_description = "slime" id = "antibodies" reagent_state = LIQUID color = "#0050F0" @@ -88,6 +91,7 @@ /datum/reagent/water name = "Water" id = "water" + taste_description = "water" description = "A ubiquitous chemical substance that is composed of hydrogen and oxygen." reagent_state = LIQUID color = "#0064C877" @@ -150,6 +154,7 @@ name = "Welding fuel" id = "fuel" description = "Required for welders. Flamable." + taste_description = "gross metal" reagent_state = LIQUID color = "#660000" diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm index d3bb6037dee..8c5aeed38f9 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm @@ -2,13 +2,17 @@ name = "Aluminum" id = "aluminum" description = "A silvery white and ductile member of the boron group of chemical elements." + taste_description = "metal" + taste_mult = 1.1 reagent_state = SOLID color = "#A8A8A8" /datum/reagent/carbon name = "Carbon" id = "carbon" - description = "A chemical element, the builing block of life." + description = "A chemical element, the building block of life." + taste_description = "sour chalk" + taste_mult = 1.5 reagent_state = SOLID color = "#1C1300" ingest_met = REM * 5 @@ -37,6 +41,7 @@ name = "Chlorine" id = "chlorine" description = "A chemical element with a characteristic odour." + taste_description = "pool water" reagent_state = GAS color = "#808080" @@ -50,12 +55,14 @@ name = "Copper" id = "copper" description = "A highly ductile metal." + taste_description = "pennies" color = "#6E3B08" /datum/reagent/ethanol name = "Ethanol" //Parent class for all alcoholic reagents. id = "ethanol" description = "A well-known alcohol with a variety of applications." + taste_description = "pure alcohol" reagent_state = LIQUID color = "#404030" var/nutriment_factor = 0 @@ -142,6 +149,7 @@ name = "Fluorine" id = "fluorine" description = "A highly-reactive chemical element." + taste_description = "acid" reagent_state = GAS color = "#808080" @@ -155,6 +163,7 @@ name = "Hydrogen" id = "hydrogen" description = "A colorless, odorless, nonmetallic, tasteless, highly combustible diatomic gas." + taste_mult = 0 //no taste reagent_state = GAS color = "#808080" @@ -162,6 +171,7 @@ name = "Iron" id = "iron" description = "Pure iron is a metal." + taste_description = "metal" reagent_state = SOLID color = "#353535" @@ -173,6 +183,7 @@ name = "Lithium" id = "lithium" description = "A chemical element, used as antidepressant." + taste_description = "metal" reagent_state = SOLID color = "#808080" @@ -187,6 +198,7 @@ name = "Mercury" id = "mercury" description = "A chemical element." + taste_mult = 0 //mercury apparently is tasteless. IDK reagent_state = LIQUID color = "#484848" @@ -202,6 +214,7 @@ name = "Nitrogen" id = "nitrogen" description = "A colorless, odorless, tasteless gas." + taste_mult = 0 //no taste reagent_state = GAS color = "#808080" @@ -213,6 +226,7 @@ name = "Oxygen" id = "oxygen" description = "A colorless, odorless gas." + taste_mult = 0 reagent_state = GAS color = "#808080" @@ -224,6 +238,7 @@ name = "Phosphorus" id = "phosphorus" description = "A chemical element, the backbone of biological energy carriers." + taste_description = "vinegar" reagent_state = SOLID color = "#832828" @@ -231,6 +246,7 @@ name = "Potassium" id = "potassium" description = "A soft, low-melting solid that can easily be cut with a knife. Reacts violently with water." + taste_description = "sweetness" //potassium is bitter in higher doses but sweet in lower ones. reagent_state = SOLID color = "#A0A0A0" @@ -238,6 +254,7 @@ name = "Radium" id = "radium" description = "Radium is an alkaline earth metal. It is extremely radioactive." + taste_mult = 0 //Apparently radium is tasteless reagent_state = SOLID color = "#C7C7C7" @@ -270,6 +287,7 @@ name = "Sulphuric acid" id = "sacid" description = "A very corrosive mineral acid with the molecular formula H2SO4." + taste_description = "acid" reagent_state = LIQUID color = "#DB5008" metabolism = REM * 2 @@ -356,6 +374,7 @@ name = "Silicon" id = "silicon" description = "A tetravalent metalloid, silicon is less reactive than its chemical analog carbon." + taste_mult = 0 reagent_state = SOLID color = "#A8A8A8" @@ -363,6 +382,7 @@ name = "Sodium" id = "sodium" description = "A chemical element, readily reacts with water." + taste_description = "salty metal" reagent_state = SOLID color = "#808080" @@ -370,6 +390,8 @@ name = "Sugar" id = "sugar" description = "The organic compound commonly known as table sugar and sometimes called saccharose. This white, odorless, crystalline powder has a pleasing, sweet taste." + taste_description = "sugar" + taste_mult = 1.8 reagent_state = SOLID color = "#FFFFFF" @@ -402,6 +424,7 @@ name = "Sulfur" id = "sulfur" description = "A chemical element with a pungent smell." + taste_description = "old eggs" reagent_state = SOLID color = "#BF8C00" @@ -409,5 +432,7 @@ name = "Tungsten" id = "tungsten" description = "A chemical element, and a strong oxidising agent." + taste_description = "metal" + taste_mult = 0 //no taste reagent_state = SOLID color = "#DCDCDC" diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index eab46ba8a09..d2111f5c214 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -4,6 +4,7 @@ name = "Nutriment" id = "nutriment" description = "All the vitamins, minerals, and carbohydrates the body needs in pure form." + taste_mult = 4 reagent_state = SOLID metabolism = REM * 4 mrate_static = TRUE @@ -11,6 +12,26 @@ var/injectable = 0 color = "#664330" +/datum/reagent/nutriment/mix_data(var/list/newdata, var/newamount) + + if(!islist(newdata) || !newdata.len) + return + + //add the new taste data + for(var/taste in newdata) + if(taste in data) + data[taste] += newdata[taste] + else + data[taste] = newdata[taste] + + //cull all tastes below 10% of total + var/totalFlavor = 0 + for(var/taste in data) + totalFlavor += data[taste] + for(var/taste in data) + if(data[taste]/totalFlavor < 0.1) + data -= taste + /datum/reagent/nutriment/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) if(!injectable) M.adjustToxLoss(0.1 * removed) @@ -28,6 +49,7 @@ /datum/reagent/nutriment/glucose name = "Glucose" id = "glucose" + taste_description = "sweetness" color = "#FFFFFF" injectable = 1 @@ -35,6 +57,7 @@ /datum/reagent/nutriment/protein // Bad for Skrell! name = "animal protein" id = "protein" + taste_description = "some sort of protein" color = "#440000" /datum/reagent/nutriment/protein/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) @@ -58,12 +81,14 @@ /datum/reagent/nutriment/protein/egg // Also bad for skrell. name = "egg yolk" id = "egg" + taste_description = "egg" color = "#FFFFAA" /datum/reagent/nutriment/honey name = "Honey" id = "honey" description = "A golden yellow syrup, loaded with sugary sweetness." + taste_description = "sweetness" nutriment_factor = 10 color = "#FFFF00" @@ -92,6 +117,7 @@ name = "flour" id = "flour" description = "This is what you rub all over yourself to pretend to be a ghost." + taste_description = "chalky wheat" reagent_state = SOLID nutriment_factor = 1 color = "#FFFFFF" @@ -104,6 +130,8 @@ name = "Coco Powder" id = "coco" description = "A fatty, bitter paste made from coco beans." + taste_description = "bitterness" + taste_mult = 1.3 reagent_state = SOLID nutriment_factor = 5 color = "#302000" @@ -112,6 +140,8 @@ name = "Soysauce" id = "soysauce" description = "A salty sauce made from the soy plant." + taste_description = "umami" + taste_mult = 1.1 reagent_state = LIQUID nutriment_factor = 2 color = "#792300" @@ -120,6 +150,7 @@ name = "Ketchup" id = "ketchup" description = "Ketchup, catsup, whatever. It's tomato paste." + taste_description = "ketchup" reagent_state = LIQUID nutriment_factor = 5 color = "#731008" @@ -128,6 +159,8 @@ name = "Rice" id = "rice" description = "Enjoy the great taste of nothing." + taste_description = "rice" + taste_mult = 0.4 reagent_state = SOLID nutriment_factor = 1 color = "#FFFFFF" @@ -136,6 +169,8 @@ name = "Cherry Jelly" id = "cherryjelly" description = "Totally the best. Only to be spread on foods with excellent lateral symmetry." + taste_description = "cherry" + taste_mult = 1.3 reagent_state = LIQUID nutriment_factor = 1 color = "#801E28" @@ -144,6 +179,8 @@ name = "Corn Oil" id = "cornoil" description = "An oil derived from various types of corn." + taste_description = "slime" + taste_mult = 0.1 reagent_state = LIQUID nutriment_factor = 20 color = "#302000" @@ -167,6 +204,8 @@ name = "Virus Food" id = "virusfood" description = "A mixture of water, milk, and oxygen. Virus cells can use this mixture to reproduce." + taste_description = "vomit" + taste_mult = 2 reagent_state = LIQUID nutriment_factor = 2 color = "#899613" @@ -175,6 +214,7 @@ name = "Sprinkles" id = "sprinkles" description = "Multi-colored little bits of sugar, commonly found on donuts. Loved by cops." + taste_description = "sugar" nutriment_factor = 1 color = "#FF00FF" @@ -182,6 +222,7 @@ name = "Mint" id = "mint" description = "Also known as Mentha." + taste_description = "mint" reagent_state = LIQUID color = "#CF3600" @@ -189,6 +230,7 @@ name = "Lipozine" id = "lipozine" description = "A chemical compound that causes a powerful fat-burning reaction." + taste_description = "mothballs" reagent_state = LIQUID color = "#BBEDA4" overdose = REAGENTS_OVERDOSE @@ -205,6 +247,7 @@ name = "Table Salt" id = "sodiumchloride" description = "A salt made of sodium chloride. Commonly used to season food." + taste_description = "salt" reagent_state = SOLID color = "#FFFFFF" overdose = REAGENTS_OVERDOSE @@ -213,6 +256,7 @@ name = "Black Pepper" id = "blackpepper" description = "A powder ground from peppercorns. *AAAACHOOO*" + taste_description = "pepper" reagent_state = SOLID color = "#000000" @@ -220,6 +264,8 @@ name = "Universal Enzyme" id = "enzyme" description = "A universal enzyme used in the preperation of certain chemicals and foods." + taste_description = "sweetness" + taste_mult = 0.7 reagent_state = LIQUID color = "#365E30" overdose = REAGENTS_OVERDOSE @@ -228,6 +274,8 @@ name = "Frost Oil" id = "frostoil" description = "A special oil that noticably chills the body. Extracted from Ice Peppers." + taste_description = "mint" + taste_mult = 1.5 reagent_state = LIQUID color = "#B31008" @@ -245,6 +293,8 @@ name = "Capsaicin Oil" id = "capsaicin" description = "This is what makes chilis hot." + taste_description = "hot peppers" + taste_mult = 1.5 reagent_state = LIQUID color = "#B31008" @@ -275,6 +325,8 @@ name = "Condensed Capsaicin" id = "condensedcapsaicin" description = "A chemical agent used for self-defense and in police work." + taste_description = "fire" + taste_mult = 10 reagent_state = LIQUID touch_met = 50 // Get rid of it quickly color = "#B31008" @@ -388,6 +440,7 @@ name = "Banana Juice" id = "banana" description = "The raw essence of a banana." + taste_description = "banana" color = "#C3AF00" glass_name = "banana juice" @@ -397,6 +450,7 @@ name = "Berry Juice" id = "berryjuice" description = "A delicious blend of several different kinds of berries." + taste_description = "berries" color = "#990066" glass_name = "berry juice" @@ -406,6 +460,7 @@ name = "Carrot juice" id = "carrotjuice" description = "It is just like a carrot but without crunching." + taste_description = "carrots" color = "#FF8C00" // rgb: 255, 140, 0 glass_name = "carrot juice" @@ -419,6 +474,7 @@ name = "Grape Juice" id = "grapejuice" description = "It's grrrrrape!" + taste_description = "grapes" color = "#863333" glass_name = "grape juice" @@ -449,6 +505,8 @@ name = "Lemon Juice" id = "lemonjuice" description = "This juice is VERY sour." + taste_description = "sourness" + taste_mult = 1.1 color = "#AFAF00" glass_name = "lemon juice" @@ -458,6 +516,8 @@ name = "Lime Juice" id = "limejuice" description = "The sweet-sour juice of limes." + taste_description = "sourness" + taste_mult = 1.8 color = "#365E30" glass_name = "lime juice" @@ -473,6 +533,7 @@ name = "Orange juice" id = "orangejuice" description = "Both delicious AND rich in Vitamin C, what more do you need?" + taste_description = "oranges" color = "#E78108" glass_name = "orange juice" @@ -488,6 +549,7 @@ name = "Poison Berry Juice" id = "poisonberryjuice" description = "A tasty juice blended from various kinds of very deadly and toxic berries." + taste_description = "berries" color = "#863353" strength = 5 @@ -498,6 +560,7 @@ name = "Potato Juice" id = "potato" description = "Juice of the potato. Bleh." + taste_description = "potatoes" nutrition = 2 color = "#302000" @@ -508,6 +571,7 @@ name = "Tomato Juice" id = "tomatojuice" description = "Tomatoes made into juice. What a waste of big, juicy tomatoes, huh?" + taste_description = "tomatoes" color = "#731008" glass_name = "tomato juice" @@ -523,6 +587,7 @@ name = "Watermelon Juice" id = "watermelonjuice" description = "Delicious juice made from watermelon." + taste_description = "sweet watermelon" color = "#B83333" glass_name = "watermelon juice" @@ -534,6 +599,7 @@ name = "Milk" id = "milk" description = "An opaque white liquid produced by the mammary glands of mammals." + taste_description = "milk" color = "#DFDFDF" glass_name = "milk" @@ -547,6 +613,7 @@ name = "Chocolate Milk" id = "chocolate_milk" description = "A delicious mixture of perfectly healthy mix and terrible chocolate." + taste_description = "chocolate milk" color = "#74533b" cup_icon_state = "cup_brown" @@ -568,6 +635,7 @@ name = "Cream" id = "cream" description = "The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?" + taste_description = "thick milk" color = "#DFD7AF" glass_name = "cream" @@ -581,6 +649,7 @@ name = "Soy Milk" id = "soymilk" description = "An opaque white liquid made from soybeans." + taste_description = "soy milk" color = "#DFDFC7" glass_name = "soy milk" @@ -594,6 +663,7 @@ name = "Tea" id = "tea" description = "Tasty black tea, it has antioxidants, it's good for you!" + taste_description = "black tea" color = "#832700" adj_dizzy = -2 adj_drowsy = -1 @@ -617,6 +687,7 @@ name = "Iced Tea" id = "icetea" description = "No relation to a certain rap artist/ actor." + taste_description = "sweet tea" color = "#AC7F24" // rgb: 16, 64, 56 adj_temp = -5 @@ -632,6 +703,8 @@ name = "Coffee" id = "coffee" description = "Coffee is a brewed drink prepared from roasted seeds, commonly called coffee beans, of the coffee plant." + taste_description = "coffee" + taste_mult = 1.3 color = "#482000" adj_dizzy = -5 adj_drowsy = -3 @@ -687,6 +760,7 @@ name = "Soy Latte" id = "soy_latte" description = "A nice and tasty beverage while you are reading your hippie books." + taste_description = "creamy coffee" color = "#C65905" adj_temp = 5 @@ -706,6 +780,7 @@ name = "Cafe Latte" id = "cafe_latte" description = "A nice, strong and tasty beverage while you are reading." + taste_description = "bitter cream" color = "#C65905" adj_temp = 5 @@ -724,6 +799,7 @@ name = "Hot Chocolate" id = "hot_coco" description = "Made with love! And cocoa beans." + taste_description = "creamy chocolate" reagent_state = LIQUID color = "#403010" nutrition = 2 @@ -740,6 +816,7 @@ name = "Soda Water" id = "sodawater" description = "A can of club soda. Why not make a scotch and soda?" + taste_description = "carbonated water" color = "#619494" adj_dizzy = -5 adj_drowsy = -3 @@ -753,6 +830,7 @@ name = "Grape Soda" id = "grapesoda" description = "Grapes made into a fine drank." + taste_description = "grape soda" color = "#421C52" adj_drowsy = -3 @@ -764,6 +842,7 @@ name = "Tonic Water" id = "tonic" description = "It tastes strange but at least the quinine keeps the Space Malaria at bay." + taste_description = "tart and fresh" color = "#619494" adj_dizzy = -5 @@ -776,8 +855,9 @@ /datum/reagent/drink/soda/lemonade name = "Lemonade" - description = "Oh the nostalgia..." id = "lemonade" + description = "Oh the nostalgia..." + taste_description = "lemonade" color = "#FFFF00" adj_temp = -5 @@ -787,8 +867,9 @@ /datum/reagent/drink/soda/kiraspecial name = "Kira Special" - description = "Long live the guy who everyone had mistaken for a girl. Baka!" id = "kiraspecial" + description = "Long live the guy who everyone had mistaken for a girl. Baka!" + taste_description = "fruity sweetness" color = "#CCCC99" adj_temp = -5 @@ -798,8 +879,9 @@ /datum/reagent/drink/soda/brownstar name = "Brown Star" - description = "It's not what it sounds like..." id = "brownstar" + description = "It's not what it sounds like..." + taste_description = "orange and cola soda" color = "#9F3400" adj_temp = -2 @@ -808,8 +890,9 @@ /datum/reagent/drink/milkshake name = "Milkshake" - description = "Glorious brainfreezing mixture." id = "milkshake" + description = "Glorious brainfreezing mixture." + taste_description = "vanilla milkshake" color = "#AEE5E4" adj_temp = -9 @@ -839,8 +922,9 @@ /datum/reagent/drink/rewriter name = "Rewriter" - description = "The secret of the sanctuary of the Libarian..." id = "rewriter" + description = "The secret of the sanctuary of the Libarian..." + taste_description = "citrus and coffee" color = "#485000" adj_temp = -5 @@ -855,6 +939,7 @@ name = "Nuka Cola" id = "nuka_cola" description = "Cola, cola never changes." + taste_description = "cola" color = "#100800" adj_temp = -5 adj_sleepy = -2 @@ -875,6 +960,7 @@ name = "Grenadine Syrup" id = "grenadine" description = "Made in the modern day with proper pomegranate substitute. Who uses real fruit, anyways?" + taste_description = "100% pure pomegranate" color = "#FF004F" glass_name = "grenadine syrup" @@ -884,6 +970,7 @@ name = "Space Cola" id = "cola" description = "A refreshing beverage." + taste_description = "cola" reagent_state = LIQUID color = "#100800" adj_drowsy = -3 @@ -897,6 +984,7 @@ name = "Mountain Wind" id = "spacemountainwind" description = "Blows right through you like a space wind." + taste_description = "sweet citrus soda" color = "#102000" adj_drowsy = -7 adj_sleepy = -1 @@ -910,6 +998,7 @@ name = "Dr. Gibb" id = "dr_gibb" description = "A delicious blend of 42 different flavours" + taste_description = "cherry soda" color = "#102000" adj_drowsy = -6 adj_temp = -5 @@ -921,6 +1010,7 @@ name = "Space-Up" id = "space_up" description = "Tastes like a hull breach in your mouth." + taste_description = "citrus soda" color = "#202800" adj_temp = -8 @@ -930,8 +1020,9 @@ /datum/reagent/drink/soda/lemon_lime name = "Lemon Lime" - description = "A tangy substance made of 0.5% natural citrus!" id = "lemon_lime" + description = "A tangy substance made of 0.5% natural citrus!" + taste_description = "tangy lime and lemon soda" color = "#878F00" adj_temp = -8 @@ -941,8 +1032,9 @@ /datum/reagent/drink/shirley_temple name = "Shirley Temple" - description = "A sweet concotion hated even by its namesake." id = "shirley_temple" + description = "A sweet concotion hated even by its namesake." + taste_description = "sweet ginger ale" color = "#EF304F" adj_temp = -8 @@ -952,8 +1044,9 @@ /datum/reagent/drink/roy_rogers name = "Roy Rogers" - description = "I'm a cowboy, on a steel horse I ride." id = "roy_rogers" + description = "I'm a cowboy, on a steel horse I ride." + taste_description = "cola and fruit" color = "#4F1811" adj_temp = -8 @@ -963,8 +1056,9 @@ /datum/reagent/drink/collins_mix name = "Collins Mix" - description = "Best hope it isn't a hoax." id = "collins_mix" + description = "Best hope it isn't a hoax." + taste_description = "gin and lemonade" color = "#D7D0B3" adj_temp = -8 @@ -974,8 +1068,9 @@ /datum/reagent/drink/arnold_palmer name = "Arnold Palmer" - description = "Tastes just like the old man." id = "arnold_palmer" + description = "Tastes just like the old man." + taste_description = "lemon and sweet tea" color = "#AF5517" adj_temp = -8 @@ -987,6 +1082,7 @@ name = "The Doctor's Delight" id = "doctorsdelight" description = "A gulp a day keeps the MediBot away. That's probably for the best." + taste_description = "homely fruit smoothie" reagent_state = LIQUID color = "#FF8CFF" nutrition = 1 @@ -1010,6 +1106,7 @@ name = "Dry Ramen" id = "dry_ramen" description = "Space age food, since August 25, 1958. Contains dried noodles, vegetables, and chemicals that boil in contact with water." + taste_description = "dry cheap noodles" reagent_state = SOLID nutrition = 1 color = "#302000" @@ -1018,6 +1115,7 @@ name = "Hot Ramen" id = "hot_ramen" description = "The noodles are boiled, the flavors are artificial, just like being back in school." + taste_description = "noodles and salt" reagent_state = LIQUID color = "#302000" nutrition = 5 @@ -1027,6 +1125,8 @@ name = "Hell Ramen" id = "hell_ramen" description = "The noodles are boiled, the flavors are artificial, just like being back in school." + taste_description = "noodles and spice" + taste_mult = 1.7 reagent_state = LIQUID color = "#302000" nutrition = 5 @@ -1041,6 +1141,7 @@ name = "Ice" id = "ice" description = "Frozen water, your dentist wouldn't like you chewing this." + taste_description = "ice" reagent_state = SOLID color = "#619494" adj_temp = -5 @@ -1053,6 +1154,7 @@ name = "Nothing" id = "nothing" description = "Absolutely nothing." + taste_description = "nothing" glass_name = "nothing" glass_desc = "Absolutely nothing." @@ -1065,6 +1167,8 @@ name = "Absinthe" id = "absinthe" description = "Watch out that the Green Fairy doesn't come for you!" + taste_description = "licorice" + taste_mult = 1.5 color = "#33EE00" strength = 12 @@ -1075,6 +1179,7 @@ name = "Ale" id = "ale" description = "A dark alchoholic beverage made by malted barley and yeast." + taste_description = "hearty barley ale" color = "#4C3100" strength = 50 @@ -1085,6 +1190,7 @@ name = "Beer" id = "beer" description = "An alcoholic beverage made from malted grains, hops, yeast, and water." + taste_description = "beer" color = "#FFD300" strength = 50 nutriment_factor = 1 @@ -1102,6 +1208,8 @@ name = "Blue Curacao" id = "bluecuracao" description = "Exotically blue, fruity drink, distilled from oranges." + taste_description = "oranges" + taste_mult = 1.1 color = "#0000CD" strength = 15 @@ -1112,6 +1220,8 @@ name = "Cognac" id = "cognac" description = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. Classy as fornication." + taste_description = "rich and smooth alcohol" + taste_mult = 1.1 color = "#AB3C05" strength = 15 @@ -1122,6 +1232,8 @@ name = "Deadrum" id = "deadrum" description = "Popular with the sailors. Not very popular with everyone else." + taste_description = "butterscotch and salt" + taste_mult = 1.1 color = "#ECB633" strength = 50 @@ -1138,6 +1250,7 @@ name = "Gin" id = "gin" description = "It's gin. In space. I say, good sir." + taste_description = "an alcoholic christmas tree" color = "#0064C6" strength = 50 @@ -1180,6 +1293,8 @@ name = "Kahlua" id = "kahlua" description = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936!" + taste_description = "spiked latte" + taste_mult = 1.1 color = "#4C3100" strength = 15 @@ -1190,6 +1305,7 @@ name = "Melon Liquor" id = "melonliquor" description = "A relatively sweet and fruity 46 proof liquor." + taste_description = "fruity alcohol" color = "#138808" // rgb: 19, 136, 8 strength = 50 @@ -1200,6 +1316,8 @@ name = "Rum" id = "rum" description = "Yohoho and all that." + taste_description = "spiked butterscotch" + taste_mult = 1.1 color = "#ECB633" strength = 15 @@ -1210,6 +1328,7 @@ name = "Sake" id = "sake" description = "Anime's favorite drink." + taste_description = "dry alcohol" color = "#DDDDDD" strength = 25 @@ -1220,6 +1339,7 @@ name = "Tequila" id = "tequilla" description = "A strong and mildly flavoured, mexican produced spirit. Feeling thirsty hombre?" + taste_description = "paint thinner" color = "#FFFF91" strength = 25 @@ -1230,6 +1350,7 @@ name = "Thirteen Loko" id = "thirteenloko" description = "A potent mixture of caffeine and alcohol." + taste_description = "paint thinner" color = "#102000" strength = 25 nutriment_factor = 1 @@ -1250,6 +1371,8 @@ name = "Vermouth" id = "vermouth" description = "You suddenly feel a craving for a martini..." + taste_description = "dry alcohol" + taste_mult = 1.3 color = "#91FF91" // rgb: 145, 255, 145 strength = 15 @@ -1260,6 +1383,7 @@ name = "Vodka" id = "vodka" description = "Number one drink AND fueling choice for Russians worldwide." + taste_description = "grain alcohol" color = "#0064C8" // rgb: 0, 100, 200 strength = 15 @@ -1274,6 +1398,7 @@ name = "Whiskey" id = "whiskey" description = "A superb and well-aged single-malt whiskey. Damn." + taste_description = "molasses" color = "#4C3100" strength = 25 @@ -1284,6 +1409,7 @@ name = "Wine" id = "wine" description = "An premium alchoholic beverage made from distilled grape juice." + taste_description = "bitter sweetness" color = "#7E4043" // rgb: 126, 64, 67 strength = 15 @@ -1296,6 +1422,7 @@ name = "Acid Spit" id = "acidspit" description = "A drink for the daring, can be deadly if incorrectly prepared!" + taste_description = "bitter tang" reagent_state = LIQUID color = "#365000" strength = 30 @@ -1307,6 +1434,7 @@ name = "Allies Cocktail" id = "alliescocktail" description = "A drink made from your allies, not as sweet as when made from your enemies." + taste_description = "bitter sweetness" color = "#D8AC45" strength = 25 @@ -1317,6 +1445,7 @@ name = "Aloe" id = "aloe" description = "So very, very, very good." + taste_description = "sweet and creamy" color = "#B7EA75" strength = 15 @@ -1327,6 +1456,7 @@ name = "Amasec" id = "amasec" description = "Official drink of the Gun Club!" + taste_description = "dark and metallic" reagent_state = LIQUID color = "#FF975D" strength = 25 @@ -1338,6 +1468,7 @@ name = "Andalusia" id = "andalusia" description = "A nice, strangely named drink." + taste_description = "lemons" color = "#F4EA4A" strength = 15 @@ -1348,6 +1479,7 @@ name = "Anti-freeze" id = "antifreeze" description = "Ultimate refreshment." + taste_description = "ice cold vodka" color = "#56DEEA" strength = 12 adj_temp = 20 @@ -1360,6 +1492,7 @@ name = "Atomic Bomb" id = "atomicbomb" description = "Nuclear proliferation never tasted so good." + taste_description = "coffee, almonds, and whiskey, with a kick" reagent_state = LIQUID color = "#666300" strength = 10 @@ -1372,6 +1505,8 @@ name = "B-52" id = "b52" description = "Coffee, Irish Cream, and cognac. You will get bombed." + taste_description = "coffee, almonds, and whiskey" + taste_mult = 1.3 color = "#997650" strength = 12 @@ -1382,6 +1517,7 @@ name = "Bahama mama" id = "bahama_mama" description = "Tropical cocktail." + taste_description = "lime and orange" color = "#FF7F3B" strength = 25 @@ -1392,6 +1528,7 @@ name = "Banana Mama" id = "bananahonk" description = "A drink from Clown Heaven." + taste_description = "bananas and sugar" nutriment_factor = 1 color = "#FFFF91" strength = 12 @@ -1403,6 +1540,7 @@ name = "Barefoot" id = "barefoot" description = "Barefoot and pregnant" + taste_description = "creamy berries" color = "#FFCDEA" strength = 30 @@ -1413,6 +1551,8 @@ name = "Beepsky Smash" id = "beepskysmash" description = "Deny drinking this and prepare for THE LAW." + taste_description = "whiskey and citrus" + taste_mult = 2 reagent_state = LIQUID color = "#404040" strength = 12 @@ -1428,6 +1568,7 @@ name = "Bilk" id = "bilk" description = "This appears to be beer mixed with milk. Disgusting." + taste_description = "sour milk" color = "#895C4C" strength = 50 nutriment_factor = 2 @@ -1439,6 +1580,7 @@ name = "Black Russian" id = "blackrussian" description = "For the lactose-intolerant. Still as classy as a White Russian." + taste_description = "coffee" color = "#360000" strength = 15 @@ -1449,6 +1591,7 @@ name = "Bloody Mary" id = "bloodymary" description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice." + taste_description = "tomatoes with a hint of lime" color = "#B40000" strength = 15 @@ -1459,6 +1602,7 @@ name = "Booger" id = "booger" description = "Ewww..." + taste_description = "sweet 'n creamy" color = "#8CFF8C" strength = 30 @@ -1469,6 +1613,8 @@ name = "Brave Bull" id = "bravebull" description = "It's just as effective as Dutch-Courage!" + taste_description = "coffee and paint thinner" + taste_mult = 1.1 color = "#4C3100" strength = 15 @@ -1479,6 +1625,7 @@ name = "Changeling Sting" id = "changelingsting" description = "You take a tiny sip and feel a burning sensation..." + taste_description = "constantly changing flavors" color = "#2E6671" strength = 10 @@ -1489,6 +1636,7 @@ name = "Classic Martini" id = "martini" description = "Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious." + taste_description = "dry class" color = "#0064C8" strength = 25 @@ -1499,6 +1647,7 @@ name = "Cuba Libre" id = "cubalibre" description = "Rum, mixed with cola. Viva la revolucion." + taste_description = "cola" color = "#3E1B00" strength = 30 @@ -1509,6 +1658,8 @@ name = "Demons Blood" id = "demonsblood" description = "AHHHH!!!!" + taste_description = "sweet tasting iron" + taste_mult = 1.5 color = "#820000" strength = 15 @@ -1519,6 +1670,7 @@ name = "Devils Kiss" id = "devilskiss" description = "Creepy time!" + taste_description = "bitter iron" color = "#A68310" strength = 15 @@ -1529,6 +1681,7 @@ name = "Driest Martini" id = "driestmartini" description = "Only for the experienced. You think you see sand floating in the glass." + taste_description = "a beach" nutriment_factor = 1 color = "#2E6671" strength = 12 @@ -1540,6 +1693,7 @@ name = "Gin Fizz" id = "ginfizz" description = "Refreshingly lemony, deliciously dry." + taste_description = "dry, tart lemons" color = "#FFFFAE" strength = 30 @@ -1550,6 +1704,7 @@ name = "Grog" id = "grog" description = "Watered-down rum, pirate approved!" + taste_description = "a poor excuse for alcohol" reagent_state = LIQUID color = "#FFBB00" strength = 100 @@ -1562,6 +1717,7 @@ name = "Erika Surprise" id = "erikasurprise" description = "The surprise is, it's green!" + taste_description = "tartness and bananas" color = "#2E6671" strength = 15 @@ -1572,6 +1728,8 @@ name = "Pan-Galactic Gargle Blaster" id = "gargleblaster" description = "Whoah, this stuff looks volatile!" + taste_description = "your brains smashed out by a lemon wrapped around a gold brick" + taste_mult = 5 reagent_state = LIQUID color = "#7F00FF" strength = 10 @@ -1583,6 +1741,7 @@ name = "Gin and Tonic" id = "gintonic" description = "An all time classic, mild cocktail." + taste_description = "mild and tart" color = "#0064C8" strength = 50 @@ -1593,6 +1752,8 @@ name = "Goldschlager" id = "goldschlager" description = "100 proof cinnamon schnapps, made for alcoholic teen girls on spring break." + taste_description = "burning cinnamon" + taste_mult = 1.3 color = "#F4E46D" strength = 15 @@ -1603,6 +1764,7 @@ name = "Hippies' Delight" id = "hippiesdelight" description = "You just don't get it maaaan." + taste_description = "giving peace a chance" reagent_state = LIQUID color = "#FF88FF" strength = 15 @@ -1615,6 +1777,7 @@ name = "Hooch" id = "hooch" description = "Either someone's failure at cocktail making or attempt in alchohol production. In any case, do you really want to drink that?" + taste_description = "pure alcohol" color = "#4C3100" strength = 25 toxicity = 2 @@ -1626,7 +1789,7 @@ name = "Iced Beer" id = "iced_beer" description = "A beer which is so cold the air around it freezes." - + taste_description = "refreshingly cold" color = "#FFD300" strength = 50 adj_temp = -20 @@ -1640,6 +1803,7 @@ name = "Irish Car Bomb" id = "irishcarbomb" description = "Mmm, tastes like chocolate cake..." + taste_description = "delicious anger" color = "#2E6671" strength = 15 @@ -1650,6 +1814,7 @@ name = "Irish Coffee" id = "irishcoffee" description = "Coffee, and alcohol. More fun than a Mimosa to drink in the morning." + taste_description = "giving up on the day" color = "#4C3100" strength = 15 @@ -1660,7 +1825,8 @@ name = "Irish Cream" id = "irishcream" description = "Whiskey-imbued cream, what else would you expect from the Irish." - color = "#DDDD9A3" + taste_description = "creamy alcohol" + color = "#DDD9A3" strength = 25 glass_name = "Irish cream" @@ -1670,6 +1836,7 @@ name = "Long Island Iced Tea" id = "longislandicedtea" description = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only." + taste_description = "sweet tea, with a kick" color = "#895B1F" strength = 12 @@ -1680,6 +1847,7 @@ name = "Manhattan" id = "manhattan" description = "The Detective's undercover drink of choice. He never could stomach gin..." + taste_description = "mild dryness" color = "#C13600" strength = 15 @@ -1690,6 +1858,7 @@ name = "Manhattan Project" id = "manhattan_proj" description = "A scientist's drink of choice, for pondering ways to blow up the station." + taste_description = "death, the destroyer of worlds" color = "#C15D00" strength = 10 druggy = 30 @@ -1701,6 +1870,7 @@ name = "The Manly Dorf" id = "manlydorf" description = "Beer and Ale, brought together in a delicious mix. Intended for true men only." + taste_description = "hair on your chest and your chin" color = "#4C3100" strength = 25 @@ -1711,6 +1881,7 @@ name = "Margarita" id = "margarita" description = "On the rocks with salt on the rim. Arriba~!" + taste_description = "dry and salty" color = "#8CFF8C" strength = 15 @@ -1721,6 +1892,7 @@ name = "Mead" id = "mead" description = "A Viking's drink, though a cheap one." + taste_description = "sweet yet alcoholic" reagent_state = LIQUID color = "#FFBB00" strength = 30 @@ -1733,6 +1905,8 @@ name = "Moonshine" id = "moonshine" description = "You've really hit rock bottom now... your liver packed its bags and left last night." + taste_description = "bitterness" + taste_mult = 2.5 color = "#0064C8" strength = 12 @@ -1743,6 +1917,7 @@ name = "Neurotoxin" id = "neurotoxin" description = "A strong neurotoxin that puts the subject into a death-like state." + taste_description = "a numbing sensation" reagent_state = LIQUID color = "#2E2E61" strength = 10 @@ -1760,6 +1935,7 @@ name = "Patron" id = "patron" description = "Tequila with silver in it, a favorite of alcoholic women in the club scene." + taste_description = "metallic paint thinner" color = "#585840" strength = 30 @@ -1795,6 +1971,7 @@ name = "Red Mead" id = "red_mead" description = "The true Viking's drink! Even though it has a strange red color." + taste_description = "sweet and salty alcohol" color = "#C73C00" strength = 30 @@ -1805,6 +1982,7 @@ name = "Sbiten" id = "sbiten" description = "A spicy Vodka! Might be a little hot for the little guys!" + taste_description = "hot and spice" color = "#FFA371" strength = 15 adj_temp = 50 @@ -1817,6 +1995,7 @@ name = "Screwdriver" id = "screwdrivercocktail" description = "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious." + taste_description = "oranges" color = "#A68310" strength = 15 @@ -1827,6 +2006,8 @@ name = "Silencer" id = "silencer" description = "A drink from Mime Heaven." + taste_description = "a pencil eraser" + taste_mult = 1.2 nutriment_factor = 1 color = "#FFFFFF" strength = 12 @@ -1838,6 +2019,7 @@ name = "Singulo" id = "singulo" description = "A blue-space beverage!" + taste_description = "concentrated matter" color = "#2E6671" strength = 10 @@ -1848,6 +2030,7 @@ name = "Snow White" id = "snowwhite" description = "A cold refreshment" + taste_description = "refreshing cold" color = "#FFFFFF" strength = 30 @@ -1858,6 +2041,7 @@ name = "Sui Dream" id = "suidream" description = "Comprised of: White soda, blue curacao, melon liquor." + taste_description = "fruit" color = "#00A86B" strength = 100 @@ -1868,6 +2052,7 @@ name = "Syndicate Bomb" id = "syndicatebomb" description = "Tastes like terrorism!" + taste_description = "purified antagonism" color = "#2E6671" strength = 10 @@ -1878,6 +2063,7 @@ name = "Tequila Sunrise" id = "tequillasunrise" description = "Tequila and orange juice. Much like a Screwdriver, only Mexican~" + taste_description = "oranges" color = "#FFE48C" strength = 25 @@ -1888,6 +2074,7 @@ name = "Three Mile Island Iced Tea" id = "threemileisland" description = "Made for a woman, strong enough for a man." + taste_description = "dry" color = "#666340" strength = 10 druggy = 50 @@ -1899,6 +2086,7 @@ name = "Toxins Special" id = "phoronspecial" description = "This thing is ON FIRE! CALL THE DAMN SHUTTLE!" + taste_description = "spicy toxins" reagent_state = LIQUID color = "#7F00FF" strength = 10 @@ -1912,6 +2100,7 @@ name = "Vodka Martini" id = "vodkamartini" description = "Vodka with Gin. Not quite how 007 enjoyed it, but still delicious." + taste_description = "shaken, not stirred" color = "#0064C8" strength = 12 @@ -1923,6 +2112,7 @@ name = "Vodka and Tonic" id = "vodkatonic" description = "For when a gin and tonic isn't russian enough." + taste_description = "tart bitterness" color = "#0064C8" // rgb: 0, 100, 200 strength = 15 @@ -1934,6 +2124,7 @@ name = "White Russian" id = "whiterussian" description = "That's just, like, your opinion, man..." + taste_description = "coffee icecream" color = "#A68340" strength = 15 @@ -1945,6 +2136,7 @@ name = "Whiskey Cola" id = "whiskeycola" description = "Whiskey, mixed with cola. Surprisingly refreshing." + taste_description = "cola with an alcoholic undertone" color = "#3E1B00" strength = 25 @@ -1956,6 +2148,7 @@ name = "Whiskey Soda" id = "whiskeysoda" description = "For the more refined griffon." + taste_description = "carbonated whiskey" color = "#EAB300" strength = 15 @@ -1966,6 +2159,7 @@ name = "Special Blend Whiskey" id = "specialwhiskey" description = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything. The smell of it singes your nostrils." + taste_description = "unspeakable whiskey bliss" color = "#523600" strength = 7 diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index 8bbb4ac9506..c049f3c0e94 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -4,6 +4,7 @@ name = "Inaprovaline" id = "inaprovaline" description = "Inaprovaline is a synaptic stimulant and cardiostimulant. Commonly used to stabilize patients." + taste_description = "bitterness" reagent_state = LIQUID color = "#00BFFF" overdose = REAGENTS_OVERDOSE * 2 @@ -20,6 +21,8 @@ name = "Bicaridine" id = "bicaridine" description = "Bicaridine is an analgesic medication and can be used to treat blunt trauma." + taste_description = "bitterness" + taste_mult = 3 reagent_state = LIQUID color = "#BF0000" overdose = REAGENTS_OVERDOSE @@ -33,6 +36,7 @@ name = "Kelotane" id = "kelotane" description = "Kelotane is a drug used to treat burns." + taste_description = "bitterness" reagent_state = LIQUID color = "#FFA800" overdose = REAGENTS_OVERDOSE @@ -46,6 +50,8 @@ name = "Dermaline" id = "dermaline" description = "Dermaline is the next step in burn medication. Works twice as good as kelotane and enables the body to restore even the direst heat-damaged tissue." + taste_description = "bitterness" + taste_mult = 1.5 reagent_state = LIQUID color = "#FF8000" overdose = REAGENTS_OVERDOSE * 0.5 @@ -59,6 +65,7 @@ name = "Dylovene" id = "anti_toxin" description = "Dylovene is a broad-spectrum antitoxin." + taste_description = "a roll of gauze" reagent_state = LIQUID color = "#00A000" scannable = 1 @@ -73,6 +80,7 @@ name = "Dexalin" id = "dexalin" description = "Dexalin is used in the treatment of oxygen deprivation." + taste_description = "bitterness" reagent_state = LIQUID color = "#0080FF" overdose = REAGENTS_OVERDOSE @@ -90,6 +98,7 @@ name = "Dexalin Plus" id = "dexalinp" description = "Dexalin Plus is used in the treatment of oxygen deprivation. It is highly effective." + taste_description = "bitterness" reagent_state = LIQUID color = "#0040FF" mrate_static = TRUE //Until it's not crazy strong, at least @@ -108,6 +117,7 @@ name = "Tricordrazine" id = "tricordrazine" description = "Tricordrazine is a highly potent stimulant, originally derived from cordrazine. Can be used to treat a wide range of injuries." + taste_description = "bitterness" reagent_state = LIQUID color = "#8040FF" scannable = 1 @@ -122,6 +132,7 @@ name = "Cryoxadone" id = "cryoxadone" description = "A chemical mixture with almost magical healing powers. Its main limitation is that the targets body temperature must be under 170K for it to metabolise correctly." + taste_description = "overripe bananas" reagent_state = LIQUID color = "#8080FF" metabolism = REM * 0.5 @@ -139,6 +150,7 @@ name = "Clonexadone" id = "clonexadone" description = "A liquid compound similar to that used in the cloning process. Can be used to 'finish' the cloning process when used in conjunction with a cryo tube." + taste_description = "rotten bananas" reagent_state = LIQUID color = "#80BFFF" metabolism = REM * 0.5 @@ -158,6 +170,7 @@ name = "Paracetamol" id = "paracetamol" description = "Most probably know this as Tylenol, but this chemical is a mild, simple painkiller." + taste_description = "bitterness" reagent_state = LIQUID color = "#C8A5DC" overdose = 60 @@ -176,6 +189,7 @@ name = "Tramadol" id = "tramadol" description = "A simple, yet effective painkiller." + taste_description = "sourness" reagent_state = LIQUID color = "#CB68FC" overdose = 30 @@ -194,6 +208,7 @@ name = "Oxycodone" id = "oxycodone" description = "An effective and very addictive painkiller." + taste_description = "bitterness" reagent_state = LIQUID color = "#800080" overdose = 20 @@ -214,6 +229,7 @@ name = "Synaptizine" id = "synaptizine" description = "Synaptizine is used to treat various diseases." + taste_description = "bitterness" reagent_state = LIQUID color = "#99CCFF" metabolism = REM * 0.05 @@ -236,6 +252,7 @@ name = "Alkysine" id = "alkysine" description = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue." + taste_description = "bitterness" reagent_state = LIQUID color = "#FFFF66" metabolism = REM * 0.25 @@ -252,6 +269,7 @@ name = "Imidazoline" id = "imidazoline" description = "Heals eye damage" + taste_description = "dull toxin" reagent_state = LIQUID color = "#C8A5DC" overdose = REAGENTS_OVERDOSE @@ -275,6 +293,7 @@ name = "Peridaxon" id = "peridaxon" description = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously." + taste_description = "bitterness" reagent_state = LIQUID color = "#561EC3" overdose = 10 @@ -295,6 +314,7 @@ name = "Ryetalyn" id = "ryetalyn" description = "Ryetalyn can cure all genetic abnomalities via a catalytic process." + taste_description = "acid" reagent_state = SOLID color = "#004000" overdose = REAGENTS_OVERDOSE @@ -315,6 +335,7 @@ name = "Ethylredoxrazine" id = "ethylredoxrazine" description = "A powerful oxidizer that reacts with ethanol." + taste_description = "bitterness" reagent_state = SOLID color = "#605048" overdose = REAGENTS_OVERDOSE @@ -335,6 +356,7 @@ name = "Hyronalin" id = "hyronalin" description = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning." + taste_description = "bitterness" reagent_state = LIQUID color = "#408000" metabolism = REM * 0.25 @@ -348,6 +370,7 @@ name = "Arithrazine" id = "arithrazine" description = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning." + taste_description = "bitterness" reagent_state = LIQUID color = "#008000" metabolism = REM * 0.25 @@ -364,6 +387,7 @@ name = "Spaceacillin" id = "spaceacillin" description = "An all-purpose antiviral agent." + taste_description = "bitterness" reagent_state = LIQUID color = "#C1C1C1" metabolism = REM * 0.05 @@ -375,6 +399,7 @@ name = "Sterilizine" id = "sterilizine" description = "Sterilizes wounds in preparation for surgery and thoroughly removes blood." + taste_description = "bitterness" reagent_state = LIQUID color = "#C8A5DC" touch_met = 5 @@ -400,6 +425,7 @@ name = "Leporazine" id = "leporazine" description = "Leporazine can be use to stabilize an individuals body temperature." + taste_description = "bitterness" reagent_state = LIQUID color = "#C8A5DC" overdose = REAGENTS_OVERDOSE @@ -419,6 +445,7 @@ name = "Methylphenidate" id = "methylphenidate" description = "Improves the ability to concentrate." + taste_description = "bitterness" reagent_state = LIQUID color = "#BF80BF" metabolism = 0.01 @@ -440,6 +467,7 @@ name = "Citalopram" id = "citalopram" description = "Stabilizes the mind a little." + taste_description = "bitterness" reagent_state = LIQUID color = "#FF80FF" metabolism = 0.01 @@ -461,6 +489,7 @@ name = "Paroxetine" id = "paroxetine" description = "Stabilizes the mind greatly, but has a chance of adverse effects." + taste_description = "bitterness" reagent_state = LIQUID color = "#FF80BF" metabolism = 0.01 @@ -486,6 +515,7 @@ name = "Rezadone" id = "rezadone" description = "A powder with almost magical properties, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects." + taste_description = "bitterness" reagent_state = SOLID color = "#669900" overdose = REAGENTS_OVERDOSE diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm index 7a94e64ac67..4f8e17cb1e6 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm @@ -4,6 +4,7 @@ name = "Crayon dust" id = "crayon_dust" description = "Intensely coloured powder obtained by grinding crayons." + taste_description = "powdered wax" reagent_state = LIQUID color = "#888888" overdose = 5 @@ -52,6 +53,7 @@ name = "Paint" id = "paint" description = "This paint will stick to almost any object." + taste_description = "chalk" reagent_state = LIQUID color = "#808080" overdose = REAGENTS_OVERDOSE * 0.5 @@ -108,6 +110,7 @@ name = "Adminordrazine" id = "adminordrazine" description = "It's magic. We don't have to explain it." + taste_description = "bwoink" reagent_state = LIQUID color = "#C8A5DC" affects_dead = 1 //This can even heal dead people. @@ -146,6 +149,7 @@ name = "Gold" id = "gold" description = "Gold is a dense, soft, shiny metal and the most malleable and ductile metal known." + taste_description = "metal" reagent_state = SOLID color = "#F7C430" @@ -153,6 +157,7 @@ name = "Silver" id = "silver" description = "A soft, white, lustrous transition metal, it has the highest electrical conductivity of any element and the highest thermal conductivity of any metal." + taste_description = "metal" reagent_state = SOLID color = "#D0D0D0" @@ -160,6 +165,7 @@ name ="Uranium" id = "uranium" description = "A silvery-white metallic chemical element in the actinide series, weakly radioactive." + taste_description = "metal" reagent_state = SOLID color = "#B8B8C0" @@ -181,6 +187,7 @@ name = "Adrenaline" id = "adrenaline" description = "Adrenaline is a hormone used as a drug to treat cardiac arrest and other cardiac dysrhythmias resulting in diminished or absent cardiac output." + taste_description = "bitterness" reagent_state = LIQUID color = "#C8A5DC" mrate_static = TRUE @@ -196,6 +203,7 @@ name = "Holy Water" id = "holywater" description = "An ashen-obsidian-water mix, this solution will alter certain sections of the brain's rationality." + taste_description = "water" color = "#E0E8EF" mrate_static = TRUE @@ -217,6 +225,8 @@ name = "Ammonia" id = "ammonia" description = "A caustic substance commonly used in fertilizer or household cleaners." + taste_description = "mordant" + taste_mult = 2 reagent_state = GAS color = "#404030" @@ -224,6 +234,7 @@ name = "Diethylamine" id = "diethylamine" description = "A secondary amine, mildly corrosive." + taste_description = "iron" reagent_state = LIQUID color = "#604030" @@ -231,6 +242,7 @@ name = "Fluorosurfactant" id = "fluorosurfactant" description = "A perfluoronated sulfonic acid that forms a foam when mixed with water." + taste_description = "metal" reagent_state = LIQUID color = "#9E6B38" @@ -238,6 +250,7 @@ name = "Foaming agent" id = "foaming_agent" description = "A agent that yields metallic foam when mixed with light metal and a strong acid." + taste_description = "metal" reagent_state = SOLID color = "#664B63" @@ -245,6 +258,7 @@ name = "Thermite" id = "thermite" description = "Thermite produces an aluminothermic reaction known as a thermite reaction. Can be used to melt walls." + taste_description = "sweet tasting metal" reagent_state = SOLID color = "#673910" touch_met = 50 @@ -269,6 +283,7 @@ name = "Space cleaner" id = "cleaner" description = "A compound used to clean things. Now with 50% more sodium hypochlorite!" + taste_description = "sourness" reagent_state = LIQUID color = "#A5F0EE" touch_met = 50 @@ -317,6 +332,7 @@ name = "Space Lube" id = "lube" description = "Lubricant is a substance introduced between two moving surfaces to reduce the friction and wear between them. giggity." + taste_description = "slime" reagent_state = LIQUID color = "#009CA8" @@ -330,6 +346,7 @@ name = "Silicate" id = "silicate" description = "A compound that can be used to reinforce glass." + taste_description = "plastic" reagent_state = LIQUID color = "#C7FFFF" @@ -344,6 +361,7 @@ name = "Glycerol" id = "glycerol" description = "Glycerol is a simple polyol compound. Glycerol is sweet-tasting and of low toxicity." + taste_description = "sweetness" reagent_state = LIQUID color = "#808080" @@ -351,6 +369,7 @@ name = "Nitroglycerin" id = "nitroglycerin" description = "Nitroglycerin is a heavy, colorless, oily, explosive liquid obtained by nitrating glycerol." + taste_description = "oil" reagent_state = LIQUID color = "#808080" @@ -358,6 +377,8 @@ name = "Coolant" id = "coolant" description = "Industrial cooling substance." + taste_description = "sourness" + taste_mult = 1.1 reagent_state = LIQUID color = "#C8A5DC" @@ -365,12 +386,14 @@ name = "Ultra Glue" id = "glue" description = "An extremely powerful bonding agent." + taste_description = "a special education class" color = "#FFFFCC" /datum/reagent/woodpulp name = "Wood Pulp" id = "woodpulp" description = "A mass of wood fibers." + taste_description = "wood" reagent_state = LIQUID color = "#B97A57" @@ -378,6 +401,7 @@ name = "Luminol" id = "luminol" description = "A compound that interacts with blood on the molecular level." + taste_description = "metal" reagent_state = LIQUID color = "#F2F3F4" diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm index 67b4594db1b..003b4910d48 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm @@ -1,13 +1,14 @@ /* Toxins, poisons, venoms */ /datum/reagent/toxin - name = "Toxin" + name = "toxin" id = "toxin" description = "A toxic chemical." + taste_description = "bitterness" + taste_mult = 1.2 reagent_state = LIQUID color = "#CF3600" metabolism = REM * 0.25 // 0.05 by default. Hopefully enough to get some help, or die horribly, whatever floats your boat - mrate_static = TRUE var/strength = 4 // How much damage it deals per unit /datum/reagent/toxin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) @@ -19,6 +20,7 @@ name = "Plasticide" id = "plasticide" description = "Liquid plastic, do not eat." + taste_description = "plastic" reagent_state = LIQUID color = "#CF3600" strength = 5 @@ -27,6 +29,7 @@ name = "Amatoxin" id = "amatoxin" description = "A powerful poison derived from certain species of mushroom." + taste_description = "mushroom" reagent_state = LIQUID color = "#792300" strength = 10 @@ -35,6 +38,7 @@ name = "Carpotoxin" id = "carpotoxin" description = "A deadly neurotoxin produced by the dreaded space carp." + taste_description = "fish" reagent_state = LIQUID color = "#003333" strength = 10 @@ -43,6 +47,7 @@ name = "Phoron" id = "phoron" description = "Phoron in its liquid form." + taste_mult = 1.5 reagent_state = LIQUID color = "#9D14DB" strength = 30 @@ -69,6 +74,8 @@ name = "Cyanide" id = "cyanide" description = "A highly toxic chemical." + taste_description = "almond" + taste_mult = 0.6 reagent_state = LIQUID color = "#CF3600" strength = 20 @@ -83,6 +90,7 @@ name = "Hyperzine" id = "hyperzine" description = "Hyperzine is a highly effective, long lasting, muscle stimulant." + taste_description = "bitterness" reagent_state = LIQUID color = "#FF3300" overdose = REAGENTS_OVERDOSE * 0.5 @@ -100,6 +108,8 @@ name = "Stimm" id = "stimm" description = "A homemade stimulant with some serious side-effects." + taste_description = "sweetness" + taste_mult = 1.8 color = "#d0583a" metabolism = REM * 3 overdose = 10 @@ -120,6 +130,7 @@ name = "Potassium Chloride" id = "potassium_chloride" description = "A delicious salt that stops the heart when injected into cardiac muscle." + taste_description = "salt" reagent_state = SOLID color = "#FFFFFF" strength = 0 @@ -139,6 +150,7 @@ name = "Potassium Chlorophoride" id = "potassium_chlorophoride" description = "A specific chemical based on Potassium Chloride to stop the heart for surgery. Not safe to eat!" + taste_description = "salt" reagent_state = SOLID color = "#FFFFFF" strength = 10 @@ -158,6 +170,7 @@ name = "Zombie Powder" id = "zombiepowder" description = "A strong neurotoxin that puts the subject into a death-like state." + taste_description = "numbness" reagent_state = SOLID color = "#669900" metabolism = REM @@ -183,6 +196,8 @@ name = "fertilizer" id = "fertilizer" description = "A chemical mix good for growing plants with." + taste_description = "plant food" + taste_mult = 0.5 reagent_state = LIQUID strength = 0.5 // It's not THAT poisonous. color = "#664330" @@ -203,6 +218,7 @@ name = "Plant-B-Gone" id = "plantbgone" description = "A harmful toxic mixture to kill plantlife. Do not ingest!" + taste_mult = 1 reagent_state = LIQUID color = "#49002E" strength = 4 @@ -231,6 +247,7 @@ name = "Polytrinic acid" id = "pacid" description = "Polytrinic acid is a an extremely corrosive chemical substance." + taste_description = "acid" reagent_state = LIQUID color = "#8E18A9" power = 10 @@ -240,6 +257,7 @@ name = "Lexorin" id = "lexorin" description = "Lexorin temporarily stops respiration. Causes tissue damage." + taste_description = "acid" reagent_state = LIQUID color = "#C8A5DC" overdose = REAGENTS_OVERDOSE @@ -260,6 +278,8 @@ name = "Unstable mutagen" id = "mutagen" description = "Might cause unpredictable mutations. Keep away from children." + taste_description = "slime" + taste_mult = 0.9 reagent_state = LIQUID color = "#13BC5E" @@ -295,6 +315,8 @@ name = "Slime Jelly" id = "slimejelly" description = "A gooey semi-liquid produced from one of the deadliest lifeforms in existence. SO REAL." + taste_description = "slime" + taste_mult = 1.3 reagent_state = LIQUID color = "#801E28" @@ -311,6 +333,7 @@ name = "Soporific" id = "stoxin" description = "An effective hypnotic used to treat insomnia." + taste_description = "bitterness" reagent_state = LIQUID color = "#009CA8" metabolism = REM * 0.5 @@ -345,6 +368,7 @@ name = "Chloral Hydrate" id = "chloralhydrate" description = "A powerful sedative." + taste_description = "bitterness" reagent_state = SOLID color = "#000067" metabolism = REM * 0.5 @@ -378,6 +402,7 @@ name = "Beer" id = "beer2" description = "An alcoholic beverage made from malted grains, hops, yeast, and water. The fermentation appears to be incomplete." //If the players manage to analyze this, they deserve to know something is wrong. + taste_description = "beer" reagent_state = LIQUID color = "#FFD300" @@ -389,6 +414,8 @@ name = "Space drugs" id = "space_drugs" description = "An illegal chemical compound used as drug." + taste_description = "bitterness" + taste_mult = 0.4 reagent_state = LIQUID color = "#60A584" metabolism = REM * 0.5 @@ -412,6 +439,7 @@ name = "Serotrotium" id = "serotrotium" description = "A chemical compound that promotes concentrated production of the serotonin neurotransmitter in humans." + taste_description = "bitterness" reagent_state = LIQUID color = "#202040" metabolism = REM * 0.25 @@ -428,6 +456,7 @@ name = "Cryptobiolin" id = "cryptobiolin" description = "Cryptobiolin causes confusion and dizzyness." + taste_description = "sourness" reagent_state = LIQUID color = "#000055" metabolism = REM * 0.5 @@ -446,6 +475,7 @@ name = "Impedrezene" id = "impedrezene" description = "Impedrezene is a narcotic that impedes one's ability by slowing down the higher brain cell functions." + taste_description = "numbness" reagent_state = LIQUID color = "#C8A5DC" overdose = REAGENTS_OVERDOSE @@ -465,6 +495,7 @@ name = "Mindbreaker Toxin" id = "mindbreaker" description = "A powerful hallucinogen, it can cause fatal effects in users." + taste_description = "sourness" reagent_state = LIQUID color = "#B31008" metabolism = REM * 0.25 @@ -483,6 +514,7 @@ name = "Psilocybin" id = "psilocybin" description = "A strong psycotropic derived from certain species of mushroom." + taste_description = "mushroom" color = "#E700E7" overdose = REAGENTS_OVERDOSE metabolism = REM * 0.5 @@ -523,6 +555,7 @@ name = "Nicotine" id = "nicotine" description = "A highly addictive stimulant extracted from the tobacco plant." + taste_description = "bitterness" reagent_state = LIQUID color = "#181818" @@ -532,6 +565,7 @@ name = "Mutation Toxin" id = "mutationtoxin" description = "A corruptive toxin produced by slimes." + taste_description = "sludge" reagent_state = LIQUID color = "#13BC5E" @@ -558,6 +592,7 @@ name = "Docility Toxin" id = "docilitytoxin" description = "A corruptive toxin produced by slimes." + taste_description = "sludge" reagent_state = LIQUID color = "#FF69B4" diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index 7ee525fc0b0..aa952915c3f 100644 --- a/code/modules/reagents/reagent_containers/dropper.dm +++ b/code/modules/reagents/reagent_containers/dropper.dm @@ -57,7 +57,7 @@ safe_thing = victim.glasses if(safe_thing) - trans = reagents.trans_to_obj(safe_thing, amount_per_transfer_from_this) + trans = reagents.splash(safe_thing, amount_per_transfer_from_this, max_spill=30) user.visible_message("[user] tries to squirt something into [target]'s eyes, but fails!", "You transfer [trans] units of the solution.") return @@ -67,14 +67,15 @@ user.attack_log += text("\[[time_stamp()]\] Used the [name] to squirt [M.name] ([M.key]). Reagents: [contained]") msg_admin_attack("[user.name] ([user.ckey]) squirted [M.name] ([M.key]) with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)") - trans = reagents.trans_to_mob(target, reagents.total_volume, CHEM_INGEST) + trans += reagents.splash(target, reagents.total_volume/2, max_spill=30) + trans += reagents.trans_to_mob(target, reagents.total_volume/2, CHEM_BLOOD) //I guess it gets into the bloodstream through the eyes or something user.visible_message("[user] squirts something into [target]'s eyes!", "You transfer [trans] units of the solution.") return else - trans = reagents.trans_to(target, amount_per_transfer_from_this) //sprinkling reagents on generic non-mobs + trans = reagents.splash(target, amount_per_transfer_from_this, max_spill=30) //sprinkling reagents on generic non-mobs user << "You transfer [trans] units of the solution." else // Taking from something diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 33660f28c72..2e0dd061328 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -12,9 +12,15 @@ var/dried_type = null var/dry = 0 var/nutriment_amt = 0 + var/list/nutriment_desc = list("food" = 1) center_of_mass = list("x"=16, "y"=16) w_class = ITEMSIZE_SMALL +/obj/item/weapon/reagent_containers/food/snacks/New() + ..() + if(nutriment_amt) + reagents.add_reagent("nutriment",nutriment_amt,nutriment_desc) + /obj/item/weapon/reagent_containers/food/snacks/New() ..() if(nutriment_amt) @@ -261,10 +267,11 @@ trash = /obj/item/trash/snack_bowl filling_color = "#468C00" center_of_mass = list("x"=17, "y"=11) + nutriment_amt = 8 + nutriment_desc = list("apples" = 3,"salad" = 5) /obj/item/weapon/reagent_containers/food/snacks/aesirsalad/New() ..() - reagents.add_reagent("nutriment", 8) reagents.add_reagent("doctorsdelight", 8) reagents.add_reagent("tricordrazine", 8) bitesize = 3 @@ -276,10 +283,11 @@ trash = /obj/item/trash/candy filling_color = "#7D5F46" center_of_mass = list("x"=15, "y"=15) + nutriment_amt = 1 + nutriment_desc = list("candy" = 1) /obj/item/weapon/reagent_containers/food/snacks/candy/New() ..() - reagents.add_reagent("nutriment", 1) reagents.add_reagent("sugar", 3) bitesize = 2 @@ -288,10 +296,11 @@ desc = "SwoleMAX brand protein bars, guaranteed to get you feeling perfectly overconfident." icon_state = "proteinbar" trash = /obj/item/trash/candy/proteinbar + nutriment_amt = 9 + nutriment_desc = list("candy" = 1, "protein" = 8) /obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar/New() ..() - reagents.add_reagent("nutriment", 9) reagents.add_reagent("protein", 4) reagents.add_reagent("sugar", 4) bitesize = 6 @@ -300,10 +309,11 @@ name = "Donor Candy" desc = "A little treat for blood donors." trash = /obj/item/trash/candy + nutriment_amt = 9 + nutriment_desc = list("candy" = 10) /obj/item/weapon/reagent_containers/food/snacks/candy/donor/New() ..() - reagents.add_reagent("nutriment", 10) reagents.add_reagent("sugar", 3) bitesize = 5 @@ -313,10 +323,11 @@ icon_state = "candy_corn" filling_color = "#FFFCB0" center_of_mass = list("x"=14, "y"=10) + nutriment_amt = 4 + nutriment_desc = list("candy corn" = 4) /obj/item/weapon/reagent_containers/food/snacks/candy_corn/New() ..() - reagents.add_reagent("nutriment", 4) reagents.add_reagent("sugar", 2) bitesize = 2 @@ -327,10 +338,11 @@ trash = /obj/item/trash/chips filling_color = "#E8C31E" center_of_mass = list("x"=15, "y"=15) + nutriment_amt = 3 + nutriment_desc = list("salt" = 1, "chips" = 2) /obj/item/weapon/reagent_containers/food/snacks/chips/New() ..() - reagents.add_reagent("nutriment", 3) bitesize = 1 /obj/item/weapon/reagent_containers/food/snacks/cookie @@ -339,10 +351,11 @@ icon_state = "COOKIE!!!" filling_color = "#DBC94F" center_of_mass = list("x"=17, "y"=18) + nutriment_amt = 5 + nutriment_desc = list("sweetness" = 3, "cookie" = 2) /obj/item/weapon/reagent_containers/food/snacks/cookie/New() ..() - reagents.add_reagent("nutriment", 5) bitesize = 1 /obj/item/weapon/reagent_containers/food/snacks/chocolatebar @@ -351,10 +364,11 @@ icon_state = "chocolatebar" filling_color = "#7D5F46" center_of_mass = list("x"=15, "y"=15) + nutriment_amt = 2 + nutriment_desc = list("chocolate" = 5) /obj/item/weapon/reagent_containers/food/snacks/chocolatebar/New() ..() - reagents.add_reagent("nutriment", 2) reagents.add_reagent("sugar", 2) reagents.add_reagent("coco", 2) bitesize = 2 @@ -365,10 +379,11 @@ icon_state = "chocolateegg" filling_color = "#7D5F46" center_of_mass = list("x"=16, "y"=13) + nutriment_amt = 3 + nutriment_desc = list("chocolate" = 5) /obj/item/weapon/reagent_containers/food/snacks/chocolateegg/New() ..() - reagents.add_reagent("nutriment", 3) reagents.add_reagent("sugar", 2) reagents.add_reagent("coco", 2) bitesize = 2 @@ -380,11 +395,13 @@ filling_color = "#D9C386" var/overlay_state = "box-donut1" center_of_mass = list("x"=13, "y"=16) + nutriment_desc = list("sweetness", "donut") /obj/item/weapon/reagent_containers/food/snacks/donut/normal name = "donut" desc = "Goes great with Robust Coffee." icon_state = "donut1" + nutriment_amt = 3 /obj/item/weapon/reagent_containers/food/snacks/donut/normal/New() ..() @@ -403,10 +420,10 @@ desc = "Like life, it never quite tastes the same." icon_state = "donut1" filling_color = "#ED11E6" + nutriment_amt = 2 /obj/item/weapon/reagent_containers/food/snacks/donut/chaos/New() ..() - reagents.add_reagent("nutriment", 2) reagents.add_reagent("sprinkles", 1) bitesize = 10 var/chaosselect = pick(1,2,3,4,5,6,7,8,9,10) @@ -443,10 +460,10 @@ icon_state = "jdonut1" filling_color = "#ED1169" center_of_mass = list("x"=16, "y"=11) + nutriment_amt = 3 /obj/item/weapon/reagent_containers/food/snacks/donut/jelly/New() ..() - reagents.add_reagent("nutriment", 3) reagents.add_reagent("sprinkles", 1) reagents.add_reagent("berryjuice", 5) bitesize = 5 @@ -462,10 +479,10 @@ icon_state = "jdonut1" filling_color = "#ED1169" center_of_mass = list("x"=16, "y"=11) + nutriment_amt = 3 /obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly/New() ..() - reagents.add_reagent("nutriment", 3) reagents.add_reagent("sprinkles", 1) reagents.add_reagent("slimejelly", 5) bitesize = 5 @@ -481,10 +498,10 @@ icon_state = "jdonut1" filling_color = "#ED1169" center_of_mass = list("x"=16, "y"=11) + nutriment_amt = 3 /obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly/New() ..() - reagents.add_reagent("nutriment", 3) reagents.add_reagent("sprinkles", 1) reagents.add_reagent("cherryjelly", 5) bitesize = 5 @@ -605,10 +622,11 @@ desc = "We all love tofu." filling_color = "#FFFEE0" center_of_mass = list("x"=17, "y"=10) + nutriment_amt = 3 + nutriment_desc = list("tofu" = 3, "goeyness" = 3) /obj/item/weapon/reagent_containers/food/snacks/tofu/New() ..() - reagents.add_reagent("nutriment", 3) src.bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/tofurkey @@ -617,10 +635,11 @@ icon_state = "tofurkey" filling_color = "#FFFEE0" center_of_mass = list("x"=16, "y"=8) + nutriment_amt = 12 + nutriment_desc = list("turkey" = 3, "tofu" = 5, "goeyness" = 4) /obj/item/weapon/reagent_containers/food/snacks/tofurkey/New() ..() - reagents.add_reagent("nutriment", 12) reagents.add_reagent("stoxin", 3) bitesize = 3 @@ -630,10 +649,11 @@ icon_state = "stuffing" filling_color = "#C9AC83" center_of_mass = list("x"=16, "y"=10) + nutriment_amt = 3 + nutriment_desc = list("dryness" = 2, "bread" = 2) /obj/item/weapon/reagent_containers/food/snacks/stuffing/New() ..() - reagents.add_reagent("nutriment", 3) bitesize = 1 /obj/item/weapon/reagent_containers/food/snacks/carpmeat @@ -668,10 +688,11 @@ icon_state = "hugemushroomslice" filling_color = "#E0D7C5" center_of_mass = list("x"=17, "y"=16) + nutriment_amt = 3 + nutriment_desc = list("raw" = 2, "mushroom" = 2) /obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice/New() ..() - reagents.add_reagent("nutriment", 3) reagents.add_reagent("psilocybin", 3) src.bitesize = 6 @@ -681,10 +702,11 @@ icon_state = "tomatomeat" filling_color = "#DB0000" center_of_mass = list("x"=17, "y"=16) + nutriment_amt = 3 + nutriment_desc = list("raw" = 2, "tomato" = 3) /obj/item/weapon/reagent_containers/food/snacks/tomatomeat/New() ..() - reagents.add_reagent("nutriment", 3) src.bitesize = 6 /obj/item/weapon/reagent_containers/food/snacks/bearmeat @@ -807,10 +829,11 @@ icon_state = "ghostburger" filling_color = "#FFF2FF" center_of_mass = list("x"=16, "y"=11) + nutriment_desc = list("buns" = 3, "spookiness" = 3) + nutriment_amt = 2 /obj/item/weapon/reagent_containers/food/snacks/ghostburger/New() ..() - reagents.add_reagent("nutriment", 2) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/human @@ -834,11 +857,12 @@ desc = "The cheese adds a good flavor." icon_state = "cheeseburger" center_of_mass = list("x"=16, "y"=11) + nutriment_amt = 2 + nutriment_desc = list("cheese" = 2, "bun" = 2) /obj/item/weapon/reagent_containers/food/snacks/cheeseburger/New() ..() reagents.add_reagent("protein", 2) - reagents.add_reagent("nutriment", 2) /obj/item/weapon/reagent_containers/food/snacks/monkeyburger name = "burger" @@ -846,11 +870,12 @@ icon_state = "hburger" filling_color = "#D63C3C" center_of_mass = list("x"=16, "y"=11) + nutriment_amt = 3 + nutriment_desc = list("bun" = 2) /obj/item/weapon/reagent_containers/food/snacks/monkeyburger/New() ..() reagents.add_reagent("protein", 3) - reagents.add_reagent("nutriment", 3) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/fishburger @@ -872,10 +897,11 @@ icon_state = "tofuburger" filling_color = "#FFFEE0" center_of_mass = list("x"=16, "y"=10) + nutriment_amt = 6 + nutriment_desc = list("bun" = 2, "pseudo-soy meat" = 3) /obj/item/weapon/reagent_containers/food/snacks/tofuburger/New() ..() - reagents.add_reagent("nutriment", 6) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/roburger @@ -884,10 +910,11 @@ icon_state = "roburger" filling_color = "#CCCCCC" center_of_mass = list("x"=16, "y"=11) + nutriment_amt = 2 + nutriment_desc = list("bun" = 2, "metal" = 3) /obj/item/weapon/reagent_containers/food/snacks/roburger/New() ..() - reagents.add_reagent("nutriment", 2) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/roburgerbig @@ -920,10 +947,11 @@ icon_state = "clownburger" filling_color = "#FF00FF" center_of_mass = list("x"=17, "y"=12) + nutriment_amt = 6 + nutriment_desc = list("bun" = 2, "clown shoe" = 3) /obj/item/weapon/reagent_containers/food/snacks/clownburger/New() ..() - reagents.add_reagent("nutriment", 6) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/mimeburger @@ -932,6 +960,8 @@ icon_state = "mimeburger" filling_color = "#FFFFFF" center_of_mass = list("x"=16, "y"=11) + nutriment_amt = 6 + nutriment_desc = list("bun" = 2, "face paint" = 3) /obj/item/weapon/reagent_containers/food/snacks/mimeburger/New() ..() @@ -957,6 +987,8 @@ icon_state = "muffin" filling_color = "#E0CF9B" center_of_mass = list("x"=17, "y"=4) + nutriment_amt = 6 + nutriment_desc = list("sweetness" = 3, "muffin" = 3) /obj/item/weapon/reagent_containers/food/snacks/muffin/New() ..() @@ -970,10 +1002,11 @@ trash = /obj/item/trash/plate filling_color = "#FBFFB8" center_of_mass = list("x"=16, "y"=13) + nutriment_amt = 4 + nutriment_desc = list("pie" = 3, "cream" = 2) /obj/item/weapon/reagent_containers/food/snacks/pie/New() ..() - reagents.add_reagent("nutriment", 4) reagents.add_reagent("banana",5) bitesize = 3 @@ -989,10 +1022,11 @@ icon_state = "berryclafoutis" trash = /obj/item/trash/plate center_of_mass = list("x"=16, "y"=13) + nutriment_amt = 4 + nutriment_desc = list("sweetness" = 2, "pie" = 3) /obj/item/weapon/reagent_containers/food/snacks/berryclafoutis/New() ..() - reagents.add_reagent("nutriment", 4) reagents.add_reagent("berryjuice", 5) bitesize = 3 @@ -1003,10 +1037,11 @@ trash = /obj/item/trash/waffles filling_color = "#E6DEB5" center_of_mass = list("x"=15, "y"=11) + nutriment_amt = 8 + nutriment_desc = list("waffle" = 8) /obj/item/weapon/reagent_containers/food/snacks/waffles/New() ..() - reagents.add_reagent("nutriment", 8) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/eggplantparm @@ -1016,10 +1051,11 @@ trash = /obj/item/trash/plate filling_color = "#4D2F5E" center_of_mass = list("x"=16, "y"=11) + nutriment_amt = 6 + nutriment_desc = list("cheese" = 3, "eggplant" = 3) /obj/item/weapon/reagent_containers/food/snacks/eggplantparm/New() ..() - reagents.add_reagent("nutriment", 6) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/soylentgreen @@ -1042,10 +1078,11 @@ trash = /obj/item/trash/waffles filling_color = "#E6FA61" center_of_mass = list("x"=15, "y"=11) + nutriment_amt = 10 + nutriment_desc = list("some sort of protein" = 10) //seasoned VERY well. /obj/item/weapon/reagent_containers/food/snacks/soylenviridians/New() ..() - reagents.add_reagent("nutriment", 10) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/meatpie @@ -1068,10 +1105,11 @@ trash = /obj/item/trash/plate filling_color = "#FFFEE0" center_of_mass = list("x"=16, "y"=13) + nutriment_amt = 10 + nutriment_desc = list("tofu" = 2, "pie" = 8) /obj/item/weapon/reagent_containers/food/snacks/tofupie/New() ..() - reagents.add_reagent("nutriment", 10) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/amanita_pie @@ -1080,10 +1118,11 @@ icon_state = "amanita_pie" filling_color = "#FFCCCC" center_of_mass = list("x"=17, "y"=9) + nutriment_amt = 5 + nutriment_desc = list("sweetness" = 3, "mushroom" = 3, "pie" = 2) /obj/item/weapon/reagent_containers/food/snacks/amanita_pie/New() ..() - reagents.add_reagent("nutriment", 5) reagents.add_reagent("amatoxin", 3) reagents.add_reagent("psilocybin", 1) bitesize = 3 @@ -1094,6 +1133,8 @@ icon_state = "plump_pie" filling_color = "#B8279B" center_of_mass = list("x"=17, "y"=9) + nutriment_amt = 8 + nutriment_desc = list("heartiness" = 2, "mushroom" = 3, "pie" = 3) /obj/item/weapon/reagent_containers/food/snacks/plump_pie/New() ..() @@ -1104,7 +1145,6 @@ reagents.add_reagent("tricordrazine", 5) bitesize = 2 else - reagents.add_reagent("nutriment", 8) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/xemeatpie @@ -1165,11 +1205,13 @@ desc = "Vegan meat, on a stick." trash = /obj/item/stack/rods filling_color = "#FFFEE0" + center_of_mass = list("x"=17, "y"=15) + nutriment_amt = 8 + nutriment_desc = list("tofu" = 3, "metal" = 1) /obj/item/weapon/reagent_containers/food/snacks/tofukabob/New() ..() - reagents.add_reagent("nutriment", 8) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/cubancarp @@ -1179,11 +1221,12 @@ trash = /obj/item/trash/plate filling_color = "#E9ADFF" center_of_mass = list("x"=12, "y"=5) + nutriment_amt = 3 + nutriment_desc = list("toasted bread" = 3) /obj/item/weapon/reagent_containers/food/snacks/cubancarp/New() ..() reagents.add_reagent("protein", 3) - reagents.add_reagent("nutriment", 3) reagents.add_reagent("carpotoxin", 3) reagents.add_reagent("capsaicin", 3) bitesize = 3 @@ -1196,11 +1239,13 @@ var/unpopped = 0 filling_color = "#FFFAD4" center_of_mass = list("x"=16, "y"=8) + nutriment_amt = 2 + nutriment_desc = list("popcorn" = 3) + /obj/item/weapon/reagent_containers/food/snacks/popcorn/New() ..() unpopped = rand(1,10) - reagents.add_reagent("nutriment", 2) bitesize = 0.1 //this snack is supposed to be eating during looooong time. And this it not dinner food! --rastaf0 /obj/item/weapon/reagent_containers/food/snacks/popcorn/On_Consume() @@ -1229,6 +1274,8 @@ trash = /obj/item/trash/raisins filling_color = "#343834" center_of_mass = list("x"=15, "y"=4) + nutriment_amt = 6 + nutriment_desc = list("dried raisins" = 6) /obj/item/weapon/reagent_containers/food/snacks/no_raisin/New() ..() @@ -1253,10 +1300,11 @@ trash = /obj/item/trash/cheesie filling_color = "#FFA305" center_of_mass = list("x"=15, "y"=9) + nutriment_amt = 4 + nutriment_desc = list("cheese" = 5, "chips" = 2) /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers/New() ..() - reagents.add_reagent("nutriment", 4) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/syndicake @@ -1265,12 +1313,12 @@ desc = "An extremely moist snack cake that tastes just as good after being nuked." filling_color = "#FF5D05" center_of_mass = list("x"=16, "y"=10) - trash = /obj/item/trash/syndi_cakes + nutriment_amt = 4 + nutriment_desc = list("sweetness" = 3, "cake" = 1) /obj/item/weapon/reagent_containers/food/snacks/syndicake/New() ..() - reagents.add_reagent("nutriment", 4) reagents.add_reagent("doctorsdelight", 5) bitesize = 3 @@ -1280,10 +1328,11 @@ icon_state = "loadedbakedpotato" filling_color = "#9C7A68" center_of_mass = list("x"=16, "y"=10) + nutriment_amt = 3 + nutriment_desc = list("baked potato" = 3) /obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato/New() ..() - reagents.add_reagent("nutriment", 3) reagents.add_reagent("protein", 3) bitesize = 2 @@ -1294,10 +1343,11 @@ trash = /obj/item/trash/plate filling_color = "#EDDD00" center_of_mass = list("x"=16, "y"=11) + nutriment_amt = 4 + nutriment_desc = list("fresh fries" = 4) /obj/item/weapon/reagent_containers/food/snacks/fries/New() ..() - reagents.add_reagent("nutriment", 4) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/soydope @@ -1307,10 +1357,11 @@ trash = /obj/item/trash/plate filling_color = "#C4BF76" center_of_mass = list("x"=16, "y"=10) + nutriment_amt = 2 + nutriment_desc = list("slime" = 2, "soy" = 2) /obj/item/weapon/reagent_containers/food/snacks/soydope/New() ..() - reagents.add_reagent("nutriment", 2) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/spagetti @@ -1319,10 +1370,11 @@ icon_state = "spagetti" filling_color = "#EDDD00" center_of_mass = list("x"=16, "y"=16) + nutriment_amt = 1 + nutriment_desc = list("noodles" = 2) /obj/item/weapon/reagent_containers/food/snacks/spagetti/New() ..() - reagents.add_reagent("nutriment", 1) bitesize = 1 /obj/item/weapon/reagent_containers/food/snacks/cheesyfries @@ -1332,11 +1384,12 @@ trash = /obj/item/trash/plate filling_color = "#EDDD00" center_of_mass = list("x"=16, "y"=11) + nutriment_amt = 4 + nutriment_desc = list("fresh fries" = 3, "cheese" = 3) /obj/item/weapon/reagent_containers/food/snacks/cheesyfries/New() ..() reagents.add_reagent("protein", 2) - reagents.add_reagent("nutriment", 4) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/fortunecookie @@ -1345,10 +1398,11 @@ icon_state = "fortune_cookie" filling_color = "#E8E79E" center_of_mass = list("x"=15, "y"=14) + nutriment_amt = 3 + nutriment_desc = list("fortune cookie" = 2) /obj/item/weapon/reagent_containers/food/snacks/fortunecookie/New() ..() - reagents.add_reagent("nutriment", 3) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/badrecipe @@ -1386,10 +1440,11 @@ trash = /obj/item/trash/snack_bowl filling_color = "#42B873" center_of_mass = list("x"=16, "y"=8) + nutriment_amt = 6 + nutriment_desc = list("mushroom" = 6) /obj/item/weapon/reagent_containers/food/snacks/spacylibertyduff/New() ..() - reagents.add_reagent("nutriment", 6) reagents.add_reagent("psilocybin", 6) bitesize = 3 @@ -1400,10 +1455,11 @@ trash = /obj/item/trash/snack_bowl filling_color = "#ED0758" center_of_mass = list("x"=16, "y"=5) + nutriment_amt = 6 + nutriment_desc = list("jelly" = 3, "mushroom" = 3) /obj/item/weapon/reagent_containers/food/snacks/amanitajelly/New() ..() - reagents.add_reagent("nutriment", 6) reagents.add_reagent("amatoxin", 6) reagents.add_reagent("psilocybin", 3) bitesize = 3 @@ -1415,10 +1471,11 @@ bitesize = 2 filling_color = "#916E36" center_of_mass = list("x"=16, "y"=10) + nutriment_amt = 5 + nutriment_desc = list("poppy seeds" = 2, "pretzel" = 3) /obj/item/weapon/reagent_containers/food/snacks/poppypretzel/New() ..() - reagents.add_reagent("nutriment", 5) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/meatballsoup @@ -1467,10 +1524,11 @@ icon_state = "clownstears" filling_color = "#C4FBFF" center_of_mass = list("x"=16, "y"=7) + nutriment_amt = 4 + nutriment_desc = list("salt" = 1, "the worst joke" = 3) /obj/item/weapon/reagent_containers/food/snacks/clownstears/New() ..() - reagents.add_reagent("nutriment", 4) reagents.add_reagent("banana", 5) reagents.add_reagent("water", 10) bitesize = 5 @@ -1482,10 +1540,11 @@ trash = /obj/item/trash/snack_bowl filling_color = "#AFC4B5" center_of_mass = list("x"=16, "y"=8) + nutriment_amt = 8 + nutriment_desc = list("carot" = 2, "corn" = 2, "eggplant" = 2, "potato" = 2) /obj/item/weapon/reagent_containers/food/snacks/vegetablesoup/New() ..() - reagents.add_reagent("nutriment", 8) reagents.add_reagent("water", 5) bitesize = 5 @@ -1496,10 +1555,11 @@ trash = /obj/item/trash/snack_bowl filling_color = "#AFC4B5" center_of_mass = list("x"=16, "y"=7) + nutriment_amt = 8 + nutriment_desc = list("salad" = 4, "egg" = 2, "potato" = 2) /obj/item/weapon/reagent_containers/food/snacks/nettlesoup/New() ..() - reagents.add_reagent("nutriment", 8) reagents.add_reagent("water", 5) reagents.add_reagent("tricordrazine", 5) bitesize = 5 @@ -1511,6 +1571,8 @@ trash = /obj/item/trash/snack_bowl filling_color = "#F082FF" center_of_mass = list("x"=16, "y"=6) + nutriment_amt = 1 + nutriment_desc = list("backwash" = 1) /obj/item/weapon/reagent_containers/food/snacks/mysterysoup/New() ..() @@ -1566,7 +1628,7 @@ bitesize = 5 if(prob(25)) src.desc = "A wish come true!" - reagents.add_reagent("nutriment", 8) + reagents.add_reagent("nutriment", 8, list("something good" = 8)) /obj/item/weapon/reagent_containers/food/snacks/hotchili name = "Hot Chili" @@ -1575,11 +1637,12 @@ trash = /obj/item/trash/snack_bowl filling_color = "#FF3C00" center_of_mass = list("x"=15, "y"=9) + nutriment_amt = 3 + nutriment_desc = list("chilli peppers" = 3) /obj/item/weapon/reagent_containers/food/snacks/hotchili/New() ..() reagents.add_reagent("protein", 3) - reagents.add_reagent("nutriment", 3) reagents.add_reagent("capsaicin", 3) reagents.add_reagent("tomatojuice", 2) bitesize = 5 @@ -1590,13 +1653,13 @@ icon_state = "coldchili" filling_color = "#2B00FF" center_of_mass = list("x"=15, "y"=9) - trash = /obj/item/trash/snack_bowl + nutriment_amt = 3 + nutriment_desc = list("ice peppers" = 3) /obj/item/weapon/reagent_containers/food/snacks/coldchili/New() ..() reagents.add_reagent("protein", 3) - reagents.add_reagent("nutriment", 3) reagents.add_reagent("frostoil", 3) reagents.add_reagent("tomatojuice", 2) bitesize = 5 @@ -1680,10 +1743,11 @@ desc = "This is absolutely Ei Nath." icon_state = "spellburger" filling_color = "#D505FF" + nutriment_amt = 6 + nutriment_desc = list("magic" = 3, "buns" = 3) /obj/item/weapon/reagent_containers/food/snacks/spellburger/New() ..() - reagents.add_reagent("nutriment", 6) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/bigbiteburger @@ -1692,11 +1756,12 @@ icon_state = "bigbiteburger" filling_color = "#E3D681" center_of_mass = list("x"=16, "y"=11) + nutriment_amt = 4 + nutriment_desc = list("buns" = 4) /obj/item/weapon/reagent_containers/food/snacks/bigbiteburger/New() ..() reagents.add_reagent("protein", 10) - reagents.add_reagent("nutriment", 4) bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/enchiladas @@ -1706,11 +1771,12 @@ trash = /obj/item/trash/tray filling_color = "#A36A1F" center_of_mass = list("x"=16, "y"=13) + nutriment_amt = 2 + nutriment_desc = list("tortilla" = 3, "corn" = 3) /obj/item/weapon/reagent_containers/food/snacks/enchiladas/New() ..() reagents.add_reagent("protein", 6) - reagents.add_reagent("nutriment",2) reagents.add_reagent("capsaicin", 6) bitesize = 4 @@ -1736,10 +1802,11 @@ icon_state = "baguette" filling_color = "#E3D796" center_of_mass = list("x"=18, "y"=12) + nutriment_amt = 6 + nutriment_desc = list("french bread" = 6) /obj/item/weapon/reagent_containers/food/snacks/baguette/New() ..() - reagents.add_reagent("nutriment", 6) reagents.add_reagent("blackpepper", 1) reagents.add_reagent("sodiumchloride", 1) bitesize = 3 @@ -1750,11 +1817,12 @@ icon_state = "fishandchips" filling_color = "#E3D796" center_of_mass = list("x"=16, "y"=16) + nutriment_amt = 3 + nutriment_desc = list("salt" = 1, "chips" = 3) /obj/item/weapon/reagent_containers/food/snacks/fishandchips/New() ..() reagents.add_reagent("protein", 3) - reagents.add_reagent("nutriment", 3) reagents.add_reagent("carpotoxin", 3) bitesize = 3 @@ -1765,11 +1833,12 @@ trash = /obj/item/trash/plate filling_color = "#D9BE29" center_of_mass = list("x"=16, "y"=4) + nutriment_amt = 3 + nutriment_desc = list("bread" = 3, "cheese" = 3) /obj/item/weapon/reagent_containers/food/snacks/sandwich/New() ..() reagents.add_reagent("protein", 3) - reagents.add_reagent("nutriment", 3) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/toastedsandwich @@ -1779,11 +1848,12 @@ trash = /obj/item/trash/plate filling_color = "#D9BE29" center_of_mass = list("x"=16, "y"=4) + nutriment_amt = 3 + nutriment_desc = list("toasted bread" = 3, "cheese" = 3) /obj/item/weapon/reagent_containers/food/snacks/toastedsandwich/New() ..() reagents.add_reagent("protein", 3) - reagents.add_reagent("nutriment", 3) reagents.add_reagent("carbon", 2) bitesize = 2 @@ -1793,11 +1863,12 @@ icon_state = "toastedsandwich" trash = /obj/item/trash/plate filling_color = "#D9BE29" + nutriment_amt = 3 + nutriment_desc = list("toasted bread" = 3, "cheese" = 3) /obj/item/weapon/reagent_containers/food/snacks/grilledcheese/New() ..() reagents.add_reagent("protein", 4) - reagents.add_reagent("nutriment", 3) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/tomatosoup @@ -1807,10 +1878,11 @@ trash = /obj/item/trash/snack_bowl filling_color = "#D92929" center_of_mass = list("x"=16, "y"=7) + nutriment_amt = 5 + nutriment_desc = list("soup" = 5) /obj/item/weapon/reagent_containers/food/snacks/tomatosoup/New() ..() - reagents.add_reagent("nutriment", 5) reagents.add_reagent("tomatojuice", 10) bitesize = 3 @@ -1821,10 +1893,11 @@ trash = /obj/item/trash/waffles filling_color = "#FF00F7" center_of_mass = list("x"=15, "y"=11) + nutriment_amt = 8 + nutriment_desc = list("waffle" = 7, "sweetness" = 1) /obj/item/weapon/reagent_containers/food/snacks/rofflewaffles/New() ..() - reagents.add_reagent("nutriment", 8) reagents.add_reagent("psilocybin", 8) bitesize = 4 @@ -1834,11 +1907,12 @@ icon_state = "stew" filling_color = "#9E673A" center_of_mass = list("x"=16, "y"=5) + nutriment_amt = 6 + nutriment_desc = list("tomato" = 2, "potato" = 2, "carrot" = 2, "eggplant" = 2, "mushroom" = 2) /obj/item/weapon/reagent_containers/food/snacks/stew/New() ..() reagents.add_reagent("protein", 4) - reagents.add_reagent("nutriment", 6) reagents.add_reagent("tomatojuice", 5) reagents.add_reagent("imidazoline", 5) reagents.add_reagent("water", 5) @@ -1851,10 +1925,11 @@ trash = /obj/item/trash/plate filling_color = "#B572AB" center_of_mass = list("x"=16, "y"=8) + nutriment_amt = 1 + nutriment_desc = list("toasted bread" = 2) /obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/New() ..() - reagents.add_reagent("nutriment", 1) bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/cherry/New() @@ -1871,10 +1946,11 @@ icon_state = "jellyburger" filling_color = "#B572AB" center_of_mass = list("x"=16, "y"=11) + nutriment_amt = 5 + nutriment_desc = list("buns" = 5) /obj/item/weapon/reagent_containers/food/snacks/jellyburger/New() ..() - reagents.add_reagent("nutriment", 5) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/jellyburger/slime/New() @@ -1891,10 +1967,11 @@ icon_state = "milosoup" trash = /obj/item/trash/snack_bowl center_of_mass = list("x"=16, "y"=7) + nutriment_amt = 8 + nutriment_desc = list("soy" = 8) /obj/item/weapon/reagent_containers/food/snacks/milosoup/New() ..() - reagents.add_reagent("nutriment", 8) reagents.add_reagent("water", 5) bitesize = 4 @@ -1904,10 +1981,11 @@ icon_state = "stewedsoymeat" trash = /obj/item/trash/plate center_of_mass = list("x"=16, "y"=10) + nutriment_amt = 8 + nutriment_desc = list("soy" = 4, "tomato" = 4) /obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat/New() ..() - reagents.add_reagent("nutriment", 8) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/boiledspagetti @@ -1917,10 +1995,11 @@ trash = /obj/item/trash/plate filling_color = "#FCEE81" center_of_mass = list("x"=16, "y"=10) + nutriment_amt = 2 + nutriment_desc = list("noodles" = 2) /obj/item/weapon/reagent_containers/food/snacks/boiledspagetti/New() ..() - reagents.add_reagent("nutriment", 2) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/boiledrice @@ -1930,10 +2009,11 @@ trash = /obj/item/trash/snack_bowl filling_color = "#FFFBDB" center_of_mass = list("x"=17, "y"=11) + nutriment_amt = 2 + nutriment_desc = list("rice" = 2) /obj/item/weapon/reagent_containers/food/snacks/boiledrice/New() ..() - reagents.add_reagent("nutriment", 2) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/ricepudding @@ -1943,10 +2023,11 @@ trash = /obj/item/trash/snack_bowl filling_color = "#FFFBDB" center_of_mass = list("x"=17, "y"=11) + nutriment_amt = 4 + nutriment_desc = list("rice" = 2) /obj/item/weapon/reagent_containers/food/snacks/ricepudding/New() ..() - reagents.add_reagent("nutriment", 4) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/pastatomato @@ -1956,10 +2037,11 @@ trash = /obj/item/trash/plate filling_color = "#DE4545" center_of_mass = list("x"=16, "y"=10) + nutriment_amt = 6 + nutriment_desc = list("tomato" = 3, "noodles" = 3) /obj/item/weapon/reagent_containers/food/snacks/pastatomato/New() ..() - reagents.add_reagent("nutriment", 6) reagents.add_reagent("tomatojuice", 10) bitesize = 4 @@ -1970,11 +2052,12 @@ trash = /obj/item/trash/plate filling_color = "#DE4545" center_of_mass = list("x"=16, "y"=10) + nutriment_amt = 4 + nutriment_desc = list("noodles" = 4) /obj/item/weapon/reagent_containers/food/snacks/meatballspagetti/New() ..() reagents.add_reagent("protein", 4) - reagents.add_reagent("nutriment", 4) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/spesslaw @@ -1983,11 +2066,12 @@ icon_state = "spesslaw" filling_color = "#DE4545" center_of_mass = list("x"=16, "y"=10) + nutriment_amt = 4 + nutriment_desc = list("noodles" = 4) /obj/item/weapon/reagent_containers/food/snacks/spesslaw/New() ..() reagents.add_reagent("protein", 4) - reagents.add_reagent("nutriment", 4) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/carrotfries @@ -1997,10 +2081,11 @@ trash = /obj/item/trash/plate filling_color = "#FAA005" center_of_mass = list("x"=16, "y"=11) + nutriment_amt = 3 + nutriment_desc = list("carrot" = 3, "salt" = 1) /obj/item/weapon/reagent_containers/food/snacks/carrotfries/New() ..() - reagents.add_reagent("nutriment", 3) reagents.add_reagent("imidazoline", 3) bitesize = 2 @@ -2010,11 +2095,12 @@ icon_state = "superbiteburger" filling_color = "#CCA26A" center_of_mass = list("x"=16, "y"=3) + nutriment_amt = 25 + nutriment_desc = list("buns" = 25) /obj/item/weapon/reagent_containers/food/snacks/superbiteburger/New() ..() reagents.add_reagent("protein", 25) - reagents.add_reagent("nutriment", 25) bitesize = 10 /obj/item/weapon/reagent_containers/food/snacks/candiedapple @@ -2023,10 +2109,11 @@ icon_state = "candiedapple" filling_color = "#F21873" center_of_mass = list("x"=15, "y"=13) + nutriment_amt = 3 + nutriment_desc = list("apple" = 3, "caramel" = 3, "sweetness" = 2) /obj/item/weapon/reagent_containers/food/snacks/candiedapple/New() ..() - reagents.add_reagent("nutriment", 3) bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/applepie @@ -2035,10 +2122,11 @@ icon_state = "applepie" filling_color = "#E0EDC5" center_of_mass = list("x"=16, "y"=13) + nutriment_amt = 4 + nutriment_desc = list("sweetness" = 2, "apple" = 2, "pie" = 2) /obj/item/weapon/reagent_containers/food/snacks/applepie/New() ..() - reagents.add_reagent("nutriment", 4) bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/cherrypie @@ -2047,10 +2135,11 @@ icon_state = "cherrypie" filling_color = "#FF525A" center_of_mass = list("x"=16, "y"=11) + nutriment_amt = 4 + nutriment_desc = list("sweetness" = 2, "cherry" = 2, "pie" = 2) /obj/item/weapon/reagent_containers/food/snacks/cherrypie/New() ..() - reagents.add_reagent("nutriment", 4) bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/twobread @@ -2059,10 +2148,11 @@ icon_state = "twobread" filling_color = "#DBCC9A" center_of_mass = list("x"=15, "y"=12) + nutriment_amt = 2 + nutriment_desc = list("sourness" = 2, "bread" = 2) /obj/item/weapon/reagent_containers/food/snacks/twobread/New() ..() - reagents.add_reagent("nutriment", 2) bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/jellysandwich @@ -2072,10 +2162,11 @@ trash = /obj/item/trash/plate filling_color = "#9E3A78" center_of_mass = list("x"=16, "y"=8) + nutriment_amt = 2 + nutriment_desc = list("bread" = 2) /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/New() ..() - reagents.add_reagent("nutriment", 2) bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/slime/New() @@ -2115,10 +2206,11 @@ trash = /obj/item/trash/snack_bowl filling_color = "#E386BF" center_of_mass = list("x"=17, "y"=10) + nutriment_amt = 8 + nutriment_desc = list("mushroom" = 8, "milk" = 2) /obj/item/weapon/reagent_containers/food/snacks/mushroomsoup/New() ..() - reagents.add_reagent("nutriment", 8) bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit @@ -2127,6 +2219,8 @@ icon_state = "phelmbiscuit" filling_color = "#CFB4C4" center_of_mass = list("x"=16, "y"=13) + nutriment_amt = 5 + nutriment_desc = list("mushroom" = 4) /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit/New() ..() @@ -2134,7 +2228,6 @@ name = "exceptional plump helmet biscuit" desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!" reagents.add_reagent("nutriment", 8) - reagents.add_reagent("tricordrazine", 5) bitesize = 2 else reagents.add_reagent("nutriment", 5) @@ -2160,11 +2253,12 @@ trash = /obj/item/trash/snack_bowl filling_color = "#FAC9FF" center_of_mass = list("x"=15, "y"=8) + nutriment_amt = 8 + nutriment_desc = list("tomato" = 4, "beet" = 4) /obj/item/weapon/reagent_containers/food/snacks/beetsoup/New() ..() name = pick(list("borsch","bortsch","borstch","borsh","borshch","borscht")) - reagents.add_reagent("nutriment", 8) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/tossedsalad @@ -2174,10 +2268,11 @@ trash = /obj/item/trash/snack_bowl filling_color = "#76B87F" center_of_mass = list("x"=17, "y"=11) + nutriment_amt = 8 + nutriment_desc = list("salad" = 2, "tomato" = 2, "carrot" = 2, "apple" = 2) /obj/item/weapon/reagent_containers/food/snacks/tossedsalad/New() ..() - reagents.add_reagent("nutriment", 8) bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/validsalad @@ -2187,11 +2282,12 @@ trash = /obj/item/trash/snack_bowl filling_color = "#76B87F" center_of_mass = list("x"=17, "y"=11) + nutriment_amt = 6 + nutriment_desc = list("100% real salad") /obj/item/weapon/reagent_containers/food/snacks/validsalad/New() ..() reagents.add_reagent("protein", 2) - reagents.add_reagent("nutriment", 6) bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/appletart @@ -2201,10 +2297,11 @@ trash = /obj/item/trash/plate filling_color = "#FFFF00" center_of_mass = list("x"=16, "y"=18) + nutriment_amt = 8 + nutriment_desc = list("apple" = 8) /obj/item/weapon/reagent_containers/food/snacks/appletart/New() ..() - reagents.add_reagent("nutriment", 8) reagents.add_reagent("gold", 5) bitesize = 3 @@ -2224,11 +2321,12 @@ slices_num = 5 filling_color = "#FF7575" center_of_mass = list("x"=16, "y"=9) + nutriment_amt = 10 + nutriment_desc = list("bread" = 10) /obj/item/weapon/reagent_containers/food/snacks/sliceable/meatbread/New() ..() reagents.add_reagent("protein", 20) - reagents.add_reagent("nutriment", 10) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice @@ -2254,11 +2352,12 @@ slices_num = 5 filling_color = "#8AFF75" center_of_mass = list("x"=16, "y"=9) + nutriment_amt = 10 + nutriment_desc = list("bread" = 10) /obj/item/weapon/reagent_containers/food/snacks/sliceable/xenomeatbread/New() ..() reagents.add_reagent("protein", 20) - reagents.add_reagent("nutriment", 10) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/xenomeatbreadslice @@ -2284,11 +2383,12 @@ slices_num = 5 filling_color = "#EDE5AD" center_of_mass = list("x"=16, "y"=9) + nutriment_amt = 10 + nutriment_desc = list("bread" = 10) /obj/item/weapon/reagent_containers/food/snacks/sliceable/bananabread/New() ..() reagents.add_reagent("banana", 20) - reagents.add_reagent("nutriment", 20) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/bananabreadslice @@ -2314,6 +2414,8 @@ slices_num = 5 filling_color = "#F7FFE0" center_of_mass = list("x"=16, "y"=9) + nutriment_amt = 30 + nutriment_desc = list("bread" = 15, "tofu" = 15) /obj/item/weapon/reagent_containers/food/snacks/sliceable/tofubread/New() ..() @@ -2343,10 +2445,11 @@ slices_num = 5 filling_color = "#FFD675" center_of_mass = list("x"=16, "y"=10) + nutriment_amt = 25 + nutriment_desc = list("cake" = 10, "sweetness" = 10, "carrot" = 15) /obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake/New() ..() - reagents.add_reagent("nutriment", 25) reagents.add_reagent("imidazoline", 10) bitesize = 2 @@ -2373,11 +2476,12 @@ slices_num = 5 filling_color = "#E6AEDB" center_of_mass = list("x"=16, "y"=10) + nutriment_amt = 5 + nutriment_desc = list("cake" = 10, "sweetness" = 10, "slime" = 15) /obj/item/weapon/reagent_containers/food/snacks/sliceable/braincake/New() ..() reagents.add_reagent("protein", 25) - reagents.add_reagent("nutriment", 5) reagents.add_reagent("alkysine", 10) bitesize = 2 @@ -2405,11 +2509,12 @@ slices_num = 5 filling_color = "#FAF7AF" center_of_mass = list("x"=16, "y"=10) + nutriment_amt = 10 + nutriment_desc = list("cake" = 10, "cream" = 10, "cheese" = 15) /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake/New() ..() reagents.add_reagent("protein", 15) - reagents.add_reagent("nutriment", 10) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice @@ -2435,10 +2540,11 @@ slices_num = 5 filling_color = "#F7EDD5" center_of_mass = list("x"=16, "y"=10) + nutriment_amt = 20 + nutriment_desc = list("cake" = 10, "sweetness" = 10, "vanilla" = 15) /obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake/New() ..() - reagents.add_reagent("nutriment", 20) /obj/item/weapon/reagent_containers/food/snacks/plaincakeslice name = "Vanilla Cake slice" @@ -2462,10 +2568,11 @@ slices_num = 5 filling_color = "#FADA8E" center_of_mass = list("x"=16, "y"=10) + nutriment_amt = 20 + nutriment_desc = list("cake" = 10, "sweetness" = 10, "orange" = 15) /obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake/New() ..() - reagents.add_reagent("nutriment", 20) /obj/item/weapon/reagent_containers/food/snacks/orangecakeslice name = "Orange Cake slice" @@ -2489,6 +2596,8 @@ slices_num = 5 filling_color = "#CBFA8E" center_of_mass = list("x"=16, "y"=10) + nutriment_amt = 20 + nutriment_desc = list("cake" = 10, "sweetness" = 10, "lime" = 15) /obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake/New() ..() @@ -2516,10 +2625,11 @@ slices_num = 5 filling_color = "#FAFA8E" center_of_mass = list("x"=16, "y"=10) + nutriment_amt = 20 + nutriment_desc = list("cake" = 10, "sweetness" = 10, "lemon" = 15) /obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake/New() ..() - reagents.add_reagent("nutriment", 20) /obj/item/weapon/reagent_containers/food/snacks/lemoncakeslice name = "Lemon Cake slice" @@ -2543,10 +2653,11 @@ slices_num = 5 filling_color = "#805930" center_of_mass = list("x"=16, "y"=10) + nutriment_amt = 20 + nutriment_desc = list("cake" = 10, "sweetness" = 10, "chocolate" = 15) /obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake/New() ..() - reagents.add_reagent("nutriment", 20) /obj/item/weapon/reagent_containers/food/snacks/chocolatecakeslice name = "Chocolate Cake slice" @@ -2570,10 +2681,12 @@ slices_num = 5 filling_color = "#FFF700" center_of_mass = list("x"=16, "y"=10) + nutriment_amt = 10 + nutriment_desc = list("cheese" = 10) /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel/New() ..() - reagents.add_reagent("protein", 20) + reagents.add_reagent("protein", 10) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/cheesewedge @@ -2592,10 +2705,11 @@ slices_num = 5 filling_color = "#FFD6D6" center_of_mass = list("x"=16, "y"=10) + nutriment_amt = 20 + nutriment_desc = list("cake" = 10, "sweetness" = 10) /obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake/New() ..() - reagents.add_reagent("nutriment", 20) reagents.add_reagent("sprinkles", 10) bitesize = 3 @@ -2622,10 +2736,11 @@ slices_num = 5 filling_color = "#FFE396" center_of_mass = list("x"=16, "y"=9) + nutriment_amt = 6 + nutriment_desc = list("bread" = 6) /obj/item/weapon/reagent_containers/food/snacks/sliceable/bread/New() ..() - reagents.add_reagent("nutriment", 6) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/breadslice @@ -2651,11 +2766,12 @@ slices_num = 5 filling_color = "#FFF896" center_of_mass = list("x"=16, "y"=9) + nutriment_amt = 5 + nutriment_desc = list("bread" = 6, "cream" = 3, "cheese" = 3) /obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread/New() ..() reagents.add_reagent("protein", 15) - reagents.add_reagent("nutriment", 5) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/creamcheesebreadslice @@ -2694,10 +2810,11 @@ slices_num = 5 filling_color = "#EBF5B8" center_of_mass = list("x"=16, "y"=10) + nutriment_amt = 15 + nutriment_desc = list("cake" = 10, "sweetness" = 10, "apple" = 15) /obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake/New() ..() - reagents.add_reagent("nutriment", 15) /obj/item/weapon/reagent_containers/food/snacks/applecakeslice name = "Apple Cake slice" @@ -2721,10 +2838,11 @@ slices_num = 5 filling_color = "#F5B951" center_of_mass = list("x"=16, "y"=10) + nutriment_amt = 15 + nutriment_desc = list("pie" = 5, "cream" = 5, "pumpkin" = 5) /obj/item/weapon/reagent_containers/food/snacks/sliceable/pumpkinpie/New() ..() - reagents.add_reagent("nutriment", 15) /obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice name = "Pumpkin Pie slice" @@ -2746,10 +2864,11 @@ icon_state = "cracker" filling_color = "#F5DEB8" center_of_mass = list("x"=17, "y"=6) + nutriment_amt = 1 + nutriment_desc = list("salt" = 1, "cracker" = 2) /obj/item/weapon/reagent_containers/food/snacks/cracker/New() ..() - reagents.add_reagent("nutriment", 1) /////////////////////////////////////////////////PIZZA//////////////////////////////////////// @@ -2764,10 +2883,11 @@ slice_path = /obj/item/weapon/reagent_containers/food/snacks/margheritaslice slices_num = 6 center_of_mass = list("x"=16, "y"=11) + nutriment_amt = 35 + nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "cheese" = 15) /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margherita/New() ..() - reagents.add_reagent("nutriment", 35) reagents.add_reagent("protein", 5) reagents.add_reagent("tomatojuice", 6) bitesize = 2 @@ -2794,10 +2914,12 @@ slice_path = /obj/item/weapon/reagent_containers/food/snacks/meatpizzaslice slices_num = 6 center_of_mass = list("x"=16, "y"=11) + nutriment_amt = 10 + nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "cheese" = 15) /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza/New() ..() - reagents.add_reagent("protein", 44) + reagents.add_reagent("protein", 34) reagents.add_reagent("tomatojuice", 6) bitesize = 2 @@ -2822,10 +2944,11 @@ slice_path = /obj/item/weapon/reagent_containers/food/snacks/mushroompizzaslice slices_num = 6 center_of_mass = list("x"=16, "y"=11) + nutriment_amt = 35 + nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "cheese" = 5, "mushroom" = 10) /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushroompizza/New() ..() - reagents.add_reagent("nutriment", 35) reagents.add_reagent("protein", 5) bitesize = 2 @@ -2850,10 +2973,11 @@ slice_path = /obj/item/weapon/reagent_containers/food/snacks/vegetablepizzaslice slices_num = 6 center_of_mass = list("x"=16, "y"=11) + nutriment_amt = 25 + nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "cheese" = 5, "eggplant" = 5, "carrot" = 5, "corn" = 5) /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza/New() ..() - reagents.add_reagent("nutriment", 25) reagents.add_reagent("protein", 5) reagents.add_reagent("tomatojuice", 6) reagents.add_reagent("imidazoline", 12) @@ -3068,10 +3192,11 @@ trash = /obj/item/trash/plate filling_color = "#75754B" center_of_mass = list("x"=16, "y"=7) + nutriment_amt = 6 + nutriment_desc = list("a chorus of flavor" = 6) /obj/item/weapon/reagent_containers/food/snacks/dionaroast/New() ..() - reagents.add_reagent("nutriment", 6) reagents.add_reagent("radium", 2) bitesize = 2 @@ -3085,11 +3210,12 @@ icon_state = "dough" bitesize = 2 center_of_mass = list("x"=16, "y"=13) + nutriment_amt = 3 + nutriment_desc = list("uncooked dough" = 3) /obj/item/weapon/reagent_containers/food/snacks/dough/New() ..() reagents.add_reagent("protein", 1) - reagents.add_reagent("nutriment", 3) // Dough + rolling pin = flat dough /obj/item/weapon/reagent_containers/food/snacks/dough/attackby(obj/item/weapon/W as obj, mob/user as mob) @@ -3122,10 +3248,11 @@ slices_num = 1 bitesize = 2 center_of_mass = list("x"=17, "y"=19) + nutriment_amt = 1 + nutriment_desc = list("uncooked dough" = 1) /obj/item/weapon/reagent_containers/food/snacks/doughslice/New() ..() - reagents.add_reagent("nutriment", 1) /obj/item/weapon/reagent_containers/food/snacks/bun name = "bun" @@ -3134,10 +3261,11 @@ icon_state = "bun" bitesize = 2 center_of_mass = list("x"=16, "y"=12) + nutriment_amt = 4 + nutriment_desc = "bun" /obj/item/weapon/reagent_containers/food/snacks/bun/New() ..() - reagents.add_reagent("nutriment", 4) /obj/item/weapon/reagent_containers/food/snacks/bun/attackby(obj/item/weapon/W as obj, mob/user as mob) // Bun + meatball = burger @@ -3189,10 +3317,11 @@ icon_state = "bunbun" bitesize = 2 center_of_mass = list("x"=16, "y"=8) + nutriment_amt = 8 + nutriment_desc = list("bun" = 8) /obj/item/weapon/reagent_containers/food/snacks/bunbun/New() ..() - reagents.add_reagent("nutriment", 8) /obj/item/weapon/reagent_containers/food/snacks/taco name = "taco" @@ -3200,11 +3329,11 @@ icon_state = "taco" bitesize = 3 center_of_mass = list("x"=21, "y"=12) - + nutriment_amt = 4 + nutriment_desc = list("cheese" = 2,"taco shell" = 2) /obj/item/weapon/reagent_containers/food/snacks/taco/New() ..() reagents.add_reagent("protein", 3) - reagents.add_reagent("nutriment", 4) /obj/item/weapon/reagent_containers/food/snacks/rawcutlet name = "raw cutlet" @@ -3260,10 +3389,11 @@ icon_state = "flatbread" bitesize = 2 center_of_mass = list("x"=16, "y"=16) + nutriment_amt = 3 + nutriment_desc = list("bread" = 3) /obj/item/weapon/reagent_containers/food/snacks/flatbread/New() ..() - reagents.add_reagent("nutriment", 3) // potato + knife = raw sticks /obj/item/weapon/reagent_containers/food/snacks/grown/potato/attackby(obj/item/weapon/W as obj, mob/user as mob) @@ -3281,10 +3411,11 @@ icon_state = "rawsticks" bitesize = 2 center_of_mass = list("x"=16, "y"=12) + nutriment_amt = 3 + nutriment_desc = list("raw potato" = 3) /obj/item/weapon/reagent_containers/food/snacks/rawsticks/New() ..() - reagents.add_reagent("nutriment", 3) /obj/item/weapon/reagent_containers/food/snacks/liquidfood name = "\improper LiquidFood Ration" @@ -3293,10 +3424,11 @@ trash = /obj/item/trash/liquidfood filling_color = "#A8A8A8" center_of_mass = list("x"=16, "y"=15) + nutriment_amt = 20 + nutriment_desc = list("chalk" = 6) /obj/item/weapon/reagent_containers/food/snacks/liquidfood/New() ..() - reagents.add_reagent("nutriment", 20) reagents.add_reagent("iron", 3) bitesize = 4 @@ -3307,10 +3439,11 @@ trash = /obj/item/trash/tastybread filling_color = "#A66829" center_of_mass = list("x"=17, "y"=16) + nutriment_amt = 6 + nutriment_desc = list("bread" = 2, "sweetness" = 3) /obj/item/weapon/reagent_containers/food/snacks/tastybread/New() ..() - reagents.add_reagent("nutriment", 6) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks @@ -3319,8 +3452,9 @@ icon_state = "skrellsnacks" filling_color = "#A66829" center_of_mass = list("x"=15, "y"=12) + nutriment_amt = 10 + nutriment_desc = list("mushroom" = 5, "salt" = 5) /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks/New() ..() - reagents.add_reagent("nutriment", 10) bitesize = 3 diff --git a/polaris.dme b/polaris.dme index 00fea66294a..976f1e57170 100644 --- a/polaris.dme +++ b/polaris.dme @@ -1519,6 +1519,7 @@ #include "code\modules\mob\living\carbon\give.dm" #include "code\modules\mob\living\carbon\resist.dm" #include "code\modules\mob\living\carbon\shock.dm" +#include "code\modules\mob\living\carbon\taste.dm" #include "code\modules\mob\living\carbon\viruses.dm" #include "code\modules\mob\living\carbon\alien\alien.dm" #include "code\modules\mob\living\carbon\alien\alien_attacks.dm" From 701695ba072677bd25f2660eea5cb8cdc0be35a7 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sat, 28 Jan 2017 20:57:54 -0600 Subject: [PATCH 2/2] Changes two taste descriptions --- .../Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index d2111f5c214..5cff9231a1f 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -57,7 +57,7 @@ /datum/reagent/nutriment/protein // Bad for Skrell! name = "animal protein" id = "protein" - taste_description = "some sort of protein" + taste_description = "some sort of meat" color = "#440000" /datum/reagent/nutriment/protein/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) @@ -1350,7 +1350,7 @@ name = "Thirteen Loko" id = "thirteenloko" description = "A potent mixture of caffeine and alcohol." - taste_description = "paint thinner" + taste_description = "battery acid" color = "#102000" strength = 25 nutriment_factor = 1