diff --git a/code/datums/supplypacks/materials.dm b/code/datums/supplypacks/materials.dm
index 18b9a9867a2..45951c516d5 100644
--- a/code/datums/supplypacks/materials.dm
+++ b/code/datums/supplypacks/materials.dm
@@ -66,16 +66,6 @@
 					/obj/fiftyspawner/tealcarpet
 					)
 
-<<<<<<< HEAD
-/datum/supply_pack/materials/arcade_carpet
-	name = "Retro carpets"
-	containertype = /obj/structure/closet/crate/grayson
-	containername = "Retro carpets crate"
-	cost = 15
-	contains = list(
-					/obj/fiftyspawner/decocarpet,
-					/obj/fiftyspawner/retrocarpet
-=======
 /datum/supply_pack/materials/retrocarpet
 	name = "Retro carpet"
 	containertype = /obj/structure/closet/crate/grayson
@@ -85,7 +75,6 @@
 					/obj/fiftyspawner/geocarpet,
 					/obj/fiftyspawner/retrocarpet,
 					/obj/fiftyspawner/retrocarpet_red
->>>>>>> f7cc15b0988... Merge pull request #8556 from Cerebulon/arcadecarpets
 					)
 
 /datum/supply_pack/materials/linoleum
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 8ef6bc3789a..6e805411a4d 100644
--- a/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm
+++ b/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm
@@ -28,16 +28,6 @@
 	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
-
-/obj/fiftyspawner/retrocarpet
-	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
@@ -50,7 +40,6 @@
 	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 6a527ffb627..baa29fb4772 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -75,6 +75,11 @@
 	desc = "An easy to fit wooden floor tile. It's blue!"
 	icon_state = "tile-sifwood"
 
+/obj/item/stack/tile/wood/alt
+	name = "wood floor tile"
+	singular_name = "wood floor tile"
+	icon_state = "tile-wood_tile"
+
 /obj/item/stack/tile/wood/parquet
 	name = "parquet wood floor tile"
 	singular_name = "parquet wood floor tile"
@@ -124,8 +129,6 @@
 	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!"
@@ -139,7 +142,6 @@
 	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
@@ -154,10 +156,6 @@
 	icon_state = "tile-carpet"
 /obj/item/stack/tile/carpet/oracarpet
 	icon_state = "tile-carpet"
-/obj/item/stack/tile/carpet/deco
-	icon_state = "tile-carpet-deco"
-/obj/item/stack/tile/carpet/retro
-	icon_state = "tile-carpet-retro"
 
 /obj/item/stack/tile/floor
 	name = "floor tile"
diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm
index 3b24236b2ed..15670da8e31 100644
--- a/code/game/turfs/flooring/flooring.dm
+++ b/code/game/turfs/flooring/flooring.dm
@@ -321,16 +321,6 @@ 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"
-	build_type = /obj/item/stack/tile/carpet/deco
-	flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN
-
-/decl/flooring/carpet/retro
-	name = "retro carpet"
-=======
 /decl/flooring/carpet/geo
 	name = "geometric carpet"
 	icon_base = "geocarpet"
@@ -339,20 +329,16 @@ var/list/flooring_types
 
 /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."
@@ -516,23 +502,30 @@ 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/alt
+	icon = 'icons/turf/flooring/wood.dmi'
+	icon_base = "wood"
+	build_type = /obj/item/stack/tile/wood/alt
 
-/decl/flooring/wood/parquet
+/decl/flooring/wood/alt/panel
+	desc = "Polished wooden panels."
+	icon = 'icons/turf/flooring/wood.dmi'
+	icon_base = "wood_panel"
+	has_damage_range = 2
+	build_type = /obj/item/stack/tile/wood/panel
+
+/decl/flooring/wood/alt/parquet
 	desc = "Polished wooden tiles."
+	icon = 'icons/turf/flooring/wood.dmi'
 	icon_base = "wood_parquet"
 	build_type = /obj/item/stack/tile/wood/parquet
-	flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN
 
-/decl/flooring/wood/tile
+/decl/flooring/wood/alt/tile
 	desc = "Polished wooden tiles."
+	icon = 'icons/turf/flooring/wood.dmi'
 	icon_base = "wood_tile"
+	has_damage_range = 2
 	build_type = /obj/item/stack/tile/wood/tile
-	flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN
 
 /decl/flooring/reinforced
 	name = "reinforced floor"
diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm
index 4f1d52dca89..a8e25b2e63d 100644
--- a/code/game/turfs/flooring/flooring_premade.dm
+++ b/code/game/turfs/flooring/flooring_premade.dm
@@ -19,10 +19,10 @@
 	icon_state = "tealcarpet"
 	initial_flooring = /decl/flooring/carpet/tealcarpet
 
-/turf/simulated/floor/carpet/deco
+/turf/simulated/floor/carpet/geo
 	name = "deco carpet"
 	icon_state = "decocarpet"
-	initial_flooring = /decl/flooring/carpet/deco
+	initial_flooring = /decl/flooring/carpet/geo
 	
 /turf/simulated/floor/carpet/retro
 	name = "retro carpet"
@@ -94,11 +94,11 @@
 	initial_flooring = /decl/flooring/wood
 
 /turf/simulated/floor/wood/broken
-	icon_state = "wood_broken0" // This gets changed when spawned.
+	icon_state = "wood-broken0" // This gets changed when spawned.
 
-/turf/simulated/floor/wood/broken/Initialize()
+/turf/simulated/floor/wood/broken/LateInitialize()
+	. = ..()
 	break_tile()
-	return ..()
 
 /turf/simulated/floor/wood/sif
 	name = "alien wooden floor"
@@ -106,23 +106,55 @@
 	initial_flooring = /decl/flooring/wood/sif
 
 /turf/simulated/floor/wood/sif/broken
-	icon_state = "sifwood_broken0" // This gets changed when spawned.
+	icon_state = "sifwood-broken0" // This gets changed when spawned.
 
-/turf/simulated/floor/wood/sif/broken/Initialize()
+/turf/simulated/floor/wood/sif/broken/LateInitialize()
+	. = ..()
 	break_tile()
-	return ..()
 
-/turf/simulated/floor/wood/tile
+/turf/simulated/floor/wood/alt
+	icon = 'icons/turf/flooring/wood.dmi'
+	initial_flooring = /decl/flooring/wood/alt
+
+/turf/simulated/floor/wood/alt/broken
+	icon_state = "wood-broken0" // This gets changed when spawned.
+
+/turf/simulated/floor/wood/alt/broken/LateInitialize()
+	. = ..()
+	break_tile()
+
+/turf/simulated/floor/wood/alt/tile
 	icon_state = "wood_tile"
-	initial_flooring = /decl/flooring/wood/tile
+	initial_flooring = /decl/flooring/wood/alt/tile
 
-/turf/simulated/floor/wood/panel
+/turf/simulated/floor/wood/alt/tile/broken
+	icon_state = "wood_tile-broken0" // This gets changed when spawned.
+
+/turf/simulated/floor/wood/alt/tile/broken/LateInitialize()
+	. = ..()
+	break_tile()
+
+/turf/simulated/floor/wood/alt/panel
 	icon_state = "wood_panel"
-	initial_flooring = /decl/flooring/wood/panel
+	initial_flooring = /decl/flooring/wood/alt/panel
 
-/turf/simulated/floor/wood/parquet
+/turf/simulated/floor/wood/alt/panel/broken
+	icon_state = "wood_panel-broken0" // This gets changed when spawned.
+
+/turf/simulated/floor/wood/alt/panel/broken/LateInitialize()
+	. = ..()
+	break_tile()
+
+/turf/simulated/floor/wood/alt/parquet
 	icon_state = "wood_parquet"
-	initial_flooring = /decl/flooring/wood/parquet
+	initial_flooring = /decl/flooring/wood/alt/parquet
+
+/turf/simulated/floor/wood/alt/parquet/broken
+	icon_state = "wood_parquet-broken0" // This gets changed when spawned.
+
+/turf/simulated/floor/wood/alt/parquet/broken/LateInitialize()
+	. = ..()
+	break_tile()
 
 /turf/simulated/floor/grass
 	name = "grass patch"
diff --git a/code/game/turfs/simulated/floor_icon.dm b/code/game/turfs/simulated/floor_icon.dm
index 420d8628b54..82153557a88 100644
--- a/code/game/turfs/simulated/floor_icon.dm
+++ b/code/game/turfs/simulated/floor_icon.dm
@@ -75,7 +75,10 @@ var/image/no_ceiling_image = null
 		icon_state = "dmg[rand(1,4)]"
 	else if(flooring)
 		if(!isnull(broken) && (flooring.flags & TURF_CAN_BREAK))
-			add_overlay(flooring.get_flooring_overlay("[flooring.icon_base]-broken-[broken]","broken[broken]"))
+			if(istype(src, /turf/simulated/floor/wood))
+				add_overlay(flooring.get_flooring_overlay("[flooring.icon_base]-broken-[broken]","[flooring.icon_base]-broken[broken]"))
+			else
+				add_overlay(flooring.get_flooring_overlay("[flooring.icon_base]-broken-[broken]","broken[broken]"))
 		if(!isnull(burnt) && (flooring.flags & TURF_CAN_BURN))
 			add_overlay(flooring.get_flooring_overlay("[flooring.icon_base]-burned-[burnt]","burned[burnt]"))
 
diff --git a/icons/obj/stacks.dmi b/icons/obj/stacks.dmi
index 6a70a2982d1..67a370b2197 100644
Binary files a/icons/obj/stacks.dmi and b/icons/obj/stacks.dmi differ
diff --git a/icons/turf/flooring/carpet.dmi b/icons/turf/flooring/carpet.dmi
index f668ae8943c..a66db7af48b 100644
Binary files a/icons/turf/flooring/carpet.dmi and b/icons/turf/flooring/carpet.dmi differ
diff --git a/icons/turf/flooring/wood.dmi b/icons/turf/flooring/wood.dmi
index 7f9b3aa567b..afec20c8515 100644
Binary files a/icons/turf/flooring/wood.dmi and b/icons/turf/flooring/wood.dmi differ
diff --git a/icons/turf/flooring/wood_vr.dmi b/icons/turf/flooring/wood_vr.dmi
index d6024f3de06..f072969e54d 100644
Binary files a/icons/turf/flooring/wood_vr.dmi and b/icons/turf/flooring/wood_vr.dmi differ
diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm
index b9e9767171c..83b765918ee 100644
--- a/maps/groundbase/gb-z2.dmm
+++ b/maps/groundbase/gb-z2.dmm
@@ -466,7 +466,7 @@
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/chapel/office)
 "bl" = (
-/turf/simulated/floor/carpet/deco,
+/turf/simulated/floor/carpet/geo,
 /area/groundbase/civilian/kitchen/backroom)
 "bn" = (
 /obj/machinery/door/airlock{
@@ -2368,7 +2368,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/turf/simulated/floor/carpet/deco,
+/turf/simulated/floor/carpet/geo,
 /area/groundbase/civilian/kitchen/backroom)
 "gZ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -2464,7 +2464,7 @@
 /obj/structure/bed/chair/sofa/black,
 /obj/machinery/alarm,
 /obj/effect/landmark/start/chef,
-/turf/simulated/floor/carpet/deco,
+/turf/simulated/floor/carpet/geo,
 /area/groundbase/civilian/kitchen/backroom)
 "hp" = (
 /obj/structure/bed/chair/sofa/pew/left{
@@ -4235,7 +4235,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/turf/simulated/floor/carpet/deco,
+/turf/simulated/floor/carpet/geo,
 /area/groundbase/civilian/kitchen/backroom)
 "mo" = (
 /obj/structure/table/woodentable,
@@ -4486,7 +4486,7 @@
 /area/groundbase/civilian/janitor)
 "nf" = (
 /obj/structure/table/wooden_reinforced,
-/turf/simulated/floor/carpet/deco,
+/turf/simulated/floor/carpet/geo,
 /area/groundbase/civilian/kitchen/backroom)
 "ng" = (
 /obj/machinery/camera/network/research{
@@ -10491,7 +10491,7 @@
 /area/groundbase/medical/psych)
 "EW" = (
 /obj/structure/bed/chair/sofa/right/black,
-/turf/simulated/floor/carpet/deco,
+/turf/simulated/floor/carpet/geo,
 /area/groundbase/civilian/kitchen/backroom)
 "EX" = (
 /obj/structure/closet/secure_closet/quartermaster,
@@ -13698,7 +13698,7 @@
 /obj/structure/bed/chair/sofa/black{
 	dir = 8
 	},
-/turf/simulated/floor/carpet/deco,
+/turf/simulated/floor/carpet/geo,
 /area/groundbase/civilian/kitchen/backroom)
 "NU" = (
 /obj/structure/sign/painting/library_secure{
@@ -13797,7 +13797,7 @@
 /obj/structure/bed/chair/sofa/left/black{
 	dir = 8
 	},
-/turf/simulated/floor/carpet/deco,
+/turf/simulated/floor/carpet/geo,
 /area/groundbase/civilian/kitchen/backroom)
 "Oi" = (
 /obj/structure/disposalpipe/tagger{
@@ -13819,7 +13819,7 @@
 	layer = 3.3;
 	pixel_y = -27
 	},
-/turf/simulated/floor/carpet/deco,
+/turf/simulated/floor/carpet/geo,
 /area/groundbase/civilian/kitchen/backroom)
 "Ok" = (
 /obj/machinery/power/apc{
@@ -17543,7 +17543,7 @@
 /area/groundbase/cargo/office)
 "Zi" = (
 /obj/machinery/firealarm,
-/turf/simulated/floor/carpet/deco,
+/turf/simulated/floor/carpet/geo,
 /area/groundbase/civilian/kitchen/backroom)
 "Zk" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
diff --git a/maps/stellardelight/overmap.dmm b/maps/stellardelight/overmap.dmm
index 2890f0159bf..8edb64c5020 100644
--- a/maps/stellardelight/overmap.dmm
+++ b/maps/stellardelight/overmap.dmm
@@ -9,7 +9,7 @@
 /turf/unsimulated/map,
 /area/overmap)
 "I" = (
-/turf/simulated/floor/carpet/deco,
+/turf/simulated/floor/carpet/geo,
 /area/space)
 "J" = (
 /obj/effect/overmap/bluespace_rift,
diff --git a/maps/stellardelight/stellar_delight3.dmm b/maps/stellardelight/stellar_delight3.dmm
index 067cf7585ba..9ef1441ea3e 100644
--- a/maps/stellardelight/stellar_delight3.dmm
+++ b/maps/stellardelight/stellar_delight3.dmm
@@ -8114,7 +8114,7 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
 	},
-/turf/simulated/floor/carpet/deco,
+/turf/simulated/floor/carpet/geo,
 /area/ai)
 "Dy" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/black,