cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Barman renamed Bartender, because I am a femmi nazi.

Browse Source 
Monkeys have several bugs fixed on them, shooting them with weak bullet rounds now works! Also, fixed monkeys not showing being KO/ burned without having brute damage on them first.

New chemistry reagents. That'll be required for a upcoming update to chemistry when grinding up refined ore will get reagents or something. Silver, gold, and Uranium.

Bar drinks now have resulting units in mixtures equal to all liquids stirred in. No more 50 unit martinis from 30 units gin and vermouth anymore!

Map updates - Fixed a maintenance tunnel with no air. Updated Bartender spawn point (so you don't spawn on loading screen).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1626 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
tronaldnwn@hotmail.com
2011-05-28 22:46:58 +00:00
parent d5251640e0
commit c3d2869749
11 changed files with 7682 additions and 7647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
code/WorkInProgress/Chemistry-Reagents.dm
View File

@@ -700,6 +700,35 @@ datum
return
*/
gold
name = "gold"
id = "gold"
description = "Gold is a dense, soft, shiny metal and the most malleable and ductile metal known."
reagent_state = SOLID
silver
name = "silver"
id = "silver"
description = "A soft, white, lustrous transition metal, it has the highest electrical conductivity of any element and the highest thermal conductivity of any metal."
reagent_state = SOLID
uranium
name ="uranium"
id = "uranium"
description = "A silvery-white metallic chemical element in the actinide series, weakly radioactive."
reagent_state = SOLID
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M.radiation += 1
..()
return
reaction_turf(var/turf/T, var/volume)
src = null
if(!istype(T, /turf/space))
new /obj/decal/cleanable/greenglow(T)
aluminum
name = "aluminum"
id = "aluminum"

54
code/WorkInProgress/Chemistry-Recipes.dm
View File

@@ -563,7 +563,7 @@ datum
result = "moonshine"
required_reagents = list("nutriment" = 10)
required_catalysts = list("enzyme" = 5)
result_amount = 5
result_amount = 10
wine
name = "Wine"
@@ -571,7 +571,7 @@ datum
result = "wine"
required_reagents = list("berryjuice" = 10)
required_catalysts = list("enzyme" = 5)
result_amount = 5
result_amount = 10
vodka
name = "Vodka"
@@ -579,7 +579,7 @@ datum
result = "vodka"
required_reagents = list("potato" = 10)
required_catalysts = list("enzyme" = 5)
result_amount = 5
result_amount = 10
kahlua
name = "Kahlua"
@@ -594,7 +594,7 @@ datum
id = "gintonic"
result = "gintonic"
required_reagents = list("gin" = 2, "tonic" = 1)
result_amount = 5
result_amount = 3
cuba_libre
@@ -602,21 +602,21 @@ datum
id = "cubalibre"
result = "cubalibre"
required_reagents = list("rum" = 2, "cola" = 1)
result_amount = 5
result_amount = 3
martini
name = "Classic Martini"
id = "martini"
result = "martini"
required_reagents = list("gin" = 2, "vermouth" = 1)
result_amount = 5
result_amount = 3
vodkamartini
name = "Vodka Martini"
id = "vodkamartini"
result = "vodkamartini"
required_reagents = list("vodka" = 2, "vermouth" = 1)
result_amount = 5
result_amount = 3
white_russian
@@ -631,21 +631,21 @@ datum
id = "whiskeycola"
result = "whiskeycola"
required_reagents = list("whiskey" = 2, "cola" = 1)
result_amount = 5
result_amount = 3
screwdriver
name = "Screwdriver"
id = "screwdrivercocktail"
result = "screwdrivercocktail"
required_reagents = list("vodka" = 2, "orangejuice" = 1)
result_amount = 5
result_amount = 3
bloody_mary
name = "Bloody Mary"
id = "bloodymary"
result = "bloodymary"
required_reagents = list("vodka" = 1, "tomatojuice" = 2, "limejuice" = 1)
result_amount = 5
result_amount = 4
gargle_blaster
name = "Pan-Galactic Gargle Blaster"
@@ -659,14 +659,14 @@ datum
id = "bravebull"
result = "bravebull"
required_reagents = list("tequilla" = 2, "kahlua" = 1)
result_amount = 5
result_amount = 3
tequilla_sunrise
name = "Tequilla Sunrise"
id = "tequillasunrise"
result = "tequillasunrise"
required_reagents = list("tequilla" = 2, "orangejuice" = 1)
result_amount = 5
result_amount = 3
toxins_special
name = "Toxins Special"
@@ -680,70 +680,70 @@ datum
id = "beepksysmash"
result = "beepskysmash"
required_reagents = list("limejuice" = 2, "whiskey" = 2, "iron" = 1)
result_amount = 5
result_amount = 4
doctor_delight
name = "The Doctor's Delight"
id = "doctordelight"
result = "doctorsdelight"
required_reagents = list("limejuice" = 1, "tomatojuice" = 1, "orangejuice" = 1, "cream" = 1)
result_amount = 5
result_amount = 4
irish_cream
name = "Irish Cream"
id = "irishcream"
result = "irishcream"
required_reagents = list("whiskey" = 2, "cream" = 1)
result_amount = 5
result_amount = 3
manly_dorf
name = "The Manly Dorf"
id = "manlydorf"
result = "manlydorf"
required_reagents = list ("beer" = 1, "ale" = 2)
result_amount = 5
result_amount = 3
hooch
name = "Hooch"
id = "hooch"
result = "hooch"
required_reagents = list ("sugar" = 1, "ethanol" = 2, "fuel" = 1)
result_amount = 5
result_amount = 3
irish_coffee
name = "Irish Coffee"
id = "irishcoffee"
result = "irishcoffee"
required_reagents = list("irishcream" = 2, "coffee" = 2)
result_amount = 5
required_reagents = list("irishcream" = 1, "coffee" = 1)
result_amount = 2
b52
name = "B-52"
id = "b52"
result = "b52"
required_reagents = list("irishcream" = 1, "kahlua" = 1, "cognac" = 1)
result_amount = 5
result_amount = 3
margarita
name = "Margarita"
id = "margarita"
result = "margarita"
required_reagents = list("tequilla" = 2, "limejuice" = 1)
result_amount = 5
result_amount = 3
longislandicedtea
name = "Long Island Iced Tea"
id = "longislandicedtea"
result = "longislandicedtea"
required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "cubalibre" = 1)
result_amount = 5
result_amount = 4
whiskeysoda
name = "Whiskey Soda"
id = "whiskeysoda"
result = "whiskeysoda"
required_reagents = list("whiskey" = 2, "sodawater" = 1)
result_amount = 5
result_amount = 3
black_russian
name = "Black Russian"
@@ -757,25 +757,25 @@ datum
id = "manhattan"
result = "manhattan"
required_reagents = list("whiskey" = 2, "vermouth" = 1)
result_amount = 5
result_amount = 3
vodka_tonic
name = "Vodka and Tonic"
id = "vodkatonic"
result = "vodkatonic"
required_reagents = list("vodka" = 2, "tonic" = 1)
result_amount = 5
result_amount = 3
gin_fizz
name = "Gin Fizz"
id = "ginfizz"
result = "ginfizz"
required_reagents = list("gin" = 2, "sodawater" = 1, "limejuice" = 1)
result_amount = 5
result_amount = 4
bahama_mama
name = "Bahama mama"
id = "bahama_mama"
result = "bahama_mama"
required_reagents = list("rum" = 2, "orangejuice" = 2, "limejuice" = 1, "ice" = 1)
result_amount = 5
result_amount = 6

2
code/WorkInProgress/Chemistry-Tools.dm
View File

@@ -2496,7 +2496,7 @@
if("martini")
icon_state = "martiniglass"
name = "Classic Martini"
desc = "Damn, the barman even stirred it, not shook it."
desc = "Damn, the bartender even stirred it, not shook it."
if("vodkamartini")
icon_state = "martiniglass"
name = "Vodka martini"