diff --git a/code/datums/supplypacks/materials.dm b/code/datums/supplypacks/materials.dm
index d06238dc41..532ec83680 100644
--- a/code/datums/supplypacks/materials.dm
+++ b/code/datums/supplypacks/materials.dm
@@ -57,20 +57,47 @@
 	containername = "Cardboard sheets crate"
 
 /datum/supply_pack/materials/carpet
-	name = "Imported carpet"
+	name = "Imported standard carpet"
 	containertype = /obj/structure/closet/crate/grayson
 	containername = "Imported carpet crate"
 	cost = 15
 	contains = list(
 					/obj/fiftyspawner/carpet,
-					/obj/fiftyspawner/tealcarpet
+					/obj/fiftyspawner/tealcarpet,
+					/obj/fiftyspawner/turcarpet
+					)
+
+/datum/supply_pack/materials/carpet_ornate
+	name = "Imported ornate carpet"
+	containertype = /obj/structure/closet/crate/grayson
+	containername = "Imported ornate carpet crate"
+	cost = 20
+	contains = list(
+					/obj/fiftyspawner/brncarpet,
+					/obj/fiftyspawner/blucarpet2,
+					/obj/fiftyspawner/greencarpet,
+					/obj/fiftyspawner/purplecarpet
+					)
+
+/datum/supply_pack/materials/carpet_diamond
+	name = "Imported diamond carpet"
+	containertype = /obj/structure/closet/crate/grayson
+	containername = "Imported diamond carpet crate"
+	cost = 30
+	contains = list(
+					/obj/fiftyspawner/bcarpet,
+					/obj/fiftyspawner/blucarpet,
+					/obj/fiftyspawner/sblucarpet,
+					/obj/fiftyspawner/gaycarpet,
+					/obj/fiftyspawner/purcarpet,
+					/obj/fiftyspawner/oracarpet
 					)
 
 /datum/supply_pack/materials/retrocarpet
-	name = "Retro carpet"
+	name = "Imported retro carpet"
 	containertype = /obj/structure/closet/crate/grayson
-	containername = "Retro carpet crate"
-	cost = 15
+	containername = "Imported retro carpet crate"
+	cost = 20
 	contains = list(
 					/obj/fiftyspawner/geocarpet,
 					/obj/fiftyspawner/retrocarpet,
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 deec4b6964..598eb7a591 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,50 @@
 	name = "stack of teal carpet"
 	type_to_spawn = /obj/item/stack/tile/carpet/teal
 
+/obj/fiftyspawner/turcarpet
+	name = "stack of turqoise carpet"
+	type_to_spawn = /obj/item/stack/tile/carpet/turcarpet
+
+/obj/fiftyspawner/bcarpet
+	name = "stack of black diamond-pattern carpet"
+	type_to_spawn = /obj/item/stack/tile/carpet/bcarpet
+
+/obj/fiftyspawner/blucarpet
+	name = "stack of blue diamond-pattern carpet"
+	type_to_spawn = /obj/item/stack/tile/carpet/blucarpet
+
+/obj/fiftyspawner/sblucarpet
+	name = "stack of silver-blue diamond-pattern carpet"
+	type_to_spawn = /obj/item/stack/tile/carpet/sblucarpet
+
+/obj/fiftyspawner/gaycarpet
+	name = "stack of pink diamond-pattern carpet"
+	type_to_spawn = /obj/item/stack/tile/carpet/gaycarpet
+
+/obj/fiftyspawner/purcarpet
+	name = "stack of purple diamond-pattern carpet"
+	type_to_spawn = /obj/item/stack/tile/carpet/purcarpet
+
+/obj/fiftyspawner/oracarpet
+	name = "stack of orange diamond-pattern carpet"
+	type_to_spawn = /obj/item/stack/tile/carpet/oracarpet
+
+/obj/fiftyspawner/brncarpet
+	name = "stack of brown ornate-pattern carpet"
+	type_to_spawn = /obj/item/stack/tile/carpet/brncarpet
+
+/obj/fiftyspawner/blucarpet2
+	name = "stack of blue ornate-pattern carpet"
+	type_to_spawn = /obj/item/stack/tile/carpet/blucarpet2
+
+/obj/fiftyspawner/greencarpet
+	name = "stack of green ornate-pattern carpet"
+	type_to_spawn = /obj/item/stack/tile/carpet/greencarpet
+
+/obj/fiftyspawner/purplecarpet
+	name = "stack of purple ornate-pattern carpet"
+	type_to_spawn = /obj/item/stack/tile/carpet/purplecarpet
+
 /obj/fiftyspawner/geocarpet
 	name = "stack of geometric carpet"
 	type_to_spawn = /obj/item/stack/tile/carpet/geo
@@ -44,22 +88,6 @@
 	name = "stack of happy carpet"
 	type_to_spawn = /obj/item/stack/tile/carpet/happy
 
-/obj/fiftyspawner/brncarpet
-	name = "stack of brown carpet"
-	type_to_spawn = /obj/item/stack/tile/carpet/brncarpet
-
-/obj/fiftyspawner/blucarpet2
-	name = "stack of blue carpet"
-	type_to_spawn = /obj/item/stack/tile/carpet/blucarpet2
-
-/obj/fiftyspawner/greencarpet
-	name = "stack of green carpet"
-	type_to_spawn = /obj/item/stack/tile/carpet/greencarpet
-
-/obj/fiftyspawner/purplecarpet
-	name = "stack of purple carpet"
-	type_to_spawn = /obj/item/stack/tile/carpet/purplecarpet
-
 /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 6c50140a65..04df7af869 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -131,11 +131,52 @@
 	pickup_sound = 'sound/items/pickup/cloth.ogg'
 
 /obj/item/stack/tile/carpet/teal
-	name = "teal carpet"
-	singular_name = "teal carpet"
 	desc = "A piece of teal carpet. It is the same size as a normal floor tile!"
 	icon_state = "tile-tealcarpet"
-	no_variants = FALSE
+
+/obj/item/stack/tile/carpet/turcarpet
+	desc = "A piece of turqoise carpet. It is the same size as a normal floor tile!"
+	icon_state = "tile-turcarpet"
+
+/obj/item/stack/tile/carpet/bcarpet
+	desc = "A piece of black diamond-pattern carpet. It is the same size as a normal floor tile!"
+	icon_state = "tile-bcarpet"
+
+/obj/item/stack/tile/carpet/blucarpet
+	desc = "A piece of blue diamond-pattern carpet. It is the same size as a normal floor tile!"
+	icon_state = "tile-blucarpet"
+
+/obj/item/stack/tile/carpet/sblucarpet
+	desc = "A piece of silver-blue diamond-pattern carpet. It is the same size as a normal floor tile!"
+	icon_state = "tile-sblucarpet"
+
+/obj/item/stack/tile/carpet/gaycarpet
+	desc = "A piece of pink diamond-pattern carpet. It is the same size as a normal floor tile!"
+	icon_state = "tile-gaycarpet"
+
+/obj/item/stack/tile/carpet/purcarpet
+	desc = "A piece of purple diamond-pattern carpet. It is the same size as a normal floor tile!"
+	icon_state = "tile-purcarpet"
+
+/obj/item/stack/tile/carpet/oracarpet
+	desc = "A piece of orange diamond-pattern carpet. It is the same size as a normal floor tile!"
+	icon_state = "tile-oracarpet"
+
+/obj/item/stack/tile/carpet/brncarpet
+	desc = "A piece of brown ornate-pattern carpet. It is the same size as a normal floor tile!"
+	icon_state = "tile-brncarpet"
+
+/obj/item/stack/tile/carpet/blucarpet2
+	desc = "A piece of blue ornate-pattern carpet. It is the same size as a normal floor tile!"
+	icon_state = "tile-blucarpet2"
+
+/obj/item/stack/tile/carpet/greencarpet
+	desc = "A piece of green ornate-pattern carpet. It is the same size as a normal floor tile!"
+	icon_state = "tile-greencarpet"
+
+/obj/item/stack/tile/carpet/purplecarpet
+	desc = "A piece of purple ornate-pattern carpet. It is the same size as a normal floor tile!"
+	icon_state = "tile-purplecarpet"
 
 /obj/item/stack/tile/carpet/geo
 	icon_state = "tile-carpet-deco"
@@ -153,6 +194,7 @@
 	icon_state = "tile-carpet-happy"
 	desc = "A piece of carpet with happy patterns. It is the same size as a normal floor tile!"
 
+<<<<<<< HEAD
 /obj/item/stack/tile/carpet/bcarpet //YW EDIT: Commented out to help with upstream merging. Get on this you fucking virgo bois. -yw //CHOMP Comment: Yawn commented out this block, but CHOMP already commented out this stuff so I just removed theirs.
 	icon_state = "tile-carpet"
 /obj/item/stack/tile/carpet/blucarpet
@@ -177,6 +219,8 @@
 	icon_state = "tile-carpet"
 */
 
+=======
+>>>>>>> 9ea28d1962... Merge pull request #14327 from Heroman3003/carpeting
 /obj/item/stack/tile/floor
 	name = "floor tile"
 	singular_name = "floor tile"
diff --git a/icons/obj/stacks.dmi b/icons/obj/stacks.dmi
index 8ade0ce4ae..2bf50ebc2f 100644
Binary files a/icons/obj/stacks.dmi and b/icons/obj/stacks.dmi differ