Skip to content

Minor revert of two changes from #780#804

Open
FalloutFalcon wants to merge 1 commit intoDarkPack13:masterfrom
FalloutFalcon:minor-revert-of-780
Open

Minor revert of two changes from #780#804
FalloutFalcon wants to merge 1 commit intoDarkPack13:masterfrom
FalloutFalcon:minor-revert-of-780

Conversation

@FalloutFalcon
Copy link
Copy Markdown
Member

@FalloutFalcon FalloutFalcon commented Mar 25, 2026

About The Pull Request

reverts the drink and boozeomat changes made in #780 as they were never addressed and pushed through.

Why It's Good For The Game

The removal of all drink glasses expect wine_glass (which also put it outside of the modular edit) was not justified or really explained.

For the init code, we have a type that is better to use and its bad to have random setting initialize behavior like that as it overides subtype and varedit behavoir.
image

@FalloutFalcon FalloutFalcon requested a review from a team as a code owner March 25, 2026 01:01
@buffyuwu
Copy link
Copy Markdown
Contributor

buffyuwu commented Mar 25, 2026

it'll still yap station slogans unless you null those out, we need the change. if people want snowflakey machines that cost credits, theyll need to make a credits system. if they want to have one that yaps slogans, they can override the init proc

the commented out wod13 glasses can be outright removed, they dont update sprites nor name when drinks are poured in and are mostly broken as-is; i think the shot glass straight up vanishes when you pour stuff into it

also i think there are higher priority items to worry about than this :(

Copy link
Copy Markdown
Contributor

@buffyuwu buffyuwu left a comment

Choose a reason for hiding this comment

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

above

@FalloutFalcon
Copy link
Copy Markdown
Member Author

FalloutFalcon commented Mar 28, 2026

it'll still yap station slogans unless you null those out, we need the change. if people want snowflakey machines that cost credits, theyll need to make a credits system.

The vending machines already use dollars and credit cards as i built out the code to automaticly support them in most places.

if they want to have one that yaps slogans, they can override the init proc

The init override was a poor way to adress the yapping issue. the slogans are also displayed in the TGUI which is flavorful and we should not remove.

the commented out wod13 glasses can be outright removed, they dont update sprites nor name when drinks are poured in and are mostly broken as-is; i think the shot glass straight up vanishes when you pour stuff into it

Then they should prob be fully removed, however i really like how they look. They fit a lot better in the art style and I am leaning towards reusing the sprites of Collins and shotglass for the tg types for the but the other ones can just exist tbh. Asking for something to be served in a pint is flavor, and they have unique reagent sizes which i think is neat.

also i think there are higher priority items to worry about than this :(

I see bad code, i fix bad code.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants