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

[MIRROR] Allows shakers to pour drinks with custom names and descriptions #1932

Merged
merged 1 commit into from
Feb 11, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#899
Original PR: tgstation/tgstation#81234

About The Pull Request

This adds the ability for shakers to pour drinks with custom names and descriptions. You can alt-click on a shaker and it will prompt you to set the name and desc for the drink, and they will be given to description of whatever drinking glass you pour into.
Washing the glass will remove these customization (it will also now remove any changes made using a pen).

2024-02-01.20-53-57.mp4

Why It's Good For The Game

While this already kind of exists by using a pen to change the name and desc, this is pretty annoying to do for every single glass of a beverage you serve. It also is overwritten whenever the kind of drink in the glass is changed. This PR will let bartenders serve plenty of their own special concoctions without having to rename every single glass they serve.

Changelog

🆑 Momo8289
add: Shakers can now pour drinks with custom names and descriptions! Alt-click the shaker to enable this.
/:cl:

…ions (#899)

* Allows shakers to pour drinks with custom names and descriptions (#81234)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
This adds the ability for shakers to pour drinks with custom names and
descriptions. You can alt-click on a shaker and it will prompt you to
set the name and desc for the drink, and they will be given to
description of whatever drinking glass you pour into.
Washing the glass will remove these customization (it will also now
remove any changes made using a pen).


https://github.com/tgstation/tgstation/assets/42454181/6cf336f0-0621-49f3-baf1-91038f454c24


<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
While this already kind of exists by using a pen to change the name and
desc, this is pretty annoying to do for every single glass of a beverage
you serve. It also is overwritten whenever the kind of drink in the
glass is changed. This PR will let bartenders serve plenty of their own
special concoctions without having to rename every single glass they
serve.
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add: Shakers can now pour drinks with custom names and descriptions!
Alt-click the shaker to enable this.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: MrMelbert <[email protected]>
Co-authored-by: Ghom <[email protected]>

* Allows shakers to pour drinks with custom names and descriptions

---------

Co-authored-by: Nick <[email protected]>
Co-authored-by: MrMelbert <[email protected]>
Co-authored-by: Ghom <[email protected]>
@Iajret Iajret merged commit 5379df1 into master Feb 11, 2024
24 checks passed
@Iajret Iajret deleted the upstream-mirror-899 branch February 11, 2024 11:01
AnywayFarus added a commit that referenced this pull request Feb 11, 2024
Iajret pushed a commit that referenced this pull request Apr 15, 2024
* Removes unused code for HTML UIs

* Merge conflicts

* Update dancing_pole.dm

* Deprecated proc

* More of those

---------

Co-authored-by: John Willard <[email protected]>
Co-authored-by: Mal <[email protected]>
Iajret added a commit that referenced this pull request Apr 16, 2024
* [MIRROR] Removes unused code for HTML UIs (#1932)

* Removes unused code for HTML UIs

* Merge conflicts

* Update dancing_pole.dm

* Deprecated proc

* More of those

---------

Co-authored-by: John Willard <[email protected]>
Co-authored-by: Mal <[email protected]>

* MergeConflict fixes

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: John Willard <[email protected]>
Co-authored-by: Mal <[email protected]>
Co-authored-by: mogeoko <[email protected]>
Co-authored-by: Iajret <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants