diff --git a/code/__DEFINES/mob_defines.dm b/code/__DEFINES/mob_defines.dm index 6327218322d..1fbb07ce255 100644 --- a/code/__DEFINES/mob_defines.dm +++ b/code/__DEFINES/mob_defines.dm @@ -111,6 +111,13 @@ #define TASTE_SENSITIVITY_DULL 25 #define TASTE_SENSITIVITY_NO_TASTE 101 +// Taste category - determines what types of reagents mob can taste +// Reagents they can't taste will produce "yucky" or "indescribable" message by default +#define TASTE_CATEGORY_NONE 0 +#define TASTE_CATEGORY_ORGANIC 1 +#define TASTE_CATEGORY_SYNTHETIC 2 +#define TASTE_CATEGORY_BOTH TASTE_CATEGORY_ORGANIC | TASTE_CATEGORY_SYNTHETIC + // Reagent type flags, defines the types of mobs this reagent will affect #define ORGANIC 1 #define SYNTHETIC 2 diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm index 6ee74466546..c626f283ab0 100644 --- a/code/modules/mob/living/carbon/human/species/_species.dm +++ b/code/modules/mob/living/carbon/human/species/_species.dm @@ -46,8 +46,9 @@ var/body_temperature = 310.15 //non-IS_SYNTHETIC species will try to stabilize at this temperature. (also affects temperature processing) var/reagent_tag //Used for metabolizing reagents. - var/hunger_drain = HUNGER_FACTOR - var/taste_sensitivity = TASTE_SENSITIVITY_NORMAL //the most widely used factor; humans use a different one + var/hunger_drain = HUNGER_FACTOR // the most widely used factor; humans use a different one + var/taste_sensitivity = TASTE_SENSITIVITY_NORMAL + var/taste_category = TASTE_CATEGORY_ORGANIC // what kinds of taste messages will they get? var/hunger_icon = 'icons/mob/screen_hunger.dmi' var/siemens_coeff = 1 //base electrocution coefficient diff --git a/code/modules/mob/living/carbon/human/species/machine.dm b/code/modules/mob/living/carbon/human/species/machine.dm index 2fccd4c261c..54e78c37dbc 100644 --- a/code/modules/mob/living/carbon/human/species/machine.dm +++ b/code/modules/mob/living/carbon/human/species/machine.dm @@ -24,7 +24,7 @@ inherent_biotypes = MOB_ROBOTIC | MOB_HUMANOID clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS bodyflags = HAS_SKIN_COLOR | HAS_HEAD_MARKINGS | HAS_HEAD_ACCESSORY | ALL_RPARTS | SHAVED - taste_sensitivity = TASTE_SENSITIVITY_NO_TASTE + taste_category = TASTE_CATEGORY_SYNTHETIC blood_color = COLOR_BLOOD_MACHINE flesh_color = "#AAAAAA" diff --git a/code/modules/mob/living/carbon/human/species/vox.dm b/code/modules/mob/living/carbon/human/species/vox.dm index 25ccb6caff5..9c1745c064a 100644 --- a/code/modules/mob/living/carbon/human/species/vox.dm +++ b/code/modules/mob/living/carbon/human/species/vox.dm @@ -34,6 +34,7 @@ butt_sprite = "vox" reagent_tag = PROCESS_ORG | PROCESS_SYN + taste_category = TASTE_CATEGORY_BOTH scream_verb = "shrieks" male_scream_sound = 'sound/voice/shriek1.ogg' female_scream_sound = 'sound/voice/shriek1.ogg' diff --git a/code/modules/mob/living/taste.dm b/code/modules/mob/living/taste.dm index 8e896f898b3..1a903dc06e8 100644 --- a/code/modules/mob/living/taste.dm +++ b/code/modules/mob/living/taste.dm @@ -2,18 +2,27 @@ return TASTE_SENSITIVITY_NORMAL /mob/living/carbon/human/get_taste_sensitivity() - if(HAS_TRAIT(src, TRAIT_IPC_CAN_EAT)) - return TASTE_SENSITIVITY_NORMAL - else if(dna.species) + if(dna.species) return dna.species.taste_sensitivity - else - return TASTE_SENSITIVITY_NORMAL + return ..() + +/mob/living/proc/get_taste_category() + return TASTE_CATEGORY_ORGANIC + +/mob/living/silicon/get_taste_category() + return TASTE_CATEGORY_SYNTHETIC + +/mob/living/carbon/human/get_taste_category() + if(HAS_TRAIT(src, TRAIT_IPC_CAN_EAT)) + return TASTE_CATEGORY_BOTH + if(dna.species) + return dna.species.taste_category + return ..() // non destructively tastes a reagent container /mob/living/proc/taste(datum/reagents/from) if(last_taste_time + 50 < world.time) - var/taste_sensitivity = get_taste_sensitivity() - var/text_output = from.generate_taste_message(taste_sensitivity) + var/text_output = from.generate_taste_message(get_taste_sensitivity(), get_taste_category()) // We dont want to spam the same message over and over again at the // person. Give it a bit of a buffer. if(AmountHallucinate() > 50 SECONDS && prob(25)) diff --git a/code/modules/reagents/chemistry/reagents/admin_reagents.dm b/code/modules/reagents/chemistry/reagents/admin_reagents.dm index 8a01dcc9ff8..4450418112f 100644 --- a/code/modules/reagents/chemistry/reagents/admin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/admin_reagents.dm @@ -7,6 +7,7 @@ color = "#600694" process_flags = ORGANIC | SYNTHETIC //Adminbuse knows no bounds! taste_description = "admin abuse" + taste_flag = ORGANIC | SYNTHETIC /datum/reagent/medicine/adminordrazine/on_mob_life(mob/living/carbon/M) M.setCloneLoss(0, FALSE) diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm index 5c8d39fdd2a..974866c47a6 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol.dm @@ -9,6 +9,7 @@ var/dizzy_adj = 6 SECONDS var/alcohol_perc = 1 //percentage of ethanol in a beverage 0.0 - 1.0 taste_description = "liquid fire" + yuck_description = "the assembly line" goal_department = "Bar" /datum/reagent/consumable/ethanol/on_mob_life(mob/living/M) @@ -58,6 +59,7 @@ drink_name = "Cider" drink_desc = "A refreshing glass of traditional cider." taste_description = "cider" + yuck_description = "stickiness in your tubes" /datum/reagent/consumable/ethanol/whiskey name = "Whiskey" @@ -124,6 +126,7 @@ drink_name = "Hooch" drink_desc = "You've really hit rock bottom now... your liver packed its bags and left last night." taste_description = "pure resignation" + yuck_description = "off-brand assembly fluid" goal_difficulty = REAGENT_GOAL_NORMAL /datum/reagent/consumable/ethanol/hooch/on_mob_life(mob/living/carbon/M) @@ -144,6 +147,7 @@ drink_name = "Glass of Rum" drink_desc = "Now you want to Pray for a pirate suit, don't you?" taste_description = "rum" + yuck_description = "stickiness in your tubes" allowed_overdose_process = TRUE /datum/reagent/consumable/ethanol/rum/overdose_process(mob/living/M, severity) @@ -194,6 +198,7 @@ drink_icon = "tequilaglass" drink_name = "Glass of Tequila" drink_desc = "Now all that's missing is the weird colored shades!" + yuck_description = "stickiness in your tubes" taste_description = "tequila" /datum/reagent/consumable/ethanol/vermouth @@ -217,6 +222,7 @@ drink_icon = "wineglass" drink_name = "Glass of wine" drink_desc = "A very classy looking drink." + yuck_description = "stickiness in your tubes" taste_description = "wine" /datum/reagent/consumable/ethanol/cognac @@ -230,6 +236,7 @@ drink_name = "Glass of cognac" drink_desc = "Damn, you feel like some kind of French aristocrat just by holding this." taste_description = "cognac" + yuck_description = "stickiness in your tubes" /// otherwise known as "I want to get so smashed my liver gives out and I die from alcohol poisoning". /datum/reagent/consumable/ethanol/suicider @@ -242,6 +249,7 @@ drink_name = "Suicider" drink_desc = "You've really hit rock bottom now... your liver packed its bags and left last night." taste_description = "approaching death" + yuck_description = "acidic stickiness in your tubes" goal_difficulty = REAGENT_GOAL_NORMAL /datum/reagent/consumable/ethanol/ale @@ -254,6 +262,7 @@ drink_name = "Ale glass" drink_desc = "A freezing pint of delicious Ale." taste_description = "ale" + yuck_description = "diluted assembly fluid" /datum/reagent/consumable/ethanol/thirteenloko name = "Thirteen Loko" @@ -290,6 +299,7 @@ drink_name = "Glass of bilk" drink_desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis." taste_description = "bilk" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/atomicbomb @@ -302,6 +312,7 @@ drink_name = "Atomic Bomb" drink_desc = "Nanotrasen cannot take legal responsibility for your actions after imbibing." taste_description = "a long, fiery burn" + yuck_description = "ignition fluid" goal_difficulty = REAGENT_GOAL_HARD /datum/reagent/consumable/ethanol/threemileisland @@ -314,6 +325,7 @@ drink_name = "Three Mile Island Ice Tea" drink_desc = "A glass of this is sure to prevent a meltdown." taste_description = "a creeping heat" + yuck_description = "ignition fluid" goal_difficulty = REAGENT_GOAL_HARD /datum/reagent/consumable/ethanol/goldschlager @@ -360,6 +372,7 @@ drink_name = "Cuba Libre" drink_desc = "A classic mix of rum and cola." taste_description = "liberation" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/whiskey_cola @@ -372,6 +385,7 @@ drink_name = "Whiskey Cola" drink_desc = "An innocent-looking mixture of cola and Whiskey. Delicious." taste_description = "whiskey and coke" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/daiquiri @@ -384,6 +398,7 @@ drink_name = "Daiquiri" drink_desc = "When Botany gives you limes, make daiquiris." taste_description = "sweetened lime juice and rum" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/martini @@ -420,6 +435,7 @@ drink_name = "White Russian" drink_desc = "A very nice looking drink. But that's just, like, your opinion, man." taste_description = "very creamy alcohol" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/screwdrivercocktail @@ -432,6 +448,7 @@ drink_name = "Screwdriver" drink_desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer." taste_description = "a naughty secret" + yuck_description = "acidic stickiness in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/booger @@ -444,6 +461,7 @@ drink_name = "Booger" drink_desc = "Eww..." taste_description = "a fruity mess" + yuck_description = "acidic stickiness in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/bloody_mary @@ -456,6 +474,7 @@ drink_name = "Bloody Mary" drink_desc = "Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder." taste_description = "tomatoes with booze" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/gargle_blaster @@ -468,6 +487,7 @@ drink_name = "Pan-Galactic Gargle Blaster" drink_desc = "Does... does this mean that Arthur and Ford are on the station? Oh joy." taste_description = "the number fourty two" + yuck_description = "premium off-brand assembly fluid" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/flaming_homer @@ -480,6 +500,7 @@ drink_name = "Flaming Moe" drink_desc = "Happiness is just a Flaming Moe away!" taste_description = "caramelised booze and sweet, salty medicine" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_NORMAL /datum/reagent/consumable/ethanol/brave_bull @@ -491,6 +512,7 @@ drink_icon = "bravebullglass" drink_name = "Brave Bull" drink_desc = "Tequila and Coffee liquor, brought together in a mouthwatering mixture. Drink up." + yuck_description = "stickiness in your tubes" taste_description = "sweet alcohol" /datum/reagent/consumable/ethanol/tequila_sunrise @@ -503,6 +525,7 @@ drink_name = "Tequila Sunrise" drink_desc = "Oh great, now you feel nostalgic about sunrises back on Terra..." taste_description = "fruity alcohol" + yuck_description = "acidic stickiness in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/toxins_special @@ -515,6 +538,7 @@ drink_name = "Toxins Special" drink_desc = "Whoah, this thing is on FIRE!" taste_description = "FIRE" + yuck_description = "potent ignition fluid" goal_difficulty = REAGENT_GOAL_NORMAL /datum/reagent/consumable/ethanol/toxins_special/on_mob_life(mob/living/M) @@ -530,8 +554,9 @@ alcohol_perc = 0.5 drink_icon = "beepskysmashglass" drink_name = "Beepsky Smash" - drink_desc = "Heavy, hot and strong. Just like the Iron fist of the LAW." + drink_desc = "Heavy, hot and strong. Just like the Iron fist of THE LAW." taste_description = "THE LAW" + yuck_description = "an affront to THE LAW" goal_difficulty = REAGENT_GOAL_NORMAL /datum/reagent/consumable/ethanol/irish_cream @@ -544,6 +569,7 @@ drink_name = "Irish Cream" drink_desc = "It's cream, mixed with whiskey. What else would you expect from the Irish?" taste_description = "creamy alcohol" + yuck_description = "stickiness in your tubes" /datum/reagent/consumable/ethanol/manly_dorf name = "The Manly Dorf" @@ -567,6 +593,7 @@ drink_name = "Long Island Iced Tea" drink_desc = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only." taste_description = "fruity alcohol" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/moonshine @@ -579,6 +606,7 @@ drink_name = "Moonshine" drink_desc = "You've really hit rock bottom now... your liver packed its bags and left last night." taste_description = "prohibition" + yuck_description = "expired assembly fluid scraped from the bottom of the drum" goal_difficulty = REAGENT_GOAL_NORMAL /datum/reagent/consumable/ethanol/b52 @@ -591,6 +619,7 @@ drink_name = "B-52" drink_desc = "Kahlua, Irish Cream, and congac. You will get bombed." taste_description = "destruction" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/irishcoffee @@ -603,6 +632,7 @@ drink_name = "Irish Coffee" drink_desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning." taste_description = "coffee and booze" + yuck_description = "subtle grit in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/margarita @@ -615,6 +645,7 @@ drink_name = "Margarita" drink_desc = "On the rocks with salt on the rim. Arriba~!" taste_description = "daisies" + yuck_description = "grit in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/black_russian @@ -627,6 +658,7 @@ drink_name = "Black Russian" drink_desc = "For the lactose-intolerant. Still as classy as a White Russian." taste_description = "sweet alcohol" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/manhattan @@ -662,6 +694,7 @@ drink_name = "Whiskey Soda" drink_desc = "Ultimate refreshment." taste_description = "mediocrity" + yuck_description = "flattening fizz" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/antifreeze @@ -674,6 +707,7 @@ drink_name = "Anti-freeze" drink_desc = "The ultimate refreshment." taste_description = "poor life choices" + yuck_description = "cold stickiness in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/antifreeze/on_mob_life(mob/living/M) @@ -692,6 +726,7 @@ drink_name = "Admin Freeze" drink_desc = "The ultimate punishment." taste_description = "a series of bad decisions" + yuck_description = "laws you didn't know you had" goal_difficulty = REAGENT_GOAL_HARD /datum/reagent/consumable/ethanol/adminfreeze/reaction_mob(mob/living/M, method = REAGENT_INGEST, volume) @@ -710,6 +745,7 @@ drink_name = "Barefoot" drink_desc = "Barefoot and pregnant." taste_description = "pregnancy" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/snowwhite @@ -722,6 +758,7 @@ drink_name = "Snow White" drink_desc = "A cold refreshment." taste_description = "a poisoned apple" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/demonsblood @@ -735,6 +772,7 @@ drink_name = "Demons Blood" drink_desc = "Just looking at this thing makes the hair at the back of your neck stand up." taste_description = SPAN_WARNING("evil") + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_HARD /datum/reagent/consumable/ethanol/vodkatonic @@ -748,6 +786,7 @@ drink_name = "Vodka and Tonic" drink_desc = "For when a gin and tonic isn't russian enough." taste_description = "bitter medicine" + yuck_description = "off-brand assembly fluid" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/ginfizz @@ -761,6 +800,7 @@ drink_name = "Gin Fizz" drink_desc = "Refreshingly lemony, deliciously dry." taste_description = "fizzy alcohol" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/bahama_mama @@ -773,6 +813,7 @@ drink_name = "Bahama Mama" drink_desc = "Tropic cocktail." taste_description = "HONK" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/singulo @@ -786,6 +827,7 @@ drink_name = "Singulo" drink_desc = "The edge of eternity, contained in a glass." taste_description = "infinity" + yuck_description = "subtle clicking" goal_difficulty = REAGENT_GOAL_NORMAL /datum/reagent/consumable/ethanol/sbiten @@ -798,6 +840,7 @@ drink_name = "Sbiten" drink_desc = "A spicy mix of Vodka and Spice. Very hot." taste_description = "comforting warmth" + yuck_description = "subpar assembly fluid" goal_difficulty = REAGENT_GOAL_NORMAL /datum/reagent/consumable/ethanol/sbiten/on_mob_life(mob/living/M) @@ -815,6 +858,7 @@ drink_name = "Devils Kiss" drink_desc = "Creepy time!" taste_description = "naughtiness" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/red_mead @@ -827,6 +871,7 @@ drink_name = "Red Mead" drink_desc = "A True Vikings Beverage, though its color is strange." taste_description = "blood" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_HARD /datum/reagent/consumable/ethanol/mead @@ -840,6 +885,7 @@ drink_name = "Mead" drink_desc = "A Vikings Beverage, though a cheap one." taste_description = "honey" + yuck_description = "stickiness in your tubes" /datum/reagent/consumable/ethanol/iced_beer name = "Iced Beer" @@ -851,6 +897,7 @@ drink_name = "Iced Beer" drink_desc = "A beer so frosty, the air around it freezes." taste_description = "cold beer" + yuck_description = "cold assembly fluid" /datum/reagent/consumable/ethanol/iced_beer/on_mob_life(mob/living/M) if(M.bodytemperature > 270) @@ -867,6 +914,7 @@ drink_name = "Grog" drink_desc = "A fine and cepa drink for Space." taste_description = "strongly diluted rum" + yuck_description = "film on your processors" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/aloe @@ -879,6 +927,7 @@ drink_name = "Aloe" drink_desc = "Very, very, very good." taste_description = "healthy skin" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/andalusia @@ -891,6 +940,7 @@ drink_name = "Andalusia" drink_desc = "A nice, strange named drink." taste_description = "sweet alcohol" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/alliescocktail @@ -915,6 +965,7 @@ drink_name = "Acid Spit" drink_desc = "A drink from Nanotrasen. Made from live aliens." taste_description = "PAIN" + yuck_description = "disassembly fluid" goal_difficulty = REAGENT_GOAL_NORMAL /datum/reagent/consumable/ethanol/amasec @@ -927,6 +978,7 @@ drink_name = "Amasec" drink_desc = "Always handy before COMBAT!!!" taste_description = "a stunbaton" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_NORMAL /datum/reagent/consumable/ethanol/neurotoxin @@ -941,6 +993,7 @@ drink_name = "Neurotoxin" drink_desc = "A drink that is guaranteed to knock you silly." taste_description = "brain damageeeEEeee" + yuck_description = "aftermarket assembly fluid" goal_difficulty = REAGENT_GOAL_NORMAL /datum/reagent/consumable/ethanol/neurotoxin/on_mob_life(mob/living/M) @@ -963,6 +1016,7 @@ drink_name = "Hippie's Delight" drink_desc = "A drink enjoyed by people during the 1960's." taste_description = "colors" + yuck_description = "film in your tubes" goal_difficulty = REAGENT_GOAL_HARD /datum/reagent/consumable/ethanol/hippies_delight/on_mob_life(mob/living/M) @@ -1001,6 +1055,7 @@ drink_name = "Changeling Sting" drink_desc = "A stingy drink." taste_description = "a tiny prick" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/dublindrop @@ -1014,6 +1069,7 @@ drink_name = "Dublin Drop" drink_desc = "A Dublin drop. Pub legends say one of the ingredients can bring back the dead." taste_description = "a belt in the gob" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/syndicatebomb @@ -1026,6 +1082,7 @@ drink_name = "Syndicate Bomb" drink_desc = "A syndicate bomb." taste_description = "a job offer" + yuck_description = "empty promises" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/erikasurprise @@ -1038,6 +1095,7 @@ drink_name = "Erika Surprise" drink_desc = "The surprise is, it's green!" taste_description = "disappointment" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/driestmartini @@ -1052,6 +1110,7 @@ drink_name = "Driest Martini" drink_desc = "Only for the experienced. You think you see sand floating in the glass." taste_description = "dust and ashes" + yuck_description = "grit in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/driestmartini/on_mob_life(mob/living/M) @@ -1069,6 +1128,7 @@ drink_name = "Glass of RR coffee Liquor" drink_desc = "DAMN, THIS THING LOOKS ROBUST!" taste_description = "coffee and alcohol" + yuck_description = "grit in your tubes" /datum/reagent/consumable/ethanol/kahlua/on_mob_life(mob/living/M) M.AdjustDizzy(-10 SECONDS) @@ -1087,6 +1147,7 @@ drink_name = "Gin and Sonic" drink_desc = "An extremely high amperage drink. Absolutely not for the true Englishman." taste_description = "SPEED" + yuck_description = "grit in your tubes" goal_difficulty = REAGENT_GOAL_HARD /datum/reagent/ginsonic/on_mob_life(mob/living/M) @@ -1116,6 +1177,7 @@ drink_name = "Glass of applejack" drink_desc = "When cider isn't strong enough, you gotta jack it." taste_description = "strong cider" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_NORMAL /datum/reagent/consumable/ethanol/jackrose @@ -1128,6 +1190,7 @@ drink_name = "Jack Rose" drink_desc = "Drinking this makes you feel like you belong in a luxury hotel bar during the 1920s." taste_description = "style" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_NORMAL /datum/reagent/consumable/ethanol/drunkenblumpkin @@ -1140,6 +1203,7 @@ drink_name = "Drunken Blumpkin" drink_desc = "A drink for the drunks." taste_description = "weirdness" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_NORMAL /datum/reagent/consumable/ethanol/eggnog @@ -1153,6 +1217,7 @@ drink_name = "Eggnog" drink_desc = "For enjoying the most wonderful time of the year." taste_description = "christmas spirit" + yuck_description = "slime in your gears" goal_difficulty = REAGENT_GOAL_HARD /// inaccessible to players, but here for admin shennanigans @@ -1162,6 +1227,7 @@ description = "Possessing this stuff probably breaks the Geneva convention." color = "#DC0000" taste_description = SPAN_USERDANGER("LIQUID FUCKING DEATH OH GOD WHAT THE FUCK") + yuck_description = "concentrated ignition fluid" /datum/reagent/consumable/ethanol/dragons_breath/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume) if(method == REAGENT_INGEST && prob(20)) @@ -1209,6 +1275,7 @@ drink_name = "Glass of GFS" drink_desc = "Gin, fernet, shrub. Simple, sour, and sweet." taste_description = "sweetness tempered by earthy beets" + yuck_description = "sticky grit in your tubes" goal_difficulty = REAGENT_GOAL_HARD /datum/reagent/consumable/ethanol/shrub_julep @@ -1221,6 +1288,7 @@ drink_name = "Glass of Shrub Julep" drink_desc = "A bit spicy. Incredibly refreshing." taste_description = "chilly mint and earthy beets" + yuck_description = "sticky grit in your tubes" goal_difficulty = REAGENT_GOAL_HARD // ROBOT ALCOHOL PAST THIS POINT @@ -1236,7 +1304,9 @@ drink_icon = "synthanolglass" drink_name = "Glass of Synthanol" drink_desc = "The equivalent of alcohol for synthetic crewmembers. They'd find it awful if they had tastebuds too." - taste_description = "motor oil" + taste_description = "dulling processors" + yuck_description = "motor oil" + taste_flag = SYNTHETIC /datum/reagent/consumable/ethanol/synthanol/on_mob_life(mob/living/M) metabolization_rate = REAGENTS_METABOLISM @@ -1264,6 +1334,7 @@ drink_name = "Glass of Robot Tears" drink_desc = "No robots were hurt in the making of this drink." taste_description = "existential angst" + yuck_description = "fizzy motor oil" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/synthanol/trinary @@ -1276,6 +1347,7 @@ drink_name = "Glass of Trinary" drink_desc = "Colorful drink made for synthetic crewmembers. It doesn't seem like it would taste well." taste_description = "modem static" + yuck_description = "orange nail polish remover" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/synthanol/servo @@ -1287,7 +1359,8 @@ drink_icon = "servoglass" drink_name = "Glass of Servo" drink_desc = "Chocolate - based drink made for IPCs. Not sure if anyone's actually tried out the recipe." - taste_description = "motor oil and cocoa" + taste_description = "motor oil and fine grit" + yuck_description = "chocolate-coated colon failure" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/synthanol/uplink @@ -1300,6 +1373,7 @@ drink_name = "Glass of Uplink" drink_desc = "An exquisite mix of the finest liquoirs and synthanol. Meant only for synthetics." taste_description = "a GUI in visual basic" + yuck_description = "liquid coolant and regret" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/synthanol/synthnsoda @@ -1311,7 +1385,8 @@ drink_icon = "synthnsodaglass" drink_name = "Glass of Synth 'n Soda" drink_desc = "Classic drink altered to fit the tastes of a robot. Bad idea to drink if you're made of carbon." - taste_description = "fizzy motor oil" + taste_description = "a shiver through your stack" + yuck_description = "fizzy motor oil" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/synthanol/synthignon @@ -1323,7 +1398,8 @@ drink_icon = "synthignonglass" drink_name = "Glass of Synthignon" drink_desc = "Someone mixed good wine and robot booze. Romantic, but atrocious." - taste_description = "fancy motor oil" + taste_description = "smoothly coated joints" + yuck_description = "diluted motor oil" /datum/reagent/consumable/ethanol/synthanol/gear_grinder name = "Gear Grinder" @@ -1334,7 +1410,8 @@ drink_icon = "gear_grinder_glass" drink_name = "Glass of Gear Grinder" drink_desc = "Someone mixed good wine and robot booze. Romantic, but atrocious." - taste_description = "vingear and regret" + taste_description = "grit halting your gears and clogging your servos" + yuck_description = "vinegar and regret" COOLDOWN_DECLARE(drink_message_cooldown) goal_difficulty = REAGENT_GOAL_HARD @@ -1358,6 +1435,7 @@ drink_name = "Glass of Runtime" drink_desc = "Looks like there was some kind of error while mixing this drink." taste_description = "something only half-describable" + yuck_description = "sickly sweetness" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/synthanol/runtime/on_mob_life(mob/living/M) @@ -1375,6 +1453,7 @@ drink_name = "Glass of Stack Trace" drink_desc = "A glistering green beverage, best of both its components." taste_description = "sweet, sweet progress" + yuck_description = "sickly sweetness" goal_difficulty = REAGENT_GOAL_NORMAL /datum/reagent/consumable/ethanol/synthanol/csv @@ -1387,6 +1466,7 @@ drink_name = "Glass of CSV" drink_desc = "Cognac, synthanol, vodka. Sadly, the comma can't separate the literal fluids." taste_description = "late-night spreadsheets" + yuck_description = "a cocktail scraped off the floor of the finest machine shop" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/synthanol/hard_reset @@ -1399,6 +1479,7 @@ drink_name = "Glass of Hard Reset" drink_desc = "Have you tried unplugging it and plugging it back in?" taste_description = "a full stop" + yuck_description = "undiluted emetic" COOLDOWN_DECLARE(reboot_cooldown) goal_difficulty = REAGENT_GOAL_HARD @@ -1495,6 +1576,7 @@ drink_name = "Glass of Burnout" drink_desc = "Perfect, if you want a drink that really burns." taste_description = "white-hot metal" + yuck_description = "a new hole in your stomach" goal_difficulty = REAGENT_GOAL_NORMAL /datum/reagent/consumable/ethanol/synthanol/burnout/on_mob_life(mob/living/M) @@ -1518,6 +1600,7 @@ drink_name = "Glass of Dryer Martini" drink_desc = "No matter how much you fill it, only a short paste remains in the bottom of the glass." taste_description = "synthanolic paste" + yuck_description = "dried thermal paste" COOLDOWN_DECLARE(drink_message_cooldown) goal_difficulty = REAGENT_GOAL_NORMAL @@ -1540,6 +1623,7 @@ color = "#FFFFFF" alcohol_perc = 0.35 taste_description = "bad coding" + yuck_description = "stickiness in your tubes" var/list/names = list("null fruit" = 1) //Names of the fruits used. Associative list where name is key, value is the percentage of that fruit. var/list/tastes = list("bad coding" = 1) //List of tastes. See above. @@ -1651,6 +1735,7 @@ drink_name = "Bacchus' Blessing" drink_desc = "You didn't think it was possible for a liquid to be so utterly revolting. Are you sure about this...?" taste_description = "a wall of bricks" + yuck_description = "scoured surfaces" /datum/reagent/consumable/ethanol/fernet name = "Fernet" @@ -1662,6 +1747,7 @@ drink_name = "glass of pure fernet" drink_desc = "Why are you drinking this pure?" taste_description = "utter bitterness" + yuck_description = "grit in your tubes" var/remove_nutrition = 2 /datum/reagent/consumable/ethanol/fernet/on_mob_life(mob/living/M) @@ -1688,6 +1774,7 @@ drink_name = "glass of fernet cola" drink_desc = "A sawed-off cola bottle filled with Fernet Cola. You can hear cuarteto music coming from the inside." taste_description = "low class heaven" + yuck_description = "sticky grit in your tubes" remove_nutrition = 1 goal_difficulty = REAGENT_GOAL_EXCESSIVE @@ -1701,6 +1788,7 @@ drink_name = "Gimlet" drink_desc = "There are debates on whether this drink should be half gin and half lime, or three parts gin and one part lime. All you know is, it's alcohol." taste_description = "sharpness" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/sidecar @@ -1713,6 +1801,7 @@ drink_name = "Sidecar" drink_desc = "You can smell the citrus from here!" taste_description = "smooth cognac and tart citrus" + yuck_description = "acidic stickiness in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/whiskey_sour @@ -1725,6 +1814,7 @@ drink_name = "Whiskey Sour" drink_desc = "Lemon and whiskey, with a cute foamy head!" taste_description = "warm whiskey and sweetness" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_HARD /datum/reagent/consumable/ethanol/mint_julep @@ -1737,6 +1827,7 @@ drink_name = "Mint Julep" drink_desc = "A dainty glass of whiskey and mint on the rocks. Perfect for summer!" taste_description = "sweet and cooling mint" + yuck_description = "cold grit in your tubes" goal_difficulty = REAGENT_GOAL_NORMAL /datum/reagent/consumable/ethanol/pina_colada @@ -1749,6 +1840,7 @@ drink_name = "Pina Colada" drink_desc = "After taking a sip, you feel contractually obligated to start singing a certain song of the same name." taste_description = "tart and tropical pineapple" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/bilkshake @@ -1762,6 +1854,7 @@ drink_name = "Bilkshake" drink_desc = "Your mind bubbles and oozes as it tries to comprehend what it's seeing. What the HELL is this?" taste_description = "bilk, cream, and cold tears" + yuck_description = "cold stickiness in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/lager @@ -1784,6 +1877,7 @@ drink_icon = "stoutglass" drink_name = "Stout" drink_desc = "A pitch black beer from Ireland, high in iron content." + yuck_description = "magnetic grit in your tubes" taste_description = "the luck of the Irish" /datum/reagent/consumable/ethanol/stout/on_mob_life(mob/living/M) // Replenishes blood, seeing as there's iron in it @@ -1804,6 +1898,7 @@ drink_name = "Acid Dreams" drink_desc = "Cooked up in a single night by a bored Grey chemist killing time while waiting for a long synthesis to complete, this drink has become the stuff of legands across Mauna-b." taste_description = "acid" + yuck_description = "acidic stickiness in your tubes" goal_difficulty = REAGENT_GOAL_NORMAL /datum/reagent/consumable/ethanol/acid_dreams/on_mob_add(mob/living/M) @@ -1866,6 +1961,7 @@ drink_name = "Ahdomai's Eclipse" drink_desc = "A blizzard in a glass, however that works. Even the most distant of Tajaran will feel a strong connection to their homeworld through this drink." taste_description = "ice" + yuck_description = "falling CPU temperature" var/min_achievable_temp = 250 goal_difficulty = REAGENT_GOAL_NORMAL @@ -1913,6 +2009,7 @@ drink_name = "Feast by the Beach" drink_desc = "A classic Unathi drink. You can spot sand sediment at the bottom of the glass. The drink is hot as hell and more." taste_description = "sand" + yuck_description = "sticky grit in your tubes" goal_difficulty = REAGENT_GOAL_NORMAL var/max_achievable_temp = 360 var/burn_modifier = 0.1 // 10 %. @@ -1963,6 +2060,7 @@ drink_name = "Die Seife" drink_desc = "There is a piece of soap at the bottom of the glass and it is slowly melting." taste_description = "soap" + yuck_description = "slime in your gears" goal_difficulty = REAGENT_GOAL_NORMAL /datum/reagent/consumable/ethanol/die_seife/on_mob_life(mob/living/M) @@ -2001,6 +2099,7 @@ drink_name = "Diona Smash" drink_desc = "Fake Diona is floating carelessly in the middle of this drink." taste_description = "the crunch" + yuck_description = "denting in your tubes" nutriment_factor = 2 * REAGENTS_METABOLISM goal_difficulty = REAGENT_GOAL_NORMAL var/damage_mod = 4 @@ -2039,6 +2138,7 @@ drink_name = "durkehiet" drink_desc = "A traditional sweet spirit from Kelune dating back to the Vulpkanin's pre-spaceflight era. Even though it was originally concocted as a traditional medicine, it was (and still is) enjoyed recreationally as well." taste_description = "citrusy sweetness, with faint numbing bitter notes" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_HARD /datum/reagent/consumable/ethanol/durkehiet/reaction_mob(mob/living/M, method = REAGENT_INGEST, volume) @@ -2066,6 +2166,7 @@ drink_name = "Islay Whiskey" drink_desc = "Named in honor of one of the most gritty and earth smelling types of Whiskey of Earth, this drink is a treat for any Diona." taste_description = "soil" + yuck_description = "grit in your tubes" goal_difficulty = REAGENT_GOAL_NORMAL /datum/reagent/consumable/ethanol/islay_whiskey/on_mob_life(mob/living/M) @@ -2091,6 +2192,7 @@ drink_name = "Jungle Vox" drink_desc = "Classy drink in a glass vox head with a bit of liquid nitrogen added on. Perfect for purging dust from a Vox's system." taste_description = "bubbles" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_NORMAL /datum/reagent/consumable/ethanol/jungle_vox/on_mob_add(mob/living/M) @@ -2136,6 +2238,7 @@ drink_name = "Slime Mold" drink_desc = "You can swear that this jelly looks alive." taste_description = "jelly" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_HARD /datum/reagent/consumable/ethanol/slime_mold/on_mob_life(mob/living/M) @@ -2162,6 +2265,7 @@ drink_name = "Sontse" drink_desc = "The Sun, in a glass! The radiant energies of this drink will empower any Nian that consumes it." taste_description = "warmth and brightness" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_HARD /// Exists purely because of changelings. I hate them. var/activated = FALSE @@ -2234,6 +2338,7 @@ drink_name = "Ultramatter" drink_desc = "In the triangle of fire, this is the apex of fuel. A sacred drink from Boron 5, it is used in cultural and religious events, and is regularly consumed by leadership of the Plasmamen as a show of status." taste_description = "fire" + yuck_description = "subtle clicking" goal_difficulty = REAGENT_GOAL_HARD var/inflamed = FALSE @@ -2316,7 +2421,8 @@ drink_icon = "michelada" drink_name = "Glass of Michelada" drink_desc = "Spicy beer served in a salt-rimmed glass." - taste_description ="hot pepper and lime" + taste_description = "hot pepper and lime" + yuck_description = "acidic assembly fluid" goal_difficulty = REAGENT_GOAL_NORMAL /datum/reagent/consumable/ethanol/vampiro @@ -2329,6 +2435,7 @@ drink_name = "Glass of Vampiro" drink_desc = "Tequila prepared with tomato juice for a blood-red look." taste_description ="old Mexican spices" + yuck_description = "acidic assembly fluid" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/acapulco_de_noche @@ -2341,6 +2448,7 @@ drink_name = "Glass of Acapulco de Noche" drink_desc = "A flamboyant cocktail that smells like medicine." taste_description ="a citric dance" + yuck_description = "acidic stickiness in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/ethanol/matadora_beer @@ -2354,6 +2462,7 @@ drink_name = "Glass of Matadora Beer" drink_desc = "It smells strangely good despite its hodge-podge appearance." taste_description ="lemonade with strawberry soda and medicinal alcohol" + yuck_description = "acidic gritty clumps in your gears" goal_difficulty = REAGENT_GOAL_HARD /datum/reagent/consumable/ethanol/hanky_panky @@ -2378,6 +2487,7 @@ drink_name = "Glass of Peach Bellini" drink_desc = "A mimosa made with peach purée. Oh la la fancy man." taste_description = "fresh peaches" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_NORMAL /datum/reagent/consumable/ethanol/vampire_bf @@ -2390,5 +2500,6 @@ drink_name = "Glass of Vampire's Best Friend" drink_desc = "A creamy beverage with chunks of garlic inside. Did you steal the chaplain's flask, son?" taste_description ="garlic" + yuck_description = "clumps in your gears" // ----------- END of imports from Hispania! diff --git a/code/modules/reagents/chemistry/reagents/drink_base.dm b/code/modules/reagents/chemistry/reagents/drink_base.dm index c49d1a12dc4..2243d4329a4 100644 --- a/code/modules/reagents/chemistry/reagents/drink_base.dm +++ b/code/modules/reagents/chemistry/reagents/drink_base.dm @@ -5,6 +5,7 @@ reagent_state = LIQUID color = "#E78108" // rgb: 231, 129, 8 taste_description = "something which should not exist" + yuck_description = "stickiness in your tubes" var/adj_dizzy = 0 var/adj_drowsy = 0 var/adj_sleepy = 0 diff --git a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm index 93493cb6cd6..c830c68acb4 100644 --- a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm @@ -82,6 +82,7 @@ drink_name = "Glass of Beet Juice" drink_desc = "Sweet as a 'sugar beet' would imply." taste_description = "beet juice" + yuck_description = "sticky grit in your tubes" /datum/reagent/consumable/drink/plumjuice name = "Plum Juice" @@ -234,6 +235,7 @@ drink_name = "Nothing" drink_desc = "Absolutely nothing." taste_description = "nothing... how?" + yuck_description = "nothing... how?" /datum/reagent/consumable/drink/nothing/on_mob_life(mob/living/carbon/human/M) var/update_flags = STATUS_UPDATE_NONE @@ -333,6 +335,7 @@ drink_name = "Glass of coffee" drink_desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere." taste_description = "coffee" + yuck_description = "grit in your tubes" /datum/reagent/consumable/drink/coffee/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE @@ -354,6 +357,7 @@ drink_name = "Iced Coffee" drink_desc = "A drink to perk you up and refresh you!" taste_description = "refreshingly cold coffee" + yuck_description = "cold grit in your tubes" /datum/reagent/consumable/drink/coffee/soy_latte name = "Soy Latte" @@ -365,6 +369,7 @@ drink_name = "Soy Latte" drink_desc = "A nice and refrshing beverage while you are reading." taste_description = "milkish coffee" + yuck_description = "sticky grit in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/drink/coffee/soy_latte/on_mob_life(mob/living/M) @@ -384,6 +389,7 @@ drink_name = "Cafe Latte" drink_desc = "A nice, strong and refreshing beverage while you are reading." taste_description = "milky coffee" + yuck_description = "sticky grit in your tubes" /datum/reagent/consumable/drink/coffee/cafe_latte/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE @@ -430,6 +436,7 @@ drink_name = "Glass of Tea" drink_desc = "A glass of hot tea. Perhaps a cup with a handle would have been smarter?" taste_description = "tea" + yuck_description = "grit in your tubes" /datum/reagent/consumable/drink/tea/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE @@ -449,6 +456,7 @@ drink_name = "Iced Tea" drink_desc = "No relation to a certain rap artist/ actor." taste_description = "cold tea" + yuck_description = "cold grit in your tubes" /datum/reagent/consumable/drink/bananahonk name = "Banana Honk" @@ -497,6 +505,7 @@ drink_name = "Chocolate Pudding" drink_desc = "A decadent chocolate dessert, in drinkable form." taste_description = "chocolate" + yuck_description = "grime in your gears" goal_difficulty = REAGENT_GOAL_NORMAL /datum/reagent/consumable/drink/vanillapudding @@ -509,6 +518,7 @@ drink_name = "Vanilla Pudding" drink_desc = "A rich vanilla dessert, in drinkable form." taste_description = "vanilla" + yuck_description = "grime in your gears" goal_difficulty = REAGENT_GOAL_NORMAL /datum/reagent/consumable/drink/cherryshake @@ -583,6 +593,7 @@ drink_name = "Iced Cocoa" drink_desc = "A sweeter drink to perk you up and refresh you!" taste_description = "refreshingly cold cocoa" + yuck_description = "cold grit in your tubes" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/drink/tonic @@ -597,6 +608,7 @@ drink_name = "Glass of Tonic Water" drink_desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away." taste_description = "bitterness" + yuck_description = "grit in your tubes" /datum/reagent/consumable/drink/sodawater name = "Soda Water" @@ -609,6 +621,7 @@ drink_name = "Glass of Soda Water" drink_desc = "Soda water. Why not make a scotch and soda?" taste_description = "fizz" + yuck_description = "fizz" /datum/reagent/consumable/drink/ice name = "Ice" @@ -620,6 +633,7 @@ drink_name = "Glass of ice" drink_desc = "Generally, you're supposed to put something else in there too..." taste_description = "cold" + yuck_description = "cold grit in your tubes" /datum/reagent/consumable/drink/ice/on_mob_life(mob/living/M) M.bodytemperature = max(M.bodytemperature - 5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0) @@ -851,6 +865,7 @@ drink_name = "Tapioca Pearls" drink_desc = "This would go great with sugar, milk, and tea." taste_description = "chewy starch" + yuck_description = "grime in your gears" /datum/reagent/consumable/drink/tea/bubbletea name = "Bubble Tea" @@ -861,6 +876,7 @@ drink_desc = "You feel trendy for drinking this." taste_description = "sweet tea with chewy pearls" goal_difficulty = REAGENT_GOAL_NORMAL + yuck_description = "grime in your gears" /datum/reagent/consumable/drink/tea/milktea name = "Milk Tea" @@ -883,6 +899,7 @@ drink_desc = "You feel extra trendy for drinking this." taste_description = "sweet milky tea with chewy pearls" goal_difficulty = REAGENT_GOAL_NORMAL + yuck_description = "grime in your gears" /datum/reagent/consumable/drink/royrogers name = "Roy Rogers" @@ -992,6 +1009,7 @@ drink_desc = "The vinegar gives this far more bite than any ordinary person would drink straight." taste_description = "vinegar" goal_difficulty = REAGENT_GOAL_HARD + yuck_description = "grit in your tubes" /datum/reagent/consumable/drink/berrybeetrefresher name = "Berry Beet Refresher" @@ -1184,7 +1202,9 @@ drink_icon = "tcp_sip_glass" drink_name = "Glass of TCP Sip" drink_desc = "A non-synthanolic refreshment for synthetics." - taste_description = "half-emptiness" + taste_description = "a little ping" + yuck_description = "horrible heartburn" + taste_flag = SYNTHETIC goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/consumable/drink/electrolytes/tcp_sip/on_mob_life(mob/living/M) @@ -1286,6 +1306,8 @@ drink_name = "Glass of Bubbly Beep" drink_desc = "The cleanest, bubbliest drink on the station." taste_description = "decontamination" + yuck_description = "a mouthful of bitter soap" + taste_flag = SYNTHETIC goal_difficulty = REAGENT_GOAL_NORMAL process_flags = SYNTHETIC | ORGANIC COOLDOWN_DECLARE(drink_message_cooldown) @@ -1317,6 +1339,8 @@ drink_name = "Glass of Tin and Tonic" drink_desc = "A good sip for a synthetic curious about quinine." taste_description = "smoothly-running processors" + taste_flag = SYNTHETIC + yuck_description = "a cup of metal" goal_difficulty = REAGENT_GOAL_NORMAL process_flags = SYNTHETIC | ORGANIC @@ -1338,6 +1362,8 @@ drink_name = "Glass of Salt and Battery" drink_desc = "Looks like it'll charge you up, but really it'll beat you down." taste_description = "assault to the batteries" + taste_flag = SYNTHETIC + yuck_description = "a cup of metal" goal_difficulty = REAGENT_GOAL_HARD process_flags = SYNTHETIC | ORGANIC @@ -1379,6 +1405,8 @@ drink_name = "Glass of Soft Reset" drink_desc = "Have you tried turning it off and back on again?" taste_description = "a little reboot" + taste_flag = SYNTHETIC + yuck_description = "forceful expectorant" goal_difficulty = REAGENT_GOAL_HARD process_flags = SYNTHETIC | ORGANIC COOLDOWN_DECLARE(reboot_cooldown) @@ -1505,6 +1533,7 @@ drink_name = "Glass of Castor Oil" drink_desc = "Smells like beans." taste_description = "beans" + yuck_description = "subpar lubricant" metabolization_rate = 0.15 * REAGENTS_METABOLISM /datum/reagent/consumable/drink/castor/on_mob_life(mob/living/carbon/M) @@ -1545,6 +1574,7 @@ drink_name = "Glass of Uncle Git's Special Milk" drink_desc = "It is sticky and has a strong chlorine smell." taste_description = "someone else's child" + yuck_description = "clumps in your motors" goal_difficulty = REAGENT_GOAL_NORMAL /datum/reagent/consumable/drink/peach_milkshake diff --git a/code/modules/reagents/chemistry/reagents/drugs.dm b/code/modules/reagents/chemistry/reagents/drugs.dm index 6cfee2c18f3..bb17e3dac22 100644 --- a/code/modules/reagents/chemistry/reagents/drugs.dm +++ b/code/modules/reagents/chemistry/reagents/drugs.dm @@ -768,6 +768,7 @@ addiction_chance_additional = 20 addiction_threshold = 10 taste_description = "flips" + taste_flag = ORGANIC | SYNTHETIC goal_department = "Science" goal_difficulty = REAGENT_GOAL_HARD @@ -1167,6 +1168,7 @@ color = "#17dd17" process_flags = SYNTHETIC taste_description = "man, like, totally the best most relaxing thing ever, dude" + taste_flag = SYNTHETIC /datum/reagent/w33d/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE @@ -1204,6 +1206,7 @@ addiction_chance = 10 addiction_threshold = 10 taste_description = "very poor life choices" + taste_flag = ORGANIC | SYNTHETIC allowed_overdose_process = TRUE goal_department = "Science" goal_difficulty = REAGENT_GOAL_HARD @@ -1288,7 +1291,9 @@ addiction_threshold = 5 metabolization_rate = 0.6 addiction_decay_rate = 0.1 //very low to force them to take time off of meth - taste_description = "wiper fluid" + taste_description = "slick servos" + taste_flag = SYNTHETIC + yuck_description = "wiper fluid" var/tenacity = 1.5 // higher is worse goal_department = "Science" goal_difficulty = REAGENT_GOAL_NORMAL @@ -1325,7 +1330,9 @@ description = "This is a special lubricant designed to attract onto and excite parasitic mindflayer swarms, revealing if someone hosts a hive. Doesn't include a cooling agent, so tends to cause overheating." harmless = FALSE color = "#163b39" - taste_description = "batteries" + taste_description = "stack overflow" + taste_flag = SYNTHETIC + yuck_description = "batteries" process_flags = SYNTHETIC /datum/reagent/lube/conductive/on_mob_life(mob/living/M) @@ -1372,7 +1379,9 @@ addiction_chance = 10 addiction_threshold = 5 addiction_decay_rate = 0.2 - taste_description = "silicon" + taste_description = "heat conducting throughout the chassis" + taste_flag = SYNTHETIC + yuck_description = "silicon" goal_department = "Science" goal_difficulty = REAGENT_GOAL_HARD diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 1e0ddefb5e3..b8360221c99 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -93,6 +93,7 @@ nutriment_factor = 5 * REAGENTS_METABOLISM overdose_threshold = 200 // Hyperglycaemic shock taste_description = "sweetness" + yuck_description = "sticky grit" taste_mult = 1.5 allowed_overdose_process = TRUE @@ -126,6 +127,7 @@ nutriment_factor = 2 * REAGENTS_METABOLISM color = "#792300" // rgb: 121, 35, 0 taste_description = "soy" + yuck_description = "subtle grit" goal_department = "Kitchen" goal_difficulty = REAGENT_GOAL_NORMAL @@ -137,6 +139,7 @@ nutriment_factor = 5 * REAGENTS_METABOLISM color = "#731008" // rgb: 115, 16, 8 taste_description = "ketchup" + yuck_description = "stickiness in your tubes" /datum/reagent/consumable/mayonnaise name = "Mayonnaise" @@ -145,6 +148,7 @@ reagent_state = LIQUID color = "#DFDFDF" // rgb: 223, 223, 223 taste_description = "mayonnaise" + yuck_description = "stickiness in your tubes" goal_department = "Kitchen" goal_difficulty = REAGENT_GOAL_HARD @@ -156,6 +160,7 @@ nutriment_factor = 5 * REAGENTS_METABOLISM color = "#D9A066" // rgb: 217, 160, 102 taste_description = "peanuts" + yuck_description = "grime in your gears" /datum/reagent/consumable/bbqsauce name = "BBQ Sauce" @@ -166,6 +171,7 @@ color = "#78280A" // rbg: 120, 40, 10 taste_mult = 2.5 taste_description = "smokey sweetness" + yuck_description = "stickiness in your tubes" goal_department = "Kitchen" goal_difficulty = REAGENT_GOAL_NORMAL @@ -180,6 +186,7 @@ addiction_threshold = 2 minor_addiction = TRUE taste_description = SPAN_WARNING("HOTNESS") + yuck_description = "cosmetic component damage" taste_mult = 1.5 /datum/reagent/consumable/capsaicin/on_mob_life(mob/living/M) @@ -240,6 +247,7 @@ color = "#8BA6E9" // rgb: 139, 166, 233 process_flags = ORGANIC | SYNTHETIC taste_description = "cold" + yuck_description = "cosmetic component damage" /datum/reagent/consumable/frostoil/on_mob_life(mob/living/M) switch(current_cycle) @@ -281,6 +289,7 @@ overdose_threshold = 100 taste_mult = 2 taste_description = "salt" + yuck_description = "grit in your tubes" /datum/reagent/consumable/sodiumchloride/overdose_process(mob/living/M, severity) var/update_flags = STATUS_UPDATE_NONE @@ -297,6 +306,7 @@ overdose_threshold = 100 taste_mult = 2 taste_description = "salt" + yuck_description = "grit in your tubes" /datum/reagent/consumable/potass_chloride/overdose_process(mob/living/M, severity) var/update_flags = STATUS_UPDATE_NONE @@ -309,6 +319,7 @@ id = "blackpepper" description = "A powder ground from peppercorns. *AAAACHOOO*" taste_description = "pepper" + yuck_description = "grit in your tubes" /datum/reagent/consumable/cocoa name = "Cocoa Powder" @@ -317,6 +328,7 @@ nutriment_factor = 5 * REAGENTS_METABOLISM color = "#5F3A13" taste_description = "bitter cocoa" + yuck_description = "powder coating" /datum/reagent/consumable/vanilla name = "Vanilla" @@ -325,6 +337,7 @@ nutriment_factor = 5 * REAGENTS_METABOLISM color = "#FEFEFE" taste_description = "bitter vanilla" + yuck_description = "grime in your gears" /datum/reagent/consumable/garlic name = "Garlic Juice" @@ -333,6 +346,7 @@ color = "#FEFEFE" taste_description = "garlic" metabolization_rate = 0.15 * REAGENTS_METABOLISM + yuck_description = "grime in your gears" /datum/reagent/consumable/garlic/on_mob_life(mob/living/carbon/M) var/update_flags = STATUS_UPDATE_NONE @@ -349,6 +363,7 @@ description = "Multi-colored little bits of sugar, commonly found on donuts. Loved by cops." color = "#FF00FF" // rgb: 255, 0, 255 taste_description = "crunchy sweetness" + yuck_description = "sticky grit in your tubes" /datum/reagent/consumable/sprinkles/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE @@ -365,6 +380,7 @@ nutriment_factor = 20 * REAGENTS_METABOLISM color = "#302000" // rgb: 48, 32, 0 taste_description = "oil" + yuck_description = "lubricant" /datum/reagent/consumable/olivepaste name = "Olive Paste" @@ -373,6 +389,7 @@ reagent_state = LIQUID color = "#adcf77" //rgb: 173, 207, 119 taste_description = "mushy olives" + yuck_description = "grime in your gears" /datum/reagent/consumable/oliveoil name = "Olive Oil" @@ -382,6 +399,7 @@ nutriment_factor = 10 * REAGENTS_METABOLISM color = "#DBCF5C" //rgb: 219, 207, 92 taste_description = "olive oil" + yuck_description = "lubricant" goal_department = "Kitchen" goal_difficulty = REAGENT_GOAL_NORMAL @@ -399,6 +417,7 @@ reagent_state = LIQUID color = "#282314" // rgb: 54, 94, 48 taste_description = "sweetness" + yuck_description = "cosmetic component damage" goal_department = "Kitchen" goal_difficulty = REAGENT_GOAL_HARD @@ -408,6 +427,7 @@ description = "Space age food, since August 25, 1958. Contains dried noodles, vegetables, and chemicals that boil in contact with water." color = "#302000" // rgb: 48, 32, 0 taste_description = "dry ramen coated with what might just be your tears" + yuck_description = "jams in your servos" /datum/reagent/consumable/hot_ramen name = "Hot Ramen" @@ -417,6 +437,7 @@ nutriment_factor = 5 * REAGENTS_METABOLISM color = "#302000" // rgb: 48, 32, 0 taste_description = "cheap ramen and memories" + yuck_description = "grime in your gears" /datum/reagent/consumable/hot_ramen/on_mob_life(mob/living/M) if(M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 @@ -431,6 +452,7 @@ nutriment_factor = 5 * REAGENTS_METABOLISM color = "#302000" // rgb: 48, 32, 0 taste_description = "SPICY ramen" + yuck_description = "acidic grime in your gears" /datum/reagent/consumable/hell_ramen/on_mob_life(mob/living/M) M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT @@ -442,6 +464,7 @@ description = "This is what you rub all over yourself to pretend to be a ghost." color = "#FFFFFF" // rgb: 0, 0, 0 taste_description = "flour" + yuck_description = "powder coating" /datum/reagent/consumable/flour/reaction_turf(turf/T, volume) if(!isspaceturf(T)) @@ -454,6 +477,7 @@ nutriment_factor = 3 * REAGENTS_METABOLISM color = "#FFFFFF" // rgb: 0, 0, 0 taste_description = "rice" + yuck_description = "stickiness in your tubes" /datum/reagent/consumable/cherryjelly name = "Cherry Jelly" @@ -462,6 +486,7 @@ reagent_state = LIQUID color = "#801E28" // rgb: 128, 30, 40 taste_description = "cherry jelly" + yuck_description = "stickiness in your tubes" /datum/reagent/consumable/bluecherryjelly name = "Blue Cherry Jelly" @@ -470,6 +495,7 @@ reagent_state = LIQUID color = "#00F0FF" taste_description = "the blues" + yuck_description = "stickiness in your tubes" /datum/reagent/consumable/egg name = "Egg" @@ -478,6 +504,7 @@ reagent_state = LIQUID color = "#F0C814" taste_description = "eggs" + yuck_description = "grime in your gears" /datum/reagent/consumable/egg/on_mob_life(mob/living/M) if(prob(3)) @@ -491,6 +518,7 @@ reagent_state = LIQUID color = "#ffeb91" taste_description = "flour" + yuck_description = "powder coating" /datum/reagent/consumable/corn_syrup name = "Corn Syrup" @@ -499,6 +527,7 @@ reagent_state = LIQUID color = "#ada537" taste_description = "cheap sugar substitute" + yuck_description = "stickiness in your tubes" /datum/reagent/consumable/corn_syrup/on_mob_life(mob/living/M) M.reagents.add_reagent("sugar", 1.2) @@ -511,6 +540,7 @@ reagent_state = LIQUID color = "#484917" taste_description = "diabetes" + yuck_description = "stickiness in your tubes" /datum/reagent/consumable/vhfcs/on_mob_life(mob/living/M) M.reagents.add_reagent("sugar", 2.4) @@ -524,6 +554,7 @@ color = "#d3a308" nutriment_factor = 15 * REAGENTS_METABOLISM taste_description = "sweetness" + yuck_description = "stickiness in your tubes" /datum/reagent/consumable/honey/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE @@ -539,6 +570,7 @@ description = "A strong tasting substance that can induce partial blindness." color = "#c0c9a0" taste_description = "pungency" + yuck_description = "grime in your gears" /datum/reagent/consumable/onion/reaction_mob(mob/living/M, method = REAGENT_TOUCH, volume) if(method == REAGENT_TOUCH) @@ -563,6 +595,7 @@ drink_name = "Glass of chocolate" drink_desc = "Tasty!" taste_description = "chocolate" + yuck_description = "stickiness in your tubes" /datum/reagent/consumable/chocolate/on_mob_life(mob/living/M) M.reagents.add_reagent("sugar", 0.8) @@ -580,6 +613,7 @@ color = "#21170E" process_flags = ORGANIC | SYNTHETIC taste_description = "tea" + yuck_description = "grit in your tubes" /datum/reagent/consumable/mugwort/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE @@ -603,6 +637,7 @@ overdose_threshold = 133 harmless = FALSE taste_description = "bacon" + yuck_description = "grit in your tubes" /datum/reagent/consumable/porktonium/overdose_process(mob/living/M, severity) if(prob(15)) @@ -621,6 +656,7 @@ metabolization_rate = 0.2 nutriment_factor = 2.5 * REAGENTS_METABOLISM taste_description = "broth" + yuck_description = "grime in your gears" /datum/reagent/consumable/cheese name = "Cheese" @@ -628,6 +664,7 @@ description = "Some cheese. Pour it out to make it solid." color = "#FFFF00" taste_description = "cheese" + yuck_description = "grime in your gears" /datum/reagent/consumable/cheese/on_mob_life(mob/living/M) if(prob(3)) @@ -651,6 +688,7 @@ minor_addiction = TRUE harmless = FALSE taste_description = "cheese?" + yuck_description = "grime in your gears" /datum/reagent/consumable/fake_cheese/overdose_process(mob/living/M, severity) var/update_flags = STATUS_UPDATE_NONE @@ -669,6 +707,7 @@ addiction_threshold = 5 minor_addiction = TRUE taste_description = "cheeeeeese...?" + yuck_description = "grime in your gears" /datum/reagent/consumable/weird_cheese/on_mob_life(mob/living/M) if(prob(5)) @@ -685,6 +724,7 @@ description = "Some mushed up cheese curds. You're not quite sure why you did this." color = "#FFFF00" taste_description = "salty cheese" + yuck_description = "clogs in your servos" /datum/reagent/consumable/yogurt name = "yogurt" @@ -693,6 +733,7 @@ reagent_state = LIQUID color = "#FFFFFF" taste_description = "yogurt" + yuck_description = "grime in your gears" /datum/reagent/consumable/beans name = "Refried beans" @@ -701,6 +742,7 @@ reagent_state = LIQUID color = "#684435" taste_description = "burritos" + yuck_description = "clogs in your servos" /datum/reagent/consumable/bread name = "Bread" @@ -708,6 +750,7 @@ description = "Bread! Yep, bread." color = "#9C5013" taste_description = "bread" + yuck_description = "grit in your tubes" /datum/reagent/consumable/soybeanoil name = "Space-soybean oil" @@ -716,6 +759,7 @@ reagent_state = LIQUID color = "#B1B0B0" taste_description = "oil" + yuck_description = "lubricant" /datum/reagent/consumable/soybeanoil/on_mob_life(mob/living/M) if(prob(10)) @@ -735,6 +779,7 @@ harmless = FALSE taste_description = "oil" allowed_overdose_process = TRUE + yuck_description = "grime in your gears" /datum/reagent/consumable/hydrogenated_soybeanoil/on_mob_life(mob/living/M) if(prob(15)) @@ -768,6 +813,7 @@ reagent_state = LIQUID color = "#EBD7D7" taste_description = "meat?" + yuck_description = "grime in your gears" /datum/reagent/consumable/meatslurry/on_mob_life(mob/living/M) if(prob(4)) @@ -785,6 +831,7 @@ description = "A starchy food paste made from boiled potatoes." color = "#D6D9C1" taste_description = "potatoes" + yuck_description = "grime in your gears" /datum/reagent/consumable/gravy name = "Gravy" @@ -793,6 +840,7 @@ reagent_state = LIQUID color = "#B4641B" taste_description = "gravy" + yuck_description = "stickiness in your tubes" goal_department = "Kitchen" goal_difficulty = REAGENT_GOAL_NORMAL @@ -803,6 +851,7 @@ reagent_state = LIQUID color = "#80942F" taste_description = "pungency" + yuck_description = "cosmetic component damage" /datum/reagent/consumable/wasabi/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume) if(method == REAGENT_INGEST) @@ -822,6 +871,7 @@ reagent_state = LIQUID color = "#63DE63" taste_description = "burned food" + yuck_description = "cosmetic component damage" /datum/reagent/questionmark/reaction_mob(mob/living/carbon/human/H, method = REAGENT_TOUCH, volume) if(istype(H) && method == REAGENT_INGEST) @@ -841,6 +891,7 @@ color = "#F5F5F5" metabolization_rate = 0.2 taste_description = "excellent cuisine" + yuck_description = "grit in your tubes" taste_mult = 4 /datum/reagent/msg/on_mob_life(mob/living/M) @@ -860,6 +911,7 @@ reagent_state = LIQUID color = "#FFFAC8" taste_description = "heart attack" + yuck_description = "grime in your gears" /datum/reagent/cholesterol/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE @@ -883,6 +935,7 @@ reagent_state = LIQUID color = "#C87D28" taste_description = "mold" + yuck_description = "grime in your gears" /datum/reagent/fungus/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume) if(method == REAGENT_INGEST) @@ -904,6 +957,7 @@ color = "#8EAE7B" process_flags = ORGANIC | SYNTHETIC //Because apparently ghosts in the shell taste_description = "spooks" + yuck_description = "stickiness in your tubes" /datum/reagent/ectoplasm/on_mob_life(mob/living/M) var/spooky_message = pick("You notice something moving out of the corner of your eye, but nothing is there...", "Your eyes twitch, you feel like something you can't see is here...", "You've got the heebie-jeebies.", "You feel uneasy.", "You shudder as if cold...", "You feel something gliding across your back...") @@ -931,6 +985,7 @@ description = "Soap, fit to clean the mouth of a sailor." color = "#FFFFFF" taste_description = "soap" + yuck_description = "grime in your gears" /datum/reagent/soap/on_mob_add(mob/living/L) ADD_TRAIT(L, TRAIT_SOAPY_MOUTH, id) @@ -947,6 +1002,7 @@ reagent_state = LIQUID color = "#FFFF00" taste_description = "puke" + yuck_description = "acidic grime in your gears" /datum/reagent/vomit/reaction_turf(turf/T, volume) if(volume >= 5 && !isspaceturf(T)) @@ -959,6 +1015,7 @@ reagent_state = LIQUID color = "#78FF74" taste_description = "puke" + yuck_description = "acidic grime in your gears" /datum/reagent/greenvomit/reaction_turf(turf/T, volume) if(volume >= 5 && !isspaceturf(T)) @@ -972,6 +1029,7 @@ description = "An ichor, derived from a certain mushroom, makes for a bad time." color = "#1d043d" taste_description = "bitter mushroom" + yuck_description = "acute stack failure" /datum/reagent/consumable/entpoly/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE @@ -992,6 +1050,7 @@ color = "#b5a213" var/light_activated = FALSE taste_description = "tingling mushroom" + yuck_description = "acidic prickles" /datum/reagent/consumable/tinlux/on_mob_life(mob/living/M) if(!light_activated) @@ -1009,6 +1068,7 @@ color = "#d3a308" nutriment_factor = 3 * REAGENTS_METABOLISM taste_description = "fruity mushroom" + yuck_description = "sticky film on your surface" /datum/reagent/consumable/vitfro/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE @@ -1024,6 +1084,7 @@ reagent_state = LIQUID color = "#A7EE9F" taste_description = "mint" + yuck_description = "cool grit in your tubes" /datum/reagent/consumable/vinegar name = "Vinegar" @@ -1032,6 +1093,7 @@ taste_description = "vinegar" color = "#ffffff" goal_department = "Kitchen" + yuck_description = "cosmetic component damage" goal_difficulty = REAGENT_GOAL_NORMAL /datum/reagent/consumable/tapioca_powder @@ -1040,6 +1102,7 @@ description = "A starchy powder made by grinding up cassava. Would be good mixed with water." color = "#DFDFDF" // rgb: 223, 223, 223 taste_description = "starchy powder" + yuck_description = "powder coating" /datum/reagent/consumable/drytapioca_pearls name = "Dry Tapioca Pearls" @@ -1047,6 +1110,7 @@ description = "Small, hard balls of dried tapioca powder." color = "#DFDFDF" // rgb: 223, 223, 223 taste_description = "dry starchy pearls" + yuck_description = "grit in your tubes" // ----------- Reagents imported from Hispania! @@ -1058,6 +1122,7 @@ color = "#fff98f" // rgb: 255, 249, 143 nutriment_factor = 5 * REAGENTS_METABOLISM taste_description = "butter" + yuck_description = "grime in your gears" /datum/reagent/consumable/guacamole name = "guacamole" @@ -1067,6 +1132,7 @@ color = "#32CD32" nutriment_factor = 5 * REAGENTS_METABOLISM taste_description = "avocado" + yuck_description = "grime in your gears" /datum/reagent/consumable/discount_sauce name = "discount sauce" @@ -1076,6 +1142,7 @@ color = "#f4fffab3" // rgb: 255, 254, 244 nutriment_factor = 5 * REAGENTS_METABOLISM taste_description = "sweet iron" + yuck_description = "high class machine oil" /datum/reagent/consumable/discount_sauce/on_mob_life(mob/living/M) if(prob(25)) @@ -1094,5 +1161,6 @@ color = "#f7f7f5" nutriment_factor = 5 * REAGENTS_METABOLISM taste_description = "sour" + yuck_description = "grime in your gears" // ----------- END of recipe imports from Hispania! diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm index b17ad87e6c9..6e801fab0be 100644 --- a/code/modules/reagents/chemistry/reagents/medicine.dm +++ b/code/modules/reagents/chemistry/reagents/medicine.dm @@ -36,6 +36,7 @@ reagent_state = LIQUID color = "#C8A5DC" // rgb: 200, 165, 220 taste_description = "antiseptic" + yuck_description = "sterilization" goal_difficulty = REAGENT_GOAL_EASY //makes you squeaky clean @@ -449,6 +450,7 @@ description = "Activated charcoal helps to absorb toxins." reagent_state = LIQUID taste_description = "dust" + taste_flag = ORGANIC | SYNTHETIC goal_difficulty = REAGENT_GOAL_EASY max_kidney_damage = 0 @@ -1103,6 +1105,7 @@ description = "Mannitol is a sugar alcohol that can help alleviate cranial swelling." color = "#D1D1F1" taste_description = "sweetness" + yuck_description = "stickiness in your tubes" goal_difficulty = REAGENT_GOAL_EASY max_kidney_damage = 0 @@ -1252,7 +1255,9 @@ reagent_state = LIQUID color = "#28b581" process_flags = SYNTHETIC - taste_description = "silicon" + taste_flag = SYNTHETIC + taste_description = "incredible connectivity" + yuck_description = "silicon" /datum/reagent/medicine/stimulative_agent/surge_plus/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE @@ -1461,7 +1466,9 @@ reagent_state = LIQUID color = "#CC7A00" process_flags = SYNTHETIC + taste_flag = SYNTHETIC taste_description = "overclocking" + yuck_description = "nail polish remover" goal_difficulty = REAGENT_GOAL_NORMAL /datum/reagent/medicine/degreaser/on_mob_life(mob/living/M) @@ -1490,7 +1497,9 @@ reagent_state = LIQUID color = "#D7B395" process_flags = SYNTHETIC - taste_description = "heavy metals" + taste_flag = SYNTHETIC + taste_description = "smooth processing" + yuck_description = "heavy metals" goal_difficulty = REAGENT_GOAL_EASY /datum/reagent/medicine/liquid_solder/on_mob_life(mob/living/M) diff --git a/code/modules/reagents/chemistry/reagents/misc_reagents.dm b/code/modules/reagents/chemistry/reagents/misc_reagents.dm index cabdab0ea23..80e24f4227a 100644 --- a/code/modules/reagents/chemistry/reagents/misc_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/misc_reagents.dm @@ -56,6 +56,7 @@ description = "A chemical element." color = "#1C1300" // rgb: 30, 20, 0 taste_description = "like a pencil or something" + yuck_description = "powder coating" /datum/reagent/carbon/reaction_turf(turf/T, volume) if(!(locate(/obj/effect/decal/cleanable/dirt) in T) && !isspaceturf(T)) // Only add one dirt per turf. Was causing people to crash. @@ -67,6 +68,7 @@ description = "Gold is a dense, soft, shiny metal and the most malleable and ductile metal known." color = "#F7C430" // rgb: 247, 196, 48 taste_description = "bling" + yuck_description = "connectivity" /datum/reagent/silver @@ -75,6 +77,7 @@ description = "A lustrous metallic element regarded as one of the precious metals." color = "#D0D0D0" // rgb: 208, 208, 208 taste_description = "sub-par bling" + yuck_description = "connectivity" /datum/reagent/aluminum name = "Aluminum" @@ -89,6 +92,7 @@ description = "A tetravalent metalloid, silicon is less reactive than its chemical analog carbon." color = "#A8A8A8" // rgb: 168, 168, 168 taste_description = "a CPU" + yuck_description = "superior connectivity" /datum/reagent/copper name = "Copper" @@ -96,6 +100,7 @@ description = "A highly ductile metal." color = "#6E3B08" // rgb: 110, 59, 8 taste_description = "copper" + yuck_description = "connectivity" /datum/reagent/copper/reaction_obj(obj/O, volume) if(istype(O, /obj/item/stack/sheet/metal)) @@ -117,6 +122,7 @@ description = "Pure iron is a metal." color = "#525152" // rgb: 200, 165, 220 taste_description = "metal" + yuck_description = "connectivity" /datum/reagent/iron/on_mob_life(mob/living/M) if(ishuman(M)) @@ -134,6 +140,7 @@ reagent_state = LIQUID color = "#9E6B38" // rgb: 158, 107, 56 taste_description = "extreme discomfort" + taste_flag = ORGANIC | SYNTHETIC // metal foaming agent // this is lithium hydride. Add other recipies (e.g. LiH + H2O -> LiOH + H2) eventually @@ -144,6 +151,7 @@ reagent_state = GAS color = "#404030" // rgb: 64, 64, 48 taste_description = "floor cleaner" + yuck_description = "clean components" /datum/reagent/diethylamine name = "Diethylamine" @@ -162,7 +170,9 @@ shock_reduction = 25 view_true_health = TRUE metabolization_rate = 0.1 - taste_description = "motor oil" + taste_description = "smooth joints and quiet servos" + yuck_description = "motor oil" + taste_flag = SYNTHETIC process_flags = SYNTHETIC /// What this becomes after burning. var/reagent_after_burning = "ash" @@ -207,6 +217,7 @@ description = "You should probably pour this down the sink, where it belongs." color = "#fbba16" taste_description = "old french fries" + yuck_description = "lubricant" reagent_after_burning = "cooking_oil_inert" /datum/reagent/oil/cooking/reaction_turf(turf/T, volume) @@ -217,6 +228,7 @@ name = "Burned Cooking Oil" description = "It's full of char and mixed with so much crud it's probably useless." id = "cooking_oil_inert" + yuck_description = "gritty lubricant" /datum/reagent/oil/cooking/inert/reaction_temperature(exposed_temperature, exposed_volume) // don't do anything @@ -267,6 +279,7 @@ reagent_state = LIQUID color = "#191919" taste_description = "ash" + yuck_description = "powder coating" /datum/reagent/acetone name = "Acetone" @@ -275,6 +288,7 @@ reagent_state = LIQUID color = "#474747" taste_description = "nail polish remover" + yuck_description = "cosmetic component damage" /datum/reagent/acetone/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE @@ -288,6 +302,7 @@ reagent_state = LIQUID color = "#60A584" // rgb: 96, 165, 132 taste_description = "one third of an explosion" + yuck_description = "powder coating" /datum/reagent/colorful_reagent name = "Colorful Reagent" @@ -401,6 +416,7 @@ reagent_state = LIQUID color = "#FF97B9" taste_description = "hugs" + taste_flag = ORGANIC | SYNTHETIC /datum/reagent/love name = "Pure love" @@ -410,6 +426,7 @@ color = "#FF83A5" process_flags = ORGANIC | SYNTHETIC // That's the power of love~ taste_description = "love" + taste_flag = ORGANIC | SYNTHETIC /datum/reagent/love/on_mob_add(mob/living/L) ..() @@ -447,7 +464,8 @@ description = "Jestosterone is an odd chemical compound that induces a variety of annoying side-effects in the average person. It also causes mild intoxication, and is toxic to mimes." color = "#ff00ff" //Fuchsia, pity we can't do rainbow here process_flags = ORGANIC | SYNTHETIC - taste_description = "a funny flavour" + taste_description = "a funny flavor" + taste_flag = ORGANIC | SYNTHETIC /datum/reagent/jestosterone/on_new() ..() @@ -516,7 +534,8 @@ color = "#353535" // Should be dark grey, there are already a fair number of white chemicals process_flags = ORGANIC | SYNTHETIC drink_desc = "The color of the glass' surroundings seem to drain as you look at it." - taste_description = "an entertaining flavour" + taste_description = "an entertaining flavor" + taste_flag = ORGANIC | SYNTHETIC /datum/reagent/mimestrogen/on_new() ..() @@ -589,6 +608,7 @@ description = "Royal Bee Jelly, if injected into a Queen Space Bee said bee will split into two bees." color = "#00ff80" taste_description = "sweetness" + yuck_description = "stickiness in your tubes" /datum/reagent/royal_bee_jelly/on_mob_life(mob/living/M) if(prob(2)) @@ -650,6 +670,7 @@ reagent_state = SOLID color = "#5B2E0D" // rgb: 91, 46, 13 taste_description = "waste" + yuck_description = "grit in your tubes" /datum/reagent/toxin/teapowder name = "Ground Tea Leaves" @@ -658,6 +679,7 @@ reagent_state = SOLID color = "#7F8400" // rgb: 127, 132, 0" taste_description = "the future" + yuck_description = "grit in your tubes" //////////////////////////////////Hydroponics stuff/////////////////////////////// diff --git a/code/modules/reagents/chemistry/reagents/paint.dm b/code/modules/reagents/chemistry/reagents/paint.dm index 6c0b04339b0..fd660c5c178 100644 --- a/code/modules/reagents/chemistry/reagents/paint.dm +++ b/code/modules/reagents/chemistry/reagents/paint.dm @@ -5,6 +5,7 @@ reagent_state = LIQUID color = "#808080" taste_description = "paint" + yuck_description = "liquid coating" /datum/reagent/paint/reaction_turf(turf/T, volume) if(!isspaceturf(T)) diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic.dm index d56d24dd644..cc6a7a16c38 100644 --- a/code/modules/reagents/chemistry/reagents/pyrotechnic.dm +++ b/code/modules/reagents/chemistry/reagents/pyrotechnic.dm @@ -6,6 +6,7 @@ color = "#FFAF00" process_flags = ORGANIC | SYNTHETIC taste_description = "burning" + taste_flag = ORGANIC | SYNTHETIC burn_temperature = T0C + 500 burn_duration = 20 SECONDS burn_color = "white" @@ -54,6 +55,7 @@ description = "A highly flammable jellied fuel." reagent_state = LIQUID process_flags = ORGANIC | SYNTHETIC + taste_flag = ORGANIC | SYNTHETIC color = "#C86432" taste_description = "burning" burn_temperature = T0C + 500 @@ -96,7 +98,9 @@ drink_icon = "fuel_glass" drink_name = "Glass of welder fuel" drink_desc = "Unless you are an industrial tool, this is probably not safe for consumption." - taste_description = "mistakes" + taste_flag = SYNTHETIC + taste_description = "internal combustion" + yuck_description = "mistakes" process_flags = ORGANIC | SYNTHETIC burn_temperature = T0C + 400 burn_duration = 15 SECONDS // Barely better than default @@ -161,6 +165,7 @@ reagent_state = LIQUID color = "#7A2B94" taste_description = "corporate assets going to waste" + taste_flag = ORGANIC | SYNTHETIC taste_mult = 1.5 burn_temperature = T0C + 400 burn_duration = 20 SECONDS @@ -195,6 +200,7 @@ description = "Thermite produces an aluminothermic reaction known as a thermite reaction. Can be used to melt walls." color = "#673910" // rgb: 103, 57, 16 process_flags = ORGANIC | SYNTHETIC + taste_flag = ORGANIC | SYNTHETIC taste_description = "rust" burn_temperature = T0C + 1500 // hahahahHAHAHAHAH LET IT BURN burn_duration = 5 SECONDS // Not for long though @@ -233,6 +239,7 @@ reagent_state = LIQUID color = "#808080" // rgb: 128, 128, 128 taste_description = "sweetness" + yuck_description = "stickiness in your tubes" /datum/reagent/stabilizing_agent name = "Stabilizing Agent" @@ -318,6 +325,7 @@ metabolization_rate = 0.05 penetrates_skin = TRUE taste_description = "explosions" + yuck_description = "powder coating" /datum/reagent/blackpowder/reaction_turf(turf/T, volume) //oh shit if(volume >= 5 && !isspaceturf(T)) @@ -332,6 +340,7 @@ color = "#FFFF00" penetrates_skin = TRUE taste_description = "salt" + yuck_description = "powder coating" /datum/reagent/smoke_powder name = "Smoke Powder" @@ -340,6 +349,7 @@ reagent_state = LIQUID color = "#808080" taste_description = "smoke" + yuck_description = "powder coating" /datum/reagent/sonic_powder name = "Sonic Powder" @@ -349,6 +359,7 @@ color = "#0000FF" penetrates_skin = TRUE taste_description = "loud noises" + yuck_description = "powder coating" /datum/reagent/cryostylane name = "Cryostylane" @@ -428,6 +439,7 @@ reagent_state = LIQUID color = "#A0A090" taste_description = "the inside of a fire extinguisher" + yuck_description = "grime in your gears" /datum/reagent/firefighting_foam/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume) // Put out fire @@ -449,6 +461,7 @@ description = "A fine dust of plasma. This chemical has unusual mutagenic properties for viruses and slimes alike." color = "#500064" // rgb: 80, 0, 100 taste_description = "corporate assets going to waste" + taste_flag = ORGANIC | SYNTHETIC taste_mult = 1.5 /datum/reagent/plasma_dust/reaction_temperature(exposed_temperature, exposed_volume) @@ -479,6 +492,7 @@ description = "Pure, liquid confetti. Explodes into a colorful bomb when exposed to heat." color = "#500064" // rgb: 80, 0, 100 taste_description = "the tears of janitors" + yuck_description = "grit in your tubes" /datum/reagent/confetti/reaction_turf(turf/T, volume) var/confetti = /obj/effect/decal/cleanable/confetti diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm index b0234114fb6..24cd5ef25b4 100644 --- a/code/modules/reagents/chemistry/reagents/toxins.dm +++ b/code/modules/reagents/chemistry/reagents/toxins.dm @@ -45,6 +45,7 @@ reagent_state = LIQUID color = "#0b8f70" // rgb: 11, 143, 112 taste_description = "slimes" + yuck_description = "grime in your gears" taste_mult = 1.3 /datum/reagent/slimejelly/reaction_mob(mob/living/M, method, volume, show_message) @@ -136,6 +137,7 @@ reagent_state = LIQUID color = "#484848" // rgb: 72, 72, 72 taste_description = "sweet" + yuck_description = "heaviness" /datum/reagent/lead/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE @@ -175,6 +177,7 @@ penetrates_skin = TRUE process_flags = ORGANIC | SYNTHETIC taste_description = "acid" + taste_flag = ORGANIC | SYNTHETIC /datum/reagent/fluorine/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE @@ -190,6 +193,7 @@ color = "#C7C7C7" // rgb: 199,199,199 penetrates_skin = TRUE taste_description = "the colour blue and regret" + taste_flag = ORGANIC | SYNTHETIC /datum/reagent/radium/on_mob_life(mob/living/M) if(M.radiation < 80) @@ -209,6 +213,7 @@ metabolization_rate = 0.3 taste_mult = 0.9 taste_description = "slime" + yuck_description = "grime in your gears" goal_department = "Science" goal_difficulty = REAGENT_GOAL_EASY @@ -236,6 +241,7 @@ reagent_state = LIQUID color = "#7DFF00" taste_description = "slime" + yuck_description = "grime in your gears" /datum/reagent/stable_mutagen/on_new(data) ..() @@ -271,6 +277,7 @@ color = "#B8B8C0" // rgb: 184, 184, 192 taste_mult = 0 taste_description = "the inside of a reactor" + taste_flag = ORGANIC | SYNTHETIC /datum/reagent/uranium/on_mob_life(mob/living/M) M.apply_effect(2, IRRADIATE) @@ -306,6 +313,7 @@ color = "#00FF32" process_flags = ORGANIC | SYNTHETIC taste_description = SPAN_USERDANGER("ACID") + taste_flag = ORGANIC | SYNTHETIC var/acidpwr = 10 //the amount of protection removed from the armour goal_department = "Science" goal_difficulty = REAGENT_GOAL_EASY @@ -430,6 +438,7 @@ color = "#0080ff" reagent_state = LIQUID taste_description = "vinegar" + yuck_description = "cosmetic component damage" goal_department = "Science" goal_difficulty = REAGENT_GOAL_EASY @@ -460,6 +469,7 @@ description = "A clear and odourless moderately strong acid. It's a pretty good rust remover." color = "#0080ff" taste_description = "sour" + yuck_description = "maintenance" goal_department = "Science" goal_difficulty = REAGENT_GOAL_EASY @@ -544,6 +554,7 @@ drink_name = "Beer glass" drink_desc = "A freezing pint of beer." taste_description = "beer" + yuck_description = "the assembly line" /datum/reagent/beer2/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE @@ -666,6 +677,7 @@ color = "#B44B00" penetrates_skin = TRUE taste_description = "bitterness" + yuck_description = "the assembly line" goal_department = "Science" goal_difficulty = REAGENT_GOAL_EASY @@ -684,6 +696,7 @@ color = "#B44B00" penetrates_skin = TRUE taste_description = "apples" + yuck_description = "the assembly line" goal_department = "Science" goal_difficulty = REAGENT_GOAL_EASY @@ -990,6 +1003,7 @@ color = "#D1DED1" metabolization_rate = 0.2 taste_description = "battery acid" + taste_flag = ORGANIC | SYNTHETIC /datum/reagent/lipolicide/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE @@ -1294,6 +1308,7 @@ reagent_state = LIQUID color = "#00FD00" taste_description = "slime" + yuck_description = "bright grime in your gears" /datum/reagent/glowing_slurry/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume) //same as mutagen if(!M || !M.dna) @@ -1326,6 +1341,7 @@ color = "#993333" process_flags = ORGANIC | SYNTHETIC taste_description = SPAN_WARNING("ANTS OH GOD") + taste_flag = ORGANIC | SYNTHETIC /datum/reagent/ants/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE @@ -1356,6 +1372,7 @@ process_flags = ORGANIC | SYNTHETIC taste_description = "electricity" + taste_flag = ORGANIC | SYNTHETIC /datum/reagent/teslium/on_mob_life(mob/living/M) shock_timer++ @@ -1410,6 +1427,7 @@ description = "Glass, crushed into a coarse powder made up of razor-sharp shards." color = "#87c6dac8" taste_description = SPAN_USERDANGER("Broken glass!") + taste_flag = ORGANIC | SYNTHETIC /datum/reagent/glass_shards/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE diff --git a/code/modules/reagents/chemistry/reagents/water.dm b/code/modules/reagents/chemistry/reagents/water.dm index d07a889d700..6ce188b7047 100644 --- a/code/modules/reagents/chemistry/reagents/water.dm +++ b/code/modules/reagents/chemistry/reagents/water.dm @@ -14,6 +14,7 @@ reagent_state = LIQUID color = "#0064C8" // rgb: 0, 100, 200 taste_description = "water" + taste_flag = ORGANIC | SYNTHETIC process_flags = ORGANIC | SYNTHETIC drink_icon = "glass_clear" drink_name = "Glass of Water" @@ -38,6 +39,7 @@ color = "#1BB1AB" harmless = TRUE taste_description = "cherry" + yuck_description = "smooth joints" /datum/reagent/lube/reaction_turf(turf/simulated/T, volume) if(volume >= 1 && istype(T)) @@ -51,7 +53,9 @@ reagent_state = LIQUID color = "#61C2C2" harmless = TRUE - taste_description = "floor cleaner" + taste_description = "squeaky clean components" + taste_flag = SYNTHETIC + yuck_description = "floor cleaner" process_flags = ORGANIC | SYNTHETIC /datum/reagent/space_cleaner/reaction_obj(obj/O, volume) @@ -96,6 +100,7 @@ drink_name = "Glass of Tomato juice" drink_desc = "Are you sure this is tomato juice?" taste_description = SPAN_WARNING("blood") + yuck_description = "grime in your gears" taste_mult = 1.3 /datum/reagent/blood/reaction_mob(mob/living/M, method = REAGENT_TOUCH, volume) @@ -253,6 +258,7 @@ reagent_state = LIQUID color = "#757547" taste_description = "puke" + yuck_description = "grime in your gears" /datum/reagent/fishwater/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume) if(method == REAGENT_INGEST) @@ -288,6 +294,7 @@ drink_name = "Glass of Water" drink_desc = "The father of all refreshments." taste_description = "water" + taste_flag = ORGANIC | SYNTHETIC /datum/reagent/holywater/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE @@ -456,6 +463,7 @@ but is incredibly harmful to the closed-minded. It metabolizes very quickly." taste_description = "Ag'hsj'saje'sh" process_flags = ORGANIC | SYNTHETIC + taste_flag = ORGANIC | SYNTHETIC color = "#1f8016" metabolization_rate = 1 @@ -529,6 +537,7 @@ process_flags = ORGANIC | SYNTHETIC //Admin-bus has no brakes! KILL THEM ALL. metabolization_rate = 1 taste_description = "burning" + taste_flag = ORGANIC | SYNTHETIC /datum/reagent/hellwater/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE @@ -546,6 +555,7 @@ description = "You don't even want to think about what's in here." reagent_state = LIQUID taste_description = "meat" + yuck_description = "grime in your gears" /datum/reagent/liquidgibs/reaction_turf(turf/T, volume) //yes i took it from synthflesh... if(volume >= 5 && !isspaceturf(T)) @@ -559,6 +569,7 @@ reagent_state = LIQUID color = "#FFFFD6" // very very light yellow taste_description = SPAN_USERDANGER("ACID")//don't drink lye, kids + taste_flag = ORGANIC | SYNTHETIC /datum/reagent/drying_agent name = "Drying agent" @@ -567,6 +578,7 @@ reagent_state = LIQUID color = "#A70FFF" taste_description = "dry mouth" + yuck_description = "dry chassis" /datum/reagent/drying_agent/reaction_turf(turf/simulated/T, volume) if(istype(T) && T.wet) @@ -585,6 +597,7 @@ reagent_state = LIQUID color = "#29262b" taste_description = "burnt dirt" + yuck_description = "powder coating" /datum/reagent/tar_compound name = "Sticky tar" @@ -593,6 +606,7 @@ reagent_state = LIQUID color = "#4B4B4B" taste_description = "processed sludge" + yuck_description = "sticky grime in your gears" /datum/reagent/tar_compound/reaction_turf(turf/simulated/T, volume) if(volume < 1 || !issimulatedturf(T)) diff --git a/code/modules/reagents/chemistry/reagents_datum.dm b/code/modules/reagents/chemistry/reagents_datum.dm index 033a878d341..17f4dd15b15 100644 --- a/code/modules/reagents/chemistry/reagents_datum.dm +++ b/code/modules/reagents/chemistry/reagents_datum.dm @@ -35,7 +35,9 @@ var/drink_name = "Glass of ..what?" var/drink_desc = "You can't really tell what this is." var/taste_mult = 1 //how easy it is to taste - the more the easier + var/taste_flag = ORGANIC var/taste_description = "metaphorical salt" + var/yuck_description = null // message they'll get if they meet sensitivity but don't match taste flag, not required /// how quickly the addiction threshold var decays var/addiction_decay_rate = 0.01 diff --git a/code/modules/reagents/chemistry/reagents_holder.dm b/code/modules/reagents/chemistry/reagents_holder.dm index 11b9024aec7..496eea0405a 100644 --- a/code/modules/reagents/chemistry/reagents_holder.dm +++ b/code/modules/reagents/chemistry/reagents_holder.dm @@ -935,19 +935,19 @@ trans_data["viruses"] = temp return trans_data -/datum/reagents/proc/generate_taste_message(minimum_percent = TASTE_SENSITIVITY_NORMAL) +/datum/reagents/proc/generate_taste_message(minimum_percent = TASTE_SENSITIVITY_NORMAL, taste_category = TASTE_CATEGORY_ORGANIC) var/list/out = list() var/list/reagent_tastes = list() //in the form reagent_tastes["descriptor"] = strength //mobs should get this message when either they cannot taste, the tastes are all too weak for them to detect, or the tastes somehow don't have any strength var/no_taste_text = "something indescribable" - if(minimum_percent > 100) + if(minimum_percent > 100 || taste_category == TASTE_CATEGORY_NONE) return no_taste_text for(var/A in reagent_list) var/datum/reagent/R = A if(!R.taste_mult) continue //nutriment carries a list of tastes that originates from the snack food that the nutriment came from - if(istype(R, /datum/reagent/consumable/nutriment)) + if(istype(R, /datum/reagent/consumable/nutriment) && taste_category & TASTE_CATEGORY_ORGANIC) var/list/nutriment_taste_data = R.data for(var/nutriment_taste in nutriment_taste_data) var/ratio = nutriment_taste_data[nutriment_taste] @@ -957,14 +957,18 @@ else reagent_tastes[nutriment_taste] = amount else - var/taste_desc = R.taste_description + var/taste_desc = R.yuck_description + if(taste_category & R.taste_flag) // if they can taste this category, give them the real taste description + taste_desc = R.taste_description + if(!taste_desc) // if the description ends up empty, skip this taste + continue var/taste_amount = R.volume * R.taste_mult if(taste_desc in reagent_tastes) reagent_tastes[taste_desc] += taste_amount else reagent_tastes[taste_desc] = taste_amount //deal with percentages - //TODO: may want to sort these from strong to weak + sortTim(reagent_tastes, cmp = GLOBAL_PROC_REF(cmp_numeric_dsc), associative = TRUE) var/total_taste = counterlist_sum(reagent_tastes) if(total_taste <= 0) return no_taste_text @@ -972,7 +976,7 @@ var/percent = (reagent_tastes[taste_desc] / total_taste) * 100 if(percent < minimum_percent) //the lower the minimum percent, the more sensitive the message is continue - var/intensity_desc = "a hint of" + var/intensity_desc = pick("a hint of", "a dash of", "a bit of") if(percent > minimum_percent * 3 && percent != 100) intensity_desc = "a strong flavor of" else if(percent > minimum_percent * 2 || percent == 100)