-
Notifications
You must be signed in to change notification settings - Fork 81
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
Nikko's Daily Messing Around #110
Conversation
RSI Diff Bot; head commit a2ca0a6 merging into d3b05f3 Resources/Textures/Floof/Clothing/Hands/coderarms.rsi
Resources/Textures/Floof/Clothing/Neck/collar_pink.rsi
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There changes that are not marked from the PR, like.
Is changes on LewdTraitSystem supose to be here?
No they are not, those changes are not supposed to be here and will need to be removed. Do I just delete the file from this PR? |
just edit the changes like they are currently on Master, deleting file will DELETE FILE |
updated to be as Master's as this should not be in this branch.
Removed changes to lewdtraitsystem and the lewd components. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Those changes are not part of the PR, are they?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not part of this PR, no.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But those changes are here, should that change not be removed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This PR still change the file name/location, no?
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Stale |
Description
Added a pink collar and coder arm warmers to the vendors and loadout.
Changelog
🆑