-
Notifications
You must be signed in to change notification settings - Fork 57
Sorting traits #278
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
Open
Raikyr0
wants to merge
28
commits into
Floof-Station:master
Choose a base branch
from
Raikyr0:SortingTraits
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Sorting traits #278
Changes from all commits
Commits
Show all changes
28 commits
Select commit
Hold shift + click to select a range
e519305
Update trait-categories.ftl
Raikyr0 aeee55d
Update categories.ftl
Raikyr0 66d6005
Update trait_categories.yml
Raikyr0 72ee258
Update categories.yml
Raikyr0 0b447c9
Update physical.yml
Raikyr0 c1e7f40
Update disabilities.yml
Raikyr0 d26030c
Update lewd.yml
Raikyr0 15b1313
Update mental.yml
Raikyr0 e0bc1e2
Update disabilities.yml
Raikyr0 58394c9
Update medical.yml
Raikyr0 fce53ed
Update mental.yml
Raikyr0 3ae0e41
Merge branch 'Floof-Station:master' into SortingTraits
Raikyr0 3e6416d
Update trait_categories.yml
Raikyr0 080cd91
Update trait_categories.yml
Raikyr0 c34572a
Update disabilities.yml
Raikyr0 216a303
Update mental.yml
Raikyr0 a9c1263
Update physical.yml
Raikyr0 a1eef31
Update trait-categories.ftl
Raikyr0 ea5b5d9
Update categories.ftl
Raikyr0 bf4dec7
Update categories.yml
Raikyr0 73f6ae0
Update trait_categories.yml
Raikyr0 5fba871
Update disabilities.yml
Raikyr0 8b704fc
Update mental.yml
Raikyr0 b836338
Update physical.yml
Raikyr0 0c799f2
Update Resources/Prototypes/_Floof/Traits/categories.yml
Raikyr0 567160f
Update disabilities.yml
Raikyr0 9e6ef91
Update medical.yml
Raikyr0 151103c
Update mental.yml
Raikyr0 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,8 @@ | ||
| trait-category-disabilitiesphysical = Disabilities - Physical | ||
| trait-category-disabilitiesmental = Disabilities - Mental | ||
| trait-category-cybernetics = Cybernetics | ||
| trait-category-psionic = Psionics | ||
| trait-category-languages = Languages | ||
| trait-category-natural-languages = Natural languages | ||
| trait-category-skills = Skills | ||
| trait-category-skills = Feats | ||
| trait-category-lewd = Lewd |
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.