diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index e8370da2e50..efe433b75a8 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -145,14 +145,39 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \ /* * Cloth */ +var/global/list/datum/stack_recipe/cloth_recipes = list ( \ + new/datum/stack_recipe("grey jumpsuit", /obj/item/clothing/under/color/grey, 3), \ + null, \ + new/datum/stack_recipe("backpack", /obj/item/weapon/storage/backpack, 4), \ + new/datum/stack_recipe("dufflebag", /obj/item/weapon/storage/backpack/dufflebag, 6), \ + null, \ + new/datum/stack_recipe("plant bag", /obj/item/weapon/storage/bag/plants, 4), \ + new/datum/stack_recipe("book bag", /obj/item/weapon/storage/bag/books, 4), \ + new/datum/stack_recipe("mining satchel", /obj/item/weapon/storage/bag/ore, 4), \ + new/datum/stack_recipe("chemistry bag", /obj/item/weapon/storage/bag/chemistry, 4), \ + new/datum/stack_recipe("bio bag", /obj/item/weapon/storage/bag/bio, 4), \ + null, \ + new/datum/stack_recipe("rag", /obj/item/weapon/reagent_containers/glass/rag, 1), \ + new/datum/stack_recipe("black shoes", /obj/item/clothing/shoes/sneakers/black, 2), \ + new/datum/stack_recipe("bedsheet", /obj/item/weapon/bedsheet, 3), \ + new/datum/stack_recipe("empty sandbag", /obj/item/weapon/emptysandbag, 4), \ + ) + /obj/item/stack/sheet/cloth name = "cloth" - desc = "This roll of cloth is made from only the finest chemicals and bunny rabbits." + desc = "Is it cotton? Linen? Denim? Burlap? Canvas? You can't tell." singular_name = "cloth roll" icon_state = "sheet-cloth" origin_tech = "materials=2" burn_state = FLAMMABLE +/obj/item/stack/sheet/cloth/New(var/loc, var/amount=null) + recipes = cloth_recipes + return ..() + +/obj/item/stack/sheet/cloth/ten + amount = 10 + /* * Cardboard */ diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index b67fff7abda..48a05c0bd27 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -158,13 +158,8 @@ dat += "" dat += "

Leather and Cloth:

" dat += "
" + dat += "Roll of cloth: Makex10 ([50/efficiency])
" dat += "Wallet: Make ([100/efficiency])
" - dat += "Book bag: Make ([200/efficiency])
" - dat += "Empty sandbag: Make ([200/efficiency])
" - dat += "Plant bag: Make ([200/efficiency])
" - dat += "Rag: Make ([200/efficiency])
" - dat += "Mining satchel: Make ([200/efficiency])
" - dat += "Chemistry bag: Make ([200/efficiency])
" dat += "Botanical gloves: Make ([250/efficiency])
" dat += "Utility belt: Make ([300/efficiency])
" dat += "Security belt: Make ([300/efficiency])
" @@ -292,33 +287,18 @@ if (check_cost(5/efficiency)) return 0 else new/obj/item/weapon/reagent_containers/glass/bottle/nutrient/empty(src.loc) + if("cloth") + if (check_cost(50/efficiency)) + return 0 + else new/obj/item/stack/sheet/cloth(src.loc) + if("tencloth") + if (check_cost(500/efficiency)) + return 0 + else new/obj/item/stack/sheet/cloth/ten(src.loc) if("wallet") if (check_cost(100/efficiency)) return 0 else new/obj/item/weapon/storage/wallet(src.loc) - if("bkbag") - if (check_cost(200/efficiency)) - return 0 - else new/obj/item/weapon/storage/bag/books(src.loc) - if("sdbag") - if (check_cost(200/efficiency)) return 0 - else new/obj/item/weapon/emptysandbag(src.loc) - if("ptbag") - if (check_cost(200/efficiency)) - return 0 - else new/obj/item/weapon/storage/bag/plants(src.loc) - if("mnbag") - if (check_cost(200/efficiency)) - return 0 - else new/obj/item/weapon/storage/bag/ore(src.loc) - if("chbag") - if (check_cost(200/efficiency)) - return 0 - else new/obj/item/weapon/storage/bag/chemistry(src.loc) - if("rag") - if (check_cost(200/efficiency)) - return 0 - else new/obj/item/weapon/reagent_containers/glass/rag(src.loc) if("gloves") if (check_cost(250/efficiency)) return 0