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

Connect zombies via copy-from - Part 2 #72534

Merged
merged 11 commits into from
Apr 24, 2024

Conversation

Karol1223
Copy link
Contributor

@Karol1223 Karol1223 commented Mar 21, 2024

Summary

None

Purpose of change

Second part of #71170 so these two are actually reviewable

Describe the solution

  • zed-classic
  • zed-acid
  • zed-burned
  • zed-children
  • zed-command
  • zed-dormant
  • zed-electric
  • zed-explosive
  • zed-ferrous
  • [ ] zed-fusion - I don't know if I should touch that? Things here are barely human
  • zed-lab
  • zed-misc
  • zed-prisoner - no changes
  • zed-skeletal
  • zed-soldiers
  • zed-survivor
  • zed-tentacle
  • zed-medical - no changes
  • zed-pupating - no changes
  • zed-winged

OTHER CHANGES

  • Switched the harvestlists for the glutton and bombardier boomers from zombie_meatslug to exempt - ultimately this has no effect ingame since their corpses are unobtainable
  • Zombies copying from military pilots got their ears back

Describe alternatives you've considered

Testing

The delete syntax does appear to be working. No errors on load either.

Additional context

TODO:

  • Check if the syntax for removing hardcoded special attacks actually works

Opted to ignore the following zombies:

  • Anything from zed_fusion - this file scares me, most things there are barely human
  • Phase skuler/shrike - they're weird, have many exceptions to standard zombie rules, I don't want to touch them

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Mar 21, 2024
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Mar 22, 2024
@Karol1223 Karol1223 force-pushed the zembeh-two branch 2 times, most recently from 6915565 to efd7486 Compare March 31, 2024 09:51
@Karol1223 Karol1223 force-pushed the zembeh-two branch 2 times, most recently from 20cde0f to 2844951 Compare April 10, 2024 17:05
@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label Apr 10, 2024
@Karol1223 Karol1223 closed this Apr 11, 2024
@Karol1223 Karol1223 reopened this Apr 11, 2024
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Apr 12, 2024
@github-actions github-actions bot added BasicBuildPassed This PR builds correctly, label assigned by github actions and removed BasicBuildPassed This PR builds correctly, label assigned by github actions labels Apr 16, 2024
@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label Apr 18, 2024
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Apr 18, 2024
@Karol1223 Karol1223 marked this pull request as ready for review April 19, 2024 09:20
@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label Apr 19, 2024
@Karol1223 Karol1223 closed this Apr 19, 2024
@Karol1223 Karol1223 reopened this Apr 19, 2024
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Apr 19, 2024
@Maleclypse Maleclypse merged commit 97bec17 into CleverRaven:master Apr 24, 2024
51 of 62 checks passed
@Karol1223 Karol1223 deleted the zembeh-two branch April 24, 2024 16:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants