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

feat(content,port): Dermatweaks #4238

Merged
merged 5 commits into from
Feb 20, 2024

Conversation

Zlorthishen
Copy link
Contributor

@Zlorthishen Zlorthishen commented Feb 20, 2024

Purpose of change

  • adds another dermatik monster, along with "incubator" creatures
  • adds Dermatik Nest map

Describe the solution

ports over dda pr 46448

Describe alternatives you've considered

Testing

spawned lots of dermatik nests and didn't observe any errors

Additional context

image

Checklist

port of dda pr 46448

Co-Authored-By: Venera3 <72006894+venera3@users.noreply.github.com>
@github-actions github-actions bot added the JSON related to game datas in JSON format. label Feb 20, 2024
Copy link
Contributor

autofix-ci bot commented Feb 20, 2024

The Autofix app has found code style violation and automatically formatted this Pull Request.

I locally edit my commits (e.g: git, github desktop)

Please choose following options:

I'd like to accept the automated commit
  1. Run git pull. this will merge the automated commit into your local copy of the PR branch.
  2. Continue working.
I do not want the automated commit
  1. Format your code locally, then commit it.
  2. Run git push --force to force push your branch. This will overwrite the automated commit on remote with your local one.
  3. Continue working.

If you don't do this, your following commits will be based on the old commit, and cause MERGE CONFLICT.

This PR is complete and I don't want to edit it anymore

It's safe to ignore this message.

I edit this PR through web UI

You can ignore this message and continue working.

I have no idea what this message is talking about

You can ignore this message and continue working. If you find any problem, please ask for help and ping @scarf005.

@Zlorthishen Zlorthishen marked this pull request as ready for review February 20, 2024 02:55
@chaosvolt chaosvolt merged commit 98c9f0e into cataclysmbnteam:main Feb 20, 2024
10 checks passed
@scarf005
Copy link
Member

@chaosvolt
...wait, we haven't added co-authors to commits

@Zlorthishen Zlorthishen deleted the dermatweaks branch February 21, 2024 01:04
@chaosvolt
Copy link
Member

Ack fuuuck

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
JSON related to game datas in JSON format.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants