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

Trait Modify Factions #955

Merged
merged 4 commits into from
Oct 27, 2024

Conversation

VMSolidus
Copy link
Member

@VMSolidus VMSolidus commented Sep 22, 2024

Description

Made by request from Nuclear14, while also adding a trait that was present both in Parkstation, as well as something N14 would like to have. This PR extends the TraitSystem so that it can now also add or remove Factions from a character. It also adds in the Animal Friend trait from Parkstation/Fallout: New Vegas.

Changelog

🆑

  • add: The Animal Friend trait has been added to the game. Characters with this trait are not attacked by animals.

@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: YML Changes any yml files labels Sep 22, 2024
Resources/Locale/en-US/traits/traits.ftl Outdated Show resolved Hide resolved
Content.Server/Traits/TraitSystem.cs Show resolved Hide resolved
Content.Server/Traits/TraitSystem.cs Show resolved Hide resolved
Resources/Prototypes/Traits/skills.yml Outdated Show resolved Hide resolved
Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: VMSolidus <[email protected]>
@FoxxoTrystan FoxxoTrystan self-requested a review September 23, 2024 02:29
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Sep 23, 2024
@FoxxoTrystan FoxxoTrystan added Size: 4-Small For small issues/PRs Priority: 3-Medium Needs to be resolved at some point Status: Awaiting Changes Do not merge due to requested changes and removed Status: Needs Review Someone please review this labels Sep 23, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Sep 28, 2024
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Sep 30, 2024
@FoxxoTrystan FoxxoTrystan requested review from a team, DEATHB4DEFEAT, Peptide90, Pspritechologist and OldDanceJacket and removed request for a team October 2, 2024 23:14
@github-actions github-actions bot added Status: Needs Review Someone please review this and removed Status: Awaiting Changes Do not merge due to requested changes labels Oct 2, 2024
@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Oct 14, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@Remuchi Remuchi removed the Status: Needs Review Someone please review this label Oct 27, 2024
@Remuchi Remuchi added the Status: Awaiting Merge 2 or more maintainers has approved this PR and is now awaiting merge label Oct 27, 2024
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Oct 27, 2024
@VMSolidus VMSolidus merged commit 8e1a63c into Simple-Station:master Oct 27, 2024
11 checks passed
Ichaie pushed a commit to Ichaie/Einstein-Engines that referenced this pull request Oct 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: YML Changes any yml files Priority: 3-Medium Needs to be resolved at some point Size: 4-Small For small issues/PRs Status: Awaiting Merge 2 or more maintainers has approved this PR and is now awaiting merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants