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] 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"