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

Hostile humans #2972

Merged
merged 24 commits into from
Jun 2, 2024
Merged

Hostile humans #2972

merged 24 commits into from
Jun 2, 2024

Conversation

FalloutFalcon
Copy link
Member

@FalloutFalcon FalloutFalcon commented May 9, 2024

About The Pull Request

Repaths hostile humans to a generic type so we don't have to redefine that same thing 100 times
Also I am probably going to add some stuff to make them all affected by something similar?
None of them act human.

Why It's Good For The Game

Changelog

🆑
refactor: refactored hostile humans
/:cl:

@github-actions github-actions bot added DME Edit Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels May 9, 2024
@github-actions github-actions bot added the Map Change Tile placing is hard. Thank you for your service. label May 15, 2024
@FalloutFalcon FalloutFalcon marked this pull request as ready for review May 15, 2024 00:29
@FalloutFalcon FalloutFalcon requested review from a team as code owners May 15, 2024 00:29
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 May 20, 2024
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label May 24, 2024
@FalloutFalcon FalloutFalcon marked this pull request as draft May 24, 2024 08:44
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 May 27, 2024
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label May 27, 2024
@FalloutFalcon FalloutFalcon marked this pull request as ready for review May 28, 2024 00:17
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 May 28, 2024
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label May 31, 2024
@rye-rice rye-rice added this pull request to the merge queue Jun 2, 2024
Merged via the queue into shiptest-ss13:master with commit 4bbd8fb Jun 2, 2024
14 checks passed
@FalloutFalcon FalloutFalcon deleted the hostile-humans branch June 18, 2024 23:35
MrCat15352 pushed a commit to MrCat15352/MrCat that referenced this pull request Jun 22, 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. -->

Repaths hostile humans to a generic type so we don't have to redefine
that same thing 100 times
Also I am probably going to add some stuff to make them all affected by
something similar?
None of them act human.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

<!-- 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:
refactor: refactored hostile humans
/: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. -->
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. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants