-
Notifications
You must be signed in to change notification settings - Fork 506
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
Reagent Containers : The 3/4thening & Contained Spritening (and other related food things) #17231
Merged
NonQueueingMatt
merged 31 commits into
Aurorastation:master
from
alsoandanswer:food_and_drink
Sep 6, 2023
Merged
Reagent Containers : The 3/4thening & Contained Spritening (and other related food things) #17231
NonQueueingMatt
merged 31 commits into
Aurorastation:master
from
alsoandanswer:food_and_drink
Sep 6, 2023
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
# Conflicts: # icons/obj/food.dmi # icons/obj/reagentfillings.dmi
BotBOREALIS
added
Changelog Required
Sprites
Adds new or changes existing sprites.
labels
Sep 3, 2023
NonQueueingMatt
approved these changes
Sep 3, 2023
alsoandanswer
added
the
WIP
The PR is a work in progress and should not be reviewed yet.
label
Sep 3, 2023
alsoandanswer
changed the title
Reagent Containers : The 3/4thening
Reagent Containers : The 3/4thening (and other related food things)
Sep 3, 2023
SleepyGemmy
reviewed
Sep 3, 2023
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
!review |
BotBOREALIS
added
Review Required
and removed
WIP
The PR is a work in progress and should not be reviewed yet.
labels
Sep 3, 2023
SleepyGemmy
approved these changes
Sep 3, 2023
BotBOREALIS
added
the
Waiting Period
The PR has the required number of reviews, but is still in the waiting period
label
Sep 3, 2023
alsoandanswer
changed the title
Reagent Containers : The 3/4thening (and other related food things)
Reagent Containers : The 3/4thening & Contained Spritening (and other related food things)
Sep 5, 2023
This reverts commit 5b238c7.
BotBOREALIS
added
Awaiting Merge
and removed
Review Required
Waiting Period
The PR has the required number of reviews, but is still in the waiting period
labels
Sep 6, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Awaiting Merge
🗺️ Mapping - Aurora
The PR touches the Aurora map files.
Mapping: Aurora
A legacy mapping label for the bot.
Sprites
Adds new or changes existing sprites.
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.
Notable changes : Contained Spritizes all reagent containers, and reagent fillings.
changes: