six new drinks #16320
Merged
six new drinks #16320
Conversation
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
|
You can use the following as a CL to also include Red in it: 馃啈 thatdanguy23 Red966 |
ooh perfect! thank you! |
|
D r i n k |
farie82
approved these changes
Jul 7, 2021
Aurorablade
reviewed
Jul 7, 2021
| @@ -44,7 +44,8 @@ GLOBAL_LIST_INIT(drinks, list("beer2","hot_coco","orangejuice","tomatojuice","li | |||
| "vodkatonic","ginfizz","bahama_mama","singulo","sbiten","devilskiss","red_mead", | |||
| "mead","iced_beer","grog","aloe","andalusia","alliescocktail","soy_latte", | |||
| "cafe_latte","acidspit","amasec","neurotoxin","hippiesdelight","bananahonk", | |||
| "silencer","changelingsting","irishcarbomb","syndicatebomb","erikasurprise","driestmartini", "flamingmoe")) | |||
| "silencer","changelingsting","irishcarbomb","syndicatebomb","erikasurprise","driestmartini", "flamingmoe", | |||
| "arnold_palmer","gimlet","sidecar","whiskeysour","mintjulep","pinacolada")) | |||
There was a problem hiding this comment.
out of scope but MY GOD that entire list needs spaces after to commas.
SabreML
suggested changes
Jul 28, 2021
| drink_desc = "Lemon and whiskey, with a cute foamy head!" | ||
| taste_description = "warm whiskey and sweetness" | ||
|
|
||
| /datum/reagent/consumable/ethanol/mint_julep |
There was a problem hiding this comment.
This and the Pina Colada are fine actually, just the others. 馃憤
Comment on lines
181
to
189
| /datum/reagent/consumable/drink/cold/arnold_palmer | ||
| name = "Arnold Palmer" | ||
| id = "arnold_palmer" | ||
| description = "A wholesome mixture of lemonade and iced tea." | ||
| color = "#8B5427" // rgb: 139, 84, 39 | ||
| drink_icon = "arnoldpalmer" | ||
| drink_name = "Arnold Palmer" | ||
| drink_desc = "A wholesome mixture of lemonade and iced tea...looks like somebody didn't stir this one very well." | ||
| taste_description = "sweet and fizzy" |
There was a problem hiding this comment.
Suggested change
| /datum/reagent/consumable/drink/cold/arnold_palmer | |
| name = "Arnold Palmer" | |
| id = "arnold_palmer" | |
| description = "A wholesome mixture of lemonade and iced tea." | |
| color = "#8B5427" // rgb: 139, 84, 39 | |
| drink_icon = "arnoldpalmer" | |
| drink_name = "Arnold Palmer" | |
| drink_desc = "A wholesome mixture of lemonade and iced tea...looks like somebody didn't stir this one very well." | |
| taste_description = "sweet and fizzy" | |
| /datum/reagent/consumable/drink/cold/arnold_palmer | |
| name = "Arnold Palmer" | |
| id = "arnold_palmer" | |
| description = "A wholesome mixture of lemonade and iced tea." | |
| color = "#8B5427" // rgb: 139, 84, 39 | |
| drink_icon = "arnoldpalmer" | |
| drink_name = "Arnold Palmer" | |
| drink_desc = "A wholesome mixture of lemonade and iced tea...looks like somebody didn't stir this one very well." | |
| taste_description = "sweet and fizzy" |
There was a problem hiding this comment.
this one ended up being counted as outdated so if it's still spaces rather than tabs feel free to re-suggest it
There was a problem hiding this comment.
Ah, right I didn't include all the changes in both. Just a second.
| /datum/reagent/consumable/ethanol/whiskey_sour | ||
| name = "Whiskey Sour" | ||
| id = "whiskeysour" | ||
| description = "A tantalizing mixture of whiskey, sugar, lemon juice...and egg whites?" |
There was a problem hiding this comment.
Also for this and the drink description for the 'Arnold Palmer', you probably want an extra space after the ellipses.
Suggested change
| description = "A tantalizing mixture of whiskey, sugar, lemon juice...and egg whites?" | |
| description = "A tantalizing mixture of whiskey, sugar, lemon juice... and egg whites?" |
There was a problem hiding this comment.
also git is angry now and they failed the PR checks, f u g
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
SabreML
reviewed
Jul 28, 2021
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
SabreML
approved these changes
Jul 28, 2021
|
Yes! We need Arnold Palmers! |
variableundefined
approved these changes
Sep 2, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What Does This PR Do
adds six new drinks; one non-alcoholic and five alcoholic. sprites by Red966#7385 (Discord).
Why It's Good For The Game
more recipes for bartenders to flaunt
Images of changes
(left to right) gimlet, sidecar, whiskey sour, mint julep, pina colada, arnold palmer
Changelog
馃啈 thatdanguy23 Red966
add: added six new drinks
/:cl: