From 50b4e76764d342d54c85a2f49ac8539c8c3b7341 Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Sun, 3 Nov 2019 12:58:31 -0500
Subject: [PATCH 1/3] Update bottle.dm

---
 code/modules/food_and_drinks/drinks/drinks/bottle.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index bc459fffbc..507f4e6b4a 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -559,6 +559,7 @@
 /obj/item/export/bottle
 	name = "Report this please"
 	desc = "A sealed bottle of alcohol, ready to be exported"
+	icon = 'icons/obj/drinks.dmi'
 	force = 0
 	throwforce = 0
 	throw_speed = 0

From 9af899c9c320f67542c8c51e36e7a800d0e0facb Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Sun, 3 Nov 2019 12:59:41 -0500
Subject: [PATCH 2/3] cleaning up

---
 .../objects/items/stacks/sheets/sheet_types.dm   | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index a487e9f92f..a6ff82c371 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/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"

From 3ab70cbc268121bd16571df07eca67df4b7e2377 Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Sun, 3 Nov 2019 13:04:48 -0500
Subject: [PATCH 3/3] Update sheets.dm

---
 code/modules/cargo/exports/sheets.dm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/modules/cargo/exports/sheets.dm b/code/modules/cargo/exports/sheets.dm
index 2530bdf06e..d239f7b7e7 100644
--- a/code/modules/cargo/exports/sheets.dm
+++ b/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)
\ No newline at end of file
+	export_types = list(/obj/item/stack/sheet/paperframes)