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.

Sign up for GitHub

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

Jump to bottom

Nikko's Daily Messing Around #110

Closed
wants to merge 10 commits into from
Closed

Nikko's Daily Messing Around #110

wants to merge 10 commits into from

Conversation

Memeji
Copy link
Collaborator

@Memeji Memeji commented Aug 15, 2024

Description

Added a pink collar and coder arm warmers to the vendors and loadout.

Changelog

🆑

  • add: Pink Collar to Clothesmate and Loadout
  • add: Coder Arm Warmers to Pride-O-Mat and Loadout

@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Status: Needs Review Someone please review this labels Aug 15, 2024
@Floof-Station-Bot Floof-Station-Bot changed the title Nikko's daily messing around Nikko's Daily Messing Around Aug 15, 2024
@Memeji Memeji self-assigned this Aug 15, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 15, 2024 •
edited
Loading

RSI Diff Bot; head commit a2ca0a6 merging into d3b05f3
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Floof/Clothing/Hands/coderarms.rsi

State Old New Status
equipped-HAND Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Clothing/Neck/collar_pink.rsi

State Old New Status
equipped-NECK Added
icon Added

Edit: diff updated after a2ca0a6

@FoxxoTrystan FoxxoTrystan removed the request for review from Fansana August 15, 2024 21:06
@FoxxoTrystan FoxxoTrystan added the Priority: 2-Medium Needs to be resolved at some point label Aug 16, 2024
FoxxoTrystan
FoxxoTrystan requested changes Aug 16, 2024
View reviewed changes
Copy link
Collaborator

@FoxxoTrystan FoxxoTrystan left a 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?

@Memeji
Copy link
Collaborator Author

Memeji commented Aug 16, 2024

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?

@FoxxoTrystan
Copy link
Collaborator

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

@github-actions github-actions bot removed the Changes: C# Changes any cs files label Aug 16, 2024
@Memeji
Copy link
Collaborator Author

Memeji commented Aug 16, 2024

Removed changes to lewdtraitsystem and the lewd components.

FoxxoTrystan
FoxxoTrystan requested changes Aug 17, 2024
View reviewed changes
Resources/Prototypes/Floof/Traits/lewd.yml
Copy link
Collaborator

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?

Copy link
Collaborator Author

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.

Copy link
Collaborator

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?

Copy link
Collaborator

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?

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Aug 17, 2024
@github-actions GitHub Actions
Copy link
Contributor

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

@FoxxoTrystan
Copy link
Collaborator

Stale

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FoxxoTrystan FoxxoTrystan Awaiting requested review from FoxxoTrystan FoxxoTrystan is a code owner

Assignees

@Memeji Memeji

Labels
Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Priority: 2-Medium Needs to be resolved at some point Status: Merge Conflict FIX YOUR PR AAAGH Status: Needs Review Someone please review this
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Memeji @FoxxoTrystan