new poisons

code/datums/components/container_craft/recipes/cooking_pot/poisons.dm

@@ -28,3 +28,122 @@
 	crafting_time = 8 SECONDS
 	finished_smell = /datum/pollutant/food/bitter
 	complete_message = "Noxious vapors rise from the mixture..."
+/datum/container_craft/cooking/herbal_tea/tranq
+	name = "Liquid tranquility"
+	created_reagent = /datum/reagent/poison/herbal/tranq
+	water_conversion = 1
+	reagent_requirements = list(
+		/datum/reagent/medicine/herbal/valeriana_draught = 20,
+	)
+	requirements = list(
+		/obj/item/alch/herb/paris = 1,
+		/obj/item/alch/herb/valeriana = 1,
+		/obj/item/alch/herb/mentha = 1
+	)
+	output_amount = 20 // Small amount of sleepy juice
+	crafting_time = 15 SECONDS
+	finished_smell = /datum/pollutant/food/bitter
+	complete_message = "The brew smells of oblivion and bitterness..."
+
+/datum/container_craft/cooking/herbal_tea/acid
+	name = "Flamekiss liqeur"
+	created_reagent = /datum/reagent/poison/herbal/acid
+	water_conversion = 1
+	reagent_requirements = list(
+		/datum/reagent/drowsbane = 10,
+	)
+	requirements = list(
+		/obj/item/reagent_containers/food/snacks/produce/fyritius = 3,
+	)
+	output_amount = 20 // LARGE amount of OH GOD IT BURNS
+	crafting_time = 15 SECONDS
+	finished_smell = /datum/pollutant/food/bitter
+	complete_message = "The fumes from the pot smell of fire and hate..."
+
+/datum/container_craft/cooking/herbal_tea/weak_paralytic
+	name = "Paralytic preblend"
+	created_reagent = /datum/reagent/toxin/spidervenom_inert
+	water_conversion = 1
+	requirements = list(
+		/obj/item/reagent_containers/spidervenom_inert = 1,
+	)
+	output_amount = 20 // doesnt actually do anything, needed as a pre requisite
+	crafting_time = 15 SECONDS
+	finished_smell = /datum/pollutant/food/bitter
+	complete_message = "The fumes from the pot smell of potential and hatred"
+
+/datum/container_craft/cooking/herbal_tea/paralytic
+	name = "Impuissance paralytic"
+	created_reagent = /datum/reagent/toxin/spidervenom_paralytic
+	water_conversion = 1
+	reagent_requirements = list(
+	/datum/reagent/toxin/spidervenom_inert = 10,
+	)
+	requirements = list(
+		/obj/item/reagent_containers/food/snacks/produce/mushroom/drowsbane = 1,
+	)
+	output_amount = 20 
+	crafting_time = 15 SECONDS
+	finished_smell = /datum/pollutant/food/bitter
+	complete_message = "The fumes from the pot smell of helplessness and suffering..."
+
+/datum/container_craft/cooking/herbal_tea/pain
+	name = "Souffrance interrogation agent"
+	created_reagent = /datum/reagent/poison/herbal/pain
+	water_conversion = 1
+	reagent_requirements = list(
+	/datum/reagent/toxin/spidervenom_inert = 10,
+	)
+	requirements = list(
+		/obj/item/alch/herb/salvia = 2,
+		/obj/item/alch/herb/euphorbia = 1,
+	)
+	output_amount = 20 
+	crafting_time = 15 SECONDS
+	finished_smell = /datum/pollutant/food/bitter
+	complete_message = "The fumes from the pot smell of sweetness and deception..."
+
+/datum/container_craft/cooking/herbal_tea/ghoulpowder
+	name = "Astuce paralytic"
+	created_reagent = /datum/reagent/poison/herbal/ghoulpowder
+	water_conversion = 1
+	reagent_requirements = list(
+		/datum/reagent/toxin/spidervenom_inert = 10,
+	)
+	requirements = list(
+		/obj/item/alch/herb/calendula = 1,
+	)
+	output_amount = 20 
+	crafting_time = 15 SECONDS
+	finished_smell = /datum/pollutant/food/bitter
+/datum/container_craft/cooking/herbal_tea/rajaijah
+	name = "Shine of the Dark Sun"
+	created_reagent = /datum/reagent/poison/herbal/rajaijah
+	water_conversion = 1
+	reagent_requirements = list(
+		/datum/reagent/blood = 20,
+	)
+	requirements = list(
+		/obj/item/organ/heart = 1,
+		/obj/item/reagent_containers/lux_tainted = 1
+	)
+	output_amount = 20 
+	crafting_time = 15 SECONDS
+	finished_smell = /datum/pollutant/food/bitter
+	complete_message = "The fumes from the pot smell of fresh shed blood and saliva..."
+
+/datum/container_craft/cooking/herbal_tea/kingsbane
+	name = "Bane of Kings"
+	created_reagent = /datum/reagent/poison/herbal/kingsbane
+	water_conversion = 1
+	reagent_requirements = list(
+		/datum/reagent/consumable/ethanol/elfblue = 20,
+	)
+	requirements = list(
+		/obj/item/alch/feaudust = 1,
+		/obj/item/reagent_containers/lux_tainted = 1
+	)
+	output_amount = 20 
+	crafting_time = 15 SECONDS
+	finished_smell = /datum/pollutant/food/bitter
+	complete_message = "The fumes from the pot smell of burnt metal and regret..."

code/datums/world_factions/zalad.dm

@@ -123,6 +123,7 @@
 		// Narcotics/Trade goods
 		/datum/supply_pack/narcotics/sigs,
 		/datum/supply_pack/narcotics/zigbox,
+		/datum/supply_pack/narcotics/spider,
 		/datum/supply_pack/narcotics/soap
 	)
 	rare_pool = list(

code/modules/cargo/supply_packs/narcotics.dm

@@ -49,6 +49,11 @@
 	cost = 25
 	contains = /obj/item/reagent_containers/glass/bottle/poison
 
+/datum/supply_pack/narcotics/spider
+	name = "Venom Gland"
+	cost = 50
+	contains = /obj/item/reagent_containers/spidervenom_inert
+
 /datum/supply_pack/narcotics/spoison
 	name = "Stamina Poison"
 	cost = 22

code/modules/crafting/alchemy/herbal_recipes.dm

@@ -486,6 +486,133 @@
 	. = ..()
 	M.add_stress(/datum/stress_event/mystical_boost)
 
+//special poisons
+
+/datum/reagent/poison/herbal/tranq
+	name = "Liquid Tranquility"
+	description = "A weaponized sleeping draught designed to knock the consumer unconcious."
+	reagent_state = LIQUID
+	color = "#4a3c5f"
+	metabolization_rate = 0.8
+	overdose_threshold = 20
+	taste_description = "exhaustion and bitter herbs" // inspired by xylazine
+	var/sleep_power = 120 SECONDS
+
+/datum/reagent/poison/herbal/tranq/on_mob_metabolize(mob/living/M)
+	. = ..()
+	M.add_stress(/datum/stress_event/herbal_calm)
+
+/datum/reagent/poison/herbal/tranq/on_mob_life(mob/living/L)
+	. = ..()
+	L.adjust_drowsiness_up_to(30 SECONDS, sleep_power)
+	L.adjust_stamina(10)
+
+/datum/reagent/poison/herbal/tranq/overdose_start(mob/living/M)
+	. = ..()
+	M.Unconscious(20 SECONDS)
+
+/datum/reagent/poison/herbal/acid
+	name = "Flamekiss Liqeur"
+	description = "Burning liquid which is tailored to dissolve flesh."
+	reagent_state = LIQUID
+	color = "#790404"
+	metabolization_rate = 0.5
+	taste_description = "burning pain beyond description"
+
+/datum/reagent/poison/herbal/acid/reaction_mob(mob/living/M, method=TOUCH, reac_volume)//Splashing people with acid HURTS
+	if(!isliving(M))
+		return
+
+	if(method in list(TOUCH, VAPOR, PATCH))
+		M.adjustFireLoss(reac_volume / 15)
+
+	return ..()
+
+/datum/reagent/poison/herbal/acid/on_mob_life(mob/living/L)
+	. = ..()
+	L.adjustFireLoss(20)
+	L.adjustOrganLoss(ORGAN_SLOT_STOMACH, 0.5)
+
+/datum/reagent/head_explosion
+	name = "Berry Juice"
+	description = "Berry juice. Totally will not make your head explode." 
+	reagent_state = LIQUID
+	color = "#790404"  // dammit Avalon, youve gotten me again. 
+	metabolization_rate = 0.1
+	taste_description = "berry, with a hint of regret"
+
+/datum/reagent/head_explosion/on_mob_add(mob/living/L)
+	. = ..()
+	if(iscarbon(L))
+		var/mob/living/carbon/C = L
+		var/obj/item/bodypart/head/dead_head = C.get_bodypart(BODY_ZONE_HEAD)
+		if(dead_head)
+			qdel(dead_head)
+	else if(L.stat != DEAD)
+		L.death()
+
+/datum/reagent/poison/herbal/ghoulpowder
+	name = "Astuce"
+	description = "A strong neurotoxin that slows metabolism to a death-like state."
+	color = "#1b8600" // rgb: 102, 71, 0
+	metabolization_rate = 0.05
+	overdose_threshold = 10
+	taste_description = "fleeing life"
+
+/datum/reagent/poison/herbal/ghoulpowder/on_mob_metabolize(mob/living/M)
+	M.adjustToxLoss(0.1)
+	if(prob(20))
+		M.set_eye_blur_if_lower(10 SECONDS)
+		M.set_confusion_if_lower(0.5 SECONDS)
+
+/datum/reagent/poison/herbal/ghoulpowder/on_mob_end_metabolize(mob/living/M)
+	REMOVE_TRAIT(M, TRAIT_FAKEDEATH, "[type]")
+	REMOVE_TRAIT(M, TRAIT_DEATHCOMA, "[type]")
+
+/datum/reagent/poison/herbal/ghoulpowder/overdose_start(mob/living/M)
+	ADD_TRAIT(M, TRAIT_FAKEDEATH, "[type]")
+	ADD_TRAIT(M, TRAIT_DEATHCOMA, "[type]")
+/datum/reagent/poison/herbal/pain
+	name = "Souffrance"
+	description = "Diluted neurotoxin designed to flay the nerves alive without causing harm. Very good for torture and interrogation."
+	reagent_state = LIQUID
+	color = "#8b0000"
+	metabolization_rate = 0.5
+	overdose_threshold = 45
+	taste_description = "deceptive sweetness, followed by burning"
+
+/datum/reagent/poison/herbal/pain/on_mob_metabolize(mob/living/M)
+	. = ..()
+	M.apply_status_effect(/datum/status_effect/debuff/alch/pain)
+	M.add_stress(/datum/stress_event/souffrance)
+
+/datum/reagent/poison/herbal/rajaijah //Goonstation my beloved
+	name = "Dark sun's shine"
+	description = "Neurodegenerative brew which makes the user go temporarily insane with a craving for violence and blood."
+	color = "#053604" // rgb: 102, 71, 0
+	metabolization_rate = 0.1
+	taste_description = "pure, unrestrained hate and hunger"
+
+/datum/reagent/poison/herbal/rajaijah/on_mob_metabolize(mob/living/M)
+	ADD_TRAIT(M, TRAIT_IN_FRENZY, "[type]")
+	ADD_TRAIT(M, TRAIT_POISONBITE, "[type]")
+
+/datum/reagent/poison/herbal/rajaijah/on_mob_end_metabolize(mob/living/M)
+	REMOVE_TRAIT(M, TRAIT_IN_FRENZY, "[type]")
+	REMOVE_TRAIT(M, TRAIT_POISONBITE, "[type]")
+
+/datum/reagent/poison/herbal/kingsbane
+	name = "Kingsbane"
+	description = "A poison used by cultists of matthios, causing the afflicted to be disgusted by money. Some say this is only the dilute version, with the real, potent one capable of ruining ones mind."
+	color = "#ffb300"
+	metabolization_rate = 0.01
+	taste_description = "cold gold"
+
+/datum/reagent/poison/herbal/kingsbane/on_mob_metabolize(mob/living/M)
+	ADD_TRAIT(M, TRAIT_MATTHIOS_CURSE, "[type]")
+
+/datum/reagent/poison/herbal/kingsbane/on_mob_end_metabolize(mob/living/M)
+	REMOVE_TRAIT(M, TRAIT_MATTHIOS_CURSE, "[type]")
 
 // Combat Enhancement
 
@@ -550,6 +677,11 @@
 
 // Mood Events for Herbal Effects
 
+/datum/stress_event/souffrance
+	desc = "I FEEL DEEPLY WRONG, EVERYTHING ITCHES!!!"
+	stress_change = 10
+	timer = 10 MINUTES
+
 /datum/stress_event/herbal_calm
 	desc = "I feel deeply relaxed and at peace."
 	stress_change = -3

code/modules/crafting/alchemy/potionbuffs.dm

@@ -86,3 +86,12 @@
 /atom/movable/screen/alert/status_effect/buff/alch/fortunepot
 	name = "Fortune"
 
+
+/datum/status_effect/debuff/alch/pain
+	id = "painpot"
+	alert_type = /atom/movable/screen/alert/status_effect/debuff/alch/pain
+	effectedstats = list(STATKEY_END = -5)
+
+/atom/movable/screen/alert/status_effect/debuff/alch/pain
+	name = "SUFFERING"
+

code/modules/reagents/chemistry/reagents/toxin_reagents.dm

@@ -261,8 +261,10 @@
 	metabolization_rate = 10
 
 /obj/item/reagent_containers/spidervenom_inert
-	list_reagents = list(/datum/reagent/toxin/spidervenom_inert = 10)
+	list_reagents = list(/datum/reagent/toxin/spidervenom_inert = 20)
+	grind_results = list(/datum/reagent/toxin/spidervenom_inert = 20)
 	name = "Pale spider gland"
 	desc = "A squishy pale gland, filled to the brim with venom of the deadly Aragn spider. Feels cold to the touch."
 	icon = 'icons/obj/webbing.dmi'
 	icon_state = "gland"
+