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

Update custom drinks #96

Conversation

SimpleStation14
Copy link
Member

Mirror of PR #993: Update custom drinks from DeltaV-Station DeltaV-Station/Delta-v

PR opened by

FluffiestFloof at 2024-03-21 21:36:52 UTC PR merged by

FluffiestFloof at 2024-04-04 17:06:01 UTC

be0d84458adc156a7f2bcb6305a7d6dbb5042c10


PR changed 0 files with 0 additions and 0 deletions.

The PR had the following labels:

  • Changes: YML
  • Changes: Localization
  • Changes: Sprite

Original Body

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.

Copy link
Contributor

github-actions bot commented Apr 7, 2024

RSI Diff Bot; head commit e6f0a08 merging into 4b53cdf
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 e6f0a08

@Pspritechologist Pspritechologist added the Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot label Apr 10, 2024
@SimpleStation14 SimpleStation14 marked this pull request as draft May 4, 2024 21:14
@VMSolidus VMSolidus marked this pull request as ready for review May 11, 2024 02:50
@github-actions github-actions bot added Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels May 11, 2024
@VMSolidus VMSolidus merged commit 6465a43 into Simple-Station:master May 12, 2024
12 checks passed
Mnemotechnician pushed a commit to Mnemotechnician/Einstein-Engines that referenced this pull request Sep 9, 2024
…douts

Cosmetic Goggles and Animal Mask Loadout Options
Mnemotechnician pushed a commit to Mnemotechnician/Einstein-Engines that referenced this pull request Sep 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants