Food reagent updates because of stuff.

Sugary plants, blend them for sugars.

Foods Sugar packets are removed, coco paste removed (it is now a reagent), and crushed leaves are removed (due to not taking advantage of the potency system).

Blend Coco Pods for Coco! Then add sugar and milk (or soymilk) for a chocolate bar! Or add water for hot chocolate (chocolate milk TBA). Crushed chocolate renamed crushed coco (is a reagent).

Kitchen closet has a condiment bottle of sugar in it now, rather than a billion packets of sugar.

Candies apples use 5 units of sugar now, rather than a pack of sugar.

Modified some new hydroponics plants to take advantage of the potency system.

Had a go with a few drink bottles in party crates that weren't showing up due to a typo!

Feed Nuka Cola to humans or animals and they won't just spaz out, they will spaz out so much not even the cold can slow them down.

Deleted some redundant reagents (there were two lime juices, two creams, and I forget what else). Rearranged a few reagents. Capisin and frost oil never added nutriment factor to start with, and they really shouldn't. That's pretty much it.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1839 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
tronaldnwn@hotmail.com
2011-07-12 06:20:12 +00:00
parent ffefce7258
commit ecb5c6d65c
12 changed files with 269 additions and 262 deletions
+204 -179
View File
@@ -290,7 +290,6 @@ datum
id = "toxin"
description = "A Toxic chemical."
reagent_state = LIQUID
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M:toxloss += 1.5
@@ -315,7 +314,6 @@ datum
id = "stoxin"
description = "An effective hypnotic used to treat insomnia."
reagent_state = LIQUID
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
if(!data) data = 1
@@ -331,6 +329,37 @@ datum
..()
return
srejuvinate
name = "Sleep Rejuvinate"
id = "stoxin"
description = "Put people to sleep, and heals them."
reagent_state = LIQUID
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
if(!data) data = 1
data++
if(M.losebreath >= 10)
M.losebreath = max(10, M.losebreath-10)
holder.remove_reagent(src.id, 0.2)
switch(data)
if(1 to 15)
M.eye_blurry = max(M.eye_blurry, 10)
if(15 to 25)
M:drowsyness = max(M:drowsyness, 20)
if(25 to INFINITY)
M:sleeping = 1
M:oxyloss = 0
M:weakened = 0
M:stunned = 0
M:paralysis = 0
M.dizziness = 0
M:drowsyness = 0
M:stuttering = 0
M:confused = 0
M:jitteriness = 0
..()
return
inaprovaline
name = "Inaprovaline"
id = "inaprovaline"
@@ -1410,12 +1439,12 @@ datum
reagent_state = LIQUID
nutriment_factor = 5 * REAGENTS_METABOLISM
capsaicin
name = "Capsaicin Oil"
id = "capsaicin"
description = "This is what makes chilis hot."
reagent_state = LIQUID
nutriment_factor = 5 * REAGENTS_METABOLISM
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M:bodytemperature += 5
@@ -1432,7 +1461,6 @@ datum
id = "frostoil"
description = "A special oil that noticably chills the body. Extraced from Icepeppers."
reagent_state = LIQUID
nutriment_factor = 5 * REAGENTS_METABOLISM
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M:bodytemperature -= 5
@@ -1440,7 +1468,7 @@ datum
M.take_organ_damage(0, 1)
if(prob(80) && istype(M, /mob/living/carbon/metroid))
M.fireloss += rand(5,20)
if(prob(5)) M << "\red You feel a terrible chill inside your body!"
M << "\red You feel a terrible chill inside your body!"
..()
return
@@ -1460,11 +1488,29 @@ datum
description = "A power ground from peppercorns. *AAAACHOOO*"
reagent_state = SOLID
crushedchocolate
name = "Crushed Chocolate"
id = "crushedchocolate"
description = "Crushed goodness"
coco
name = "Coco Powder"
id = "Coco Powder"
description = "A fatty, bitter paste made from coco beans."
reagent_state = SOLID
nutriment_factor = 5 * REAGENTS_METABOLISM
on_mob_life(var/mob/living/M as mob)
M:nutrition += nutriment_factor
..()
return
hot_coco
name = "Hot Chocolate"
id = "hot_coco"
description = "Made with love! And coco beans."
reagent_state = LIQUID
nutriment_factor = 2 * REAGENTS_METABOLISM
on_mob_life(var/mob/living/M as mob)
if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
M.bodytemperature = min(310, M.bodytemperature+5)
M:nutrition += nutriment_factor
..()
return
amatoxin
name = "Amatoxin"
@@ -1580,6 +1626,111 @@ datum
description = "A universal enzyme used in the preperation of certain chemicals and foods."
reagent_state = LIQUID
dry_ramen
name = "Dry Ramen"
id = "dry_ramen"
description = "Space age food, since August 25, 1958. Contains dried noodles, vegetables, and chemicals that boil in contact with water."
reagent_state = SOLID
nutriment_factor = 1 * REAGENTS_METABOLISM
on_mob_life(var/mob/living/M as mob)
M:nutrition += nutriment_factor
..()
return
hot_ramen
name = "Hot Ramen"
id = "hot_ramen"
description = "The noodles are boiled, the flavors are artificial, just like being back in school."
reagent_state = LIQUID
nutriment_factor = 5 * REAGENTS_METABOLISM
on_mob_life(var/mob/living/M as mob)
M:nutrition += nutriment_factor
if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
M.bodytemperature = min(310, M.bodytemperature+10)
..()
return
hell_ramen
name = "Hell Ramen"
id = "hell_ramen"
description = "The noodles are boiled, the flavors are artificial, just like being back in school."
reagent_state = LIQUID
nutriment_factor = 5 * REAGENTS_METABOLISM
on_mob_life(var/mob/living/M as mob)
M:nutrition += nutriment_factor
M:bodytemperature += 10
..()
return
/////////////////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////// DRINKS BELOW, Beer is up there though, along with cola. Cap'n Pete's Cuban Spiced Rum////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////////////////////
orangejuice
name = "Orange juice"
id = "orangejuice"
description = "Both delicious AND rich in Vitamin C, what more do you need?"
reagent_state = LIQUID
nutriment_factor = 1 * REAGENTS_METABOLISM
on_mob_life(var/mob/living/M as mob)
M:nutrition += nutriment_factor
if(!M) M = holder.my_atom
if(M:oxyloss && prob(30)) M:oxyloss--
M:nutrition++
..()
return
tomatojuice
name = "Tomato Juice"
id = "tomatojuice"
description = "Tomatoes made into juice. What a waste of big, juicy tomatoes, huh?"
reagent_state = LIQUID
nutriment_factor = 1 * REAGENTS_METABOLISM
on_mob_life(var/mob/living/M as mob)
M:nutrition += nutriment_factor
if(!M) M = holder.my_atom
if(M:fireloss && prob(20)) M:heal_organ_damage(0,1)
M:nutrition++
..()
return
limejuice
name = "Lime Juice"
id = "limejuice"
description = "The sweet-sour juice of limes."
reagent_state = LIQUID
nutriment_factor = 1 * REAGENTS_METABOLISM
on_mob_life(var/mob/living/M as mob)
M:nutrition += nutriment_factor
if(!M) M = holder.my_atom
if(M:toxloss && prob(20)) M:toxloss--
M:nutrition++
..()
return
carrotjuice
name = "Carrot juice"
id = "carrotjuice"
description = "It is just like a carrot but without crunching."
reagent_state = LIQUID
nutriment_factor = 1 * REAGENTS_METABOLISM
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M:nutrition += nutriment_factor
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
berryjuice
name = "Berry Juice"
id = "berryjuice"
@@ -1592,22 +1743,23 @@ datum
..()
return
watermelonjuice
name = "Watermelon Juice"
id = "watermelonjuice"
description = "Delicious juice made from watermelon."
poisonberryjuice
name = "Poison Berry Juice"
id = "poisonberryjuice"
description = "A tasty juice blended from various kinds of very deadly and toxic berries."
reagent_state = LIQUID
nutriment_factor = 1 * REAGENTS_METABOLISM
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M:nutrition += nutriment_factor
M:toxloss += 1
..()
return
limejuice
name = "Lime Juice"
id = "limejuice"
description = "Some very sour juice, enough to make your face twitch."
watermelonjuice
name = "Watermelon Juice"
id = "watermelonjuice"
description = "Delicious juice made from watermelon."
reagent_state = LIQUID
nutriment_factor = 1 * REAGENTS_METABOLISM
on_mob_life(var/mob/living/M as mob)
@@ -1628,20 +1780,6 @@ datum
..()
return
poisonberryjuice
name = "Poison Berry Juice"
id = "poisonberryjuice"
description = "A tasty juice blended from various kinds of very deadly and toxic berries."
reagent_state = LIQUID
nutriment_factor = 1 * REAGENTS_METABOLISM
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M:nutrition += nutriment_factor
if(!M) M = holder.my_atom
M:toxloss += 2.5
..()
return
banana
name = "Banana Juice"
id = "banana"
@@ -1659,56 +1797,19 @@ datum
M:heal_organ_damage(1,1)
..()
return
..()
dry_ramen
name = "Dry Ramen"
id = "dry_ramen"
description = "Space age food, since August 25, 1958. Contains dried noodles, vegetables, and chemicals that boil in contact with water."
reagent_state = SOLID
on_mob_life(var/mob/living/M as mob)
..()
M:nutrition += 1
return
hot_ramen
name = "Hot Ramen"
id = "hot_ramen"
description = "The noodles are boiled, the flavors are artificial, just like being back in school."
reagent_state = LIQUID
nutriment_factor = 5 * REAGENTS_METABOLISM
on_mob_life(var/mob/living/M as mob)
..()
M:nutrition += nutriment_factor
if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
M.bodytemperature = min(310, M.bodytemperature+10)
return
hell_ramen
name = "Hell Ramen"
id = "hell_ramen"
description = "The noodles are boiled, the flavors are artificial, just like being back in school."
reagent_state = LIQUID
nutriment_factor = 5 * REAGENTS_METABOLISM
on_mob_life(var/mob/living/M as mob)
..()
M:nutrition += nutriment_factor
M:bodytemperature += 10
return
potato_juice
name = "Potato Juice"
id = "potato"
description = "Juice of the potato. Bleh."
reagent_state = LIQUID
nutriment_factor = 2 * REAGENTS_METABOLISM
on_mob_life(var/mob/living/M as mob)
M:nutrition += nutriment_factor
..()
return
/////////////////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////// DRINKS BELOW, Beer is up there though, along with cola. Cap'n Pete's Cuban Spiced Rum////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////////////////////
milk
name = "Milk"
id = "milk"
@@ -1733,6 +1834,18 @@ datum
..()
return
cream
name = "Cream"
id = "cream"
description = "The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?"
reagent_state = LIQUID
nutriment_factor = 1 * REAGENTS_METABOLISM
on_mob_life(var/mob/living/M as mob)
M:nutrition += nutriment_factor
if(M:bruteloss && prob(20)) M:heal_organ_damage(1,0)
..()
return
coffee
name = "Coffee"
id = "coffee"
@@ -1760,7 +1873,7 @@ datum
M:drowsyness = max(0,M:drowsyness-1)
M:jitteriness = max(0,M:jitteriness-3)
M:sleeping = 0
if(M:toxloss && prob(50))
if(M:toxloss && prob(20))
M:toxloss--
if (M.bodytemperature < 310) //310 is the normal bodytemp. 310.055
M.bodytemperature = min(310, M.bodytemperature+5)
@@ -1793,24 +1906,12 @@ datum
M.dizziness = max(0,M.dizziness-2)
M:drowsyness = max(0,M:drowsyness-1)
M:sleeping = 0
if(M:toxloss && prob(50))
if(M:toxloss && prob(20))
M:toxloss--
if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055
M.bodytemperature = min(310, M.bodytemperature-5)
return
h_chocolate
name = "Hot Chocolate"
id = "h_chocolate"
description = "Made with love! And coco beans."
reagent_state = LIQUID
on_mob_life(var/mob/living/M as mob)
..()
if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
M.bodytemperature = min(310, M.bodytemperature+5)
M:nutrition += 1
return
space_cola
name = "Cola"
id = "cola"
@@ -1824,6 +1925,23 @@ datum
..()
return
nuka_cola
name = "Nuka Cola"
id = "nuka_cola"
description = "Cola, cola never changes."
reagent_state = LIQUID
on_mob_life(var/mob/living/M as mob)
M.make_jittery(20)
M.druggy = max(M.druggy, 30)
M.dizziness +=5
M:drowsyness = 0
M:sleeping = 0
if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055
M.bodytemperature = max(310, M.bodytemperature-5)
M:nutrition += 1
..()
return
spacemountainwind
name = "Space Mountain Wind"
id = "spacemountainwind"
@@ -2059,76 +2177,6 @@ datum
..()
return
orangejuice
name = "Orange juice"
id = "orangejuice"
description = "Both delicious AND rich in Vitamin C, what more do you need?"
reagent_state = LIQUID
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
if(M:oxyloss && prob(30)) M:oxyloss--
M:nutrition++
..()
return
tomatojuice
name = "Tomato Juice"
id = "tomatojuice"
description = "Tomatoes made into juice. What a waste of big, juicy tomatoes, huh?"
reagent_state = LIQUID
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
if(M:fireloss && prob(20)) M:heal_organ_damage(0,1)
M:nutrition++
..()
return
limejuice
name = "Lime Juice"
id = "limejuice"
description = "The sweet-sour juice of limes."
reagent_state = LIQUID
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
if(M:oxyloss && prob(20)) M:oxyloss--
if(M:bruteloss && prob(20)) M:heal_organ_damage(1,0)
if(M:fireloss && prob(20)) M:heal_organ_damage(0,1)
if(M:toxloss && prob(20)) M:toxloss--
M:nutrition++
..()
return
cream
name = "Cream"
id = "cream"
description = "The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?"
reagent_state = LIQUID
on_mob_life(var/mob/living/M as mob)
if(M:bruteloss && prob(20)) M:heal_organ_damage(1,0)
..()
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"
id = "kahlua"
@@ -2160,12 +2208,6 @@ datum
..()
return
cream
name = "Cream"
id = "cream"
description = "The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?"
reagent_state = LIQUID
hooch
name = "Hooch"
id = "hooch"
@@ -2899,23 +2941,6 @@ datum
..()
return
nuka_cola
name = "Nuka Cola"
id = "nuka_cola"
description = "Cola, cola never changes."
reagent_state = LIQUID
on_mob_life(var/mob/living/M as mob)
M.make_jittery(20)
M.druggy = max(M.druggy, 30)
M.dizziness +=5
M:drowsyness = 0
M:sleeping = 0
if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055
M.bodytemperature = max(310, M.bodytemperature-5)
M:nutrition += 1
..()
return
soy_latte
name = "Soy Latte"
id = "soy_latte"
+31
View File
@@ -671,6 +671,37 @@ datum
new /obj/item/weapon/reagent_containers/food/snacks/tofu(location)
return
chocolate_bar
name = "Chocolate Bar"
id = "chocolate_bar"
result = null
required_reagents = list("soymilk" = 2, "coco" = 2, "sugar" = 2)
result_amount = 1
on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/weapon/reagent_containers/food/snacks/chocolatebar(location)
return
chocolate_bar2
name = "Chocolate Bar"
id = "chocolate_bar"
result = null
required_reagents = list("milk" = 2, "coco" = 2, "sugar" = 2)
result_amount = 1
on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/weapon/reagent_containers/food/snacks/chocolatebar(location)
return
hot_coco
name = "Hot Coco"
id = "hot_coco"
result = "hot_coco"
required_reagents = list("water" = 5, "coco" = 1)
result_amount = 5
soysauce
name = "Soy Sauce"
id = "soysauce"
+10 -2
View File
@@ -1933,6 +1933,9 @@
name = "Corn Oil"
desc = "A delicious oil used in cooking. Made from corn."
icon_state = "oliveoil"
if("sugar")
name = "Sugar"
desc = "Tastey space sugar!"
else
name = "Misc Condiment Bottle"
if (reagents.reagent_list.len==1)
@@ -1954,6 +1957,11 @@
..()
reagents.add_reagent("enzyme", 50)
/obj/item/weapon/reagent_containers/food/condiment/sugar
New()
..()
reagents.add_reagent("sugar", 50)
/obj/item/weapon/reagent_containers/food/condiment/saltshaker //Seperate from above since it's a small shaker rather then
name = "Salt Shaker" // a large one.
desc = "Salt. From space oceans, presumably."
@@ -2038,13 +2046,13 @@
icon_state = "tea"
New()
..()
reagents.add_reagent("h_chocolate", 30)
reagents.add_reagent("hot_coco", 30)
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/dry_ramen
name = "Cup Ramen"
desc = "Just add 10ml water, self heats! A taste that reminds you of your shcool years."
desc = "Just add 10ml water, self heats! A taste that reminds you of your school years."
icon_state = "ramen"
New()
..()