* add snails
* scuffix
* migrate
* mo-grate
* oopsied the ftls
* Revert "oopsied the ftls"
This reverts commit 0d3c6c17f31ec904679d6a48799cea71e77c1f99.
* the curse of staging the wrong file, resolved.
* Snoth
* fix my dumbs
* reviews 1
* anti space technology
* salt hurty
* spelling
* Its a slotherhouse out here
* sequencing
* cooked snail
* volfix
* speed reversal
* 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
* Edited blueberry pancake textures to seem more blueberry-stained
* Added new blueberry pancake sprites to allow stacking up to 9
* Added more sprites for chocolate pancakes so they can stack up to 9
* Fixed up the blueberry pancake sprites to be more consistent
* Updated the stack components of blueberry and chocolate pancakes in the yml prototype file.
* Updates the stack size in the consumable stacks yaml file.
* Added the new pancake sprites to the sprite meta json file.
* Removed an unnecessary space from the baked food YAML file
* Updated branch and fully resolved merge conflict
* Decreased the copy-pastiness of some of the blueberry sprites to make them less repetitive
* Diversified the textures some more for good measure.
* Fixed some missing rims around the pancakes because I'm bored
* Added all the parts to implement spicy rock pizza
* Added sprites for pizza
* Fixed coma formatting in meta.json for pizzas
* Fix formatting and rebalance reagent quantities in pizza.yml
* Flipped Uranium and Radium values to be the correct ratio
* Updated meta.json file to have credit for sprite
Bagels are made by using a rolling pin on a dough slice to make a dough rope, then cooking the dough rope in a microwave for 5 seconds. There are two types: a normal bagel and a poppyseed bagel. The poppyseed bagel requires a poppy and a dough rope and has a small (5u) quantity of Bicaridine inside of it in addition to its nutriment.
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
* 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>
* adds a bunch of vox clothing sprites
* bird up
* bee mask
* fix test fails. i hope. this better be the only damn one
* fix "eqipped"
* A.
* outerclohting
* ???
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@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
* Check for CRLF in actions workflow
Make emisse weep
* Copy paste bottom text
* I would like to thank StackOverflow for this spite PR.
* Mention file name in message because the workflow tab doesn't display it.
* dos2unix everything
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.
* Added stonk pockets
* Give me a little credit
* Update Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json
* Update Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* 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>
* Add melee dmg to salami
* Bump up dmg to 6, 1 more than a punch
* Add in-hand and wielded sprites, and adjust swing angle
---------
Co-authored-by: Jeff <velcroboy333@hotmail.com>
