Add Delta-V species guidebook entries #532
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* DeltaV species guidebook entries Copied straight from the wiki :D * Forgor * Update Oni.xml Signed-off-by: Null <[email protected]> --------- Signed-off-by: Null <[email protected]>
Comment out the Delta-V Harpy guide entry definition since Floof already has a Harpy entry from elsewhere.
Tweak the DV message to instead indicate Floofstation - pretty sure Dwarf is disabled for us too.
Forzii
requested review from
Fansana,
Memeji,
FoxxoTrystan and
Mnemotechnician
as code owners
github-actions
bot
added
Status: Needs Review
|
Please add "# Delta-V" or "# Floofstation" comments to upstream files when modifying them to make upstream merging easier in the future. |
|
I think I might need a bit more clarification on that. This was almost directly pulled from the Delta-V PR. Most of the files are in Delta-V folders and the files that got changed that aren't are marked with Delta-V comments. The area that I commented out I also left a comment indicating it was due to a Floofstation conflict. I understand the point of marking any changes we make (I actually have a related question in my first PR) - but I don't understand what you're saying I missed here. Edit: Do you mean adding those strings literally, to allow for easier searching and such? |
Mnemotechnician
approved these changes
Feb 6, 2025
FoxxoTrystan
approved these changes
Feb 6, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Ports DeltaV-Station/Delta-v#1174 with some minor tweaks for Floof. That PR added guidebook entries for Vulpkanin, Felinid, Harpy, and Oni based on their wiki.
Primary differences:
Floof already has a Harpy guidebook entry so I commented out the Harpy definition from DV
This PR adds a note to Dwarf saying it's disabled - modified it to say disabled on Floofstation (vice DV)
Additional note:
MobFelinid, MobFelinidDummy, and MobOniDummy seem to be broken visually, but I believe fixing that should be outside the scope of this PR/commit.
TODO
Media
Changelog
🆑