More Hydroponics Stuff:

* New blender icons that don't suck!
* New Plant: Corn. Hmmm... corm.

Thanks to Guest XXX on the forums for the corn and blender icons (and the poppy ones I'm not using yet).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@506 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
morikou@gmail.com
2010-11-30 18:26:54 +00:00
parent 417e659d6c
commit a107e9cc7b
8 changed files with 121 additions and 4 deletions

View File

@@ -1046,7 +1046,10 @@ datum
if(!M) M = holder.my_atom
if(!data) data = 1
switch(data)
if(1 to 50)
if(1)
M:confused += 2
M:drowsyness += 2
if(2 to 50)
M:sleeping += 1
if(51 to INFINITY)
M:sleeping += 1
@@ -1054,8 +1057,64 @@ datum
data++
..()
return
/*
addiction //Is a generic "addiction" reagent that is produced by any chemical that is addictive.
name = "Addiction" // It should never be seen by the player since it only exists inside the body.
id = "addiction"
description = "Raw addiction. Patented by the Robust Softdrinks Corporation."
reagent_state = SOLID
on_mob_life(var/mob/M)
if(!M) M = holder.my_atom
if(M.reagents.has_reagent("opium") || M.reagents.has_reagent("morphine")) //Addictive substances goes here.
M.reagents.add_reagent("addiction", 1) //If you if have the substance, it adds another to balance out metabolism
else //If you don't, you start stuffering withdrawls.
if(!M:stuttering)
M:stuttering = 1
M:stuttering += 2
M:confused += 2
if(!data) data = 1
switch(data)
if(10 to 30)
M:toxloss++
M.make_jittery(2)
if(31 to INFINITY)
M:toxloss++
M.make_jittery(10)
..() //It also starts working out of your system.
return
opium
name = "Opium"
id = "opium"
description = "A mildly addictive narcotic analgesic."
reagent_state = SOLID
on_mob_life(var/mob/M)
if(!M) M = holder.my_atom
if(prob(50)) M:fireloss -= 2
if(prob(50)) M:bruteloss -= 2
M.reagents.add_reagent("addiction", 1) //It's addictive? A shock!
..()
return
morphine
name = "Morphine"
id = "morphine"
description = "A refined form of opium. It is a powerful narcotic analgesic."
reagent_state = LIQUID
on_mob_life(var/mob/M)
if(!M) M = holder.my_atom
if(prob(50)) M:fireloss -= 5
if(prob(50)) M:bruteloss -= 5
M.reagents.add_reagent("addiction", 2) //2x addictive for 3x the effect.
var/overdose = 0
if(!data) data = 1
if(data > 100) overdose = 1 //Oh no! An overdose
if(overdose == 1)
M:toxloss += 50
data = 0
..()
return
*/
/////////////////////////Food Reagents////////////////////////////
// Part of the food code. Nutriment is used instead of the old "heal_amt" code. Also is where all the food
// condiments, additives, and such go.
@@ -1066,7 +1125,7 @@ datum
reagent_state = SOLID
on_mob_life(var/mob/M)
if(!M) M = holder.my_atom
M:bruteloss--
if(prob(50))M:bruteloss--
M:nutrition += 20 //This is the bit that makes you fat.
..()
return

View File

@@ -311,6 +311,13 @@ datum
required_reagents = list("ethanol" = 1, "chlorine" = 3, "water" = 1)
result_amount = 1
morphine
name = "Morphine"
id = "morphine"
result = "morphine"
required_reagents = list("opium" = 10, "enzyme" = 2)
result_amount = 5
///////////////////////////////////////////////////////////////////////////////////
// foam and foam precursor

View File

@@ -110,6 +110,39 @@
plant_type = 0
growthstages = 6
/obj/item/seeds/cornseed
name = "Corn seeds"
icon_state = "seed-corn"
mypath = "/obj/item/seeds/cornseed"
species = "corn"
plantname = "Corn plant"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/corn"
lifespan = 25
endurance = 15
maturation = 8
production = 6
yield = 3
plant_type = 0
oneharvest = 1
growthstages = 3
/*
/obj/item/seeds/poppyseed
name = "Poppy seeds"
icon_state = "seed-poppy"
mypath = "/obj/item/seeds/poppyseed"
species = "poppy"
plantname = "Poppy plant"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/poppy"
lifespan = 25
endurance = 10
potency = 20
maturation = 8
production = 6
yield = 3
plant_type = 0
oneharvest = 1
growthstages = 3
*/
/obj/item/seeds/potatoseed
name = "Potato Seeds"
icon_state = "seed-potato"
@@ -476,6 +509,24 @@
user << ""
return
/obj/item/weapon/reagent_containers/food/snacks/grown/corn
seed = "/obj/item/seeds/cornseed"
name = "Corn"
icon_state = "corn"
New()
..()
reagents.add_reagent("nutriment", 2)
/*
/obj/item/weapon/reagent_containers/food/snacks/grown/poppy
seed = "/obj/item/seeds/poppyseed"
name = "Poppy"
icon_state = "poppy"
New()
..()
reagents.add_reagent("nutriment", 1)
reagents.add_reagent("opium", max(round((potency / 5), 1), 2))
bitesize = reagents.total_volume
*/
/obj/item/weapon/reagent_containers/food/snacks/grown/potato
seed = "/obj/item/seeds/potatoseed"

View File

@@ -648,8 +648,8 @@
name = "MegaSeed Servitor"
desc = "When you need seeds fast!"
icon_state = "seeds"
product_paths = "/obj/item/seeds/chiliseed;/obj/item/seeds/berryseed;/obj/item/seeds/eggplantseed;/obj/item/seeds/tomatoseed;/obj/item/seeds/wheatseed;/obj/item/seeds/soyaseed;/obj/item/seeds/carrotseed;/obj/item/seeds/potatoseed;/obj/item/seeds/chantermycelium"
product_amounts = "2;2;2;2;2;2;2;2;2"
product_paths = "/obj/item/seeds/cornseed;/obj/item/seeds/chiliseed;/obj/item/seeds/berryseed;/obj/item/seeds/eggplantseed;/obj/item/seeds/tomatoseed;/obj/item/seeds/wheatseed;/obj/item/seeds/soyaseed;/obj/item/seeds/carrotseed;/obj/item/seeds/potatoseed;/obj/item/seeds/chantermycelium"
product_amounts = "2;2;2;2;2;2;2;2;2;2"
product_slogans = "THIS'S WHERE TH' SEEDS LIVE! GIT YOU SOME!;Hands down the best seed selection on the station!;Also certain mushroom varieties available, more for experts! Get certified today!"
product_hidden = "/obj/item/seeds/amanitamycelium;/obj/item/seeds/libertymycelium;/obj/item/seeds/nettleseed;/obj/item/seeds/plumpmycelium"
product_hideamt = "1;2;2;2"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 70 KiB

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB