Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

code/game/objects/structures/flora/flora.dm

@@ -235,7 +235,7 @@
 /obj/structure/flora/pottedplant/attackby(obj/item/I, mob/user)
 	if(issilicon(user))
 		return // Don't try to put modules in here, you're a borg. TODO: Inventory refactor to not be ass.
-	
+
 	if(stored_item)
 		to_chat(user, "<span class='notice'>[I] won't fit in. There already appears to be something in here...</span>")
 		return
@@ -494,3 +494,47 @@
 
 /obj/structure/flora/sif/tendrils/get_harvestable_desc()
 	return "<span class='notice'>\The [src] seems to be growing over something.</span>"
+
+/datum/category_item/catalogue/flora/frostbelle
+	name = "Sivian Flora - Frostbelle"
+	desc = "A rare plant native to Sif, with very peculiar growing requirements. Rarely seen outside of their original habitat,\
+	or the homes of the wealthy, the plant's unique vein structure is actually used to carry the plant's reproductive material \
+	to forming buds, the petals of which secrete the luminescent sap containing the pollen at the time of blooming. Certain \
+	horticulturists have found ways of halting this process prior to the secretion of the sap, leaving the flower's petals \
+	bright, at the cost of making that bud sterile."
+	value = CATALOGUER_REWARD_HARD
+
+/obj/structure/flora/sif/frostbelle
+	name = "gnarly shrub"
+	desc = "A stocky plant with fins bearing luminescent veins along its branches."
+	icon_state = "grass"
+	randomize_size = TRUE
+	catalogue_data = list(/datum/category_item/catalogue/flora/frostbelle)
+
+	harvest_tool = /obj/item/weapon/material/knife
+	max_harvests = 2
+	min_harvests = -4
+	harvest_loot = list(
+		/obj/item/weapon/reagent_containers/food/snacks/frostbelle = 1
+		)
+
+	var/variantnum = null
+
+/obj/structure/flora/sif/frostbelle/Initialize()
+	. = ..()
+
+	variantnum = rand(1,3)
+
+	update_icon()
+
+/obj/structure/flora/sif/frostbelle/update_icon()
+	..()
+
+	if(max_harvests > 0 && harvest_count < max_harvests)
+		icon_state = "[initial(icon_state)][variantnum]"
+
+	else
+		icon_state = initial(icon_state)
+
+/obj/structure/flora/sif/frostbelle/get_harvestable_desc()
+	return "<span class='notice'>\The [src] seems to be budding.</span>"

code/game/objects/structures/flora/flora_vr.dm

@@ -36,3 +36,66 @@
 /obj/structure/flora/pumpkin/carved/owo
 	desc = "A fat, freshly picked pumpkin. This one has a face carved into it! This one has large, round eyes and a squiggly, cat-like smiling mouth. Its pleasantly surprised expression seems to suggest that the pumpkin has noticed something about you."
 	icon_state = "decor-jackolantern-owo"
+
+// Various decorá 
+/obj/structure/flora/log1
+	name = "waterlogged trunk"
+	icon = 'icons/obj/flora/amayastuff.dmi'
+	desc = "A part of a felled tree. Moss is growing across it."
+	icon_state = "log1"
+	
+/obj/structure/flora/log2
+	name = "driftwood"
+	icon = 'icons/obj/flora/amayastuff.dmi'
+	desc = "Driftwood carelessly lost in the water."
+	icon_state = "log2"
+
+/obj/structure/flora/lily1
+	name = "red flowered lilypads"
+	icon = 'icons/obj/flora/amayastuff.dmi'
+	desc = "A bunch of lilypads. A beautiful red flower grows in the middle of them."
+	icon_state = "lilypad1"
+	
+/obj/structure/flora/lily2
+	name = "yellow flowered lilypads"
+	icon = 'icons/obj/flora/amayastuff.dmi'
+	desc = "A few lilypads. A sunny yellow flower stems from the water and from between the lilypads."
+	icon_state = "lilypad2"
+	
+/obj/structure/flora/lily3
+	name = "lilypads"
+	icon = 'icons/obj/flora/amayastuff.dmi'
+	desc = "A group of flowerless lilypads."
+	icon_state = "lilypad3"
+
+/obj/structure/flora/smallbould
+	name = "small boulder"
+	icon = 'icons/obj/flora/amayastuff.dmi'
+	desc = "A small boulder, with its top smothered with moss."
+	icon_state = "smallerboulder"
+	
+/obj/structure/flora/bboulder1
+	name = "large boulder"
+	icon = 'icons/obj/flora/amayastuff.dmi'
+	desc = "Small stones sit beside this large boulder. Moss grows on the top of each of them."
+	icon_state = "bigboulder1"
+	density = 1
+	
+/obj/structure/flora/bboulder2
+	name = "jagged large boulder"
+	icon = 'icons/obj/flora/amayastuff.dmi'
+	desc = "This boulder has had plates broken off it. Moss grows in the cracks and across the top."
+	icon_state = "bigboulder2"
+	density = 1
+	
+/obj/structure/flora/rocks1
+	name = "rocks"
+	icon = 'icons/obj/flora/amayastuff.dmi'
+	desc = "A bunch of mossy rocks."
+	icon_state = "rocks1"
+	
+/obj/structure/flora/rocks2
+	name = "rocks"
+	icon = 'icons/obj/flora/amayastuff.dmi'
+	desc = "A bunch of mossy rocks."
+	icon_state = "rocks2"