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] Alien nests and some other stuf can be hit again. #1215

Merged
merged 1 commit into from
Dec 20, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25736
Original PR: tgstation/tgstation#80418

About The Pull Request

Another small issue fixed. Thanks Melbert for telling us what's wrong with it.

EDIT: other objects were rendered unhittable by that flags refactor PR.

Why It's Good For The Game

Fixes #80311. I made the xmas tree indestructible because the comment to the NO_DECONSTRUCTION flag didn't make a load of sense since that doesn't stop it from getting destroyed anyway.

Changelog

🆑 MrMelbert, Ghommie
fix: Alien nests, and some other stuff, can be physically attacked again.
balance: x-mas trees (the ones with presents), are indestructibles. Truly protected by a yuletide spirit.
/:cl:

…E] (#25736)

* Alien nests and some other stuf can be hit again. (#80418)

## About The Pull Request
Another small issue fixed. Thanks Melbert for telling us what's wrong
with it.

EDIT: other objects were rendered unhittable by that flags refactor PR.

## Why It's Good For The Game
Fixes #80311. I made the xmas tree indestructible because the comment to
the `NO_DECONSTRUCTION` flag didn't make a load of sense since that
doesn't stop it from getting destroyed anyway.

## Changelog

:cl: MrMelbert, Ghommie
fix: Alien nests, and some other stuff, can be physically attacked
again.
balance: x-mas trees (the ones with presents), are indestructibles.
Truly protected by a yuletide spirit.
/:cl:

* Alien nests and some other stuf can be hit again.

---------

Co-authored-by: Ghom <[email protected]>
@ReezeBL ReezeBL merged commit 49d645b into master Dec 20, 2023
23 checks passed
@ReezeBL ReezeBL deleted the upstream-mirror-25736 branch December 20, 2023 13:57
AnywayFarus added a commit that referenced this pull request Dec 20, 2023
Iajret pushed a commit that referenced this pull request Feb 29, 2024
* Fixes oversight with DROP_BRAIN

* Update death.dm

---------

Co-authored-by: Bloop <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants