cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 15:45:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds proper ethanol percentages to stuff.

Browse Source
This commit is contained in:
Mieszko Jędrzejczak
2016-03-26 14:39:00 +01:00
parent 3f6e882f62
commit dbff5d765d
2 changed files with 103 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/newchem/drinks.dm
+13 -4
View File
@@ -39,6 +39,7 @@
slur_start = 30
brawl_start = 40
confused_start = 100
alcohol_perc = 0.4
/datum/chemical_reaction/applejack
name = "applejack"
@@ -55,6 +56,7 @@
id = "jackrose"
description = "A classic cocktail that had fallen out of fashion, but never out of taste,"
color = "#664300"
alcohol_perc = 0.4
/datum/chemical_reaction/jackrose
name = "jackrose"
@@ -80,11 +82,12 @@
vomit_start = INFINITY //
blur_start = INFINITY //
pass_out = INFINITY //INFINITY, so that IPCs don't puke and stuff
var/spark_start = 50 //amount absorbed after which mob starts sparking
var/collapse_start = 150 //amount absorbed after wich mob starts sparking and collapsing (DOUBLE THE SPARKS, DOUBLE THE FUN)
var/spark_start = 25 //amount absorbed after which mob starts sparking
var/collapse_start = 70 //amount absorbed after wich mob starts sparking and collapsing (DOUBLE THE SPARKS, DOUBLE THE FUN)
var/braindamage_start = 250 //amount absorbed after which mob starts taking a small amount of brain damage
/datum/chemical_reaction/synthanol
name = "Synthanol"
id = "synthanol"
@@ -96,7 +99,7 @@
/datum/reagent/ethanol/synthanol/on_mob_life(var/mob/living/M as mob, var/alien)
var/d = data
var/d = current_cycle * alcohol_perc
if(M.isSynthetic()) //works normally on synthetics
if(d >= spark_start && prob(25))
var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
@@ -107,7 +110,7 @@
var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
s.set_up(3, 1, M)
s.start()
if(d >= braindamage_start && prob(33))
if(d >= braindamage_start && prob(10))
M.adjustBrainLoss(1)
else
@@ -131,6 +134,7 @@ datum/reagent/ethanol/synthanol/reaction_mob(var/mob/M, var/method=TOUCH, var/vo
description = "An oily substance that an IPC could technically consider a 'drink'."
reagent_state = LIQUID
color = "#363636"
alcohol_perc = 0.5
/datum/chemical_reaction/synthanol/robottears
name = "Robot Tears"
@@ -146,6 +150,7 @@ datum/reagent/ethanol/synthanol/reaction_mob(var/mob/M, var/method=TOUCH, var/vo
description = "A fruit drink meant only for synthetics, however that works."
reagent_state = LIQUID
color = "#adb21f"
alcohol_perc = 0.3
/datum/chemical_reaction/synthanol/trinary
name = "Trinary"
@@ -161,6 +166,7 @@ datum/reagent/ethanol/synthanol/reaction_mob(var/mob/M, var/method=TOUCH, var/vo
description = "A drink containing some organic ingredients, but meant only for synthetics."
reagent_state = LIQUID
color = "#5b3210"
alcohol_perc = 0.5
/datum/chemical_reaction/synthanol/servo
name = "Servo"
@@ -176,6 +182,7 @@ datum/reagent/ethanol/synthanol/reaction_mob(var/mob/M, var/method=TOUCH, var/vo
description = "A potent mix of alcohol and synthanol. Will only work on synthetics."
reagent_state = LIQUID
color = "#e7ae04"
alcohol_perc = 0.2
/datum/chemical_reaction/synthanol/uplink
name = "Uplink"
@@ -190,6 +197,7 @@ datum/reagent/ethanol/synthanol/reaction_mob(var/mob/M, var/method=TOUCH, var/vo
description = "The classic drink adjusted for a robot's tastes."
reagent_state = LIQUID
color = "#7204e7"
alcohol_perc = 0.5
/datum/chemical_reaction/synthanol/synthnsoda
name = "Synth 'n Soda"
@@ -204,6 +212,7 @@ datum/reagent/ethanol/synthanol/reaction_mob(var/mob/M, var/method=TOUCH, var/vo
description = "Someone mixed wine and alcohol for robots. Hope you're proud of yourself."
reagent_state = LIQUID
color = "#d004e7"
alcohol_perc = 0.5
/datum/chemical_reaction/synthanol/synthignon
name = "Synthignon"
code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm
+90 -47
View File
@@ -11,31 +11,30 @@
var/dizzy_adj = 3
var/slurr_adj = 3
var/confused_adj = 2
var/slur_start = 65 //amount absorbed after which mob starts slurring
var/brawl_start = 75 //amount absorbed after which mob switches to drunken brawling as a fighting style
var/confused_start = 130 //amount absorbed after which mob starts confusing directions
var/vomit_start = 180 //amount absorbed after which mob starts vomitting
var/blur_start = 260 //amount absorbed after which mob starts getting blurred vision
var/pass_out = 325 //amount absorbed after which mob starts passing out
var/slur_start = 40 //amount absorbed after which mob starts slurring
var/brawl_start = 50 //amount absorbed after which mob switches to drunken brawling as a fighting style
var/confused_start = 60 //amount absorbed after which mob starts confusing directions
var/vomit_start = 90 //amount absorbed after which mob starts vomitting
var/blur_start = 140 //amount absorbed after which mob starts getting blurred vision
var/pass_out = 180 //amount absorbed after which mob starts passing out
var/alcohol_perc = 1 //percentage of ethanol in a beverage 0.0 - 1.0
/datum/reagent/ethanol/on_mob_life(var/mob/living/M as mob, var/alien)
// Sobering multiplier.
// Sober block makes it more difficult to get drunk
var/sober_str=!(SOBER in M.mutations)?1:2
M.nutrition += nutriment_factor
if(!src.data) data = 1
src.data++
var/d = data
var/d = current_cycle * alcohol_perc
// make all the beverages work together
for(var/datum/reagent/ethanol/A in holder.reagent_list)
if(isnum(A.data)) d += A.data
if(isnum(A.current_cycle)) d += A.current_cycle * A.alcohol_perc
d/=sober_str
var/obj/item/organ/internal/liver/L
if(ishuman(M))
if(ishuman(M) && !M.isSynthetic())
var/mob/living/carbon/human/H = M
L = H.get_int_organ(/obj/item/organ/internal/liver)
if(!L || (istype(L) && L.dna.species in list("Skrell", "Neara")))
@@ -93,12 +92,13 @@
return
/datum/reagent/ethanol/beer //It's really much more stronger than other drinks.
/datum/reagent/ethanol/beer
name = "Beer"
id = "beer"
description = "An alcoholic beverage made from malted grains, hops, yeast, and water."
nutriment_factor = 2 * FOOD_METABOLISM
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.1
/datum/reagent/ethanol/beer/on_mob_life(var/mob/living/M as mob)
..()
@@ -110,6 +110,7 @@
id = "cider"
description = "An alcoholic beverage derived from apples."
color = "#174116"
alcohol_perc = 0.1
/datum/reagent/ethanol/whiskey
name = "Whiskey"
@@ -117,14 +118,14 @@
description = "A superb and well-aged single-malt whiskey. Damn."
color = "#664300" // rgb: 102, 67, 0
dizzy_adj = 4
alcohol_perc = 0.4
/datum/reagent/ethanol/specialwhiskey
name = "Special Blend Whiskey"
id = "specialwhiskey"
description = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything."
color = "#664300" // rgb: 102, 67, 0
slur_start = 30 //amount absorbed after which mob starts slurring
brawl_start = 40
alcohol_perc = 0.5
/datum/reagent/ethanol/gin
name = "Gin"
@@ -132,6 +133,7 @@
description = "It's gin. In space. I say, good sir."
color = "#664300" // rgb: 102, 67, 0
dizzy_adj = 3
alcohol_perc = 0.5
/datum/reagent/ethanol/absinthe
name = "Absinthe"
@@ -139,16 +141,11 @@
description = "Watch out that the Green Fairy doesn't come for you!"
color = "#33EE00" // rgb: lots, ??, ??
overdose_threshold = 30
dizzy_adj = 5
slur_start = 25
brawl_start = 40
confused_start = 100
alcohol_perc = 0.7
//copy paste from LSD... shoot me
/datum/reagent/ethanol/absinthe/on_mob_life(var/mob/living/M)
if(!M) M = holder.my_atom
if(!data) data = 1
data++
M.hallucination += 5
..()
return
@@ -164,6 +161,7 @@
description = "Popular with the sailors. Not very popular with everyone else."
color = "#664300" // rgb: 102, 67, 0
overdose_threshold = 30
alcohol_perc = 0.4
/datum/reagent/ethanol/rum/on_mob_life(var/mob/living/M as mob)
..()
@@ -180,30 +178,35 @@
id = "mojito"
description = "If it's good enough for Spesscuba, it's good enough for you."
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.1
/datum/reagent/ethanol/vodka
name = "Vodka"
id = "vodka"
description = "Number one drink AND fueling choice for Russians worldwide."
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.4
/datum/reagent/ethanol/sake
name = "Sake"
id = "sake"
description = "Anime's favorite drink."
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
/datum/reagent/ethanol/tequilla
name = "Tequila"
id = "tequilla"
description = "A strong and mildly flavoured, mexican produced spirit. Feeling thirsty hombre?"
color = "#A8B0B7" // rgb: 168, 176, 183
alcohol_perc = 0.4
/datum/reagent/ethanol/vermouth
name = "Vermouth"
id = "vermouth"
description = "You suddenly feel a craving for a martini..."
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
/datum/reagent/ethanol/wine
name = "Wine"
@@ -211,8 +214,7 @@
description = "An premium alchoholic beverage made from distilled grape juice."
color = "#7E4043" // rgb: 126, 64, 67
dizzy_adj = 2
slur_start = 65 //amount absorbed after which mob starts slurring
confused_start = 145 //amount absorbed after which mob starts confusing directions
alcohol_perc = 0.2
/datum/reagent/ethanol/cognac
name = "Cognac"
@@ -220,7 +222,7 @@
description = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. Classy as fornication."
color = "#664300" // rgb: 102, 67, 0
dizzy_adj = 4
confused_start = 115 //amount absorbed after which mob starts confusing directions
alcohol_perc = 0.4
/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"
@@ -230,17 +232,14 @@
dizzy_adj = 20
slurr_adj = 20
confused_adj = 3
slur_start = 15
brawl_start = 25
confused_start = 40
blur_start = 60
pass_out = 80
alcohol_perc = 1 //because that's a thing it's supposed to do, I guess
/datum/reagent/ethanol/ale
name = "Ale"
id = "ale"
description = "A dark alchoholic beverage made by malted barley and yeast."
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.1
/datum/reagent/ethanol/thirteenloko
name = "Thirteen Loko"
@@ -248,6 +247,7 @@
description = "A potent mixture of caffeine and alcohol."
reagent_state = LIQUID
color = "#102000" // rgb: 16, 32, 0
alcohol_perc = 0.3
/datum/reagent/ethanol/thirteenloko/on_mob_life(var/mob/living/M as mob)
..()
@@ -269,6 +269,7 @@
description = "This appears to be beer mixed with milk. Disgusting."
reagent_state = LIQUID
color = "#895C4C" // rgb: 137, 92, 76
alcohol_perc = 0.1
/datum/reagent/ethanol/atomicbomb
name = "Atomic Bomb"
@@ -276,6 +277,7 @@
description = "Nuclear proliferation never tasted so good."
reagent_state = LIQUID
color = "#666300" // rgb: 102, 99, 0
alcohol_perc = 0.2
/datum/reagent/ethanol/threemileisland
name = "THree Mile Island Iced Tea"
@@ -283,6 +285,7 @@
description = "Made for a woman, strong enough for a man."
reagent_state = LIQUID
color = "#666340" // rgb: 102, 99, 64
alcohol_perc = 0.2
/datum/reagent/ethanol/goldschlager
name = "Goldschlager"
@@ -290,6 +293,7 @@
description = "100 proof cinnamon schnapps, made for alcoholic teen girls on spring break."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.4
/datum/reagent/ethanol/patron
name = "Patron"
@@ -297,6 +301,7 @@
description = "Tequila with silver in it, a favorite of alcoholic women in the club scene."
reagent_state = LIQUID
color = "#585840" // rgb: 88, 88, 64
alcohol_perc = 0.4
/datum/reagent/ethanol/gintonic
name = "Gin and Tonic"
@@ -304,6 +309,7 @@
description = "An all time classic, mild cocktail."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.4
/datum/reagent/ethanol/cuba_libre
name = "Cuba Libre"
@@ -311,6 +317,7 @@
description = "Rum, mixed with cola. Viva la revolution."
reagent_state = LIQUID
color = "#3E1B00" // rgb: 62, 27, 0
alcohol_perc = 0.2
/datum/reagent/ethanol/whiskey_cola
name = "Whiskey Cola"
@@ -318,6 +325,7 @@
description = "Whiskey, mixed with cola. Surprisingly refreshing."
reagent_state = LIQUID
color = "#3E1B00" // rgb: 62, 27, 0
alcohol_perc = 0.3
/datum/reagent/ethanol/martini
name = "Classic Martini"
@@ -325,6 +333,7 @@
description = "Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.5
/datum/reagent/ethanol/vodkamartini
name = "Vodka Martini"
@@ -332,6 +341,7 @@
description = "Vodka with Gin. Not quite how 007 enjoyed it, but still delicious."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.4
/datum/reagent/ethanol/white_russian
name = "White Russian"
@@ -339,6 +349,7 @@
description = "That's just, like, your opinion, man..."
reagent_state = LIQUID
color = "#A68340" // rgb: 166, 131, 64
alcohol_perc = 0.3
/datum/reagent/ethanol/screwdrivercocktail
name = "Screwdriver"
@@ -346,6 +357,7 @@
description = "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious."
reagent_state = LIQUID
color = "#A68310" // rgb: 166, 131, 16
alcohol_perc = 0.3
/datum/reagent/ethanol/booger
name = "Booger"
@@ -353,6 +365,7 @@
description = "Ewww..."
reagent_state = LIQUID
color = "#A68310" // rgb: 166, 131, 16
alcohol_perc = 0.2
/datum/reagent/ethanol/bloody_mary
name = "Bloody Mary"
@@ -360,6 +373,7 @@
description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
/datum/reagent/ethanol/gargle_blaster
name = "Pan-Galactic Gargle Blaster"
@@ -367,6 +381,7 @@
description = "Whoah, this stuff looks volatile!"
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.7 //ouch
/datum/reagent/ethanol/brave_bull
name = "Brave Bull"
@@ -374,6 +389,7 @@
description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.3
/datum/reagent/ethanol/tequilla_sunrise
name = "Tequila Sunrise"
@@ -381,6 +397,7 @@
description = "Tequila and orange juice. Much like a Screwdriver, only Mexican~"
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.3
/datum/reagent/ethanol/toxins_special
name = "Toxins Special"
@@ -388,6 +405,7 @@
description = "This thing is FLAMING!. CALL THE DAMN SHUTTLE!"
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.5
/datum/reagent/ethanol/beepsky_smash
name = "Beepsky Smash"
@@ -395,24 +413,19 @@
description = "Deny drinking this and prepare for THE LAW."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.5
/datum/reagent/ethanol/beepsky_smash/on_mob_life(mob/living/M)
M.Stun(1)
..()
/datum/reagent/ethanol/changelingsting
name = "Changeling Sting"
id = "changelingsting"
description = "You take a tiny sip and feel a burning sensation..."
reagent_state = LIQUID
color = "#2E6671" // rgb: 46, 102, 113
/datum/reagent/ethanol/irish_cream
name = "Irish Cream"
id = "irishcream"
description = "Whiskey-imbued cream, what else would you expect from the Irish."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.3
/datum/reagent/ethanol/manly_dorf
name = "The Manly Dorf"
@@ -420,6 +433,7 @@
description = "Beer and Ale, brought together in a delicious mix. Intended for true men only."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.1
/datum/reagent/ethanol/longislandicedtea
name = "Long Island Iced Tea"
@@ -427,6 +441,7 @@
description = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.5
/datum/reagent/ethanol/moonshine
name = "Moonshine"
@@ -434,6 +449,7 @@
description = "You've really hit rock bottom now... your liver packed its bags and left last night."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.8 //yeeehaw
/datum/reagent/ethanol/b52
name = "B-52"
@@ -441,6 +457,7 @@
description = "Coffee, Irish Cream, and congac. You will get bombed."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.3
/datum/reagent/ethanol/irishcoffee
name = "Irish Coffee"
@@ -448,6 +465,7 @@
description = "Coffee, and alcohol. More fun than a Mimosa to drink in the morning."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
/datum/reagent/ethanol/margarita
name = "Margarita"
@@ -455,6 +473,7 @@
description = "On the rocks with salt on the rim. Arriba~!"
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.3
/datum/reagent/ethanol/black_russian
name = "Black Russian"
@@ -462,6 +481,7 @@
description = "For the lactose-intolerant. Still as classy as a White Russian."
reagent_state = LIQUID
color = "#360000" // rgb: 54, 0, 0
alcohol_perc = 0.4
/datum/reagent/ethanol/manhattan
name = "Manhattan"
@@ -469,6 +489,7 @@
description = "The Detective's undercover drink of choice. He never could stomach gin..."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.4
/datum/reagent/ethanol/manhattan_proj
name = "Manhattan Project"
@@ -476,6 +497,7 @@
description = "A scienitst's drink of choice, for pondering ways to blow up the station."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.4
/datum/reagent/ethanol/whiskeysoda
name = "Whiskey Soda"
@@ -483,6 +505,7 @@
description = "Ultimate refreshment."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.3
/datum/reagent/ethanol/antifreeze
name = "Anti-freeze"
@@ -490,6 +513,7 @@
description = "Ultimate refreshment."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
/datum/reagent/ethanol/barefoot
name = "Barefoot"
@@ -497,6 +521,7 @@
description = "Barefoot and pregnant"
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.1
/datum/reagent/ethanol/snowwhite
name = "Snow White"
@@ -504,6 +529,7 @@
description = "A cold refreshment"
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.1
/datum/reagent/ethanol/demonsblood
name = "Demons Blood"
@@ -513,6 +539,7 @@
color = "#664300" // rgb: 102, 67, 0
dizzy_adj = 10
slurr_adj = 10
alcohol_perc = 0.4
/datum/reagent/ethanol/vodkatonic
name = "Vodka and Tonic"
@@ -522,6 +549,7 @@
color = "#664300" // rgb: 102, 67, 0
dizzy_adj = 4
slurr_adj = 3
alcohol_perc = 0.3
/datum/reagent/ethanol/ginfizz
name = "Gin Fizz"
@@ -531,6 +559,7 @@
color = "#664300" // rgb: 102, 67, 0
dizzy_adj = 4
slurr_adj = 3
alcohol_perc = 0.4
/datum/reagent/ethanol/bahama_mama
name = "Bahama mama"
@@ -538,6 +567,7 @@
description = "Tropic cocktail."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.1
/datum/reagent/ethanol/singulo
name = "Singulo"
@@ -547,6 +577,7 @@
color = "#2E6671" // rgb: 46, 102, 113
dizzy_adj = 15
slurr_adj = 15
alcohol_perc = 0.7
/datum/reagent/ethanol/sbiten
name = "Sbiten"
@@ -554,6 +585,7 @@
description = "A spicy Vodka! Might be a little hot for the little guys!"
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.4
/datum/reagent/ethanol/sbiten/on_mob_life(var/mob/living/M as mob)
..()
@@ -567,6 +599,7 @@
description = "Creepy time!"
reagent_state = LIQUID
color = "#A68310" // rgb: 166, 131, 16
alcohol_perc = 0.3
/datum/reagent/ethanol/red_mead
name = "Red Mead"
@@ -574,6 +607,7 @@
description = "The true Viking drink! Even though it has a strange red color."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.1
/datum/reagent/ethanol/mead
name = "Mead"
@@ -581,6 +615,7 @@
description = "A Vikings drink, though a cheap one."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.1
/datum/reagent/ethanol/iced_beer
name = "Iced Beer"
@@ -588,6 +623,7 @@
description = "A beer which is so cold the air around it freezes."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.1
/datum/reagent/ethanol/iced_beer/on_mob_life(var/mob/living/M as mob)
..()
@@ -601,6 +637,7 @@
description = "Watered down rum, Nanotrasen approves!"
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
/datum/reagent/ethanol/aloe
name = "Aloe"
@@ -608,6 +645,7 @@
description = "So very, very, very good."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
/datum/reagent/ethanol/andalusia
name = "Andalusia"
@@ -615,6 +653,7 @@
description = "A nice, strange named drink."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.4
/datum/reagent/ethanol/alliescocktail
name = "Allies Cocktail"
@@ -622,6 +661,7 @@
description = "A drink made from your allies."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.5
/datum/reagent/ethanol/acid_spit
name = "Acid Spit"
@@ -629,6 +669,7 @@
description = "A drink by Nanotrasen. Made from live aliens."
reagent_state = LIQUID
color = "#365000" // rgb: 54, 80, 0
alcohol_perc = 0.3
/datum/reagent/ethanol/amasec
name = "Amasec"
@@ -636,7 +677,7 @@
description = "Official drink of the Imperium."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.3
/datum/reagent/ethanol/neurotoxin
name = "Neuro-toxin"
@@ -644,22 +685,20 @@
description = "A strong neurotoxin that puts the subject into a death-like state."
reagent_state = LIQUID
color = "#2E2E61" // rgb: 46, 46, 97
alcohol_perc = 0.7
/datum/reagent/ethanol/neurotoxin/on_mob_life(var/mob/living/M as mob)
M.weakened = max(M.weakened, 3)
if(!data)
data = 1
data++
M.dizziness +=6
if(data >= 15 && data <45)
if(current_cycle >= 15 && current_cycle <45)
if (!M.slurring)
M.slurring = 1
M.slurring += 3
else if(data >= 45 && prob(50) && data <55)
else if(current_cycle >= 45 && prob(50) && current_cycle <55)
M.confused = max(M.confused+3,0)
else if(data >=55)
else if(current_cycle >=55)
M.druggy = max(M.druggy, 55)
else if(data >=200)
else if(current_cycle >=200)
M.adjustToxLoss(2)
..()
return
@@ -670,6 +709,7 @@
description = "A stingy drink."
reagent_state = LIQUID
color = "#2E6671" // rgb: 46, 102, 113
alcohol_perc = 0.7
/datum/reagent/ethanol/changelingsting/on_mob_life(var/mob/living/M as mob)
..()
@@ -682,6 +722,7 @@
description = "Mmm, tastes like chocolate cake..."
reagent_state = LIQUID
color = "#2E6671" // rgb: 46, 102, 113
alcohol_perc = 0.3
/datum/reagent/ethanol/irishcarbomb/on_mob_life(var/mob/living/M as mob)
..()
@@ -694,6 +735,7 @@
description = "A Syndicate bomb"
reagent_state = LIQUID
color = "#2E6671" // rgb: 46, 102, 113
alcohol_perc = 0.2
/datum/reagent/ethanol/erikasurprise
name = "Erika Surprise"
@@ -701,6 +743,7 @@
description = "The surprise is, it's green!"
reagent_state = LIQUID
color = "#2E6671" // rgb: 46, 102, 113
alcohol_perc = 0.1
/datum/reagent/ethanol/driestmartini
name = "Driest Martini"
@@ -708,15 +751,14 @@
description = "Only for the experienced. You think you see sand floating in the glass."
nutriment_factor = 1 * FOOD_METABOLISM
color = "#2E6671" // rgb: 46, 102, 113
alcohol_perc = 0.5
/datum/reagent/ethanol/driestmartini/on_mob_life(var/mob/living/M as mob)
if(!data) data = 1
data++
M.dizziness +=10
if(data >= 55 && data <115)
if(current_cycle >= 55 && current_cycle <115)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 10
else if(data >= 115 && prob(33))
else if(current_cycle >= 115 && prob(33))
M.confused = max(M.confused+15,15)
..()
@@ -727,6 +769,7 @@
id = "kahlua"
description = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936!"
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
/datum/reagent/ethanol/kahlua/on_mob_life(var/mob/living/M as mob)
M.dizziness = max(0,M.dizziness-5)