From 0662245d80e4cd765022c32aa97cf3d8c1afaa14 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Wed, 6 Nov 2019 22:52:44 -0500 Subject: [PATCH] corrections --- code/game/objects/items/stacks/sheets/sheet_types.dm | 3 ++- code/modules/cargo/exports/parts.dm | 7 ++++--- code/modules/cargo/packs/materials.dm | 10 ++++++++++ code/modules/cargo/packs/organic.dm | 10 ---------- code/modules/research/designs/autobotter_designs.dm | 6 +++--- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index a6ff82c371..4a51cc6aea 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -279,7 +279,8 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ resistance_flags = FLAMMABLE force = 0 throwforce = 0 - pull_effort = 30 + pull_effort = 90 + is_fabric = TRUE loom_result = /obj/item/stack/sheet/cloth/silk merge_type = /obj/item/stack/sheet/cloth diff --git a/code/modules/cargo/exports/parts.dm b/code/modules/cargo/exports/parts.dm index 33f6559446..e53db0bf7b 100644 --- a/code/modules/cargo/exports/parts.dm +++ b/code/modules/cargo/exports/parts.dm @@ -6,14 +6,15 @@ export_types = list(/obj/item/solar_assembly) /datum/export/solar/tracker_board - cost = 30 + cost = 10 unit_name = "solar tracker board" export_types = list(/obj/item/electronics/tracker) /datum/export/solar/control_board - cost = 75 + cost = 15 unit_name = "solar panel control board" export_types = list(/obj/item/circuitboard/computer/solar_control) + include_subtypes = FALSE /datum/export/swarmer cost = 500 @@ -30,9 +31,9 @@ /datum/export/board/SMES cost = 20 - k_elasticity = 1/30 unit_name = "smes board" export_types = list(/obj/item/circuitboard/machine/smes) + include_subtypes = FALSE //Stock Parts diff --git a/code/modules/cargo/packs/materials.dm b/code/modules/cargo/packs/materials.dm index 494148cffd..82ae1867d4 100644 --- a/code/modules/cargo/packs/materials.dm +++ b/code/modules/cargo/packs/materials.dm @@ -65,6 +65,16 @@ contains = list(/obj/item/stack/sheet/mineral/wood/fifty) crate_name = "wood planks crate" +/datum/supply_pack/organic/rawcotton + name = "Raw Cotton Crate" + desc = "Plushies have been on the down in the market, and now due to a flood of raw cotton the price of it is so cheap, its a steal! Contains 40 raw cotton sheets." + cost = 800 // 100 net cost, 20 x 20 = 400. 300 proffit if turned into cloth sheets or more if turned to silk then 10 x 200 = 2000 + contains = list(/obj/item/stack/sheet/cotton/thirty, + /obj/item/stack/sheet/cotton/ten + ) + crate_name = "cotton crate" + crate_type = /obj/structure/closet/crate/hydroponics + /datum/supply_pack/materials/rcdammo name = "Spare RDC ammo" desc = "This crate contains sixteen RCD ammo packs, to help with any holes or projects people mite be working on." diff --git a/code/modules/cargo/packs/organic.dm b/code/modules/cargo/packs/organic.dm index 4449dc6405..78f7dc3f89 100644 --- a/code/modules/cargo/packs/organic.dm +++ b/code/modules/cargo/packs/organic.dm @@ -248,16 +248,6 @@ crate_name = "potted plants crate" crate_type = /obj/structure/closet/crate/hydroponics -/datum/supply_pack/organic/rawcotton - name = "Raw Cotton Crate" - desc = "Plushies have been on the down in the market, and now due to a flood of raw cotton the price of it is so cheap, its a steal! Contains 40 raw cotton sheets." - cost = 800 // 100 net cost, 20 x 40 = 800. 700 proffit if turned into cloth sheets or more if turned to silk - contains = list(/obj/item/stack/sheet/cotton/thirty, - /obj/item/stack/sheet/cotton/ten - ) - crate_name = "cotton crate" - crate_type = /obj/structure/closet/crate/hydroponics - /datum/supply_pack/organic/seeds name = "Seeds Crate" desc = "Big things have small beginnings. Contains thirteen different seeds." diff --git a/code/modules/research/designs/autobotter_designs.dm b/code/modules/research/designs/autobotter_designs.dm index 01ba5c93d1..895ea95842 100644 --- a/code/modules/research/designs/autobotter_designs.dm +++ b/code/modules/research/designs/autobotter_designs.dm @@ -2,14 +2,14 @@ //////////AutoBottler Designs////// /////////////////////////////////// -/datum/design/autobottler +/datum/design/board/autobottler name = "Machine Design (AutoBottler)" desc = "Allows for the construction of circuit boards used to build an Autobottler." id = "autobottler" materials = list(MAT_GLASS = 2000) build_path = /obj/item/circuitboard/machine/autobottler - category = list("Misc") - departmental_flags = DEPARTMENTAL_FLAG_CARGO + category = list ("Misc. Machinery") + departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SERVICE /datum/design/bottle materials = list(MAT_GLASS = 1200)