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

Clothing-Nikko #119

Merged
merged 4 commits into from
Aug 19, 2024
Merged

Clothing-Nikko #119

merged 4 commits into from
Aug 19, 2024

Conversation

Memeji
Copy link
Collaborator

@Memeji Memeji commented Aug 18, 2024 •
edited
Loading

Description

Added Pink Collar

Changelog

🆑

  • add: Pink Collar

@Memeji Memeji requested a review from FoxxoTrystan as a code owner August 18, 2024 17:29
@github-actions github-actions bot added 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 18, 2024
@Floof-Station-Bot Floof-Station-Bot changed the title Clothing-nikko Clothing-Nikko Aug 18, 2024
@github-actions GitHub Actions
Copy link
Contributor

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

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

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

State Old New Status
equipped-NECK Added
icon Added

Edit: diff updated after c9b45c2

@ShatteredSwords
Copy link
Contributor

I think there are armwarmers being added in #116 in terms of coder stuff

FoxxoTrystan
FoxxoTrystan requested changes Aug 18, 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.

Coder Armes is already added, replace or remove.

@Memeji Memeji requested a review from FoxxoTrystan August 18, 2024 21:38
FoxxoTrystan
FoxxoTrystan approved these changes Aug 19, 2024
View reviewed changes
Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml
Copy link
Collaborator

Choose a reason for hiding this comment

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

Normally this should be unchanged but its fine.

@FoxxoTrystan FoxxoTrystan merged commit 8f0216c into Fansana:master Aug 19, 2024
15 checks passed
Floof-Station-Bot added a commit that referenced this pull request Aug 19, 2024
@Floof-Station-Bot
Automatic Changelog Update (#119)
83162d5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FoxxoTrystan FoxxoTrystan FoxxoTrystan approved these changes

Assignees
No one assigned
Labels
Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Status: Needs Review Someone please review this
Projects
None yet
Milestone
No milestone
Development

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