Merge branch 'master' into upstream-merge-5446

code/game/objects/structures/crates_lockers/closets/fireaxe.dm

@@ -16,13 +16,10 @@
 
 	starts_with = list(/obj/item/weapon/material/twohanded/fireaxe)
 
-<<<<<<< HEAD
-=======
 /obj/structure/closet/fireaxecabinet/initialize()
 	..()
 	fireaxe = locate() in contents
 
->>>>>>> 8cd1f6a... Merge pull request #5446 from Anewbe/fireaxe_fix_again
 /obj/structure/closet/fireaxecabinet/attackby(var/obj/item/O as obj, var/mob/user as mob)  //Marker -Agouri
 	//..() //That's very useful, Erro
 
@@ -122,6 +119,7 @@
 	if(src.locked)
 		to_chat(user, "<span class='warning'>The cabinet won't budge!</span>")
 		return
+
 	if(localopened)
 		if(fireaxe)
 			user.put_in_hands(fireaxe)

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

@@ -4,7 +4,8 @@
 	anchored = 1
 	density = 1
 	pixel_x = -16
-	layer = MOB_LAYER // You know what, let's play it safe.
+	plane = MOB_LAYER // You know what, let's play it safe.
+	layer = ABOVE_MOB_LAYER
 	var/base_state = null	// Used for stumps.
 	var/health = 200		// Used for chopping down trees.
 	var/max_health = 200