Tajaran tea and drug expansion (#21651)

Adds two tajaran teas to the game, Messa's Tear and ras'nif. These can
be found in the loadout and the bar, as well as random warehouse spawns.
Adds solar salve, a legal herbal substance from Adhomai, found in the
loadout and warehouse spawns.
Also performs some tweaks to the Konyang teas in order to make brewing
teas with them easier.

---------

Signed-off-by: Greenjoe12345 <33647525+Greenjoe12345@users.noreply.github.com>

code/modules/cargo/random_stock/t1_common.dm

@@ -546,5 +546,16 @@ STOCK_ITEM_COMMON(flagbox, 3)
 	var/type = pick(flagbox_type)
 	new type(L)
 
+STOCK_ITEM_COMMON(teatin, 3)
+	var/list/teatin_type = list(
+		/obj/item/storage/box/unique/tea,
+		/obj/item/storage/box/unique/tea/tieguanyin,
+		/obj/item/storage/box/unique/tea/jaekseol,
+		/obj/item/storage/box/unique/tea/messa,
+		/obj/item/storage/box/unique/tea/rasnif
+	)
+	var/type = pick(teatin_type)
+	new type(L)
+
 STOCK_ITEM_COMMON(nothing, 0)
 	// do nothing

code/modules/client/preference_setup/loadout/items/drugs_meds.dm

@@ -81,6 +81,7 @@
 	chews["Weibi's Breeze chewing tobacco"] = /obj/item/storage/chewables/tobacco/dyn
 	chews["box of Nico-Tine gum"] = /obj/item/storage/box/fancy/chewables/tobacco/nico
 	chews["Ha'zana chewing koko"] = /obj/item/storage/chewables/tobacco/koko
+	chews["tin of solar salve"] = /obj/item/storage/chewables/solar_salve
 	gear_tweaks += new /datum/gear_tweak/path(chews)
 
 /datum/gear/drugs_meds/leaves

code/modules/client/preference_setup/loadout/items/general.dm

@@ -168,19 +168,22 @@
 	if(istype(spawned_cup) && spawned_cup.reagents)
 		spawned_cup.reagents.set_temperature(T0C + 45)
 
-/datum/gear/chatins
-	display_name = "konyang-cha tins"
-	description = "Tins of tea leaves made by Konyang-cha."
+/datum/gear/teatins
+	display_name = "tea tin selection"
+	description = "A selction of various tins of tea."
 	cost = 1
 	path = /obj/item/storage/box/unique/tea
 
-/datum/gear/chatins/New()
+/datum/gear/teatins/New()
 	..()
-	var/list/chatins = list()
-	chatins["sencha cha-tin"] = /obj/item/storage/box/unique/tea
-	chatins["tieguanyin cha-tin"] = /obj/item/storage/box/unique/tea/tieguanyin
-	chatins["jaekseol cha-tin"] = /obj/item/storage/box/unique/tea/jaekseol
-	gear_tweaks += new /datum/gear_tweak/path(chatins)
+	var/list/teatins = list()
+	teatins["sencha cha-tin"] = /obj/item/storage/box/unique/tea
+	teatins["tieguanyin cha-tin"] = /obj/item/storage/box/unique/tea/tieguanyin
+	teatins["jaekseol cha-tin"] = /obj/item/storage/box/unique/tea/jaekseol
+	teatins["messa's tear tea"] = /obj/item/storage/box/unique/tea/messa
+	teatins["ras'nif tea"] = /obj/item/storage/box/unique/tea/rasnif
+
+	gear_tweaks += new /datum/gear_tweak/path(teatins)
 
 /datum/gear/teapots
 	display_name = "teapots"

code/modules/cooking/machinery/commissary.dm

@@ -449,7 +449,8 @@
 		/obj/item/storage/chewables/tobacco/dyn = 3,
 		/obj/item/storage/chewables/tobacco/koko = 3,
 		/obj/item/storage/box/fancy/chewables/tobacco/nico = 3,
-		/obj/item/storage/chewables/oracle = 3
+		/obj/item/storage/chewables/oracle = 3,
+		/obj/item/storage/chewables/solar_salve = 3
 	)
 
 /obj/item/commissary_restrock/smoking_accessory

code/modules/hydroponics/seed_datums/adhomai.dm

@@ -164,3 +164,30 @@
 
 /obj/item/seeds/sugartree
 	seed_type = "sugartree"
+
+/obj/item/reagent_containers/food/snacks/grown/messas_tear_tea
+	name = "messa's tear leaves"
+	desc = "Messa's tears are a medicinal herb found across Adhomai and its many Twin Suns churches. \
+			Its leaves, while traditionally used for treating burns, is a common choice for making traditional teas."
+	plantname = "mtear"
+	icon = 'icons/obj/item/reagent_containers/teaware.dmi'
+	icon_state = "messas_tear"
+	color = "#4CC5C7"
+
+/obj/item/reagent_containers/food/snacks/grown/messas_tear_tea/Initialize()
+	. = ..()
+	reagents.clear_reagents()
+	reagents.add_reagent(/singleton/reagent/nutriment/teagrounds/messa, 5)
+
+/obj/item/reagent_containers/food/snacks/grown/messas_tear_tea/update_desc()
+	return
+
+/obj/item/reagent_containers/food/snacks/grown/messas_tear_tea/afterattack(atom/target, mob/user, proximity, params)
+	if(proximity && target.is_open_container() && target.reagents)
+		if(!target.reagents.total_volume)
+			to_chat(user, SPAN_WARNING("You can't steep tea inside of an empty pot!"))
+			return
+		to_chat(user, SPAN_NOTICE("You steep \the [src] inside \the [target]."))
+
+		reagents.trans_to(target, reagents.total_volume)
+		qdel(src)

code/modules/hydroponics/seed_datums/herbs.dm

@@ -46,7 +46,7 @@
 	name = "sencha"
 	seed_name = "sencha leaves"
 	display_name = "sencha plant"
-	chems = list(/singleton/reagent/nutriment/teagrounds/sencha = list(4,9))
+	chems = list(/singleton/reagent/nutriment/teagrounds/sencha = list(5,9))
 
 /datum/seed/sencha/setup_traits()
 	..()
@@ -66,7 +66,7 @@
 	name = "tieguanyin"
 	seed_name = "tieguanyin leaves"
 	display_name = "tieguanyin plant"
-	chems = list(/singleton/reagent/nutriment/teagrounds/tieguanyin = list(3,8))
+	chems = list(/singleton/reagent/nutriment/teagrounds/tieguanyin = list(5,8))
 
 /datum/seed/tieguanyin/setup_traits()
 	..()
@@ -86,7 +86,7 @@
 	name = "jaekseol"
 	seed_name = "jaekseol leaves"
 	display_name = "jaekseol plant"
-	chems = list(/singleton/reagent/nutriment/teagrounds/jaekseol = list(4,7))
+	chems = list(/singleton/reagent/nutriment/teagrounds/jaekseol = list(5,7))
 
 /datum/seed/jaekseol/setup_traits()
 	..()

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm

@@ -801,5 +801,32 @@
 /singleton/reagent/drugs/dionae_stimulant/diet/final_effect(mob/living/carbon/M, alien, removed, datum/reagents/holder)
 	return
 
-#undef DRUG_MESSAGE_DELAY
+/singleton/reagent/drugs/solar_salve
+	name = "solar salve"
+	description = "A herbal mixture originating from Southern Harr'masir, Solar Salve is used to ward off the feelings of hunger, thirst and cold. Now it commonly sees use on the docks of the city of Crevus."
+	color = "#5f8c37"
+	reagent_state = SOLID
+	taste_description = "honyed herbal paste"
+	ingest_met = REM * 0.1
+	sober_message_list = list("Your hunger returns to you...", "You start to feel thirsty again...", "You start to feel the cold again...")
+	initial_effect_message_list = list("Your hunger and thirst start to fade away...", "It feels like the cold no longer bothers you...")
 
+/singleton/reagent/drugs/solar_salve/initial_effect(mob/living/carbon/human/M, alien, datum/reagents/holder)
+	if(alien == (IS_UNATHI || IS_SKRELL || IS_VAURCA)) //solar salve doesn't affect ectothermic species
+		return
+	. = ..()
+
+/singleton/reagent/drugs/solar_salve/affect_blood(mob/living/carbon/M, alien, removed, datum/reagents/holder)
+	..()
+	if(alien == (IS_UNATHI || IS_SKRELL || IS_VAURCA))
+		return
+	else
+		if(prob(7))
+			to_chat(M, SPAN_GOOD(pick("You feel sated.", "You feel warmth throughout your body.")))
+
+/singleton/reagent/drugs/solar_salve/final_effect(mob/living/carbon/human/M, alien, datum/reagents/holder)
+	if(alien == (IS_UNATHI || IS_SKRELL || IS_VAURCA))
+		return
+	. = ..()
+
+#undef DRUG_MESSAGE_DELAY

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_species_tajara.dm

@@ -265,3 +265,49 @@
 	glass_icon_state = "veteranschoice_glass"
 	glass_name = "glass of veteran's choice"
 	glass_desc = "A cocktail consisting of Messa's Mead and gunpowder."
+//
+//Tea
+//
+/singleton/reagent/nutriment/teagrounds/messa
+	name = "Messa's Tear Tea Leaves"
+	description = "Dried leaves from the Messa's Tear plant, ready to be brewed into tea."
+	reagent_state = SOLID
+	color = "#efab34"
+	taste_description = "bitter honeyed leaves"
+	condiment_name = "messa's tear tea leaves"
+	condiment_icon_state = "tea"
+	condiment_center_of_mass = list("x"=16, "y"=8)
+
+/singleton/reagent/nutriment/teagrounds/rasnif
+	name = "Ras'nif Tea Grounds"
+	description = "Made from ground ras'nif seeds, harvested from the planet of Hro'zamal."
+	reagent_state = SOLID
+	color = "#4fd24d"
+	taste_description = "tangy sweet ground seeds"
+	condiment_name = "ras'nif tea leaves"
+	condiment_icon_state = "tea"
+	condiment_center_of_mass = list("x"=16, "y"=8)
+
+/singleton/reagent/drink/tea/messa
+	name = "Messa's Tear Tea"
+	description = "Messa's tears are a medicinal herb found across Adhomai and its many Twin Suns churches. \
+					Its leaves, while traditionally used for treating burns, are a common choice for making traditional teas."
+	color = "#70a4a5"
+	taste_description = "bitter herbal honey tea"
+
+	glass_icon_state = "bigteacup"
+	glass_name = "cup of messa's tear tea"
+	glass_desc = "Messa's tears are a medicinal herb found across Adhomai and its many Twin Suns churches. \
+					Its leaves, while traditionally used for treating burns, are a common choice for making traditional teas."
+
+/singleton/reagent/drink/tea/rasnif
+	name = "Ras'nif Tea"
+	description = "A herbal tea made with Hro'zamal Ras'nifs powder. \
+					Despite the popularity of its carbonated counterpart, Ras'nif tea remains a popular drink among Hro'zamal settlers."
+	color = "#bf9c5f"
+	taste_description = "tangy fruity sweet tea"
+
+	glass_icon_state = "bigteacup"
+	glass_name = "cup of ras'nif tea"
+	glass_desc = "A herbal tea made with Hro'zamal Ras'nifs powder. \
+					Despite the popularity of its carbonated counterpart, Ras'nif tea remains a popular drink among Hro'zamal settlers."

code/modules/reagents/Chemistry-Recipes.dm

@@ -2057,28 +2057,28 @@
 	id = "tea"
 	result = /singleton/reagent/drink/tea
 	required_reagents = list(/singleton/reagent/nutriment/teagrounds = 1, /singleton/reagent/water = 5)
-	result_amount = 5
+	result_amount = 6
 
 /datum/chemical_reaction/drink/sencha
 	name = "Sencha"
 	id = "sencha"
 	result = /singleton/reagent/drink/tea/sencha
-	required_reagents = list(/singleton/reagent/nutriment/teagrounds/sencha = 1, /singleton/reagent/water = 9)
-	result_amount = 10
+	required_reagents = list(/singleton/reagent/nutriment/teagrounds/sencha = 1, /singleton/reagent/water = 5)
+	result_amount = 6
 
 /datum/chemical_reaction/drink/tieguanyin
 	name = "Tieguanyin"
 	id = "tieguanyin"
 	result = /singleton/reagent/drink/tea/tieguanyin
-	required_reagents = list(/singleton/reagent/nutriment/teagrounds/tieguanyin = 1, /singleton/reagent/water = 9)
-	result_amount = 10
+	required_reagents = list(/singleton/reagent/nutriment/teagrounds/tieguanyin = 1, /singleton/reagent/water = 5)
+	result_amount = 6
 
 /datum/chemical_reaction/drink/jaekseol
 	name = "jaekseol"
 	id = "jaekseol"
 	result = /singleton/reagent/drink/tea/jaekseol
-	required_reagents = list(/singleton/reagent/nutriment/teagrounds/jaekseol = 1, /singleton/reagent/water = 9)
-	result_amount = 10
+	required_reagents = list(/singleton/reagent/nutriment/teagrounds/jaekseol = 1, /singleton/reagent/water = 5)
+	result_amount = 6
 
 /datum/chemical_reaction/drink/cocatea
 	name = "Mate de Coca"
@@ -3905,6 +3905,20 @@
 	required_reagents = list(/singleton/reagent/drink/icetea = 3, /singleton/reagent/drink/limejuice = 1, /singleton/reagent/drink/orangejuice = 1, /singleton/reagent/drink/watermelonjuice = 1)
 	result_amount = 6
 
+/datum/chemical_reaction/drink/messas_tear_tea
+	name = "Messa's Tear Tea"
+	id = "messas_tear_tea"
+	result = /singleton/reagent/drink/tea/messa
+	required_reagents = list(/singleton/reagent/nutriment/teagrounds/messa = 1, /singleton/reagent/water = 5)
+	result_amount = 6
+
+/datum/chemical_reaction/drink/rasnif
+	name = "Ras'nif Tea"
+	id = "rasnif_tea"
+	result = /singleton/reagent/drink/tea/rasnif
+	required_reagents = list(/singleton/reagent/nutriment/teagrounds/rasnif = 1, /singleton/reagent/water = 5)
+	result_amount = 6
+
 //transmutation
 
 /datum/chemical_reaction/transmutation_silver

code/modules/reagents/reagent_containers/food/condiment.dm

@@ -380,6 +380,12 @@
 	desc = "Contains 5u of instant black tea powder. Mix with 25u of water."
 	reagents_to_add = list(/singleton/reagent/nutriment/teagrounds = 5)
 
+/obj/item/reagent_containers/food/condiment/small/packet/tea/rasnif
+	name = "ras'nif tea powder packet"
+	desc = "A small sachet with the People's Republic of Adhomai's flag on it. Contains 5u of Ras'nif tea powder. Mix with 25u of water."
+	icon_state = "packet_small_red"
+	reagents_to_add = list(/singleton/reagent/nutriment/teagrounds/rasnif = 5)
+
 /obj/item/reagent_containers/food/condiment/small/packet/cocoa
 	name = "cocoa powder packet"
 	desc = "Contains 5u of cocoa powder. Mix with 25u of water and heat."