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(data): Two more person ships: Intola and Verdorve (closed because of a git error) #143

Closed
wants to merge 380 commits into from

Conversation

TheGiraffe3
Copy link

Content (Person Ships)

Summary

Follow-up to #136 and #135.
Intola is a Scout with two Heavy Lasers as armament. I wondered about giving it a Quantum Keystone, but that's a little spoilery.
Verdorve's captain loves plasma weapons and engines, and the Splinter Verdorve flies uses nothing but plasma.

Also increases the person spawn rate by a somewhat extreme rate: twenty minutes on average to two and a half.

@TheGiraffe3
Copy link
Author

Oh, the Avgi are in!

@TheGiraffe3 TheGiraffe3 marked this pull request as ready for review November 16, 2024 13:41
@Zitchas
Copy link
Member

Zitchas commented Nov 16, 2024

Ah.... There was a mishap with experimental. For some reason my combining of two branches on my own fork merged Azure's Avgi into experimental. I have reset it, so it's clean again, but your PR picked it up already.

I'm sure the Avgi are going to be in eventually (probably sooner rather than later), but they're still being worked on, so the time is not yet. (and it would be squash merged, not commit-merged)

@TheGiraffe3
Copy link
Author

I'll re-PR this without the extra commits.

@Zitchas
Copy link
Member

Zitchas commented Nov 16, 2024

Thanks, and sorry for the problem. I'm still not sure why that even happened. My guess is that somehow git created a symbolic link or something so pushing changes to the branch proceeded to push those on to experimental.

@TheGiraffe3 TheGiraffe3 deleted the more-persons branch November 16, 2024 14:16
@TheGiraffe3 TheGiraffe3 changed the title feat(data): Two more person ships: Intola and Verdorve feat(data): Two more person ships: Intola and Verdorve (closed because of a git error) Nov 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants