Adds a tea set box to the loadout and reduces the point cost of cigs (#22067)

Adds a 2 point box to the loadout that allows one to have a tin of tea,
teapot and 4 cups to properly share tea with people. Inspired after I
saw similar elsewhere and thought how annoying it was to use 3 points
just to get the tea, teapot and 1 (potentially full) cup.
Tea tins were made a bit smaller as it seemed weird they were box sized,
and so that it would actually fit in the tea set box.

The point cost of cigs were reduced to 1 point, down from 2, as it seem
to make more sense. We have entire lunchboxes and augs for 2 points,
while cigs are more an aesthetic choice.
This commit is contained in:
Casper3667
2026-03-23 09:16:03 +00:00
committed by GitHub
parent f8b1c3342c
commit 07ea1ab294
5 changed files with 70 additions and 4 deletions
@@ -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()
@@ -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."
@@ -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)