From 8ec0a931f0f40d4b36849ed6f4f90bc66b07bbdd Mon Sep 17 00:00:00 2001
From: Sonoida <mipsio117@gmail.com>
Date: Wed, 8 Mar 2023 16:15:46 +0100
Subject: [PATCH] added presets, continuing work on research tree

also added a new fatoray sprite, thank you Ambassadoing
---
 GainStation13/icons/obj/fatoray.dmi           | Bin 580 -> 579 bytes
 .../objects/items/grenades/chem_grenade.dm    |  39 ++++++++++++++++++
 .../objects/items/stacks/sheets/mineral.dm    |   2 +-
 .../reagents/reagent_containers/glass.dm      |   6 +++
 code/modules/research/techweb/all_nodes.dm    |   2 +
 5 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/GainStation13/icons/obj/fatoray.dmi b/GainStation13/icons/obj/fatoray.dmi
index e6729ed186727328524891b310bb599acc88d8de..e7564456967344408896fd62b7ecf2a4f2f8e485 100644
GIT binary patch
delta 393
zcmV;40e1ex1j7W7BsnlpOjJd{z`!IUDOFixH8(zxlbF=h()jrJrmL*ESs34OCXqxC
zS1SzvfB?5#0NZW=I2#8^Oc_s+a-)APNkl<ZScUDC+Y*By3`7Ahsa5R%|80Y}wxhDC
zDPx^sc|5WkVnk!IvMwiUt%^f?R}>Ko#3d00E8>87T;-dNaA;pubzMzbTOcm5=lwO^
z8eSAEwt2wKnlHMyyf*xa27_t|ppP0~d=8+UGi(Mp=gQGyEOY3AwS|;R6fA$(gO(oi
zytps8D1yHtI~U3Yy6-sFIO9W|MCE!r;<AKLWVy2+aY+Dwq}Bx;;n3fW21mKffBz~&
zT;d<S<^YHOQv;52K>{ccaX~`bpIKH`*8iweav<MzaR=sJm*7Ew*ZCV%pa&-u1Vj^H
z3(pTQJ!ny{^f&M&YyDA$;Dkj%kCxYI0S4{YwkZ8ePCrFT4*lV6s!T{8kba8bZTj~C
n$*1TCPn;W&eu|O@WL;2Cbp#A8oQyny00000NkvXXu0mjfVv4Q{

delta 394
zcmV;50d@Yv1jGc8Bu+(8OjJd{z`zp{9%*W7A|N!6kB`sK&$hO<u}}`*aV9i0G%6}8
zQ6vT)9v(|eOE54nM@L6sU|=RDCjWo{w_E_*ZUC%H2{Qr&NNfu^kzJ#I8c9S!R9J=W
zl+hA`AP_~7)YQ^UtpESi&{<4Pxd@`u49CYC_bjUuV}U^6P@)b_Smb&*k1mo}F|R;5
z?5A^yLRM_a@%%*cZ5Yppa#$Y^1E$wZK53HhyeO9PF3zU;gxg&{OE;heC;`vQvRKMV
zFwLQWwlEeHvjJ7E1oIq!3K*+qJKmZjs*a&zp&#T}@aUm8`g<PbhW!<NlbdrRLEW#x
zE;s70*AJuo^nSuN$2@!N^FSaF7|}T90MRu12AK;tg8%~I*3Zy@0^HC*pf$i1o-bf6
zSW)ZP&)`dT?MD-W8y+Hfz2&oRKoh`zAlTt0dl%^0VMY4$@ZZ!i^(*o%@V+86A-v)F
o0`FhZ4!<~8;QuS~E(rV~A2N&;pi<5iyZ`_I07*qoM6N<$f@HO_KmY&$

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"