Merge branch 'Cargo_MKII' of https://github.com/Trilbyspaceclone/Citadel-Station-13 into Cargo_MKII

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -277,9 +277,10 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
 	icon_state = "sheet-cloth"
 	item_state = "sheet-cloth"
 	resistance_flags = FLAMMABLE
-	is_fabric = TRUE
 	force = 0
 	throwforce = 0
+	pull_effort = 30
+	loom_result = /obj/item/stack/sheet/cloth/silk
 	merge_type = /obj/item/stack/sheet/cloth
 
 /obj/item/stack/sheet/cloth/Initialize(mapload, new_amount, merge = TRUE)
@@ -292,19 +293,6 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
 /obj/item/stack/sheet/cloth/thirty
 	amount = 30
 
-/obj/item/stack/sheet/cloth
-	name = "cloth"
-	desc = "Is it cotton? Linen? Denim? Burlap? Canvas? You can't tell."
-	singular_name = "cloth roll"
-	icon_state = "sheet-cloth"
-	item_state = "sheet-cloth"
-	resistance_flags = FLAMMABLE
-	force = 0
-	throwforce = 0
-	pull_effort = 30
-	loom_result = /obj/item/stack/sheet/cloth/silk
-	merge_type = /obj/item/stack/sheet/cloth
-
 /obj/item/stack/sheet/cloth/silk
 	name = "silk"
 	desc = "A long soft material. This one is just made out of cotton rather then any spiders or wyrms"

code/modules/cargo/exports/sheets.dm

@@ -115,6 +115,8 @@
 	unit_name = "sheets"
 	message = "of silk"
 	export_types = list(/obj/item/stack/sheet/cloth/silk)
+	exclude_types = list(/obj/item/stack/sheet/cloth) //Reduntent but just in case
+	include_subtypes = FALSE
 
 /datum/export/stack/duracloth
 	cost = 40
@@ -156,4 +158,4 @@
 	unit_name = "sheets"
 	cost = 30
 	message = "of paperframes"
-	export_types = list(/obj/item/stack/sheet/paperframes)
+	export_types = list(/obj/item/stack/sheet/paperframes)