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.

Sign up for GitHub

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

Jump to bottom

Pride o mat #659

Merged
merged 2 commits into from
Dec 10, 2023
Merged

Pride o mat #659

merged 2 commits into from
Dec 10, 2023

Conversation

dvir001
Copy link
Contributor

@dvir001 dvir001 commented Dec 5, 2023 •
edited
Loading

About the PR

DeltaV vend machine
Made it frontier friendly

Why / Balance

Why not.

Technical details

.yml

Media

N/A

Breaking changes

N/A

Changelog
🆑

  • add: Added Pride-O-Mat vender

Dorragon and others added 2 commits December 6, 2023 00:50
@Dorragon @dvir001
Pride-o-mat and refill for it (new-frontiers-14#22)
eb8974f 
* Pride-o-mat and refill

* Made BaseVendingMachineRestockDeltaV unspawnable

* Update vending_machine_restock.yml

Signed-off-by: Dorragon <[email protected]>

---------

Signed-off-by: Dorragon <[email protected]>
@dvir001
Fixing For Frontier
7d23332
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 5, 2023

RSI Diff Bot; head commit 7d23332 merging into 956cbe8
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi

State Old New Status
base Added
green_bit Added
inhand-left Added
inhand-right Added
refill_pride Added

Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi

State Old New Status
broken Added
normal-unshaded Added
off Added
panel Added

@Cheackraze Cheackraze self-requested a review December 10, 2023 18:32
@github-actions github-actions bot added the Status: Needs Review This PR is awaiting reviews label Dec 10, 2023
@Cheackraze Cheackraze merged commit 48220e2 into new-frontiers-14:master Dec 10, 2023
11 of 12 checks passed
FrontierATC added a commit that referenced this pull request Dec 10, 2023
@FrontierATC
Automatic Changelog (#659)
c4f263d
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Cheackraze Cheackraze Cheackraze approved these changes

@RealIHaveANameOfficial RealIHaveANameOfficial RealIHaveANameOfficial approved these changes

Assignees
No one assigned
Labels
Status: Needs Review This PR is awaiting reviews
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@dvir001 @Cheackraze @RealIHaveANameOfficial @Dorragon