The Drinkening #3019
Merged
The Drinkening #3019
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
…rs Monkey Energy to Xeno-Energy, dutch hot coco to Solar's Best Hot Cocoa, robust coffee to Solar's Best black coffee, changes the recipes that call for Dr. Gibb to instead require Tradixx. please god dont fuck this up
…rent reflavorings, and adds reagents for Molten Bubbles and Plasma Fizz.
…zer joke instead, this might be orphaning the lemon-lime soda? if so I can just Make Something for it
…n drinks.dm, changes the name of reagents.
…into drinksUpdate
…hiptest into drinksUpdate
…his point doesn't matter
…hiptest into drinksUpdate
|
No updatepaths? Its over |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
…to drinksUpdate
|
no react andies allowed |
Imaginos16
added
Test Merge Candidate
|
TM requested by PR author. |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
…to drinksUpdate
shiptest-server
pushed a commit
that referenced
this pull request
Jun 17, 2024
MrCat15352
pushed a commit
to MrCat15352/MrCat
that referenced
this pull request
Jun 22, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> This pull request contains an incredible number of changes to item names and descriptions regarding everything drinkable. This has been a long time coming, and was put off for quite a while due to my own procrastination. This is almost certainly going to have mapping errors, but I'm not checking them all myself. I'll let the tests figure it out for me. - Space Mountain Wind changed to Comet Trail - Dr. Gibb changed to Tadrixx - Starkist changed to Lunapunch - PWR Game changed to Pacfuel - Lemon Lime changed to Orange Soda - Nuka Cola removed - Thirteen Loko changed to Vimukti - Fetching Fizz removed - Manhattan Project removed - Narsour removed - Monkey Energy changed to Xeno Energy - unbranded water bottle changed to Ryuunosuke Reserve - space beer changed to Bizircan Brewery GDM - Magm-Ale changed to RHIMBASA TAP - Space Cola reflavored - Tonic water reflavored - Soda water reflavored - Grey Bull changed to Crosstalk - E-Fuel removed - Canned Air reflavored - Molten Bubbles reflavored and refactored - Plasma Fizz reflavored and refactored - Gin reflavored - Whiskey reflavored - Vodka reflavored - Tequila reflavored - Patron reflavored - Rum reflavored - Holy water reflavored - Vermouth reflavored - Kahlua reflavored - Goldschlager reflavored - Cognac reflavored - Wine reflavored - Absinthe reflavored, randomization removed - Premium Absinthe reflavored - Lizard Wine reflavored, again - Hard Cider reflavored - Amaretto reflavored - Grappa reflavored - Sake reflavored, as well as random reskins - Fernet reflavored - Orange Juice reflavored - Cream reflavored - Tomato Juice reflavored - Lime Juice reflavored - Grenadine reflavored - Applejack reflavored - Champagne reflavored - Blazaam reflavored to Hyperspace Highball(I've never even heard of this?) - Trappist Bleu reflavored - Hooch reflavored - Moonshine reflavored - Creme de Coconut reflavored - Cuba Libre reflavored to Frontier Libre - White Russian reflavored to White Gezenan - Irish Cream reflavored to Zohil Cream - Manly Dorf reflavored to Shortstop - B-52 reflavored to AM-G - Irish Coffee reflavored to Gezenan Coffee - Black Russian reflavored to Black Rachnid - Manhattan reflavored to Twelve Crossings - Red Mead reflavored to Drop-pod - Allies Cocktail reflavored to Canton Cocktail - Acid Spit reflavored to Cracked Moon - Amasec reflavored to Ren Kirsi - Irish Car Bomb reflavored to Lightspeed - Syndicate Bomb reflavored to Gorlex Surprise - Hivemind Eraser reflavored to Hivemind - Erika Surprise reflavored to Terraformer Surprise - Driest Martini reflavored to Saltflat - Banana Honk reflavored to Creamtruck - Silencer reflavored to Choker - Hippie's Delight reflavored to Between the Mandibles - Alexander reflavored to Ash-Shield - Amaretto Alexander reflavored to Happy Huntsman - Sidecar reflavored to Bridge Bunny - Kamikaze reflavored to Mothball - Moscow Mule reflavored to Gorlex Gator - Fernet Cola reflavored to Weldline - Branca Menta reflavored to Mirage - Bug Spray reflavored to Stunball - Jack Rose reflavored to Jackalope - Duplex reflavored to North-South - Mauna Loa reflavored to Inner Fire - Mudder's Milk reflavored to Miner's Milk - Freezer Burn reflavored to Hullbreach - Archmagus' brew removed - Cogchamp removed - Shambler's Juice reflavored to Shoal Punch - Gibb Floats reflavored to Tadrixx Float Vending machines reflavored Good lord I hope I didn't miss anything. Immense thanks to Stripes for doing all of the writing for this, with some help from our lore team. We miss you. I hope you're doing well. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> Distances us from TG, and helps build our setting. <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> :cl: @thestripes, @meemofcourse , @GenericDM tweak: reflavors nearly every drink ingame /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> --------- Co-authored-by: Stripes <[email protected]> Co-authored-by: meemofcourse <[email protected]> Co-authored-by: Theos <[email protected]>
|
|
|
Im like, 99% sure tequila isnt in the vendors, neither is absethine |
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.
About The Pull Request
This pull request contains an incredible number of changes to item names and descriptions regarding everything drinkable.
This has been a long time coming, and was put off for quite a while due to my own procrastination.
This is almost certainly going to have mapping errors, but I'm not checking them all myself. I'll let the tests figure it out for me.
Vending machines reflavored
Good lord I hope I didn't miss anything.
Immense thanks to Stripes for doing all of the writing for this, with some help from our lore team. We miss you. I hope you're doing well.
Why It's Good For The Game
Distances us from TG, and helps build our setting.
Changelog
🆑 @thestripes, @meemofcourse , @GenericDM
tweak: reflavors nearly every drink ingame
/:cl: