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

Vending machine lock improvements #28200

Merged
merged 6 commits into from
Feb 13, 2025

Conversation

FunnyMan3595
Copy link
Contributor

What Does This PR Do

  • You can no longer link a different POS to a locked custom vendor
  • You can no longer unwrench a locked custom vendor
  • You can now bypass the lock on a custom vendor while the POS device is in your hand or pocket.

Why It's Good For The Game

Makes custom vendors easier to use, and makes it harder for other crew to mess with them (short of tipping or destroying them)

Images of changes

When the machine is locked, but you can bypass the lock:
image

Testing

Vended in all three states. Was only charged when locked and not bypassing.
Tried to change appearance all three states. Was only prevented when locked and not bypassing.
Tried to change name all three states. Was only prevented when locked and not bypassing.
Tried to pry the machine apart in all four states (including no linked POS). Only failed when locked and not bypassing.
Tried to unwrench the machine in all four states (including no linked POS). Only failed when locked and not bypassing.


Declaration

  • I confirm that I either do not require pre-approval for this PR, or I have obtained such approval and have included a screenshot to demonstrate this below.

Changelog

🆑
tweak: You can no longer link a new POS device to a locked custom vendor.
tweak: You can no longer unwrench a locked custom vendor.
add: You can bypass the lock on a custom vendor while the linked POS device is in your hand or pocket.
/:cl:

@FunnyMan3595 FunnyMan3595 added the Tweak This PR tweaks something ingame label Jan 31, 2025
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally TGUI This PR modifies TGUI, will conflict labels Jan 31, 2025
Copy link
Contributor

@lewcc lewcc left a comment

Choose a reason for hiding this comment

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

DM changes lgtm, would like other eyes on the js side

@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally labels Jan 31, 2025
Copy link
Contributor

@Spaghetti-bit Spaghetti-bit left a comment

Choose a reason for hiding this comment

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

.js side of things looks good.

@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Feb 2, 2025
@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Feb 2, 2025
@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Feb 10, 2025
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting merge This PR is ready for merge and removed -Status: Awaiting review This PR is awaiting review from the review team labels Feb 12, 2025
@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Feb 13, 2025
@Burzah Burzah added this pull request to the merge queue Feb 13, 2025
Merged via the queue into ParadiseSS13:master with commit 5495930 Feb 13, 2025
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
-Status: Awaiting merge This PR is ready for merge TGUI This PR modifies TGUI, will conflict Tweak This PR tweaks something ingame
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants