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

Update custom drinks #993

Merged
merged 10 commits into from
Apr 4, 2024
Merged

Update custom drinks #993

merged 10 commits into from
Apr 4, 2024

Conversation

FluffiestFloof
Copy link
Contributor

@FluffiestFloof FluffiestFloof commented Mar 21, 2024 •
edited
Loading

About the PR

Gives all the DeltaV and Nyano drinks new empty and fill sprites.
Fun.

Why / Balance

Looks better.

Technical details

Fixes #985

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

🆑

  • fix: Fixed our custom drinks not having different fill levels.

@github-actions github-actions bot added Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files labels Mar 21, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Mar 21, 2024 •
edited
Loading

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

Resources/Textures/DeltaV/Objects/Consumable/Drinks/greengrass.rsi

State Old New Status
icon Modified
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon_empty Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemondrop.rsi

State Old New Status
icon Modified
fill-1 Added
fill-2 Added
fill-3 Added
icon_empty Added

Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/atomicpunch.rsi

State Old New Status
icon Modified
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
icon_empty Added

Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/brainbomb.rsi

State Old New Status
icon Modified
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
icon_empty Added

Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi

State Old New Status
icon Modified
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon_empty Added

Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi

State Old New Status
icon Modified
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon_empty Added

Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi

State Old New Status
icon Modified
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon_empty Added

Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi

State Old New Status
icon Modified
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon_empty Added

Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/orangecreamcicle.rsi

State Old New Status
icon Modified
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
icon_empty Added

Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/pinkdrink.rsi

State Old New Status
icon Modified
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
icon_empty Added

Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/silverjack.rsi

State Old New Status
icon Modified
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
icon_empty Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/dulleavene.rsi

State Old New Status
icon Removed

Resources/Textures/DeltaV/Objects/Consumable/Drinks/arsonist.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
icon_empty Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/daiquiri.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
icon_empty Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/gunmetal.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon_empty Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/kvass.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
icon Added
icon_empty Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
icon_empty Added

Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sakeglass.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
icon_empty Added

Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sapopicante.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon_empty Added

Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sojuglass.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
icon_empty Added

Edit: diff updated after 7ce3781

@FluffiestFloof
fixes
0da20a8
@FluffiestFloof
imsmart
3a0eb01
@FluffiestFloof
elp
8784f44 
Some DV drink sprites are way too different from the base game sprites
@github-actions github-actions bot added the Changes: Localization Changes any ftl files label Mar 22, 2024
@FluffiestFloof FluffiestFloof marked this pull request as ready for review March 23, 2024 11:09
IamVelcroboy
IamVelcroboy previously approved these changes Mar 25, 2024
View reviewed changes
Copy link
Member

@IamVelcroboy IamVelcroboy left a comment

Choose a reason for hiding this comment

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

Looks good to me

@IamVelcroboy IamVelcroboy merged commit be0d844 into DeltaV-Station:master Apr 4, 2024
13 checks passed
nearlyNonexistent referenced this pull request in nearlyNonexistent/Horizon-Station Apr 14, 2024
@FluffiestFloof @nearlyNonexistent
Update custom drinks (#993)
4b10e13 
* fix dulleaveanee icon weirdness

hmm yes 13x17 sprite

* First batch

* fixes

* imsmart

* elp

Some DV drink sprites are way too different from the base game sprites

* oops

* soju and sake

* fix flavor

* small fix to kvass
VMSolidus added a commit to Simple-Station/Einstein-Engines that referenced this pull request May 12, 2024
@SimpleStation14 @FluffiestFloof @VMSolidus
Update custom drinks (#96)
6465a43 
## Mirror of PR #993: [Update custom
drinks](DeltaV-Station/Delta-v#993) from <img
src="https://avatars.githubusercontent.com/u/131613340?v=4"
alt="DeltaV-Station" width="22"/>
[DeltaV-Station](https://github.com/DeltaV-Station)/[Delta-v](https://github.com/DeltaV-Station/Delta-v)

<aside>PR opened by <img
src="https://avatars.githubusercontent.com/u/9823203?v=4" width="16"/><a
href="https://github.com/FluffiestFloof"> FluffiestFloof</a> at
2024-03-21 21:36:52 UTC</aside>
<aside>PR merged by <img
src="https://avatars.githubusercontent.com/u/9823203?v=4" width="16"/><a
href="https://github.com/FluffiestFloof"> FluffiestFloof</a> at
2024-04-04 17:06:01 UTC</aside>
<sup>

`be0d84458adc156a7f2bcb6305a7d6dbb5042c10`

</sup>

---

PR changed 0 files with 0 additions and 0 deletions.

The PR had the following labels:
- Changes: YML
- Changes: Localization
- Changes: Sprite


---

<details open="true"><summary><h1>Original Body</h1></summary>

> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
> 
> ## About the PR
> <!-- What did you change in this PR? -->
> Gives all the DeltaV and Nyano drinks new empty and fill sprites.
> Fun.
> 
> ## Why / Balance
> <!-- Why was it changed? Link any discussions or issues here. Please
discuss how this would affect game balance. -->
> Looks better.
> 
> ## Technical details
> <!-- If this is a code change, summarize at high level how your new
code works. This makes it easier to review. -->
> Fixes #985 
> 
> ## Media
> <!-- 
> PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
> Small fixes/refactors are exempt.
> Any media may be used in SS14 progress reports, with clear credit
given.
> 
> If you're unsure whether your PR will require media, ask a maintainer.
> 
> Check the box below to confirm that you have in fact seen this (put an
X in the brackets, like [X]):
> -->
> 
> - [ ] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
> 
> ## Breaking changes
> <!--
> List any breaking changes, including namespace, public
class/method/field changes, prototype renames; and provide instructions
for fixing them. This will be pasted in #codebase-changes.
> -->
> 
> **Changelog**
> <!--
> Make players aware of new features and changes that could affect how
they play the game by adding a Changelog entry. Please read the
Changelog guidelines located at:
https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog
> -->
> 
> 🆑
> - fix: Fixed our custom drinks not having different fill levels.


</details>

Co-authored-by: Fluffiest Floofers <thebluewulf@gmail.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@IamVelcroboy IamVelcroboy IamVelcroboy left review comments

Assignees
No one assigned
Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Drinks from the Nyano/DV base need to be moved to the new metamorphic glasses
2 participants
@FluffiestFloof @IamVelcroboy