mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-12 15:45:25 +01:00
Merge to main from the hydroponics branch r57_skie_1.
Hydroponics update + bugfixes. Consists of revisions: R58, R60, R67, R68, R73. Combined changelog (from oldest rev to newest): Put all hydroponics defines into one .dm file Added functionality for nettles and made all currently growable plantlife work Changed hydroponics layout Added Hydroponics Supply crates and added weed/pest sprays into the current ones at hydro Fixed nettle hold graphics Fixed vending machines showing hidden items. Added Research Director hydroponics access and botanists tox access (already had chem access, but no tox). Hydroponics in great shape. Spank Numbers for final modifications before merging to trunk. (weedkillers, pestkillers) Added a seed vending machine. Amanitas now poison, and the poison is nasty. Added a poison() proc to all foods. Added graphics for vertical and horizontal one-tile-wide tables. Put one inside hydroponics. New 'blur' texture when your vision goes blurry. Fixed a typo in hydroponics code. Added a disposal unit in hydroponics. Added a how-to instructions paper in hydroponics. Hydroponics in working order. Extra features still in developement. Fixed weedspray and pestspray entries. Removed chaplains random probability to have see_invisible 15 at start, because it's reset to 0 right next world tick anyways. Added burn() and drug() procs to foodstuffs. Added drug effects to some mushrooms. Have a nice trip. Made chilis heat you up and ice peppers freeze you down. Fixed carrot's harvest icon (it didn't exist) To-do: Mutagens and vitamins for hydroponics plants. New mutations, recipes for cook, extracting stuff from plants. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@74 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -160,12 +160,6 @@
|
||||
flags = FPRINT|TABLEPASS|SUITSPACE
|
||||
item_state = "caphat"
|
||||
|
||||
/obj/item/clothing/head/wardhat
|
||||
name = "Warden's hat"
|
||||
icon_state = "warden"
|
||||
flags = FPRINT|TABLEPASS|SUITSPACE
|
||||
item_state = "warden"
|
||||
|
||||
/obj/item/clothing/head/centhat
|
||||
name = "Cent. Comm. hat"
|
||||
icon_state = "centcom"
|
||||
|
||||
@@ -1,61 +0,0 @@
|
||||
//Grown foods
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/ //New subclass so we can pass on values
|
||||
var/seed = ""
|
||||
var/plantname = ""
|
||||
var/productname = ""
|
||||
var/species = ""
|
||||
var/lifespan = 0
|
||||
var/endurance = 0
|
||||
var/maturation = 0
|
||||
var/production = 0
|
||||
var/yield = 0
|
||||
var/potency = -1
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/berries
|
||||
name = "berries"
|
||||
desc = "Nutritious!"
|
||||
icon_state = "berrypile"
|
||||
amount = 2
|
||||
heal_amt = 5
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/chili
|
||||
name = "chili"
|
||||
desc = "Spicy!"
|
||||
icon_state = "chilipepper"
|
||||
amount = 1
|
||||
heal_amt = 5
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/eggplant
|
||||
name = "eggplant"
|
||||
desc = "Yum!"
|
||||
icon_state = "eggplant"
|
||||
amount = 2
|
||||
heal_amt = 5
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans
|
||||
name = "soybeans"
|
||||
desc = "Pretty bland, but the possibilities..."
|
||||
icon_state = "soybeans"
|
||||
amount = 1
|
||||
heal_amt = 2
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato
|
||||
name = "tomato"
|
||||
desc = "Tom-mae-to or to-mah-to? You decide."
|
||||
icon_state = "tomato"
|
||||
amount = 2
|
||||
heal_amt = 5
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/wheat
|
||||
name = "wheat"
|
||||
desc = "I wouldn't eat this, unless you're one of those health freaks.."
|
||||
icon_state = "wheat"
|
||||
amount = 1
|
||||
heal_amt = 1
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/icepepper
|
||||
name = "icepepper"
|
||||
desc = "THIS SHOULD PROBABLY DO SOMETHING BUT IT DOESN'T RIGHT NOW SO YOU CAN GO FUCK RIGHT OFF"
|
||||
icon_state = "icepepper"
|
||||
amount = 1
|
||||
heal_amt = 1
|
||||
@@ -0,0 +1,573 @@
|
||||
// ********************************************************
|
||||
// Here's all the seeds (=plants) that can be used in hydro
|
||||
// ********************************************************
|
||||
|
||||
/obj/item/seeds
|
||||
name = "seed"
|
||||
icon = 'hydroponics.dmi'
|
||||
icon_state = "seed" // unknown plant seed - these shouldn't exist in-game
|
||||
flags = FPRINT | TABLEPASS
|
||||
var/mypath = "/obj/item/seeds"
|
||||
var/plantname = ""
|
||||
var/productname = ""
|
||||
var/species = ""
|
||||
var/lifespan = 0
|
||||
var/endurance = 0
|
||||
var/maturation = 0
|
||||
var/production = 0
|
||||
var/yield = 0 // If is -1, the plant/shroom/weed is never meant to be harvested
|
||||
var/oneharvest = 0
|
||||
var/potency = -1
|
||||
var/growthstages = 0
|
||||
var/plant_type = 0 // 0 = 'normal plant'; 1 = weed; 2 = shroom
|
||||
|
||||
/obj/item/seeds/chiliseed
|
||||
name = "Chili plant seeds"
|
||||
icon_state = "seed-chili"
|
||||
mypath = "/obj/item/seeds/chiliseed"
|
||||
species = "chili"
|
||||
plantname = "Chili plant"
|
||||
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/chili"
|
||||
lifespan = 20
|
||||
endurance = 15
|
||||
maturation = 5
|
||||
production = 5
|
||||
yield = 4
|
||||
potency = 20
|
||||
plant_type = 0
|
||||
growthstages = 6
|
||||
|
||||
/obj/item/seeds/berryseed
|
||||
name = "Berry seeds"
|
||||
icon_state = "seed-berry"
|
||||
mypath = "/obj/item/seeds/berryseed"
|
||||
species = "berry"
|
||||
plantname = "Berry bush"
|
||||
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/berries"
|
||||
lifespan = 20
|
||||
endurance = 15
|
||||
maturation = 5
|
||||
production = 5
|
||||
yield = 2
|
||||
plant_type = 0
|
||||
growthstages = 6
|
||||
|
||||
/obj/item/seeds/eggplantseed
|
||||
name = "Eggplant seeds"
|
||||
icon_state = "seed-eggplant"
|
||||
mypath = "/obj/item/seeds/eggplantseed"
|
||||
species = "eggplant"
|
||||
plantname = "Eggplant plant"
|
||||
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/eggplant"
|
||||
lifespan = 25
|
||||
endurance = 15
|
||||
maturation = 6
|
||||
production = 6
|
||||
yield = 2
|
||||
plant_type = 0
|
||||
growthstages = 6
|
||||
|
||||
/obj/item/seeds/tomatoseed
|
||||
name = "Tomato seeds"
|
||||
icon_state = "seed-tomato"
|
||||
mypath = "/obj/item/seeds/tomatoseed"
|
||||
species = "tomato"
|
||||
plantname = "Tomato plant"
|
||||
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/tomato"
|
||||
lifespan = 25
|
||||
endurance = 15
|
||||
maturation = 8
|
||||
production = 6
|
||||
yield = 2
|
||||
plant_type = 0
|
||||
growthstages = 6
|
||||
|
||||
/obj/item/seeds/icepepperseed
|
||||
name = "Ice pepper seeds"
|
||||
icon_state = "seed-icepepper"
|
||||
mypath = "/obj/item/seeds/icepepperseed"
|
||||
species = "chiliice"
|
||||
plantname = "Ice pepper plant"
|
||||
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/icepepper"
|
||||
lifespan = 25
|
||||
endurance = 15
|
||||
maturation = 4
|
||||
production = 4
|
||||
yield = 4
|
||||
potency = 20
|
||||
plant_type = 0
|
||||
growthstages = 6
|
||||
|
||||
/obj/item/seeds/soyaseed
|
||||
name = "Soybean seeds"
|
||||
icon_state = "seed-soybean"
|
||||
mypath = "/obj/item/seeds/soyaseed"
|
||||
species = "soybean"
|
||||
plantname = "Soybean plant"
|
||||
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans"
|
||||
lifespan = 25
|
||||
endurance = 15
|
||||
maturation = 4
|
||||
production = 4
|
||||
yield = 3
|
||||
potency = 0
|
||||
plant_type = 0
|
||||
growthstages = 6
|
||||
|
||||
/obj/item/seeds/wheatseed
|
||||
name = "Wheat seeds"
|
||||
icon_state = "seed-wheat"
|
||||
mypath = "/obj/item/seeds/wheatseed"
|
||||
species = "wheat"
|
||||
plantname = "Wheat stalks"
|
||||
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/wheat"
|
||||
lifespan = 25
|
||||
endurance = 15
|
||||
maturation = 6
|
||||
production = 1
|
||||
yield = 4
|
||||
potency = 0
|
||||
oneharvest = 1
|
||||
plant_type = 0
|
||||
growthstages = 6
|
||||
|
||||
/obj/item/seeds/carrotseed
|
||||
name = "Carrot seeds"
|
||||
icon_state = "seed-carrot"
|
||||
mypath = "/obj/item/seeds/carrotseed"
|
||||
species = "carrot"
|
||||
plantname = "CURROTS MAN CURROTS"
|
||||
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/carrot"
|
||||
lifespan = 25
|
||||
endurance = 15
|
||||
maturation = 10
|
||||
production = 1
|
||||
yield = 4
|
||||
potency = 0
|
||||
oneharvest = 1
|
||||
plant_type = 0
|
||||
growthstages = 5
|
||||
|
||||
/obj/item/seeds/amanitamycelium
|
||||
name = "Fly Amanita mycelium"
|
||||
icon_state = "mycelium-amanita"
|
||||
mypath = "/obj/item/seeds/amanitamycelium"
|
||||
species = "amanita"
|
||||
plantname = "Fly Amanita"
|
||||
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/amanita"
|
||||
lifespan = 50
|
||||
endurance = 35
|
||||
maturation = 10
|
||||
production = 5
|
||||
yield = 4
|
||||
potency = 10 // Damage based on potency?
|
||||
oneharvest = 1
|
||||
growthstages = 3
|
||||
plant_type = 2
|
||||
|
||||
/obj/item/seeds/angelmycelium
|
||||
name = "Destroying Angel mycelium"
|
||||
icon_state = "mycelium-angel"
|
||||
mypath = "/obj/item/seeds/angelmycelium"
|
||||
species = "angel"
|
||||
plantname = "Destroying Angel"
|
||||
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/angel"
|
||||
lifespan = 50
|
||||
endurance = 35
|
||||
maturation = 12
|
||||
production = 5
|
||||
yield = 2
|
||||
potency = 35
|
||||
oneharvest = 1
|
||||
growthstages = 3
|
||||
plant_type = 2
|
||||
|
||||
/obj/item/seeds/libertymycelium
|
||||
name = "Liberty Cap mycelium"
|
||||
icon_state = "mycelium-liberty"
|
||||
mypath = "/obj/item/seeds/libertymycelium"
|
||||
species = "liberty"
|
||||
plantname = "Liberty Cap"
|
||||
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/libertycap"
|
||||
lifespan = 25
|
||||
endurance = 15
|
||||
maturation = 7
|
||||
production = 1
|
||||
yield = 6
|
||||
potency = 15 // Lowish potency at start
|
||||
oneharvest = 1
|
||||
growthstages = 3
|
||||
plant_type = 2
|
||||
|
||||
/obj/item/seeds/chantermycelium
|
||||
name = "Chanterelle mycelium"
|
||||
icon_state = "mycelium-chanter"
|
||||
mypath = "/obj/item/seeds/chantermycelium"
|
||||
species = "chanter"
|
||||
plantname = "Chanterelle"
|
||||
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/chanterelle"
|
||||
lifespan = 35
|
||||
endurance = 20
|
||||
maturation = 7
|
||||
production = 1
|
||||
yield = 5
|
||||
potency = -1
|
||||
oneharvest = 1
|
||||
growthstages = 3
|
||||
plant_type = 2
|
||||
|
||||
/obj/item/seeds/towermycelium
|
||||
name = "Tower Cap mycelium"
|
||||
icon_state = "mycelium-tower"
|
||||
mypath = "/obj/item/seeds/towermycelium"
|
||||
species = "towercap"
|
||||
plantname = "Tower Cap"
|
||||
productname = "" // Doesn't exist yet
|
||||
lifespan = 80
|
||||
endurance = 50
|
||||
maturation = 15
|
||||
production = 1
|
||||
yield = 5
|
||||
potency = -1
|
||||
oneharvest = 1
|
||||
growthstages = 3
|
||||
plant_type = 2
|
||||
|
||||
/obj/item/seeds/plumpmycelium
|
||||
name = "Plump Helmet mycelium"
|
||||
icon_state = "mycelium-plump"
|
||||
mypath = "/obj/item/seeds/plumpmycelium"
|
||||
species = "plump"
|
||||
plantname = "Plump Helmet"
|
||||
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/plumphelmet"
|
||||
lifespan = 25
|
||||
endurance = 15
|
||||
maturation = 8
|
||||
production = 1
|
||||
yield = 4
|
||||
potency = 0
|
||||
oneharvest = 1
|
||||
growthstages = 3
|
||||
plant_type = 2
|
||||
|
||||
/obj/item/seeds/nettleseed
|
||||
name = "Nettle seeds"
|
||||
icon_state = "seed-nettle"
|
||||
mypath = "/obj/item/seeds/nettleseed"
|
||||
species = "nettle"
|
||||
plantname = "Nettle"
|
||||
productname = "/obj/item/weapon/grown/nettle"
|
||||
lifespan = 30
|
||||
endurance = 40 // tuff like a toiger
|
||||
maturation = 6
|
||||
production = 6
|
||||
yield = 4
|
||||
potency = 8
|
||||
oneharvest = 0
|
||||
growthstages = 5
|
||||
plant_type = 1
|
||||
|
||||
/obj/item/seeds/deathnettleseed
|
||||
name = "Deathnettle seeds"
|
||||
icon_state = "seed-deathnettle"
|
||||
mypath = "/obj/item/seeds/deathnettleseed"
|
||||
species = "deathnettle"
|
||||
plantname = "Death Nettle"
|
||||
productname = "/obj/item/weapon/grown/deathnettle"
|
||||
lifespan = 30
|
||||
endurance = 25
|
||||
maturation = 8
|
||||
production = 6
|
||||
yield = 2
|
||||
potency = 20
|
||||
oneharvest = 0
|
||||
growthstages = 5
|
||||
plant_type = 1
|
||||
|
||||
/obj/item/seeds/weeds
|
||||
name = "Weeds"
|
||||
icon_state = "seed"
|
||||
mypath = "/obj/item/seeds/weeds"
|
||||
species = "weeds"
|
||||
plantname = "Generic weeds"
|
||||
productname = ""
|
||||
lifespan = 100
|
||||
endurance = 50 // damm pesky weeds
|
||||
maturation = 5
|
||||
production = 1
|
||||
yield = -1
|
||||
potency = -1
|
||||
oneharvest = 1
|
||||
growthstages = 4
|
||||
plant_type = 1
|
||||
|
||||
/obj/item/seeds/harebell
|
||||
name = "Harebell"
|
||||
icon_state = "seed"
|
||||
mypath = "/obj/item/seeds/harebell"
|
||||
species = "harebell"
|
||||
plantname = "Harebell"
|
||||
productname = ""
|
||||
lifespan = 100
|
||||
endurance = 20
|
||||
maturation = 7
|
||||
production = 1
|
||||
yield = -1
|
||||
potency = -1
|
||||
oneharvest = 1
|
||||
growthstages = 4
|
||||
plant_type = 1
|
||||
|
||||
/obj/item/seeds/brownmold
|
||||
name = "Brown Mold"
|
||||
icon_state = "seed"
|
||||
mypath = "/obj/item/seeds/brownmold"
|
||||
species = "mold"
|
||||
plantname = "Brown Mold"
|
||||
productname = ""
|
||||
lifespan = 50
|
||||
endurance = 30
|
||||
maturation = 10
|
||||
production = 1
|
||||
yield = -1
|
||||
potency = -1
|
||||
oneharvest = 1
|
||||
growthstages = 3
|
||||
plant_type = 2
|
||||
|
||||
/*
|
||||
/obj/item/seeds/
|
||||
name = ""
|
||||
icon_state = "seed"
|
||||
mypath = "/obj/item/seeds/"
|
||||
species = ""
|
||||
plantname = ""
|
||||
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/"
|
||||
lifespan = 25
|
||||
endurance = 15
|
||||
maturation = 10
|
||||
production = 1
|
||||
yield = -1
|
||||
potency = 0
|
||||
oneharvest = 1
|
||||
growthstages = 3
|
||||
plant_type = 0
|
||||
|
||||
*/
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// ***********************************************************
|
||||
// Foods that are produced from hydroponics ~~~~~~~~~~
|
||||
// Data from the seeds carry over to these grown foods
|
||||
// ***********************************************************
|
||||
|
||||
|
||||
//Grown foods
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/ //New subclass so we can pass on values
|
||||
var/seed = ""
|
||||
var/plantname = ""
|
||||
var/productname = ""
|
||||
var/species = ""
|
||||
var/lifespan = 0
|
||||
var/endurance = 0
|
||||
var/maturation = 0
|
||||
var/production = 0
|
||||
var/yield = 0
|
||||
var/potency = -1
|
||||
var/plant_type = 0
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/berries
|
||||
name = "Berries"
|
||||
desc = "Nutritious!"
|
||||
icon_state = "berrypile"
|
||||
amount = 2
|
||||
heal_amt = 3
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/chili
|
||||
name = "Chili"
|
||||
desc = "Spicy!"
|
||||
icon_state = "chilipepper"
|
||||
amount = 1
|
||||
heal_amt = 2
|
||||
heat_amt = 20
|
||||
potency = 20
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/eggplant
|
||||
name = "Eggplant"
|
||||
desc = "Yum!"
|
||||
icon_state = "eggplant"
|
||||
amount = 1
|
||||
heal_amt = 5
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans
|
||||
name = "Soybeans"
|
||||
desc = "Pretty bland, but the possibilities..."
|
||||
icon_state = "soybeans"
|
||||
amount = 2
|
||||
heal_amt = 2
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato
|
||||
name = "Tomato"
|
||||
desc = "Tom-mae-to or to-mah-to? You decide."
|
||||
icon_state = "tomato"
|
||||
amount = 2
|
||||
heal_amt = 5
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/wheat
|
||||
name = "Wheat"
|
||||
desc = "I wouldn't eat this, unless you're one of those health freaks.."
|
||||
icon_state = "wheat"
|
||||
amount = 1
|
||||
heal_amt = 2
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/icepepper
|
||||
name = "Icepepper"
|
||||
desc = "A mutant strain of chile"
|
||||
icon_state = "icepepper"
|
||||
amount = 1
|
||||
heal_amt = 3
|
||||
heat_amt = 20
|
||||
potency = 20
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/carrot
|
||||
name = "Carrot"
|
||||
desc = "Good for the eyes!"
|
||||
icon_state = "carrot"
|
||||
amount = 3
|
||||
heal_amt = 1
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/amanita
|
||||
name = "Fly amanita"
|
||||
desc = "<I>Amanita Muscaria</I>: Learn poisonous mushrooms by heart. Only pick mushrooms you know."
|
||||
icon_state = "amanita"
|
||||
amount = 1
|
||||
heal_amt = 0
|
||||
poison_amt = 25
|
||||
potency = 10
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/angel
|
||||
name = "Destroying angel"
|
||||
desc = "<I>Amanita Virosa</I>: Deadly poisonous basidiomycete fungus filled with alpha amatoxins."
|
||||
icon_state = "angel"
|
||||
amount = 1
|
||||
heal_amt = 0
|
||||
poison_amt = 75
|
||||
potency = 35
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/libertycap
|
||||
name = "Liberty cap"
|
||||
desc = "<I>Psilocybe Semilanceata</I>: Liberate yourself!"
|
||||
icon_state = "libertycap"
|
||||
amount = 1
|
||||
heal_amt = 3
|
||||
drug_amt = 15
|
||||
potency = 15
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/plumphelmet
|
||||
name = "Plump Helmet"
|
||||
desc = "<I>Plumus Hellmus</I>: Plump, soft and s-so inviting~"
|
||||
icon_state = "plumphelmet"
|
||||
amount = 2
|
||||
heal_amt = 5
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/chanterelle
|
||||
name = "Chanterelle"
|
||||
desc = "<I>Cantharellus Cibarius</I>: These jolly yellow little shrooms sure look tasty! There's a lot!"
|
||||
icon_state = "chanterelle"
|
||||
amount = 3
|
||||
heal_amt = 2
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// *************************************
|
||||
// Pestkiller defines for hydroponics
|
||||
// *************************************
|
||||
|
||||
|
||||
/obj/item/pestkiller
|
||||
name = ""
|
||||
icon = 'chemical.dmi'
|
||||
icon_state = "bottle16"
|
||||
flags = FPRINT | TABLEPASS
|
||||
var/toxicity = 0
|
||||
var/PestKillStr = 0
|
||||
|
||||
/obj/item/pestkiller/carbaryl
|
||||
name = "Carbaryl"
|
||||
icon = 'chemical.dmi'
|
||||
icon_state = "bottle16"
|
||||
flags = FPRINT | TABLEPASS
|
||||
toxicity = 4
|
||||
PestKillStr = 2
|
||||
|
||||
/obj/item/pestkiller/lindane
|
||||
name = "Lindane"
|
||||
icon = 'chemical.dmi'
|
||||
icon_state = "bottle18"
|
||||
flags = FPRINT | TABLEPASS
|
||||
toxicity = 6
|
||||
PestKillStr = 4
|
||||
|
||||
/obj/item/pestkiller/phosmet
|
||||
name = "Phosmet"
|
||||
icon = 'chemical.dmi'
|
||||
icon_state = "bottle15"
|
||||
flags = FPRINT | TABLEPASS
|
||||
toxicity = 8
|
||||
PestKillStr = 7
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// *************************************
|
||||
// Weedkiller defines for hydroponics
|
||||
// *************************************
|
||||
|
||||
|
||||
/obj/item/weedkiller
|
||||
name = ""
|
||||
icon = 'chemical.dmi'
|
||||
icon_state = "bottle16"
|
||||
flags = FPRINT | TABLEPASS
|
||||
var/toxicity = 0
|
||||
var/WeedKillStr = 0
|
||||
|
||||
/obj/item/weedkiller/triclopyr
|
||||
name = "Glyphosate"
|
||||
icon = 'chemical.dmi'
|
||||
icon_state = "bottle16"
|
||||
flags = FPRINT | TABLEPASS
|
||||
toxicity = 4
|
||||
WeedKillStr = 2
|
||||
|
||||
/obj/item/weedkiller/lindane
|
||||
name = "Triclopyr"
|
||||
icon = 'chemical.dmi'
|
||||
icon_state = "bottle18"
|
||||
flags = FPRINT | TABLEPASS
|
||||
toxicity = 6
|
||||
WeedKillStr = 4
|
||||
|
||||
/obj/item/weedkiller/D24
|
||||
name = "2,4-D"
|
||||
icon = 'chemical.dmi'
|
||||
icon_state = "bottle15"
|
||||
flags = FPRINT | TABLEPASS
|
||||
toxicity = 8
|
||||
WeedKillStr = 7
|
||||
@@ -529,7 +529,7 @@
|
||||
var/active = 1 //No sales pitches if off!
|
||||
var/vend_ready = 1 //Are we ready to vend?? Is it time??
|
||||
var/vend_delay = 10 //How long does it take to vend?
|
||||
var/product_paths = "" //String of product paths separated by semicolons.
|
||||
var/product_paths = "" //String of product paths separated by semicolons. No spaces!
|
||||
var/product_amounts = "" //String of product amounts separated by semicolons, must have amount for every path in product_paths
|
||||
var/product_slogans = "" //String of slogans separated by semicolons, optional
|
||||
var/product_hidden = "" //String of products that are hidden unless hacked.
|
||||
@@ -605,7 +605,7 @@
|
||||
icon_state = "sec"
|
||||
icon_deny = "sec-deny"
|
||||
req_access_txt = "1"
|
||||
product_paths = "/obj/item/weapon/handcuffs;/obj/item/weapon/flashbang; /obj/item/device/flash"
|
||||
product_paths = "/obj/item/weapon/handcuffs;/obj/item/weapon/flashbang;/obj/item/device/flash"
|
||||
product_amounts = "8;2;5"
|
||||
//product_amounts = "8;5;4" Old totals
|
||||
product_hidden = "/obj/item/clothing/head/helmet"
|
||||
@@ -620,6 +620,16 @@
|
||||
product_amounts = "25;15;15"
|
||||
product_slogans = "Aren't you glad you don't have to fertilize the natural way?;Now with 50% less stink!;Plants are people too!"
|
||||
|
||||
/obj/machinery/vending/hydroseeds
|
||||
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/chantermycelium;/obj/item/seeds/nettleseed"
|
||||
product_amounts = "2;2;2;2;2;2;2;2;1"
|
||||
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;/obj/item/seeds/towermycelium"
|
||||
product_hideamt = "1;2;2;2;2"
|
||||
|
||||
/obj/machinery/microwave
|
||||
name = "Microwave"
|
||||
icon = 'kitchen.dmi'
|
||||
@@ -630,7 +640,6 @@
|
||||
var/flour_amount = 0 //Current amount of flour inside
|
||||
var/water_amount = 0 //Current amount of water inside
|
||||
var/monkeymeat_amount = 0
|
||||
var/cheese_amount = 0 //cheese inside, yo
|
||||
var/humanmeat_amount = 0
|
||||
var/donkpocket_amount = 0
|
||||
var/xenomeat_amount = 0
|
||||
|
||||
@@ -1,112 +0,0 @@
|
||||
/obj/item/seeds
|
||||
name = "seed"
|
||||
icon = 'hydroponics.dmi'
|
||||
icon_state = "seed"
|
||||
flags = FPRINT | TABLEPASS
|
||||
var/mypath = "/obj/item/seeds"
|
||||
var/plantname = ""
|
||||
var/productname = ""
|
||||
var/species = ""
|
||||
var/lifespan = 0
|
||||
var/endurance = 0
|
||||
var/maturation = 0
|
||||
var/production = 0
|
||||
var/yield = 0
|
||||
var/oneharvest = 0
|
||||
var/potency = -1
|
||||
|
||||
/obj/item/seeds/chiliseed
|
||||
name = "chili plant seeds"
|
||||
icon_state = "seed-chili"
|
||||
mypath = "/obj/item/seeds/chiliseed"
|
||||
species = "chili"
|
||||
plantname = "chili plant"
|
||||
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/chili"
|
||||
lifespan = 20
|
||||
endurance = 15
|
||||
maturation = 5
|
||||
production = 5
|
||||
yield = 4
|
||||
potency = 0
|
||||
|
||||
/obj/item/seeds/berryseed
|
||||
name = "berry seeds"
|
||||
icon_state = "seed-berry"
|
||||
mypath = "/obj/item/seeds/berryseed"
|
||||
species = "berry"
|
||||
plantname = "berry bush"
|
||||
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/berries"
|
||||
lifespan = 20
|
||||
endurance = 15
|
||||
maturation = 6
|
||||
production = 5
|
||||
yield = 1
|
||||
|
||||
/obj/item/seeds/eggplantseed
|
||||
name = "eggplant seeds"
|
||||
icon_state = "seed-eggplant"
|
||||
mypath = "/obj/item/seeds/eggplantseed"
|
||||
species = "eggplant"
|
||||
plantname = "eggplant plant"
|
||||
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/eggplant"
|
||||
lifespan = 25
|
||||
endurance = 15
|
||||
maturation = 6
|
||||
production = 6
|
||||
yield = 2
|
||||
|
||||
/obj/item/seeds/tomatoseed
|
||||
name = "tomato seeds"
|
||||
icon_state = "seed-tomato"
|
||||
mypath = "/obj/item/seeds/tomatoseed"
|
||||
species = "tomato"
|
||||
plantname = "tomato plant"
|
||||
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/tomato"
|
||||
lifespan = 25
|
||||
endurance = 15
|
||||
maturation = 6
|
||||
production = 6
|
||||
yield = 2
|
||||
|
||||
/obj/item/seeds/icepepperseed
|
||||
name = "ice pepper seeds"
|
||||
icon_state = "seed-icepepper"
|
||||
mypath = "/obj/item/seeds/icepepperseed"
|
||||
species = "chiliice"
|
||||
plantname = "ice pepper plant"
|
||||
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/icepepper"
|
||||
lifespan = 25
|
||||
endurance = 15
|
||||
maturation = 4
|
||||
production = 4
|
||||
yield = 4
|
||||
potency = 0
|
||||
|
||||
/obj/item/seeds/soyaseed
|
||||
name = "soybean seeds"
|
||||
icon_state = "seed-soybean"
|
||||
mypath = "/obj/item/seeds/soyaseed"
|
||||
species = "soybean"
|
||||
plantname = "soybean plant"
|
||||
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans"
|
||||
lifespan = 25
|
||||
endurance = 15
|
||||
maturation = 4
|
||||
production = 4
|
||||
yield = 3
|
||||
potency = 0
|
||||
|
||||
/obj/item/seeds/wheatseed
|
||||
name = "wheat seeds"
|
||||
icon_state = "seed-wheat"
|
||||
mypath = "/obj/item/seeds/wheatseed"
|
||||
species = "wheat"
|
||||
plantname = "wheat stalks"
|
||||
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/wheat"
|
||||
lifespan = 25
|
||||
endurance = 15
|
||||
maturation = 6
|
||||
production = 1
|
||||
yield = 4
|
||||
potency = 0
|
||||
oneharvest = 1
|
||||
+91
-40
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user