-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
+125
−103
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lewcc
reviewed
Jan 31, 2025
There was a problem hiding this 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
Spaghetti-bit
approved these changes
Feb 1, 2025
There was a problem hiding this 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.
Spaghetti-bit
approved these changes
Feb 4, 2025
lewcc
approved these changes
Feb 12, 2025
Burzah
approved these changes
Feb 12, 2025
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What Does This PR Do
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](https://private-user-images.githubusercontent.com/98381/408524695-c5c94df8-6d2f-47e2-b69b-f789b52806ca.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk0Njc0MzEsIm5iZiI6MTczOTQ2NzEzMSwicGF0aCI6Ii85ODM4MS80MDg1MjQ2OTUtYzVjOTRkZjgtNmQyZi00N2UyLWI2OWItZjc4OWI1MjgwNmNhLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMTMlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjEzVDE3MTg1MVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTIyNTU5OWQyNWNkM2ZiZGIxZDYzNDBlZGE0ZGU4YTk1MWU4N2VmYjU0N2U4MWM1NWVjZGRkNmEwZDc3NzZkZjcmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.NvQE38zmHiYZsifUxh1Royeq2LbeDLsODjX36LnpCvE)
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
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: