diff --git a/code/datums/mapgen/Cavegens/LavalandGenerator.dm b/code/datums/mapgen/Cavegens/LavalandGenerator.dm index 7dc9f2b498a..07e8b4c3898 100644 --- a/code/datums/mapgen/Cavegens/LavalandGenerator.dm +++ b/code/datums/mapgen/Cavegens/LavalandGenerator.dm @@ -2,7 +2,6 @@ weighted_open_turf_types = list(/turf/open/misc/asteroid/basalt/lava_land_surface = 1) weighted_closed_turf_types = list(/turf/closed/mineral/random/volcanic = 1) - weighted_mob_spawn_list = list( /mob/living/simple_animal/hostile/asteroid/goliath/beast/random = 50, /obj/structure/spawner/lavaland/goliath = 3, @@ -16,9 +15,25 @@ /mob/living/simple_animal/hostile/asteroid/brimdemon = 20, /mob/living/basic/mining/bileworm = 20, ) - weighted_flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2, /obj/structure/flora/ash/seraka = 2) + + weighted_flora_spawn_list = list( + /obj/structure/flora/ash/leaf_shroom = 2, + /obj/structure/flora/ash/cap_shroom = 2, + /obj/structure/flora/ash/stem_shroom = 2, + /obj/structure/flora/ash/cacti = 1, + /obj/structure/flora/ash/tall_shroom = 2, + /obj/structure/flora/ash/seraka = 2, + /obj/structure/flora/ash/fireblossom = 2, + ) + ///Note that this spawn list is also in the icemoon generator - weighted_feature_spawn_list = list(/obj/structure/geyser/wittel = 6, /obj/structure/geyser/random = 2, /obj/structure/geyser/plasma_oxide = 10, /obj/structure/geyser/protozine = 10, /obj/structure/geyser/hollowwater = 10) + weighted_feature_spawn_list = list( + /obj/structure/geyser/wittel = 6, + /obj/structure/geyser/random = 2, + /obj/structure/geyser/plasma_oxide = 10, + /obj/structure/geyser/protozine = 10, + /obj/structure/geyser/hollowwater = 10, + ) initial_closed_chance = 45 smoothing_iterations = 50 diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index b5c541f90fe..4ed23e6cee5 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -123,6 +123,21 @@ number_of_variants = 2 harvest_message_true_thresholds = FALSE +/obj/structure/flora/ash/fireblossom + name = "fire blossom" + desc = "An odd flower that grows commonly near bodies of lava." + icon_state = "fireblossom" + product_types = list(/obj/item/food/grown/ash_flora/fireblossom = 1) + harvested_name = "fire blossom stems" + harvested_desc = "A few fire blossom stems, missing their flowers." + harvest_amount_high = 3 + harvest_message_low = "You pluck a single, suitable flower." + harvest_message_med = "You pluck a number of flowers, leaving a few unsuitable ones." + harvest_message_high = "You pluck quite a lot of suitable flowers." + regrowth_time_low = 2500 + regrowth_time_high = 4000 + number_of_variants = 2 + ///Snow flora to exist on icebox. /obj/structure/flora/ash/chilly name = "springy grassy fruit" @@ -211,6 +226,14 @@ seed = /obj/item/seeds/lavaland/seraka wine_power = 40 +/obj/item/food/grown/ash_flora/fireblossom + name = "fire blossom" + desc = "A flower from a fire blossom." + icon_state = "fireblossom" + slot_flags = ITEM_SLOT_HEAD + seed = /obj/item/seeds/lavaland/fireblossom + wine_power = 40 + //SEEDS /obj/item/seeds/lavaland @@ -293,7 +316,6 @@ growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi' reagents_add = list(/datum/reagent/consumable/nutriment = 0.06, /datum/reagent/consumable/vitfro = 0.04, /datum/reagent/drug/nicotine = 0.04) - /obj/item/seeds/lavaland/inocybe name = "pack of inocybe mycelium" desc = "This mycelium grows into an inocybe mushroom, a species of Lavaland origin with hallucinatory and toxic effects." @@ -327,6 +349,18 @@ growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi' reagents_add = list(/datum/reagent/toxin/mushroom_powder = 0.1, /datum/reagent/medicine/coagulant/seraka_extract = 0.02) +/obj/item/seeds/lavaland/fireblossom + name = "pack of fire blossom seeds" + desc = "These seeds grow into fire blossoms." + plantname = "Fire Blossom" + icon_state = "seed-fireblossom" + species = "fireblossom" + growthstages = 3 + product = /obj/item/food/grown/ash_flora/fireblossom + genes = list(/datum/plant_gene/trait/fire_resistance, /datum/plant_gene/trait/glow/yellow) + growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi' + reagents_add = list(/datum/reagent/consumable/tinlux = 0.04, /datum/reagent/consumable/nutriment = 0.03, /datum/reagent/carbon = 0.05) + //CRAFTING /datum/crafting_recipe/mushroom_bowl @@ -335,6 +369,7 @@ reqs = list(/obj/item/food/grown/ash_flora/shavings = 5) time = 30 category = CAT_PRIMAL + /obj/item/reagent_containers/cup/bowl/mushroom_bowl name = "mushroom bowl" desc = "A bowl made out of mushrooms. Not food, though it might have contained some at some point." diff --git a/icons/mob/clothing/head/hydroponics.dmi b/icons/mob/clothing/head/hydroponics.dmi index 0fd8f6b2746..e592ad444be 100644 Binary files a/icons/mob/clothing/head/hydroponics.dmi and b/icons/mob/clothing/head/hydroponics.dmi differ diff --git a/icons/obj/hydroponics/growing_flowers.dmi b/icons/obj/hydroponics/growing_flowers.dmi index d0126a54f58..f490c9e9092 100644 Binary files a/icons/obj/hydroponics/growing_flowers.dmi and b/icons/obj/hydroponics/growing_flowers.dmi differ diff --git a/icons/obj/hydroponics/seeds.dmi b/icons/obj/hydroponics/seeds.dmi index b59478ebdef..c5c50a726e2 100644 Binary files a/icons/obj/hydroponics/seeds.dmi and b/icons/obj/hydroponics/seeds.dmi differ diff --git a/icons/obj/lavaland/ash_flora.dmi b/icons/obj/lavaland/ash_flora.dmi index fcc93f9aeb7..8e7bbe5df29 100644 Binary files a/icons/obj/lavaland/ash_flora.dmi and b/icons/obj/lavaland/ash_flora.dmi differ