diff --git a/GainStation13/code/modules/research/designs/nutri_designs.dm b/GainStation13/code/modules/research/designs/nutri_designs.dm new file mode 100644 index 00000000..2adee7c4 --- /dev/null +++ b/GainStation13/code/modules/research/designs/nutri_designs.dm @@ -0,0 +1,14 @@ +///////////////////////////////////////// +///GS13 designs / nutri designs +///////////////////////////////////////// + +/datum/design/fatoray_weak + name = "Basic Fatoray" + desc = "A weaker version of the original fatoray." + id = "fatoray_weak" + build_type = PROTOLATHE + materials = list(MAT_METAL = 1000, MAT_GLASS = 500, MAT_CALORITE = 3000) + construction_time = 75 + build_path = /obj/item/gun/energy/fatoray + category = list("Weapons") + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE diff --git a/GainStation13/code/obj/weapons/fatoray.dm b/GainStation13/code/obj/weapons/fatoray.dm index 089b046e..9897cbb1 100644 --- a/GainStation13/code/obj/weapons/fatoray.dm +++ b/GainStation13/code/obj/weapons/fatoray.dm @@ -17,7 +17,7 @@ icon = 'GainStation13/icons/obj/fatoray.dmi' icon_state = "ray" ///How much fat is added to the target mob? - var/fat_added = 25 //Around 6.25 pounds per hit. + var/fat_added = 50 //Around 12.5 pounds per hit. /obj/item/projectile/energy/fattening/on_hit(atom/target, blocked) . = ..() diff --git a/GainStation13/icons/obj/fatoray.dmi b/GainStation13/icons/obj/fatoray.dmi index 16d4bfaf..e6729ed1 100644 Binary files a/GainStation13/icons/obj/fatoray.dmi and b/GainStation13/icons/obj/fatoray.dmi differ diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index e8717fc8..4ce6c473 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -1146,3 +1146,25 @@ var/datum/techweb_node/TN = i TW.add_point_list(TN.research_costs) return TW.printout_points() + + + +/////////////// GS13 - NUTRITIONAL TECHNOLOGY + +/datum/techweb_node/nutri_tech + id = "nutritech" + display_name = "Nutritional Technology" + description = "Ending world hunger was never made easier!" + prereq_ids = list("biotech") //remember to add "engineering" + design_ids = list("alien_scalpel") + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 10) + export_price = 5000 + +/datum/techweb_node/nutri_tools + id = "nutritech_tools" + display_name = "Nutri-Tech Tools" + description = "Ever wanted to reach your daily caloric intake in just 5 seconds?" + prereq_ids = list("nutritech") //remember to add "adv_engi" + design_ids = list("fatoray_weak") + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 20) + export_price = 10000 diff --git a/tgstation.dme b/tgstation.dme index d2e993c3..e76deb34 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3324,6 +3324,7 @@ #include "GainStation13\code\modules\mob\living\emote.dm" #include "GainStation13\code\modules\reagents\chemistry\reagents\consumable_reagents.dm" #include "GainStation13\code\modules\reagents\chemistry\recipes\fatchem.dm" +#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\structure\scale.dm"