diff --git a/code/datums/supplypacks/materials.dm b/code/datums/supplypacks/materials.dm
index 5e181d8af8a..18b9a9867a2 100644
--- a/code/datums/supplypacks/materials.dm
+++ b/code/datums/supplypacks/materials.dm
@@ -66,6 +66,7 @@
 					/obj/fiftyspawner/tealcarpet
 					)
 
+<<<<<<< HEAD
 /datum/supply_pack/materials/arcade_carpet
 	name = "Retro carpets"
 	containertype = /obj/structure/closet/crate/grayson
@@ -74,9 +75,20 @@
 	contains = list(
 					/obj/fiftyspawner/decocarpet,
 					/obj/fiftyspawner/retrocarpet
+=======
+/datum/supply_pack/materials/retrocarpet
+	name = "Retro carpet"
+	containertype = /obj/structure/closet/crate/grayson
+	containername = "Retro carpet crate"
+	cost = 15
+	contains = list(
+					/obj/fiftyspawner/geocarpet,
+					/obj/fiftyspawner/retrocarpet,
+					/obj/fiftyspawner/retrocarpet_red
+>>>>>>> f7cc15b0988... Merge pull request #8556 from Cerebulon/arcadecarpets
 					)
 
-/datum/supply_pack/misc/linoleum
+/datum/supply_pack/materials/linoleum
 	name = "Linoleum"
 	containertype = /obj/structure/closet/crate/grayson
 	containername = "Linoleum crate"
diff --git a/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm b/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm
index a730263afa1..8ef6bc3789a 100644
--- a/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm
+++ b/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
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index 3c17fb0acf8..6a527ffb627 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/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
diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm
index ba7429eec4f..3b24236b2ed 100644
--- a/code/game/turfs/flooring/flooring.dm
+++ b/code/game/turfs/flooring/flooring.dm
@@ -321,6 +321,7 @@ var/list/flooring_types
 	icon_base = "tealcarpet"
 	build_type = /obj/item/stack/tile/carpet/teal
 
+<<<<<<< HEAD
 /decl/flooring/carpet/deco
 	name = "deco carpet"
 	icon_base = "decocarpet"
@@ -329,10 +330,29 @@ var/list/flooring_types
 
 /decl/flooring/carpet/retro
 	name = "retro carpet"
+=======
+/decl/flooring/carpet/geo
+	name = "geometric carpet"
+	icon_base = "geocarpet"
+	build_type = /obj/item/stack/tile/carpet/geo
+	flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN
+
+/decl/flooring/carpet/retro
+	name = "blue retro carpet"
+>>>>>>> f7cc15b0988... Merge pull request #8556 from Cerebulon/arcadecarpets
 	icon_base = "retrocarpet"
 	build_type = /obj/item/stack/tile/carpet/retro
 	flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN
 
+<<<<<<< HEAD
+=======
+/decl/flooring/carpet/retro_red
+	name = "red retro carpet"
+	icon_base = "retrocarpet_red"
+	build_type = /obj/item/stack/tile/carpet/retro_red
+	flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN
+
+>>>>>>> f7cc15b0988... Merge pull request #8556 from Cerebulon/arcadecarpets
 /decl/flooring/tiling
 	name = "floor"
 	desc = "Scuffed from the passage of countless greyshirts."
@@ -496,6 +516,24 @@ var/list/flooring_types
 	icon_base = "sifwood"
 	build_type = /obj/item/stack/tile/wood/sif
 
+/decl/flooring/wood/panel
+	desc = "Polished wooden panels."
+	icon_base = "wood_large"
+	build_type = /obj/item/stack/tile/wood/panel
+	flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN
+
+/decl/flooring/wood/parquet
+	desc = "Polished wooden tiles."
+	icon_base = "wood_parquet"
+	build_type = /obj/item/stack/tile/wood/parquet
+	flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN
+
+/decl/flooring/wood/tile
+	desc = "Polished wooden tiles."
+	icon_base = "wood_tile"
+	build_type = /obj/item/stack/tile/wood/tile
+	flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN
+
 /decl/flooring/reinforced
 	name = "reinforced floor"
 	desc = "Heavily reinforced with steel rods."
diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm
index 42bf1e780e0..4f1d52dca89 100644
--- a/code/game/turfs/flooring/flooring_premade.dm
+++ b/code/game/turfs/flooring/flooring_premade.dm
@@ -60,6 +60,21 @@
 	icon_state = "oracarpet"
 	initial_flooring = /decl/flooring/carpet/oracarpet
 
+/turf/simulated/floor/carpet/geo
+	name = "geometric carpet"
+	icon_state = "geocarpet"
+	initial_flooring = /decl/flooring/carpet/geo
+
+/turf/simulated/floor/carpet/retro
+	name = "blue retro carpet"
+	icon_state = "retrocarpet"
+	initial_flooring = /decl/flooring/carpet/retro
+
+/turf/simulated/floor/carpet/retro_red
+	name = "red retro carpet"
+	icon_state = "retrocarpet_red"
+	initial_flooring = /decl/flooring/carpet/retro_red
+
 /turf/simulated/floor/bluegrid
 	name = "mainframe floor"
 	icon = 'icons/turf/flooring/circuit.dmi'
@@ -87,7 +102,6 @@
 
 /turf/simulated/floor/wood/sif
 	name = "alien wooden floor"
-	icon = 'icons/turf/flooring/wood.dmi'
 	icon_state = "sifwood"
 	initial_flooring = /decl/flooring/wood/sif
 
@@ -98,6 +112,18 @@
 	break_tile()
 	return ..()
 
+/turf/simulated/floor/wood/tile
+	icon_state = "wood_tile"
+	initial_flooring = /decl/flooring/wood/tile
+
+/turf/simulated/floor/wood/panel
+	icon_state = "wood_panel"
+	initial_flooring = /decl/flooring/wood/panel
+
+/turf/simulated/floor/wood/parquet
+	icon_state = "wood_parquet"
+	initial_flooring = /decl/flooring/wood/parquet
+
 /turf/simulated/floor/grass
 	name = "grass patch"
 	icon = 'icons/turf/flooring/grass.dmi'
diff --git a/icons/turf/flooring/wood.dmi b/icons/turf/flooring/wood.dmi
index eb913336735..7f9b3aa567b 100644
Binary files a/icons/turf/flooring/wood.dmi and b/icons/turf/flooring/wood.dmi differ