Food/Drink Overhaul Phase 1: Vast majority of the changes are transparent to players.

- Healing on all food items have been adjusted. This means food heals for more generally (also because the old code always healed 1 damage regardless of what the food was designed to do). The strength of secondary effects (such as heat from chilis or the extra healing from donuts) has generally changed (donk pockets currently only heal their basic amount, I think).
- Poisonous shrooms are still potentially lethal but you'll have time to respond to their effect.
- Redundancies removed from all over the place.
- New reagents: Nutriment, Ketchup, Soy Sauce, Salt, Pepper, Capsaicin Oil, Frost Oil, Amatoxin, Psilocybin, Sprinkles
- Preparation for condiments
- Fixed Gulp_Size related stuff.
- New Food Item: Chaos Donut: 1 Hot Sauce + 1 Cold Sauce + 1 Flour + 1 Egg. Has a variable effect. NOT DEADLY (usually).
- New Drug: Ethylredoxrazine: Carbon + Oxygen + Anti-Toxin. Binds strongly with Ethanol *HINT*
- Changelog updated.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@423 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
morikou@gmail.com
2010-11-15 02:22:21 +00:00
parent 9ad14e6859
commit 284c0c80b6
11 changed files with 653 additions and 672 deletions
+128
View File
@@ -155,6 +155,9 @@ datum
id = "milk"
description = "An opaque white liquid produced by the mammary glands of mammals."
reagent_state = LIQUID
on_mob_life(var/mob/M)
if(!M) M = holder.my_atom
if(M:bruteloss && prob(10)) M:bruteloss--
beer
name = "Beer"
@@ -262,6 +265,8 @@ datum
holder.remove_reagent("acid", 1)
if(holder.has_reagent("cyanide"))
holder.remove_reagent("cyanide", 1)
if(holder.has_reagent("amatoxin"))
holder.remove_reagent("amatoxin", 2)
M:toxloss = max(M:toxloss-2,0)
..()
return
@@ -983,6 +988,7 @@ datum
holder.remove_reagent(src.id, 0.2)
return
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
nanites
@@ -1059,6 +1065,128 @@ datum
description = "A secondary amine, mildly corrosive."
reagent_state = LIQUID
ethylredoxrazine // FUCK YOU, ALCOHOL
name = "Ethylredoxrazine"
id = "ethylredoxrazine"
description = "A powerfuld oxidizer that reacts with ethanol."
reagent_state = SOLID
on_mob_life(var/mob/M)
if(!M) M = holder.my_atom
M.dizziness = 0
M:drowsyness = 0
M:stuttering = 0
M:confused = 0
..()
/////////////////////////Food Reagents////////////////////////////
// Part of the food code. It is used instead of the old "heal_amt" code. Also is where all the food
// condiments, additives, and such go.
nutriment
name = "Nutrition"
id = "nutriment"
description = "All the vitamins, minerals, and carbohydrates the body needs in pure form."
reagent_state = SOLID
on_mob_life(var/mob/M)
if(!M) M = holder.my_atom
M:bruteloss--
M:nutrition += 20 //This is the bit that makes you fat.
..()
return
berryjam
name = "Berry Jam"
id = "berryjam"
description = "A delightfully sweat flavor of some indescernible berry... you think."
reagent_state = LIQUID
on_mob_life(var/mob/M)
if(!M) M = holder.my_atom
M:nutrition++
..()
soysauce
name = "Soysauce"
id = "soysauce"
description = "A salty sauce made from the soy plant."
reagent_state = LIQUID
ketchup
name = "Ketchup"
id = "ketchup"
description = "Ketchup, catsup, whatever. It's tomato paste."
reagent_state = LIQUID
capsaicin
name = "Capsaicin Oil"
id = "capsaicin"
description = "This is what makes chilis hot."
reagent_state = LIQUID
on_mob_life(var/mob/M)
if(!M) M = holder.my_atom
M:bodytemperature += 5
if(prob(40)) M:fireloss++
..()
return
frostoil
name = "Frost Oil"
id = "frostoil"
description = "A special oil that noticably chills the body. Extraced from Icepeppers."
reagent_state = LIQUID
on_mob_life(var/mob/M)
if(!M) M = holder.my_atom
M:bodytemperature -= 5
if(prob(40)) M:fireloss++
..()
return
tablesalt
name = "Table Salt"
id = "tablesalt"
description = "A salt made of sodium chloride. Commonly used to season food."
reagent_state = SOLID
blackpepper
name = "Black Pepper"
id = "blackpepper"
description = "A power ground from peppercorns. *AAAACHOOO*"
reagent_state = SOLID
amatoxin
name = "Amatoxin"
id = "amatoxin"
description = "A powerful poison derived from certain species of mushroom."
on_mob_life(var/mob/M)
if(!M) M = holder.my_atom
M:toxloss++
..()
return
psilocybin
name = "Psilocybin"
id = "psilocybin"
description = "A strong psycotropic derived from certain species of mushroom."
on_mob_life(var/mob/M)
if(!M) M = holder.my_atom
M.druggy = max(M.druggy, 30)
if(M.canmove) step(M, pick(cardinal))
if(prob(14)) M:emote(pick("twitch","drool","moan","giggle"))
holder.remove_reagent(src.id, 0.2)
..()
return
sprinkles
name = "Sprinkles"
id = "sprinkles"
description = "Multi-colored little bits of sugar, commonly found on donuts. Loved by cops."
on_mob_life(var/mob/M)
if(istype(M, /mob/living/carbon/human) && M.job in list("Security Officer", "Head of Security", "Detective"))
if(!M) M = holder.my_atom
M:bruteloss--
M:fireloss--
..()
return
/////////////////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////// ALCHOHOLIC DRINKS BELOW, Beer is up there though, along with cola. Cap'n Pete's Cuban Spiced Rum////////////////////////////////
+15 -1
View File
@@ -200,12 +200,26 @@ datum
result_amount = 10
spaceacillin
name = "spaceacillin"
name = "Spaceacillin"
id = "spaceacillin"
result = "spaceacillin"
required_reagents = list("cryptobiolin" = 1, "inaprovaline" = 1)
result_amount = 2
ethylredoxrazine
name = "Ethylredoxrazine"
id = "ethylredoxrazine"
result = "ethylredoxrazine"
required_reagents = list("oxygen" = 1, "anti_toxin" = 1, "carbon" = 1)
result_amount = 3
ethanoloxidation
name = "ethanoloxidation" //Kind of a placeholder in case someone ever changes it so that chemicals
id = "ethanoloxidation" // react in the body. Also it would be silly if it didn't exist.
result = "water"
required_reagents = list("ethylredoxrazine" = 1, "ethanol" = 1)
result_amount = 2
flash_powder
name = "Flash powder"
id = "flash_powder"
File diff suppressed because it is too large Load Diff