Add arcadey carpets

code/datums/supplypacks/materials.dm

@@ -59,6 +59,15 @@
 					/obj/fiftyspawner/tealcarpet
 					)
 
+/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/misc/linoleum
 	name = "Linoleum"

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

@@ -28,6 +28,14 @@
 	name = "stack of teal carpet"
 	type_to_spawn = /obj/item/stack/tile/carpet/teal
 
+/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/floor
 	name = "stack of floor tiles"
 	type_to_spawn = /obj/item/stack/tile/floor

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

@@ -132,7 +132,15 @@
 	icon_state = "tile-carpet"
 /obj/item/stack/tile/carpet/oracarpet
 	icon_state = "tile-carpet"
+<<<<<<< HEAD
 	*/
+||||||| parent of 78723da872... Merge pull request #11298 from VOREStation/Arokha/arcadecarpets
+=======
+/obj/item/stack/tile/carpet/deco
+	icon_state = "tile-carpet-deco"
+/obj/item/stack/tile/carpet/retro
+	icon_state = "tile-carpet-retro"
+>>>>>>> 78723da872... Merge pull request #11298 from VOREStation/Arokha/arcadecarpets
 
 /obj/item/stack/tile/floor
 	name = "floor tile"

code/game/turfs/flooring/flooring.dm

@@ -332,6 +332,18 @@ var/list/flooring_types
 	icon_base = "tealcarpet"
 	build_type = /obj/item/stack/tile/carpet/teal
 
+/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"
+	icon_base = "retrocarpet"
+	build_type = /obj/item/stack/tile/carpet/retro
+	flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN
+
 /decl/flooring/tiling
 	name = "floor"
 	desc = "Scuffed from the passage of countless greyshirts."

code/game/turfs/flooring/flooring_premade.dm

@@ -19,6 +19,16 @@
 	icon_state = "tealcarpet"
 	initial_flooring = /decl/flooring/carpet/tealcarpet
 
+/turf/simulated/floor/carpet/deco
+	name = "deco carpet"
+	icon_state = "decocarpet"
+	initial_flooring = /decl/flooring/carpet/deco
+	
+/turf/simulated/floor/carpet/retro
+	name = "retro carpet"
+	icon_state = "retrocarpet"
+	initial_flooring = /decl/flooring/carpet/retro
+
 // Legacy support for existing paths for blue carpet
 /turf/simulated/floor/carpet/blue
 	name = "blue carpet"