diff --git a/GainStation13/code/modules/research/designs/nutri_designs.dm b/GainStation13/code/modules/research/designs/nutri_designs.dm index 20b49d71..df2124ca 100644 --- a/GainStation13/code/modules/research/designs/nutri_designs.dm +++ b/GainStation13/code/modules/research/designs/nutri_designs.dm @@ -6,21 +6,21 @@ name = "Basic Fatoray" id = "fatoray_weak" build_type = PROTOLATHE - materials = list(MAT_METAL = 5000, MAT_GLASS = 2000, MAT_CALORITE = 10000) + materials = list(MAT_METAL = 8000, MAT_GLASS = 6000, MAT_CALORITE = 20000) construction_time = 75 - build_path = /obj/item/gun/energy/fatoray + build_path = /obj/item/gun/energy/fatoray/weak category = list("Weapons") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_SECURITY /datum/design/fatoray_cannon_weak name = "Cannonshot Fatoray" - id = "fatoray_cannon" + id = "fatoray_cannon_weak" build_type = PROTOLATHE - materials = list(MAT_METAL = 5000, MAT_GLASS = 2000, MAT_CALORITE = 10000) + materials = list(MAT_METAL = 10000, MAT_GLASS = 8000, MAT_CALORITE = 30000) construction_time = 200 build_path = /obj/item/gun/energy/fatoray/cannon_weak category = list("Weapons") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_SECURITY // FIX THOSE VALUES LATER!! @@ -31,9 +31,9 @@ desc = "A collar that amplifies caloric intake of the wearer." id = "calorite_collar" build_type = PROTOLATHE - materials = list(MAT_METAL = 500, MAT_GLASS = 2000, MAT_CALORITE = 3000) + materials = list(MAT_METAL = 1000, MAT_CALORITE = 4000) construction_time = 75 build_path = /obj/item/clothing/neck/petcollar/calorite - category = list("Weapons") // FIX THIS CATEGORY LATER, FORGOT THEIR NAMES LUL + category = list("Equipment") // FIX THIS CATEGORY LATER, FORGOT THEIR NAMES LUL departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 0d64858b..efa5fd77 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -1155,9 +1155,9 @@ id = "nutritech" display_name = "Nutritional Technology" description = "Ending world hunger was never made easier!" - prereq_ids = list("biotech") //remember to add "engineering" + prereq_ids = list("biotech") // add "engineering" if the designs get complicated later on design_ids = list("calorite_collar") - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 10) //REMEMBER TO TWEAK VALUES! + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) boost_item_paths = list(/obj/item/gun/energy/fatoray, /obj/item/gun/energy/fatoray/cannon, /obj/item/trash/fatoray_scrap1, /obj/item/trash/fatoray_scrap2) export_price = 5000 hidden = TRUE @@ -1166,9 +1166,9 @@ id = "nutritech_tools" display_name = "Nutri-Tech Tools" description = "Ever wanted to reach your daily caloric intake in just 5 seconds?" - prereq_ids = list("biotech") //remember to add "adv_engi" and weapons - design_ids = list("fatoray_weak", "fatoray_cannon") - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 20) + prereq_ids = list("biotech", "adv_engi") + design_ids = list("fatoray_weak", "fatoray_cannon_weak") + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000) boost_item_paths = list(/obj/item/gun/energy/fatoray, /obj/item/gun/energy/fatoray/cannon, /obj/item/trash/fatoray_scrap1, /obj/item/trash/fatoray_scrap2) export_price = 10000 hidden = TRUE diff --git a/tgstation.dme b/tgstation.dme index 32b33cd7..0f6a1b3d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3334,6 +3334,7 @@ #include "GainStation13\code\modules\research\designs\nutri_designs.dm" #include "GainStation13\code\modules\vending\gatocola.dm" #include "GainStation13\code\modules\vending\mealdor.dm" +#include "GainStation13\code\obj\items\minor_items.dm" #include "GainStation13\code\obj\structure\scale.dm" #include "GainStation13\code\obj\weapons\fatoray.dm" #include "hyperstation\code\__DEFINES\economy.dm"