diff --git a/GainStation13/code/modules/research/designs/nutri_designs.dm b/GainStation13/code/modules/research/designs/nutri_designs.dm index 2adee7c4..d22460d1 100644 --- a/GainStation13/code/modules/research/designs/nutri_designs.dm +++ b/GainStation13/code/modules/research/designs/nutri_designs.dm @@ -7,8 +7,23 @@ 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) + materials = list(MAT_METAL = 5000, MAT_GLASS = 2000, MAT_CALORITE = 10000) construction_time = 75 build_path = /obj/item/gun/energy/fatoray category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + +// FIX THOSE VALUES LATER!! + + +/datum/design/calorite_collar + name = "Calorite Collar" + 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) + construction_time = 75 + build_path = /obj/item/clothing/neck/petcollar/calorite + 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 9897cbb1..8d95d86f 100644 --- a/GainStation13/code/obj/weapons/fatoray.dm +++ b/GainStation13/code/obj/weapons/fatoray.dm @@ -1,6 +1,8 @@ +/////GS13 - fattening raygun + ///The base fatoray /obj/item/gun/energy/fatoray - name = "fatoray" + name = "Fatoray" desc = "An energy gun that fattens up anyone it hits." icon = 'GainStation13/icons/obj/fatoray.dmi' icon_state = "fatoray" @@ -30,3 +32,26 @@ return FALSE return TRUE + + + +///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." + 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" + select_name = "fatten" + projectile_type = /obj/item/projectile/energy/fattening/weak + +///The base projectile used by the fatoray +/obj/item/projectile/energy/fattening_weak + name = "fat energy" + icon = 'GainStation13/icons/obj/fatoray.dmi' + icon_state = "ray" + ///How much fat is added to the target mob? + var/fat_added = 20 diff --git a/code/modules/projectiles/guns/misc/fatbeam.dm b/code/modules/projectiles/guns/misc/fatbeam.dm index d6715f39..b1b57884 100644 --- a/code/modules/projectiles/guns/misc/fatbeam.dm +++ b/code/modules/projectiles/guns/misc/fatbeam.dm @@ -1,6 +1,6 @@ /obj/item/gun/fatbeam name = "Fatbeam Gun" - desc = "New invention of this sector's most degenerate engineers." + desc = "Apparently used to treat malnourished patients from a safe distance... But we all know what it will truly be used for." icon = 'icons/obj/fatbeam.dmi' icon_state = "fatbeam" item_state = "fatbeam" @@ -113,7 +113,7 @@ /obj/item/gun/fatbeam/proc/on_beam_tick(var/mob/living/target) if(target.health != target.maxHealth) - new /obj/effect/temp_visual/heal(get_turf(target), "#FFC2F8") + new /obj/effect/temp_visual/heal(get_turf(target), "#fabb62") if(target?.client?.prefs?.weight_gain_weapons) target.nutrition += 50 return diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 35819e06..3d9ab5be 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -1157,7 +1157,7 @@ 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) + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 10) //REMEMBER TO TWEAK VALUES! boost_item_paths = list(/obj/item/gun/energy/fatoray) export_price = 5000 hidden = TRUE