diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
index 23d1e593dd..94f875f194 100644
--- a/code/game/objects/structures/flora.dm
+++ b/code/game/objects/structures/flora.dm
@@ -12,8 +12,8 @@
 	icon_state = "pine_1"
 
 /obj/structure/flora/tree/pine/New()
-	..()
 	icon_state = "pine_[rand(1, 3)]"
+	..()
 
 /obj/structure/flora/tree/pine/xmas
 	name = "xmas tree"
@@ -29,8 +29,8 @@
 	icon_state = "tree_1"
 
 /obj/structure/flora/tree/dead/New()
-	..()
 	icon_state = "tree_[rand(1, 6)]"
+	..()
 
 
 //grass
@@ -43,23 +43,23 @@
 	icon_state = "snowgrass1bb"
 
 /obj/structure/flora/grass/brown/New()
-	..()
 	icon_state = "snowgrass[rand(1, 3)]bb"
+	..()
 
 
 /obj/structure/flora/grass/green
 	icon_state = "snowgrass1gb"
 
 /obj/structure/flora/grass/green/New()
-	..()
 	icon_state = "snowgrass[rand(1, 3)]gb"
+	..()
 
 /obj/structure/flora/grass/both
 	icon_state = "snowgrassall1"
 
 /obj/structure/flora/grass/both/New()
-	..()
 	icon_state = "snowgrassall[rand(1, 3)]"
+	..()
 
 
 //bushes
@@ -70,8 +70,13 @@
 	anchored = 1
 
 /obj/structure/flora/bush/New()
-	..()
 	icon_state = "snowbush[rand(1, 6)]"
+	..()
+
+/obj/structure/flora/pottedplant
+	name = "potted plant"
+	icon = 'icons/obj/plants.dmi'
+	icon_state = "plant-26"
 
 //newbushes
 
@@ -82,110 +87,110 @@
 	anchored = 1
 
 /obj/structure/flora/ausbushes/New()
-	..()
 	icon_state = "firstbush_[rand(1, 4)]"
+	..()
 
 /obj/structure/flora/ausbushes/reedbush
 	icon_state = "reedbush_1"
 
 /obj/structure/flora/ausbushes/reedbush/New()
-	..()
 	icon_state = "reedbush_[rand(1, 4)]"
+	..()
 
 /obj/structure/flora/ausbushes/leafybush
 	icon_state = "leafybush_1"
 
 /obj/structure/flora/ausbushes/leafybush/New()
-	..()
 	icon_state = "leafybush_[rand(1, 3)]"
+	..()
 
 /obj/structure/flora/ausbushes/palebush
 	icon_state = "palebush_1"
 
 /obj/structure/flora/ausbushes/palebush/New()
-	..()
 	icon_state = "palebush_[rand(1, 4)]"
+	..()
 
 /obj/structure/flora/ausbushes/stalkybush
 	icon_state = "stalkybush_1"
 
 /obj/structure/flora/ausbushes/stalkybush/New()
-	..()
 	icon_state = "stalkybush_[rand(1, 3)]"
+	..()
 
 /obj/structure/flora/ausbushes/grassybush
 	icon_state = "grassybush_1"
 
 /obj/structure/flora/ausbushes/grassybush/New()
-	..()
 	icon_state = "grassybush_[rand(1, 4)]"
+	..()
 
 /obj/structure/flora/ausbushes/fernybush
 	icon_state = "fernybush_1"
 
 /obj/structure/flora/ausbushes/fernybush/New()
-	..()
 	icon_state = "fernybush_[rand(1, 3)]"
+	..()
 
 /obj/structure/flora/ausbushes/sunnybush
 	icon_state = "sunnybush_1"
 
 /obj/structure/flora/ausbushes/sunnybush/New()
-	..()
 	icon_state = "sunnybush_[rand(1, 3)]"
+	..()
 
 /obj/structure/flora/ausbushes/genericbush
 	icon_state = "genericbush_1"
 
 /obj/structure/flora/ausbushes/genericbush/New()
-	..()
 	icon_state = "genericbush_[rand(1, 4)]"
+	..()
 
 /obj/structure/flora/ausbushes/pointybush
 	icon_state = "pointybush_1"
 
 /obj/structure/flora/ausbushes/pointybush/New()
-	..()
 	icon_state = "pointybush_[rand(1, 4)]"
+	..()
 
 /obj/structure/flora/ausbushes/lavendergrass
 	icon_state = "lavendergrass_1"
 
 /obj/structure/flora/ausbushes/lavendergrass/New()
-	..()
 	icon_state = "lavendergrass_[rand(1, 4)]"
+	..()
 
 /obj/structure/flora/ausbushes/ywflowers
 	icon_state = "ywflowers_1"
 
 /obj/structure/flora/ausbushes/ywflowers/New()
-	..()
 	icon_state = "ywflowers_[rand(1, 3)]"
+	..()
 
 /obj/structure/flora/ausbushes/brflowers
 	icon_state = "brflowers_1"
 
 /obj/structure/flora/ausbushes/brflowers/New()
-	..()
 	icon_state = "brflowers_[rand(1, 3)]"
+	..()
 
 /obj/structure/flora/ausbushes/ppflowers
 	icon_state = "ppflowers_1"
 
 /obj/structure/flora/ausbushes/ppflowers/New()
-	..()
 	icon_state = "ppflowers_[rand(1, 4)]"
+	..()
 
 /obj/structure/flora/ausbushes/sparsegrass
 	icon_state = "sparsegrass_1"
 
 /obj/structure/flora/ausbushes/sparsegrass/New()
-	..()
 	icon_state = "sparsegrass_[rand(1, 3)]"
+	..()
 
 /obj/structure/flora/ausbushes/fullgrass
 	icon_state = "fullgrass_1"
 
 /obj/structure/flora/ausbushes/fullgrass/New()
-	..()
-	icon_state = "fullgrass_[rand(1, 3)]"
\ No newline at end of file
+	icon_state = "fullgrass_[rand(1, 3)]"
+	..()
\ No newline at end of file
diff --git a/code/game/structure/flora.dm b/code/game/structure/flora.dm
deleted file mode 100644
index 92aadd4529..0000000000
--- a/code/game/structure/flora.dm
+++ /dev/null
@@ -1,196 +0,0 @@
-//trees
-/obj/structure/flora/tree
-	name = "tree"
-	anchored = 1
-	density = 1
-	pixel_x = -16
-	layer = 9
-
-/obj/structure/flora/tree/pine
-	name = "pine tree"
-	icon = 'icons/obj/flora/pinetrees.dmi'
-	icon_state = "pine_1"
-
-/obj/structure/flora/tree/pine/New()
-	icon_state = "pine_[rand(1, 3)]"
-	..()
-
-/obj/structure/flora/tree/pine/xmas
-	name = "xmas tree"
-	icon = 'icons/obj/flora/pinetrees.dmi'
-	icon_state = "pine_c"
-
-/obj/structure/flora/tree/pine/xmas/New()
-	..()
-	icon_state = "pine_c"
-
-/obj/structure/flora/tree/dead
-	icon = 'icons/obj/flora/deadtrees.dmi'
-	icon_state = "tree_1"
-
-/obj/structure/flora/tree/dead/New()
-	icon_state = "tree_[rand(1, 6)]"
-	..()
-
-
-//grass
-/obj/structure/flora/grass
-	name = "grass"
-	icon = 'icons/obj/flora/snowflora.dmi'
-	anchored = 1
-
-/obj/structure/flora/grass/brown
-	icon_state = "snowgrass1bb"
-
-/obj/structure/flora/grass/brown/New()
-	icon_state = "snowgrass[rand(1, 3)]bb"
-	..()
-
-
-/obj/structure/flora/grass/green
-	icon_state = "snowgrass1gb"
-
-/obj/structure/flora/grass/green/New()
-	icon_state = "snowgrass[rand(1, 3)]gb"
-	..()
-
-/obj/structure/flora/grass/both
-	icon_state = "snowgrassall1"
-
-/obj/structure/flora/grass/both/New()
-	icon_state = "snowgrassall[rand(1, 3)]"
-	..()
-
-
-//bushes
-/obj/structure/flora/bush
-	name = "bush"
-	icon = 'icons/obj/flora/snowflora.dmi'
-	icon_state = "snowbush1"
-	anchored = 1
-
-/obj/structure/flora/bush/New()
-	icon_state = "snowbush[rand(1, 6)]"
-	..()
-
-/obj/structure/flora/pottedplant
-	name = "potted plant"
-	icon = 'icons/obj/plants.dmi'
-	icon_state = "plant-26"
-
-//newbushes
-
-/obj/structure/flora/ausbushes
-	name = "bush"
-	icon = 'icons/obj/flora/ausflora.dmi'
-	icon_state = "firstbush_1"
-	anchored = 1
-
-/obj/structure/flora/ausbushes/New()
-	icon_state = "firstbush_[rand(1, 4)]"
-	..()
-
-/obj/structure/flora/ausbushes/reedbush
-	icon_state = "reedbush_1"
-
-/obj/structure/flora/ausbushes/reedbush/New()
-	icon_state = "reedbush_[rand(1, 4)]"
-	..()
-
-/obj/structure/flora/ausbushes/leafybush
-	icon_state = "leafybush_1"
-
-/obj/structure/flora/ausbushes/leafybush/New()
-	icon_state = "leafybush_[rand(1, 3)]"
-	..()
-
-/obj/structure/flora/ausbushes/palebush
-	icon_state = "palebush_1"
-
-/obj/structure/flora/ausbushes/palebush/New()
-	icon_state = "palebush_[rand(1, 4)]"
-	..()
-
-/obj/structure/flora/ausbushes/stalkybush
-	icon_state = "stalkybush_1"
-
-/obj/structure/flora/ausbushes/stalkybush/New()
-	icon_state = "stalkybush_[rand(1, 3)]"
-	..()
-
-/obj/structure/flora/ausbushes/grassybush
-	icon_state = "grassybush_1"
-
-/obj/structure/flora/ausbushes/grassybush/New()
-	icon_state = "grassybush_[rand(1, 4)]"
-	..()
-
-/obj/structure/flora/ausbushes/fernybush
-	icon_state = "fernybush_1"
-
-/obj/structure/flora/ausbushes/fernybush/New()
-	icon_state = "fernybush_[rand(1, 3)]"
-	..()
-
-/obj/structure/flora/ausbushes/sunnybush
-	icon_state = "sunnybush_1"
-
-/obj/structure/flora/ausbushes/sunnybush/New()
-	icon_state = "sunnybush_[rand(1, 3)]"
-	..()
-
-/obj/structure/flora/ausbushes/genericbush
-	icon_state = "genericbush_1"
-
-/obj/structure/flora/ausbushes/genericbush/New()
-	icon_state = "genericbush_[rand(1, 4)]"
-	..()
-
-/obj/structure/flora/ausbushes/pointybush
-	icon_state = "pointybush_1"
-
-/obj/structure/flora/ausbushes/pointybush/New()
-	icon_state = "pointybush_[rand(1, 4)]"
-	..()
-
-/obj/structure/flora/ausbushes/lavendergrass
-	icon_state = "lavendergrass_1"
-
-/obj/structure/flora/ausbushes/lavendergrass/New()
-	icon_state = "lavendergrass_[rand(1, 4)]"
-	..()
-
-/obj/structure/flora/ausbushes/ywflowers
-	icon_state = "ywflowers_1"
-
-/obj/structure/flora/ausbushes/ywflowers/New()
-	icon_state = "ywflowers_[rand(1, 3)]"
-	..()
-
-/obj/structure/flora/ausbushes/brflowers
-	icon_state = "brflowers_1"
-
-/obj/structure/flora/ausbushes/brflowers/New()
-	icon_state = "brflowers_[rand(1, 3)]"
-	..()
-
-/obj/structure/flora/ausbushes/ppflowers
-	icon_state = "ppflowers_1"
-
-/obj/structure/flora/ausbushes/ppflowers/New()
-	icon_state = "ppflowers_[rand(1, 4)]"
-	..()
-
-/obj/structure/flora/ausbushes/sparsegrass
-	icon_state = "sparsegrass_1"
-
-/obj/structure/flora/ausbushes/sparsegrass/New()
-	icon_state = "sparsegrass_[rand(1, 3)]"
-	..()
-
-/obj/structure/flora/ausbushes/fullgrass
-	icon_state = "fullgrass_1"
-
-/obj/structure/flora/ausbushes/fullgrass/New()
-	icon_state = "fullgrass_[rand(1, 3)]"
-	..()
\ No newline at end of file
diff --git a/code/game/structure/structure.dm b/code/game/structure/structure.dm
deleted file mode 100644
index e69de29bb2..0000000000