diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 34ef7cbb26e..d6234bddd7c 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -170,6 +170,15 @@ label = null illustration = null +/obj/item/storage/box/blank/teabox + max_storage_space = 12 + can_hold = list( + /obj/item/storage/box/unique/tea, + /obj/item/reagent_containers/glass/beaker/teapot, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/teacup, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/konyang + ) + /obj/item/storage/box/survival name = "emergency survival box" desc = "A faithful box that will remain with you, no matter where you go, and probably save you." @@ -1612,6 +1621,7 @@ /obj/item/reagent_containers/food/snacks/grown/konyang_tea = 12 ) foldable = null + w_class = WEIGHT_CLASS_SMALL /obj/item/storage/box/unique/tea/tieguanyin name = "tieguanyin cha-tin" 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 b7424cf30ac..e3ca1808530 100644 --- a/code/modules/client/preference_setup/loadout/items/drugs_meds.dm +++ b/code/modules/client/preference_setup/loadout/items/drugs_meds.dm @@ -39,13 +39,13 @@ /datum/gear/drugs_meds/cigarcase display_name = "cigar case" path = /obj/item/storage/box/fancy/cigarettes/cigar - cost = 2 + cost = 1 /datum/gear/drugs_meds/cigarettes display_name = "cigarette packet selection" description = "A selection of cigarette packets." path = /obj/item/storage/box/fancy/cigarettes - cost = 2 + cost = 1 flags = GEAR_HAS_DESC_SELECTION /datum/gear/drugs_meds/cigarettes/New() @@ -68,7 +68,7 @@ display_name = "chewing tobacco selection" description = "A selection of chewing tobacco." path = /obj/item/storage/chewables/tobacco - cost = 2 + cost = 1 flags = GEAR_HAS_DESC_SELECTION /datum/gear/drugs_meds/chew/New() @@ -88,7 +88,7 @@ display_name = "smokable leaf selection" description = "A selection of smokable leaves." path = /obj/item/storage/chewables/rollable - cost = 2 + cost = 1 flags = GEAR_HAS_DESC_SELECTION /datum/gear/drugs_meds/leaves/New() diff --git a/code/modules/client/preference_setup/loadout/items/general.dm b/code/modules/client/preference_setup/loadout/items/general.dm index f955f2fc6ae..5fd48c237da 100644 --- a/code/modules/client/preference_setup/loadout/items/general.dm +++ b/code/modules/client/preference_setup/loadout/items/general.dm @@ -68,6 +68,16 @@ gear_tweaks += new /datum/gear_tweak/path(lunchboxes) gear_tweaks += new /datum/gear_tweak/contents(lunchables_lunches(), lunchables_snacks(), lunchables_drinks(), lunchables_utensil()) +/datum/gear/teaset + display_name = "tea set" + description = "A box containing a tea set." + cost = 2 + path = /obj/item/storage/box/blank/teabox + +/datum/gear/teaset/New() + ..() + gear_tweaks += new /datum/gear_tweak/contents(teas_tea_type(), teas_teapot_type(), teas_teacup_type(), teas_teacup_type(), teas_teacup_type(), teas_teacup_type()) + /datum/gear/coffeecup display_name = "coffee cups" description = "A coffee cup in various designs." diff --git a/code/modules/reagents/reagent_containers/food/lunch.dm b/code/modules/reagents/reagent_containers/food/lunch.dm index e2dec63f238..a4c043f6e9f 100644 --- a/code/modules/reagents/reagent_containers/food/lunch.dm +++ b/code/modules/reagents/reagent_containers/food/lunch.dm @@ -186,6 +186,29 @@ GLOBAL_LIST_INIT(lunchables_alcohol_reagents_, list( /singleton/reagent/alcohol/sugartree_liquor/darmadhirbrew )) +GLOBAL_LIST_INIT(teas_tea_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 +)) + +GLOBAL_LIST_INIT(teas_teapot_type_, list( + /obj/item/reagent_containers/glass/beaker/teapot, + /obj/item/reagent_containers/glass/beaker/teapot/lidded, + /obj/item/reagent_containers/glass/beaker/teapot/lidded/kyusu +)) + +GLOBAL_LIST_INIT(teas_teacup_type_, list( + "plain tea cup" = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/teacup, + "clay yunomi" = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/konyang, + "grey yunomi" = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/konyang/grey, + "glazed pattern yunomi" = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/konyang/pattern, + "manila pattern yunomi" = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/konyang/manila, + "nature pattern yunomi" = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/konyang/nature +)) + /proc/lunchables_lunches() if(!(GLOB.lunchables_lunches_[GLOB.lunchables_lunches_[1]])) GLOB.lunchables_lunches_ = init_lunchable_list(GLOB.lunchables_lunches_) @@ -216,6 +239,21 @@ GLOBAL_LIST_INIT(lunchables_alcohol_reagents_, list( GLOB.lunchables_utensil_ = init_lunchable_list(GLOB.lunchables_utensil_) return GLOB.lunchables_utensil_ +/proc/teas_tea_type() + if(!(GLOB.teas_tea_type_[GLOB.teas_tea_type_[1]])) + GLOB.teas_tea_type_ = init_lunchable_list(GLOB.teas_tea_type_) + return GLOB.teas_tea_type_ + +/proc/teas_teapot_type() + if(!(GLOB.teas_teapot_type_[GLOB.teas_teapot_type_[1]])) + GLOB.teas_teapot_type_ = init_lunchable_list(GLOB.teas_teapot_type_) + return GLOB.teas_teapot_type_ + +/proc/teas_teacup_type() + if(!(GLOB.teas_teacup_type_[GLOB.teas_teacup_type_[1]])) + GLOB.teas_teacup_type_ = init_lunchable_list(GLOB.teas_teacup_type_) + return GLOB.teas_teacup_type_ + /proc/lunchables_drink_reagents() if(!(GLOB.lunchables_drink_reagents_[GLOB.lunchables_drink_reagents_[1]])) GLOB.lunchables_drink_reagents_ = init_lunchable_reagent_list(GLOB.lunchables_drink_reagents_, /singleton/reagent/drink) diff --git a/html/changelogs/TeaCeremony.yml b/html/changelogs/TeaCeremony.yml new file mode 100644 index 00000000000..d18d9675b60 --- /dev/null +++ b/html/changelogs/TeaCeremony.yml @@ -0,0 +1,8 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - rscadd: "Added a tea set box to the loadout costing 2 points. It contain 1 tin of tea, 1 teapot and 4 empty cups." + - rscadd: "Reduced the cost of loadout cigs to 1 point." + - rscadd: "Reduced the size of tea tins."