mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-27 06:54:18 +01:00
Adds Konyanger tea leaves, teapots, and tea cups. (#18145)
* Adds Konyanger tea leaves, teapots, and tea cups. * teatray to the glassware * classic * teapot correction * updates --------- Co-authored-by: Matt Atlas <liermattia@gmail.com>
This commit is contained in:
Matt Atlas
@@ -514,6 +514,30 @@
|
||||
M.adjustToxLoss(1.5 * removed)
|
||||
//Copied from tea. though i feel it should be stronger as its not diluted with water
|
||||
|
||||
/singleton/reagent/nutriment/teagrounds/sencha
|
||||
name = "Sencha Leaves"
|
||||
description = "A type of green tea originating from Japan on Earth, sencha is unique in that it is steamed instead of pan-roasted like most teas. \
|
||||
It has a fresh flavor profile as a result, with flavors like seaweed, grass, or spinach greens predominant. On Konyang, it is most popular in Aoyama."
|
||||
color = "#0E1F0E"
|
||||
taste_description = "bitter seaweed and even more bitter grass"
|
||||
condiment_name = "ground sencha"
|
||||
|
||||
/singleton/reagent/nutriment/teagrounds/tieguanyin
|
||||
name = "Tieguanyin Leaves"
|
||||
description = "A type of oolong tea originating from China on Earth. Like most oolongs, its flavor is somewhere between green and black tea. \
|
||||
It has a nutty, peppery, and floral flavor profile. On Konyang, it is most popular in Ganzaodeng and New Hong Kong."
|
||||
color = "#5C6447"
|
||||
taste_description = "rough floral peppercorns"
|
||||
condiment_name = "ground tieguanyin"
|
||||
|
||||
/singleton/reagent/nutriment/teagrounds/jaekseol
|
||||
name = "jaekseol Leaves"
|
||||
description = "A type of black tea originating from Korea on Earth. It has a relatively typical flavor for a black tea, with a sweet, toasty flavor. \
|
||||
On Konyang, it is most popular in Suwon, although coffee is still a more popular beverage in general."
|
||||
color = "#534337"
|
||||
taste_description = "harsh burnt toast"
|
||||
condiment_name = "ground jaekseol"
|
||||
|
||||
/singleton/reagent/nutriment/cocagrounds
|
||||
name = "Coca Grounds"
|
||||
description = "Enjoy the great taste of tea."
|
||||
@@ -1460,6 +1484,40 @@
|
||||
metabolism = REM * 0.33
|
||||
M.adjustToxLoss(1.5 * removed)
|
||||
|
||||
/singleton/reagent/drink/tea/sencha
|
||||
name = "Sencha"
|
||||
description = "A type of green tea originating from Japan on Earth, sencha is unique in that it is steamed instead of pan-roasted like most teas. \
|
||||
It has a fresh flavor profile as a result, with flavors like seaweed, grass, or spinach greens predominant. \
|
||||
On Konyang, it is most popular in Aoyama."
|
||||
taste_description = "seaweed and bitter grass"
|
||||
glass_name = "cup of sencha"
|
||||
glass_desc = "A type of green tea originating from Japan on Earth, sencha is unique in that it is steamed instead of pan-roasted like most teas. \
|
||||
It has a fresh flavor profile as a result, with flavors like seaweed, grass, or spinach greens predominant. \
|
||||
On Konyang, it is most popular in Aoyama."
|
||||
color = "#0E1F0E"
|
||||
|
||||
/singleton/reagent/drink/tea/tieguanyin
|
||||
name = "Tieguanyin"
|
||||
description = "A type of oolong tea originating from China on Earth. Like most oolongs, its flavor is somewhere between green and black tea. \
|
||||
It has a nutty, peppery, and floral flavor profile. \
|
||||
On Konyang, it is most popular in Ganzaodeng and New Hong Kong."
|
||||
taste_description = "floral peppercorns"
|
||||
glass_name = "cup of tieguanyin"
|
||||
glass_desc = "A type of oolong tea originating from China on Earth. Like most oolongs, its flavor is somewhere between green and black tea. \
|
||||
It has a nutty, peppery, and floral flavor profile. \
|
||||
On Konyang, it is most popular in Ganzaodeng and New Hong Kong."
|
||||
color = "#5C6447"
|
||||
|
||||
/singleton/reagent/drink/tea/jaekseol
|
||||
name = "jaekseol"
|
||||
description = "A type of black tea originating from Korea on Earth. It has a relatively typical flavor for a black tea, with a sweet, toasty flavor. \
|
||||
On Konyang, it is most popular in Suwon, although coffee is still a more popular beverage in general."
|
||||
taste_description = "sweet burnt toast"
|
||||
glass_name = "cup of jaekseol"
|
||||
glass_desc = "A type of black tea originating from Korea on Earth. It has a relatively typical flavor for a black tea, with a sweet, toasty flavor. \
|
||||
On Konyang, it is most popular in Suwon, although coffee is still a more popular beverage in general."
|
||||
color = "#534337"
|
||||
|
||||
/singleton/reagent/drink/icetea
|
||||
name = "Iced Tea"
|
||||
description = "No relation to a certain rap artist/ actor."
|
||||
|
||||
@@ -2007,6 +2007,27 @@
|
||||
required_reagents = list(/singleton/reagent/nutriment/teagrounds = 1, /singleton/reagent/water = 5)
|
||||
result_amount = 5
|
||||
|
||||
/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 = 5)
|
||||
result_amount = 5
|
||||
|
||||
/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 = 5)
|
||||
result_amount = 5
|
||||
|
||||
/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 = 5)
|
||||
result_amount = 5
|
||||
|
||||
/datum/chemical_reaction/drink/cocatea
|
||||
name = "Mate de Coca"
|
||||
id = "cocatea"
|
||||
|
||||
@@ -60,13 +60,13 @@
|
||||
|
||||
return additional_evidence
|
||||
|
||||
/obj/item/reagent_containers/glass/attack_self()
|
||||
/obj/item/reagent_containers/glass/attack_self(mob/user)
|
||||
..()
|
||||
if(is_open_container())
|
||||
to_chat(usr, "<span class = 'notice'>You put the lid on \the [src].</span>")
|
||||
to_chat(user, "<span class = 'notice'>You put the lid on \the [src].</span>")
|
||||
atom_flags ^= ATOM_FLAG_OPEN_CONTAINER
|
||||
else
|
||||
to_chat(usr, "<span class = 'notice'>You take the lid off \the [src].</span>")
|
||||
to_chat(user, "<span class = 'notice'>You take the lid off \the [src].</span>")
|
||||
atom_flags |= ATOM_FLAG_OPEN_CONTAINER
|
||||
update_icon()
|
||||
|
||||
@@ -213,15 +213,6 @@
|
||||
|
||||
/obj/item/reagent_containers/glass/beaker/sulphuric/reagents_to_add = list(/singleton/reagent/acid = 60)
|
||||
|
||||
/obj/item/reagent_containers/glass/beaker/teapot
|
||||
name = "teapot"
|
||||
desc = "An elegant teapot. It simply oozes class."
|
||||
icon_state = "teapot"
|
||||
item_state = "teapot"
|
||||
unacidable = TRUE
|
||||
amount_per_transfer_from_this = 10
|
||||
volume = 120
|
||||
|
||||
/obj/item/reagent_containers/glass/beaker/pitcher
|
||||
name = "pitcher"
|
||||
desc = "Everyone's best friend in the morning."
|
||||
@@ -294,8 +285,8 @@
|
||||
to_chat(user, "<span class='notice'>You drink heavily from \the [src].</span>")
|
||||
|
||||
/obj/item/reagent_containers/glass/bucket/wood
|
||||
desc = "An old wooden bucket."
|
||||
name = "wooden bucket"
|
||||
desc = "An old wooden bucket."
|
||||
icon = 'icons/obj/janitor.dmi'
|
||||
icon_state = "woodbucket"
|
||||
item_state = "woodbucket"
|
||||
@@ -309,5 +300,4 @@
|
||||
if(isprox(D))
|
||||
to_chat(user, "This wooden bucket doesn't play well with electronics.")
|
||||
return
|
||||
|
||||
..()
|
||||
|
||||
@@ -129,3 +129,44 @@
|
||||
icon_state = "goblet"
|
||||
icon = 'icons/obj/drink_glasses/goblet.dmi'
|
||||
volume = 25
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/konyang
|
||||
name = "yunomi"
|
||||
desc = "A ceramic teacup of Japanese origin, most frequently used for teas brewed at a lower temperature because of its lack of a handle. \
|
||||
This sort of teacup is popular on Konyang, owing to the Japanese origins of some of its population. \
|
||||
This one is unglazed and the plain brownish-gray of the clay most often used on Konyang."
|
||||
icon = 'icons/obj/item/reagent_containers/teaware.dmi'
|
||||
icon_state = "yunomi"
|
||||
item_state = "yunomi"
|
||||
contained_sprite = TRUE
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/konyang/update_icon()
|
||||
if(reagents?.total_volume)
|
||||
var/mutable_appearance/filling = mutable_appearance(icon, "yunomi-[get_filling_state()]")
|
||||
filling.color = reagents.get_color()
|
||||
add_overlay(filling)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/konyang/grey
|
||||
desc = "A ceramic teacup of Japanese origin, most frequently used for teas brewed at a lower temperature because of its lack of a handle. \
|
||||
This sort of teacup is popular on Konyang, owing to the Japanese origins of some of its population. \
|
||||
This one is unglazed and a plain stone grey color."
|
||||
icon_state = "yunomi-grey"
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/konyang/pattern
|
||||
desc = "A ceramic teacup of Japanese origin, most frequently used for teas brewed at a lower temperature because of its lack of a handle. \
|
||||
This sort of teacup is popular on Konyang, owing to the Japanese origins of some of its population. \
|
||||
This one is glazed and has a simple abstract pattern."
|
||||
icon_state = "yunomi-pattern"
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/konyang/manila
|
||||
desc = "A ceramic teacup of Japanese origin, most frequently used for teas brewed at a lower temperature because of its lack of a handle. \
|
||||
This sort of teacup is popular on Konyang, owing to the Japanese origins of some of its population. \
|
||||
This one is glazed and a plain manila color."
|
||||
icon_state = "yunomi-manila"
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/konyang/nature
|
||||
desc = "A ceramic teacup of Japanese origin, most frequently used for teas brewed at a lower temperature because of its lack of a handle. \
|
||||
This sort of teacup is popular on Konyang, owing to the Japanese origins of some of its population. \
|
||||
This one is glazed and depicts a nature scene, showing trees native to Konyang."
|
||||
icon_state = "yunomi-nature"
|
||||
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
/obj/item/reagent_containers/glass/beaker/teapot
|
||||
name = "teapot"
|
||||
desc = "An elegant teapot. It simply oozes class."
|
||||
icon_state = "teapot"
|
||||
item_state = "teapot"
|
||||
unacidable = TRUE
|
||||
amount_per_transfer_from_this = 10
|
||||
volume = 120
|
||||
|
||||
/obj/item/reagent_containers/glass/beaker/teapot/lidded
|
||||
name = "gaiwan"
|
||||
desc = "A lidded ceramic bowl of Chinese origin. Used to infuse a large amount of tea into a small amount of water. \
|
||||
To pour, the lid is pinched down into the bowl with a small gap left open for the tea. Traditionally used across the Alliance."
|
||||
icon = 'icons/obj/item/reagent_containers/teaware.dmi'
|
||||
icon_state = "gaiwan"
|
||||
item_state = "gaiwan"
|
||||
contained_sprite = TRUE
|
||||
drop_sound = 'sound/items/drop/bottle.ogg'
|
||||
pickup_sound = 'sound/items/pickup/bottle.ogg'
|
||||
volume = 60
|
||||
fragile = 0
|
||||
var/lid_type = /obj/item/teapot_lid
|
||||
var/obj/item/teapot_lid/lid
|
||||
|
||||
/obj/item/reagent_containers/glass/beaker/teapot/lidded/Initialize()
|
||||
. = ..()
|
||||
lid = new lid_type()
|
||||
update_icon()
|
||||
|
||||
/obj/item/reagent_containers/glass/beaker/teapot/lidded/update_icon()
|
||||
if(lid)
|
||||
icon_state = initial(icon_state) + "_lid"
|
||||
cut_overlays()
|
||||
else
|
||||
..()
|
||||
icon_state = initial(icon_state)
|
||||
|
||||
/obj/item/reagent_containers/glass/beaker/teapot/lidded/attackby(obj/item/W, mob/user)
|
||||
. = ..()
|
||||
if(istype(W, lid_type) && !lid)
|
||||
user.drop_from_inventory(W, src)
|
||||
lid = W
|
||||
to_chat(user, SPAN_NOTICE("You slide the lid onto \the [src]."))
|
||||
update_icon()
|
||||
return TRUE
|
||||
|
||||
/obj/item/reagent_containers/glass/beaker/teapot/lidded/attack_self(mob/user)
|
||||
if(lid)
|
||||
if(user.put_in_hands(lid))
|
||||
lid = null
|
||||
to_chat(user, SPAN_NOTICE("You slide off \the [src]'s lid."))
|
||||
update_icon()
|
||||
return TRUE
|
||||
|
||||
/obj/item/reagent_containers/glass/beaker/teapot/lidded/is_open_container()
|
||||
return lid ? FALSE : TRUE
|
||||
|
||||
/obj/item/reagent_containers/glass/beaker/teapot/lidded/kyusu
|
||||
name = "kyusu"
|
||||
desc = "A ceramic yokode kyusu - or side-handle teapot. This sort of teapot is popular on Konyang, owing to the Japanese origins of some of its population. \
|
||||
To pour, one grasps the handle while holding the lid down with the index finger."
|
||||
icon_state = "kyusu"
|
||||
item_state = "kyusu"
|
||||
lid_type = /obj/item/teapot_lid/kyusu
|
||||
|
||||
/obj/item/teapot_lid
|
||||
name = "gaiwan lid"
|
||||
desc = "A lid for a gaiwan."
|
||||
icon = 'icons/obj/item/reagent_containers/teaware.dmi'
|
||||
icon_state = "gaiwan-lid"
|
||||
|
||||
/obj/item/teapot_lid/kyusu
|
||||
name = "kyusu lid"
|
||||
desc = "A lid for a yokode kyusu."
|
||||
icon_state = "kyusu-lid"
|
||||
Reference in New Issue
Block a user