Makes items dropped while in a locker go into the locker #28167
+5
−4
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
|
I believe you're not supposed to do RP changelog messages, to make it more clear to users and to shorten the amount they have to read |
Comment on lines
+112
to
+117
| var userXform = Transform(uid); | ||
| var isInContainer = ContainerSystem.IsEntityOrParentInContainer(uid, xform: userXform); | ||
|
|
||
| var entity = hand.HeldEntity!.Value; | ||
| DoDrop(uid, hand, doDropInteraction: doDropInteraction, handsComp); | ||
| if (!isInContainer) | ||
| DoDrop(uid, hand, doDropInteraction: doDropInteraction, handsComp); |
There was a problem hiding this comment.
Isn't this just PlaceNextTo?
There was a problem hiding this comment.
Apparently this was caused by a bulk replace, so I need to actually dig through and figure out whats going on better, I just figured DropNextTo was there for a good reason. I'll update.
|
This works with disposal pipes too, this PR fixes it? |
Yeah, tested it, works as intended. |
ShadowCommander
requested changes
May 25, 2024
AJCM-git
added
the
Status: Awaiting Changes
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 PR
Fixed unintended behaviour where items dropped while inside a locker went onto the floor, rather than into the locker's storage. Maybe fixes #17230?
Why / Balance
Bug bad.
Technical details
Game was trying to insert items into the locker twice. I don't fully understand why it was set up this way, but the second attempt saw the item was already in, freaked out, and dropped it on the floor outside the locker. I just made the first insert attempt be conditional on it not taking place in a container, because there's a second one that (I think) does the same thing if you are. I tested it and it didnt give me any errors and worked. If there's a way this should be working other than this, let me know and I'll change it, the hard part was figuring out what was causing it.
Media
Breaking changes
Changelog
🆑