Fixy

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

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"