Merge pull request #1776 from Mark9013100/5/27/2016blue_carpet

Adds blue carpet stack

code/datums/supplypacks.dm

@@ -1242,16 +1242,19 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 
 /datum/supply_packs/carpet
 	name = "Imported carpet"
-	containertype = /obj/structure/closet
+	containertype = /obj/structure/closet/crate
 	containername = "Imported carpet crate"
 	cost = 15
 	group = "Miscellaneous"
-	contains = list(/obj/item/stack/tile/carpet)
+	contains = list(
+					/obj/item/stack/tile/carpet,
+					/obj/item/stack/tile/carpet/blue
+					)
 	amount = 50
 
 /datum/supply_packs/linoleum
 	name = "Linoleum"
-	containertype = /obj/structure/closet
+	containertype = /obj/structure/closet/crate
 	containername = "Linoleum crate"
 	cost = 15
 	group = "Miscellaneous"

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

@@ -4,6 +4,7 @@
  *		Grass
  *		Wood
  *		Carpet
+ * 		Blue Carpet
  *		Linoleum
  */
 
@@ -70,6 +71,12 @@
 	throw_range = 20
 	flags = 0
 
+/obj/item/stack/tile/carpet/blue
+	name = "blue carpet"
+	singular_name = "blue carpet"
+	desc = "A piece of blue carpet. It is the same size as a normal floor tile!"
+	icon_state = "tile-bluecarpet"
+
 /obj/item/stack/tile/floor
 	name = "floor tile"
 	singular_name = "floor tile"

code/game/turfs/flooring/flooring.dm

@@ -68,7 +68,7 @@ var/list/flooring_types
 /decl/flooring/carpet/blue
 	name = "carpet"
 	icon_base = "bcarpet"
-	build_type = null
+	build_type = /obj/item/stack/tile/carpet/blue
 	flags = TURF_HAS_EDGES | TURF_REMOVE_CROWBAR
 
 /decl/flooring/tiling