diff --git a/code/modules/hydroponics/grown/melon.dm b/code/modules/hydroponics/grown/melon.dm index efdb9a7d4dde..52d0f30d8932 100644 --- a/code/modules/hydroponics/grown/melon.dm +++ b/code/modules/hydroponics/grown/melon.dm @@ -11,7 +11,7 @@ growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' icon_dead = "watermelon-dead" genes = list(/datum/plant_gene/trait/repeated_harvest) - possible_mutations = list(/datum/hydroponics/plant_mutation/melon_barrel, /datum/hydroponics/plant_mutation/holy_melon) + possible_mutations = list(/datum/hydroponics/plant_mutation/melon_barrel, /datum/hydroponics/plant_mutation/holy_melon, /datum/hydroponics/plant_mutation/honeydew) reagents_add = list(/datum/reagent/water = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.2) /obj/item/seeds/watermelon/suicide_act(mob/living/user) diff --git a/monkestation/code/game/objects/items/food/misc.dm b/monkestation/code/game/objects/items/food/misc.dm new file mode 100644 index 000000000000..ebffd34bc3a0 --- /dev/null +++ b/monkestation/code/game/objects/items/food/misc.dm @@ -0,0 +1,13 @@ +/obj/item/food/honeydewslice + name = "honeydew melon slice" + desc = "a sweet slice of honeydew" + icon = 'monkestation/icons/obj/food/misc.dmi' + icon_state = "honeydewslice" + food_reagents = list( + /datum/reagent/consumable/nutriment/vitamin = 0.25, + /datum/reagent/consumable/nutriment = 0.75 + ) + tastes = list("watery honey" = 1) + foodtypes = FRUIT + food_flags = FOOD_FINGER_FOOD + w_class = WEIGHT_CLASS_SMALL diff --git a/monkestation/code/modules/hydroponics/grown/honeydew.dm b/monkestation/code/modules/hydroponics/grown/honeydew.dm new file mode 100644 index 000000000000..020da4bbd2af --- /dev/null +++ b/monkestation/code/modules/hydroponics/grown/honeydew.dm @@ -0,0 +1,28 @@ +/obj/item/seeds/watermelon/honeydew + name = "pack of honeydew melon seeds" + desc = "These seeds grow into sweet honeydew melon plants." + icon = 'monkestation/icons/obj/hydroponics/fruit.dmi' + icon_state = "honeydew-seed" + icon_dead = "honeydew-dead" + species = "honeydew" + plantname = "Honeydew Melon Vines" + product = /obj/item/food/grown/honeydew + lifespan = 60 + endurance = 40 + growing_icon = 'monkestation/icons/obj/hydroponics/growing.dmi' + genes = list(/datum/plant_gene/trait/repeated_harvest) + reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.1, /datum/reagent/consumable/nutriment = 0.15) + rarity = 20 + graft_gene = /datum/plant_gene/trait/repeated_harvest + +/obj/item/food/grown/honeydew + seed = /obj/item/seeds/watermelon/honeydew + name = "honeydew melon" + desc = "A sweet melon variant that, bizarrely, distills into honey." + icon = 'monkestation/icons/obj/hydroponics/harvest.dmi' + icon_state = "honeydew" + foodtypes = FRUIT + distill_reagent = /datum/reagent/consumable/honey + +/obj/item/food/grown/honeydew/make_processable() + AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/honeydewslice, 6, 20, screentip_verb = "Slice") diff --git a/monkestation/code/modules/hydroponics/mutations/base.dm b/monkestation/code/modules/hydroponics/mutations/base.dm index 85f4aed01fb1..4d01ae6db6b1 100644 --- a/monkestation/code/modules/hydroponics/mutations/base.dm +++ b/monkestation/code/modules/hydroponics/mutations/base.dm @@ -418,3 +418,10 @@ required_endurance = list(60, 70) required_yield = list(5, 10) required_lifespan = list(-INFINITY, 20) + +/datum/hydroponics/plant_mutation/honeydew + mutates_from = list(/obj/item/seeds/watermelon) + created_product = /obj/item/food/grown/honeydew + created_seed = /obj/item/seeds/watermelon/honeydew + required_yield = list(20, INFINITY) + required_lifespan = list(60, INFINITY) diff --git a/monkestation/icons/obj/food/misc.dmi b/monkestation/icons/obj/food/misc.dmi new file mode 100644 index 000000000000..0dd7cf2936dc Binary files /dev/null and b/monkestation/icons/obj/food/misc.dmi differ diff --git a/monkestation/icons/obj/hydroponics/fruit.dmi b/monkestation/icons/obj/hydroponics/fruit.dmi index 05967937abed..69ec16c9a999 100644 Binary files a/monkestation/icons/obj/hydroponics/fruit.dmi and b/monkestation/icons/obj/hydroponics/fruit.dmi differ diff --git a/monkestation/icons/obj/hydroponics/growing.dmi b/monkestation/icons/obj/hydroponics/growing.dmi index b5671e37f2dd..4bec447cf04d 100644 Binary files a/monkestation/icons/obj/hydroponics/growing.dmi and b/monkestation/icons/obj/hydroponics/growing.dmi differ diff --git a/monkestation/icons/obj/hydroponics/harvest.dmi b/monkestation/icons/obj/hydroponics/harvest.dmi index 776803f82b3c..7ec45274b7e7 100644 Binary files a/monkestation/icons/obj/hydroponics/harvest.dmi and b/monkestation/icons/obj/hydroponics/harvest.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 9808b909b6b2..bbf1d0921591 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5764,6 +5764,7 @@ #include "monkestation\code\game\objects\items\effects\nugget.dm" #include "monkestation\code\game\objects\items\effects\washing_machine.dm" #include "monkestation\code\game\objects\items\food\corndog.dm" +#include "monkestation\code\game\objects\items\food\misc.dm" #include "monkestation\code\game\objects\items\food\spaghetti.dm" #include "monkestation\code\game\objects\items\grenades\monkey_barrel.dm" #include "monkestation\code\game\objects\items\guns\crank_guns.dm" @@ -6250,6 +6251,7 @@ #include "monkestation\code\modules\hydroponics\plant_genes.dm" #include "monkestation\code\modules\hydroponics\seeds.dm" #include "monkestation\code\modules\hydroponics\grown\coconut.dm" +#include "monkestation\code\modules\hydroponics\grown\honeydew.dm" #include "monkestation\code\modules\hydroponics\machines\composter.dm" #include "monkestation\code\modules\hydroponics\machines\splicer.dm" #include "monkestation\code\modules\hydroponics\mutations\_mutations.dm"