diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 42103363cc2..1212ba2b126 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -188,7 +188,7 @@ //multiplier checks : only stacks can have one and its value is 1, 10 ,25 or max_multiplier var/multiplier = text2num(href_list["multiplier"]) - var/max_multiplier = min(50, design_last_ordered.materials[MAT_METAL] ?round(materials.amount(MAT_METAL)/design_last_ordered.materials[MAT_METAL]):INFINITY,design_last_ordered.materials[MAT_GLASS]?round(materials.amount(MAT_GLASS)/design_last_ordered.materials[MAT_GLASS]):INFINITY) + var/max_multiplier = min(design_last_ordered.maxstack, design_last_ordered.materials[MAT_METAL] ?round(materials.amount(MAT_METAL)/design_last_ordered.materials[MAT_METAL]):INFINITY,design_last_ordered.materials[MAT_GLASS]?round(materials.amount(MAT_GLASS)/design_last_ordered.materials[MAT_GLASS]):INFINITY) var/is_stack = ispath(design_last_ordered.build_path, /obj/item/stack) if(!is_stack && (multiplier > 1)) @@ -433,7 +433,7 @@ dat += "[D.name]" if(ispath(D.build_path, /obj/item/stack)) - var/max_multiplier = min(50, D.materials[MAT_METAL] ?round(materials.amount(MAT_METAL)/D.materials[MAT_METAL]):INFINITY,D.materials[MAT_GLASS]?round(materials.amount(MAT_GLASS)/D.materials[MAT_GLASS]):INFINITY) + var/max_multiplier = min(D.maxstack, D.materials[MAT_METAL] ?round(materials.amount(MAT_METAL)/D.materials[MAT_METAL]):INFINITY,D.materials[MAT_GLASS]?round(materials.amount(MAT_GLASS)/D.materials[MAT_GLASS]):INFINITY) if (max_multiplier>10 && !disabled) dat += " x10" if (max_multiplier>25 && !disabled) @@ -465,7 +465,7 @@ dat += "[D.name]" if(ispath(D.build_path, /obj/item/stack)) - var/max_multiplier = min(50, D.materials[MAT_METAL] ?round(materials.amount(MAT_METAL)/D.materials[MAT_METAL]):INFINITY,D.materials[MAT_GLASS]?round(materials.amount(MAT_GLASS)/D.materials[MAT_GLASS]):INFINITY) + var/max_multiplier = min(D.maxstack, D.materials[MAT_METAL] ?round(materials.amount(MAT_METAL)/D.materials[MAT_METAL]):INFINITY,D.materials[MAT_GLASS]?round(materials.amount(MAT_GLASS)/D.materials[MAT_GLASS]):INFINITY) if (max_multiplier>10 && !disabled) dat += " x10" if (max_multiplier>25 && !disabled) diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index c7ffe04a458..da2e75bd488 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -470,7 +470,7 @@ obj/structure/cable/proc/cableColor(var/colorC) w_class = 2.0 throw_speed = 2 throw_range = 5 - materials = list(MAT_METAL=50, MAT_GLASS=20) + materials = list(MAT_METAL=10, MAT_GLASS=5) flags = CONDUCT slot_flags = SLOT_BELT item_state = "coil" diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index de5c02fa4a7..89a73e31715 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -48,6 +48,7 @@ other types of metals and chemistry for reagents). var/access_requirement = list(access_armory) //What special access requirements will the lockbox have? Defaults to armory. var/category = null //Primarily used for Mech Fabricators, but can be used for anything var/list/reagents = list() //List of reagents. Format: "id" = amount. + var/maxstack = 1 //A proc to calculate the reliability of a design based on tech levels and innate modifiers. //Input: A list of /datum/tech; Output: The new reliabilty. diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 6e5bcf0389b..aa9437d13e5 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -74,6 +74,15 @@ build_path = /obj/item/clothing/head/welding category = list("initial","Tools") +/datum/design/cable_coil + name = "Cable coil" + id = "cable_coil" + build_type = AUTOLATHE + materials = list(MAT_METAL = 10, MAT_GLASS = 5) + build_path = /obj/item/stack/cable_coil + category = list("initial","Tools") + maxstack = 30 + /datum/design/weldingtool name = "Welding Tool" id = "welding_tool" @@ -289,6 +298,7 @@ materials = list(MAT_GLASS = MINERAL_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/glass category = list("initial","Construction") + maxstack = 50 /datum/design/light_bulb name = "Light Bulb" @@ -313,6 +323,7 @@ materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/metal category = list("initial","Construction") + maxstack = 50 /datum/design/newscaster_frame name = "Newscaster Frame" @@ -337,6 +348,7 @@ materials = list(MAT_METAL = 1000, MAT_GLASS = MINERAL_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/rglass category = list("initial","Construction") + maxstack = 50 /datum/design/rods name = "Metal Rod" @@ -345,6 +357,7 @@ materials = list(MAT_METAL = 1000) build_path = /obj/item/stack/rods category = list("initial","Construction") + maxstack = 50 /datum/design/beaker name = "Beaker"