Merge pull request #12659 from Very-Soft/tweaks

Adjusts trees and vendor spawners

code/game/objects/random/mapping.dm

@@ -71,20 +71,20 @@
 	icon_state = "radren-off"
 
 /obj/random/vendorall/item_to_spawn()
-	return pick (/obj/machinery/vending/coffee,
-				/obj/machinery/vending/snack,
-				/obj/machinery/vending/cola,
-				/obj/machinery/vending/fitness,
-				/obj/machinery/vending/cigarette,
-				/obj/machinery/vending/giftvendor,
-				/obj/machinery/vending/hotfood,
-				/obj/machinery/vending/weeb,
-				/obj/machinery/vending/sol,
-				/obj/machinery/vending/snix,
-				/obj/machinery/vending/snlvend,
-				/obj/machinery/vending/sovietsoda,
-				/obj/machinery/vending/sovietvend,
-				/obj/machinery/vending/radren)
+	return pick (prob(5);/obj/machinery/vending/coffee,	//VOREStation Edit Start - Let's weight this a little bit
+				prob(5);/obj/machinery/vending/snack,
+				prob(5);/obj/machinery/vending/cola,
+				prob(3);/obj/machinery/vending/fitness,
+				prob(4);/obj/machinery/vending/cigarette,
+				prob(3);/obj/machinery/vending/giftvendor,
+				prob(1);/obj/machinery/vending/hotfood,
+				prob(5);/obj/machinery/vending/weeb,
+				prob(5);/obj/machinery/vending/sol,
+				prob(5);/obj/machinery/vending/snix,
+				prob(5);/obj/machinery/vending/snlvend,
+				prob(5);/obj/machinery/vending/sovietsoda,
+				prob(5);/obj/machinery/vending/sovietvend,
+				prob(5);/obj/machinery/vending/radren) //VOREStation Edit End
 
 /obj/random/vendorfood //Random food vendors for station use
 	name = "random snack vending machine"

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

@@ -4,8 +4,8 @@
 	base_state = "tree"
 	product = /obj/item/stack/material/log
 	product_amount = 20
-	health = 2000
-	max_health = 2000
+	health = 400
+	max_health = 400
 	pixel_x = -65
 	pixel_y = -8
 	layer = MOB_LAYER - 1
@@ -19,4 +19,14 @@
 
 	var/image/i = image('icons/obj/flora/moretrees_vr.dmi', "[icon_state]-b")
 	i.plane = ABOVE_MOB_PLANE
-	add_overlay(i)
+	add_overlay(i)
+
+/obj/structure/flora/tree/bigtree/stump()
+	if(is_stump)
+		return
+
+	is_stump = TRUE
+	density = FALSE
+	icon_state = "[icon_state]_stump"
+	cut_overlays()
+	set_light(0)