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] Removes a duplicate bookcase in icebox permabrig library #758

Merged
merged 3 commits into from
Nov 21, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25158
Original PR: tgstation/tgstation#79838

About The Pull Request

Removes a duplicate bookcase that is stacked on top of another bookcase in Icebox's permabrig library.

Why It's Good For The Game

There probably shouldn't be two bookshelves stacked on top of each other.

Changelog

🆑 dieamond13
fix: removes a duplicate bookcase in icebox permabrig library
/:cl:

…B IGNORE] (#25158)

* Removes a duplicate bookcase in icebox permabrig library (#79838)

Removes a duplicate bookcase that is stacked on top of another bookcase
in Icebox's permabrig library.
There probably shouldn't be two bookshelves stacked on top of each
other.
:cl:
fix: removes a duplicate bookcase in icebox permabrig library
/:cl:

* Removes a duplicate bookcase in icebox permabrig library

---------

Co-authored-by: die_amond <[email protected]>
@Steals-The-PRs Steals-The-PRs added Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота TG Mirror Fix labels Nov 21, 2023
@Iajret Iajret merged commit 86282e7 into master Nov 21, 2023
23 checks passed
@Iajret Iajret deleted the upstream-mirror-25158 branch November 21, 2023 23:44
AnywayFarus added a commit that referenced this pull request Nov 21, 2023
Iajret pushed a commit that referenced this pull request Feb 4, 2024
…by the tank itself (#758)

* Kills off /obj/item/onetankbomb, assembly bombs now handled by the tank itself (#81218)

* Kills off /obj/item/onetankbomb, assembly bombs now handled by the tank itself

---------

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

Successfully merging this pull request may close these issues.

3 participants