Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Honeydew, I'm home! #1565

Merged
merged 6 commits into from
Apr 7, 2024
Merged

Honeydew, I'm home! #1565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
435328b
initial meloning
SeeBeeSee Apr 3, 2024
35fb1a7
growth sprites
SeeBeeSee Apr 3, 2024
3b5bddb
harvest sprite
SeeBeeSee Apr 3, 2024
d48407f
mutation datum and seed sprite
SeeBeeSee Apr 3, 2024
7bf79f4
some minor fixes
SeeBeeSee Apr 3, 2024
53561e6
sliceable honeydews
SeeBeeSee Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/melon.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
13 changes: 13 additions & 0 deletions monkestation/code/game/objects/items/food/misc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
28 changes: 28 additions & 0 deletions monkestation/code/modules/hydroponics/grown/honeydew.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
7 changes: 7 additions & 0 deletions monkestation/code/modules/hydroponics/mutations/base.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Binary file added monkestation/icons/obj/food/misc.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/icons/obj/hydroponics/fruit.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/icons/obj/hydroponics/growing.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/icons/obj/hydroponics/harvest.dmi
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions tgstation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
Loading