Adds ERP #395
Merged
Adds ERP #395
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
Doubleumc
reviewed
Aug 21, 2024
Doubleumc
previously approved these changes
Aug 22, 2024
Doubleumc
approved these changes
Aug 22, 2024
AndroBetel
reviewed
Aug 23, 2024
| @@ -86,7 +86,7 @@ | |||
| to_chat(user, SPAN_NOTICE(" You transfer [trans] units of the condiment to [target].")) | |||
|
|
|||
| /obj/item/reagent_container/food/condiment/on_reagent_change() | |||
| if(icon_state == "saltshakersmall" || icon_state == "peppermillsmall" || icon_state == "hotsauce_cholula" || icon_state == "hotsauce_franks" || icon_state == "hotsauce_sriracha" || icon_state == "hotsauce_tabasco" || icon_state == "coldsauce_cole") | |||
| if(icon_state == "saltshakersmall" || icon_state == "peppermillsmall" || icon_state == "hotsauce_cholula" || icon_state == "hotsauce_franks" || icon_state == "hotsauce_sriracha" || icon_state == "hotsauce_tabasco" || icon_state == "coldsauce_cole" || icon_state == "eggpowder" || icon_state == "milkpowder" || icon_state == "bjpowder" || icon_state == "ojpowder" || icon_state == "ajpowder" || icon_state == "wjpowder" || icon_state == "gjpowder" || icon_state == "pjpowder") | |||
There was a problem hiding this comment.
this is a fucked up piece of code
AndroBetel
reviewed
Aug 23, 2024
| . = ..() | ||
| reagents.add_reagent("dehydrated_pineapple_juice", 6) | ||
|
|
||
| /obj/item/reagent_container/food/condiment/juice/egg |
AndroBetel
approved these changes
Aug 23, 2024
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
And by ERP, I mean Eating RolePlay.
Adds various powdered drinks and such to the code. Juices are added from the get-go to MRE packs, with the milk & egg powders getting added once #388 is merged.
Adds a more lore-friendly way of allowing marines to cook without having to rely on some 'magical hypersleep linked freezer' that the galley PR currently uses in the interim.
Explain why it's good for the game
MRE's in modern times come with drink packs already, the current ones in game have a bottle of water, it's frankly wild that no one thought to add juice-powder packs beforehand so those oft ignored bottles of bland water could be spiced up and actually used. Also opens up a new, albiet small, avenue for RP of swapping flavours with other marines and such.
Not to mention the milk & egg powder portion of the PR, which fits more in line with established lore of perishables not being ideal to keep aboard ships travelling in FTL.
Testing Photographs and Procedure
Tested extensively on a local server, no issues found with the code.
Changelog
🆑
add: Added various condiment packets of powedered juices, milk & egg to the code
add: Added corresponding reactions for the new powdered substances where needed
add: Sprites for the condiment packets, some taken from Bay, others edited by me from Bay sprites
qol: MRE's now contain a juice packet alongside their typical contents
maptweak: Replaces the magic freezer and it's perishable contents with a locker full of the non-perishable replacements
/:cl: