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

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

@@ -313,6 +313,7 @@
 	light_range = 2
 	light_power = 0.6
 	light_color = "#33CCFF"
+	light_on = TRUE
 	catalogue_data = list(/datum/category_item/catalogue/flora/sif_tree)
 
 /obj/structure/flora/pottedplant/orientaltree
@@ -372,6 +373,7 @@
 	light_range = 2
 	light_power = 0.6
 	light_color = "#FF6633"
+	light_on = TRUE
 
 /obj/structure/flora/pottedplant/minitree
 	name = "potted tree"
@@ -439,6 +441,7 @@
 	light_range = 2
 	light_power = 0.6
 	light_color = "#FF6633"
+	light_on = TRUE
 	catalogue_data = list(/datum/category_item/catalogue/flora/subterranean_bulbs)
 
 /obj/structure/flora/sif/subterranean/Initialize()

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

@@ -0,0 +1,22 @@
+/obj/structure/flora/tree/bigtree
+	icon = 'icons/obj/flora/moretrees_vr.dmi'
+	icon_state = "bigtree1"
+	base_state = "tree"
+	product = /obj/item/stack/material/log
+	product_amount = 20
+	health = 2000
+	max_health = 2000
+	pixel_x = -65
+	pixel_y = -8
+	layer = MOB_LAYER - 1
+	shake_animation_degrees = 2
+
+/obj/structure/flora/tree/bigtree/choose_icon_state()
+	return "[base_state][rand(1, 4)]"
+
+/obj/structure/flora/tree/bigtree/Initialize()
+	. = ..()
+
+	var/image/i = image('icons/obj/flora/moretrees_vr.dmi', "[icon_state]-b")
+	i.plane = ABOVE_MOB_PLANE
+	add_overlay(i)

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

@@ -115,7 +115,7 @@
 	is_stump = TRUE
 	density = FALSE
 	icon_state = "[base_state]_stump"
-	overlays.Cut() // For the Sif tree and other future glowy trees.
+	cut_overlays() // For the Sif tree and other future glowy trees.
 	set_light(0)
 
 /obj/structure/flora/tree/ex_act(var/severity)
@@ -300,6 +300,7 @@
 	icon = 'icons/obj/flora/deadtrees.dmi'
 	icon_state = "tree_sif"
 	base_state = "tree_sif"
+	blocks_emissive = FALSE
 	product = /obj/item/stack/material/log/sif
 	catalogue_data = list(/datum/category_item/catalogue/flora/sif_tree)
 	randomize_size = TRUE
@@ -324,7 +325,10 @@
 	update_icon()
 
 /obj/structure/flora/tree/sif/update_icon()
-	set_light(5 - light_shift, 1, "#33ccff")	// 5 variants, missing bulbs. 5th has no bulbs, so no glow.
-	var/image/glow = image(icon = icon, icon_state = "[base_state][light_shift]_glow")
-	glow.plane = PLANE_LIGHTING_ABOVE
-	overlays = list(glow)
+	cut_overlays()
+	var/bulbs = (5 - light_shift)
+	if(bulbs > 0)
+		set_light(bulbs, 1, "#33ccff")	// 5 variants, missing bulbs. 5th has no bulbs, so no glow.
+		add_overlay(mutable_appearance(icon, "[base_state][bulbs]_glow"))
+		add_overlay(emissive_appearance(icon, "[base_state][bulbs]_glow"))
+