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

Clippy! #2487

Merged
merged 15 commits into from
Jan 2, 2025
Merged

Clippy! #2487

merged 15 commits into from
Jan 2, 2025

Conversation

Unkn0wnGh0st333
Copy link
Contributor

@Unkn0wnGh0st333 Unkn0wnGh0st333 commented Dec 20, 2024 •
edited
Loading

About the PR

Ports Clippy from Frontier to be the courier's new beloved pet!

Why / Balance

This is necessary

Technical details

  • Adds a very small C# file to let cats wear hats
  • Adds new pet type from frontier
  • Adds Clippy
  • Adds Clippys Bag (similar to Ian Bag) that the courier can unlock
  • Adds Clippy
  • Adds the ability for cats to wear hats
    • Only effects Clippy, Runtime, Bingus, and Exception (Floppa can't wear hats)

Media

image

Requirements

  • I have tested all added content and changes.
  • I have added media to this PR or it does not require an in-game showcase.

Changes

  • New spawn for mapping to add Clippy

Changelog
🆑

  • add: Clippy from Frontier has been transferred to DeltaV stations! Couriers now have a new pet and bag to unlock!

@github-actions github-actions bot added size/L 256-1023 lines Changes: YML Changes any yml files Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi labels Dec 20, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 20, 2024 •
edited
Loading

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

Resources/Textures/_DV/Clothing/Head/Hats/mailman.rsi

State Old New Status
equipped-HELMET-cat Added

Resources/Textures/_NF/Clothing/Back/Backpacks/clippy.rsi

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

Resources/Textures/_NF/Tips/clippy.rsi

State Old New Status
down Added
left Added
right Added

Edit: diff updated after fa5af5d

@Unkn0wnGh0st333 Unkn0wnGh0st333 marked this pull request as ready for review December 22, 2024 17:37
@Unkn0wnGh0st333 Unkn0wnGh0st333 requested review from a team as code owners December 22, 2024 17:37
@github-actions github-actions bot added the Changes: Audio Changes any audio files label Dec 22, 2024
@Unkn0wnGh0st333
Copy link
Contributor Author

@dvir001 I can't figure out what I'm missing, bless me with your frontier knowledge

@dvir001
Copy link
Contributor

dvir001 commented Dec 23, 2024 •
edited
Loading

You dont need whitelisted.yml

@ewokswagger
Copy link
Contributor

This is so cute I'm all for more pets

deltanedas
deltanedas previously approved these changes Dec 25, 2024
View reviewed changes
@Unkn0wnGh0st333
Copy link
Contributor Author

I rushed and forgot to change it from nyano to deltav for the mailman hat. Sorry, merry Christmas team

deltanedas
deltanedas previously approved these changes Dec 26, 2024
View reviewed changes
Lyndomen
Lyndomen previously approved these changes Dec 27, 2024
View reviewed changes
Copy link
Contributor

@Lyndomen Lyndomen left a comment

Choose a reason for hiding this comment

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

yeah good shit. If I get another email about clippy I'm gonna die

@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Jan 1, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 1, 2025

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

@deltanedas deltanedas dismissed stale reviews from Lyndomen and themself via 8606022 January 1, 2025 13:54
@deltanedas deltanedas enabled auto-merge (squash) January 1, 2025 13:54
@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Jan 1, 2025
deltanedas
deltanedas previously approved these changes Jan 1, 2025
View reviewed changes
@deltanedas deltanedas merged commit 8fda187 into DeltaV-Station:master Jan 2, 2025
14 checks passed
@Unkn0wnGh0st333 Unkn0wnGh0st333 deleted the Clippy branch January 4, 2025 04:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dvir001 dvir001 dvir001 approved these changes

@deltanedas deltanedas deltanedas approved these changes

@Lyndomen Lyndomen Lyndomen left review comments

Assignees
No one assigned
Labels
Changes: Audio Changes any audio files Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review size/L 256-1023 lines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Unkn0wnGh0st333 @dvir001 @ewokswagger @Kr8art @deltanedas @Lyndomen