From f088e812a9ca1bd98429a450f7fd5dc4505bb5b8 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Mon, 14 Aug 2017 09:31:49 -0500
Subject: [PATCH] Update flora.dm

---
 code/game/objects/structures/flora.dm | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
index 76b1462304..d141f71b7a 100644
--- a/code/game/objects/structures/flora.dm
+++ b/code/game/objects/structures/flora.dm
@@ -1,12 +1,13 @@
 /obj/structure/flora
 	resistance_flags = FLAMMABLE
+	obj_integrity = 150
 	max_integrity = 150
-	anchored = TRUE
+	anchored = 1
 
 //trees
 /obj/structure/flora/tree
 	name = "tree"
-	density = TRUE
+	density = 1
 	pixel_x = -16
 	layer = FLY_LAYER
 	var/cut = FALSE
@@ -25,7 +26,7 @@
 				playsound(get_turf(src), 'sound/effects/meteorimpact.ogg', 100 , 0, 0)
 				icon = 'icons/obj/flora/pinetrees.dmi'
 				icon_state = "tree_stump"
-				density = FALSE
+				density = 0
 				pixel_x = -16
 				name += " stump"
 				cut = TRUE
@@ -88,12 +89,7 @@
 
 /obj/structure/flora/tree/jungle/Initialize()
 	icon_state = "[icon_state][rand(1, 6)]"
-	..()
-
-/obj/structure/flora/tree/jungle/small
-	pixel_y = 0
-	pixel_x = -32
-	icon = 'icons/obj/flora/jungletreesmall.dmi'
+	. = ..()
 
 //grass
 /obj/structure/flora/grass
@@ -129,7 +125,7 @@
 	name = "bush"
 	icon = 'icons/obj/flora/snowflora.dmi'
 	icon_state = "snowbush1"
-	anchored = TRUE
+	anchored = 1
 
 /obj/structure/flora/bush/Initialize()
 	icon_state = "snowbush[rand(1, 6)]"
@@ -308,10 +304,10 @@
 	desc = "A volcanic rock"
 	icon = 'icons/obj/flora/rocks.dmi'
 	resistance_flags = FIRE_PROOF
-	density = TRUE
+	density = 1
 
 /obj/structure/flora/rock/Initialize()
-	..()
+	. = ..()
 	icon_state = "[icon_state][rand(1,3)]"
 
 /obj/structure/flora/rock/pile