mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
some shit hornygranny wanted me to commit, preparation for me making the shuttle fly, combat shotgun fix YEAHHHH
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@331 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
uhangi@gmail.com
@@ -1317,7 +1317,17 @@ datum
|
||||
M:confused += 2
|
||||
..()
|
||||
|
||||
|
||||
sodawater
|
||||
name = "Soda Water"
|
||||
id = "sodawater"
|
||||
description = "A can of club soda. Why not make a scotch and soda?"
|
||||
reagent_state = LIQUID
|
||||
on_mob_life(var/mob/M)
|
||||
..()
|
||||
M.dizziness = max(0,M.dizziness-5)
|
||||
M:drowsyness = max(0,M:drowsyness-3)
|
||||
M:sleeping = 0
|
||||
M.bodytemperature = min(310, M.bodytemperature-5)
|
||||
/////////////////////////////////////////////////////////////////cocktail entities//////////////////////////////////////////////
|
||||
|
||||
|
||||
@@ -1613,3 +1623,185 @@ datum
|
||||
M.confused += 3
|
||||
..()
|
||||
return
|
||||
|
||||
longislandicedtea
|
||||
name = "Long Island Iced Tea"
|
||||
id = "longislandicedtea"
|
||||
description = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only."
|
||||
reagent_state = LIQUID
|
||||
on_mob_life(var/mob/M)
|
||||
if(!data) data = 1
|
||||
data++
|
||||
M.make_dizzy(4)
|
||||
M.jitteriness = max(M:jitteriness-5,0)
|
||||
if(data >= 30)
|
||||
if (!M.stuttering) M:stuttering = 1
|
||||
M.stuttering += 4
|
||||
if(data >= 50 && prob(33))
|
||||
if (!M.confused) M:confused = 1
|
||||
M.confused += 3
|
||||
M.confused += 3
|
||||
..()
|
||||
return
|
||||
|
||||
hooch
|
||||
name = "Hooch"
|
||||
id = "hooch"
|
||||
description = "You've really hit rock bottom now... your liver packed its bags and left last night."
|
||||
reagent_state = LIQUID
|
||||
on_mob_life(var/mob/M)
|
||||
if(!data) data = 1
|
||||
data++
|
||||
M.make_dizzy(4)
|
||||
M.jitteriness = max(M:jitteriness-5,0)
|
||||
if(data >= 30)
|
||||
if (!M.stuttering) M:stuttering = 1
|
||||
M.stuttering += 4
|
||||
if(data >= 50 && prob(33))
|
||||
if (!M.confused) M:confused = 1
|
||||
M.confused += 3
|
||||
M.confused += 3
|
||||
..()
|
||||
return
|
||||
|
||||
b52
|
||||
name = "B-52"
|
||||
id = "b52"
|
||||
description = "Coffee, Irish Cream, and congac. You will get bombed."
|
||||
reagent_state = LIQUID
|
||||
on_mob_life(var/mob/M)
|
||||
if(!data) data = 1
|
||||
data++
|
||||
M.make_dizzy(3)
|
||||
M.jitteriness = max(M:jitteriness-4,0)
|
||||
if(data >= 30)
|
||||
if (!M.stuttering) M:stuttering = 1
|
||||
M.stuttering += 3
|
||||
if(data >= 50 && prob(33))
|
||||
if (!M.confused) M:confused = 1
|
||||
M.confused += 2
|
||||
|
||||
irishcoffee
|
||||
name = "Irish Coffee"
|
||||
id = "irishcoffee"
|
||||
description = "Coffee, and alcohol. More fun than a Mimosa to drink in the morning."
|
||||
reagent_state = LIQUID
|
||||
on_mob_life(var/mob/M)
|
||||
if(!data) data = 1
|
||||
data++
|
||||
M.make_dizzy(3)
|
||||
M.jitteriness = max(M:jitteriness-4,0)
|
||||
if(data >= 30)
|
||||
if (!M.stuttering) M:stuttering = 1
|
||||
M.stuttering += 3
|
||||
if(data >= 50 && prob(33))
|
||||
if (!M.confused) M:confused = 1
|
||||
M.confused += 2
|
||||
|
||||
margarita
|
||||
name = "Margarita"
|
||||
id = "margarita"
|
||||
description = "On the rocks with salt on the rim. Arriba~!"
|
||||
reagent_state = LIQUID
|
||||
on_mob_life(var/mob/M)
|
||||
if(!data) data = 1
|
||||
data++
|
||||
M.make_dizzy(3)
|
||||
M.jitteriness = max(M:jitteriness-4,0)
|
||||
if(data >= 30)
|
||||
if (!M.stuttering) M:stuttering = 1
|
||||
M.stuttering += 3
|
||||
if(data >= 50 && prob(33))
|
||||
if (!M.confused) M:confused = 1
|
||||
M.confused += 2
|
||||
..()
|
||||
|
||||
black_russian
|
||||
name = "Black Russian"
|
||||
id = "blackrussian"
|
||||
description = "For the lactose-intolerant. Still as classy as a White Russian."
|
||||
reagent_state = LIQUID
|
||||
on_mob_life(var/mob/M)
|
||||
if(!data) data = 1
|
||||
data++
|
||||
M.make_dizzy(3)
|
||||
M.jitteriness = max(M.jitteriness-3,0)
|
||||
if(data >= 35)
|
||||
if (!M.stuttering) M.stuttering = 1
|
||||
M.stuttering += 3
|
||||
if(data >= 60 && prob(33))
|
||||
if (!M:confused) M.confused = 1
|
||||
M.confused += 2
|
||||
..()
|
||||
|
||||
manhattan
|
||||
name = "Manhattan"
|
||||
id = "manhattan"
|
||||
description = "The Detective's undercover drink of choice. He never could stomach gin..."
|
||||
reagent_state = LIQUID
|
||||
on_mob_life(var/mob/M)
|
||||
if(!data) data = 1
|
||||
data++
|
||||
M.make_dizzy(3)
|
||||
M.jitteriness = max(M.jitteriness-3,0)
|
||||
if(data >= 30)
|
||||
if (!M:stuttering) M.stuttering = 1
|
||||
M.stuttering += 3
|
||||
if(data >= 50 && prob(33))
|
||||
if (!M.confused) M.confused = 1
|
||||
M.confused += 2
|
||||
..()
|
||||
|
||||
whiskeysoda
|
||||
name = "Whiskey Soda"
|
||||
id = "whiskeysoda"
|
||||
description = "Ultimate refreshment."
|
||||
reagent_state = LIQUID
|
||||
on_mob_life(var/mob/M)
|
||||
if(!data) data = 1
|
||||
data++
|
||||
M.make_dizzy(3)
|
||||
M.jitteriness = max(M.jitteriness-3,0)
|
||||
if(data >= 35)
|
||||
if (!M.stuttering) M.stuttering = 1
|
||||
M.stuttering += 3
|
||||
if(data >= 65 && prob(33))
|
||||
if (!M.confused) M.confused = 1
|
||||
M:confused += 2
|
||||
..()
|
||||
|
||||
vodkatonic
|
||||
name = "Vodka and Tonic"
|
||||
id = "vodkatonic"
|
||||
description = "For when a gin and tonic isn't russian enough."
|
||||
reagent_state = LIQUID
|
||||
on_mob_life(var/mob/M)
|
||||
if(!data) data = 1
|
||||
data++
|
||||
M.make_dizzy(3)
|
||||
M.jitteriness = max(M.jitteriness-3,0)
|
||||
if(data >= 35)
|
||||
if (!M.stuttering) M.stuttering = 1
|
||||
M.stuttering += 3
|
||||
if(data >= 55 && prob(33))
|
||||
if (!M.confused) M.confused = 1
|
||||
M.confused += 2
|
||||
..()
|
||||
|
||||
ginfizz
|
||||
name = "Gin Fizz"
|
||||
id = "ginfizz"
|
||||
description = "Refreshingly lemony, deliciously dry."
|
||||
reagent_state = LIQUID
|
||||
on_mob_life(var/mob/M)
|
||||
if(!data) data = 1
|
||||
data++
|
||||
M.make_dizzy(3)
|
||||
M.jitteriness = max(M.jitteriness-3,0)
|
||||
if(data >= 35)
|
||||
if (!M.stuttering) M.stuttering = 1
|
||||
M.stuttering += 3
|
||||
if(data >= 55 && prob(33))
|
||||
if (!M.confused) M.confused = 1
|
||||
M.confused += 2
|
||||
..()
|
||||
@@ -513,4 +513,74 @@ datum
|
||||
id = "manlydorf"
|
||||
result = "manlydorf"
|
||||
required_reagents = list ("beer" = 1, "ale" = 2)
|
||||
result_amount = 5
|
||||
|
||||
hooch
|
||||
name = "Hooch"
|
||||
id = "hooch"
|
||||
result = "hooch"
|
||||
required_reagents = list ("sugar" = 1, "ethanol" = 2, "fuel" = 1)
|
||||
result_amount = 5
|
||||
|
||||
irish_coffee
|
||||
name = "Irish Coffee"
|
||||
id = "irishcoffee"
|
||||
result = "irishcoffee"
|
||||
required_reagents = list("irishcream" = 2, "coffee" = 2)
|
||||
result_amount = 5
|
||||
|
||||
b52
|
||||
name = "B-52"
|
||||
id = "b52"
|
||||
result = "b52"
|
||||
required_reagents = list("irishcream" = 1, "kahlua" = 1, "cognac" = 1)
|
||||
result_amount = 5
|
||||
|
||||
margarita
|
||||
name = "Margarita"
|
||||
id = "margarita"
|
||||
result = "margarita"
|
||||
required_reagents = list("tequilla" = 2, "limejuice" = 1)
|
||||
result_amount = 5
|
||||
|
||||
longislandicedtea
|
||||
name = "Long Island Iced Tea"
|
||||
id = "longislandicedtea"
|
||||
result = "longislandicedtea"
|
||||
required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "cubalibre" = 1)
|
||||
result_amount = 5
|
||||
|
||||
whiskeysoda
|
||||
name = "Whiskey Soda"
|
||||
id = "whiskeysoda"
|
||||
result = "whiskeysoda"
|
||||
required_reagents = list("whiskey" = 2, "sodawater" = 1)
|
||||
result_amount = 5
|
||||
|
||||
black_russian
|
||||
name = "Black Russian"
|
||||
id = "blackrussian"
|
||||
result = "blackrussian"
|
||||
required_reagents = list("vodka" = 3, "kahlua" = 2)
|
||||
result_amount = 5
|
||||
|
||||
manhattan
|
||||
name = "Manhattan "
|
||||
id = "manhattan"
|
||||
result = "manhattan"
|
||||
required_reagents = list("whiskey" = 2, "vermouth" = 1)
|
||||
result_amount = 5
|
||||
|
||||
vodka_tonic
|
||||
name = "Vodka and Tonic"
|
||||
id = "vodkatonic"
|
||||
result = "vodkatonic"
|
||||
required_reagents = list("vodka" = 2, "tonic" = 1)
|
||||
result_amount = 5
|
||||
|
||||
gin_fizz
|
||||
name = "Gin Fizz"
|
||||
id = "ginfizz"
|
||||
result = "ginfizz"
|
||||
required_reagents = list("gin" = 2, "sodawater" = 1, "limejuice" = 1)
|
||||
result_amount = 5
|
||||
@@ -1781,7 +1781,16 @@
|
||||
R.my_atom = src
|
||||
R.add_reagent("tonic", 50)
|
||||
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/drinks/sodawater
|
||||
name = "Soda Water"
|
||||
desc = "A can of soda water. Why not make a scotch and soda?"
|
||||
icon_state = "sodawater"
|
||||
heal_amt = 2
|
||||
New()
|
||||
var/datum/reagents/R = new/datum/reagents(50)
|
||||
reagents = R
|
||||
R.my_atom = src
|
||||
R.add_reagent("sodawater", 50)
|
||||
|
||||
|
||||
//Pills
|
||||
@@ -2049,6 +2058,66 @@
|
||||
icon_state = "cubalibreglass"
|
||||
name = "Cuba Libre"
|
||||
desc = "A classic mix of rum and cola."
|
||||
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("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("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("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("hooch")
|
||||
icon_state = "glass_brown2"
|
||||
name = "Hooch"
|
||||
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 = "Are you really that boring?"
|
||||
else
|
||||
icon_state ="glass_brown"
|
||||
name = "Glass of ..what?"
|
||||
|
||||
Reference in New Issue
Block a user