mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-22 20:43:10 +01:00
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>
This commit is contained in:
Greenjoe12345
@@ -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"
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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.")
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user