diff --git a/GainStation13/icons/obj/fatoray.dmi b/GainStation13/icons/obj/fatoray.dmi index e6729ed1..e7564456 100644 Binary files a/GainStation13/icons/obj/fatoray.dmi and b/GainStation13/icons/obj/fatoray.dmi differ diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm index 92bc25ea..cf2d7be6 100644 --- a/code/game/objects/items/grenades/chem_grenade.dm +++ b/code/game/objects/items/grenades/chem_grenade.dm @@ -597,6 +597,45 @@ beakers += B1 beakers += B2 +//GS13 - fattening grenade presets + +/obj/item/grenade/chem_grenade/lipoifier_strong + name = "lipoifier grenade" + desc = "For when you want everyone in the room to gain a couple hundred pounds." + stage = READY + +/obj/item/grenade/chem_grenade/lipoifier_strong/Initialize() + . = ..() + var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src) + var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src) + + B1.reagents.add_reagent(/datum/reagent/consumable/lipoifier, 250) + B1.reagents.add_reagent(/datum/reagent/potassium, 40) + B2.reagents.add_reagent(/datum/reagent/phosphorus, 40) + B2.reagents.add_reagent(/datum/reagent/consumable/sugar, 40) + + beakers += B1 + beakers += B2 + + +/obj/item/grenade/chem_grenade/lipoifier_weak + name = "lipoifier grenade" + desc = "For when you want everyone in the room to gain a couple dozen pounds." + stage = READY + +/obj/item/grenade/chem_grenade/lipoifier_weak/Initialize() + . = ..() + var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src) + var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src) + + B1.reagents.add_reagent(/datum/reagent/consumable/lipoifier, 40) + B1.reagents.add_reagent(/datum/reagent/potassium, 20) + B2.reagents.add_reagent(/datum/reagent/phosphorus, 20) + B2.reagents.add_reagent(/datum/reagent/consumable/sugar, 20) + + beakers += B1 + beakers += B2 + #undef READY #undef WIRED #undef EMPTY diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 8d5d534b..dd45f3d4 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -290,7 +290,7 @@ GLOBAL_LIST_INIT(bananium_recipes, list ( \ sheettype = "calorite" materials = list(MAT_CALORITE=MINERAL_MATERIAL_AMOUNT) novariants = TRUE - grind_results = list(/datum/reagent/consumable/lipoifier = 10) + grind_results = list(/datum/reagent/consumable/lipoifier = 5) point_value = 40 merge_type = /obj/item/stack/sheet/mineral/calorite diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index cb38d885..e2468c83 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -254,6 +254,12 @@ /obj/item/reagent_containers/glass/beaker/synthflesh list_reagents = list(/datum/reagent/medicine/synthflesh = 50) +/obj/item/reagent_containers/glass/beaker/lipoifier + list_reagents = list(/datum/reagent/consumable/lipoifier = 50) //GS13 + +/obj/item/reagent_containers/glass/beaker/cornoil + list_reagents = list(/datum/reagent/consumable/cornoil = 50) //GS13 + /obj/item/reagent_containers/glass/bucket name = "bucket" desc = "It's a bucket." diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 4ce6c473..35819e06 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -1158,7 +1158,9 @@ prereq_ids = list("biotech") //remember to add "engineering" design_ids = list("alien_scalpel") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 10) + boost_item_paths = list(/obj/item/gun/energy/fatoray) export_price = 5000 + hidden = TRUE /datum/techweb_node/nutri_tools id = "nutritech_tools"