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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes Comet Trail, Molten Bubbles, and Sunset Sarsaparilla sprites #3174

Merged
merged 3 commits into from
Jul 3, 2024
Merged

Fixes Comet Trail, Molten Bubbles, and Sunset Sarsaparilla sprites #3174

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1716b97
fixes
generalthrax Jul 1, 2024
647fe50
small error
generalthrax Jul 1, 2024
6622c4e
Update code/modules/reagents/chemistry/reagents/drink_reagents.dm
generalthrax Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 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 @@ -416,7 +416,7 @@
description = "A citrusy drink from the Kepori space installation known as The Ring."
color = "#c4ff2d" // rgb: 16, 32, 0
taste_description = "sweet citrus soda"
glass_icon_state = "Comet_trail_glass"
glass_icon_state = "comet_trail_glass"
glass_name = "glass of Comet Trail"
glass_desc = "A glass of Comet Trail. Taste the stars!"

Expand Down Expand Up @@ -461,7 +461,7 @@
description = "A spicy soft drink made from a coca-like plant from Kalixcis. Popularly served both cold -and- hot, depending on the weather."
color = "#5f2010"
taste_description = "spiced cola"
glass_icon_state = "molten_glass"
glass_icon_state = "glass_brown"
glass_name = "glass of Molten Bubbles"
glass_desc = "A glass of Molten Bubbles. The spices tickle your nose."

Expand All @@ -487,6 +487,8 @@
description = "Extra refreshing for those long desert days."
color = "#af9938"
taste_description = "root-beer and asbestos"
glass_name = "glass of Sandblast Sarsaparilla"
glass_desc = "A glass of Sandblast Sarsaparilla. Perfect for those long desert days.
generalthrax marked this conversation as resolved.
Show resolved Hide resolved

/datum/reagent/consumable/lemon_lime
name = "Lemon Lime"
Expand Down
Loading