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

Pride-o-mat and refill for it #22

Merged
merged 3 commits into from
Sep 16, 2023
Merged

Conversation

Dorragon
Copy link
Contributor

About the PR

adds Pride-O-Mat along with refill for it orderable in cargo

I am in misery

Why / Balance

Technical details

Media

Breaking changes

Changelog

🆑

  • add: Added Pride-O-Mat
  • add: Added restock box for prideomat that is available in cargo

@github-actions github-actions bot added Changes: Sprites Changes: YML Changes any yml files labels Sep 16, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Sep 16, 2023

RSI Diff Bot; head commit 2c7c3be merging into 1dfcbf4
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

Edit: diff updated after 2c7c3be

Signed-off-by: Dorragon <101672978+Dorragon@users.noreply.github.com>
@Dorragon Dorragon marked this pull request as ready for review September 16, 2023 04:23
@Colin-Tel Colin-Tel merged commit 0c2f8a4 into DeltaV-Station:master Sep 16, 2023
22 checks passed
DeltaV-Bot pushed a commit that referenced this pull request Sep 16, 2023
@Dorragon Dorragon deleted the Pride-o-mat branch March 23, 2024 03:50
TypoChel1 pushed a commit to TypoChel1/Ifi07 that referenced this pull request Jul 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants