Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds Bubble tea to the game / Fixes drinks name #10072

Merged
merged 6 commits into from
Oct 27, 2023
Merged

Adds Bubble tea to the game / Fixes drinks name #10072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
44a0b51
Bubble Tea
ClownMoff Oct 22, 2023
5676c3f
I think I did something wrong. Bubble TeaV2
ClownMoff Oct 22, 2023
7273034
Changed description of the bubble tea taste
ClownMoff Oct 22, 2023
1ab76f5
BubbleTeaIconFix
ClownMoff Oct 22, 2023
860368f
Update code/modules/reagents/chemistry/reagents/drink_reagents.dm
ClownMoff Oct 26, 2023
8989aa2
Update drink_reagents.dm
ClownMoff Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 10 additions & 1 deletion code/modules/food_and_drinks/drinks/drinks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
// Formatting is the same as food.

/obj/item/reagent_containers/food/drinks/coffee
name = "robust coffee"
name = "Robust coffee"
desc = "Careful, the beverage you're about to enjoy is extremely hot."
icon_state = "coffee"
list_reagents = list(/datum/reagent/consumable/coffee = 30)
Expand All @@ -222,6 +222,15 @@
isGlass = FALSE
foodtype = BREAKFAST

/obj/item/reagent_containers/food/drinks/bubble_tea
name = "Bubble tea"
desc = "Refreshing! You aren't sure what those things in the bottom are."
icon_state = "bubble_tea"
list_reagents = list(/datum/reagent/consumable/bubble_tea = 50)
foodtype = SUGAR
spillable = TRUE
isGlass = FALSE

/obj/item/reagent_containers/food/drinks/ice
name = "ice cup"
desc = "Careful, cold ice, do not chew."
Expand Down
11 changes: 11 additions & 0 deletions code/modules/reagents/chemistry/reagents/drink_reagents.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1019,3 +1019,14 @@
M.adjust_disgust(30)
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "quality_drink", /datum/mood_event/quality_bad)
. = ..()

/datum/reagent/consumable/bubble_tea
name = "Bubble Tea"
description = "Refreshing! You aren't sure what those things in the bottom are."
color = "#DFC7AB"
chem_flags = CHEMICAL_RNG_GENERAL | CHEMICAL_RNG_BOTANY | CHEMICAL_GOAL_BARTENDER_SERVING
quality = DRINK_VERYGOOD
taste_description = "sweet, creamy and silky tea with chewy tapioca pearls"
glass_icon_state = "bubble_tea"
glass_name = "Bubble Tea"
glass_desc = "A cup of refreshing bubble tea."
3 changes: 2 additions & 1 deletion code/modules/vending/coffee.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
light_color = LIGHT_COLOR_BROWN
products = list(/obj/item/reagent_containers/food/drinks/coffee = 6,
/obj/item/reagent_containers/food/drinks/mug/tea = 6,
/obj/item/reagent_containers/food/drinks/mug/cocoa = 3)
/obj/item/reagent_containers/food/drinks/mug/cocoa = 3,
/obj/item/reagent_containers/food/drinks/bubble_tea = 4)
contraband = list(/obj/item/reagent_containers/food/drinks/ice = 12)
refill_canister = /obj/item/vending_refill/coffee
default_price = 10
Expand Down
Binary file modified icons/obj/drinks.dmi
View file
Open in desktop
Binary file not shown.