diff --git a/GainStation13/code/modules/research/designs/nutri_designs.dm b/GainStation13/code/modules/research/designs/nutri_designs.dm index d22460d1..90e9bc64 100644 --- a/GainStation13/code/modules/research/designs/nutri_designs.dm +++ b/GainStation13/code/modules/research/designs/nutri_designs.dm @@ -4,7 +4,6 @@ /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 = 5000, MAT_GLASS = 2000, MAT_CALORITE = 10000) @@ -13,6 +12,17 @@ category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE +/datum/design/fatoray_oneshot + name = "Cannonshot Fatoray" + id = "fatoray_cannon" + build_type = PROTOLATHE + materials = list(MAT_METAL = 5000, MAT_GLASS = 2000, MAT_CALORITE = 10000) + construction_time = 200 + build_path = /obj/item/gun/energy/fatoray/cannon + category = list("Weapons") + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + + // FIX THOSE VALUES LATER!! @@ -24,6 +34,6 @@ materials = list(MAT_METAL = 500, MAT_GLASS = 2000, MAT_CALORITE = 3000) construction_time = 75 build_path = /obj/item/clothing/neck/petcollar/calorite - category = list("Weapons") + category = list("Weapons") // FIX THIS CATEGORY LATER, FORGOT THEIR NAMES LUL 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 8d95d86f..a5040c32 100644 --- a/GainStation13/code/obj/weapons/fatoray.dm +++ b/GainStation13/code/obj/weapons/fatoray.dm @@ -1,4 +1,4 @@ -/////GS13 - fattening raygun +/////GS13 - fattening rayguns and ranged weapons ///The base fatoray /obj/item/gun/energy/fatoray @@ -6,6 +6,7 @@ desc = "An energy gun that fattens up anyone it hits." icon = 'GainStation13/icons/obj/fatoray.dmi' icon_state = "fatoray" + pin = null ammo_type = list(/obj/item/ammo_casing/energy/fattening) /obj/item/ammo_casing/energy/fattening @@ -18,6 +19,11 @@ name = "fat energy" icon = 'GainStation13/icons/obj/fatoray.dmi' icon_state = "ray" + ricochets_max = 50 + ricochet_chance = 80 + is_reflectable = TRUE + light_range = 2 + light_color = LIGHT_COLOR_ORANGE ///How much fat is added to the target mob? var/fat_added = 50 //Around 12.5 pounds per hit. @@ -33,25 +39,58 @@ return TRUE - +//////////////////////////////////////////////////////////////////// +////////FATORAYS THAT CAN BE MADE BY LATHES OR RESEARCHED/////////// +//////////////////////////////////////////////////////////////////// ///Weaker version of fatoray, can be produced by lathes -/obj/item/gun/energy/fatoray_weak - name = "Budget Fatoray" - desc = "An energy gun that fattens up anyone it hits. This version is considerably weaker than its original counterpart." +/obj/item/gun/energy/fatoray/weak + name = "Basic Fatoray" + desc = "An energy gun that fattens up anyone it hits. This version is considerably weaker than its original counterpart, the technology behind it seemingly still not perfected." icon = 'GainStation13/icons/obj/fatoray.dmi' /// REPLACE THESE LATER WITH UNIQUE SPRITES - Sono icon_state = "fatoray" ammo_type = list(/obj/item/ammo_casing/energy/fattening/weak) -/obj/item/ammo_casing/energy/fattening_weak - name = "weak fattening weapon lens" +/obj/item/ammo_casing/energy/fattening/weak + name = "budget fattening weapon lens" select_name = "fatten" projectile_type = /obj/item/projectile/energy/fattening/weak ///The base projectile used by the fatoray -/obj/item/projectile/energy/fattening_weak +/obj/item/projectile/energy/fattening/weak name = "fat energy" icon = 'GainStation13/icons/obj/fatoray.dmi' - icon_state = "ray" + icon_state = "ray" ///How much fat is added to the target mob? - var/fat_added = 20 + fat_added = 20 + +/////////////////////////////////////////////////// + +///Single shot glass cannon fatoray +/obj/item/gun/energy/fatoray/cannon + name = "One-Shot Fatoray" + desc = "An energy gun that fattens up anyone it hits. This version functions as a glass cannon of some sorts." + icon = 'GainStation13/icons/obj/fatoray.dmi' /// REPLACE THESE LATER WITH UNIQUE SPRITES - Sono + icon_state = "fatoray_cannon" + can_charge = 0 + recoil = 3 + slowdown = 1 + charge_sections = 3 + weapon_weight = WEAPON_HEAVY + ammo_type = list(/obj/item/ammo_casing/energy/fattening/oneshot) + + +/obj/item/ammo_casing/energy/fattening/oneshot + name = "one-shot fattening weapon lens" + select_name = "fatten" + e_cost = 300 + projectile_type = /obj/item/projectile/energy/fattening/oneshot + +/obj/item/projectile/energy/fattening/oneshot + name = "fat energy" + icon = 'GainStation13/icons/obj/fatoray.dmi' + icon_state = "cannon_ray" + ///How much fat is added to the target mob? + fat_added = 500 + +/////////////////////////////////////// diff --git a/GainStation13/icons/obj/fatoray.dmi b/GainStation13/icons/obj/fatoray.dmi index e7564456..8447bd57 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 3d9ab5be..907b9be7 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -1166,7 +1166,7 @@ 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" + prereq_ids = list("nutritech") //remember to add "adv_engi" and weapons design_ids = list("fatoray_weak") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 20) export_price = 10000