Fixed bugs:

Players now cannot rejoin the game if their mobs were gibbed/burned while they were disconnected.
Cremating/gibbing for meat now counts as death with triggering log records, gamemode checks, sql reports, etc.
Fixed some bugs with enabling verb ghostize().
Fixed bug with DNA Machine popping out from the protolathe.
Fixed bug with tuning RSD.
Added juicer:
	berry -> berry juice
	banana -> banana juice
	tomato -> tomato juice
	carrot -> carrot juice
Bug your botanists for getting better potence for more juice.
Juicer can be pulled, chef can give it to barmen or botanists.
Blender changed a bit:
	tomato -> ketchup
	corn -> corn oil
	soy beans -> soy milk
	any food -> nutriments and contained reagents.
Sound for the juicer found at http://www.freesound.org/samplesViewSingle.php?id=98053, edited by Nikie.
You can eject ingredients from the microwave. However, you cannot get back your reagents, they will be lost and can make microwave dirty.
Essence of Banana was renamed to Banana Juice.
Added Carrot Juice. Heals eyes much slower than imidazoline.
Carrots now contain imidazoline (however, carrot cake contains more imidazoline).
Potency for peppers, tomatoes, carrots and druggy mushrooms should work now.
New cocktail "Bahama mama": 2 rum,  2 orangejuice, limejuice, ice.
Changed recipe for soy sauce: 4 soy milk + 1 acid.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1477 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
rastaf.zero@gmail.com
2011-04-20 14:44:13 +00:00
parent 1644364643
commit 9b2e9c3420
34 changed files with 690 additions and 477 deletions
+41 -2
View File
@@ -1054,7 +1054,7 @@ datum
return
imidazoline
name = "imidazoline"
name = "Imidazoline"
id = "imidazoline"
description = "Heals eye damage"
reagent_state = LIQUID
@@ -1516,7 +1516,7 @@ datum
return
banana
name = "Essence of Banana"
name = "Banana Juice"
id = "banana"
description = "The raw essence of a banana. HONK"
nutriment_factor = 1 * REAGENTS_METABOLISM
@@ -1951,6 +1951,26 @@ datum
..()
return
carrotjuice
name = "Carrot juice"
id = "carrotjuice"
description = "It is just like a carrot but without crunching."
reagent_state = LIQUID
nutriment_factor = 0.3 * REAGENTS_METABOLISM
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M:eye_blurry = max(M:eye_blurry-1 , 0)
M:eye_blind = max(M:eye_blind-1 , 0)
if(!data) data = 1
switch(data)
if(1 to 20)
//nothing
if(21 to INFINITY)
if (prob(data-10))
M:disabilities &= ~1
data++
..()
return
kahlua
name = "Kahlua"
@@ -2496,3 +2516,22 @@ datum
M.confused = max(M:confused+2,0)
..()
return
bahama_mama
name = "Bahama mama"
id = "bahama_mama"
description = "Tropic cocktail."
reagent_state = LIQUID
on_mob_life(var/mob/living/M as mob)
if(!data) data = 1
data++
M.dizziness +=3
if(data >= 55 && data <165)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
else if(data >= 165 && prob(33))
M.confused = max(M:confused+2,0)
if (M.bodytemperature > 310)
M.bodytemperature = max(310, M.bodytemperature-5)
..()
return
+10 -3
View File
@@ -509,8 +509,8 @@ datum
name = "Soy Sauce"
id = "soysauce"
result = "soysauce"
required_reagents = list("soymilk" = 1, "acid" = 1)
result_amount = 2
required_reagents = list("soymilk" = 4, "acid" = 1)
result_amount = 5
cheesewheel
name = "Cheesewheel"
@@ -750,4 +750,11 @@ datum
id = "ginfizz"
result = "ginfizz"
required_reagents = list("gin" = 2, "sodawater" = 1, "limejuice" = 1)
result_amount = 5
result_amount = 5
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
+13 -1
View File
@@ -2474,8 +2474,20 @@
desc = "White and nutritious soy goodness!"
if("berryjuice")
icon_state = "berryjuice"
name = "Glass berry joice"
name = "Glass of berry juice"
desc = "Berry juice. Or maybe its jam. Who cares?"
if("carrotjuice")
icon_state = "carrotjuice"
name = "Glass of carrot juice"
desc = "It is just like a carrot but without crunching."
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"
else
icon_state ="glass_brown"
name = "Glass of ..what?"