From 84fdc3d9f1ffb2defe6264535bec4c2006b86d21 Mon Sep 17 00:00:00 2001 From: FlattestGuitar Date: Thu, 18 May 2017 02:24:27 +0200 Subject: [PATCH] Adds reagent taste messages --- code/modules/mob/living/living.dm | 2 + .../reagents/chemistry/reagents/alcohol.dm | 73 ++++++++++++++++++- .../reagents/chemistry/reagents/drink_base.dm | 2 +- .../reagents/chemistry/reagents/drink_cold.dm | 14 +++- .../reagents/chemistry/reagents/drinks.dm | 36 ++++++++- .../reagents/chemistry/reagents/drugs.dm | 6 +- .../reagents/chemistry/reagents/food.dm | 66 +++++++++++++++-- .../reagents/chemistry/reagents/medicine.dm | 1 + .../reagents/chemistry/reagents/misc.dm | 47 ++++++++++-- .../reagents/chemistry/reagents/paint.dm | 4 +- .../chemistry/reagents/paradise_pop.dm | 9 ++- .../chemistry/reagents/pyrotechnic.dm | 9 +++ .../reagents/chemistry/reagents/toxins.dm | 21 +++++- .../reagents/chemistry/reagents/water.dm | 12 ++- 14 files changed, 278 insertions(+), 24 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 4d145a19e7c..07fd0abf283 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -867,6 +867,8 @@ for(var/datum/reagent/R in tastes.reagent_list) taste_sum += R.volume * R.taste_strength + if(!R.taste_message)//set to null; no taste, like water + continue taste_list[R.taste_message] += R.volume * R.taste_strength for(var/R in taste_list) diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm index b07e9da9124..fe224331f71 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol.dm @@ -9,6 +9,7 @@ can_grow_in_plants = 0 //Alcoholic drinks won't be grown in plants (would "water down" random seed chems too much) var/dizzy_adj = 3 var/alcohol_perc = 1 //percentage of ethanol in a beverage 0.0 - 1.0 + taste_message = "strong alcohol" /datum/reagent/consumable/ethanol/on_mob_life(mob/living/M) M.AdjustDrunk(alcohol_perc) @@ -43,6 +44,7 @@ drink_icon ="beerglass" drink_name = "Beer glass" drink_desc = "A freezing pint of beer" + taste_message = "beer" /datum/reagent/consumable/ethanol/cider name = "Cider" @@ -54,6 +56,7 @@ drink_icon = "rewriter" drink_name = "Cider" drink_desc = "a refreshing glass of traditional cider" + taste_message = "cider" /datum/reagent/consumable/ethanol/whiskey name = "Whiskey" @@ -72,6 +75,7 @@ description = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything." color = "#664300" // rgb: 102, 67, 0 alcohol_perc = 0.5 + taste_message = "pure class" /datum/reagent/consumable/ethanol/gin name = "Gin" @@ -95,6 +99,7 @@ drink_icon = "absinthebottle" drink_name = "Glass of Absinthe" drink_desc = "The green fairy is going to get you now!" + taste_message = "fucking pain" //copy paste from LSD... shoot me /datum/reagent/consumable/ethanol/absinthe/on_mob_life(mob/living/M) @@ -128,6 +133,7 @@ drink_icon = "mojito" drink_name = "Glass of Mojito" drink_desc = "Fresh from Spesscuba." + taste_message = "mojito" /datum/reagent/consumable/ethanol/vodka name = "Vodka" @@ -148,6 +154,7 @@ drink_icon = "ginvodkaglass" drink_name = "Glass of Sake" drink_desc = "A glass of Sake." + taste_message = "sake" /datum/reagent/consumable/ethanol/tequila name = "Tequila" @@ -168,6 +175,7 @@ drink_icon = "vermouthglass" drink_name = "Glass of Vermouth" drink_desc = "You wonder why you're even drinking this straight." + taste_message = "vermouth" /datum/reagent/consumable/ethanol/wine name = "Wine" @@ -179,6 +187,7 @@ drink_icon = "wineglass" drink_name = "Glass of wine" drink_desc = "A very classy looking drink." + taste_message = "wine" /datum/reagent/consumable/ethanol/cognac name = "Cognac" @@ -201,6 +210,7 @@ drink_icon = "suicider" drink_name = "Suicider" drink_desc = "You've really hit rock bottom now... your liver packed its bags and left last night." + taste_message = "approaching death" /datum/reagent/consumable/ethanol/ale name = "Ale" @@ -211,6 +221,7 @@ drink_icon = "aleglass" drink_name = "Ale glass" drink_desc = "A freezing pint of delicious Ale" + taste_message = "ale" /datum/reagent/consumable/ethanol/thirteenloko name = "Thirteen Loko" @@ -224,6 +235,7 @@ drink_icon = "thirteen_loko_glass" drink_name = "Glass of Thirteen Loko" drink_desc = "This is a glass of Thirteen Loko, it appears to be of the highest quality. The drink, not the glass" + taste_message = "party" /datum/reagent/consumable/ethanol/thirteenloko/on_mob_life(mob/living/M) M.AdjustDrowsy(-7) @@ -247,6 +259,7 @@ drink_icon = "glass_brown" drink_name = "Glass of bilk" drink_desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis." + taste_message = "bilk" /datum/reagent/consumable/ethanol/atomicbomb name = "Atomic Bomb" @@ -258,6 +271,7 @@ drink_icon = "atomicbombglass" drink_name = "Atomic Bomb" drink_desc = "Nanotrasen cannot take legal responsibility for your actions after imbibing." + taste_message = "fruity alcohol" /datum/reagent/consumable/ethanol/threemileisland name = "THree Mile Island Iced Tea" @@ -269,6 +283,7 @@ drink_icon = "threemileislandglass" drink_name = "Three Mile Island Ice Tea" drink_desc = "A glass of this is sure to prevent a meltdown." + taste_message = "fruity alcohol" /datum/reagent/consumable/ethanol/goldschlager name = "Goldschlager" @@ -313,6 +328,7 @@ drink_icon = "cubalibreglass" drink_name = "Cuba Libre" drink_desc = "A classic mix of rum and cola." + taste_message = "fruity alcohol" /datum/reagent/consumable/ethanol/whiskey_cola name = "Whiskey Cola" @@ -324,6 +340,7 @@ drink_icon = "whiskeycolaglass" drink_name = "Whiskey Cola" drink_desc = "An innocent-looking mixture of cola and Whiskey. Delicious." + taste_message = "whiskey and coke" /datum/reagent/consumable/ethanol/martini name = "Classic Martini" @@ -335,6 +352,7 @@ drink_icon = "martiniglass" drink_name = "Classic Martini" drink_desc = "Damn, the bartender even stirred it, not shook it." + taste_message = "martini" /datum/reagent/consumable/ethanol/vodkamartini name = "Vodka Martini" @@ -357,6 +375,7 @@ drink_icon = "whiterussianglass" drink_name = "White Russian" drink_desc = "A very nice looking drink. But that's just, like, your opinion, man." + taste_message = "creamy alcohol" /datum/reagent/consumable/ethanol/screwdrivercocktail name = "Screwdriver" @@ -368,6 +387,7 @@ drink_icon = "screwdriverglass" drink_name = "Screwdriver" drink_desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer." + taste_message = "fruity alcohol" /datum/reagent/consumable/ethanol/booger name = "Booger" @@ -379,6 +399,7 @@ drink_icon = "booger" drink_name = "Booger" drink_desc = "Ewww..." + taste_message = "sweet alcohol" /datum/reagent/consumable/ethanol/bloody_mary name = "Bloody Mary" @@ -390,6 +411,7 @@ drink_icon = "bloodymaryglass" drink_name = "Bloody Mary" drink_desc = "Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder." + taste_message = "tomatoes with booze" /datum/reagent/consumable/ethanol/gargle_blaster name = "Pan-Galactic Gargle Blaster" @@ -401,6 +423,7 @@ drink_icon = "gargleblasterglass" drink_name = "Pan-Galactic Gargle Blaster" drink_desc = "Does... does this mean that Arthur and Ford are on the station? Oh joy." + taste_message = "the number fourty-two, somehow" /datum/reagent/consumable/ethanol/brave_bull name = "Brave Bull" @@ -412,6 +435,7 @@ drink_icon = "bravebullglass" drink_name = "Brave Bull" drink_desc = "Tequila and Coffee liquor, brought together in a mouthwatering mixture. Drink up." + taste_message = "sweet alcohol" /datum/reagent/consumable/ethanol/tequila_sunrise name = "Tequila Sunrise" @@ -423,6 +447,7 @@ drink_icon = "tequilasunriseglass" drink_name = "Tequila Sunrise" drink_desc = "Oh great, now you feel nostalgic about sunrises back on Terra..." + taste_message = "fruity alcohol" /datum/reagent/consumable/ethanol/toxins_special name = "Toxins Special" @@ -434,6 +459,7 @@ drink_icon = "toxinsspecialglass" drink_name = "Toxins Special" drink_desc = "Whoah, this thing is on FIRE" + taste_message = "FIRE" /datum/reagent/consumable/ethanol/toxins_special/on_mob_life(mob/living/M) if(M.bodytemperature < 330) @@ -450,6 +476,7 @@ drink_icon = "beepskysmashglass" drink_name = "Beepsky Smash" drink_desc = "Heavy, hot and strong. Just like the Iron fist of the LAW." + taste_message = "THE LAW" /datum/reagent/consumable/ethanol/beepsky_smash/on_mob_life(mob/living/M) M.Stun(1) @@ -465,6 +492,7 @@ drink_icon = "irishcreamglass" drink_name = "Irish Cream" drink_desc = "It's cream, mixed with whiskey. What else would you expect from the Irish?" + taste_message = "creamy alcohol" /datum/reagent/consumable/ethanol/manly_dorf name = "The Manly Dorf" @@ -476,6 +504,7 @@ drink_icon = "manlydorfglass" drink_name = "The Manly Dorf" drink_desc = "A manly concotion made from Ale and Beer. Intended for true men only." + taste_message = "manliness" /datum/reagent/consumable/ethanol/longislandicedtea name = "Long Island Iced Tea" @@ -487,6 +516,7 @@ drink_icon = "longislandicedteaglass" 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_message = "fruity alcohol" /datum/reagent/consumable/ethanol/moonshine name = "Moonshine" @@ -498,6 +528,7 @@ drink_icon = "glass_clear" drink_name = "Moonshine" drink_desc = "You've really hit rock bottom now... your liver packed its bags and left last night." + taste_message = "the proletaryat" /datum/reagent/consumable/ethanol/b52 name = "B-52" @@ -509,6 +540,7 @@ drink_icon = "b52glass" drink_name = "B-52" drink_desc = "Kahlua, Irish Cream, and congac. You will get bombed." + taste_message = "creamy alcohol" /datum/reagent/consumable/ethanol/irishcoffee name = "Irish Coffee" @@ -520,6 +552,7 @@ drink_icon = "irishcoffeeglass" drink_name = "Irish Coffee" drink_desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning." + taste_message = "coffee and booze" /datum/reagent/consumable/ethanol/margarita name = "Margarita" @@ -531,6 +564,7 @@ drink_icon = "margaritaglass" drink_name = "Margarita" drink_desc = "On the rocks with salt on the rim. Arriba~!" + taste_message = "fruity alcohol" /datum/reagent/consumable/ethanol/black_russian name = "Black Russian" @@ -542,6 +576,7 @@ drink_icon = "blackrussianglass" drink_name = "Black Russian" drink_desc = "For the lactose-intolerant. Still as classy as a White Russian." + taste_message = "sweet alcohol" /datum/reagent/consumable/ethanol/manhattan name = "Manhattan" @@ -553,6 +588,7 @@ drink_icon = "manhattanglass" drink_name = "Manhattan" drink_desc = "The Detective's undercover drink of choice. He never could stomach gin..." + taste_message = "bitter alcohol" /datum/reagent/consumable/ethanol/manhattan_proj name = "Manhattan Project" @@ -564,6 +600,7 @@ drink_icon = "proj_manhattanglass" drink_name = "Manhattan Project" drink_desc = "A scienitst drink of choice, for thinking how to blow up the station." + taste_message = "bitter alcohol" /datum/reagent/consumable/ethanol/whiskeysoda name = "Whiskey Soda" @@ -575,6 +612,7 @@ drink_icon = "whiskeysodaglass2" drink_name = "Whiskey Soda" drink_desc = "Ultimate refreshment." + taste_message = "mediocrity" /datum/reagent/consumable/ethanol/antifreeze name = "Anti-freeze" @@ -586,6 +624,7 @@ drink_icon = "antifreeze" drink_name = "Anti-freeze" drink_desc = "The ultimate refreshment." + taste_message = "poor life choices" /datum/reagent/consumable/ethanol/antifreeze/on_mob_life(mob/living/M) if(M.bodytemperature < 330) @@ -602,6 +641,7 @@ drink_icon = "b&p" drink_name = "Barefoot" drink_desc = "Barefoot and pregnant" + taste_message = "sweet alcohol" /datum/reagent/consumable/ethanol/snowwhite name = "Snow White" @@ -613,6 +653,7 @@ drink_icon = "snowwhite" drink_name = "Snow White" drink_desc = "A cold refreshment." + taste_message = "refreshing alcohol" /datum/reagent/consumable/ethanol/demonsblood name = "Demons Blood" @@ -625,6 +666,7 @@ drink_icon = "demonsblood" drink_name = "Demons Blood" drink_desc = "Just looking at this thing makes the hair at the back of your neck stand up." + taste_message = "evil" /datum/reagent/consumable/ethanol/vodkatonic name = "Vodka and Tonic" @@ -637,6 +679,7 @@ drink_icon = "vodkatonicglass" drink_name = "Vodka and Tonic" drink_desc = "For when a gin and tonic isn't russian enough." + taste_message = "fizzy alcohol" /datum/reagent/consumable/ethanol/ginfizz name = "Gin Fizz" @@ -649,6 +692,7 @@ drink_icon = "ginfizzglass" drink_name = "Gin Fizz" drink_desc = "Refreshingly lemony, deliciously dry." + taste_message = "fizzy alcohol" /datum/reagent/consumable/ethanol/bahama_mama name = "Bahama mama" @@ -660,6 +704,7 @@ drink_icon = "bahama_mama" drink_name = "Bahama Mama" drink_desc = "Tropic cocktail" + taste_message = "fruity alcohol" /datum/reagent/consumable/ethanol/singulo name = "Singulo" @@ -672,6 +717,7 @@ drink_icon = "singulo" drink_name = "Singulo" drink_desc = "A blue-space beverage." + taste_message = "infinity" /datum/reagent/consumable/ethanol/sbiten name = "Sbiten" @@ -683,6 +729,7 @@ drink_icon = "sbitenglass" drink_name = "Sbiten" drink_desc = "A spicy mix of Vodka and Spice. Very hot." + taste_message = "spicy alcohol" /datum/reagent/consumable/ethanol/sbiten/on_mob_life(mob/living/M) if(M.bodytemperature < 360) @@ -699,6 +746,7 @@ drink_icon = "devilskiss" drink_name = "Devils Kiss" drink_desc = "Creepy time!" + taste_message = "blood mixed with alcohol" /datum/reagent/consumable/ethanol/red_mead name = "Red Mead" @@ -710,6 +758,7 @@ drink_icon = "red_meadglass" drink_name = "Red Mead" drink_desc = "A True Vikings Beverage, though its color is strange." + taste_message = "blood mixed with alcohol" /datum/reagent/consumable/ethanol/mead name = "Mead" @@ -722,6 +771,7 @@ drink_icon = "meadglass" drink_name = "Mead" drink_desc = "A Vikings Beverage, though a cheap one." + taste_message = "sweet alcohol" /datum/reagent/consumable/ethanol/iced_beer name = "Iced Beer" @@ -733,6 +783,7 @@ drink_icon = "iced_beerglass" drink_name = "Iced Beer" drink_desc = "A beer so frosty, the air around it freezes." + taste_message = "refreshing alcohol" /datum/reagent/consumable/ethanol/iced_beer/on_mob_life(mob/living/M) if(M.bodytemperature > 270) @@ -749,6 +800,7 @@ drink_icon = "grogglass" drink_name = "Grog" drink_desc = "A fine and cepa drink for Space." + taste_message = "rum" /datum/reagent/consumable/ethanol/aloe name = "Aloe" @@ -760,6 +812,7 @@ drink_icon = "aloe" drink_name = "Aloe" drink_desc = "Very, very, very good." + taste_message = "sweet alcohol" /datum/reagent/consumable/ethanol/andalusia name = "Andalusia" @@ -771,6 +824,7 @@ drink_icon = "andalusia" drink_name = "Andalusia" drink_desc = "A nice, strange named drink." + taste_message = "sweet alcohol" /datum/reagent/consumable/ethanol/alliescocktail name = "Allies Cocktail" @@ -782,6 +836,7 @@ drink_icon = "alliescocktail" drink_name = "Allies cocktail" drink_desc = "A drink made from your allies." + taste_message = "bitter alcohol" /datum/reagent/consumable/ethanol/acid_spit name = "Acid Spit" @@ -793,6 +848,7 @@ drink_icon = "acidspitglass" drink_name = "Acid Spit" drink_desc = "A drink from Nanotrasen. Made from live aliens." + taste_message = "PAIN" /datum/reagent/consumable/ethanol/amasec name = "Amasec" @@ -804,6 +860,7 @@ drink_icon = "amasecglass" drink_name = "Amasec" drink_desc = "Always handy before COMBAT!!!" + taste_message = "a stunbaton" /datum/reagent/consumable/ethanol/neurotoxin name = "Neuro-toxin" @@ -817,6 +874,7 @@ drink_icon = "neurotoxinglass" drink_name = "Neurotoxin" drink_desc = "A drink that is guaranteed to knock you silly." + taste_message = "brain damageeeEEeee" /datum/reagent/consumable/ethanol/neurotoxin/on_mob_life(mob/living/M) M.Weaken(3) @@ -869,6 +927,7 @@ drink_icon = "changelingsting" drink_name = "Changeling Sting" drink_desc = "A stingy drink." + taste_message = "a tiny prick" /datum/reagent/consumable/ethanol/irishcarbomb name = "Irish Car Bomb" @@ -881,6 +940,7 @@ drink_icon = "irishcarbomb" drink_name = "Irish Car Bomb" drink_desc = "An irish car bomb." + taste_message = "creamy alcohol" /datum/reagent/consumable/ethanol/syndicatebomb name = "Syndicate Bomb" @@ -892,6 +952,7 @@ drink_icon = "syndicatebomb" drink_name = "Syndicate Bomb" drink_desc = "A syndicate bomb." + taste_message = "a job offer" /datum/reagent/consumable/ethanol/erikasurprise name = "Erika Surprise" @@ -903,6 +964,7 @@ drink_icon = "erikasurprise" name = "Erika Surprise" drink_desc = "The surprise is, it's green!" + taste_message = "sweet alcohol" /datum/reagent/consumable/ethanol/driestmartini name = "Driest Martini" @@ -915,6 +977,7 @@ drink_icon = "driestmartiniglass" drink_name = "Driest Martini" drink_desc = "Only for the experienced. You think you see sand floating in the glass." + taste_message = "bitter alcohol" /datum/reagent/consumable/ethanol/driestmartini/on_mob_life(mob/living/M) if(current_cycle >= 55 && current_cycle < 115) @@ -930,6 +993,7 @@ drink_icon = "kahluaglass" drink_name = "Glass of RR coffee Liquor" drink_desc = "DAMN, THIS THING LOOKS ROBUST" + taste_message = "sweet alcohol" /datum/reagent/consumable/ethanol/kahlua/on_mob_life(mob/living/M) M.AdjustDizzy(-5) @@ -947,6 +1011,7 @@ drink_icon = "ginsonic" drink_name = "Gin and Sonic" drink_desc = "An extremely high amperage drink. Absolutely not for the true Englishman." + taste_message = "SPEED" /datum/reagent/ginsonic/on_mob_life(mob/living/M) M.AdjustDrowsy(-5) @@ -972,6 +1037,7 @@ drink_icon = "cognacglass" drink_name = "Glass of applejack" drink_desc = "When cider isn't strong enough, you gotta jack it." + taste_message = "strong cider" /datum/reagent/consumable/ethanol/jackrose name = "Jack Rose" @@ -982,6 +1048,7 @@ drink_icon = "patronglass" drink_name = "Jack Rose" drink_desc = "Drinking this makes you feel like you belong in a luxury hotel bar during the 1920s." + taste_message = "style" /datum/reagent/consumable/ethanol/drunkenblumpkin name = "Drunken Blumpkin" @@ -992,6 +1059,7 @@ drink_icon = "drunkenblumpkin" drink_name = "Drunken Blumpkin" drink_desc = "A drink for the drunks" + taste_message = "weirdness" /datum/reagent/consumable/ethanol/eggnog name = "Eggnog" @@ -1003,6 +1071,7 @@ drink_icon = "glass_yellow" drink_name = "Eggnog" drink_desc = "For enjoying the most wonderful time of the year." + taste_message = "christmas spirit" /datum/reagent/consumable/ethanol/dragons_breath //inaccessible to players, but here for admin shennanigans name = "Dragon's Breath" @@ -1012,6 +1081,7 @@ color = "#DC0000" alcohol_perc = 1 can_synth = 0 + taste_message = "LIQUID FUCKING DEATH OH GOD WHAT THE FUCK" /datum/reagent/consumable/ethanol/dragons_breath/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == INGEST && prob(20)) @@ -1059,6 +1129,7 @@ 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_message = "motor oil mixed with puke" /datum/reagent/consumable/ethanol/synthanol/on_mob_life(mob/living/M) if(!M.isSynthetic()) @@ -1138,4 +1209,4 @@ alcohol_perc = 0.25 drink_icon = "synthignonglass" drink_name = "Glass of Synthignon" - drink_desc = "Someone mixed good wine and robot booze. Romantic, but atrocious." \ No newline at end of file + drink_desc = "Someone mixed good wine and robot booze. Romantic, but atrocious." diff --git a/code/modules/reagents/chemistry/reagents/drink_base.dm b/code/modules/reagents/chemistry/reagents/drink_base.dm index 25484983a4f..a924d84349b 100644 --- a/code/modules/reagents/chemistry/reagents/drink_base.dm +++ b/code/modules/reagents/chemistry/reagents/drink_base.dm @@ -23,4 +23,4 @@ if(adj_temp_cool) if(M.bodytemperature > 310)//310 is the normal bodytemp. 310.055 M.bodytemperature = max(310, M.bodytemperature - (adj_temp_cool * TEMPERATURE_DAMAGE_COEFFICIENT)) - ..() \ No newline at end of file + ..() diff --git a/code/modules/reagents/chemistry/reagents/drink_cold.dm b/code/modules/reagents/chemistry/reagents/drink_cold.dm index ffd43a81840..a92d8644c6b 100644 --- a/code/modules/reagents/chemistry/reagents/drink_cold.dm +++ b/code/modules/reagents/chemistry/reagents/drink_cold.dm @@ -1,6 +1,7 @@ /datum/reagent/consumable/drink/cold name = "Cold drink" adj_temp_cool = 5 + taste_message = null /datum/reagent/consumable/drink/cold/tonic name = "Tonic Water" @@ -50,6 +51,7 @@ drink_icon = "glass_brown" drink_name = "Glass of Space Cola" drink_desc = "A glass of refreshing Space Cola" + taste_message = "cola" /datum/reagent/consumable/drink/cold/nuka_cola name = "Nuka Cola" @@ -60,6 +62,7 @@ drink_icon = "nuka_colaglass" drink_name = "Nuka Cola" drink_desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland" + taste_message = "cola" /datum/reagent/consumable/drink/cold/nuka_cola/on_mob_life(mob/living/M) M.Jitter(20) @@ -83,6 +86,7 @@ drink_icon = "Space_mountain_wind_glass" drink_name = "Glass of Space Mountain Wind" drink_desc = "Space Mountain Wind. As you know, there are no mountains in space, only wind." + taste_message = "lime soda" /datum/reagent/consumable/drink/cold/dr_gibb name = "Dr. Gibb" @@ -93,6 +97,7 @@ drink_icon = "dr_gibb_glass" drink_name = "Glass of Dr. Gibb" drink_desc = "Dr. Gibb. Not as dangerous as the name might imply." + taste_message = "cherry soda" /datum/reagent/consumable/drink/cold/space_up name = "Space-Up" @@ -103,6 +108,7 @@ drink_icon = "space-up_glass" drink_name = "Glass of Space-up" drink_desc = "Space-up. It helps keep your cool." + taste_message = "lemon soda" /datum/reagent/consumable/drink/cold/lemon_lime name = "Lemon Lime" @@ -110,6 +116,7 @@ id = "lemon_lime" color = "#878F00" // rgb: 135, 40, 0 adj_temp_cool = 8 + taste_message = "citrus soda" /datum/reagent/consumable/drink/cold/lemonade name = "Lemonade" @@ -119,6 +126,7 @@ drink_icon = "lemonade" drink_name = "Lemonade" drink_desc = "Oh the nostalgia..." + taste_message = "lemonade" /datum/reagent/consumable/drink/cold/kiraspecial name = "Kira Special" @@ -128,6 +136,7 @@ drink_icon = "kiraspecial" drink_name = "Kira Special" drink_desc = "Long live the guy who everyone had mistaken for a girl. Baka!" + taste_message = "citrus soda" /datum/reagent/consumable/drink/cold/brownstar name = "Brown Star" @@ -138,6 +147,7 @@ drink_icon = "brownstar" drink_name = "Brown Star" drink_desc = "Its not what it sounds like..." + taste_message = "orange soda" /datum/reagent/consumable/drink/cold/milkshake name = "Milkshake" @@ -148,6 +158,7 @@ drink_icon = "milkshake" drink_name = "Milkshake" drink_desc = "Glorious brainfreezing mixture." + taste_message = "milkshake" /datum/reagent/consumable/drink/cold/rewriter name = "Rewriter" @@ -157,7 +168,8 @@ drink_icon = "rewriter" drink_name = "Rewriter" drink_desc = "The secert of the sanctuary of the Libarian..." + taste_message = "coffee...soda?" /datum/reagent/consumable/drink/cold/rewriter/on_mob_life(mob/living/M) M.Jitter(5) - ..() \ No newline at end of file + ..() diff --git a/code/modules/reagents/chemistry/reagents/drinks.dm b/code/modules/reagents/chemistry/reagents/drinks.dm index 7db9387c3ff..47b4111a67d 100644 --- a/code/modules/reagents/chemistry/reagents/drinks.dm +++ b/code/modules/reagents/chemistry/reagents/drinks.dm @@ -6,6 +6,7 @@ drink_icon = "glass_orange" drink_name = "Glass of Orange juice" drink_desc = "Vitamins! Yay!" + taste_message = "orange juice" /datum/reagent/consumable/drink/orangejuicde/on_mob_life(mob/living/M) if(M.getOxyLoss() && prob(30)) @@ -20,6 +21,7 @@ drink_icon = "glass_red" drink_name = "Glass of Tomato juice" drink_desc = "Are you sure this is tomato juice?" + taste_message = "tomato juice" /datum/reagent/consumable/drink/tomatojuice/on_mob_life(mob/living/M) if(M.getFireLoss() && prob(20)) @@ -34,6 +36,7 @@ drink_icon = "glass_green" drink_name = "Glass of Lime juice" drink_desc = "A glass of sweet-sour lime juice." + taste_message = "lime juice" /datum/reagent/consumable/drink/limejuice/on_mob_life(mob/living/M) if(M.getToxLoss() && prob(20)) @@ -48,6 +51,7 @@ drink_icon = "carrotjuice" drink_name = "Glass of carrot juice" drink_desc = "It is just like a carrot but without crunching." + taste_message = "carrot juice" /datum/reagent/consumable/drink/carrotjuicde/on_mob_life(mob/living/M) M.AdjustEyeBlurry(-1) @@ -69,6 +73,7 @@ drink_icon = "doctorsdelightglass" drink_name = "Doctor's Delight" drink_desc = "A healthy mixture of juices, guaranteed to keep you healthy until the next toolboxing takes place." + taste_message = "healthy dietary choices" /datum/reagent/consumable/drink/doctors_delight/on_mob_life(mob/living/M) if(M.getToxLoss() && prob(20)) @@ -84,6 +89,7 @@ drink_icon = "triplecitrus" drink_name = "Glass of Triplecitrus Juice" drink_desc = "As colorful and healthy as it is delicious." + taste_message = "citrus juice" /datum/reagent/consumable/drink/triple_citrus/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == INGEST) @@ -97,6 +103,7 @@ drink_icon = "berryjuice" drink_name = "Glass of berry juice" drink_desc = "Berry juice. Or maybe its jam. Who cares?" + taste_message = "berry juice" /datum/reagent/consumable/drink/poisonberryjuice name = "Poison Berry Juice" @@ -106,6 +113,7 @@ drink_icon = "poisonberryjuice" drink_name = "Glass of poison berry juice" drink_desc = "A glass of deadly juice." + taste_message = "berry juice" /datum/reagent/consumable/drink/poisonberryjuice/on_mob_life(mob/living/M) M.adjustToxLoss(1) @@ -116,12 +124,14 @@ id = "applejuice" description = "The sweet juice of an apple, fit for all ages." color = "#ECFF56" // rgb: 236, 255, 86 + taste_message = "apple juice" /datum/reagent/consumable/drink/watermelonjuice name = "Watermelon Juice" id = "watermelonjuice" description = "Delicious juice made from watermelon." color = "#863333" // rgb: 134, 51, 51 + taste_message = "watermelon juice" /datum/reagent/consumable/drink/lemonjuice name = "Lemon Juice" @@ -131,12 +141,14 @@ drink_icon = "lemonglass" drink_name = "Glass of lemonjuice" drink_desc = "Sour..." + taste_message = "lemon juice" /datum/reagent/consumable/drink/grapejuice name = "Grape Juice" id = "grapejuice" description = "This juice is known to stain shirts." color = "#993399" // rgb: 153, 51, 153 + taste_message = "grape juice" /datum/reagent/consumable/drink/banana name = "Banana Juice" @@ -146,6 +158,7 @@ drink_icon = "banana" drink_name = "Glass of banana juice" drink_desc = "The raw essence of a banana. HONK" + taste_message = "banana juice" /datum/reagent/consumable/drink/banana/on_mob_life(mob/living/M) if((ishuman(M) && M.job in list("Clown") ) || issmall(M)) @@ -160,6 +173,7 @@ drink_icon = "nothing" drink_name = "Nothing" drink_desc = "Absolutely nothing." + taste_message = "nothing...how?" /datum/reagent/consumable/drink/nothing/on_mob_life(mob/living/M) if(ishuman(M) && M.job in list("Mime")) @@ -176,6 +190,7 @@ drink_icon = "glass_brown" drink_name = "Glass of potato juice" drink_desc = "Who in the hell requests this? Gross!" + taste_message = "puke, you're pretty sure" /datum/reagent/consumable/drink/milk name = "Milk" @@ -185,6 +200,7 @@ drink_icon = "glass_white" drink_name = "Glass of milk" drink_desc = "White and nutritious goodness!" + taste_message = "milk" /datum/reagent/consumable/drink/milk/on_mob_life(mob/living/M) if(M.getBruteLoss() && prob(20)) @@ -200,6 +216,7 @@ color = "#DFDFC7" // rgb: 223, 223, 199 drink_name = "Glass of soy milk" drink_desc = "White and nutritious soy goodness!" + taste_message = "fake milk" /datum/reagent/consumable/drink/milk/cream name = "Cream" @@ -208,12 +225,14 @@ color = "#DFD7AF" // rgb: 223, 215, 175 drink_name = "Glass of cream" drink_desc = "Ewwww..." + taste_message = "cream" /datum/reagent/consumable/drink/milk/chocolate_milk name = "Chocolate milk" id ="chocolate_milk" description = "Chocolate-flavored milk, tastes like being a kid again." color = "#85432C" + taste_message = "chocolate milk" /datum/reagent/consumable/drink/hot_coco name = "Hot Chocolate" @@ -225,6 +244,7 @@ drink_icon = "hot_coco" drink_name = "Glass of hot coco" drink_desc = "Delicious and cozy" + taste_message = "chocolate" /datum/reagent/consumable/drink/coffee name = "Coffee" @@ -242,6 +262,7 @@ drink_icon = "glass_brown" drink_name = "Glass of coffee" drink_desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere." + taste_message = "coffee" /datum/reagent/consumable/drink/coffee/on_mob_life(mob/living/M) if(holder.has_reagent("frostoil")) @@ -266,6 +287,7 @@ drink_icon = "icedcoffeeglass" drink_name = "Iced Coffee" drink_desc = "A drink to perk you up and refresh you!" + taste_message = "coffee" /datum/reagent/consumable/drink/coffee/soy_latte name = "Soy Latte" @@ -322,6 +344,7 @@ drink_icon = "glass_brown" drink_name = "Glass of Tea" drink_desc = "A glass of hot tea. Perhaps a cup with a handle would have been smarter?" + taste_message = "tea" /datum/reagent/consumable/drink/tea/on_mob_life(mob/living/M) if(M.getToxLoss() && prob(20)) @@ -347,6 +370,7 @@ drink_icon = "bananahonkglass" drink_name = "Banana Honk" drink_desc = "A drink from Banana Heaven." + taste_message = "honks" /datum/reagent/consumable/drink/bananahonk/on_mob_life(mob/living/M) if((ishuman(M) && M.job in list("Clown") ) || issmall(M)) @@ -362,6 +386,7 @@ drink_icon = "silencerglass" drink_name = "Silencer" drink_desc = "A drink from mime Heaven." + taste_message = "mphhhh" /datum/reagent/consumable/drink/silencer/on_mob_life(mob/living/M) if(ishuman(M) && M.job in list("Mime")) @@ -378,6 +403,7 @@ drink_icon = "chocolatepudding" drink_name = "Chocolate Pudding" drink_desc = "Tasty" + taste_message = "chocolate" /datum/reagent/consumable/drink/vanillapudding name = "Vanilla Pudding" @@ -388,6 +414,7 @@ drink_icon = "vanillapudding" drink_name = "Vanilla Pudding" drink_desc = "Tasty." + taste_message = "vanilla" /datum/reagent/consumable/drink/cherryshake name = "Cherry Shake" @@ -398,6 +425,7 @@ drink_icon = "cherryshake" drink_name = "Cherry Shake" drink_desc = "A cherry flavored milkshake." + taste_message = "cherry milkshake" /datum/reagent/consumable/drink/bluecherryshake name = "Blue Cherry Shake" @@ -408,6 +436,7 @@ drink_icon = "bluecherryshake" drink_name = "Blue Cherry Shake" drink_desc = "An exotic blue milkshake." + taste_message = "cherry milkshake" /datum/reagent/consumable/drink/pumpkin_latte name = "Pumpkin Latte" @@ -418,6 +447,7 @@ drink_icon = "pumpkin_latte" drink_name = "Pumpkin Latte" drink_desc = "A mix of coffee and pumpkin juice." + taste_message = "overpriced hipster spices" /datum/reagent/consumable/drink/gibbfloats name = "Gibb Floats" @@ -428,21 +458,25 @@ drink_icon= "gibbfloats" drink_name = "Gibbfloat" drink_desc = "Dr. Gibb with ice cream on top." + taste_message = "taste revolution" /datum/reagent/consumable/drink/pumpkinjuice name = "Pumpkin Juice" id = "pumpkinjuice" description = "Juiced from real pumpkin." color = "#FFA500" + taste_message = "puke" /datum/reagent/consumable/drink/blumpkinjuice name = "Blumpkin Juice" id = "blumpkinjuice" description = "Juiced from real blumpkin." color = "#00BFFF" + taste_message = "caustic puke" /datum/reagent/consumable/drink/grape_soda name = "Grape soda" id = "grapesoda" description = "Beloved of children and teetotalers." - color = "#E6CDFF" \ No newline at end of file + color = "#E6CDFF" + taste_message = "grape soda" diff --git a/code/modules/reagents/chemistry/reagents/drugs.dm b/code/modules/reagents/chemistry/reagents/drugs.dm index 3719c6f49b8..0d6fc67db5d 100644 --- a/code/modules/reagents/chemistry/reagents/drugs.dm +++ b/code/modules/reagents/chemistry/reagents/drugs.dm @@ -439,6 +439,7 @@ reagent_state = LIQUID color = "#644600" addiction_chance = 30 + taste_message = "puke...or worse" /datum/reagent/jenkem/on_mob_life(mob/living/M) M.Dizzy(5) @@ -500,6 +501,7 @@ overdose_threshold = 15 process_flags = ORGANIC | SYNTHETIC //Flipping for everyone! addiction_chance = 10 + taste_message = "flips" /datum/reagent/fliptonium/on_mob_life(mob/living/M) if(current_cycle == 5) @@ -575,6 +577,7 @@ overdose_threshold = 20 addiction_chance = 60 metabolization_rate = 0.6 + taste_message = "wiper fluid" /datum/reagent/lube/ultra/on_mob_life(mob/living/M) var/high_message = pick("You feel your servos whir!", "You feel like you need to go faster.", "You feel like you were just overclocked!") @@ -622,6 +625,7 @@ process_flags = SYNTHETIC overdose_threshold = 20 addiction_chance = 50 + taste_message = "silicone" /datum/reagent/surge/on_mob_life(mob/living/M) @@ -651,4 +655,4 @@ B.pixel_y = rand(-20, 0) B.icon = I M.adjustFireLoss(rand(1,5)*REAGENTS_EFFECT_MULTIPLIER) - M.adjustBruteLoss(rand(1,5)*REAGENTS_EFFECT_MULTIPLIER) \ No newline at end of file + M.adjustBruteLoss(rand(1,5)*REAGENTS_EFFECT_MULTIPLIER) diff --git a/code/modules/reagents/chemistry/reagents/food.dm b/code/modules/reagents/chemistry/reagents/food.dm index 082b6496357..d25d0529062 100644 --- a/code/modules/reagents/chemistry/reagents/food.dm +++ b/code/modules/reagents/chemistry/reagents/food.dm @@ -23,6 +23,7 @@ reagent_state = SOLID nutriment_factor = 15 * REAGENTS_METABOLISM color = "#664330" // rgb: 102, 67, 48 + taste_message = "bland food" /datum/reagent/consumable/nutriment/on_mob_life(mob/living/M) if(!(M.mind in ticker.mode.vampires)) @@ -43,12 +44,14 @@ id = "protein" description = "Various essential proteins and fats commonly found in animal flesh and blood." diet_flags = DIET_CARN | DIET_OMNI + taste_message = "meat" /datum/reagent/consumable/nutriment/plantmatter // Plant-based biomatter, digestable by herbivores and omnivores, worthless to carnivores name = "Plant-matter" id = "plantmatter" description = "Vitamin-rich fibers and natural sugars commonly found in fresh produce." diet_flags = DIET_HERB | DIET_OMNI + taste_message = "plant matter" /datum/reagent/consumable/vitamin name = "Vitamin" @@ -56,6 +59,7 @@ description = "All the best vitamins, minerals, and carbohydrates the body needs in pure form." reagent_state = SOLID color = "#664330" // rgb: 102, 67, 48 + taste_message = null /datum/reagent/consumable/vitamin/on_mob_life(mob/living/M) if(prob(50)) @@ -80,6 +84,7 @@ color = "#FFFFFF" // rgb: 255, 255, 255 nutriment_factor = 5 * REAGENTS_METABOLISM overdose_threshold = 200 // Hyperglycaemic shock + taste_message = "sweetness" /datum/reagent/consumable/sugar/on_mob_life(mob/living/M) M.AdjustDrowsy(-5) @@ -111,6 +116,7 @@ reagent_state = LIQUID nutriment_factor = 2 * REAGENTS_METABOLISM color = "#792300" // rgb: 121, 35, 0 + taste_message = "salt" /datum/reagent/consumable/ketchup name = "Ketchup" @@ -119,6 +125,7 @@ reagent_state = LIQUID nutriment_factor = 5 * REAGENTS_METABOLISM color = "#731008" // rgb: 115, 16, 8 + taste_message = "ketchup" /datum/reagent/consumable/capsaicin name = "Capsaicin Oil" @@ -126,6 +133,7 @@ description = "This is what makes chilis hot." reagent_state = LIQUID color = "#B31008" // rgb: 179, 16, 8 + taste_message = "HOTNESS" /datum/reagent/consumable/capsaicin/on_mob_life(mob/living/M) switch(current_cycle) @@ -155,6 +163,7 @@ description = "This shit goes in pepperspray." reagent_state = LIQUID color = "#B31008" // rgb: 179, 16, 8 + taste_message = "PURE FIRE" /datum/reagent/consumable/condensedcapsaicin/on_mob_life(mob/living/M) if(prob(5)) @@ -223,6 +232,7 @@ reagent_state = LIQUID color = "#8BA6E9" // rgb: 139, 166, 233 process_flags = ORGANIC | SYNTHETIC + taste_message = "cold" /datum/reagent/consumable/frostoil/on_mob_life(mob/living/M) switch(current_cycle) @@ -262,6 +272,7 @@ reagent_state = SOLID color = "#B1B0B0" overdose_threshold = 100 + taste_message = "salt" /datum/reagent/consumable/sodiumchloride/overdose_process(mob/living/M, severity) if(prob(70)) @@ -273,6 +284,7 @@ id = "blackpepper" description = "A powder ground from peppercorns. *AAAACHOOO*" reagent_state = SOLID + taste_message = "pepper" /datum/reagent/consumable/cocoa name = "Cocoa Powder" @@ -281,6 +293,7 @@ reagent_state = SOLID nutriment_factor = 5 * REAGENTS_METABOLISM color = "#302000" // rgb: 48, 32, 0 + taste_message = "bitter cocoa" /datum/reagent/consumable/vanilla name = "Vanilla Powder" @@ -289,6 +302,7 @@ reagent_state = SOLID nutriment_factor = 5 * REAGENTS_METABOLISM color = "#FFFACD" + taste_message = "bitter vanilla" /datum/reagent/consumable/hot_coco name = "Hot Chocolate" @@ -297,6 +311,7 @@ reagent_state = LIQUID nutriment_factor = 2 * REAGENTS_METABOLISM color = "#403010" // rgb: 64, 48, 16 + taste_message = "chocolate" /datum/reagent/consumable/hot_coco/on_mob_life(mob/living/M) if(M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 @@ -308,6 +323,7 @@ id = "sprinkles" description = "Multi-colored little bits of sugar, commonly found on donuts. Loved by cops." color = "#FF00FF" // rgb: 255, 0, 255 + taste_message = "sweetness" /datum/reagent/consumable/sprinkles/on_mob_life(mob/living/M) if(ishuman(M) && M.job in list("Security Officer", "Security Pod Pilot", "Detective", "Warden", "Head of Security", "Brig Physician", "Internal Affairs Agent", "Magistrate")) @@ -322,6 +338,7 @@ reagent_state = LIQUID nutriment_factor = 20 * REAGENTS_METABOLISM color = "#302000" // rgb: 48, 32, 0 + taste_message = "oil" /datum/reagent/consumable/cornoil/reaction_turf(turf/simulated/T, volume) if(!istype(T)) @@ -342,6 +359,7 @@ description = "Heated beyond usefulness, this enzyme is now worthless." reagent_state = LIQUID color = "#282314" // rgb: 54, 94, 48 + taste_message = null /datum/reagent/consumable/dry_ramen name = "Dry Ramen" @@ -349,6 +367,7 @@ description = "Space age food, since August 25, 1958. Contains dried noodles, vegetables, and chemicals that boil in contact with water." reagent_state = SOLID color = "#302000" // rgb: 48, 32, 0 + taste_message = "dry ramen coated with what might just be your tears" /datum/reagent/consumable/hot_ramen name = "Hot Ramen" @@ -357,6 +376,7 @@ reagent_state = LIQUID nutriment_factor = 5 * REAGENTS_METABOLISM color = "#302000" // rgb: 48, 32, 0 + taste_message = "ramen" /datum/reagent/consumable/hot_ramen/on_mob_life(mob/living/M) if(M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 @@ -370,6 +390,7 @@ reagent_state = LIQUID nutriment_factor = 5 * REAGENTS_METABOLISM color = "#302000" // rgb: 48, 32, 0 + taste_message = "SPICY ramen" /datum/reagent/consumable/hell_ramen/on_mob_life(mob/living/M) M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT @@ -381,6 +402,7 @@ description = "This is what you rub all over yourself to pretend to be a ghost." reagent_state = SOLID color = "#FFFFFF" // rgb: 0, 0, 0 + taste_message = "flour" /datum/reagent/consumable/flour/reaction_turf(turf/T, volume) if(!istype(T, /turf/space)) @@ -393,6 +415,7 @@ reagent_state = SOLID nutriment_factor = 3 * REAGENTS_METABOLISM color = "#FFFFFF" // rgb: 0, 0, 0 + taste_message = "rice" /datum/reagent/consumable/cherryjelly name = "Cherry Jelly" @@ -400,6 +423,7 @@ description = "Totally the best. Only to be spread on foods with excellent lateral symmetry." reagent_state = LIQUID color = "#801E28" // rgb: 128, 30, 40 + taste_message = "cherry jelly" /datum/reagent/consumable/bluecherryjelly name = "Blue Cherry Jelly" @@ -407,6 +431,7 @@ description = "Blue and tastier kind of cherry jelly." reagent_state = LIQUID color = "#00F0FF" + taste_message = "cherry jelly" /datum/reagent/consumable/egg name = "Egg" @@ -414,6 +439,7 @@ description = "A runny and viscous mixture of clear and yellow fluids." reagent_state = LIQUID color = "#F0C814" + taste_message = "eggs" /datum/reagent/consumable/egg/on_mob_life(mob/living/M) if(prob(8)) @@ -428,6 +454,7 @@ description = "The powdered starch of maize, derived from the kernel's endosperm. Used as a thickener for gravies and puddings." reagent_state = LIQUID color = "#C8A5DC" + taste_message = "flour" /datum/reagent/consumable/corn_syrup name = "Corn Syrup" @@ -435,6 +462,7 @@ description = "A sweet syrup derived from corn starch that has had its starches converted into maltose and other sugars." reagent_state = LIQUID color = "#C8A5DC" + taste_message = "sweetness" /datum/reagent/consumable/corn_syrup/on_mob_life(mob/living/M) M.reagents.add_reagent("sugar", 1.2) @@ -446,6 +474,7 @@ description = "An incredibly sweet syrup, created from corn syrup treated with enzymes to convert its sugars into fructose." reagent_state = LIQUID color = "#C8A5DC" + taste_message = "diabetes" /datum/reagent/consumable/vhfcs/on_mob_life(mob/living/M) M.reagents.add_reagent("sugar", 2.4) @@ -458,6 +487,7 @@ reagent_state = LIQUID color = "#d3a308" nutriment_factor = 15 * REAGENTS_METABOLISM + taste_message = "sweetness" /datum/reagent/consumable/honey/on_mob_life(mob/living/M) M.reagents.add_reagent("sugar", 3) @@ -476,6 +506,7 @@ drink_icon = "chocolateglass" drink_name = "Glass of chocolate" drink_desc = "Tasty" + taste_message = "chocolate" /datum/reagent/consumable/chocolate/on_mob_life(mob/living/M) M.reagents.add_reagent("sugar", 0.8) @@ -491,6 +522,7 @@ description = "A rather bitter herb once thought to hold magical protective properties." reagent_state = LIQUID color = "#21170E" + taste_message = "tea" /datum/reagent/consumable/mugwort/on_mob_life(mob/living/M) if(ishuman(M) && M.mind) @@ -509,6 +541,7 @@ color = "#AB5D5D" metabolization_rate = 0.2 overdose_threshold = 133 + taste_message = "bacon" /datum/reagent/consumable/porktonium/overdose_process(mob/living/M, severity) if(prob(15)) @@ -525,6 +558,7 @@ color = "#B4B400" metabolization_rate = 0.2 nutriment_factor = 2 + taste_message = "broth" /datum/reagent/consumable/cheese name = "Cheese" @@ -532,6 +566,7 @@ description = "Some cheese. Pour it out to make it solid." reagent_state = SOLID color = "#FFFF00" + taste_message = "cheese" /datum/reagent/consumable/cheese/on_mob_life(mob/living/M) if(prob(3)) @@ -549,6 +584,7 @@ reagent_state = LIQUID color = "#B2B139" overdose_threshold = 50 + taste_message = "cheese?" /datum/reagent/consumable/fake_cheese/overdose_process(mob/living/M, severity) if(prob(8)) @@ -562,6 +598,7 @@ reagent_state = SOLID color = "#50FF00" addiction_chance = 5 + taste_message = "cheese...?" /datum/reagent/consumable/weird_cheese/on_mob_life(mob/living/M) if(prob(5)) @@ -578,6 +615,7 @@ description = "A dish made of mashed beans cooked with lard." reagent_state = LIQUID color = "#684435" + taste_message = "burritos" /datum/reagent/consumable/beans/on_mob_life(mob/living/M) if(prob(10)) @@ -590,6 +628,7 @@ description = "Bread! Yep, bread." reagent_state = SOLID color = "#9C5013" + taste_message = "bread" /datum/reagent/consumable/soybeanoil name = "Space-soybean oil" @@ -597,6 +636,7 @@ description = "An oil derived from extra-terrestrial soybeans." reagent_state = LIQUID color = "#B1B0B0" + taste_message = "oil" /datum/reagent/consumable/soybeanoil/on_mob_life(mob/living/M) if(prob(10)) @@ -613,6 +653,7 @@ color = "#B1B0B0" metabolization_rate = 0.2 overdose_threshold = 75 + taste_message = "oil" /datum/reagent/consumable/hydrogenated_soybeanoil/on_mob_life(mob/living/M) if(prob(15)) @@ -643,6 +684,7 @@ description = "A paste comprised of highly-processed organic material. Uncomfortably similar to deviled ham spread." reagent_state = LIQUID color = "#EBD7D7" + taste_message = "meat" /datum/reagent/consumable/meatslurry/on_mob_life(mob/living/M) if(prob(4)) @@ -660,6 +702,7 @@ description = "A starchy food paste made from boiled potatoes." reagent_state = SOLID color = "#D6D9C1" + taste_message = "potatoes" /datum/reagent/consumable/gravy name = "Gravy" @@ -667,6 +710,7 @@ description = "A savory sauce made from a simple meat-dripping roux and milk." reagent_state = LIQUID color = "#B4641B" + taste_message = "gravy" /datum/reagent/consumable/beff name = "Beff" @@ -674,6 +718,7 @@ description = "An advanced blend of mechanically-recovered meat and textured synthesized protein product notable for its unusual crystalline grain when sliced." reagent_state = SOLID color = "#AC7E67" + taste_message = "meat; hopefully" /datum/reagent/consumable/beff/on_mob_life(mob/living/M) if(prob(5)) @@ -691,6 +736,7 @@ description = "An Italian-American variety of salami usually made from beef and pork" reagent_state = SOLID color = "#AC7E67" + taste_message = "pepperoni" /datum/reagent/consumable/pepperoni/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == TOUCH) @@ -722,6 +768,7 @@ description = "A gross and unidentifiable substance." reagent_state = LIQUID color = "#63DE63" + taste_message = "burned food" /datum/reagent/questionmark/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == INGEST) @@ -737,6 +784,7 @@ reagent_state = LIQUID color = "#F5F5F5" metabolization_rate = 0.2 + taste_message = "excellent cuisine" /datum/reagent/msg/on_mob_life(mob/living/M) if(prob(5)) @@ -747,16 +795,13 @@ M.Stun(rand(2,5)) ..() -/datum/reagent/msg/reaction_mob(mob/living/M, method=TOUCH, volume) - if(method == INGEST) - to_chat(M, "That tasted amazing!") - /datum/reagent/cholesterol name = "cholesterol" id = "cholesterol" description = "Pure cholesterol. Probably not very good for you." reagent_state = LIQUID color = "#FFFAC8" + taste_message = "heart disease" /datum/reagent/cholesterol/on_mob_life(mob/living/M) if(volume >= 25 && prob(volume*0.15)) @@ -782,6 +827,7 @@ description = "Scrapings of some unknown fungus found growing on the station walls." reagent_state = LIQUID color = "#C87D28" + taste_message = "puke" /datum/reagent/fungus/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == INGEST) @@ -802,6 +848,7 @@ reagent_state = LIQUID color = "#8EAE7B" process_flags = ORGANIC | SYNTHETIC //Because apparently ghosts in the shell + taste_message = "spooks" /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...") @@ -830,6 +877,7 @@ description = "Looks like someone lost their lunch. And then collected it. Yuck." reagent_state = LIQUID color = "#FFFF00" + taste_message = "puke" /datum/reagent/vomit/reaction_turf(turf/T, volume) if(volume >= 5 && !istype(T, /turf/space)) @@ -842,12 +890,13 @@ description = "Whoa, that can't be natural. That's horrible." reagent_state = LIQUID color = "#78FF74" + taste_message = "puke" /datum/reagent/greenvomit/reaction_turf(turf/T, volume) if(volume >= 5 && !istype(T, /turf/space)) new /obj/effect/decal/cleanable/vomit/green(T) playsound(T, 'sound/effects/splat.ogg', 50, 1, -3) - + ////Lavaland Flora Reagents//// /datum/reagent/consumable/entpoly @@ -855,6 +904,7 @@ id = "entpoly" description = "An ichor, derived from a certain mushroom, makes for a bad time." color = "#1d043d" + taste_message = "puke" /datum/reagent/consumable/entpoly/on_mob_life(mob/living/M) if(current_cycle >= 10) @@ -873,12 +923,13 @@ description = "A stimulating ichor which causes luminescent fungi to grow on the skin. " color = "#b5a213" var/light_activated = 0 + taste_message = "puke" /datum/reagent/consumable/tinlux/on_mob_life(mob/living/M) if(!light_activated) M.set_light(2) light_activated = 1 - ..() + ..() /datum/reagent/consumable/tinlux/on_mob_delete(mob/living/M) M.set_light(0) @@ -889,9 +940,10 @@ description = "A bubbly paste that heals wounds of the skin." color = "#d3a308" nutriment_factor = 3 * REAGENTS_METABOLISM + taste_message = "sweetness" /datum/reagent/consumable/vitfro/on_mob_life(mob/living/M) if(prob(80)) M.adjustBruteLoss(-1 * REAGENTS_EFFECT_MULTIPLIER) M.adjustFireLoss(-1 * REAGENTS_EFFECT_MULTIPLIER) - ..() \ No newline at end of file + ..() diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm index a8fcf888318..6a156313971 100644 --- a/code/modules/reagents/chemistry/reagents/medicine.dm +++ b/code/modules/reagents/chemistry/reagents/medicine.dm @@ -205,6 +205,7 @@ color = "#C8A5DC" penetrates_skin = 1 metabolization_rate = 0.15 + taste_message = "salt" /datum/reagent/medicine/salglu_solution/on_mob_life(mob/living/M) if(prob(33)) diff --git a/code/modules/reagents/chemistry/reagents/misc.dm b/code/modules/reagents/chemistry/reagents/misc.dm index 89233789903..d08531aebc3 100644 --- a/code/modules/reagents/chemistry/reagents/misc.dm +++ b/code/modules/reagents/chemistry/reagents/misc.dm @@ -38,6 +38,7 @@ description = "A colorless, odorless gas." reagent_state = GAS color = "#808080" // rgb: 128, 128, 128 + taste_message = null /datum/reagent/nitrogen name = "Nitrogen" @@ -45,7 +46,7 @@ description = "A colorless, odorless, tasteless gas." reagent_state = GAS color = "#808080" // rgb: 128, 128, 128 - + taste_message = null /datum/reagent/hydrogen name = "Hydrogen" @@ -53,7 +54,7 @@ description = "A colorless, odorless, nonmetallic, tasteless, highly combustible diatomic gas." reagent_state = GAS color = "#808080" // rgb: 128, 128, 128 - + taste_message = null /datum/reagent/potassium name = "Potassium" @@ -61,7 +62,7 @@ description = "A soft, low-melting solid that can easily be cut with a knife. Reacts violently with water." reagent_state = SOLID color = "#A0A0A0" // rgb: 160, 160, 160 - + taste_message = "bad ideas" /datum/reagent/sulfur name = "Sulfur" @@ -69,7 +70,7 @@ description = "A chemical element." reagent_state = SOLID color = "#BF8C00" // rgb: 191, 140, 0 - + taste_message = "impulsive decisions" /datum/reagent/sodium name = "Sodium" @@ -77,7 +78,7 @@ description = "A chemical element." reagent_state = SOLID color = "#808080" // rgb: 128, 128, 128 - + taste_message = "horrible misjudgement" /datum/reagent/phosphorus name = "Phosphorus" @@ -85,7 +86,7 @@ description = "A chemical element." reagent_state = SOLID color = "#832828" // rgb: 131, 40, 40 - + taste_message = "misguided choices" /datum/reagent/carbon name = "Carbon" @@ -93,6 +94,7 @@ description = "A chemical element." reagent_state = SOLID color = "#1C1300" // rgb: 30, 20, 0 + taste_message = "like a pencil or something" /datum/reagent/carbon/reaction_turf(turf/T, volume) if(!istype(T, /turf/space) && !(locate(/obj/effect/decal/cleanable/dirt) in T)) // Only add one dirt per turf. Was causing people to crash. @@ -104,6 +106,7 @@ description = "Gold is a dense, soft, shiny metal and the most malleable and ductile metal known." reagent_state = SOLID color = "#F7C430" // rgb: 247, 196, 48 + taste_message = "bling" /datum/reagent/silver @@ -112,6 +115,7 @@ description = "A lustrous metallic element regarded as one of the precious metals." reagent_state = SOLID color = "#D0D0D0" // rgb: 208, 208, 208 + taste_message = "sub-par bling" /datum/reagent/aluminum @@ -120,6 +124,7 @@ description = "A silvery white and ductile member of the boron group of chemical elements." reagent_state = SOLID color = "#A8A8A8" // rgb: 168, 168, 168 + taste_message = "metal" /datum/reagent/silicon @@ -128,6 +133,7 @@ description = "A tetravalent metalloid, silicon is less reactive than its chemical analog carbon." reagent_state = SOLID color = "#A8A8A8" // rgb: 168, 168, 168 + taste_message = null /datum/reagent/copper @@ -135,6 +141,7 @@ id = "copper" description = "A highly ductile metal." color = "#6E3B08" // rgb: 110, 59, 8 + taste_message = "copper" /datum/reagent/iron @@ -143,6 +150,7 @@ description = "Pure iron is a metal." reagent_state = SOLID color = "#C8A5DC" // rgb: 200, 165, 220 + taste_message = "metal" /datum/reagent/iron/on_mob_life(mob/living/M) if(ishuman(M)) @@ -158,6 +166,7 @@ description = "A perfluoronated sulfonic acid that forms a foam when mixed with water." reagent_state = LIQUID color = "#9E6B38" // rgb: 158, 107, 56 + taste_message = null // metal foaming agent // this is lithium hydride. Add other recipies (e.g. LiH + H2O -> LiOH + H2) eventually @@ -167,6 +176,7 @@ description = "A caustic substance commonly used in fertilizer or household cleaners." reagent_state = GAS color = "#404030" // rgb: 64, 64, 48 + taste_message = "floor cleaner" /datum/reagent/diethylamine name = "Diethylamine" @@ -174,6 +184,7 @@ description = "A secondary amine, useful as a plant nutrient and as building block for other compounds." reagent_state = LIQUID color = "#322D00" + taste_message = null /datum/reagent/oil name = "Oil" @@ -181,6 +192,7 @@ description = "A decent lubricant for machines. High in benzene, naptha and other hydrocarbons." reagent_state = LIQUID color = "#3C3C3C" + taste_message = "motor oil" /datum/reagent/iodine name = "Iodine" @@ -188,6 +200,7 @@ description = "A purple gaseous element." reagent_state = GAS color = "#493062" + taste_message = null /datum/reagent/carpet name = "Carpet" @@ -195,6 +208,7 @@ description = "A covering of thick fabric used on floors. This type looks particularly gross." reagent_state = LIQUID color = "#701345" + taste_message = "a carpet...what?" /datum/reagent/carpet/reaction_turf(turf/simulated/T, volume) if(istype(T, /turf/simulated/floor/plating) || istype(T, /turf/simulated/floor/plasteel)) @@ -208,6 +222,7 @@ description = "A red-brown liquid element." reagent_state = LIQUID color = "#4E3A3A" + taste_message = null /datum/reagent/phenol name = "Phenol" @@ -215,6 +230,7 @@ description = "Also known as carbolic acid, this is a useful building block in organic chemistry." reagent_state = LIQUID color = "#525050" + taste_message = null /datum/reagent/ash name = "Ash" @@ -222,6 +238,7 @@ description = "Ashes to ashes, dust to dust." reagent_state = LIQUID color = "#191919" + taste_message = "ash" /datum/reagent/acetone name = "Acetone" @@ -229,6 +246,7 @@ description = "Pure 100% nail polish remover, also works as an industrial solvent." reagent_state = LIQUID color = "#474747" + taste_message = null /datum/reagent/acetone/on_mob_life(mob/living/M) M.adjustToxLoss(1.5) @@ -240,6 +258,7 @@ description = "Volatile." reagent_state = LIQUID color = "#60A584" // rgb: 96, 165, 132 + taste_message = null /datum/reagent/colorful_reagent name = "Colorful Reagent" @@ -247,6 +266,7 @@ description = "It's pure liquid colors. That's a thing now." reagent_state = LIQUID color = "#FFFFFF" + taste_message = "colors!" /datum/reagent/colorful_reagent/reaction_mob(mob/living/simple_animal/M, method=TOUCH, volume) if(isanimal(M)) @@ -269,6 +289,7 @@ description = "A rather tubular and gnarly way of coloring totally bodacious hair. Duuuudddeee." reagent_state = LIQUID color = "#960096" + taste_message = "the 2559 Autumn release of the Le Jeune Homme catalogue for professional hairdressers" /datum/reagent/hair_dye/reaction_mob(mob/living/M, volume) if(ishuman(M)) @@ -291,6 +312,7 @@ reagent_state = LIQUID color = "#5DDA5D" penetrates_skin = 1 + taste_message = "someone's beard" /datum/reagent/hairgrownium/reaction_mob(mob/living/M, volume) if(ishuman(M)) @@ -309,6 +331,7 @@ reagent_state = LIQUID color = "#5DD95D" penetrates_skin = 1 + taste_message = "multiple beards" /datum/reagent/super_hairgrownium/reaction_mob(mob/living/M, volume) if(ishuman(M)) @@ -341,6 +364,7 @@ description = "Oh god it never ends, IT NEVER STOPS!" reagent_state = GAS color = "#D06E27" + taste_message = "mexican cuisine" /datum/reagent/fartonium/on_mob_life(mob/living/M) if(prob(66)) @@ -364,6 +388,7 @@ description = "Hugs, in liquid form. Yes, the concept of a hug. As a liquid. This makes sense in the future." reagent_state = LIQUID color = "#FF97B9" + taste_message = "hugs; awww" /datum/reagent/love name = "Pure love" @@ -371,6 +396,7 @@ description = "What is this emotion you humans call \"love?\" Oh, it's this? This is it? Huh, well okay then, thanks." reagent_state = LIQUID color = "#FF83A5" + taste_message = "love; awwwwwww" /datum/reagent/love/on_mob_life(mob/living/M) if(M.a_intent == I_HARM) @@ -399,6 +425,7 @@ id = "royal_bee_jelly" description = "Royal Bee Jelly, if injected into a Queen Space Bee said bee will split into two bees." color = "#00ff80" + taste_message = "sweetness" /datum/reagent/royal_bee_jelly/on_mob_life(mob/living/M) if(prob(2)) @@ -411,6 +438,7 @@ description = "A commercial chemical designed to help older men in the bedroom." //not really it just makes you a giant color = "#ff0000"//strong red. rgb 255, 0, 0 var/current_size = 1 + taste_message = "power!" /datum/reagent/growthserum/on_mob_life(mob/living/carbon/H) var/newsize = current_size @@ -442,13 +470,15 @@ description = "Finely ground Coffee beans, used to make coffee." reagent_state = SOLID color = "#5B2E0D" // rgb: 91, 46, 13 + taste_message = "bitterness" /datum/reagent/toxin/teapowder name = "Ground Tea Leaves" id = "teapowder" description = "Finely shredded Tea leaves, used for making tea." reagent_state = SOLID - color = "#7F8400" // rgb: 127, 132, 0 + color = "#7F8400" // rgb: 127, 132, 0" + taste_message = "bitterness" //////////////////////////////////Hydroponics stuff/////////////////////////////// @@ -458,6 +488,7 @@ description = "Some kind of nutriment. You can't really tell what it is. You should probably report it, along with how you obtained it." color = "#000000" // RBG: 0, 0, 0 var/tox_prob = 0 + taste_message = "puke" /datum/reagent/plantnutriment/on_mob_life(mob/living/M) if(prob(tox_prob)) @@ -520,4 +551,4 @@ id = "triplepiss" description = "Ewwwwwwwww." reagent_state = LIQUID - color = "#857400" \ No newline at end of file + color = "#857400" diff --git a/code/modules/reagents/chemistry/reagents/paint.dm b/code/modules/reagents/chemistry/reagents/paint.dm index 0ca67259126..e1a765f59d9 100644 --- a/code/modules/reagents/chemistry/reagents/paint.dm +++ b/code/modules/reagents/chemistry/reagents/paint.dm @@ -4,6 +4,7 @@ description = "Floor paint is used to color floor tiles." reagent_state = LIQUID color = "#808080" + taste_message = "paint" /datum/reagent/paint/reaction_turf(turf/T, volume) if(!istype(T, /turf/space)) @@ -54,7 +55,8 @@ description = "Paint remover is used to remove floor paint from floor tiles." reagent_state = LIQUID color = "#808080" + taste_message = "alcohol" /datum/reagent/paint_remover/reaction_turf(turf/T, volume) if(!istype(T, /turf/space)) - T.color = initial(T.color) \ No newline at end of file + T.color = initial(T.color) diff --git a/code/modules/reagents/chemistry/reagents/paradise_pop.dm b/code/modules/reagents/chemistry/reagents/paradise_pop.dm index 2dab79627cc..edf633bcacc 100644 --- a/code/modules/reagents/chemistry/reagents/paradise_pop.dm +++ b/code/modules/reagents/chemistry/reagents/paradise_pop.dm @@ -15,6 +15,7 @@ description = "Tastes just how you'd think Paradise would if you could bottle it." reagent_state = LIQUID color = "#cc0044" + taste_message = "paradise" //Apple-pocalypse: Low chance to cause a goonchem vortex that pulls things within a very small radius (2 tiles?) towards the drinker /datum/reagent/consumable/drink/apple_pocalypse @@ -23,6 +24,7 @@ description = "If doomsday came in fruit form, it'd probably be apples." reagent_state = LIQUID color = "#44FF44" + taste_message = "doomsday" /datum/reagent/consumable/drink/apple_pocalypse/on_mob_life(mob/living/M) if(prob(1)) @@ -38,6 +40,7 @@ description = "Reason for ban: Excessive Flavor." reagent_state = LIQUID color = "#FF44FF" + taste_message = "a permaban" /datum/reagent/consumable/drink/berry_banned/on_mob_life(mob/living/M) if(prob(10)) @@ -65,6 +68,7 @@ description = "Reason for ban: Excessive Flavor." reagent_state = LIQUID color = "#FF44FF" + taste_message = "a permaban" /datum/reagent/consumable/drink/berry_banned2/on_mob_life(mob/living/M) if(prob(50)) @@ -85,6 +89,7 @@ description = "Creamy, smooth flavor, just like the bald heads of the masses. Supposedly aged for 30 years." reagent_state = LIQUID color = "#4d2600" + taste_message = "greytide" /datum/reagent/consumable/drink/blackeye_brew/on_mob_life(mob/living/M) if(prob(25)) @@ -107,6 +112,7 @@ description = "Exploding with grape flavor and a favorite among ERT members system-wide." reagent_state = LIQUID color = "#9933ff" + taste_message = "old people" /datum/reagent/consumable/drink/grape_granade/on_mob_life(mob/living/M) if(prob(1)) @@ -125,6 +131,7 @@ description = "Soft drinks have been detected on collision course with your tastebuds." reagent_state = LIQUID color = "#cc9900" + taste_message = "flying space rocks" /datum/reagent/consumable/drink/meteor_malt/on_mob_life(mob/living/M) if(prob(25)) @@ -134,4 +141,4 @@ var/amount = rand(1, 5) var/mineral = pick("copper", "iron", "gold", "carbon", "silver", "aluminum", "silicon", "sodiumchloride", "plasma") M.reagents.add_reagent(mineral, amount) - ..() \ No newline at end of file + ..() diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic.dm index 43e81db402f..d4147a1cae9 100644 --- a/code/modules/reagents/chemistry/reagents/pyrotechnic.dm +++ b/code/modules/reagents/chemistry/reagents/pyrotechnic.dm @@ -7,6 +7,7 @@ drink_icon = "dr_gibb_glass" drink_name = "Glass of welder fuel" drink_desc = "Unless you are an industrial tool, this is probably not safe for consumption." + taste_message = "mistakes" /datum/reagent/fuel/reaction_mob(mob/living/M, method=TOUCH, volume)//Splashing people with welding fuel to make them easy to ignite! if(method == TOUCH) @@ -20,6 +21,7 @@ description = "The liquid phase of an unusual extraterrestrial compound." reagent_state = LIQUID color = "#7A2B94" + taste_message = "corporate assets going to waste" /datum/reagent/plasma/on_mob_life(mob/living/M) M.adjustToxLoss(1*REAGENTS_EFFECT_MULTIPLIER) @@ -43,6 +45,7 @@ reagent_state = SOLID color = "#673910" // rgb: 103, 57, 16 process_flags = ORGANIC | SYNTHETIC + taste_message = "metal" /datum/reagent/thermite/reaction_turf(turf/simulated/wall/W, volume) if(volume >= 5 && istype(W)) @@ -56,6 +59,7 @@ description = "Glycerol is a simple polyol compound. Glycerol is sweet-tasting and of low toxicity." reagent_state = LIQUID color = "#808080" // rgb: 128, 128, 128 + taste_message = "sweetness" /datum/reagent/stabilizing_agent name = "Stabilizing Agent" @@ -63,6 +67,7 @@ description = "A chemical that stabilises normally volatile compounds, preventing them from reacting immediately." reagent_state = LIQUID color = "#FFFF00" + taste_message = null /datum/reagent/clf3 name = "Chlorine Trifluoride" @@ -72,6 +77,7 @@ color = "#FF0000" metabolization_rate = 4 process_flags = ORGANIC | SYNTHETIC + taste_message = null /datum/reagent/clf3/on_mob_life(mob/living/M) M.adjust_fire_stacks(2) @@ -116,6 +122,7 @@ description = "Sucks everything into the detonation point." reagent_state = LIQUID color = "#800080" + taste_message = "the end of the world" /datum/reagent/blackpowder name = "Black Powder" @@ -125,6 +132,7 @@ color = "#000000" metabolization_rate = 0.05 penetrates_skin = 1 + taste_message = "sand" /datum/reagent/blackpowder/reaction_turf(turf/T, volume) //oh shit if(volume >= 5 && !istype(T, /turf/space)) @@ -279,6 +287,7 @@ id = "plasma_dust" description = "A fine dust of plasma. This chemical has unusual mutagenic properties for viruses and slimes alike." color = "#500064" // rgb: 80, 0, 100 + taste_message = "corporate assets going to waste" /datum/reagent/plasma_dust/on_mob_life(mob/living/M) M.adjustToxLoss(3) diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm index 8fabc46db00..935fda3691d 100644 --- a/code/modules/reagents/chemistry/reagents/toxins.dm +++ b/code/modules/reagents/chemistry/reagents/toxins.dm @@ -38,6 +38,7 @@ description = "Useful for dealing with undesirable customers." reagent_state = LIQUID color = "#CF3600" // rgb: 207, 54, 0 + taste_message = "mint" /datum/reagent/minttoxin/on_mob_life(mob/living/M) if(FAT in M.mutations) @@ -50,6 +51,7 @@ description = "A gooey semi-liquid produced from one of the deadliest lifeforms in existence. SO REAL." reagent_state = LIQUID color = "#801E28" // rgb: 128, 30, 40 + taste_message = "slimes?" /datum/reagent/slimejelly/on_mob_life(mob/living/M) if(prob(10)) @@ -66,6 +68,7 @@ reagent_state = LIQUID color = "#13BC5E" // rgb: 19, 188, 94 can_synth = 0 + taste_message = "shadows" /datum/reagent/slimetoxin/on_mob_life(mob/living/M) if(ishuman(M)) @@ -99,6 +102,7 @@ color = "#484848" // rgb: 72, 72, 72 metabolization_rate = 0.2 penetrates_skin = 1 + taste_message = "metal" /datum/reagent/mercury/on_mob_life(mob/living/M) if(prob(70)) @@ -113,6 +117,7 @@ color = "#808080" // rgb: 128, 128, 128 penetrates_skin = 1 process_flags = ORGANIC | SYNTHETIC + taste_message = "fire" /datum/reagent/chlorine/on_mob_life(mob/living/M) M.adjustFireLoss(1) @@ -126,6 +131,7 @@ color = "#6A6054" penetrates_skin = 1 process_flags = ORGANIC | SYNTHETIC + taste_message = "spicy freshness" /datum/reagent/fluorine/on_mob_life(mob/living/M) M.adjustFireLoss(1) @@ -212,6 +218,7 @@ reagent_state = LIQUID color = "#00D72B" process_flags = ORGANIC | SYNTHETIC + taste_message = "ACID" /datum/reagent/sacid/on_mob_life(mob/living/M) M.adjustFireLoss(1) @@ -322,6 +329,7 @@ drink_icon ="beerglass" drink_name = "Beer glass" drink_desc = "A freezing pint of beer" + taste_message = "beer" /datum/reagent/beer2/on_mob_life(mob/living/M) switch(current_cycle) @@ -341,6 +349,7 @@ metabolization_rate = 0.1 penetrates_skin = 1 can_synth = 0 + taste_message = null /datum/reagent/polonium/on_mob_life(mob/living/M) M.apply_effect(8, IRRADIATE, negate_armor = 1) @@ -354,6 +363,7 @@ color = "#E7C4C4" metabolization_rate = 0.2 overdose_threshold = 40 + taste_message = null /datum/reagent/histamine/reaction_mob(mob/living/M, method=TOUCH, volume) //dumping histamine on someone is VERY mean. if(iscarbon(M)) @@ -510,6 +520,7 @@ color = "#CF3600" metabolization_rate = 0.1 penetrates_skin = 1 + taste_message = "almonds" /datum/reagent/cyanide/on_mob_life(mob/living/M) M.adjustToxLoss(1.5*REAGENTS_EFFECT_MULTIPLIER) @@ -566,6 +577,7 @@ reagent_state = LIQUID color = "#4141D2" process_flags = ORGANIC | SYNTHETIC + taste_message = "ACID" /datum/reagent/facid/on_mob_life(mob/living/M) M.adjustToxLoss(1*REAGENTS_EFFECT_MULTIPLIER) @@ -629,6 +641,7 @@ reagent_state = LIQUID color = "#7F10C0" can_synth = 0 + taste_message = null /datum/reagent/initropidril/on_mob_life(mob/living/M) if(prob(33)) @@ -659,6 +672,7 @@ reagent_state = LIQUID color = "#1E4664" metabolization_rate = 0.2 + taste_message = null /datum/reagent/pancuronium/on_mob_life(mob/living/M) switch(current_cycle) @@ -721,6 +735,7 @@ penetrates_skin = 1 can_synth = 0 + taste_message = null /datum/reagent/ketamine/on_mob_life(mob/living/M) switch(current_cycle) if(1 to 5) @@ -781,6 +796,7 @@ reagent_state = SOLID color = "#D1DED1" metabolization_rate = 0.2 + taste_message = "puke" /datum/reagent/lipolicide/on_mob_life(mob/living/M) if(!M.nutrition) @@ -853,6 +869,7 @@ metabolization_rate = 0.1 penetrates_skin = 1 overdose_threshold = 25 + taste_message = null /datum/reagent/sarin/on_mob_life(mob/living/M) switch(current_cycle) @@ -1062,6 +1079,7 @@ reagent_state = SOLID color = "#993333" process_flags = ORGANIC | SYNTHETIC + taste_message = "ANTS; OH GOD!" /datum/reagent/ants/on_mob_life(mob/living/M) M.adjustBruteLoss(2) @@ -1083,6 +1101,7 @@ metabolization_rate = 0.2 var/shock_timer = 0 process_flags = ORGANIC | SYNTHETIC + taste_message = "electrons" /datum/reagent/teslium/on_mob_life(mob/living/M) shock_timer++ @@ -1090,4 +1109,4 @@ shock_timer = 0 M.electrocute_act(rand(5,20), "Teslium in their body", 1, 1) //Override because it's caused from INSIDE of you playsound(M, "sparks", 50, 1) - ..() \ No newline at end of file + ..() diff --git a/code/modules/reagents/chemistry/reagents/water.dm b/code/modules/reagents/chemistry/reagents/water.dm index 70d2a9f76c0..0595ffa84bf 100644 --- a/code/modules/reagents/chemistry/reagents/water.dm +++ b/code/modules/reagents/chemistry/reagents/water.dm @@ -18,6 +18,7 @@ drink_icon = "glass_clear" drink_name = "Glass of Water" drink_desc = "The father of all refreshments." + taste_message = null /datum/reagent/water/reaction_mob(mob/living/M, method=TOUCH, volume) // Put out fire @@ -61,6 +62,7 @@ description = "Lubricant is a substance introduced between two moving surfaces to reduce the friction and wear between them. giggity." reagent_state = LIQUID color = "#1BB1AB" + taste_message = "oil" /datum/reagent/lube/reaction_turf(turf/simulated/T, volume) if(volume >= 1 && istype(T)) @@ -73,6 +75,7 @@ description = "A compound used to clean things. Now with 50% more sodium hypochlorite!" reagent_state = LIQUID color = "#61C2C2" + taste_message = "floor cleaner" /datum/reagent/space_cleaner/reaction_obj(obj/O, volume) if(O && !istype(O, /atom/movable/lighting_overlay)) @@ -138,6 +141,7 @@ drink_icon = "glass_red" drink_name = "Glass of Tomato juice" drink_desc = "Are you sure this is tomato juice?" + taste_message = "blood" /datum/reagent/blood/reaction_mob(mob/living/M, method=TOUCH, volume) if(data && data["viruses"]) @@ -238,6 +242,7 @@ description = "Smelly water from a fish tank. Gross!" reagent_state = LIQUID color = "#757547" + taste_message = "puke" /datum/reagent/fishwater/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == INGEST) @@ -257,6 +262,7 @@ description = "Filthy water scoured from a nasty toilet bowl. Absolutely disgusting." reagent_state = LIQUID color = "#757547" + taste_message = "puke" /datum/reagent/fishwater/toiletwater/reaction_mob(mob/living/M, method=TOUCH, volume) //For shennanigans return @@ -271,6 +277,7 @@ drink_icon = "glass_clear" drink_name = "Glass of Water" drink_desc = "The father of all refreshments." + taste_message = null /datum/reagent/holywater/on_mob_life(mob/living/M) M.AdjustJitter(-5) @@ -346,6 +353,7 @@ description = "Something that shouldn't exist on this plane of existance." process_flags = ORGANIC | SYNTHETIC //ethereal means everything processes it. metabolization_rate = 1 + taste_message = null /datum/reagent/fuel/unholywater/on_mob_life(mob/living/M) if(iscultist(M)) @@ -373,6 +381,7 @@ process_flags = ORGANIC | SYNTHETIC //Admin-bus has no brakes! KILL THEM ALL. metabolization_rate = 1 can_synth = 0 + taste_message = null /datum/reagent/hellwater/on_mob_life(mob/living/M) M.fire_stacks = min(5, M.fire_stacks + 3) @@ -388,6 +397,7 @@ color = "#FF9966" description = "You don't even want to think about what's in here." reagent_state = LIQUID + taste_message = "meat" /datum/reagent/liquidgibs/reaction_turf(turf/T, volume) //yes i took it from synthflesh... if(volume >= 5 && !istype(T, /turf/space)) @@ -416,4 +426,4 @@ if(istype(O, /obj/item/clothing/shoes/galoshes)) var/t_loc = get_turf(O) qdel(O) - new /obj/item/clothing/shoes/galoshes/dry(t_loc) \ No newline at end of file + new /obj/item/clothing/shoes/galoshes/dry(t_loc)