diff --git a/code/game/turfs/open/floor/plating/asteroid.dm b/code/game/turfs/open/floor/plating/asteroid.dm index efc12cf6bd6..e27d9488fcb 100644 --- a/code/game/turfs/open/floor/plating/asteroid.dm +++ b/code/game/turfs/open/floor/plating/asteroid.dm @@ -216,7 +216,7 @@ GLOBAL_LIST_INIT(megafauna_spawn_list, list(/mob/living/simple_animal/hostile/me /mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow = 50, /mob/living/simple_animal/hostile/asteroid/goldgrub = 10, \ /mob/living/simple_animal/hostile/asteroid/lobstrosity = 15) - flora_spawn_list = list(/obj/structure/flora/tree/pine = 2, /obj/structure/flora/rock/icy = 2, /obj/structure/flora/rock/pile/icy = 2, /obj/structure/flora/grass/both = 12) + flora_spawn_list = list(/obj/structure/flora/tree/pine = 2, /obj/structure/flora/rock/icy = 2, /obj/structure/flora/rock/pile/icy = 2, /obj/structure/flora/grass/both = 6, /obj/structure/flora/ash/chilly = 2) terrain_spawn_list = list() data_having_type = /turf/open/floor/plating/asteroid/airless/cave/snow/has_data turf_type = /turf/open/floor/plating/asteroid/snow/icemoon @@ -227,7 +227,7 @@ GLOBAL_LIST_INIT(megafauna_spawn_list, list(/mob/living/simple_animal/hostile/me mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/ice_demon = 50, /obj/structure/spawner/ice_moon/demonic_portal = 3, \ /mob/living/simple_animal/hostile/asteroid/ice_whelp = 30, /obj/structure/spawner/ice_moon/demonic_portal/ice_whelp = 3, \ /mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow = 50, /obj/structure/spawner/ice_moon/demonic_portal/snowlegion = 3) - flora_spawn_list = list(/obj/structure/flora/rock/icy = 6, /obj/structure/flora/rock/pile/icy = 6) + flora_spawn_list = list(/obj/structure/flora/rock/icy = 6, /obj/structure/flora/rock/pile/icy = 6, /obj/structure/flora/ash/chilly = 1) data_having_type = /turf/open/floor/plating/asteroid/airless/cave/snow/underground/has_data choose_turf_type = null pick_tunnel_width = list("1" = 1, "2" = 2, "3" = 1) diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index 4de3dec7bbd..b68ff57a418 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -22,10 +22,11 @@ var/base_icon var/regrowth_time_low = 8 MINUTES var/regrowth_time_high = 16 MINUTES + var/number_of_variants = 4 /obj/structure/flora/ash/Initialize() . = ..() - base_icon = "[icon_state][rand(1, 4)]" + base_icon = "[icon_state][rand(1, number_of_variants)]" icon_state = base_icon /obj/structure/flora/ash/proc/harvest(user) @@ -146,6 +147,24 @@ // min dmg 3, max dmg 6, prob(70) AddComponent(/datum/component/caltrop, 3, 6, 70) +///Snow flora to exist on icebox. +/obj/structure/flora/ash/chilly + icon_state = "chilly_pepper" + name = "springy grassy fruit" + desc = "A number of bright, springy blue fruiting plants. They seem to be unconcerned with the hardy, cold environment." + harvested_name = "springy grass" + harvested_desc = "A bunch of springy, bouncy fruiting grass, all picked. Or maybe they were never fruiting at all?" + harvest = /obj/item/reagent_containers/food/snacks/grown/icepepper + needs_sharp_harvest = FALSE + harvest_amount_high = 3 + harvest_time = 15 + harvest_message_low = "You pluck a single, curved fruit." + harvest_message_med = "You pluck a number of curved fruit." + harvest_message_high = "You pluck quite a lot of curved fruit." + regrowth_time_low = 2400 + regrowth_time_high = 5500 + number_of_variants = 2 + //SNACKS /obj/item/reagent_containers/food/snacks/grown/ash_flora diff --git a/icons/obj/lavaland/ash_flora.dmi b/icons/obj/lavaland/ash_flora.dmi index c8c128a0ab5..1932e43c153 100644 Binary files a/icons/obj/lavaland/ash_flora.dmi and b/icons/obj/lavaland/ash_flora.dmi differ