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.
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
six new drinks #16320
Merged
Merged
six new drinks #16320
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
e5249a9
tested n ready
danni-boy a514834
Merge branch 'ParadiseSS13:master' into newdrinks
thatdanguy23 c9d5e52
tab indents r e e
thatdanguy23 e633a7a
tab indents r e e
thatdanguy23 bcee469
tab indents r e e
thatdanguy23 824b3c4
tab indents r e e
thatdanguy23 90168d8
please be nice daddy github, we just want to fix indents
thatdanguy23 c8fdbc3
Update code/modules/reagents/chemistry/reagents/drink_cold.dm
thatdanguy23 File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1458,3 +1458,58 @@ | |
drink_desc = "A sawed-off cola bottle filled with Fernet Cola. You can hear cuarteto music coming from the inside." | ||
taste_description = "low class heaven" | ||
remove_nutrition = 1 | ||
|
||
/datum/reagent/consumable/ethanol/gimlet | ||
name = "Gimlet" | ||
id = "gimlet" | ||
description = "A sharp cocktail dating back to the 19th century. Gin and lime, nothing else." | ||
color = "#DEF8AB" // rgb (222, 248, 171) | ||
alcohol_perc = 0.3 | ||
drink_icon = "gimlet" | ||
drink_name = "Gimlet" | ||
drink_desc = "There are debates on whether this drink should be half gin and half lime, or three parts gin and one part lime. All you know is, it's alcohol." | ||
taste_description = "sharpness" | ||
|
||
/datum/reagent/consumable/ethanol/sidecar | ||
name = "Sidecar" | ||
id = "sidecar" | ||
description = "A citrus cocktail of cognac, lemon and orange." | ||
color = "#D7A61E" // rgb (215, 166, 30) | ||
alcohol_perc = 0.4 | ||
drink_icon = "sidecar" | ||
drink_name = "Sidecar" | ||
drink_desc = "You can smell the citrus from here!" | ||
taste_description = "smooth cognac and tart citrus" | ||
|
||
/datum/reagent/consumable/ethanol/whiskey_sour | ||
name = "Whiskey Sour" | ||
id = "whiskeysour" | ||
description = "A tantalizing mixture of whiskey, sugar, lemon juice...and egg whites?" | ||
color = "#E4D629" // rgb (228, 214, 41) | ||
alcohol_perc = 0.6 | ||
drink_icon = "whiskeysour" | ||
drink_name = "Whiskey Sour" | ||
drink_desc = "Lemon and whiskey, with a cute foamy head!" | ||
taste_description = "warm whiskey and sweetness" | ||
thatdanguy23 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
/datum/reagent/consumable/ethanol/mint_julep | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This and the Pina Colada are fine actually, just the others. 馃憤 |
||
name = "Mint Julep" | ||
id = "mintjulep" | ||
description = "A refreshing, cold mix of whiskey and mint. Perfect for summer!" | ||
color = "#EAE2C8" // rgb (243, 226, 200) | ||
alcohol_perc = 0.4 | ||
drink_icon = "mintjulep" | ||
drink_name = "Mint Julep" | ||
drink_desc = "A dainty glass of whiskey and mint on the rocks. Perfect for summer!" | ||
taste_description = "sweet and cooling mint" | ||
|
||
/datum/reagent/consumable/ethanol/pina_colada | ||
name = "Pina Colada" | ||
id = "pinacolada" | ||
description = "Tropical deliciousness." | ||
color = "#F9D17D" // rgb (249, 209, 125) | ||
alcohol_perc = 0.4 | ||
drink_icon = "pinacolada" | ||
drink_name = "Pina Colada" | ||
drink_desc = "After taking a sip, you feel contractually obligated to start singing a certain song of the same name." | ||
taste_description = "tart and tropical pineapple" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
out of scope but MY GOD that entire list needs spaces after to commas.