-
Notifications
You must be signed in to change notification settings - Fork 414
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’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: HydroCo - Beverage Powders #2210
feat: HydroCo - Beverage Powders #2210
Conversation
RSI Diff Bot; head commit 0d71dae merging into d4d22c9 Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi
|
This is really neat. My main suggestion would be to reduce the contents of the fruit crates to 4 and use rng group tables.
|
Please add a crate for energy drinks versions. (GFuel, GamerSupps). Call it GamerDonkCo / CyberFuel / SyndijuiceSupps etc |
Another suggestion, one or two of these would probably be a good addition to the perma SusVend |
Speaking of that machine, it needs a restock or something. Currently doesn't have one and it'd be nice to be able to restock it so the Perma players have somewhat reliable food besides what they make |
Definitely out of scope for this PR but it would be an easy PR for anyone to do. |
I'll probably PR more variations of beverages at a later point, but I'd consider that out of scope for now. I was thinking of also adding syrups for SpaceUp and stuff like that, but powdered energy drinks would work too. |
Makes sense, I'll do that and reduce the price to 1500. |
oh god i fucked up the rebase |
750b4ca
to
b0eee72
Compare
This doesn't modify C#, label can be removed. Should be the final changes, ready for review! |
890eb98
to
64eeb91
Compare
* meow * meow * Update DeltaVChangelog.yml Signed-off-by: Lyndomen <[email protected]> --------- Signed-off-by: Lyndomen <[email protected]>
64eeb91
to
414778c
Compare
i rebased and reworded a commit to retrigger the flaky test and did the thing again, apparently that's not a great idea after merge commit :blunt: |
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.
Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml
Outdated
Show resolved
Hide resolved
Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml
Outdated
Show resolved
Hide resolved
test failures unrelated |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Signed-off-by: DisposableCrewmember42 <[email protected]>
Conflicts resolved |
# Description ## **!!! DO NOT "Squash and commit", ONLY "Create a merge commit" !!!** Merges a lot of PRs from Delta-V, most of these are plain YML changes so they shouldn't cause wizmerge-like issues. - DeltaV-Station/Delta-v#1008 - DeltaV-Station/Delta-v#1077 - DeltaV-Station/Delta-v#1092 - DeltaV-Station/Delta-v#1094 - DeltaV-Station/Delta-v#1143 - Excluded the lobby art with DeltaV branding. - DeltaV-Station/Delta-v#1176 - DeltaV-Station/Delta-v#1209 - DeltaV-Station/Delta-v#1227 - DeltaV-Station/Delta-v#1252 - not directly cherry-picked due to harpy singing now being stored in a different file, but implemented the same thing in df50140 - DeltaV-Station/Delta-v#1261 - DeltaV-Station/Delta-v#1271 - DeltaV-Station/Delta-v#1272 - Also made available to Humans and Tajarans like the other Felinid tails. - DeltaV-Station/Delta-v#1426 - DeltaV-Station/Delta-v#1462 - DeltaV-Station/Delta-v#1542 - DeltaV-Station/Delta-v#1759 - DeltaV-Station/Delta-v#1763 - DeltaV-Station/Delta-v#1765 - DeltaV-Station/Delta-v#1780 - DeltaV-Station/Delta-v#1781 - DeltaV-Station/Delta-v#1804 - DeltaV-Station/Delta-v#1814 - TODO in another pr, vulp sprite for the colorable neck gaiter (PR only adds vulp states to pre-existing black/red neck gaiters) - DeltaV-Station/Delta-v#1828 - Added to Loadouts for Corpsman, costs 2 points. - DeltaV-Station/Delta-v#1838 - DeltaV-Station/Delta-v#1877 - DeltaV-Station/Delta-v#1905 - Added to Loadout Uniforms, costs 1 point. - DeltaV-Station/Delta-v#1910 - DeltaV-Station/Delta-v#1935 - DeltaV-Station/Delta-v#1946 - DeltaV-Station/Delta-v#1994 - DeltaV-Station/Delta-v#1997 - DeltaV-Station/Delta-v#1998 - DeltaV-Station/Delta-v#2031 - DeltaV-Station/Delta-v#2089 - DeltaV-Station/Delta-v#2113 - DeltaV-Station/Delta-v#2213 - DeltaV-Station/Delta-v#2209 - DeltaV-Station/Delta-v#2210 - Prerequisite Wizden PR added: space-wizards/space-station-14#29243 - Prerequisite Wizden PR added: space-wizards/space-station-14#30856 - DeltaV-Station/Delta-v#2233 - DeltaV-Station/Delta-v#2245 - DeltaV-Station/Delta-v#2250 - DeltaV-Station/Delta-v#2266 - DeltaV-Station/Delta-v#2267 - DeltaV-Station/Delta-v#2294 - DeltaV-Station/Delta-v#2307 - DeltaV-Station/Delta-v#2318 - DeltaV-Station/Delta-v#2398 - DeltaV-Station/Delta-v#2410 - DeltaV-Station/Delta-v#2462 - DeltaV-Station/Delta-v#2478 - DeltaV-Station/Delta-v#2501 - DeltaV-Station/Delta-v#2503 - DeltaV-Station/Delta-v#2504 - Prerequisite Wizden PR added: space-wizards/space-station-14#30957 - DeltaV-Station/Delta-v#2524 - DeltaV-Station/Delta-v#2539 - DeltaV-Station/Delta-v#2635 - Prerequisite Wizden PR added: space-wizards/space-station-14#32193 - Prerequisite Wizden PR added: space-wizards/space-station-14#32327 ## Changelog Too much changes to count so some changes are unlisted :cl: Several Contributors - add: Added Lone Digger by Caravan Palace to the jukebox! (by MilonPL) - add: Added Deck The Halls by Kevin Macleod to the jukebox! (by Lyndomen) - tweak: Now medical belts have a slot for medkits. (by Radezolid) - add: Added a way for muskets, flintlocks, and musket cartridges (NOT .60) to be crafted. (by Tryded) - add: Added Vulpkanin-specific sprites to a lot of helmets and masks. (by Adrian16199, TadJohnson00) - add: Security dogs (such as Laika) now have Vulpkanin vocal emotes. Howl! (by Remuchi) - add: Split the Emag into the Cryptographic Sequencer and the Airlock Access Override. (by Warmechanic) - add: Added Corpsman Glasses, no more getting flashed as Corpsman! Also available in Loadouts. (by Unkn0wnGh0st333) - add: Harpies can now mimic harps! (by TheOneWhoIsManyFrame) - tweak: Cats will now play with mouse toys. (by Deltanedas) - add: Added a black turtleneck, available in Loadouts! (by Aikakakah) - add: Added the Binary Translator Key to the uplink costing 1 TC and the listening post operative headset. (by Radezolid) - add: Spesos now have a new pretty look transferred from the Frontier Station. (by whatston3) - add: The home-run bat has been re-added to the traitor uplink. - add: Added the CrystalThistle, mutated from the Galaxythistle that generates Quartzite which when heated produces glass sheets. (by jimmy12or) - add: Added a Ghost Pepper! A friendly looking Pepper that's so Spicy, it hurts! (by jimmy12or) - add: Added a Cosmic Revenant! A spooky mutation of the Ghost pepper that produced Ectoplasm. (by jimmy12or) - add: Added blue and purple tomato soup, made using Blue Tomatoes. (by DisposableCrewmember42) - add: Added new drinks: the double ice cream (by dge21) and Dr. Gibb Blood Red (by BlitzTheSquishy). - add: Some drink reactions now require shaking with the shaker or stirring with a spoon. (by Vermidia) - add: Added "Selene" wing customization option for moths (by boogiebogus) - add: Added the tiger tail sprite for Felinids, Humans and Tajarans. (by Adrian16199) - add: NanoTrasen has established business relations with HydroCo! You can now order powdered milk and juice via your Logistics department. (by DisposableCrewmember42) - tweak: Bar and kitchen shelves no longer restrict the items that can be placed in them. (by Velcroboy) - tweak: Bookshelves can now fit any kind of item, not just books. (by Deltanedas) - add: New magic crayons have appeared in the sector, artists rejoice! (by AvalonProto)
* feat: Powdered drinks orderable by Logi * tweak: Lower amounts per crate * chore: fix copy-paste mistake * feat: Add HydroCo to StockTrade App * tweak: Lemon, Lime and Pineapple Juice powders now deal slight Caustic damage * i18n: Powdered watermelon juice does not include water * feat: If eating straight powdered beverage, cough and vomit * tweak: change powder tastes * tweak: Add spoons to HydroCo crates * tweak: Add HydroCo consumption notice to crates * refactor: consistent naming * refactor: BasePowderBeverage now abstract, inherit physicalDesc * refactor: mark ReagentTinBase as abstract * tweak: Rephrase HydroCo Notice * refactor: Move name and description to prototype * tweak: Juice crate now comes in one of four editions * feat: powdered tomato juice * refactor: rename reagent ftl for consistendcy * tweak: use tomato powder in crate fill * fix: copy-paste mistake * feat: hydroco trial mails * tweak: 2 soy, 2 regular milk in dairy crate * tweak: lower price for juice crate * tweak: recolor tomato powder * tweak: use one of each edition, no themed crates; plastic spoons instead of metal * feat: soy milk powder and orange juice powder in sustenance vendor * tweak: reword hydroco mail message * tweak: rearrange papers to play nicer with word-wrap * tweak: add new-line in case somebody drags the paper wider * tweak: reintroduce random tin, condense juice fill tables * refactor: amount defaults to 1 * Add Changelog Entry for Teach Lesson (DeltaV-Station#2225) * meow * meow * Update DeltaVChangelog.yml Signed-off-by: Lyndomen <[email protected]> --------- Signed-off-by: Lyndomen <[email protected]> * refactor: add missing newline * refactor: respect yaml property ordering convention * refactor: more yaml conventions --------- Signed-off-by: Lyndomen <[email protected]> Signed-off-by: DisposableCrewmember42 <[email protected]> Co-authored-by: Lyndomen <[email protected]> Co-authored-by: Milon <[email protected]>
About the PR
Why / Balance
Requested in The Drawing Board and further discussed in a dedicated thread.
Regarding balance:
I believe the prices are justified and high enough to discourage buying lots of juice instead of cooperating with Botany, especially since you can't order specific types in bulk.
Technical details
YML changes mostly in line with everything else in each file/category. For the tins, I created a new base type, since neither the FoodTinBase prototype nor the ReagentPacketBase suited my exact needs.
The texture uses the Sprite color attribute and an overlay to avoid lots of pointless and tiring work, and make it easy to add new types in the future.
Media
pr-hydroco-powders.mp4
pr-hydroco-powders-cough-vomit.mp4
Requirements
Breaking changes
Changelog
🆑 DisposableCrewmember42