Skip to content
This repository has been archived by the owner on Oct 15, 2023. It is now read-only.

Commit

Permalink
Hydroponics Update: Growable Ash Flora
Browse files Browse the repository at this point in the history
  • Loading branch information
@Fox-McCloud
Fox-McCloud committed Sep 11, 2019
1 parent a502733 commit 5e4521b
Show file tree
Hide file tree
Showing 35 changed files with 302 additions and 152 deletions.
61 changes: 51 additions & 10 deletions code/game/machinery/vending.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1275,16 +1275,57 @@
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_ads = "We like plants!;Grow some crops!;Grow, baby, growww!;Aw h'yeah son!"
icon_state = "seeds"
products = list(/obj/item/seeds/aloe =3, /obj/item/seeds/ambrosia = 3, /obj/item/seeds/apple = 3, /obj/item/seeds/cotton = 3, /obj/item/seeds/banana = 3, /obj/item/seeds/berry = 3,
/obj/item/seeds/cabbage = 3, /obj/item/seeds/carrot = 3, /obj/item/seeds/cherry = 3, /obj/item/seeds/chanter = 3,
/obj/item/seeds/chili = 3, /obj/item/seeds/cocoapod = 3, /obj/item/seeds/coffee = 3, /obj/item/seeds/comfrey =3, /obj/item/seeds/corn = 3,
/obj/item/seeds/nymph =3, /obj/item/seeds/eggplant = 3, /obj/item/seeds/grape = 3, /obj/item/seeds/grass = 3, /obj/item/seeds/lemon = 3,
/obj/item/seeds/lime = 3, /obj/item/seeds/onion = 3, /obj/item/seeds/orange = 3, /obj/item/seeds/peanuts = 3, /obj/item/seeds/pineapple = 3, /obj/item/seeds/potato = 3, /obj/item/seeds/poppy = 3,
/obj/item/seeds/pumpkin = 3, /obj/item/seeds/replicapod = 3, /obj/item/seeds/wheat/rice = 3, /obj/item/seeds/soya = 3, /obj/item/seeds/sunflower = 3, /obj/item/seeds/sugarcane = 3,
/obj/item/seeds/tea = 3, /obj/item/seeds/tobacco = 3, /obj/item/seeds/tomato = 3,
/obj/item/seeds/tower = 3, /obj/item/seeds/watermelon = 3, /obj/item/seeds/wheat = 3, /obj/item/seeds/whitebeet = 3)
contraband = list(/obj/item/seeds/amanita = 2, /obj/item/seeds/glowshroom = 2, /obj/item/seeds/liberty = 2, /obj/item/seeds/nettle = 2,
/obj/item/seeds/plump = 2, /obj/item/seeds/reishi = 2, /obj/item/seeds/cannabis = 3, /obj/item/seeds/starthistle = 2, /obj/item/seeds/fungus = 3, /obj/item/seeds/random = 2)
products = list(/obj/item/seeds/aloe =3,
/obj/item/seeds/ambrosia = 3,
/obj/item/seeds/apple = 3,
/obj/item/seeds/cotton = 3,
/obj/item/seeds/banana = 3,
/obj/item/seeds/berry = 3,
/obj/item/seeds/cabbage = 3,
/obj/item/seeds/carrot = 3,
/obj/item/seeds/cherry = 3,
/obj/item/seeds/chanter = 3,
/obj/item/seeds/chili = 3,
/obj/item/seeds/cocoapod = 3,
/obj/item/seeds/coffee = 3,
/obj/item/seeds/comfrey =3,
/obj/item/seeds/corn = 3,
/obj/item/seeds/nymph =3,
/obj/item/seeds/eggplant = 3,
/obj/item/seeds/garlic = 3,
/obj/item/seeds/grape = 3,
/obj/item/seeds/grass = 3,
/obj/item/seeds/lemon = 3,
/obj/item/seeds/lime = 3,
/obj/item/seeds/onion = 3,
/obj/item/seeds/orange = 3,
/obj/item/seeds/peanuts = 3,
/obj/item/seeds/pineapple = 3,
/obj/item/seeds/potato = 3,
/obj/item/seeds/poppy = 3,
/obj/item/seeds/pumpkin = 3,
/obj/item/seeds/replicapod = 3,
/obj/item/seeds/wheat/rice = 3,
/obj/item/seeds/soya = 3,
/obj/item/seeds/sunflower = 3,
/obj/item/seeds/sugarcane = 3,
/obj/item/seeds/tea = 3,
/obj/item/seeds/tobacco = 3,
/obj/item/seeds/tomato = 3,
/obj/item/seeds/tower = 3,
/obj/item/seeds/watermelon = 3,
/obj/item/seeds/wheat = 3,
/obj/item/seeds/whitebeet = 3)
contraband = list(/obj/item/seeds/amanita = 2,
/obj/item/seeds/glowshroom = 2,
/obj/item/seeds/liberty = 2,
/obj/item/seeds/nettle = 2,
/obj/item/seeds/plump = 2,
/obj/item/seeds/reishi = 2,
/obj/item/seeds/cannabis = 3,
/obj/item/seeds/starthistle = 2,
/obj/item/seeds/fungus = 3,
/obj/item/seeds/random = 2)
premium = list(/obj/item/reagent_containers/spray/waterflower = 1)
refill_canister = /obj/item/vending_refill/hydroseeds

Expand Down
8 changes: 0 additions & 8 deletions code/modules/food_and_drinks/drinks/drinks.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,14 +334,6 @@
icon_state = "britcup"
volume = 30

/obj/item/reagent_containers/food/drinks/mushroom_bowl
name = "mushroom bowl"
desc = "A bowl made out of mushrooms. Not food, though it might have contained some at some point."
icon = 'icons/obj/lavaland/ash_flora.dmi'
icon_state = "mushroom_bowl"
w_class = WEIGHT_CLASS_SMALL


/obj/item/reagent_containers/food/drinks/bag
name = "drink bag"
desc = "Normally put in wine boxes, or down pants at stadium events."
Expand Down
2 changes: 1 addition & 1 deletion code/modules/food_and_drinks/recipes/recipes_microwave.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@

/datum/recipe/microwave/nettlesoup
reagents = list("water" = 10)
items = list(/obj/item/reagent_containers/food/snacks/egg, /obj/item/grown/nettle/basic, /obj/item/reagent_containers/food/snacks/grown/potato)
items = list(/obj/item/reagent_containers/food/snacks/egg, /obj/item/reagent_containers/food/snacks/grown/nettle/basic, /obj/item/reagent_containers/food/snacks/grown/potato)
result = /obj/item/reagent_containers/food/snacks/nettlesoup

/datum/recipe/microwave/wishsoup
Expand Down
1 change: 1 addition & 0 deletions code/modules/hydroponics/gene_modder.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,7 @@
seed.genes += disk.gene.Copy()
if(istype(disk.gene, /datum/plant_gene/reagent))
seed.reagents_from_genes()
disk.gene.apply_vars(seed)
repaint_seed()

update_genes()
Expand Down
4 changes: 2 additions & 2 deletions code/modules/hydroponics/grown/beans.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
icon_dead = "soybean-dead"
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/soya/koi)
reagents_add = list("soybeanoil" = 0.2, "vitamin" = 0.04, "plantmatter" = 0.05)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.05, "soybeanoil" = 0.03)

/obj/item/reagent_containers/food/snacks/grown/soybeans
seed = /obj/item/seeds/soya
Expand All @@ -25,7 +25,7 @@
icon_state = "soybeans"
filling_color = "#F0E68C"
bitesize_mod = 2
tastes = list("soybean" = 1)
tastes = list("soy" = 1)
wine_power = 0.2

// Koibean
Expand Down
10 changes: 5 additions & 5 deletions code/modules/hydroponics/grown/berries.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
desc = "Taste so good, you could die!"
icon_state = "poisonberrypile"
filling_color = "#C71585"
distill_reagent = null
tastes = list("poison-berry" = 1)
distill_reagent = null
wine_power = 0.35

// Death Berries
Expand All @@ -70,8 +70,8 @@
desc = "Taste so good, you could die!"
icon_state = "deathberrypile"
filling_color = "#708090"
distill_reagent = null
tastes = list("death-berry" = 1)
distill_reagent = null
wine_power = 0.5

// Glow Berries
Expand Down Expand Up @@ -130,8 +130,8 @@
gender = PLURAL
filling_color = "#FF0000"
bitesize_mod = 2
wine_power = 0.3
tastes = list("cherry" = 1)
wine_power = 0.3

// Blue Cherries
/obj/item/seeds/cherry/blue
Expand All @@ -152,8 +152,8 @@
icon_state = "bluecherry"
filling_color = "#6495ED"
bitesize_mod = 2
wine_power = 0.5
tastes = list("blue cherry" = 1)
wine_power = 0.5

// Grapes
/obj/item/seeds/grape
Expand Down Expand Up @@ -184,8 +184,8 @@
dried_type = /obj/item/reagent_containers/food/snacks/no_raisin
filling_color = "#FF1493"
bitesize_mod = 2
distill_reagent = "wine"
tastes = list("grapes" = 1)
distill_reagent = "wine"

// Green Grapes
/obj/item/seeds/grape/green
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/chili.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
filling_color = "#0000CD"
bitesize_mod = 2
origin_tech = "biotech=4"
tastes = list("chilli" = 1)
tastes = list("chilly" = 1)
wine_power = 0.3

// Ghost Chili
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/citrus.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
icon_state = "lime"
filling_color = "#00FF00"
tastes = list("lime" = 1)
distill_reagent = "triple_sec"

// Orange
/obj/item/seeds/orange
Expand Down Expand Up @@ -59,6 +58,7 @@
icon_state = "orange"
tastes = list("orange" = 1)
filling_color = "#FFA500"
distill_reagent = "triple_sec"

// Lemon
/obj/item/seeds/lemon
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/corn.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
/obj/item/grown/snapcorn
seed = /obj/item/seeds/corn/snapcorn
name = "snap corn"
desc = "A cob with snap pops"
desc = "A cob with snap pops."
icon_state = "snapcorn"
item_state = "corncob"
w_class = WEIGHT_CLASS_TINY
Expand Down
2 changes: 2 additions & 0 deletions code/modules/hydroponics/grown/eggplant.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@

// Egg-Plant
/obj/item/seeds/eggplant/eggy
name = "pack of egg-plant seeds"
desc = "These seeds grow to produce berries that look a lot like eggs."
icon_state = "seed-eggy"
species = "eggy"
plantname = "Egg-Plants"
product = /obj/item/reagent_containers/food/snacks/grown/shell/eggy
lifespan = 75
production = 12
Expand Down
6 changes: 5 additions & 1 deletion code/modules/hydroponics/grown/flowers.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@
icon_state = "seed-moonflower"
species = "moonflower"
plantname = "Moonflowers"
icon_grow = "moonflower-grow"
icon_dead = "sunflower-dead"
product = /obj/item/reagent_containers/food/snacks/grown/moonflower
mutatelist = list()
reagents_add = list("moonshine" = 0.2, "vitamin" = 0.02, "plantmatter" = 0.02)
Expand All @@ -152,7 +154,7 @@
filling_color = "#E6E6FA"
bitesize_mod = 2
tastes = list("moonflower" = 1)
distill_reagent = "absinthe"
distill_reagent = "absinthe" //It's made from flowers.

// Novaflower
/obj/item/seeds/sunflower/novaflower
Expand All @@ -161,6 +163,8 @@
icon_state = "seed-novaflower"
species = "novaflower"
plantname = "Novaflowers"
icon_grow = "novaflower-grow"
icon_dead = "sunflower-dead"
product = /obj/item/grown/novaflower
mutatelist = list()
reagents_add = list("condensedcapsaicin" = 0.25, "capsaicin" = 0.3, "plantmatter" = 0)
Expand Down
22 changes: 22 additions & 0 deletions code/modules/hydroponics/grown/garlic.dm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/obj/item/seeds/garlic
name = "pack of garlic seeds"
desc = "A packet of extremely pungent seeds."
icon_state = "seed-garlic"
species = "garlic"
plantname = "Garlic Sprouts"
product = /obj/item/reagent_containers/food/snacks/grown/garlic
yield = 6
potency = 25
growthstages = 3
growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
reagents_add = list("garlic" = 0.15, "plantmatter" = 0.1)

/obj/item/reagent_containers/food/snacks/grown/garlic
seed = /obj/item/seeds/garlic
name = "garlic"
desc = "Delicious, but with a potentially overwhelming odor."
icon_state = "garlic"
filling_color = "#C0C9A0"
bitesize_mod = 2
tastes = list("garlic" = 1)
wine_power = 0.1
11 changes: 1 addition & 10 deletions code/modules/hydroponics/grown/grass_carpet.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,8 @@
continue
grassAmt += 1 + round(G.seed.potency * tile_coefficient)
qdel(G)
var/obj/item/stack/tile/GT = new stacktype(user.loc)
while(grassAmt > GT.max_amount)
GT.amount = GT.max_amount
grassAmt -= GT.max_amount
GT = new stacktype(user.loc)
GT.amount = grassAmt
for(var/obj/item/stack/tile/T in user.loc)
if((T.type == stacktype) && (T.amount < T.max_amount) && (T != GT))
T.attackby(GT, user)
new stacktype(user.drop_location(), grassAmt)
qdel(src)
return

// Carpet
/obj/item/seeds/grass/carpet
Expand Down
7 changes: 7 additions & 0 deletions code/modules/hydroponics/grown/melon.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@
mutatelist = list(/obj/item/seeds/watermelon/holy)
reagents_add = list("water" = 0.2, "vitamin" = 0.04, "plantmatter" = 0.2)

/obj/item/seeds/watermelon/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is swallowing [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
user.gib()
new product(drop_location())
qdel(src)
return OBLITERATION

/obj/item/reagent_containers/food/snacks/grown/watermelon
seed = /obj/item/seeds/watermelon
name = "watermelon"
Expand Down
6 changes: 3 additions & 3 deletions code/modules/hydroponics/grown/misc.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@
growthstages = 3
growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
genes = list(/datum/plant_gene/trait/plant_type/weed_hardy)
mutatelist = list(/obj/item/seeds/harebell)

/obj/item/seeds/starthistle/harvest(mob/user)
var/obj/machinery/hydroponics/parent = loc
var/seed_count = yield
if(prob(getYield() * 20))
seed_count++
var/output_loc = parent.Adjacent(user) ? user.loc : parent.loc
for(var/i in 1 to yield+1)
for(var/i in 1 to seed_count)
var/obj/item/seeds/starthistle/harvestseeds = Copy()
harvestseeds.forceMove(output_loc)

parent.update_tray()


// Cabbage
/obj/item/seeds/cabbage
name = "pack of cabbage seeds"
Expand Down
5 changes: 2 additions & 3 deletions code/modules/hydroponics/grown/mushrooms.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
can_distill = FALSE

/obj/item/reagent_containers/food/snacks/grown/mushroom/walkingmushroom/attack_self(mob/user)
if(istype(user.loc, /turf/space))
if(isspaceturf(user.loc))
return
var/mob/living/simple_animal/hostile/mushroom/M = new /mob/living/simple_animal/hostile/mushroom(user.loc)
M.maxHealth += round(seed.endurance / 4)
Expand Down Expand Up @@ -277,8 +277,7 @@
desc = "This mycelium -powers- into mushrooms!"
icon_state = "mycelium-glowcap"
species = "glowcap"
icon_grow = "glowshroom-grow"
icon_dead = "glowshroom-dead"
icon_harvest = "glowcap-harvest"
plantname = "Glowcaps"
product = /obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/glowcap
genes = list(/datum/plant_gene/trait/glow/red, /datum/plant_gene/trait/cell_charge, /datum/plant_gene/trait/plant_type/fungal_metabolism)
Expand Down
Loading

0 comments on commit 5e4521b

Please sign in to comment.