diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm
index 70ce6c69699..2be7cb011e9 100644
--- a/code/game/objects/items/weapons/chewables.dm
+++ b/code/game/objects/items/weapons/chewables.dm
@@ -291,3 +291,22 @@
 	reagents.add_reagent(payload, 15)
 	color = reagents.get_color()
 	desc = "[desc] This one is labeled '[initial(payload.name)]'."
+
+/obj/item/clothing/mask/chewable/solar_salve
+	name = "solar salve"
+	desc = "A paste made of various Adhomian herbs, chewed to help ward off feelings of hunger, thirst and the cold."
+	desc_extended = "A herbal mixture originating from Southern Harr'masir, Solar Salve is used to ward off the feelings of hunger, thirst and cold. Nowadays it commonly sees use in the docks of the city of Crevus."
+	gender = PLURAL
+	color = "#5f8c37"
+	icon_state = "wad"
+	type_butt = /obj/item/trash/spitwad/solar_salve
+	chem_volume = 50
+	chewtime = 300
+	reagents_to_add = list(/singleton/reagent/drugs/solar_salve = 10)
+
+/obj/item/trash/spitwad/solar_salve
+	name = "chewed plant paste"
+	desc = "A chewed up lump of plant matter. Disgusting."
+	gender = PLURAL
+	color = "#5f8c37"
+	icon_state = "spit-gum"
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 3d89cd1b805..62f64574384 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -1588,7 +1588,7 @@
 
 /obj/item/storage/box/unique/tea
 	name = "sencha cha-tin"
-	desc = "A tin bearing the logo of the Konyang-cha tea company. This one contains a bag of sencha, a type of green tea."
+	desc = "A tin bearing the logo of the Konyang-cha tea company. This one contains a bag of sencha, a type of green tea. Instructions are printed on the back: Steep one leaf with 25 units of hot water per cup in a teapot."
 	desc_extended = "A subsidiary of Gwok Group, the Konyang-cha tea company is the spur's foremost vendor of artisanal loose leaf tea, \
 				selling blends sourced from independent Konyanger farmers. Popular both on Konyang and off-world, it is considered a symbol of Konyang's culture."
 	icon = 'icons/obj/item/reagent_containers/teaware.dmi'
@@ -1602,26 +1602,55 @@
 		/obj/item/reagent_containers/food/snacks/grown/konyang_tea
 	)
 	starts_with = list(
-		/obj/item/reagent_containers/food/snacks/grown/konyang_tea = 7
+		/obj/item/reagent_containers/food/snacks/grown/konyang_tea = 12
 	)
 	foldable = null
 
 /obj/item/storage/box/unique/tea/tieguanyin
 	name = "tieguanyin cha-tin"
-	desc = "A tin bearing the logo of the Konyang-cha tea company. This one contains a bag of tieguanyin, a type of oolong tea."
+	desc = "A tin bearing the logo of the Konyang-cha tea company. This one contains a bag of tieguanyin, a type of oolong tea. Instructions are printed on the back: Steep one leaf with 25 units of hot water per cup in a teapot."
 	icon_state = "can_tie"
 	starts_with = list(
-		/obj/item/reagent_containers/food/snacks/grown/konyang_tea/tieguanyin = 7
+		/obj/item/reagent_containers/food/snacks/grown/konyang_tea/tieguanyin = 12
 	)
 
 /obj/item/storage/box/unique/tea/jaekseol
 	name = "jaekseol cha-tin"
-	desc = "A tin bearing the logo of the Konyang-cha tea company. This one contains a bag of jaekseol, a type of black tea."
+	desc = "A tin bearing the logo of the Konyang-cha tea company. This one contains a bag of jaekseol, a type of black tea. Instructions are printed on the back: Steep one leaf with 25 units of hot water per cup in a teapot."
 	icon_state = "can_jaek"
 	starts_with = list(
-		/obj/item/reagent_containers/food/snacks/grown/konyang_tea/jaekseol = 7
+		/obj/item/reagent_containers/food/snacks/grown/konyang_tea/jaekseol = 12
 	)
 
+
+/obj/item/storage/box/unique/tea/messa
+	name = "adhomian tin"
+	desc = "A tin labeled in Siik'maas. It is adorned by a blue sun, the symbol of the goddess Messa."
+	icon_state = "can_messa"
+	starts_with = list(
+		/obj/item/reagent_containers/food/snacks/grown/messas_tear_tea = 12
+	)
+	desc_extended = "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."
+
+/obj/item/storage/box/unique/tea/messa/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
+	. = ..()
+	if(GLOB.all_languages[LANGUAGE_SIIK_MAAS] in user.languages)
+		. += SPAN_NOTICE("The label says: \"Dried Messa's Tear leaves\" and then provides instructions: Steep one leaf with 25 units of hot water per cup in a teapot.")
+
+/obj/item/storage/box/unique/tea/rasnif
+	name = "ras'nif tea tin"
+	desc = "A tin with the flag of the People's Republic of Adhomai printed on it, labeled in both Siik'maas and Ceti Basic. It instructs the user to mix one packet with 25 units of hot water."
+	icon_state = "can_pra"
+	can_hold = list(
+		/obj/item/reagent_containers/food/condiment/small/packet
+	)
+	starts_with = list(
+		/obj/item/reagent_containers/food/condiment/small/packet/tea/rasnif = 12
+	)
+	desc_extended = "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."
+
 /obj/item/storage/box/telefreedom_kit
 	name = "telefreedom kit"
 	desc = "A box containing a telefreedom full kit."
diff --git a/code/game/objects/items/weapons/storage/misc.dm b/code/game/objects/items/weapons/storage/misc.dm
index b63da27d6d2..27743773b1f 100644
--- a/code/game/objects/items/weapons/storage/misc.dm
+++ b/code/game/objects/items/weapons/storage/misc.dm
@@ -231,3 +231,21 @@
 	starts_with = list(/obj/item/reagent_containers/food/snacks/grown/dried_oracle/fine = 8)
 	icon_state = "roll_vedamor"
 	item_state = "Epacket"
+
+//solar salve
+/obj/item/storage/chewables/solar_salve
+	name = "adhomian tin"
+	desc = "A tin labeled in Siik'maas. It has a picture of an icy harbour on it."
+	icon_state = "solar_salve"
+	drop_sound = 'sound/items/drop/metal_pot.ogg'
+	pickup_sound = 'sound/items/drop/metal_pot.ogg'
+	use_sound = 'sound/items/storage/box.ogg'
+	w_class = WEIGHT_CLASS_NORMAL
+	throwforce = 2
+	starts_with = list(/obj/item/clothing/mask/chewable/solar_salve = 6)
+	make_exact_fit = TRUE
+
+/obj/item/storage/chewables/solar_salve/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
+	. = ..()
+	if(GLOB.all_languages[LANGUAGE_SIIK_MAAS] in user.languages)
+		. += SPAN_NOTICE("The label says: \"Solar Salve\" and then goes on to describe how it helps against the tiredness of long shifts and cold nights.")
diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm
index 38fab55effa..bd3aeed9ddd 100644
--- a/code/game/objects/random/misc.dm
+++ b/code/game/objects/random/misc.dm
@@ -1,6 +1,6 @@
 /obj/random/smokable
-	name = "random smokable"
-	desc = "This is a random smoking item."
+	name = "random smokable/chewable"
+	desc = "This is a random smoking/chewing item."
 	icon_state = "cigarettes"
 	problist = list(
 		/obj/item/storage/box/fancy/cigarettes = 30,
@@ -14,7 +14,24 @@
 		/obj/item/storage/box/fancy/cigarettes/dpra = 2,
 		/obj/item/storage/box/fancy/cigarettes/nka = 2,
 		/obj/item/storage/box/fancy/cigarettes/federation = 2,
-		/obj/item/storage/box/fancy/cigarettes/dyn = 2
+		/obj/item/storage/box/fancy/cigarettes/dyn = 2,
+		/obj/item/storage/box/fancy/cigarettes/oracle = 3,
+		/obj/item/storage/box/fancy/cigarettes/koko = 1,
+		/obj/item/storage/chewables/rollable = 3,
+		/obj/item/storage/chewables/rollable/unathi = 1,
+		/obj/item/storage/chewables/rollable/fine = 1,
+		/obj/item/storage/chewables/rollable/nico = 1,
+		/obj/item/storage/chewables/rollable/oracle = 2,
+		/obj/item/storage/chewables/rollable/vedamor = 1,
+		/obj/item/storage/chewables/tobacco/bad = 4,
+		/obj/item/storage/chewables/tobacco = 3,
+		/obj/item/storage/chewables/tobacco/fine = 2,
+		/obj/item/storage/chewables/tobacco/federation = 1,
+		/obj/item/storage/chewables/tobacco/dyn = 1,
+		/obj/item/storage/chewables/tobacco/koko = 1,
+		/obj/item/storage/chewables/oracle = 3,
+		/obj/item/storage/box/fancy/chewables/tobacco/nico = 3,
+		/obj/item/storage/chewables/solar_salve = 1
 	)
 
 /obj/random/action_figure
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index 454f1e01edf..2832bae0d70 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -787,5 +787,7 @@
 	new /obj/item/storage/box/midynhr_water(src)
 	new /obj/item/storage/box/fancy/yoke/grape_juice(src)
 	new /obj/item/storage/box/fancy/yoke/beetle_milk(src)
+	new /obj/item/storage/box/unique/tea/rasnif(src)
+	new /obj/item/storage/box/unique/tea/messa(src)
 	new /obj/item/reagent_containers/toothpaste(src)
 	new /obj/item/reagent_containers/food/drinks/flask/vacuumflask/mouthwash(src)
diff --git a/code/modules/cargo/random_stock/t1_common.dm b/code/modules/cargo/random_stock/t1_common.dm
index 69610dae35a..4b4f5d153a3 100644
--- a/code/modules/cargo/random_stock/t1_common.dm
+++ b/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
diff --git a/code/modules/client/preference_setup/loadout/items/drugs_meds.dm b/code/modules/client/preference_setup/loadout/items/drugs_meds.dm
index a6dd2f4801d..b7424cf30ac 100644
--- a/code/modules/client/preference_setup/loadout/items/drugs_meds.dm
+++ b/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
diff --git a/code/modules/client/preference_setup/loadout/items/general.dm b/code/modules/client/preference_setup/loadout/items/general.dm
index c3815a3d380..3ded990bd39 100644
--- a/code/modules/client/preference_setup/loadout/items/general.dm
+++ b/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"
diff --git a/code/modules/cooking/machinery/commissary.dm b/code/modules/cooking/machinery/commissary.dm
index 7b2736526c6..4bba114b183 100644
--- a/code/modules/cooking/machinery/commissary.dm
+++ b/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
diff --git a/code/modules/hydroponics/seed_datums/adhomai.dm b/code/modules/hydroponics/seed_datums/adhomai.dm
index 4b2dd4ad0b1..45de4ee439b 100644
--- a/code/modules/hydroponics/seed_datums/adhomai.dm
+++ b/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)
diff --git a/code/modules/hydroponics/seed_datums/herbs.dm b/code/modules/hydroponics/seed_datums/herbs.dm
index cf74abaa29f..505ba1b64a3 100644
--- a/code/modules/hydroponics/seed_datums/herbs.dm
+++ b/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()
 	..()
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm
index 8687d78842c..f712e54b12d 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm
+++ b/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
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_species_tajara.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_species_tajara.dm
index f861647be3a..3e9fe4c6772 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_species_tajara.dm
+++ b/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."
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index 7951824bed1..f1463402c86 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/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
diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm
index 3366dbfcf1a..34de6ee77ed 100644
--- a/code/modules/reagents/reagent_containers/food/condiment.dm
+++ b/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."
diff --git a/html/changelogs/greenjoe - adhomaidrug.yml b/html/changelogs/greenjoe - adhomaidrug.yml
new file mode 100644
index 00000000000..5158697b14c
--- /dev/null
+++ b/html/changelogs/greenjoe - adhomaidrug.yml	
@@ -0,0 +1,62 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: Greenjoe
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "Adds two types of tajaran tea - Messa's tear and ras'nif. Tins are found in the loadout and bar."
+  - rscadd: "Adds solar salve. Find it in the loadout under chewing tobacco selection."
+  - rscadd: "Adds a bunch of smokeables/chewables to the loot pool for random smokeables."
+  - qol: "Adjusts the amount of reagents in the Konyang tea leaves to make brewing easier, as well as adding instructions to the tins."
+  - rscadd: "Increases the number of leaves in the Konyang tea tins from 7 to 12."
diff --git a/icons/obj/cigs_lighters.dmi b/icons/obj/cigs_lighters.dmi
index 8e91292ae90..9a9d0756640 100644
Binary files a/icons/obj/cigs_lighters.dmi and b/icons/obj/cigs_lighters.dmi differ
diff --git a/icons/obj/item/reagent_containers/teaware.dmi b/icons/obj/item/reagent_containers/teaware.dmi
index 6dfb23f5f96..e080f6781b9 100644
Binary files a/icons/obj/item/reagent_containers/teaware.dmi and b/icons/obj/item/reagent_containers/teaware.dmi differ