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

Kill Xenobio Stuff #3527

Merged
merged 9 commits into from
Oct 18, 2024
Merged

Conversation

Erikafox
Copy link
Contributor

About The Pull Request

Removes Xenobiology (minus slimes since they're good fluffmobs sometimes).

Why It's Good For The Game

cruft. thgvr said they'd get me a therapist if I did this.

Changelog

🆑
del: Xenobiology (minus slimes)
/:cl:

@github-actions github-actions bot added DME Edit Code change Watch something violently break. labels Oct 10, 2024
@Erikafox Erikafox requested a review from a team as a code owner October 10, 2024 22:24
@github-actions github-actions bot added the Map Change Tile placing is hard. Thank you for your service. label Oct 10, 2024
@thgvr
Copy link
Member

thgvr commented Oct 10, 2024

we outta therapy

@Xkallubar
Copy link

soul removal team back at it again... It's so OVER!!

@Erikafox
Copy link
Contributor Author

you know it random github user

@rye-rice
Copy link
Member

YOLO

@rye-rice rye-rice added this pull request to the merge queue Oct 15, 2024
@meemofcourse meemofcourse removed this pull request from the merge queue due to a manual request Oct 15, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Oct 15, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Oct 15, 2024
@Latentish
Copy link
Member

Let's get this bread.

Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Oct 17, 2024
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Oct 17, 2024
@FalloutFalcon FalloutFalcon added this pull request to the merge queue Oct 18, 2024
Merged via the queue into shiptest-ss13:master with commit 18171b5 Oct 18, 2024
14 checks passed
zimon9 pushed a commit to zimon9/Shiptest-PR-testing that referenced this pull request Oct 29, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Removes Xenobiology (minus slimes since they're good fluffmobs
sometimes).
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
cruft. thgvr said they'd get me a therapist if I did this.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
del: Xenobiology (minus slimes)
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: Erika Fox <[email protected]>
Co-authored-by: Bjarl <[email protected]>
zimon9 pushed a commit to zimon9/Shiptest-PR-testing that referenced this pull request Oct 29, 2024
MrCat15352 pushed a commit to MrCat15352/MrCat that referenced this pull request Dec 27, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->
Removes Xenobiology (minus slimes since they're good fluffmobs
sometimes).
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->
cruft. thgvr said they'd get me a therapist if I did this.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

:cl:
del: Xenobiology (minus slimes)
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: Erika Fox <[email protected]>
Co-authored-by: Bjarl <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit Map Change Tile placing is hard. Thank you for your service.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants