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

Separate quirk code into individual files #1220

Merged

Conversation

LeDrascol
Copy link

About The Pull Request

Separates modular quirk code from good, neutral, and negative files into distinct files per quirk. In addition, this properly modularizes edits made to upstream quirks. A new file (trait_edits.dm) contains the minor formally non-modular edits.

This does not change or fix anything else about the quirks. They are transferred as-is.

Why It's Good For The Game

Reduces the chance of merge conflicts when multiple pull requests edit quirks, and improves parity with modern TG. Modularizing edits makes it easier to determine what was changed.

A Port?

No, but inspired by tgstation PR #78407.

Pre-Merge Checklist

  • You tested this on a local server.
  • This code did not runtime during testing.
  • You documented all of your changes.

Changelog

🆑
code: Modular quirks are now in separate files
code: Modularized edits to upstream quirks
/:cl:

This does the following:
- Separates all modular quirks into separate files, with no other changes.
- Modularizes some non-modular edits into a new file
- Fixes location of hydra trait definition
Modularizes the edits to Sandstorm's quirk Sheltered
Removes a mistakenly added reference to a new-codebase quirk.
Adds missing trailing newlines to two quirk files.
Moves Sanguine Metabolism to a separate file to match new formatting.
@MosleyTheMalO MosleyTheMalO merged commit f65c42d into SPLURT-Station:master Nov 14, 2024
6 checks passed
github-actions bot pushed a commit that referenced this pull request Nov 14, 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.

2 participants