diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm index 958a1d078d..2a988fd319 100644 --- a/code/modules/power/smes_construction.dm +++ b/code/modules/power/smes_construction.dm @@ -23,7 +23,7 @@ ChargeCapacity = 1200000 // 20 kWh IOCapacity = 150000 // 150 kW -// 1000% Charge Capacity, 20% I/O Capacity +// Capacity Coils: High Capacity, Low Flow /obj/item/smes_coil/super_capacity name = "superconductive capacitance coil" desc = "A specialised type of superconductive magnetic coil with a significantly stronger containment field, allowing for larger power storage. Its IO rating is much lower, however." @@ -31,7 +31,21 @@ ChargeCapacity = 60000000 // 1000 kWh IOCapacity = 50000 // 50 kW -// 10% Charge Capacity, 400% I/O Capacity. Technically turns SMES into large super capacitor.Ideal for shields. +/obj/item/smes_coil/super_capacity/ultra + name = "ultraconductive capacitance coil" + desc = "A specialised type of superconductive magnetic coil with a significantly stronger containment field, allowing for larger power storage. Its IO rating is much lower, however." + icon_state = "smes_coil_capacitance_ultra" + ChargeCapacity = 120000000 // 2000 kWh + IOCapacity = 100000 // 100 kW + +/obj/item/smes_coil/super_capacity/hyper + name = "hyperconductive capacitance coil" + desc = "A specialised type of superconductive magnetic coil with a significantly stronger containment field, allowing for larger power storage. Its IO rating is much lower, however." + icon_state = "smes_coil_capacitance_hyper" + ChargeCapacity = 360000000 // 6000 kWh + IOCapacity = 200000 // 200 kW + +// Flow Coils: Low Capacity, High Flow /obj/item/smes_coil/super_io name = "superconductive transmission coil" desc = "A specialised type of superconductive magnetic coil with reduced storage capabilites but vastly improved power transmission capabilities, making it useful in systems which require large throughput." @@ -39,6 +53,19 @@ ChargeCapacity = 600000 // 10 kWh IOCapacity = 1000000 // 1000 kW +/obj/item/smes_coil/super_io/ultra + name = "ultraconductive transmission coil" + desc = "A specialised type of superconductive magnetic coil with reduced storage capabilites but vastly improved power transmission capabilities, making it useful in systems which require large throughput." + icon_state = "smes_coil_transmission_ultra" + ChargeCapacity = 1200000 // 20 kWh + IOCapacity = 2000000 // 2000 kW + +/obj/item/smes_coil/super_io/hyper + name = "hyperconductive transmission coil" + desc = "A specialised type of superconductive magnetic coil with reduced storage capabilites but vastly improved power transmission capabilities, making it useful in systems which require large throughput." + icon_state = "smes_coil_transmission_hyper" + ChargeCapacity = 2400000 // 40 kWh + IOCapacity = 6000000 // 6000 kW // SMES SUBTYPES - THESE ARE MAPPED IN AND CONTAIN DIFFERENT TYPES OF COILS diff --git a/code/modules/research/tg/designs/stock_part_designs.dm b/code/modules/research/tg/designs/stock_part_designs.dm index aa8cf81f1d..a9a1b59b4d 100644 --- a/code/modules/research/tg/designs/stock_part_designs.dm +++ b/code/modules/research/tg/designs/stock_part_designs.dm @@ -578,3 +578,81 @@ RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_5 ) departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING + +//SMES Coils +/datum/design_techweb/smes_basic_coil + name = "Superconductive Magnetic Coil" + build_type = PROTOLATHE + id = "smes_magnetic_coil" + materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000, MAT_COPPER = 2000) + build_path = /obj/item/smes_coil + category = list( + RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_1 + ) + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING + +/datum/design_techweb/smes_capacity_coil + name = "Superconductive Capacity Coil" + build_type = PROTOLATHE + id = "smes_cap_basic" + materials = list(MAT_STEEL = 6000, MAT_GLASS = 6000, MAT_SILVER = 2000) + build_path = /obj/item/smes_coil/super_capacity + category = list( + RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_2 + ) + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING + +/datum/design_techweb/smes_capacity_coil_ultra + name = "Ultraconductive Capacity Coil" + build_type = PROTOLATHE + id = "smes_cap_ultra" + materials = list(MAT_STEEL = 10000, MAT_GLASS = 6000, MAT_GOLD = 5000, MAT_SILVER = 5000, MAT_DURASTEEL = 3000, MAT_METALHYDROGEN = 2000, MAT_VERDANTIUM = 2000) + build_path = /obj/item/smes_coil/super_capacity/ultra + category = list( + RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_3 + ) + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING + +/datum/design_techweb/smes_capacity_coil_hyper + name = "Hyperconductive Capacity Coil" + build_type = PROTOLATHE + id = "smes_cap_hyper" + materials = list(MAT_STEEL = 15000, MAT_GLASS = 9000, MAT_GOLD = 7500, MAT_SILVER = 7500, MAT_DURASTEEL = 4500, MAT_METALHYDROGEN = 3000, MAT_VERDANTIUM = 3000, MAT_MORPHIUM = 2000) + build_path = /obj/item/smes_coil/super_capacity/hyper + category = list( + RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_5 + ) + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING + +/datum/design_techweb/smes_transmission_coil + name = "Superconductive Transmission Coil" + build_type = PROTOLATHE + id = "smes_trans_basic" + materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000, MAT_SILVER = 4000) + build_path = /obj/item/smes_coil/super_io + category = list( + RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_2 + ) + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING + +/datum/design_techweb/smes_transmission_coil_ultra + name = "Ultraconductive Transmission Coil" + build_type = PROTOLATHE + id = "smes_trans_ultra" + materials = list(MAT_STEEL = 6000, MAT_GLASS = 4000, MAT_GOLD = 6000, MAT_SILVER = 6000, MAT_DURASTEEL = 2000, MAT_METALHYDROGEN = 2000, MAT_VERDANTIUM = 2000) + build_path = /obj/item/smes_coil/super_io/ultra + category = list( + RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_3 + ) + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING + +/datum/design_techweb/smes_transmission_coil_hyper + name = "Hyperconductive Transmission Coil" + build_type = PROTOLATHE + id = "smes_trans_hyper" + materials = list(MAT_STEEL = 9000, MAT_GLASS = 6000, MAT_GOLD = 9000, MAT_SILVER = 9000, MAT_DURASTEEL = 3000, MAT_METALHYDROGEN = 3000, MAT_VERDANTIUM = 3000, MAT_MORPHIUM = 2000) + build_path = /obj/item/smes_coil/super_io/hyper + category = list( + RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_5 + ) + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING diff --git a/code/modules/research/tg/designs/tool_designs.dm b/code/modules/research/tg/designs/tool_designs.dm index febcb0aa61..21817db399 100644 --- a/code/modules/research/tg/designs/tool_designs.dm +++ b/code/modules/research/tg/designs/tool_designs.dm @@ -896,7 +896,7 @@ build_path = /obj/item/mail_scanner build_type = PROTOLATHE category = list( - RND_CATEGORY_MACHINE + RND_CATEGORY_TOOLS ) departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO @@ -907,7 +907,7 @@ build_path = /obj/item/holosign_creator/combifan build_type = PROTOLATHE category = list( - RND_CATEGORY_MACHINE + RND_CATEGORY_TOOLS ) departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING @@ -931,7 +931,7 @@ build_path = /obj/item/floor_painter build_type = PROTOLATHE category = list( - RND_CATEGORY_MACHINE + RND_CATEGORY_TOOLS ) departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_SERVICE @@ -942,6 +942,6 @@ build_path = /obj/item/holosign_creator/medical build_type = PROTOLATHE category = list( - RND_CATEGORY_MACHINE + RND_CATEGORY_TOOLS ) departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_MEDICAL diff --git a/code/modules/research/tg/techwebs/nodes/engi_nodes.dm b/code/modules/research/tg/techwebs/nodes/engi_nodes.dm index ed480a30df..596af3c2c3 100644 --- a/code/modules/research/tg/techwebs/nodes/engi_nodes.dm +++ b/code/modules/research/tg/techwebs/nodes/engi_nodes.dm @@ -16,6 +16,7 @@ "weapon_cell", "high_mech_cell", "potato_cell", + "smes_magnetic_coil", // "basic_scanning", // "condenser", // "igniter", @@ -42,6 +43,8 @@ "super_cell", "super_mech_cell", "rped", + "smes_cap_basic", + "smes_trans_basic", ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS) announce_channels = list(CHANNEL_ENGINEERING) @@ -61,6 +64,8 @@ "super_device", "hyper_device", "arped", + "smes_cap_ultra", + "smes_trans_ultra", ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS) required_experiments = list(/datum/experiment/scanning/points/machinery_tiered_scan/tier2_any) @@ -128,6 +133,8 @@ "omni_micro_laser", "giga_device", "giga_cell", + "smes_cap_hyper", + "smes_trans_hyper", ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_5_POINTS) discount_experiments = list(/datum/experiment/scanning/points/machinery_tiered_scan/tier4_any = TECHWEB_TIER_5_POINTS) diff --git a/icons/obj/stock_parts.dmi b/icons/obj/stock_parts.dmi index dcb032ca65..b8d760f74a 100644 Binary files a/icons/obj/stock_parts.dmi and b/icons/obj/stock_parts.dmi differ