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

Port Samurai armor from Nyano #334

Merged
merged 4 commits into from
Sep 19, 2023
Merged

Conversation

Leander-0
Copy link
Contributor

About the PR

Title, port armor from Nyano and add it to the possible stuff that can spawn in the syndicate surplus crates.

🆑 Leander

  • add: Add syndicate samurai armor to the list of cool syndicate stuff.

PuroSlavKing and others added 3 commits September 17, 2023 19:05
* [Clothing] Samurai hakama

syndicate only.

* meta.json update

Co-authored-by: AJCM-git <[email protected]>

* hakama desc

the description of the hakama is shortened

* Update theater.yml

* Update coats.yml

* Update RobustToolbox

* Revert "Update RobustToolbox"

This reverts commit 113dd54a5d0e49a415039f8f03ea1bf87bad04c9.

* dogi

---------

Co-authored-by: AJCM-git <[email protected]>
@@ -0,0 +1,8 @@
uplink-kanabou-name = Kanabou
uplink-kanabou-desc = A weapon for those who wish to forgo subtlety. Particularly suited to oni.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Extra lines?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well technically is adding them back since they where deleted and the uplink list doesn't have the .ftl for the kanabou and Rickenbacker.

@dvir001
Copy link
Contributor

dvir001 commented Sep 18, 2023

This going to have an issue with syndicate crate spawn another crate inside of it, please make the armor spawn in a syndicate bag instead.

@Leander-0
Copy link
Contributor Author

last commit should fix all issues with the PR.

@Cheackraze Cheackraze self-requested a review September 19, 2023 16:34
Copy link
Member

@Cheackraze Cheackraze left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@Cheackraze Cheackraze merged commit 2187b00 into new-frontiers-14:master Sep 19, 2023
14 of 17 checks passed
@Leander-0 Leander-0 deleted the samurai branch March 17, 2024 23:12
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.

5 participants