cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 13:37:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

drinking glass refactor

Browse Source
This commit is contained in:
Fox-McCloud
2016-11-06 02:02:08 -05:00
parent 710e0e1005
commit 77c6460bfe
11 changed files with 552 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+6 -517
View File
@@ -36,523 +36,12 @@
reagents.clear_reagents()
extinguish()
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/on_reagent_change() // *scream
if(reagents.reagent_list.len > 0)
switch(reagents.get_master_reagent_id())
if("beer")
icon_state = "beerglass"
name = "Beer glass"
desc = "A freezing pint of beer"
if("cider")
icon_state = "rewriter"
name = "Cider"
desc = "a refreshing glass of traditional cider"
if("beer2")
icon_state = "beerglass"
name = "Beer glass"
desc = "A freezing pint of beer"
if("ale")
icon_state = "aleglass"
name = "Ale glass"
desc = "A freezing pint of delicious Ale"
if("milk")
icon_state = "glass_white"
name = "Glass of milk"
desc = "White and nutritious goodness!"
if("cream")
icon_state = "glass_white"
name = "Glass of cream"
desc = "Ewwww..."
if("chocolate")
icon_state = "chocolateglass"
name = "Glass of chocolate"
desc = "Tasty"
if("hot_coco")
icon_state = "hot_coco"
name = "Glass of hot coco"
desc = "Delicious and cozy"
if("lemonjuice")
icon_state = "lemonglass"
name = "Glass of lemonjuice"
desc = "Sour..."
if("cola")
icon_state = "glass_brown"
name = "Glass of Space Cola"
desc = "A glass of refreshing Space Cola"
if("nuka_cola")
icon_state = "nuka_colaglass"
name = "Nuka Cola"
desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland"
if("orangejuice")
icon_state = "glass_orange"
name = "Glass of Orange juice"
desc = "Vitamins! Yay!"
if("tomatojuice")
icon_state = "glass_red"
name = "Glass of Tomato juice"
desc = "Are you sure this is tomato juice?"
if("blood")
icon_state = "glass_red"
name = "Glass of Tomato juice"
desc = "Are you sure this is tomato juice?"
if("limejuice")
icon_state = "glass_green"
name = "Glass of Lime juice"
desc = "A glass of sweet-sour lime juice."
if("whiskey")
icon_state = "whiskeyglass"
name = "Glass of whiskey"
desc = "The silky, smokey whiskey goodness inside the glass makes the drink look very classy."
if("gin")
icon_state = "ginvodkaglass"
name = "Glass of gin"
desc = "A crystal clear glass of Griffeater gin."
if("vodka")
icon_state = "ginvodkaglass"
name = "Glass of vodka"
desc = "The glass contain wodka. Xynta."
if("sake")
icon_state = "ginvodkaglass"
name = "Glass of Sake"
desc = "A glass of Sake."
if("goldschlager")
icon_state = "ginvodkaglass"
name = "Glass of goldschlager"
desc = "100 proof that teen girls will drink anything with gold in it."
if("wine")
icon_state = "wineglass"
name = "Glass of wine"
desc = "A very classy looking drink."
if("cognac")
icon_state = "cognacglass"
name = "Glass of cognac"
desc = "Damn, you feel like some kind of French aristocrat just by holding this."
if("kahlua")
icon_state = "kahluaglass"
name = "Glass of RR coffee Liquor"
desc = "DAMN, THIS THING LOOKS ROBUST"
if("vermouth")
icon_state = "vermouthglass"
name = "Glass of Vermouth"
desc = "You wonder why you're even drinking this straight."
if("triple_citrus")
icon_state = "triplecitrus"
name = "Glass of Triplecitrus Juice"
desc = "As colorful and healthy as it is delicious."
if("mojito")
icon_state = "mojito"
name = "Glass of Mojito"
desc = "Fresh from Spesscuba."
if("tequila")
icon_state = "tequilaglass"
name = "Glass of Tequila"
desc = "Now all that's missing is the weird colored shades!"
if("patron")
icon_state = "patronglass"
name = "Glass of Patron"
desc = "Drinking patron in the bar, with all the subpar ladies."
if("rum")
icon_state = "rumglass"
name = "Glass of Rum"
desc = "Now you want to Pray for a pirate suit, don't you?"
if("absinthe")
icon_state = "absinthebottle"
name = "Glass of Absinthe"
desc = "The green fairy is going to get you now!"
if("gintonic")
icon_state = "gintonicglass"
name = "Gin and Tonic"
desc = "A mild but still great cocktail. Drink up, like a true Englishman."
if("ginsonic")
icon_state = "ginsonic"
name = "Gin and Sonic"
desc = "An extremely high amperage drink. Absolutely not for the true Englishman."
if("whiskeycola")
icon_state = "whiskeycolaglass"
name = "Whiskey Cola"
desc = "An innocent-looking mixture of cola and Whiskey. Delicious."
if("whiterussian")
icon_state = "whiterussianglass"
name = "White Russian"
desc = "A very nice looking drink. But that's just, like, your opinion, man."
if("screwdrivercocktail")
icon_state = "screwdriverglass"
name = "Screwdriver"
desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer."
if("bloodymary")
icon_state = "bloodymaryglass"
name = "Bloody Mary"
desc = "Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder."
if("martini")
icon_state = "martiniglass"
name = "Classic Martini"
desc = "Damn, the bartender even stirred it, not shook it."
if("vodkamartini")
icon_state = "martiniglass"
name = "Vodka martini"
desc ="A bastardisation of the classic martini. Still great."
if("gargleblaster")
icon_state = "gargleblasterglass"
name = "Pan-Galactic Gargle Blaster"
desc = "Does... does this mean that Arthur and Ford are on the station? Oh joy."
if("bravebull")
icon_state = "bravebullglass"
name = "Brave Bull"
desc = "Tequila and Coffee liquor, brought together in a mouthwatering mixture. Drink up."
if("tequilasunrise")
icon_state = "tequilasunriseglass"
name = "Tequila Sunrise"
desc = "Oh great, now you feel nostalgic about sunrises back on Terra..."
if("toxinsspecial")
icon_state = "toxinsspecialglass"
name = "Toxins Special"
desc = "Whoah, this thing is on FIRE"
if("beepskysmash")
icon_state = "beepskysmashglass"
name = "Beepsky Smash"
desc = "Heavy, hot and strong. Just like the Iron fist of the LAW."
if("doctorsdelight")
icon_state = "doctorsdelightglass"
name = "Doctor's Delight"
desc = "A healthy mixture of juices, guaranteed to keep you healthy until the next toolboxing takes place."
if("manlydorf")
icon_state = "manlydorfglass"
name = "The Manly Dorf"
desc = "A manly concotion made from Ale and Beer. Intended for true men only."
if("irishcream")
icon_state = "irishcreamglass"
name = "Irish Cream"
desc = "It's cream, mixed with whiskey. What else would you expect from the Irish?"
if("cubalibre")
icon_state = "cubalibreglass"
name = "Cuba Libre"
desc = "A classic mix of rum and cola."
if("b52")
icon_state = "b52glass"
name = "B-52"
desc = "Kahlua, Irish Cream, and congac. You will get bombed."
if("atomicbomb")
icon_state = "atomicbombglass"
name = "Atomic Bomb"
desc = "Nanotrasen cannot take legal responsibility for your actions after imbibing."
if("longislandicedtea")
icon_state = "longislandicedteaglass"
name = "Long Island Iced Tea"
desc = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only."
if("threemileisland")
icon_state = "threemileislandglass"
name = "Three Mile Island Ice Tea"
desc = "A glass of this is sure to prevent a meltdown."
if("margarita")
icon_state = "margaritaglass"
name = "Margarita"
desc = "On the rocks with salt on the rim. Arriba~!"
if("blackrussian")
icon_state = "blackrussianglass"
name = "Black Russian"
desc = "For the lactose-intolerant. Still as classy as a White Russian."
if("vodkatonic")
icon_state = "vodkatonicglass"
name = "Vodka and Tonic"
desc = "For when a gin and tonic isn't russian enough."
if("manhattan")
icon_state = "manhattanglass"
name = "Manhattan"
desc = "The Detective's undercover drink of choice. He never could stomach gin..."
if("manhattan_proj")
icon_state = "proj_manhattanglass"
name = "Manhattan Project"
desc = "A scienitst drink of choice, for thinking how to blow up the station."
if("ginfizz")
icon_state = "ginfizzglass"
name = "Gin Fizz"
desc = "Refreshingly lemony, deliciously dry."
if("irishcoffee")
icon_state = "irishcoffeeglass"
name = "Irish Coffee"
desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning."
if("suicider")
icon_state = "suicider"
name = "Suicider"
desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
if("whiskeysoda")
icon_state = "whiskeysodaglass2"
name = "Whiskey Soda"
desc = "Ultimate refreshment."
if("tonic")
icon_state = "glass_clear"
name = "Glass of Tonic Water"
desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
if("sodawater")
icon_state = "glass_clear"
name = "Glass of Soda Water"
desc = "Soda water. Why not make a scotch and soda?"
if("water")
icon_state = "glass_clear"
name = "Glass of Water"
desc = "The father of all refreshments."
if("spacemountainwind")
icon_state = "Space_mountain_wind_glass"
name = "Glass of Space Mountain Wind"
desc = "Space Mountain Wind. As you know, there are no mountains in space, only wind."
if("thirteenloko")
icon_state = "thirteen_loko_glass"
name = "Glass of Thirteen Loko"
desc = "This is a glass of Thirteen Loko, it appears to be of the highest quality. The drink, not the glass"
if("dr_gibb")
icon_state = "dr_gibb_glass"
name = "Glass of Dr. Gibb"
desc = "Dr. Gibb. Not as dangerous as the name might imply."
if("space_up")
icon_state = "space-up_glass"
name = "Glass of Space-up"
desc = "Space-up. It helps keep your cool."
if("moonshine")
icon_state = "glass_clear"
name = "Moonshine"
desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
if("soymilk")
icon_state = "glass_white"
name = "Glass of soy milk"
desc = "White and nutritious soy goodness!"
if("berryjuice")
icon_state = "berryjuice"
name = "Glass of berry juice"
desc = "Berry juice. Or maybe its jam. Who cares?"
if("poisonberryjuice")
icon_state = "poisonberryjuice"
name = "Glass of poison berry juice"
desc = "A glass of deadly juice."
if("carrotjuice")
icon_state = "carrotjuice"
name = "Glass of carrot juice"
desc = "It is just like a carrot but without crunching."
if("potato")
icon_state = "glass_brown"
name = "Glass of potato juice"
desc = "Who in the hell requests this? Gross!"
if("banana")
icon_state = "banana"
name = "Glass of banana juice"
desc = "The raw essence of a banana. HONK"
if("bahama_mama")
icon_state = "bahama_mama"
name = "Bahama Mama"
desc = "Tropic cocktail"
if("singulo")
icon_state = "singulo"
name = "Singulo"
desc = "A blue-space beverage."
if("alliescocktail")
icon_state = "alliescocktail"
name = "Allies cocktail"
desc = "A drink made from your allies."
if("antifreeze")
icon_state = "antifreeze"
name = "Anti-freeze"
desc = "The ultimate refreshment."
if("barefoot")
icon_state = "b&p"
name = "Barefoot"
desc = "Barefoot and pregnant"
if("demonsblood")
icon_state = "demonsblood"
name = "Demons Blood"
desc = "Just looking at this thing makes the hair at the back of your neck stand up."
if("booger")
icon_state = "booger"
name = "Booger"
desc = "Ewww..."
if("snowwhite")
icon_state = "snowwhite"
name = "Snow White"
desc = "A cold refreshment."
if("aloe")
icon_state = "aloe"
name = "Aloe"
desc = "Very, very, very good."
if("andalusia")
icon_state = "andalusia"
name = "Andalusia"
desc = "A nice, strange named drink."
if("sbiten")
icon_state = "sbitenglass"
name = "Sbiten"
desc = "A spicy mix of Vodka and Spice. Very hot."
if("red_mead")
icon_state = "red_meadglass"
name = "Red Mead"
desc = "A True Vikings Beverage, though its color is strange."
if("mead")
icon_state = "meadglass"
name = "Mead"
desc = "A Vikings Beverage, though a cheap one."
if("iced_beer")
icon_state = "iced_beerglass"
name = "Iced Beer"
desc = "A beer so frosty, the air around it freezes."
if("grog")
icon_state = "grogglass"
name = "Grog"
desc = "A fine and cepa drink for Space."
if("soy_latte")
icon_state = "soy_latte"
name = "Soy Latte"
desc = "A nice and refrshing beverage while you are reading."
if("cafe_latte")
icon_state = "cafe_latte"
name = "Cafe Latte"
desc = "A nice, strong and refreshing beverage while you are reading."
if("cafe_mocha")
icon_state = "cafe_latte"
name = "Cafe Mocha"
desc = "The perfect blend of coffe, milk, and chocolate."
if("acidspit")
icon_state = "acidspitglass"
name = "Acid Spit"
desc = "A drink from Nanotrasen. Made from live aliens."
if("amasec")
icon_state = "amasecglass"
name = "Amasec"
desc = "Always handy before COMBAT!!!"
if("neurotoxin")
icon_state = "neurotoxinglass"
name = "Neurotoxin"
desc = "A drink that is guaranteed to knock you silly."
if("hippiesdelight")
icon_state = "hippiesdelightglass"
name = "Hippie's Delight"
desc = "A drink enjoyed by people during the 1960's."
if("bananahonk")
icon_state = "bananahonkglass"
name = "Banana Honk"
desc = "A drink from Banana Heaven."
if("silencer")
icon_state = "silencerglass"
name = "Silencer"
desc = "A drink from mime Heaven."
if("nothing")
icon_state = "nothing"
name = "Nothing"
desc = "Absolutely nothing."
if("devilskiss")
icon_state = "devilskiss"
name = "Devils Kiss"
desc = "Creepy time!"
if("changelingsting")
icon_state = "changelingsting"
name = "Changeling Sting"
desc = "A stingy drink."
if("irishcarbomb")
icon_state = "irishcarbomb"
name = "Irish Car Bomb"
desc = "An irish car bomb."
if("syndicatebomb")
icon_state = "syndicatebomb"
name = "Syndicate Bomb"
desc = "A syndicate bomb."
if("erikasurprise")
icon_state = "erikasurprise"
name = "Erika Surprise"
desc = "The surprise is, it's green!"
if("driestmartini")
icon_state = "driestmartiniglass"
name = "Driest Martini"
desc = "Only for the experienced. You think you see sand floating in the glass."
if("ice")
icon_state = "iceglass"
name = "Glass of ice"
desc = "Generally, you're supposed to put something else in there too..."
if("icecoffee")
icon_state = "icedcoffeeglass"
name = "Iced Coffee"
desc = "A drink to perk you up and refresh you!"
if("coffee")
icon_state = "glass_brown"
name = "Glass of coffee"
desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere."
if("bilk")
icon_state = "glass_brown"
name = "Glass of bilk"
desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis."
if("fuel")
icon_state = "dr_gibb_glass"
name = "Glass of welder fuel"
desc = "Unless you are an industrial tool, this is probably not safe for consumption."
if("brownstar")
icon_state = "brownstar"
name = "Brown Star"
desc = "Its not what it sounds like..."
if("tea")
icon_state = "glass_brown"
name = "Glass of Tea"
desc = "A glass of hot tea. Perhaps a cup with a handle would have been smarter?"
if("icetea")
icon_state = "icetea"
name = "Iced Tea"
desc = "No relation to a certain rap artist/ actor."
if("milkshake")
icon_state = "milkshake"
name = "Milkshake"
desc = "Glorious brainfreezing mixture."
if("lemonade")
icon_state = "lemonade"
name = "Lemonade"
desc = "Oh the nostalgia..."
if("kiraspecial")
icon_state = "kiraspecial"
name = "Kira Special"
desc = "Long live the guy who everyone had mistaken for a girl. Baka!"
if("rewriter")
icon_state = "rewriter"
name = "Rewriter"
desc = "The secert of the sanctuary of the Libarian..."
if("applejack")
icon_state = "cognacglass"
name = "Glass of applejack"
desc = "When cider isn't strong enough, you gotta jack it."
if("jackrose")
icon_state = "patronglass"
name = "Jack Rose"
desc = "Drinking this makes you feel like you belong in a luxury hotel bar during the 1920s."
if("synthanol")
icon_state = "synthanolglass"
name = "Glass of Synthanol"
desc = "The equivalent of alcohol for synthetic crewmembers. They'd find it awful if they had tastebuds too."
if("robottears")
icon_state = "robottearsglass"
name = "Glass of Robot Tears"
desc = "No robots were hurt in the making of this drink."
if("trinary")
icon_state = "trinaryglass"
name = "Glass of Trinary"
desc = "Colorful drink made for synthetic crewmembers. It doesn't seem like it would taste well."
if("servo")
icon_state = "servoglass"
name = "Glass of Servo"
desc = "Chocolate - based drink made for IPCs. Not sure if anyone's actually tried out the recipe."
if("synthnsoda")
icon_state = "synthnsodaglass"
name = "Glass of Synth 'n Soda"
desc = "Classic drink altered to fit the tastes of a robot. Bad idea to drink if you're made of carbon."
if("synthignon")
icon_state = "synthignonglass"
name = "Glass of Synthignon"
desc = "Someone mixed good wine and robot booze. Romantic, but atrocious."
if("uplink")
icon_state = "uplinkglass"
name = "Glass of Uplink"
desc = "An exquisite mix of the finest liquoirs and synthanol. Meant only for synthetics."
if("holywater")
icon_state = "glass_clear"
name = "Glass of Water"
desc = "The father of all refreshments."
else
icon_state ="glass_brown"
name = "Glass of ..what?"
desc = "You can't really tell what this is."
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/on_reagent_change()
if(reagents.reagent_list.len)
var/datum/reagent/R = reagents.get_master_reagent()
icon_state = R.drink_icon
name = R.drink_name
desc = R.drink_desc
else
icon_state = "glass_empty"
name = "glass"
code/modules/reagents/chemistry/holder.dm
+10
View File
@@ -76,6 +76,16 @@ var/const/INGEST = 2
handle_reactions()
return total_transfered
/datum/reagents/proc/get_master_reagent()
var/the_reagent = null
var/the_volume = 0
for(var/datum/reagent/A in reagent_list)
if(A.volume > the_volume)
the_volume = A.volume
the_reagent = A
return the_reagent
/datum/reagents/proc/get_master_reagent_name()
var/the_name = null
var/the_volume = 0
code/modules/reagents/chemistry/reagents.dm
+3
View File
@@ -32,6 +32,9 @@
var/last_addiction_dose = 0
var/overdosed = 0 // You fucked up and this is now triggering it's overdose effects, purge that shit quick.
var/current_cycle = 1
var/drink_icon = "glass_brown" // what icon state/name/description a drinking glass will use if this is the master reagent.
var/drink_name = "Glass of ..what?"
var/drink_desc = "You can't really tell what this is."
/datum/reagent/Destroy()
. = ..()
code/modules/reagents/chemistry/reagents/alcohol.dm
+400
View File
@@ -42,6 +42,9 @@
nutriment_factor = 2 * FOOD_METABOLISM
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
drink_icon ="beerglass"
drink_name = "Beer glass"
drink_desc = "A freezing pint of beer"
/datum/reagent/ethanol/cider
name = "Cider"
@@ -49,6 +52,9 @@
description = "An alcoholic beverage derived from apples."
color = "#174116"
alcohol_perc = 0.2
drink_icon = "rewriter"
drink_name = "Cider"
drink_desc = "a refreshing glass of traditional cider"
/datum/reagent/ethanol/whiskey
name = "Whiskey"
@@ -57,6 +63,9 @@
color = "#664300" // rgb: 102, 67, 0
dizzy_adj = 4
alcohol_perc = 0.4
drink_icon = "whiskeyglass"
drink_name = "Glass of whiskey"
drink_desc = "The silky, smokey whiskey goodness inside the glass makes the drink look very classy."
/datum/reagent/ethanol/specialwhiskey
name = "Special Blend Whiskey"
@@ -72,6 +81,9 @@
color = "#664300" // rgb: 102, 67, 0
dizzy_adj = 3
alcohol_perc = 0.5
drink_icon = "ginvodkaglass"
drink_name = "Glass of gin"
drink_desc = "A crystal clear glass of Griffeater gin."
/datum/reagent/ethanol/absinthe
name = "Absinthe"
@@ -81,6 +93,9 @@
overdose_threshold = 30
dizzy_adj = 5
alcohol_perc = 0.7
drink_icon = "absinthebottle"
drink_name = "Glass of Absinthe"
drink_desc = "The green fairy is going to get you now!"
//copy paste from LSD... shoot me
/datum/reagent/ethanol/absinthe/on_mob_life(mob/living/M)
@@ -98,6 +113,9 @@
overdose_threshold = 30
alcohol_perc = 0.4
dizzy_adj = 5
drink_icon = "rumglass"
drink_name = "Glass of Rum"
drink_desc = "Now you want to Pray for a pirate suit, don't you?"
/datum/reagent/ethanol/rum/overdose_process(mob/living/M, severity)
M.adjustToxLoss(1)
@@ -108,6 +126,9 @@
description = "If it's good enough for Spesscuba, it's good enough for you."
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
drink_icon = "mojito"
drink_name = "Glass of Mojito"
drink_desc = "Fresh from Spesscuba."
/datum/reagent/ethanol/vodka
name = "Vodka"
@@ -115,6 +136,9 @@
description = "Number one drink AND fueling choice for Russians worldwide."
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.4
drink_icon = "ginvodkaglass"
drink_name = "Glass of vodka"
drink_desc = "The glass contain wodka. Xynta."
/datum/reagent/ethanol/sake
name = "Sake"
@@ -122,6 +146,9 @@
description = "Anime's favorite drink."
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
drink_icon = "ginvodkaglass"
drink_name = "Glass of Sake"
drink_desc = "A glass of Sake."
/datum/reagent/ethanol/tequila
name = "Tequila"
@@ -129,6 +156,9 @@
description = "A strong and mildly flavoured, mexican produced spirit. Feeling thirsty hombre?"
color = "#A8B0B7" // rgb: 168, 176, 183
alcohol_perc = 0.4
drink_icon = "tequilaglass"
drink_name = "Glass of Tequila"
drink_desc = "Now all that's missing is the weird colored shades!"
/datum/reagent/ethanol/vermouth
name = "Vermouth"
@@ -136,6 +166,9 @@
description = "You suddenly feel a craving for a martini..."
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
drink_icon = "vermouthglass"
drink_name = "Glass of Vermouth"
drink_desc = "You wonder why you're even drinking this straight."
/datum/reagent/ethanol/wine
name = "Wine"
@@ -144,6 +177,9 @@
color = "#7E4043" // rgb: 126, 64, 67
dizzy_adj = 2
alcohol_perc = 0.2
drink_icon = "wineglass"
drink_name = "Glass of wine"
drink_desc = "A very classy looking drink."
/datum/reagent/ethanol/cognac
name = "Cognac"
@@ -152,6 +188,9 @@
color = "#664300" // rgb: 102, 67, 0
dizzy_adj = 4
alcohol_perc = 0.4
drink_icon = "cognacglass"
drink_name = "Glass of cognac"
drink_desc = "Damn, you feel like some kind of French aristocrat just by holding this."
/datum/reagent/ethanol/suicider //otherwise known as "I want to get so smashed my liver gives out and I die from alcohol poisoning".
name = "Suicider"
@@ -160,6 +199,9 @@
color = "#CF3811"
dizzy_adj = 20
alcohol_perc = 1 //because that's a thing it's supposed to do, I guess
drink_icon = "suicider"
drink_name = "Suicider"
drink_desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
/datum/reagent/ethanol/ale
name = "Ale"
@@ -167,6 +209,9 @@
description = "A dark alchoholic beverage made by malted barley and yeast."
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.1
drink_icon = "aleglass"
drink_name = "Ale glass"
drink_desc = "A freezing pint of delicious Ale"
/datum/reagent/ethanol/thirteenloko
name = "Thirteen Loko"
@@ -176,6 +221,9 @@
color = "#102000" // rgb: 16, 32, 0
alcohol_perc = 0.3
heart_rate_increase = 1
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"
/datum/reagent/ethanol/thirteenloko/on_mob_life(mob/living/M)
M.nutrition += nutriment_factor
@@ -196,6 +244,9 @@
reagent_state = LIQUID
color = "#895C4C" // rgb: 137, 92, 76
alcohol_perc = 0.2
drink_icon = "glass_brown"
drink_name = "Glass of bilk"
drink_desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis."
/datum/reagent/ethanol/atomicbomb
name = "Atomic Bomb"
@@ -204,6 +255,9 @@
reagent_state = LIQUID
color = "#666300" // rgb: 102, 99, 0
alcohol_perc = 0.2
drink_icon = "atomicbombglass"
drink_name = "Atomic Bomb"
drink_desc = "Nanotrasen cannot take legal responsibility for your actions after imbibing."
/datum/reagent/ethanol/threemileisland
name = "THree Mile Island Iced Tea"
@@ -212,6 +266,9 @@
reagent_state = LIQUID
color = "#666340" // rgb: 102, 99, 64
alcohol_perc = 0.2
drink_icon = "threemileislandglass"
drink_name = "Three Mile Island Ice Tea"
drink_desc = "A glass of this is sure to prevent a meltdown."
/datum/reagent/ethanol/goldschlager
name = "Goldschlager"
@@ -220,6 +277,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.4
drink_icon = "ginvodkaglass"
drink_name = "Glass of goldschlager"
drink_desc = "100 proof that teen girls will drink anything with gold in it."
/datum/reagent/ethanol/patron
name = "Patron"
@@ -228,6 +288,9 @@
reagent_state = LIQUID
color = "#585840" // rgb: 88, 88, 64
alcohol_perc = 0.4
drink_icon = "patronglass"
drink_name = "Glass of Patron"
drink_desc = "Drinking patron in the bar, with all the subpar ladies."
/datum/reagent/ethanol/gintonic
name = "Gin and Tonic"
@@ -236,6 +299,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.4
drink_icon = "gintonicglass"
drink_name = "Gin and Tonic"
drink_desc = "A mild but still great cocktail. Drink up, like a true Englishman."
/datum/reagent/ethanol/cuba_libre
name = "Cuba Libre"
@@ -244,6 +310,9 @@
reagent_state = LIQUID
color = "#3E1B00" // rgb: 62, 27, 0
alcohol_perc = 0.2
drink_icon = "cubalibreglass"
drink_name = "Cuba Libre"
drink_desc = "A classic mix of rum and cola."
/datum/reagent/ethanol/whiskey_cola
name = "Whiskey Cola"
@@ -252,6 +321,9 @@
reagent_state = LIQUID
color = "#3E1B00" // rgb: 62, 27, 0
alcohol_perc = 0.3
drink_icon = "whiskeycolaglass"
drink_name = "Whiskey Cola"
drink_desc = "An innocent-looking mixture of cola and Whiskey. Delicious."
/datum/reagent/ethanol/martini
name = "Classic Martini"
@@ -260,6 +332,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.5
drink_icon = "martiniglass"
drink_name = "Classic Martini"
drink_desc = "Damn, the bartender even stirred it, not shook it."
/datum/reagent/ethanol/vodkamartini
name = "Vodka Martini"
@@ -268,6 +343,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.4
drink_icon = "martiniglass"
drink_name = "Vodka martini"
drink_desc ="A bastardisation of the classic martini. Still great."
/datum/reagent/ethanol/white_russian
name = "White Russian"
@@ -276,6 +354,9 @@
reagent_state = LIQUID
color = "#A68340" // rgb: 166, 131, 64
alcohol_perc = 0.3
drink_icon = "whiterussianglass"
drink_name = "White Russian"
drink_desc = "A very nice looking drink. But that's just, like, your opinion, man."
/datum/reagent/ethanol/screwdrivercocktail
name = "Screwdriver"
@@ -284,6 +365,9 @@
reagent_state = LIQUID
color = "#A68310" // rgb: 166, 131, 16
alcohol_perc = 0.3
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."
/datum/reagent/ethanol/booger
name = "Booger"
@@ -292,6 +376,9 @@
reagent_state = LIQUID
color = "#A68310" // rgb: 166, 131, 16
alcohol_perc = 0.2
drink_icon = "booger"
drink_name = "Booger"
drink_desc = "Ewww..."
/datum/reagent/ethanol/bloody_mary
name = "Bloody Mary"
@@ -300,6 +387,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
drink_icon = "bloodymaryglass"
drink_name = "Bloody Mary"
drink_desc = "Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder."
/datum/reagent/ethanol/gargle_blaster
name = "Pan-Galactic Gargle Blaster"
@@ -308,6 +398,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.7 //ouch
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."
/datum/reagent/ethanol/brave_bull
name = "Brave Bull"
@@ -316,6 +409,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.3
drink_icon = "bravebullglass"
drink_name = "Brave Bull"
drink_desc = "Tequila and Coffee liquor, brought together in a mouthwatering mixture. Drink up."
/datum/reagent/ethanol/tequila_sunrise
name = "Tequila Sunrise"
@@ -324,6 +420,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.3
drink_icon = "tequilasunriseglass"
drink_name = "Tequila Sunrise"
drink_desc = "Oh great, now you feel nostalgic about sunrises back on Terra..."
/datum/reagent/ethanol/toxins_special
name = "Toxins Special"
@@ -332,6 +431,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.5
drink_icon = "toxinsspecialglass"
drink_name = "Toxins Special"
drink_desc = "Whoah, this thing is on FIRE"
/datum/reagent/ethanol/toxins_special/on_mob_life(mob/living/M)
if(M.bodytemperature < 330)
@@ -345,6 +447,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.5
drink_icon = "beepskysmashglass"
drink_name = "Beepsky Smash"
drink_desc = "Heavy, hot and strong. Just like the Iron fist of the LAW."
/datum/reagent/ethanol/beepsky_smash/on_mob_life(mob/living/M)
M.Stun(1)
@@ -357,6 +462,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.3
drink_icon = "irishcreamglass"
drink_name = "Irish Cream"
drink_desc = "It's cream, mixed with whiskey. What else would you expect from the Irish?"
/datum/reagent/ethanol/manly_dorf
name = "The Manly Dorf"
@@ -365,6 +473,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
drink_icon = "manlydorfglass"
drink_name = "The Manly Dorf"
drink_desc = "A manly concotion made from Ale and Beer. Intended for true men only."
/datum/reagent/ethanol/longislandicedtea
name = "Long Island Iced Tea"
@@ -373,6 +484,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.5
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."
/datum/reagent/ethanol/moonshine
name = "Moonshine"
@@ -381,6 +495,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.8 //yeeehaw
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."
/datum/reagent/ethanol/b52
name = "B-52"
@@ -389,6 +506,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.3
drink_icon = "b52glass"
drink_name = "B-52"
drink_desc = "Kahlua, Irish Cream, and congac. You will get bombed."
/datum/reagent/ethanol/irishcoffee
name = "Irish Coffee"
@@ -397,6 +517,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
drink_icon = "irishcoffeeglass"
drink_name = "Irish Coffee"
drink_desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning."
/datum/reagent/ethanol/margarita
name = "Margarita"
@@ -405,6 +528,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.3
drink_icon = "margaritaglass"
drink_name = "Margarita"
drink_desc = "On the rocks with salt on the rim. Arriba~!"
/datum/reagent/ethanol/black_russian
name = "Black Russian"
@@ -413,6 +539,9 @@
reagent_state = LIQUID
color = "#360000" // rgb: 54, 0, 0
alcohol_perc = 0.4
drink_icon = "blackrussianglass"
drink_name = "Black Russian"
drink_desc = "For the lactose-intolerant. Still as classy as a White Russian."
/datum/reagent/ethanol/manhattan
name = "Manhattan"
@@ -421,6 +550,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.4
drink_icon = "manhattanglass"
drink_name = "Manhattan"
drink_desc = "The Detective's undercover drink of choice. He never could stomach gin..."
/datum/reagent/ethanol/manhattan_proj
name = "Manhattan Project"
@@ -429,6 +561,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.4
drink_icon = "proj_manhattanglass"
drink_name = "Manhattan Project"
drink_desc = "A scienitst drink of choice, for thinking how to blow up the station."
/datum/reagent/ethanol/whiskeysoda
name = "Whiskey Soda"
@@ -437,6 +572,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.3
drink_icon = "whiskeysodaglass2"
drink_name = "Whiskey Soda"
drink_desc = "Ultimate refreshment."
/datum/reagent/ethanol/antifreeze
name = "Anti-freeze"
@@ -445,6 +583,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
drink_icon = "antifreeze"
drink_name = "Anti-freeze"
drink_desc = "The ultimate refreshment."
/datum/reagent/ethanol/antifreeze/on_mob_life(mob/living/M)
if(M.bodytemperature < 330)
@@ -458,6 +599,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
drink_icon = "b&p"
drink_name = "Barefoot"
drink_desc = "Barefoot and pregnant"
/datum/reagent/ethanol/snowwhite
name = "Snow White"
@@ -466,6 +610,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
drink_icon = "snowwhite"
drink_name = "Snow White"
drink_desc = "A cold refreshment."
/datum/reagent/ethanol/demonsblood
name = "Demons Blood"
@@ -475,6 +622,9 @@
color = "#664300" // rgb: 102, 67, 0
dizzy_adj = 10
alcohol_perc = 0.4
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."
/datum/reagent/ethanol/vodkatonic
name = "Vodka and Tonic"
@@ -484,6 +634,9 @@
color = "#664300" // rgb: 102, 67, 0
dizzy_adj = 4
alcohol_perc = 0.3
drink_icon = "vodkatonicglass"
drink_name = "Vodka and Tonic"
drink_desc = "For when a gin and tonic isn't russian enough."
/datum/reagent/ethanol/ginfizz
name = "Gin Fizz"
@@ -493,6 +646,9 @@
color = "#664300" // rgb: 102, 67, 0
dizzy_adj = 4
alcohol_perc = 0.4
drink_icon = "ginfizzglass"
drink_name = "Gin Fizz"
drink_desc = "Refreshingly lemony, deliciously dry."
/datum/reagent/ethanol/bahama_mama
name = "Bahama mama"
@@ -501,6 +657,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
drink_icon = "bahama_mama"
drink_name = "Bahama Mama"
drink_desc = "Tropic cocktail"
/datum/reagent/ethanol/singulo
name = "Singulo"
@@ -510,6 +669,9 @@
color = "#2E6671" // rgb: 46, 102, 113
dizzy_adj = 15
alcohol_perc = 0.7
drink_icon = "singulo"
drink_name = "Singulo"
drink_desc = "A blue-space beverage."
/datum/reagent/ethanol/sbiten
name = "Sbiten"
@@ -518,6 +680,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.4
drink_icon = "sbitenglass"
drink_name = "Sbiten"
drink_desc = "A spicy mix of Vodka and Spice. Very hot."
/datum/reagent/ethanol/sbiten/on_mob_life(mob/living/M)
if(M.bodytemperature < 360)
@@ -531,6 +696,9 @@
reagent_state = LIQUID
color = "#A68310" // rgb: 166, 131, 16
alcohol_perc = 0.3
drink_icon = "devilskiss"
drink_name = "Devils Kiss"
drink_desc = "Creepy time!"
/datum/reagent/ethanol/red_mead
name = "Red Mead"
@@ -539,6 +707,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
drink_icon = "red_meadglass"
drink_name = "Red Mead"
drink_desc = "A True Vikings Beverage, though its color is strange."
/datum/reagent/ethanol/mead
name = "Mead"
@@ -547,6 +718,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
drink_icon = "meadglass"
drink_name = "Mead"
drink_desc = "A Vikings Beverage, though a cheap one."
/datum/reagent/ethanol/iced_beer
name = "Iced Beer"
@@ -555,6 +729,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
drink_icon = "iced_beerglass"
drink_name = "Iced Beer"
drink_desc = "A beer so frosty, the air around it freezes."
/datum/reagent/ethanol/iced_beer/on_mob_life(mob/living/M)
if(M.bodytemperature > 270)
@@ -568,6 +745,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
drink_icon = "grogglass"
drink_name = "Grog"
drink_desc = "A fine and cepa drink for Space."
/datum/reagent/ethanol/aloe
name = "Aloe"
@@ -576,6 +756,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
drink_icon = "aloe"
drink_name = "Aloe"
drink_desc = "Very, very, very good."
/datum/reagent/ethanol/andalusia
name = "Andalusia"
@@ -584,6 +767,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.4
drink_icon = "andalusia"
drink_name = "Andalusia"
drink_desc = "A nice, strange named drink."
/datum/reagent/ethanol/alliescocktail
name = "Allies Cocktail"
@@ -592,6 +778,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.5
drink_icon = "alliescocktail"
drink_name = "Allies cocktail"
drink_desc = "A drink made from your allies."
/datum/reagent/ethanol/acid_spit
name = "Acid Spit"
@@ -600,6 +789,9 @@
reagent_state = LIQUID
color = "#365000" // rgb: 54, 80, 0
alcohol_perc = 0.3
drink_icon = "acidspitglass"
drink_name = "Acid Spit"
drink_desc = "A drink from Nanotrasen. Made from live aliens."
/datum/reagent/ethanol/amasec
name = "Amasec"
@@ -608,6 +800,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.3
drink_icon = "amasecglass"
drink_name = "Amasec"
drink_desc = "Always handy before COMBAT!!!"
/datum/reagent/ethanol/neurotoxin
name = "Neuro-toxin"
@@ -618,6 +813,9 @@
dizzy_adj = 6
alcohol_perc = 0.7
heart_rate_decrease = 1
drink_icon = "neurotoxinglass"
drink_name = "Neurotoxin"
drink_desc = "A drink that is guaranteed to knock you silly."
/datum/reagent/ethanol/neurotoxin/on_mob_life(mob/living/M)
M.weakened = max(M.weakened, 3)
@@ -635,6 +833,9 @@
color = "#2E6671" // rgb: 46, 102, 113
alcohol_perc = 0.7
dizzy_adj = 5
drink_icon = "changelingsting"
drink_name = "Changeling Sting"
drink_desc = "A stingy drink."
/datum/reagent/ethanol/irishcarbomb
name = "Irish Car Bomb"
@@ -644,6 +845,9 @@
color = "#2E6671" // rgb: 46, 102, 113
alcohol_perc = 0.3
dizzy_adj = 5
drink_icon = "irishcarbomb"
drink_name = "Irish Car Bomb"
drink_desc = "An irish car bomb."
/datum/reagent/ethanol/syndicatebomb
name = "Syndicate Bomb"
@@ -652,6 +856,9 @@
reagent_state = LIQUID
color = "#2E6671" // rgb: 46, 102, 113
alcohol_perc = 0.2
drink_icon = "syndicatebomb"
drink_name = "Syndicate Bomb"
drink_desc = "A syndicate bomb."
/datum/reagent/ethanol/erikasurprise
name = "Erika Surprise"
@@ -660,6 +867,9 @@
reagent_state = LIQUID
color = "#2E6671" // rgb: 46, 102, 113
alcohol_perc = 0.2
drink_icon = "erikasurprise"
name = "Erika Surprise"
drink_desc = "The surprise is, it's green!"
/datum/reagent/ethanol/driestmartini
name = "Driest Martini"
@@ -669,6 +879,9 @@
color = "#2E6671" // rgb: 46, 102, 113
alcohol_perc = 0.5
dizzy_adj = 10
drink_icon = "driestmartiniglass"
drink_name = "Driest Martini"
drink_desc = "Only for the experienced. You think you see sand floating in the glass."
/datum/reagent/ethanol/driestmartini/on_mob_life(mob/living/M)
if(current_cycle >= 55 && current_cycle < 115)
@@ -681,6 +894,9 @@
description = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936!"
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
drink_icon = "kahluaglass"
drink_name = "Glass of RR coffee Liquor"
drink_desc = "DAMN, THIS THING LOOKS ROBUST"
/datum/reagent/ethanol/kahlua/on_mob_life(mob/living/M)
M.AdjustDizzy(-5)
@@ -688,3 +904,187 @@
M.AdjustSleeping(-2)
M.Jitter(5)
..()
/datum/reagent/ginsonic
name = "Gin and sonic"
id = "ginsonic"
description = "GOTTA GET CRUNK FAST BUT LIQUOR TOO SLOW"
reagent_state = LIQUID
color = "#1111CF"
drink_icon = "ginsonic"
drink_name = "Gin and Sonic"
drink_desc = "An extremely high amperage drink. Absolutely not for the true Englishman."
/datum/reagent/ginsonic/on_mob_life(mob/living/M)
M.AdjustDrowsy(-5)
if(prob(25))
M.AdjustParalysis(-1)
M.AdjustStunned(-1)
M.AdjustWeakened(-1)
if(prob(8))
M.reagents.add_reagent("methamphetamine",1.2)
var/sonic_message = pick("Gotta go fast!", "Time to speed, keed!", "I feel a need for speed!", "Let's juice.", "Juice time.", "Way Past Cool!")
if(prob(50))
M.say("[sonic_message]")
else
to_chat(M, "<span class='notice'>[sonic_message ]</span>")
..()
/datum/reagent/ethanol/applejack
name = "Applejack"
id = "applejack"
description = "A highly concentrated alcoholic beverage made by repeatedly freezing cider and removing the ice."
color = "#997A00"
alcohol_perc = 0.4
drink_icon = "cognacglass"
drink_name = "Glass of applejack"
drink_desc = "When cider isn't strong enough, you gotta jack it."
/datum/reagent/ethanol/jackrose
name = "Jack Rose"
id = "jackrose"
description = "A classic cocktail that had fallen out of fashion, but never out of taste,"
color = "#664300"
alcohol_perc = 0.4
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."
/datum/reagent/ethanol/dragons_breath //inaccessible to players, but here for admin shennanigans
name = "Dragon's Breath"
id = "dragonsbreath"
description = "Possessing this stuff probably breaks the Geneva convention."
reagent_state = LIQUID
color = "#DC0000"
alcohol_perc = 1
/datum/reagent/ethanol/dragons_breath/reaction_mob(mob/living/M, method=TOUCH, volume)
if(method == INGEST && prob(20))
if(M.on_fire)
M.adjust_fire_stacks(3)
/datum/reagent/ethanol/dragons_breath/on_mob_life(mob/living/M)
if(M.reagents.has_reagent("milk"))
to_chat(M, "<span class='notice'>The milk stops the burning. Ahhh.</span>")
M.reagents.del_reagent("milk")
M.reagents.del_reagent("dragonsbreath")
return
if(prob(8))
to_chat(M, "<span class='userdanger'>Oh god! Oh GODD!!</span>")
if(prob(50))
to_chat(M, "<span class='danger'>Your throat burns terribly!</span>")
M.emote(pick("scream","cry","choke","gasp"))
M.Stun(1)
if(prob(8))
to_chat(M, "<span class='danger'>Why!? WHY!?</span>")
if(prob(8))
to_chat(M, "<span class='danger'>ARGHHHH!</span>")
if(prob(2 * volume))
to_chat(M, "<span class='userdanger'>OH GOD OH GOD PLEASE NO!!</b></span>")
if(M.on_fire)
M.adjust_fire_stacks(5)
if(prob(50))
to_chat(M, "<span class='userdanger'>IT BURNS!!!!</span>")
M.visible_message("<span class='danger'>[M] is consumed in flames!</span>")
M.dust()
return
..()
// ROBOT ALCOHOL PAST THIS POINT
// WOOO!
/datum/reagent/ethanol/synthanol
name = "Synthanol"
id = "synthanol"
description = "A runny liquid with conductive capacities. Its effects on synthetics are similar to those of alcohol on organics."
reagent_state = LIQUID
color = "#1BB1FF"
process_flags = ORGANIC | SYNTHETIC
metabolization_rate = 0.4
alcohol_perc = 0.5
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."
/datum/reagent/ethanol/synthanol/on_mob_life(mob/living/M)
if(!M.isSynthetic())
holder.remove_reagent(id, 3.6) //gets removed from organics very fast
if(prob(25))
holder.remove_reagent(id, 15)
M.fakevomit()
..()
/datum/reagent/ethanol/synthanol/reaction_mob(mob/living/M, method=TOUCH, volume)
if(M.isSynthetic())
return
if(method == INGEST)
to_chat(M, pick("<span class = 'danger'>That was awful!</span>", "<span class = 'danger'>Yuck!</span>"))
/datum/reagent/ethanol/synthanol/robottears
name = "Robot Tears"
id = "robottears"
description = "An oily substance that an IPC could technically consider a 'drink'."
reagent_state = LIQUID
color = "#363636"
alcohol_perc = 0.25
drink_icon = "robottearsglass"
drink_name = "Glass of Robot Tears"
drink_desc = "No robots were hurt in the making of this drink."
/datum/reagent/ethanol/synthanol/trinary
name = "Trinary"
id = "trinary"
description = "A fruit drink meant only for synthetics, however that works."
reagent_state = LIQUID
color = "#adb21f"
alcohol_perc = 0.2
drink_icon = "trinaryglass"
drink_name = "Glass of Trinary"
drink_desc = "Colorful drink made for synthetic crewmembers. It doesn't seem like it would taste well."
/datum/reagent/ethanol/synthanol/servo
name = "Servo"
id = "servo"
description = "A drink containing some organic ingredients, but meant only for synthetics."
reagent_state = LIQUID
color = "#5b3210"
alcohol_perc = 0.25
drink_icon = "servoglass"
drink_name = "Glass of Servo"
drink_desc = "Chocolate - based drink made for IPCs. Not sure if anyone's actually tried out the recipe."
/datum/reagent/ethanol/synthanol/uplink
name = "Uplink"
id = "uplink"
description = "A potent mix of alcohol and synthanol. Will only work on synthetics."
reagent_state = LIQUID
color = "#e7ae04"
alcohol_perc = 0.15
drink_icon = "uplinkglass"
drink_name = "Glass of Uplink"
drink_desc = "An exquisite mix of the finest liquoirs and synthanol. Meant only for synthetics."
/datum/reagent/ethanol/synthanol/synthnsoda
name = "Synth 'n Soda"
id = "synthnsoda"
description = "The classic drink adjusted for a robot's tastes."
reagent_state = LIQUID
color = "#7204e7"
alcohol_perc = 0.25
drink_icon = "synthnsodaglass"
drink_name = "Glass of Synth 'n Soda"
drink_desc = "Classic drink altered to fit the tastes of a robot. Bad idea to drink if you're made of carbon."
/datum/reagent/ethanol/synthanol/synthignon
name = "Synthignon"
id = "synthignon"
description = "Someone mixed wine and alcohol for robots. Hope you're proud of yourself."
reagent_state = LIQUID
color = "#d004e7"
alcohol_perc = 0.25
drink_icon = "synthignonglass"
drink_name = "Glass of Synthignon"
drink_desc = "Someone mixed good wine and robot booze. Romantic, but atrocious."
// ROBOT ALCOHOL ENDS
code/modules/reagents/chemistry/reagents/drink_cold.dm
+39
View File
@@ -10,6 +10,9 @@
adj_dizzy = -5
adj_drowsy = -3
adj_sleepy = -2
drink_icon = "glass_clear"
drink_name = "Glass of Tonic Water"
drink_desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
/datum/reagent/drink/cold/sodawater
name = "Soda Water"
@@ -18,6 +21,9 @@
color = "#619494" // rgb: 97, 148, 148
adj_dizzy = -5
adj_drowsy = -3
drink_icon = "glass_clear"
drink_name = "Glass of Soda Water"
drink_desc = "Soda water. Why not make a scotch and soda?"
/datum/reagent/drink/cold/ice
name = "Ice"
@@ -26,6 +32,9 @@
reagent_state = SOLID
color = "#619494" // rgb: 97, 148, 148
adj_temp_cool = 0
drink_icon = "iceglass"
drink_name = "Glass of ice"
drink_desc = "Generally, you're supposed to put something else in there too..."
/datum/reagent/drink/cold/ice/on_mob_life(mob/living/M)
M.bodytemperature = max(M.bodytemperature - 5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0)
@@ -38,6 +47,9 @@
reagent_state = LIQUID
color = "#100800" // rgb: 16, 8, 0
adj_drowsy = -5
drink_icon = "glass_brown"
drink_name = "Glass of Space Cola"
drink_desc = "A glass of refreshing Space Cola"
/datum/reagent/drink/cold/nuka_cola
name = "Nuka Cola"
@@ -45,6 +57,9 @@
description = "Cola, cola never changes."
color = "#100800" // rgb: 16, 8, 0
adj_sleepy = -2
drink_icon = "nuka_colaglass"
drink_name = "Nuka Cola"
drink_desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland"
/datum/reagent/drink/cold/nuka_cola/on_mob_life(mob/living/M)
M.Jitter(20)
@@ -65,6 +80,9 @@
color = "#102000" // rgb: 16, 32, 0
adj_drowsy = -7
adj_sleepy = -1
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."
/datum/reagent/drink/cold/dr_gibb
name = "Dr. Gibb"
@@ -72,6 +90,9 @@
description = "A delicious blend of 42 different flavours"
color = "#102000" // rgb: 16, 32, 0
adj_drowsy = -6
drink_icon = "dr_gibb_glass"
drink_name = "Glass of Dr. Gibb"
drink_desc = "Dr. Gibb. Not as dangerous as the name might imply."
/datum/reagent/drink/cold/space_up
name = "Space-Up"
@@ -79,6 +100,9 @@
description = "Tastes like a hull breach in your mouth."
color = "#202800" // rgb: 32, 40, 0
adj_temp_cool = 8
drink_icon = "space-up_glass"
drink_name = "Glass of Space-up"
drink_desc = "Space-up. It helps keep your cool."
/datum/reagent/drink/cold/lemon_lime
name = "Lemon Lime"
@@ -92,12 +116,18 @@
description = "Oh the nostalgia..."
id = "lemonade"
color = "#FFFF00" // rgb: 255, 255, 0
drink_icon = "lemonade"
drink_name = "Lemonade"
drink_desc = "Oh the nostalgia..."
/datum/reagent/drink/cold/kiraspecial
name = "Kira Special"
description = "Long live the guy who everyone had mistaken for a girl. Baka!"
id = "kiraspecial"
color = "#CCCC99" // rgb: 204, 204, 153
drink_icon = "kiraspecial"
drink_name = "Kira Special"
drink_desc = "Long live the guy who everyone had mistaken for a girl. Baka!"
/datum/reagent/drink/cold/brownstar
name = "Brown Star"
@@ -105,6 +135,9 @@
id = "brownstar"
color = "#9F3400" // rgb: 159, 052, 000
adj_temp_cool = 2
drink_icon = "brownstar"
drink_name = "Brown Star"
drink_desc = "Its not what it sounds like..."
/datum/reagent/drink/cold/milkshake
name = "Milkshake"
@@ -112,12 +145,18 @@
id = "milkshake"
color = "#AEE5E4" // rgb" 174, 229, 228
adj_temp_cool = 9
drink_icon = "milkshake"
drink_name = "Milkshake"
drink_desc = "Glorious brainfreezing mixture."
/datum/reagent/drink/cold/rewriter
name = "Rewriter"
description = "The secert of the sanctuary of the Libarian..."
id = "rewriter"
color = "#485000" // rgb:72, 080, 0
drink_icon = "rewriter"
drink_name = "Rewriter"
drink_desc = "The secert of the sanctuary of the Libarian..."
/datum/reagent/drink/cold/rewriter/on_mob_life(mob/living/M)
M.Jitter(5)
code/modules/reagents/chemistry/reagents/drinks.dm
+70 -148
View File
@@ -3,6 +3,9 @@
id = "orangejuice"
description = "Both delicious AND rich in Vitamin C, what more do you need?"
color = "#E78108" // rgb: 231, 129, 8
drink_icon = "glass_orange"
drink_name = "Glass of Orange juice"
drink_desc = "Vitamins! Yay!"
/datum/reagent/drink/orangejuicde/on_mob_life(mob/living/M)
if(M.getOxyLoss() && prob(30))
@@ -14,6 +17,9 @@
id = "tomatojuice"
description = "Tomatoes made into juice. What a waste of big, juicy tomatoes, huh?"
color = "#731008" // rgb: 115, 16, 8
drink_icon = "glass_red"
drink_name = "Glass of Tomato juice"
drink_desc = "Are you sure this is tomato juice?"
/datum/reagent/drink/tomatojuice/on_mob_life(mob/living/M)
if(M.getFireLoss() && prob(20))
@@ -25,6 +31,9 @@
id = "limejuice"
description = "The sweet-sour juice of limes."
color = "#365E30" // rgb: 54, 94, 48
drink_icon = "glass_green"
drink_name = "Glass of Lime juice"
drink_desc = "A glass of sweet-sour lime juice."
/datum/reagent/drink/limejuice/on_mob_life(mob/living/M)
if(M.getToxLoss() && prob(20))
@@ -36,6 +45,9 @@
id = "carrotjuice"
description = "It is just like a carrot but without crunching."
color = "#973800" // rgb: 151, 56, 0
drink_icon = "carrotjuice"
drink_name = "Glass of carrot juice"
drink_desc = "It is just like a carrot but without crunching."
/datum/reagent/drink/carrotjuicde/on_mob_life(mob/living/M)
M.AdjustEyeBlurry(-1)
@@ -54,6 +66,9 @@
description = "A gulp a day keeps the MediBot away. That's probably for the best."
reagent_state = LIQUID
color = "#FF8CFF" // rgb: 255, 140, 255
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."
/datum/reagent/drink/doctors_delight/on_mob_life(mob/living/M)
if(M.getToxLoss() && prob(20))
@@ -65,12 +80,18 @@
id = "berryjuice"
description = "A delicious blend of several different kinds of berries."
color = "#863333" // rgb: 134, 51, 51
drink_icon = "berryjuice"
drink_name = "Glass of berry juice"
drink_desc = "Berry juice. Or maybe its jam. Who cares?"
/datum/reagent/drink/poisonberryjuice
name = "Poison Berry Juice"
id = "poisonberryjuice"
description = "A tasty juice blended from various kinds of very deadly and toxic berries."
color = "#863353" // rgb: 134, 51, 83
drink_icon = "poisonberryjuice"
drink_name = "Glass of poison berry juice"
drink_desc = "A glass of deadly juice."
/datum/reagent/drink/poisonberryjuice/on_mob_life(mob/living/M)
M.adjustToxLoss(1)
@@ -87,6 +108,9 @@
id = "lemonjuice"
description = "This juice is VERY sour."
color = "#863333" // rgb: 175, 175, 0
drink_icon = "lemonglass"
drink_name = "Glass of lemonjuice"
drink_desc = "Sour..."
/datum/reagent/drink/grapejuice
name = "Grape Juice"
@@ -99,6 +123,9 @@
id = "banana"
description = "The raw essence of a banana."
color = "#863333" // rgb: 175, 175, 0
drink_icon = "banana"
drink_name = "Glass of banana juice"
drink_desc = "The raw essence of a banana. HONK"
/datum/reagent/drink/banana/on_mob_life(mob/living/M)
M.nutrition += nutriment_factor
@@ -111,6 +138,9 @@
name = "Nothing"
id = "nothing"
description = "Absolutely nothing."
drink_icon = "nothing"
drink_name = "Nothing"
drink_desc = "Absolutely nothing."
/datum/reagent/drink/nothing/on_mob_life(mob/living/M)
M.nutrition += nutriment_factor
@@ -125,12 +155,18 @@
description = "Juice of the potato. Bleh."
nutriment_factor = 2 * FOOD_METABOLISM
color = "#302000" // rgb: 48, 32, 0
drink_icon = "glass_brown"
drink_name = "Glass of potato juice"
drink_desc = "Who in the hell requests this? Gross!"
/datum/reagent/drink/milk
name = "Milk"
id = "milk"
description = "An opaque white liquid produced by the mammary glands of mammals."
color = "#DFDFDF" // rgb: 223, 223, 223
drink_icon = "glass_white"
drink_name = "Glass of milk"
drink_desc = "White and nutritious goodness!"
/datum/reagent/drink/milk/on_mob_life(mob/living/M)
if(M.getBruteLoss() && prob(20))
@@ -144,12 +180,16 @@
id = "soymilk"
description = "An opaque white liquid made from soybeans."
color = "#DFDFC7" // rgb: 223, 223, 199
drink_name = "Glass of soy milk"
drink_desc = "White and nutritious soy goodness!"
/datum/reagent/drink/milk/cream
name = "Cream"
id = "cream"
description = "The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?"
color = "#DFD7AF" // rgb: 223, 215, 175
drink_name = "Glass of cream"
drink_desc = "Ewwww..."
/datum/reagent/drink/milk/chocolate_milk
name = "Chocolate milk"
@@ -164,6 +204,9 @@
nutriment_factor = 2 * FOOD_METABOLISM
color = "#403010" // rgb: 64, 48, 16
adj_temp_hot = 5
drink_icon = "hot_coco"
drink_name = "Glass of hot coco"
drink_desc = "Delicious and cozy"
/datum/reagent/drink/coffee
name = "Coffee"
@@ -177,6 +220,9 @@
overdose_threshold = 45
addiction_chance = 1 // It's true.
heart_rate_increase = 1
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."
/datum/reagent/drink/coffee/on_mob_life(mob/living/M)
if(holder.has_reagent("frostoil"))
@@ -198,6 +244,9 @@
color = "#102838" // rgb: 16, 40, 56
adj_temp_hot = 0
adj_temp_cool = 5
drink_icon = "icedcoffeeglass"
drink_name = "Iced Coffee"
drink_desc = "A drink to perk you up and refresh you!"
/datum/reagent/drink/coffee/soy_latte
name = "Soy Latte"
@@ -206,6 +255,9 @@
color = "#664300" // rgb: 102, 67, 0
adj_sleepy = 0
adj_temp_hot = 5
drink_icon = "soy_latte"
drink_name = "Soy Latte"
drink_desc = "A nice and refrshing beverage while you are reading."
/datum/reagent/drink/coffee/soy_latte/on_mob_life(mob/living/M)
..()
@@ -220,6 +272,9 @@
color = "#664300" // rgb: 102, 67, 0
adj_sleepy = 0
adj_temp_hot = 5
drink_icon = "cafe_latte"
drink_name = "Cafe Latte"
drink_desc = "A nice, strong and refreshing beverage while you are reading."
/datum/reagent/drink/coffee/cafe_latte/on_mob_life(mob/living/M)
..()
@@ -232,6 +287,8 @@
id = "cafe_mocha"
description = "The perfect blend of coffe, milk, and chocolate."
color = "#673629"
drink_name = "Cafe Mocha"
drink_desc = "The perfect blend of coffe, milk, and chocolate."
/datum/reagent/drink/tea
name = "Tea"
@@ -242,6 +299,9 @@
adj_drowsy = -1
adj_sleepy = -3
adj_temp_hot = 20
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?"
/datum/reagent/drink/tea/on_mob_life(mob/living/M)
if(M.getToxLoss() && prob(20))
@@ -255,6 +315,9 @@
color = "#104038" // rgb: 16, 64, 56
adj_temp_hot = 0
adj_temp_cool = 5
drink_icon = "icetea"
drink_name = "Iced Tea"
drink_desc = "No relation to a certain rap artist/ actor."
/datum/reagent/drink/bananahonk
name = "Banana Mama"
@@ -262,6 +325,9 @@
description = "A drink from Clown Heaven."
nutriment_factor = 1 * FOOD_METABOLISM
color = "#664300" // rgb: 102, 67, 0
drink_icon = "bananahonkglass"
drink_name = "Banana Honk"
drink_desc = "A drink from Banana Heaven."
/datum/reagent/drink/bananahonk/on_mob_life(mob/living/M)
M.nutrition += nutriment_factor
@@ -276,157 +342,13 @@
description = "A drink from Mime Heaven."
nutriment_factor = 1 * FOOD_METABOLISM
color = "#664300" // rgb: 102, 67, 0
drink_icon = "silencerglass"
drink_name = "Silencer"
drink_desc = "A drink from mime Heaven."
/datum/reagent/drink/silencer/on_mob_life(mob/living/M)
M.nutrition += nutriment_factor
if(ishuman(M) && M.job in list("Mime"))
M.adjustBruteLoss(-1)
M.adjustFireLoss(-1)
..()
/datum/reagent/ginsonic/on_mob_life(mob/living/M)
M.AdjustDrowsy(-5)
if(prob(25))
M.AdjustParalysis(-1)
M.AdjustStunned(-1)
M.AdjustWeakened(-1)
if(prob(8))
M.reagents.add_reagent("methamphetamine",1.2)
var/sonic_message = pick("Gotta go fast!", "Time to speed, keed!", "I feel a need for speed!", "Let's juice.", "Juice time.", "Way Past Cool!")
if(prob(50))
M.say("[sonic_message]")
else
to_chat(M, "<span class='notice'>[sonic_message ]</span>")
..()
/datum/reagent/ethanol/applejack
name = "Applejack"
id = "applejack"
description = "A highly concentrated alcoholic beverage made by repeatedly freezing cider and removing the ice."
color = "#997A00"
alcohol_perc = 0.4
/datum/reagent/ethanol/jackrose
name = "Jack Rose"
id = "jackrose"
description = "A classic cocktail that had fallen out of fashion, but never out of taste,"
color = "#664300"
alcohol_perc = 0.4
/datum/reagent/ethanol/dragons_breath //inaccessible to players, but here for admin shennanigans
name = "Dragon's Breath"
id = "dragonsbreath"
description = "Possessing this stuff probably breaks the Geneva convention."
reagent_state = LIQUID
color = "#DC0000"
alcohol_perc = 1
/datum/reagent/ethanol/dragons_breath/reaction_mob(mob/living/M, method=TOUCH, volume)
if(method == INGEST && prob(20))
if(M.on_fire)
M.adjust_fire_stacks(3)
/datum/reagent/ethanol/dragons_breath/on_mob_life(mob/living/M)
if(M.reagents.has_reagent("milk"))
to_chat(M, "<span class='notice'>The milk stops the burning. Ahhh.</span>")
M.reagents.del_reagent("milk")
M.reagents.del_reagent("dragonsbreath")
return
if(prob(8))
to_chat(M, "<span class='userdanger'>Oh god! Oh GODD!!</span>")
if(prob(50))
to_chat(M, "<span class='danger'>Your throat burns terribly!</span>")
M.emote(pick("scream","cry","choke","gasp"))
M.Stun(1)
if(prob(8))
to_chat(M, "<span class='danger'>Why!? WHY!?</span>")
if(prob(8))
to_chat(M, "<span class='danger'>ARGHHHH!</span>")
if(prob(2 * volume))
to_chat(M, "<span class='userdanger'>OH GOD OH GOD PLEASE NO!!</b></span>")
if(M.on_fire)
M.adjust_fire_stacks(5)
if(prob(50))
to_chat(M, "<span class='userdanger'>IT BURNS!!!!</span>")
M.visible_message("<span class='danger'>[M] is consumed in flames!</span>")
M.dust()
return
..()
// ROBOT ALCOHOL PAST THIS POINT
// WOOO!
/datum/reagent/ethanol/synthanol
name = "Synthanol"
id = "synthanol"
description = "A runny liquid with conductive capacities. Its effects on synthetics are similar to those of alcohol on organics."
reagent_state = LIQUID
color = "#1BB1FF"
process_flags = ORGANIC | SYNTHETIC
metabolization_rate = 0.4
alcohol_perc = 0.5
/datum/reagent/ethanol/synthanol/on_mob_life(mob/living/M)
if(!M.isSynthetic())
holder.remove_reagent(id, 3.6) //gets removed from organics very fast
if(prob(25))
holder.remove_reagent(id, 15)
M.fakevomit()
..()
/datum/reagent/ethanol/synthanol/reaction_mob(mob/living/M, method=TOUCH, volume)
if(M.isSynthetic())
return
if(method == INGEST)
to_chat(M, pick("<span class = 'danger'>That was awful!</span>", "<span class = 'danger'>Yuck!</span>"))
/datum/reagent/ethanol/synthanol/robottears
name = "Robot Tears"
id = "robottears"
description = "An oily substance that an IPC could technically consider a 'drink'."
reagent_state = LIQUID
color = "#363636"
alcohol_perc = 0.25
/datum/reagent/ethanol/synthanol/trinary
name = "Trinary"
id = "trinary"
description = "A fruit drink meant only for synthetics, however that works."
reagent_state = LIQUID
color = "#adb21f"
alcohol_perc = 0.2
/datum/reagent/ethanol/synthanol/servo
name = "Servo"
id = "servo"
description = "A drink containing some organic ingredients, but meant only for synthetics."
reagent_state = LIQUID
color = "#5b3210"
alcohol_perc = 0.25
/datum/reagent/ethanol/synthanol/uplink
name = "Uplink"
id = "uplink"
description = "A potent mix of alcohol and synthanol. Will only work on synthetics."
reagent_state = LIQUID
color = "#e7ae04"
alcohol_perc = 0.15
/datum/reagent/ethanol/synthanol/synthnsoda
name = "Synth 'n Soda"
id = "synthnsoda"
description = "The classic drink adjusted for a robot's tastes."
reagent_state = LIQUID
color = "#7204e7"
alcohol_perc = 0.25
/datum/reagent/ethanol/synthanol/synthignon
name = "Synthignon"
id = "synthignon"
description = "Someone mixed wine and alcohol for robots. Hope you're proud of yourself."
reagent_state = LIQUID
color = "#d004e7"
alcohol_perc = 0.25
// ROBOT ALCOHOL ENDS
..()
code/modules/reagents/chemistry/reagents/drugs.dm
+3
View File
@@ -35,6 +35,9 @@
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
metabolization_rate = 0.2 * REAGENTS_METABOLISM
drink_icon = "hippiesdelightglass"
drink_name = "Hippie's Delight"
drink_desc = "A drink enjoyed by people during the 1960's."
/datum/reagent/hippies_delight/on_mob_life(mob/living/M)
M.Druggy(50)
code/modules/reagents/chemistry/reagents/food.dm
+6
View File
@@ -427,6 +427,9 @@
description = "A refreshing mixed drink of orange, lemon and lime juice."
reagent_state = LIQUID
color = "#23A046"
drink_icon = "triplecitrus"
drink_name = "Glass of Triplecitrus Juice"
drink_desc = "As colorful and healthy as it is delicious."
/datum/reagent/triple_citrus/reaction_mob(mob/living/M, method=TOUCH, volume)
if(method == INGEST)
@@ -481,6 +484,9 @@
reagent_state = LIQUID
nutriment_factor = 5 * REAGENTS_METABOLISM //same as pure cocoa powder, because it makes no sense that chocolate won't fill you up and make you fat
color = "#2E2418"
drink_icon = "chocolateglass"
drink_name = "Glass of chocolate"
drink_desc = "Tasty"
/datum/reagent/chocolate/on_mob_life(mob/living/M)
M.nutrition += nutriment_factor
code/modules/reagents/chemistry/reagents/pyrotechnic.dm
+3
View File
@@ -4,6 +4,9 @@
description = "A highly flammable blend of basic hydrocarbons, mostly Acetylene. Useful for both welding and organic chemistry, and can be fortified into a heavier oil."
reagent_state = LIQUID
color = "#060606"
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."
/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)
code/modules/reagents/chemistry/reagents/toxins.dm
+3
View File
@@ -335,6 +335,9 @@
description = "An alcoholic beverage made from malted grains, hops, yeast, and water."
color = "#664300" // rgb: 102, 67, 0
metabolization_rate = 1.5 * REAGENTS_METABOLISM
drink_icon ="beerglass"
drink_name = "Beer glass"
drink_desc = "A freezing pint of beer"
/datum/reagent/beer2/on_mob_life(mob/living/M)
switch(current_cycle)
code/modules/reagents/chemistry/reagents/water.dm
+9
View File
@@ -15,6 +15,9 @@
color = "#0064C8" // rgb: 0, 100, 200
var/cooling_temperature = 2
process_flags = ORGANIC | SYNTHETIC
drink_icon = "glass_clear"
drink_name = "Glass of Water"
drink_desc = "The father of all refreshments."
/datum/reagent/water/reaction_mob(mob/living/M, method=TOUCH, volume)
// Put out fire
@@ -133,6 +136,9 @@
id = "blood"
reagent_state = LIQUID
color = "#C80000" // rgb: 200, 0, 0
drink_icon = "glass_red"
drink_name = "Glass of Tomato juice"
drink_desc = "Are you sure this is tomato juice?"
/datum/reagent/blood/reaction_mob(mob/living/M, method=TOUCH, volume)
if(data && data["viruses"])
@@ -262,6 +268,9 @@
reagent_state = LIQUID
color = "#0064C8" // rgb: 0, 100, 200
process_flags = ORGANIC | SYNTHETIC
drink_icon = "glass_clear"
drink_name = "Glass of Water"
drink_desc = "The father of all refreshments."
/datum/reagent/holywater/on_mob_life(mob/living/M)
M.AdjustJitter(-5)