From 118e76f7ea1cd05fced31943676a006c609b16c1 Mon Sep 17 00:00:00 2001 From: Alan Date: Thu, 4 Dec 2025 14:54:24 -0500 Subject: [PATCH] Change beverage colors in code to match sprites. (#31181) --- .../reagents/chemistry/reagents/alcohol.dm | 158 +++++++++--------- .../chemistry/reagents/drinks_reagents.dm | 50 +++--- 2 files changed, 104 insertions(+), 104 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm index 4acb28c3743..71a5a30b060 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol.dm @@ -40,7 +40,7 @@ id = "beer" description = "An alcoholic beverage made from malted grains, hops, yeast, and water." nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#664300" // rgb: 102, 67, 0 + color = "#958223" alcohol_perc = 0.2 drink_icon ="beerglass" drink_name = "Beer glass" @@ -63,7 +63,7 @@ name = "Whiskey" id = "whiskey" description = "A superb and well-aged single-malt whiskey. Damn." - color = "#664300" // rgb: 102, 67, 0 + color = "#671f04" dizzy_adj = 8 SECONDS alcohol_perc = 0.4 drink_icon = "whiskeyglass" @@ -83,7 +83,7 @@ name = "Gin" id = "gin" description = "It's gin. In space. I say, good sir." - color = "#664300" // rgb: 102, 67, 0 + color = "#7aaac7" alcohol_perc = 0.5 drink_icon = "ginvodkaglass" drink_name = "Glass of gin" @@ -136,7 +136,7 @@ name = "Rum" id = "rum" description = "Popular with the sailors. Not very popular with everyone else." - color = "#664300" // rgb: 102, 67, 0 + color = "#662800" overdose_threshold = 30 alcohol_perc = 0.4 dizzy_adj = 10 SECONDS @@ -155,7 +155,7 @@ name = "Mojito" id = "mojito" description = "If it's good enough for Spesscuba, it's good enough for you." - color = "#664300" // rgb: 102, 67, 0 + color = "#62956e" alcohol_perc = 0.2 drink_icon = "mojito" drink_name = "Glass of Mojito" @@ -167,7 +167,7 @@ name = "Vodka" id = "vodka" description = "Number one drink AND fueling choice for Russians worldwide." - color = "#664300" // rgb: 102, 67, 0 + color = "#7aaac7" alcohol_perc = 0.4 drink_icon = "ginvodkaglass" drink_name = "Glass of vodka" @@ -178,7 +178,7 @@ name = "Sake" id = "sake" description = "Anime's favorite drink." - color = "#664300" // rgb: 102, 67, 0 + color = "#9aaab9" alcohol_perc = 0.2 drink_icon = "sake" drink_name = "Glass of Sake" @@ -189,7 +189,7 @@ name = "Tequila" id = "tequila" description = "A strong and mildly flavoured, mexican produced spirit. Feeling thirsty hombre?" - color = "#A8B0B7" // rgb: 168, 176, 183 + color = "#8d8e71" alcohol_perc = 0.4 drink_icon = "tequilaglass" drink_name = "Glass of Tequila" @@ -200,7 +200,7 @@ name = "Vermouth" id = "vermouth" description = "You suddenly feel a craving for a martini..." - color = "#664300" // rgb: 102, 67, 0 + color = "#64a088" alcohol_perc = 0.2 drink_icon = "vermouthglass" drink_name = "Glass of Vermouth" @@ -211,7 +211,7 @@ name = "Wine" id = "wine" description = "An premium alchoholic beverage made from distilled grape juice." - color = "#7E4043" // rgb: 126, 64, 67 + color = "#690732" dizzy_adj = 4 SECONDS alcohol_perc = 0.2 drink_icon = "wineglass" @@ -223,7 +223,7 @@ name = "Cognac" id = "cognac" description = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. Classy as fornication." - color = "#664300" // rgb: 102, 67, 0 + color = "#a84317" dizzy_adj = 8 SECONDS alcohol_perc = 0.4 drink_icon = "cognacglass" @@ -248,7 +248,7 @@ name = "Ale" id = "ale" description = "A dark alchoholic beverage made by malted barley and yeast." - color = "#664300" // rgb: 102, 67, 0 + color = "#82291c" alcohol_perc = 0.1 drink_icon = "aleglass" drink_name = "Ale glass" @@ -259,7 +259,7 @@ name = "Thirteen Loko" id = "thirteenloko" description = "A potent mixture of caffeine and alcohol." - color = "#102000" // rgb: 16, 32, 0 + color = "#922d01" nutriment_factor = 1 * REAGENTS_METABOLISM alcohol_perc = 0.3 heart_rate_increase = 1 @@ -296,7 +296,7 @@ name = "Atomic Bomb" id = "atomicbomb" description = "Nuclear proliferation never tasted so good." - color = "#666300" // rgb: 102, 99, 0 + color = "#601e06" alcohol_perc = 0.2 drink_icon = "atomicbombglass" drink_name = "Atomic Bomb" @@ -308,7 +308,7 @@ name = "Three Mile Island Iced Tea" id = "threemileisland" description = "Made for a woman, strong enough for a man." - color = "#666340" // rgb: 102, 99, 64 + color = "#313a3f" alcohol_perc = 0.2 drink_icon = "threemileislandglass" drink_name = "Three Mile Island Ice Tea" @@ -320,7 +320,7 @@ name = "Goldschlager" id = "goldschlager" description = "100 proof cinnamon schnapps, made for alcoholic teen girls on spring break." - color = "#664300" // rgb: 102, 67, 0 + color = "#959595" alcohol_perc = 0.4 drink_icon = "goldschlagerglass" drink_name = "Glass of goldschlager" @@ -331,7 +331,7 @@ name = "Patron" id = "patron" description = "Tequila with silver in it, a favorite of alcoholic women in the club scene." - color = "#585840" // rgb: 88, 88, 64 + color = "#a4af9d" alcohol_perc = 0.4 drink_icon = "patronglass" drink_name = "Glass of Patron" @@ -342,7 +342,7 @@ name = "Gin and Tonic" id = "gintonic" description = "An all time classic, mild cocktail." - color = "#664300" // rgb: 102, 67, 0 + color = "#61a6a8" alcohol_perc = 0.4 drink_icon = "gintonicglass" drink_name = "Gin and Tonic" @@ -378,7 +378,7 @@ name = "Daiquiri" id = "daiquiri" description = "Lime juice and sugar mixed with rum. A sweet and refreshing mix." - color = "#61d961" // rgb: 38, 85, 38 + color = "#a4af9d" alcohol_perc = 0.4 drink_icon = "daiquiriglass" drink_name = "Daiquiri" @@ -390,7 +390,7 @@ name = "Classic Martini" id = "martini" description = "Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious." - color = "#664300" // rgb: 102, 67, 0 + color = "#3c582f" alcohol_perc = 0.5 drink_icon = "martiniglass" drink_name = "Classic Martini" @@ -402,7 +402,7 @@ name = "Vodka Martini" id = "vodkamartini" description = "Vodka with Gin. Not quite how 007 enjoyed it, but still delicious." - color = "#664300" // rgb: 102, 67, 0 + color = "#3c582f" alcohol_perc = 0.4 drink_icon = "martiniglass" drink_name = "Vodka martini" @@ -414,7 +414,7 @@ name = "White Russian" id = "whiterussian" description = "That's just, like, your opinion, man..." - color = "#A68340" // rgb: 166, 131, 64 + color = "#b4b483" alcohol_perc = 0.3 drink_icon = "whiterussianglass" drink_name = "White Russian" @@ -426,7 +426,7 @@ name = "Screwdriver" id = "screwdrivercocktail" description = "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious." - color = "#A68310" // rgb: 166, 131, 16 + color = "#744a02" alcohol_perc = 0.3 drink_icon = "screwdriverglass" drink_name = "Screwdriver" @@ -438,7 +438,7 @@ name = "Booger" id = "booger" description = "Eww..." - color = "#A68310" // rgb: 166, 131, 16 + color = "#447109" alcohol_perc = 0.2 drink_icon = "booger" drink_name = "Booger" @@ -450,7 +450,7 @@ name = "Bloody Mary" id = "bloodymary" description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice." - color = "#664300" // rgb: 102, 67, 0 + color = "#7d0707" alcohol_perc = 0.2 drink_icon = "bloodymaryglass" drink_name = "Bloody Mary" @@ -462,7 +462,7 @@ name = "Pan-Galactic Gargle Blaster" id = "gargleblaster" description = "Whoah, this stuff looks volatile!" - color = "#664300" // rgb: 102, 67, 0 + color = "#381575" alcohol_perc = 0.7 //ouch drink_icon = "gargleblasterglass" drink_name = "Pan-Galactic Gargle Blaster" @@ -486,7 +486,7 @@ name = "Brave Bull" id = "bravebull" description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice." - color = "#664300" // rgb: 102, 67, 0 + color = "#361308" alcohol_perc = 0.3 drink_icon = "bravebullglass" drink_name = "Brave Bull" @@ -497,7 +497,7 @@ name = "Tequila Sunrise" id = "tequilasunrise" description = "Tequila and orange juice. Much like a Screwdriver, only Mexican~" - color = "#664300" // rgb: 102, 67, 0 + color = "#923a07" alcohol_perc = 0.3 drink_icon = "tequilasunriseglass" drink_name = "Tequila Sunrise" @@ -509,7 +509,7 @@ name = "Toxins Special" id = "toxinsspecial" description = "This thing is FLAMING!. CALL THE DAMN SHUTTLE!" - color = "#664300" // rgb: 102, 67, 0 + color = "#2e1c4f" alcohol_perc = 0.5 drink_icon = "toxinsspecialglass" drink_name = "Toxins Special" @@ -526,7 +526,7 @@ name = "Beepsky Smash" id = "beepskysmash" description = "Deny drinking this and prepare for THE LAW." - color = "#664300" // rgb: 102, 67, 0 + color = "#505000" alcohol_perc = 0.5 drink_icon = "beepskysmashglass" drink_name = "Beepsky Smash" @@ -538,7 +538,7 @@ name = "Irish Cream" id = "irishcream" description = "Whiskey-imbued cream, what else would you expect from the Irish." - color = "#664300" // rgb: 102, 67, 0 + color = "#bca880" alcohol_perc = 0.3 drink_icon = "irishcreamglass" drink_name = "Irish Cream" @@ -549,7 +549,7 @@ name = "The Manly Dorf" id = "manlydorf" description = "Beer and Ale, brought together in a delicious mix. Intended for true men only." - color = "#664300" // rgb: 102, 67, 0 + color = "#c57d07" alcohol_perc = 0.2 drink_icon = "manlydorfglass" drink_name = "The Manly Dorf" @@ -561,7 +561,7 @@ name = "Long Island Iced Tea" id = "longislandicedtea" description = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only." - color = "#664300" // rgb: 102, 67, 0 + color = "#b4202a" alcohol_perc = 0.5 drink_icon = "longislandicedteaglass" drink_name = "Long Island Iced Tea" @@ -573,7 +573,7 @@ name = "Moonshine" id = "moonshine" description = "You've really hit rock bottom now... your liver packed its bags and left last night." - color = "#664300" // rgb: 102, 67, 0 + color = "#738280" alcohol_perc = 0.8 //yeeehaw drink_icon = "glass_clear" drink_name = "Moonshine" @@ -585,7 +585,7 @@ name = "B-52" id = "b52" description = "Coffee, Irish Cream, and congac. You will get bombed." - color = "#664300" // rgb: 102, 67, 0 + color = "#4c280e" alcohol_perc = 0.3 drink_icon = "b52glass" drink_name = "B-52" @@ -597,7 +597,7 @@ name = "Irish Coffee" id = "irishcoffee" description = "Coffee, and alcohol. More fun than a Mimosa to drink in the morning." - color = "#664300" // rgb: 102, 67, 0 + color = "#a45a41" alcohol_perc = 0.2 drink_icon = "irishcoffeeglass" drink_name = "Irish Coffee" @@ -609,7 +609,7 @@ name = "Margarita" id = "margarita" description = "On the rocks with salt on the rim. Arriba~!" - color = "#664300" // rgb: 102, 67, 0 + color = "#52c76a" alcohol_perc = 0.3 drink_icon = "margaritaglass" drink_name = "Margarita" @@ -621,7 +621,7 @@ name = "Black Russian" id = "blackrussian" description = "For the lactose-intolerant. Still as classy as a White Russian." - color = "#360000" // rgb: 54, 0, 0 + color = "#3f0415" alcohol_perc = 0.4 drink_icon = "blackrussianglass" drink_name = "Black Russian" @@ -633,7 +633,7 @@ name = "Manhattan" id = "manhattan" description = "The Detective's undercover drink of choice. He never could stomach gin..." - color = "#664300" // rgb: 102, 67, 0 + color = "#ac0649" alcohol_perc = 0.4 drink_icon = "manhattanglass" drink_name = "Manhattan" @@ -644,7 +644,7 @@ name = "Manhattan Project" id = "manhattan_proj" description = "A scientist's drink of choice, for pondering ways to blow up the station." - color = "#664300" // rgb: 102, 67, 0 + color = "#ff6633" alcohol_perc = 0.4 drink_icon = "proj_manhattanglass" drink_name = "Manhattan Project" @@ -656,7 +656,7 @@ name = "Whiskey Soda" id = "whiskeysoda" description = "Ultimate refreshment." - color = "#664300" // rgb: 102, 67, 0 + color = "#6a1e06" alcohol_perc = 0.3 drink_icon = "whiskeysodaglass2" drink_name = "Whiskey Soda" @@ -668,7 +668,7 @@ name = "Anti-freeze" id = "antifreeze" description = "Ultimate refreshment." - color = "#664300" // rgb: 102, 67, 0 + color = "#185b81" alcohol_perc = 0.2 drink_icon = "antifreeze" drink_name = "Anti-freeze" @@ -704,7 +704,7 @@ name = "Barefoot" id = "barefoot" description = "Barefoot and pregnant" - color = "#664300" // rgb: 102, 67, 0 + color = "#402751" alcohol_perc = 0.2 drink_icon = "b&p" drink_name = "Barefoot" @@ -716,7 +716,7 @@ name = "Snow White" id = "snowwhite" description = "A cold refreshment" - color = "#664300" // rgb: 102, 67, 0 + color = "#f8f8f8" alcohol_perc = 0.2 drink_icon = "snowwhite" drink_name = "Snow White" @@ -728,7 +728,7 @@ name = "Demons Blood" id = "demonsblood" description = "AHHHH!!!!" - color = "#664300" // rgb: 102, 67, 0 + color = "#931f29" dizzy_adj = 20 SECONDS alcohol_perc = 0.4 drink_icon = "demonsblood" @@ -741,7 +741,7 @@ name = "Vodka and Tonic" id = "vodkatonic" description = "For when a gin and tonic isn't russian enough." - color = "#664300" // rgb: 102, 67, 0 + color = "#469b85" dizzy_adj = 8 SECONDS alcohol_perc = 0.3 drink_icon = "vodkatonicglass" @@ -754,7 +754,7 @@ name = "Gin Fizz" id = "ginfizz" description = "Refreshingly lemony, deliciously dry." - color = "#664300" // rgb: 102, 67, 0 + color = "#a26d3f" dizzy_adj = 8 SECONDS alcohol_perc = 0.4 drink_icon = "ginfizzglass" @@ -767,7 +767,7 @@ name = "Bahama mama" id = "bahama_mama" description = "Tropic cocktail." - color = "#664300" // rgb: 102, 67, 0 + color = "#a33900" alcohol_perc = 0.2 drink_icon = "bahama_mama" drink_name = "Bahama Mama" @@ -779,7 +779,7 @@ name = "Singulo" id = "singulo" description = "The edge of eternity, contained in a glass." - color = "#2E6671" // rgb: 46, 102, 113 + color = "#690732" dizzy_adj = 30 SECONDS alcohol_perc = 0.7 drink_icon = "singulo" @@ -792,7 +792,7 @@ name = "Sbiten" id = "sbiten" description = "A spicy Vodka! Might be a little hot for the little guys!" - color = "#664300" // rgb: 102, 67, 0 + color = "#827f17" alcohol_perc = 0.4 drink_icon = "sbitenglass" drink_name = "Sbiten" @@ -809,7 +809,7 @@ name = "Devils Kiss" id = "devilskiss" description = "Creepy time!" - color = "#A68310" // rgb: 166, 131, 16 + color = "#c13f61" alcohol_perc = 0.3 drink_icon = "devilskiss" drink_name = "Devils Kiss" @@ -821,7 +821,7 @@ name = "Red Mead" id = "red_mead" description = "The true Viking drink! Even though it has a strange red color." - color = "#664300" // rgb: 102, 67, 0 + color = "#ac4644" alcohol_perc = 0.2 drink_icon = "red_meadglass" drink_name = "Red Mead" @@ -833,7 +833,7 @@ name = "Mead" id = "mead" description = "A Vikings drink, though a cheap one." - color = "#664300" // rgb: 102, 67, 0 + color = "#8d7808" nutriment_factor = 1 * REAGENTS_METABOLISM alcohol_perc = 0.2 drink_icon = "meadglass" @@ -845,7 +845,7 @@ name = "Iced Beer" id = "iced_beer" description = "A beer which is so cold the air around it freezes." - color = "#664300" // rgb: 102, 67, 0 + color = "#958223" alcohol_perc = 0.2 drink_icon = "iced_beerglass" drink_name = "Iced Beer" @@ -861,7 +861,7 @@ name = "Grog" id = "grog" description = "Watered down rum, Nanotrasen approves!" - color = "#664300" // rgb: 102, 67, 0 + color = "#717009" alcohol_perc = 0.2 drink_icon = "grogglass" drink_name = "Grog" @@ -873,7 +873,7 @@ name = "Aloe" id = "aloe" description = "So very, very, very good." - color = "#664300" // rgb: 102, 67, 0 + color = "#696807" alcohol_perc = 0.2 drink_icon = "aloe" drink_name = "Aloe" @@ -885,7 +885,7 @@ name = "Andalusia" id = "andalusia" description = "A nice, strange named drink." - color = "#664300" // rgb: 102, 67, 0 + color = "#446a0c" alcohol_perc = 0.4 drink_icon = "andalusia" drink_name = "Andalusia" @@ -897,7 +897,7 @@ name = "Allies Cocktail" id = "alliescocktail" description = "A drink made from your allies." - color = "#664300" // rgb: 102, 67, 0 + color = "#0a705c" alcohol_perc = 0.5 drink_icon = "alliescocktail" drink_name = "Allies cocktail" @@ -921,7 +921,7 @@ name = "Amasec" id = "amasec" description = "Official drink of the Imperium." - color = "#664300" // rgb: 102, 67, 0 + color = "#717009" alcohol_perc = 0.3 drink_icon = "amasecglass" drink_name = "Amasec" @@ -933,7 +933,7 @@ name = "Neuro-toxin" id = "neurotoxin" description = "A strong neurotoxin that puts the subject into a death-like state." - color = "#2E2E61" // rgb: 46, 46, 97 + color = "#185b81" dizzy_adj = 12 SECONDS alcohol_perc = 0.7 heart_rate_decrease = 1 @@ -957,7 +957,7 @@ name = "Hippie's Delight" id = "hippiesdelight" description = "You just don't get it maaaan." - color = "#664300" // rgb: 102, 67, 0 + color = "#0e8113" metabolization_rate = 0.2 * REAGENTS_METABOLISM drink_icon = "hippiesdelightglass" drink_name = "Hippie's Delight" @@ -1007,7 +1007,7 @@ name = "Dublin Drop" id = "dublindrop" description = "Mmm, tastes like chocolate cake..." - color = "#2E6671" // rgb: 46, 102, 113 + color = "#482504" alcohol_perc = 0.3 dizzy_adj = 10 SECONDS drink_icon = "dublindrop" @@ -1020,7 +1020,7 @@ name = "Syndicate Bomb" id = "syndicatebomb" description = "A Syndicate bomb" - color = "#2E6671" // rgb: 46, 102, 113 + color = "#b4202a" alcohol_perc = 0.2 drink_icon = "syndicatebomb" drink_name = "Syndicate Bomb" @@ -1032,7 +1032,7 @@ name = "Erika Surprise" id = "erikasurprise" description = "The surprise is, it's green!" - color = "#2E6671" // rgb: 46, 102, 113 + color = "#1b6f1b" alcohol_perc = 0.2 drink_icon = "erikasurprise" drink_name = "Erika Surprise" @@ -1045,7 +1045,7 @@ id = "driestmartini" description = "Only for the experienced. You think you see sand floating in the glass." nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#2E6671" // rgb: 46, 102, 113 + color = "#bd994d" alcohol_perc = 0.5 dizzy_adj = 20 SECONDS drink_icon = "driestmartiniglass" @@ -1063,7 +1063,7 @@ name = "Kahlua" id = "kahlua" description = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936!" - color = "#664300" // rgb: 102, 67, 0 + color = "#31211b" alcohol_perc = 0.2 drink_icon = "kahluaglass" drink_name = "Glass of RR coffee Liquor" @@ -1082,7 +1082,7 @@ id = "ginsonic" description = "GOTTA GET CRUNK FAST BUT LIQUOR TOO SLOW" reagent_state = LIQUID - color = "#1111CF" + color = "#5489dd" drink_icon = "ginsonic" drink_name = "Gin and Sonic" drink_desc = "An extremely high amperage drink. Absolutely not for the true Englishman." @@ -1110,7 +1110,7 @@ name = "Applejack" id = "applejack" description = "A highly concentrated alcoholic beverage made by repeatedly freezing cider and removing the ice." - color = "#997A00" + color = "#a84317" alcohol_perc = 0.4 drink_icon = "cognacglass" drink_name = "Glass of applejack" @@ -1122,7 +1122,7 @@ name = "Jack Rose" id = "jackrose" description = "A classic cocktail that had fallen out of fashion, but never out of taste," - color = "#664300" + color = "#a4af9d" alcohol_perc = 0.4 drink_icon = "patronglass" drink_name = "Jack Rose" @@ -1134,7 +1134,7 @@ name = "Drunken Blumpkin" id = "drunkenblumpkin" description = "A weird mix of whiskey and blumpkin juice." - color = "#1EA0FF" // rgb: 102, 67, 0 + color = "#0099cc" alcohol_perc = 0.5 drink_icon = "drunkenblumpkin" drink_name = "Drunken Blumpkin" @@ -1282,7 +1282,7 @@ name = "Servo" id = "servo" description = "A drink containing some organic ingredients, but meant only for synthetics." - color = "#5b3210" + color = "#220c0c" alcohol_perc = 0.25 drink_icon = "servoglass" drink_name = "Glass of Servo" @@ -1306,7 +1306,7 @@ name = "Synth 'n Soda" id = "synthnsoda" description = "The classic drink adjusted for a robot's tastes." - color = "#7204e7" + color = "#3d2a29" alcohol_perc = 0.25 drink_icon = "synthnsodaglass" drink_name = "Glass of Synth 'n Soda" @@ -1318,7 +1318,7 @@ name = "Synthignon" id = "synthignon" description = "Someone mixed wine and alcohol for robots. Hope you're proud of yourself." - color = "#d004e7" + color = "#7104a8" alcohol_perc = 0.25 drink_icon = "synthignonglass" drink_name = "Glass of Synthignon" @@ -1512,7 +1512,7 @@ name = "Dryer Martini" id = "dryer_martini" description = "In general, you want the martini to taste dry, not dry up." - color = "#d004e7" + color = "#3c5e8b" dizzy_adj = 14 SECONDS drink_icon = "dryer_martini_glass" drink_name = "Glass of Dryer Martini" @@ -1719,7 +1719,7 @@ name = "Whiskey Sour" id = "whiskeysour" description = "A tantalizing mixture of whiskey, sugar, lemon juice... and egg whites?" - color = "#E4D629" // rgb (228, 214, 41) + color = "#efac14" alcohol_perc = 0.6 drink_icon = "whiskeysour" drink_name = "Whiskey Sour" @@ -1768,7 +1768,7 @@ name = "Lager" id = "lager" description = "A pale beer commonly drank by football hooligans" - color = "#664300" + color = "#958223" alcohol_perc = 0.4 drink_icon = "lagerglass" drink_name = "Starlink Lager" @@ -1779,7 +1779,7 @@ name = "Stout" id = "stout" description = "A pitch black beer, high in iron content" - color = "#000000" + color = "#111111" alcohol_perc = 0.4 drink_icon = "stoutglass" drink_name = "Stout" @@ -1955,7 +1955,7 @@ name = "Die Seife" id = "dieseife" description = "There is a piece of soap at the bottom of the glass and it is slowly melting." - color = "#9D9E89" // rgb: 157, 158, 137 + color = "#b3660d" overdose_threshold = 20 allowed_overdose_process = TRUE alcohol_perc = 0.2 @@ -2033,7 +2033,7 @@ name = "Howler" id = "howler" description = "Old classic human drink that was adopted by Vulpkanin." - color = "#EC6400" // rgb: 236, 100, 0 + color = "#9c0b0c" alcohol_perc = 0.2 drink_icon = "howler" drink_name = "Howler" diff --git a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm index e341b0a93de..6cc2e3ba95e 100644 --- a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm @@ -107,7 +107,7 @@ name = "The Doctor's Delight" id = "doctorsdelight" description = "A gulp a day keeps the MediBot away. That's probably for the best." - color = "#FF8CFF" // rgb: 255, 140, 255 + color = "#754389" 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." @@ -183,7 +183,7 @@ name = "Watermelon Juice" id = "watermelonjuice" description = "Delicious juice made from watermelon." - color = "#863333" // rgb: 134, 51, 51 + color = "#ae2631" drink_name = "Watermelon Juice" drink_desc = "Almost water." taste_description = "watermelon juice" @@ -417,7 +417,7 @@ name = "Tea" id = "tea" description = "Tasty black tea: It has antioxidants. It's good for you!" - color = "#101000" // rgb: 16, 16, 0 + color = "#5d2409" nutriment_factor = 0 adj_dizzy = -4 SECONDS adj_drowsy = -2 SECONDS @@ -444,7 +444,7 @@ name = "Iced Tea" id = "icetea" description = "No relation to a certain rap artist/ actor." - color = "#104038" // rgb: 16, 64, 56 + color = "#73280d" drink_icon = "icetea" drink_name = "Iced Tea" drink_desc = "No relation to a certain rap artist/ actor." @@ -454,7 +454,7 @@ name = "Banana Honk" id = "bananahonk" description = "A drink from Clown Heaven." - color = "#664300" // rgb: 102, 67, 0 + color = "#d4c540" process_flags = ORGANIC | SYNTHETIC drink_icon = "bananahonkglass" drink_name = "Banana Honk" @@ -472,7 +472,7 @@ name = "Silencer" id = "silencer" description = "A drink from Mime Heaven." - color = "#664300" // rgb: 102, 67, 0 + color = "#7c8287" process_flags = ORGANIC | SYNTHETIC drink_icon = "silencerglass" drink_name = "Silencer" @@ -491,7 +491,7 @@ name = "Chocolate Pudding" id = "chocolatepudding" description = "A great dessert for chocolate lovers." - color = "#800000" + color = "#63230d" nutriment_factor = 4 * REAGENTS_METABOLISM drink_icon = "chocolatepudding" drink_name = "Chocolate Pudding" @@ -503,7 +503,7 @@ name = "Vanilla Pudding" id = "vanillapudding" description = "A great dessert for vanilla lovers." - color = "#FAFAD2" + color = "#cbbe8a" nutriment_factor = 4 * REAGENTS_METABOLISM drink_icon = "vanillapudding" drink_name = "Vanilla Pudding" @@ -515,7 +515,7 @@ name = "Cherry Shake" id = "cherryshake" description = "A cherry flavored milkshake." - color = "#FFB6C1" + color = "#ff7970" nutriment_factor = 4 * REAGENTS_METABOLISM drink_icon = "cherryshake" drink_name = "Cherry Shake" @@ -569,7 +569,7 @@ name = "Grape soda" id = "grapesoda" description = "Beloved of children and teetotalers." - color = "#E6CDFF" + color = "#b570ff" drink_name = "Grape Soda" drink_desc = "Made with real grapes! Shocking!" taste_description = "grape soda" @@ -578,7 +578,7 @@ name = "Iced Cocoa" id = "icecoco" description = "Hot cocoa and ice, refreshing and cool." - color = "#102838" // rgb: 16, 40, 56 + color = "#5d2c28" drink_icon = "icedcoffeeglass" drink_name = "Iced Cocoa" drink_desc = "A sweeter drink to perk you up and refresh you!" @@ -589,7 +589,7 @@ name = "Tonic Water" id = "tonic" description = "It tastes strange but at least the quinine keeps the Space Malaria at bay." - color = "#664300" // rgb: 102, 67, 0 + color = "#5999c4" adj_dizzy = -10 SECONDS adj_drowsy = -6 SECONDS adj_sleepy = -4 SECONDS @@ -602,7 +602,7 @@ name = "Soda Water" id = "sodawater" description = "A can of club soda. Why not make a scotch and soda?" - color = "#619494" // rgb: 97, 148, 148 + color = "#619494" adj_dizzy = -10 SECONDS adj_drowsy = -6 SECONDS drink_icon = "glass_clear" @@ -629,7 +629,7 @@ name = "Cola" id = "cola" description = "A refreshing beverage." - color = "#100800" // rgb: 16, 8, 0 + color = "#401a08" adj_drowsy = -10 SECONDS drink_icon = "glass_brown" drink_name = "Glass of Space Cola" @@ -640,7 +640,7 @@ name = "Nuka Cola" id = "nuka_cola" description = "Cola, cola never changes." - color = "#100800" // rgb: 16, 8, 0 + color = "#0e0502" adj_sleepy = -4 SECONDS drink_icon = "nuka_colaglass" drink_name = "Nuka Cola" @@ -666,7 +666,7 @@ name = "Space Mountain Wind" id = "spacemountainwind" description = "Blows right through you like a space wind." - color = "#102000" // rgb: 16, 32, 0 + color = "#58d92e" adj_drowsy = -14 SECONDS adj_sleepy = -2 SECONDS drink_icon = "Space_mountain_wind_glass" @@ -678,7 +678,7 @@ name = "Dr. Gibb" id = "dr_gibb" description = "A delicious blend of 42 different flavours" - color = "#102000" // rgb: 16, 32, 0 + color = "#bf0d16" adj_drowsy = -12 SECONDS drink_icon = "dr_gibb_glass" drink_name = "Glass of Dr. Gibb" @@ -689,7 +689,7 @@ name = "Space-Up" id = "space_up" description = "Tastes like a hull breach in your mouth." - color = "#C7DF67" + color = "#446693" drink_icon = "space-up_glass" drink_name = "Glass of Space-up" drink_desc = "Space-up. It helps keep your cool." @@ -717,7 +717,7 @@ name = "Kira Special" description = "Long live the guy who everyone had mistaken for a girl. Baka!" id = "kiraspecial" - color = "#CCCC99" // rgb: 204, 204, 153 + color = "#c97b0d" drink_icon = "kiraspecial" drink_name = "Kira Special" drink_desc = "Long live the guy who everyone had mistaken for a girl. Baka!" @@ -739,7 +739,7 @@ name = "Milkshake" description = "Glorious brainfreezing mixture." id = "milkshake" - color = "#AEE5E4" // rgb" 174, 229, 228 + color = "#ddcaa6" drink_icon = "milkshake" drink_name = "Milkshake" drink_desc = "Glorious brainfreezing mixture." @@ -749,7 +749,7 @@ name = "Rewriter" description = "The secret of the sanctuary of the Librarian..." id = "rewriter" - color = "#485000" // rgb:72, 080, 0 + color = "#1f6f3a" drink_icon = "rewriter" drink_name = "Rewriter" drink_desc = "The secret of the sanctuary of the Librarian..." @@ -764,7 +764,7 @@ name = "Arnold Palmer" id = "arnold_palmer" description = "A wholesome mixture of lemonade and iced tea." - color = "#8B5427" // rgb: 139, 84, 39 + color = "#af934c" drink_icon = "arnoldpalmer" drink_name = "Arnold Palmer" drink_desc = "A wholesome mixture of lemonade and iced tea... looks like somebody didn't stir this one very well." @@ -819,7 +819,7 @@ name = "Lean" id = "lean" description = "Also known as Purple Drank." - color = "#f249d6" + color = "#8b3cd9" drink_icon = "lean" drink_name = "Lean" drink_desc = "Also known as Purple Drank." @@ -856,7 +856,7 @@ name = "Bubble Tea" description = "A tea-based drink made with tapioca pearls. Known by some as boba tea." id = "bubbletea" - color = "#c79a47" + color = "#5d2409" drink_icon = "bubbletea" drink_name = "Bubble Tea" drink_desc = "You feel trendy for drinking this." @@ -1172,7 +1172,7 @@ return ..() /datum/reagent/consumable/drink/electrolytes/tcp_sip/ginger_beep - name = "ginger_beep" + name = "Ginger Beep" description = "A gingery refreshment for synthetics." id = "ginger_beep" color = "#bd994d"