Skip to content
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

[MIRROR] You can access your inventory when lying down #4121

Merged
merged 3 commits into from
Jun 30, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#3342
Original PR: tgstation/tgstation#84380

About The Pull Request

  • Fixes #84373

Changelog

🆑 SyncIt21
fix: you can access your inventory when lying down
/:cl:

…3342)

* You can access your inventory when lying down

* conflicts

* remove space

---------

Co-authored-by: SyncIt21 <[email protected]>
Co-authored-by: Fluffles <[email protected]>
@Steals-The-PRs Steals-The-PRs added Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота TG Mirror labels Jun 29, 2024
@Iajret Iajret merged commit 9b0db37 into master Jun 30, 2024
26 checks passed
@Iajret Iajret deleted the upstream-mirror-3342 branch June 30, 2024 13:27
AnywayFarus added a commit that referenced this pull request Jun 30, 2024
Iajret pushed a commit that referenced this pull request Jul 31, 2024
[NO GBP] Lil' fix to fishing hat PR. (#85459)

## About The Pull Request
I didn't remove or change a few copypasted lines. @Jacquerel.

## Why It's Good For The Game
They won't flee otherwise.

## Changelog
N/A

Co-authored-by: Ghom <[email protected]>
FeenieRU pushed a commit that referenced this pull request Jul 31, 2024
* [MIRROR] [NO GBP] Lil' fix to fishing hat PR. [MDB IGNORE] (#4121)

[NO GBP] Lil' fix to fishing hat PR. (#85459)

## About The Pull Request
I didn't remove or change a few copypasted lines. @Jacquerel.

## Why It's Good For The Game
They won't flee otherwise.

## Changelog
N/A

Co-authored-by: Ghom <[email protected]>

* [MIRROR]  Lil' fix to fishing hat PR.

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: Ghom <[email protected]>
Co-authored-by: StealsThePRs <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота TG Mirror
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants