Bug fixing, improvements to furniture, jukebox change

Made casino jukebox music finally only appear on its proper jukebox
made tiles have material variable, allowing recovery of carpets from padding
made carpets give padding different colors
made stools also benefit from colored padding
Made modular sofas able to be made from plasteel and plastic

code/modules/materials/material_recipes_ch.dm

@@ -1,7 +1,23 @@
+//In future consider cleaning up often used recipes by adding them to the general recipe list with material criteria
+
 /material/plasteel/generate_recipes()
 	. = ..()
 	recipes += new/datum/stack_recipe("Hammer Head", /obj/item/weapon/hammer_head, 2)
-
+	recipes += new/datum/stack_recipe_list("sofas", list( \
+		new/datum/stack_recipe("sofa middle", /obj/structure/bed/chair/sofa, 1, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("sofa left", /obj/structure/bed/chair/sofa/left, 1, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("sofa right", /obj/structure/bed/chair/sofa/right, 1, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("sofa corner", /obj/structure/bed/chair/sofa/corner, 1, one_per_turf = 1, on_floor = 1), \
+		))
+		
+/material/plastic/generate_recipes()
+	. = ..()
+	recipes += new/datum/stack_recipe_list("sofas", list( \
+		new/datum/stack_recipe("sofa middle", /obj/structure/bed/chair/sofa, 1, one_per_turf = 1, on_floor = 1, supplied_material = "[name]"), \
+		new/datum/stack_recipe("sofa left", /obj/structure/bed/chair/sofa/left, 1, one_per_turf = 1, on_floor = 1, supplied_material = "[name]"), \
+		new/datum/stack_recipe("sofa right", /obj/structure/bed/chair/sofa/right, 1, one_per_turf = 1, on_floor = 1, supplied_material = "[name]"), \
+		new/datum/stack_recipe("sofa corner", /obj/structure/bed/chair/sofa/corner, 1, one_per_turf = 1, on_floor = 1, supplied_material = "[name]"), \
+		))
 
 /material/wood/generate_recipes() //Is a little sad we cant have lovely wooden sofa
 	. = ..()

code/modules/materials/materials.dm

@@ -1011,6 +1011,8 @@ var/list/name_to_material
 	protectiveness = 3 // 13%
 	conductive = 0
 
+//CHOMPEDIT: Moved to materials_ch and changed to allow for material var
+/*
 /material/carpet
 	name = "carpet"
 	display_name = "comfy"
@@ -1023,6 +1025,7 @@ var/list/name_to_material
 	sheet_plural_name = "tiles"
 	protectiveness = 1 // 4%
 	conductive = 0
+*/
 
 /material/cotton
 	name = "cotton"

code/modules/materials/materials_ch.dm

@@ -0,0 +1,55 @@
+//CARPET materials
+
+/material/carpet
+	name = MAT_CARPET
+	display_name = "comfy"
+	use_name = "upholstery"
+	icon_colour = "#DB2626"
+	flags = MATERIAL_PADDING
+	stack_type = /obj/item/stack/tile/carpet
+	ignition_point = T0C+232
+	melting_point = T0C+300
+	sheet_singular_name = "tile"
+	sheet_plural_name = "tiles"
+	protectiveness = 1 // 4%
+	conductive = 0
+
+/material/carpet/teal
+	name = MAT_CARPET_TEAL
+	icon_colour = "#007575"
+	stack_type = /obj/item/stack/tile/carpet/teal
+
+/material/carpet/bcarpet
+	name = MAT_CARPET_BLACK
+	icon_colour = "#1B171E"
+	stack_type = /obj/item/stack/tile/carpet/bcarpet
+
+/material/carpet/blucarpet
+	name = MAT_CARPET_BLUE
+	icon_colour = "#122CDF"
+	stack_type = /obj/item/stack/tile/carpet/blucarpet
+
+/material/carpet/turcarpet
+	name = MAT_CARPET_TURQUOISE
+	icon_colour = "#41A997"
+	stack_type = /obj/item/stack/tile/carpet/turcarpet
+
+/material/carpet/sblucarpet
+	name = MAT_CARPET_SILVERBLUE
+	icon_colour = "#547EC6"
+	stack_type = /obj/item/stack/tile/carpet/sblucarpet
+
+/material/carpet/gaycarpet
+	name = MAT_CARPET_PINK
+	icon_colour = "#E12C87"
+	stack_type = /obj/item/stack/tile/carpet/gaycarpet
+
+/material/carpet/purcarpet
+	name = MAT_CARPET_PURPLE
+	icon_colour = "#B500A6"
+	stack_type = /obj/item/stack/tile/carpet/purcarpet
+
+/material/carpet/oracarpet
+	name = MAT_CARPET_ORANGE
+	icon_colour = "#D1D000"
+	stack_type = /obj/item/stack/tile/carpet/oracarpet