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

Cherry-Pick Paper, Folders, and Sticky Notes From Delta V #556

Merged
merged 7 commits into from
Feb 14, 2025

Conversation

Eagle0600
Copy link
Contributor

@Eagle0600 Eagle0600 commented Feb 14, 2025

Description

Adds sticky notes, folders, paper reams, and new colours of paper from Delta V.

Places all these items in the bureaucracy crate.

Original PRs:


TODO

  • Cherry-pick changes from Delta V.
  • Evaluate new crate value to ensure it can't be sold for a profit.
  • Add media.
  • Determine whether I should put sowelipililimute in the changelog credit.

Media

Papermoon


Changelog

🆑 sowelipililimute

  • add: Sticky notes exist, and can be found in the bureaucracy crate
  • add: Bureaucracy crate has more and more varied folders
  • add: Papermoon white and dyed paper reams are now available to spice up your paperwork in the Bureaucracy crate
  • tweak: Loose papers in the bureaucracy crate have been replaced with a ream of white paper

@github-actions github-actions bot added Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Feb 14, 2025
Copy link
Contributor

github-actions bot commented Feb 14, 2025

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

Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi

State Old New Status
ream-bright Added
ream-classic Added
ream-white Added

Resources/Textures/_DV/Objects/Misc/stickies.rsi

State Old New Status
sticky_note Added
sticky_note_dispenser_base Added
sticky_note_dispenser_bin1 Added
sticky_note_dispenser_bin2 Added
sticky_note_dispenser_bin3 Added
sticky_note_dispenser_bin4 Added
sticky_note_dispenser_bin5 Added
sticky_note_words Added

Edit: diff updated after 7d6ecf6

@Eagle0600 Eagle0600 marked this pull request as ready for review February 14, 2025 09:09
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Feb 14, 2025
@Eagle0600
Copy link
Contributor Author

Hi @sowelipililimute. Sorry for the second mention. I'd misspelled bureaucracy in my branch name, and renaming it broke the PR. So, same question again, do you want me to put you on the changelog here? I'm not sure what the appropriate etiquette is.

@Mnemotechnician
Copy link
Collaborator

Please link the original PR in the PR description. As for specifying the authors name in the changelog, it's preferable to do that too if you don't credit the author otherwise.

@Eagle0600
Copy link
Contributor Author

Added PRs to description, added original PR author to changelog credit.

Copy link
Collaborator

@Mnemotechnician Mnemotechnician left a comment

Choose a reason for hiding this comment

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

Looks fine to me.

@FoxxoTrystan FoxxoTrystan merged commit 76f83b8 into Fansana:master Feb 14, 2025
30 checks passed
Floof-Station-Bot added a commit that referenced this pull request Feb 14, 2025
@Eagle0600 Eagle0600 deleted the bureaucracy branch February 15, 2025 03:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

5 participants