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

Porting Pride-O-Mat to Upstream #34412

Merged
merged 4 commits into from
Jan 13, 2025
Merged

Porting Pride-O-Mat to Upstream #34412

merged 4 commits into from
Jan 13, 2025

Conversation

southbridge-fur
Copy link
Contributor

@southbridge-fur southbridge-fur commented Jan 13, 2025 •
edited
Loading

About the PR

This PR brings the Pride-O-Mat from Nyanotrasen/Nyanotrasen#1322 to upstream.

Why / Balance

This is both a personal desire from seeing this vendor in other forks, and also just a really nice thing to have to provide people with methods to express themselves during a round.

Technical details

Before anyone starts a discussion regarding licensing, I want to mention that the sprites are licensed under CC-BY-SA-4.0 and the repository where this vending machine was first introduced is licensed under MIT. That is the version I have cherry picked from and am drawing all my changes off of.

  • Cherry-picked Pride-O-Mat Nyanotrasen/Nyanotrasen#1322 into upstream.
  • Adjusted things to fit into the current conventions for vending machines.
  • Added a new advertising line
  • Added goodbyes.
  • Adjusted the inventory to include all pride cloaks, additional pins, headphones, and flower wreath.
  • Added an emag inventory of the Coder Socks, Bee Socks, and (as a joke) 0 cat ears.

Media

Image

image

Video Demonstration

pride-o-mat.mp4

Requirements

Breaking changes

Any downstream forks using the Pride-O-Mat may need to adjust various values such as the inventory, advertisements, goodbyes, etc. This is also likely to lead to some merge conflicts since changes to this vendor could have been made which cannot be brought into upstream due to licensing.

Changelog

🆑

  • add: The Pride-O-Mat vending machine has been ported to upstream.

Dorragon and others added 3 commits January 12, 2025 19:13
@Dorragon @southbridge-fur
Pride-O-Mat (space-wizards#1322)
3e5ed8f 
* Added Pride-O-Mat

* Yep

* Updated license to the correct one
@southbridge-fur
Added more lines, reconfigured settings a bit, also added cloaks to i…
4e9d3a7 
…nventory, set coder socks to emag inventory
@southbridge-fur
Removed bunny ears, fixed typo
f14ad3f
@github-actions github-actions bot added S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. size/M Denotes a PR that changes 100-999 lines. Changes: No C# Changes: Requires no C# knowledge to review or fix this item. Changes: Sprites Changes: Might require knowledge of spriting or visual design. labels Jan 13, 2025
@github-actions GitHub Actions
Copy link
Contributor

RSI Diff Bot; head commit f14ad3f merging into 5fff6bb
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

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

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

@K-Dynamic
Copy link
Contributor

K-Dynamic commented Jan 13, 2025 •
edited
Loading

Bruh 0 cat ears, give 1 at least :trollface:

If pride items are available in a vendor, do we want to keep or remove them from loadouts (the loadout page is long as is)

@southbridge-fur
Copy link
Contributor Author

Bruh 0 cat ears, give 1 at least :trollface:

If pride items are available in a vendor, do we want to keep or remove them from loadouts (the loadout page is long as is)

26tc item for an 8tc EMAG :godo:

@K-Dynamic
Copy link
Contributor

K-Dynamic commented Jan 13, 2025 •
edited
Loading

26tc item for an 8tc EMAG :godo:

Other than being a meme, part of the cost also acts as a price sink for surplus rolls.

I'd like to ask why plushie sharks and headphones are included in the inventory

@southbridge-fur
Copy link
Contributor Author

26tc item for an 8tc EMAG :godo:

Other than being a meme, part of the cost also acts as a price sink for surplus rolls.

I'd like to ask why plushie sharks and headphones are included in the inventory

Plushie sharks because they're trans icons and the headphones for autism since some folks get overstimulated easily and wear headphones to help.

@southbridge-fur
Copy link
Contributor Author

Bruh 0 cat ears, give 1 at least :trollface:

If pride items are available in a vendor, do we want to keep or remove them from loadouts (the loadout page is long as is)

also I'm not looking to remove these items from loadouts, at least not the pins. Although I could remove the pins from the vendor since they're likely going to be in loadouts anyway

@K-Dynamic
Copy link
Contributor

K-Dynamic commented Jan 13, 2025 •
edited
Loading

Plushie sharks because they're trans icons and the headphones for autism since some folks get overstimulated easily and wear headphones to help.

also I'm not looking to remove these items from loadouts, at least not the pins. Although I could remove the pins from the vendor since they're likely going to be in loadouts anyway

Just keep everything in the vendor (especially the pins since they display on the vendor sprite), no need to touch loadout then

@lzk228 lzk228 added P3: Standard Priority: Default priority for repository items. T: New Feature Type: New feature or content, or extending existing content S: Needs Review Status: Requires additional reviews before being fully accepted DB: Beginner Friendly Difficulty: Great for beginners. Unambiguous in scope, and explains how to achieve the result. A: General Interactions Area: General in-game interactions that don't relate to another area. and removed S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. labels Jan 13, 2025
@lzk228
Copy link
Contributor

lzk228 commented Jan 13, 2025

i personally think that pins in loadouts is enough

@Pumkin69
Copy link
Contributor

i like the idea but would rather have pride mantles and a vending machine for those.

@southbridge-fur
Copy link
Contributor Author

i like the idea but would rather have pride mantles and a vending machine for those.

Do you mean I should remove the pins? The pride mantles are in the vendor already

@2011sunbeam

This comment was marked as abuse.

Sign in to view
PJB3005
PJB3005 approved these changes Jan 13, 2025
View reviewed changes
Copy link
Member

@PJB3005 PJB3005 left a comment

Choose a reason for hiding this comment

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

Speedmerge

@PJB3005 PJB3005 added the S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. label Jan 13, 2025
keronshb
keronshb previously requested changes Jan 13, 2025
View reviewed changes
Copy link
Contributor

@keronshb keronshb left a comment

Choose a reason for hiding this comment

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

Emag interactions are currently under a freeze.
Please remove the emag inventory from this.

@Marsty-dev

This comment was marked as abuse.

Sign in to view
@Marsty-dev

This comment was marked as abuse.

Sign in to view
@Marsty-dev

This comment was marked as spam.

Sign in to view
@deathride58
Copy link
Member

@Marsty-dev Мы не терпим здесь нетерпимых.

@space-wizards space-wizards locked and limited conversation to collaborators Jan 13, 2025
slarticodefast
slarticodefast requested changes Jan 13, 2025
View reviewed changes
Copy link
Member

@slarticodefast slarticodefast left a comment

Choose a reason for hiding this comment

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

Can you add it to the random vending machine spawner in Markers/Spawners/Random/vending.yml?

slarticodefast
slarticodefast approved these changes Jan 13, 2025
View reviewed changes
Copy link
Member

@slarticodefast slarticodefast left a comment

Choose a reason for hiding this comment

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

We had a short discussion with the maintainers and decided that this will not need to be mapped on every single map, but should rather use a random spawner in case we add more vending machines in the future.
HI talked on discord with the author and they will be adding a few more random spawners for mapping in a separate PR. Thank you for contributing!

@slarticodefast slarticodefast enabled auto-merge (squash) January 13, 2025 18:48
@slarticodefast slarticodefast merged commit 6c41d96 into space-wizards:master Jan 13, 2025
13 of 14 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@PJB3005 PJB3005 PJB3005 approved these changes

@slarticodefast slarticodefast slarticodefast approved these changes

@keronshb keronshb keronshb left review comments

Assignees
No one assigned
Labels
A: General Interactions Area: General in-game interactions that don't relate to another area. Changes: No C# Changes: Requires no C# knowledge to review or fix this item. Changes: Sprites Changes: Might require knowledge of spriting or visual design. DB: Beginner Friendly Difficulty: Great for beginners. Unambiguous in scope, and explains how to achieve the result. P3: Standard Priority: Default priority for repository items. S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. S: Needs Review Status: Requires additional reviews before being fully accepted size/M Denotes a PR that changes 100-999 lines. T: New Feature Type: New feature or content, or extending existing content
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.