Adds Some More Decorative Flooring Types

code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm

@@ -28,6 +28,7 @@
 	name = "stack of teal carpet"
 	type_to_spawn = /obj/item/stack/tile/carpet/teal
 
+<<<<<<< HEAD
 /obj/fiftyspawner/decocarpet
 	name = "stack of deco carpet"
 	type_to_spawn = /obj/item/stack/tile/carpet/deco
@@ -36,6 +37,20 @@
 	name = "stack of retro carpet"
 	type_to_spawn = /obj/item/stack/tile/carpet/retro
 
+=======
+/obj/fiftyspawner/geocarpet
+	name = "stack of geometric carpet"
+	type_to_spawn = /obj/item/stack/tile/carpet/geo
+
+/obj/fiftyspawner/retrocarpet
+	name = "stack of blue retro carpet"
+	type_to_spawn = /obj/item/stack/tile/carpet/retro
+
+/obj/fiftyspawner/retrocarpet_red
+	name = "stack of red retro carpet"
+	type_to_spawn = /obj/item/stack/tile/carpet/retro_red
+
+>>>>>>> f7cc15b0988... Merge pull request #8556 from Cerebulon/arcadecarpets
 /obj/fiftyspawner/floor
 	name = "stack of floor tiles"
 	type_to_spawn = /obj/item/stack/tile/floor

code/game/objects/items/stacks/tiles/tile_types.dm

@@ -75,6 +75,21 @@
 	desc = "An easy to fit wooden floor tile. It's blue!"
 	icon_state = "tile-sifwood"
 
+/obj/item/stack/tile/wood/parquet
+	name = "parquet wood floor tile"
+	singular_name = "parquet wood floor tile"
+	icon_state = "tile-wood_parquet"
+
+/obj/item/stack/tile/wood/panel
+	name = "large wood floor tile"
+	singular_name = "large wood floor tile"
+	icon_state = "tile-wood_large"
+
+/obj/item/stack/tile/wood/tile
+	name = "tiled wood floor tile"
+	singular_name = "tiled wood floor tile"
+	icon_state = "tile-wood_tile"
+
 /obj/item/stack/tile/wood/cyborg
 	name = "wood floor tile synthesizer"
 	desc = "A device that makes wood floor tiles."
@@ -83,6 +98,8 @@
 	stacktype = /obj/item/stack/tile/wood
 	build_type = /obj/item/stack/tile/wood
 
+
+
 /*
  * Carpets
  */
@@ -107,6 +124,22 @@
 	icon_state = "tile-tealcarpet"
 	no_variants = FALSE
 
+<<<<<<< HEAD
+=======
+/obj/item/stack/tile/carpet/geo
+	icon_state = "tile-carpet-deco"
+	desc = "A piece of carpet with a gnarly geometric design. It is the same size as a normal floor tile!"
+
+/obj/item/stack/tile/carpet/retro
+	icon_state = "tile-carpet-retro"
+	desc = "A piece of carpet with totally wicked blue space patterns. It is the same size as a normal floor tile!"
+
+/obj/item/stack/tile/carpet/retro_red
+	icon_state = "tile-carpet-retro-red"
+	desc = "A piece of carpet with red-ical space patterns. It is the same size as a normal floor tile!"
+
+// TODO - Add descriptions to these
+>>>>>>> f7cc15b0988... Merge pull request #8556 from Cerebulon/arcadecarpets
 /obj/item/stack/tile/carpet/bcarpet
 	icon_state = "tile-carpet"
 /obj/item/stack/tile/carpet/blucarpet