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

Trickwine Hotfix #2492

Merged
merged 11 commits into from
Nov 18, 2023
Merged

Trickwine Hotfix #2492

merged 11 commits into from
Nov 18, 2023

Conversation

FalloutFalcon
Copy link
Member

@FalloutFalcon FalloutFalcon commented Nov 17, 2023 •
edited
Loading

About The Pull Request

It took me 1-2 rounds the gather up a list of small issues and bugs

  • Stray pixel somewhere in the flask sprites.
  • Color of reagents doesn't match the sprites.
  • Typo in vintage flasks.
  • Prism wine needs buff: maybe give it a real reflect and make prism wine actually reflect lasers.
  • The breakaway flask recipe should go in the drinks tab.
  • The distiller's icon state gets turned back to barrel when you open it. Use a variable in the barrel to update icons so they acctually get updated proper

Why It's Good For The Game

fixing my mistakes and oversights is.. good c:

Changelog

🆑
fix: fixed shitty trickwine code (who let this guy cook)
balance: buff to prismwine to make it useful
/:cl:

@github-actions github-actions bot added the Sprites A bikeshed full of soulless bikes. label Nov 17, 2023
@github-actions github-actions bot added the Code change Watch something violently break. label Nov 17, 2023
@FalloutFalcon FalloutFalcon marked this pull request as ready for review November 17, 2023 04:33
@FalloutFalcon FalloutFalcon requested a review from a team as a code owner November 17, 2023 04:33
@FalloutFalcon FalloutFalcon marked this pull request as draft November 17, 2023 05:01
@FalloutFalcon FalloutFalcon marked this pull request as ready for review November 17, 2023 18:20
@thgvr thgvr added this pull request to the merge queue Nov 18, 2023
Merged via the queue into shiptest-ss13:master with commit 7428bca Nov 18, 2023
10 checks passed
shiptest-server pushed a commit that referenced this pull request Nov 18, 2023
@actions-user
Automatic changelog generation for PR #2492 [ci skip]
0902fd1
MysticalFaceLesS added a commit to CeladonSS13/Shiptest that referenced this pull request Dec 4, 2023
@MysticalFaceLesS
Merge pull request #179 from Mirag1993/Мердж-с-оффами
c657fb2 
Trickwine Hotfix (shiptest-ss13#2492)
@FalloutFalcon FalloutFalcon deleted the Trickwine-Hotfix branch December 18, 2023 14:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Code change Watch something violently break. DME Edit Sprites A bikeshed full of soulless bikes.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@FalloutFalcon @thgvr