Poison expansion part 2

code/datums/uplink_item.dm

@@ -273,6 +273,13 @@ var/list/uplink_items = list()
 	cost = 5
 	excludefrom = list(/datum/game_mode/nuclear) //is this really needed?
 
+/datum/uplink_item/stealthy_weapons/poisonkit
+	name = "Poison Kit"
+	desc = "A box containing 3 bottles of a random poison. The first bottle contains a regular poison, the second bottle contains an utility based poison and the last bottle contains a very dangerous poison."
+	item = /obj/item/weapon/storage/box/syndie_kit/poison
+	cost = 3
+	excludefrom = list(/datum/game_mode/nuclear)
+
 /datum/uplink_item/stealthy_weapons/soap
 	name = "Syndicate Soap"
 	desc = "A sinister-looking surfactant used to clean blood stains to hide murders and prevent DNA analysis. You can also drop it underfoot to slip people."

code/game/objects/items/weapons/storage/boxes.dm

@@ -218,6 +218,22 @@
 		new /obj/item/weapon/grenade/chem_grenade/teargas(src)
 		new /obj/item/weapon/grenade/chem_grenade/teargas(src)
 
+/obj/item/weapon/storage/box/incendiary
+	name = "box of incendiary grenades (WARNING)"
+	desc = "<B>WARNING: Do not use without fire resistant clothing and internals.</B>"
+	icon_state = "incendiary"
+
+	New()
+		..()
+		new /obj/item/weapon/grenade/chem_grenade/incendiary(src)
+		new /obj/item/weapon/grenade/chem_grenade/incendiary(src)
+		new /obj/item/weapon/grenade/chem_grenade/incendiary(src)
+		new /obj/item/weapon/grenade/chem_grenade/incendiary(src)
+		new /obj/item/weapon/grenade/chem_grenade/incendiary(src)
+		new /obj/item/weapon/grenade/chem_grenade/incendiary(src)
+		new /obj/item/weapon/grenade/chem_grenade/incendiary(src)
+
+
 /obj/item/weapon/storage/box/emps
 	name = "box of emp grenades"
 	desc = "A box with 5 emp grenades."

code/game/objects/items/weapons/storage/uplink_kits.dm

@@ -172,4 +172,33 @@
 	new /obj/item/device/flashlight/emp/(src)
 	return
 
+/obj/item/weapon/storage/box/syndie_kit/poison
+	name = "boxed poison kit"
 
+/obj/item/weapon/storage/box/syndie_kit/poison/New()
+	..()
+	switch (pick("chiyanine", "maizine", "fangshenine", "amatoxin", "frostoil", "hunzine")) //poisons
+		if ("chiyanine") new /obj/item/weapon/reagent_containers/glass/bottle/syndie/chiyanine(src)
+		if ("maizine") new /obj/item/weapon/reagent_containers/glass/bottle/syndie/maizine(src)
+		if ("fangshenine") new /obj/item/weapon/reagent_containers/glass/bottle/syndie/fangshenine(src)
+		if ("amatoxin") new /obj/item/weapon/reagent_containers/glass/bottle/syndie/amatoxin(src)
+		if ("frostoil") new /obj/item/weapon/reagent_containers/glass/bottle/syndie/frostoil(src)
+		if ("hunzine") new /obj/item/weapon/reagent_containers/glass/bottle/syndie/hunzine(src)
+	switch (pick("iwazarudol", "mizarudol", "impedrezene", "beepskysmash", "chloralhydrate", "neurotoxin", "mutagen")) //utility poisons
+		if ("iwazarudol") new /obj/item/weapon/reagent_containers/glass/bottle/syndie/iwazarudol(src)
+		if ("mizarudol") new /obj/item/weapon/reagent_containers/glass/bottle/syndie/mizarudol(src)
+		if ("impedrezene") new /obj/item/weapon/reagent_containers/glass/bottle/syndie/impedrezene(src)
+		if ("beepskysmash") new /obj/item/weapon/reagent_containers/glass/bottle/syndie/beepskysmash(src)
+		if ("chloralhydrate") new /obj/item/weapon/reagent_containers/glass/bottle/syndie/chloralhydrate(src)
+		if ("neurotoxin") new /obj/item/weapon/reagent_containers/glass/bottle/syndie/neurotoxin(src)
+		if ("mutagen") new /obj/item/weapon/reagent_containers/glass/bottle/syndie/mutagen(src)
+	switch (pick("plasma", "ehuadol", "lexorin", "blazeoil", "slimejelly")) //strong poisons
+		if ("plasma") new /obj/item/weapon/reagent_containers/glass/bottle/syndie/plasma(src)
+		if ("ehuadol") new /obj/item/weapon/reagent_containers/glass/bottle/syndie/ehuadol(src)
+		if ("lexorin") new /obj/item/weapon/reagent_containers/glass/bottle/syndie/lexorin(src)
+		if ("blazeoil") new /obj/item/weapon/reagent_containers/glass/bottle/syndie/blazeoil(src)
+		if ("slimejelly") new /obj/item/weapon/reagent_containers/glass/bottle/syndie/slimejelly(src)
+	return
+
+/obj/item/weapon/storage/box/syndie_kit/incendiary
+	name = "boxed incendiary grenade"

code/game/objects/structures/crates_lockers/closets/syndicate.dm

@@ -32,6 +32,7 @@
 	new /obj/item/ammo_box/magazine/m10mm(src)
 	new /obj/item/weapon/storage/box/flashbangs(src)
 	new /obj/item/weapon/storage/box/teargas(src)
+	new /obj/item/weapon/storage/box/incendiary(src)
 	new /obj/item/weapon/gun/projectile/automatic/bulldog(src)
 	new /obj/item/weapon/gun/projectile/automatic/bulldog(src)
 	new /obj/item/weapon/gun/projectile/automatic/bulldog(src)

code/modules/events/vent_clog.dm

@@ -27,8 +27,8 @@
 	if(activeFor % interval == 0)
 		var/obj/vent = pick_n_take(vents)
 		if(vent && vent.loc)
-			var/list/gunk = list("water","carbon","flour","radium","toxin","cleaner","nutriment","condensedcapsaicin","mushroomhallucinogen","lube",
-								 "plantbgone","banana","anti_toxin","space_drugs","hyperzine","holywater","ethanol","hot_coco","pacid")
+			var/list/gunk = list("water","spore","flour","radium","frostoil","lube","jiutin","condensedcapsaicin","mushroomhallucinogen","lube",
+								 "chloralhydrate","lube","doctorsdelight","zombiepowder","hyperzine","holywater","blood","neurotoxin","mizarudol")
 			var/datum/reagents/R = new/datum/reagents(50)
 			R.my_atom = vent
 			R.add_reagent(pick(gunk), 50)

code/modules/hydroponics/grown.dm

@@ -494,8 +494,10 @@
 		..()
 		if(reagents)
 			reagents.add_reagent("nutriment", 1+round((potency / 25), 1))
+			reagents.add_reagent("blazeoil", max(0, potency-80))
 			reagents.add_reagent("capsaicin", 8+round(potency / 2, 1))
 			reagents.add_reagent("condensedcapsaicin", 4+round(potency / 4, 1))
+
 			bitesize = 1+round(reagents.total_volume / 4, 1)
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chilli/attackby(var/obj/item/O as obj, var/mob/user as mob)