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] Adds new vending machine tooltips. #2434

Merged
merged 1 commit into from
Mar 17, 2024
Merged

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#1466
Original PR: tgstation/tgstation#81918

About The Pull Request

This PR adds tooltips to vending machines.
Specifically, the tooltips cover tool interactions (unwrench, toggle panel open/closed, deconstruct), as well as righting a knocked over vending machine with an open hand, and returning items to a vending machine as applicable.
image
image
image
image
image
This also provides a context for restock modules, which shows specific text when the vending machine has credit to be claimed when restocked.

Tweaks a little bit of speech handling to prevent issues with custom_vendor for determining if an item can be returned to re-use for the tooltip proc.

Why It's Good For The Game

Improves clarity on a high impact economy related piece of content, plus we kinda like vending machines, based on how much code we have dedicated to them. 🐛 💥

Changelog

🆑 ArcaneMusic
qol: Vending machines now have contextual tooltips for interactions with tools/objects/restocking/returns.
qol: Vending machines can now be examined to see what type of restock module they need to be refilled.
/:cl:

* Adds new vending machine tooltips. (#81918)

## About The Pull Request

This PR adds tooltips to vending machines.
Specifically, the tooltips cover tool interactions (unwrench, toggle
panel open/closed, deconstruct), as well as righting a knocked over
vending machine with an open hand, and returning items to a vending
machine as applicable.

![image](https://github.com/tgstation/tgstation/assets/41715314/2af1eb6a-b357-423b-acd4-f9b6dd913b64)

![image](https://github.com/tgstation/tgstation/assets/41715314/816eb602-4831-41ea-a4b6-ece54cea4665)

![image](https://github.com/tgstation/tgstation/assets/41715314/f4ec55eb-b403-4444-9ae5-ea1978f7f578)

![image](https://github.com/tgstation/tgstation/assets/41715314/371c21b3-a884-4ec0-afa7-531f109c93b1)

![image](https://github.com/tgstation/tgstation/assets/41715314/fac5881e-89f0-482e-b19b-db0440684147)
This also provides a context for restock modules, which shows specific
text when the vending machine has credit to be claimed when restocked.

Tweaks a little bit of speech handling to prevent issues with
custom_vendor for determining if an item can be returned to re-use for
the tooltip proc.

## Why It's Good For The Game

Improves clarity on a high impact economy related piece of content, plus
we kinda *like* vending machines, based on how much code we have
dedicated to them. 🐛 💥

## Changelog

:cl:
qol: Vending machines now have contextual tooltips for interactions with
tools/objects/restocking/returns.
qol: Vending machines can now be examined to see what type of restock
module they need to be refilled.
/:cl:

---------

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

* Adds new vending machine tooltips.

* override fix

---------

Co-authored-by: ArcaneMusic <[email protected]>
Co-authored-by: MrMelbert <[email protected]>
Co-authored-by: san7890 <[email protected]>
Co-authored-by: SomeRandomOwl <[email protected]>
@ReezeBL ReezeBL merged commit 33aad9e into master Mar 17, 2024
24 checks passed
@ReezeBL ReezeBL deleted the upstream-mirror-1466 branch March 17, 2024 00:17
AnywayFarus added a commit that referenced this pull request Mar 17, 2024
Iajret pushed a commit that referenced this pull request May 14, 2024
* the rot consumes all

* prepare thyself

* and in the end there will be little ceasars and tap water for you
AnywayFarus pushed a commit that referenced this pull request Jun 2, 2024
* the rot consumes all

* prepare thyself

* and in the end there will be little ceasars and tap water for you

Co-authored-by: Paxilmaniac <[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