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

Reflavor drinking amounts, pillows, and maybe add ashtrays. Oh, and inhand icon state. #45

Merged
merged 6 commits into from
Jul 20, 2024

Conversation

Tk420634
Copy link
Collaborator

  • Change the clear cut amounts that you 'transfer liquid' from cups to be something like sips, tastes, gulps, etc.

  • Todo: add pillows, the files added but not ticked on yet

  • Ashtrays todo: sprites exist but no code is written yet.

Placing cig on ashtray should mark cig as yours, clicking it again picks it up. Should make a sprite for cigs in the ashtray that aren't just burnt out. Picking up a cig that isn't marked as yours should clearly state 'so and so picks up the whatever left by the whoever' or something.

About The Pull Request

Pre-Merge Checklist

  • You tested this on a local server.
  • This code did not runtime during testing.
  • You documented all of your changes.

Changelog

🆑
add: Added new things
add: Added more things
del: Removed old things
tweak: tweaked a few things
balance: rebalanced something
fix: fixed a few things
soundadd: added a new sound thingy
sounddel: removed an old sound thingy
imageadd: added some icons and images
imagedel: deleted some icons and images
spellcheck: fixed a few typos
code: changed some code
refactor: refactored some code
config: changed some config setting
admin: messed with admin stuff
server: something server ops should know
/:cl:

- Change the clear cut amounts that you 'transfer liquid' from cups to be something like sips, tastes, gulps, etc.

- Todo: add pillows, the files added but not ticked on yet

- Ashtrays todo: sprites exist but no code is written yet.

Placing cig on ashtray should mark cig as yours, clicking it again picks it up.  Should make a sprite for cigs in the ashtray that aren't just burnt out.  Picking up a cig that isn't marked as yours should clearly state 'so and so picks up the whatever left by the whoever' or something.
@Tk420634 Tk420634 marked this pull request as draft July 19, 2024 23:02
@Tk420634 Tk420634 added enhancement New feature or request help wanted Extra attention is needed labels Jul 19, 2024
@Tk420634 Tk420634 changed the title Reflavor drinking amounts, pillows, and maybe add ashtrays Reflavor drinking amounts, pillows, and maybe add ashtrays. Oh, and inhand icon state. Jul 20, 2024
@Tk420634 Tk420634 marked this pull request as ready for review July 20, 2024 05:13
@Tk420634 Tk420634 merged commit dadf10b into master Jul 20, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request help wanted Extra attention is needed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants