fixes some carpet issues

code/__DEFINES/icon_smoothing.dm

@@ -138,7 +138,11 @@ DEFINE_BITFIELD(smoothing_junction, list(
 #define SMOOTH_GROUP_TURF_BALLPIT S_TURF(64) ///turf/open/floor/ballpit
 #define SMOOTH_GROUP_TURF_WATER S_TURF(65)
 
-#define MAX_S_TURF 65 //Always match this value with the one above it.
+#define SMOOTH_GROUP_CARPET_PLAIN_BLUE S_TURF(66) ///turf/open/indestructible/carpet/plainblue
+#define SMOOTH_GROUP_CARPET_PLAIN_GREEN S_TURF(67) ///turf/open/indestructible/carpet/plaingreen
+#define SMOOTH_GROUP_CARPET_PLAIN_PURPLE S_TURF(68) ///turf/open/indestructible/carpet/plainpurple
+
+#define MAX_S_TURF 68 //Always match this value with the one above it.
 
 #define S_OBJ(num) ("-" + #num + ",")
 /* /obj included */
@@ -202,7 +206,7 @@ DEFINE_BITFIELD(smoothing_junction, list(
 
 #define SMOOTH_GROUP_CLEANABLE_DIRT S_OBJ(68) ///obj/effect/decal/cleanable/dirt
 
-#define SMOOTH_GROUP_GAS_TANK S_OBJ(72) 
+#define SMOOTH_GROUP_GAS_TANK S_OBJ(72)
 
 
 /// Performs the work to set smoothing_groups and canSmoothWith.

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

@@ -219,8 +219,8 @@
 
 /obj/item/stack/tile/carpet/blue
 	name = "exotic blue carpet"
-	icon_state = "tile-carpet-blue"
-	item_state = "tile-carpet-blue"
+	icon_state = "tile-carpet-exoticblue"
+	item_state = "tile-carpet-exoticblue"
 	turf_type = /turf/open/floor/carpet/blue
 	tableVariant = /obj/structure/table/wood/fancy/blue
 
@@ -233,8 +233,8 @@
 
 /obj/item/stack/tile/carpet/green
 	name = "exotic green carpet"
-	icon_state = "tile-carpet-green"
-	item_state = "tile-carpet-green"
+	icon_state = "tile-carpet-exoticgreen"
+	item_state = "tile-carpet-exoticgreen"
 	turf_type = /turf/open/floor/carpet/green
 	tableVariant = /obj/structure/table/wood/fancy/green
 
@@ -247,8 +247,8 @@
 
 /obj/item/stack/tile/carpet/purple
 	name = "exotic purple carpet"
-	icon_state = "tile-carpet-purple"
-	item_state = "tile-carpet-purple"
+	icon_state = "tile-carpet-exoticpurple"
+	item_state = "tile-carpet-exoticpurple"
 	turf_type = /turf/open/floor/carpet/purple
 	tableVariant = /obj/structure/table/wood/fancy/purple
 
@@ -294,6 +294,23 @@
 	turf_type = /turf/open/floor/carpet/donk
 	merge_type = /obj/item/stack/tile/carpet/donk
 
+/obj/item/stack/tile/carpet/plainblue
+	name = "blue carpet"
+	icon_state = "tile-carpet-blue"
+	item_state = "tile-carpet-blue"
+	turf_type = /turf/open/floor/carpet/plainblue
+
+/obj/item/stack/tile/carpet/plaingreen
+	name = "green carpet"
+	icon_state = "tile-carpet-green"
+	item_state = "tile-carpet-green"
+	turf_type = /turf/open/floor/carpet/plaingreen
+
+/obj/item/stack/tile/carpet/plainpurple
+	name = "purple carpet"
+	icon_state = "tile-carpet-purple"
+	item_state = "tile-carpet-purple"
+	turf_type = /turf/open/floor/carpet/plainpurple
 
 /obj/item/stack/tile/carpet/fifty
 	amount = 50
@@ -325,6 +342,15 @@
 /obj/item/stack/tile/carpet/royalblue/fifty
 	amount = 50
 
+/obj/item/stack/tile/carpet/plainblue/fifty
+	amount = 50
+
+/obj/item/stack/tile/carpet/plaingreen/fifty
+	amount = 50
+
+/obj/item/stack/tile/carpet/plainpurple/fifty
+	amount = 50
+
 
 /obj/item/stack/tile/fakespace
 	name = "astral carpet"
@@ -441,14 +467,14 @@
 	materials = list() // All other Borg versions of items have no Metal or Glass - RR
 	is_cyborg = 1
 	cost = 125
-	
+
 /obj/item/stack/tile/eighties
 	name = "retro tile"
 	singular_name = "retro floor tile"
 	desc = "A stack of floor tiles that remind you of an age of funk."
 	icon_state = "tile_eighties"
 	turf_type = /turf/open/floor/eighties
-	
+
 /obj/item/stack/tile/eighties/loaded
 	amount = 15
 

code/game/turfs/open/_open.dm

@@ -15,7 +15,7 @@
 	var/barefootstep = null
 	var/clawfootstep = null
 	var/heavyfootstep = null
-	
+
 	/// Determines the type of damage overlay that will be used for the tile
 	var/damaged_dmi = null
 	var/broken = FALSE
@@ -231,6 +231,27 @@
 	smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET_RED
 	canSmoothWith = SMOOTH_GROUP_CARPET_RED
 
+/turf/open/indestructible/carpet/plainblue
+	icon = 'icons/turf/floors/carpet_plainblue.dmi'
+	icon_state = "carpet_plainblue-255"
+	base_icon_state = "carpet_plainblue"
+	smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET_PLAIN_BLUE
+	canSmoothWith = SMOOTH_GROUP_CARPET_PLAIN_BLUE
+
+/turf/open/indestructible/carpet/plaingreen
+	icon = 'icons/turf/floors/carpet_plaingreen.dmi'
+	icon_state = "carpet_plaingreen-255"
+	base_icon_state = "carpet_plaingreen"
+	smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET_PLAIN_GREEN
+	canSmoothWith = SMOOTH_GROUP_CARPET_PLAIN_GREEN
+
+/turf/open/indestructible/carpet/plainpurple
+	icon = 'icons/turf/floors/carpet_plainpurple.dmi'
+	icon_state = "carpet_plainpurple-255"
+	base_icon_state = "carpet_plainpurple"
+	smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET_PLAIN_PURPLE
+	canSmoothWith = SMOOTH_GROUP_CARPET_PLAIN_PURPLE
+
 /turf/open/indestructible/carpet/royalblack
 	icon = 'icons/turf/floors/carpet_royalblack.dmi'
 	icon_state = "carpet_royalblack-255"

code/game/turfs/open/floor/fancy_floor.dm

@@ -440,6 +440,30 @@
 	smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET_RED
 	canSmoothWith = SMOOTH_GROUP_CARPET_RED
 
+/turf/open/floor/carpet/plainblue
+	icon = 'icons/turf/floors/carpet_plainblue.dmi'
+	icon_state = "carpet_plainblue-255"
+	base_icon_state = "carpet_plainblue"
+	floor_tile = /obj/item/stack/tile/carpet/plainblue
+	smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET_PLAIN_BLUE
+	canSmoothWith = SMOOTH_GROUP_CARPET_PLAIN_BLUE
+
+/turf/open/floor/carpet/plaingreen
+	icon = 'icons/turf/floors/carpet_plaingreen.dmi'
+	icon_state = "carpet_plaingreen-255"
+	base_icon_state = "carpet_plaingreen"
+	floor_tile = /obj/item/stack/tile/carpet/plaingreen
+	smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET_PLAIN_GREEN
+	canSmoothWith = SMOOTH_GROUP_CARPET_PLAIN_GREEN
+
+/turf/open/floor/carpet/plainpurple
+	icon = 'icons/turf/floors/carpet_plainpurple.dmi'
+	icon_state = "carpet_plainpurple-255"
+	base_icon_state = "carpet_plainpurple"
+	floor_tile = /obj/item/stack/tile/carpet/plainpurple
+	smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET_PLAIN_PURPLE
+	canSmoothWith = SMOOTH_GROUP_CARPET_PLAIN_PURPLE
+
 /turf/open/floor/carpet/royalblack
 	icon = 'icons/turf/floors/carpet_royalblack.dmi'
 	icon_state = "carpet_royalblack-255"

code/modules/cargo/packs.dm

@@ -1929,12 +1929,12 @@
 					/obj/item/stack/tile/carpet/fifty,
 					/obj/item/stack/tile/carpet/black/fifty,
 					/obj/item/stack/tile/carpet/black/fifty,
-					/obj/item/stack/tile/carpet/blue/fifty, //yogs start - adds coloured carpets
-					/obj/item/stack/tile/carpet/blue/fifty,
-					/obj/item/stack/tile/carpet/green/fifty,
-					/obj/item/stack/tile/carpet/green/fifty,
-					/obj/item/stack/tile/carpet/purple/fifty,
-					/obj/item/stack/tile/carpet/purple/fifty) //yogs end
+					/obj/item/stack/tile/carpet/plainblue/fifty, //yogs start - adds coloured carpets
+					/obj/item/stack/tile/carpet/plainblue/fifty,
+					/obj/item/stack/tile/carpet/plaingreen/fifty,
+					/obj/item/stack/tile/carpet/plaingreen/fifty,
+					/obj/item/stack/tile/carpet/plainpurple/fifty,
+					/obj/item/stack/tile/carpet/plainpurple/fifty) //yogs end
 	crate_name = "premium carpet crate"
 
 /datum/supply_pack/service/carpet_exotic