* rename kira
* these one too
* migration
* Revert "migration"
This reverts commit ae0006ef745909c2e17b37fd18fd1d57204fe773.
* Revert "these one too"
This reverts commit 9757d2cf6898719b158e03c0f3b637cd2b55ce17.
* Revert "rename kira"
This reverts commit 170408c6f7486a6746b7a7c52cf10c597ead2608.
* bless the emo
* aaaaa
* time to end this right here and right now
* Revert "time to end this right here and right now"
This reverts commit b2c38573f9f8b5e8f736443d646d26839a0694cf.
* Revert "aaaaa"
This reverts commit 0f9451e22533b2f646211219e04103ce16d952ca.
* Revert "bless the emo"
This reverts commit 223607accf81e286481cab8d1037b1eb89a44dac.
* rename
* bikeshedding
---------
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
* Preliminary eggnog changes (egg in shaker crashes?)
* Fixed eggnog reagent name and description
* added - to flavor
* deleted a space
* Added eggnog glass sprite
* changed fill levels to match rsi
* Added two more fill levels to eggnog
* Removed fizziness, changed physical description, and fixed rsi
---------
Co-authored-by: uhbg <29674581+uhbg@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
* Add inhand sprites for the drink shaker
* Update Resources/Textures/Objects/Consumable/Drinks/shaker.rsi/meta.json
oop that's not actually their discord name
* Co-Authored-By: Failed <158702813+failed5@users.noreply.github.com>
* added start to bacchus blessing with few more things left to do
* added sprites and trying to get the empty sprite to work
* fixed empty sprite will fill layer
* added missing fill image
* made flavor, physical description, recipe reaction and tweaked reagent threshold
* fixed fill levels
* removed name from drinks.yml, updated suffix instead
* delay is weird and broken, removing the difference
* updated copyright
* Added New Cocktails and new fill level sprites to existing drinks
* Updated copyright info and fixed recipies for Caipirinha/Mojito.
---------
Co-authored-by: RedBookcase <Usualmoves@gmail.com>
* Renamed "Irish Car Bomb" drink to "Irish Slammer", due to concerns over insensitivity.
* Fixing some missed references
* Added prototype id changes to migration.yml. Removed any reference to the troubles (and corrected ale to stout for flavour text).
* Corrected description back to "Irish Cream"
* Removed non-entities from migration.yml
* Add a festive lemon-lime soda variant: cranberry!
* Gave lemon-lime a brand name
* Make the CrateFoodSoftdrinksLarge slightly larger to accomodate the extra drinks.
* Extend the Christmas anomaly with extra jolliness
* Minor spelling mistake. Jollyness will not be denied.
* Removed redundant delay from meta file
* changed weird red pixel on pitcher sprite
* added pitcher prototype
* added pitcher to dinnervend
* realized I need to change the other icon sprites too :P
* made cup ramen eatable with anything with the fork component
* removed extra png
* made cupramen fillable with water, and made hot ramen dry ramen.
---------
Co-authored-by: redfire1331 <Redfire1331@users.noreply.github.com>
* drinks round 1
saving my progress before my hard drive explodes
* test 2
please work
* name fixes
whoops
* Update drinks.yml
* various fixes
am dumb
* add sol dry to vends
more fixes and changes, yippee!
* more fixes & ingame testing
shrimple tests
* last fixes :trollface:
should be ready for pr now
* Update soda.yml
sate thirst
This adds visual differences to the sprites of many of the game's drinks when they are opened, as well as visual fill levels for most see-through drink containers. Condiment packets are visibly torn open in the corner when opened. Glue, lube, and condiment bottles are visibly opened too. I also noticed that the soda bottles were all completely opaque, so I fixed that while I was at it. Oh, and I updated the wine bottle sprite to say 14 instead of 13, 'cause yeah.
As a result of the way fill levels take on the color of the contained liquid, many of the drinks have changed slightly in appearance. This can be adjusted in the future by modifying the colors of the reagents, but seems outside the scope of this already large PR. This also means that if you refill the bottles with a different liquid, they'll take on the new color appropriately.
* A beer can and a wine can
* fix wrong file locations
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Update drinks_cans.yml
* A beer can and a wine can
* Update drinks_cans.yml
* A beer can and a wine can
* replace sprites
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Update meta.json
* Update meta.json
* Update Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/meta.json
* Update Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/meta.json
---------
Signed-off-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
