Merge pull request #448 from Tsuchigumo550/hydroponics_expansion

Hydroponics expansion
This commit is contained in:
Dahlular
2020-09-10 21:40:00 -06:00
committed by GitHub
6 changed files with 49 additions and 2 deletions
+26 -1
View File
@@ -15,7 +15,7 @@
icon_grow = "chili-grow" // Uses one growth icons set for all the subtypes
icon_dead = "chili-dead" // Same for the dead icon
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/chili/ice, /obj/item/seeds/chili/ghost)
mutatelist = list(/obj/item/seeds/chili/ice, /obj/item/seeds/chili/ghost, /obj/item/seeds/chili/pink)
reagents_add = list("capsaicin" = 0.25, "vitamin" = 0.04, "nutriment" = 0.04)
/obj/item/reagent_containers/food/snacks/grown/chili
@@ -80,6 +80,31 @@
foodtype = FRUIT
wine_power = 50
//Pink-peppers
/obj/item/seeds/chili/pink
name = "pack of pink pepper seeds"
desc = "These seeds grow into pink pepper plants."
icon_state = "seed-chilipink"
species = "chilipink"
plantname = "Pink Pepper Plants"
product = /obj/item/reagent_containers/food/snacks/grown/pink_chili
maturation = 6
production = 4
yield = 3
rarity = 20
mutatelist = list()
reagents_add = list("aphro" = 0.2, "penis_enlarger" = 0.08, "vitamin" = 0.04, "nutriment" = 0.04)
/obj/item/reagent_containers/food/snacks/grown/pink_chili
seed = /obj/item/seeds/chili/pink
name = "pink pepper"
desc = "It looks almost like a knotted phallus. Is it... throbbing?"
icon_state = "pinkchilipepper"
filling_color = "#FF1458"
bitesize_mod = 3
foodtype = FRUIT
wine_power = 40
/obj/item/reagent_containers/food/snacks/grown/ghost_chili/attack_hand(mob/user)
. = ..()
if(.)
+23 -1
View File
@@ -11,7 +11,7 @@
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
icon_dead = "watermelon-dead"
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/watermelon/holy)
mutatelist = list(/obj/item/seeds/watermelon/holy, /obj/item/seeds/watermelon/milk)
reagents_add = list("water" = 0.2, "vitamin" = 0.04, "nutriment" = 0.2)
/obj/item/seeds/watermelon/suicide_act(mob/user)
@@ -62,3 +62,25 @@
/obj/item/reagent_containers/food/snacks/grown/holymelon/Initialize()
. = ..()
AddComponent(/datum/component/anti_magic, TRUE, TRUE) //deliver us from evil o melon god
//Milkmelon
/obj/item/seeds/watermelon/milk
name = "pack of milkmelon seeds"
desc = "These seeds grow into Milkmelon plants."
icon_state = "seed-milkmelon"
species = "milkmelon"
plantname = "Milk Melon Vines"
product = /obj/item/reagent_containers/food/snacks/grown/milkmelon
mutatelist = list()
reagents_add = list("milk" = 0.2, "breast_enlarger" = 0.08, "vitamin" = 0.04, "nutriment" = 0.1)
rarity = 20
/obj/item/reagent_containers/food/snacks/grown/milkmelon
seed = /obj/item/seeds/watermelon/milk
name = "milkmelon"
desc = "A softer, rounder-looking watermelon that audibly sloshes with milk."
icon_state = "milkmelon"
filling_color = "#FFAABB"
dried_type = null
wine_power = 30
wine_flavor = "creamy"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 84 KiB

After

Width:  |  Height:  |  Size: 85 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB