Allow pillows in pillowcases to act as SLEEP_AIDs #46068
Merged
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
Added pillowcases and made pillows spawn inside them
Co-authored-by: anothersimulacrum <anothersimulacrum@gmail.com>
anothersimulacrum
added
the
[C++]
Qrox
reviewed
Dec 16, 2020
The code's a bit ugly, but it works.
anothersimulacrum
force-pushed
the
cookie
branch
from
9f00b21
to
ee06703
Compare
Closed
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.
Summary
SUMMARY: None
Purpose of change
Based on #46067.
That PR breaks the behavior of pillows as
SLEEP_AIDs because they are now contained in pillowcases.Describe the solution
Add a
SLEEP_AID_CONTAINERflag, and allow items in items with this flag to work as normalSLEEP_AIDsTesting
Added a message showing the name of the sleep aid I was using when I was using a sleep aid. It correctly showed pillows within pillowcases acting as
SLEEP_AIDs.Additional Context
This will probably generate merge conflicts when #46067 is merged due to sharing commits with that.