* Adds cotton burgers
* Rephrased copyright
* Added an extra comment
* Adds CottonBurger to tags.yml, Not sure if i am supposed to do this or not.
* Reordered Cotton bun YAML, and fixed overwritten tags
* Merge issue fix?
* Add experiment plushie and remove rubber chicken from cotton burgers
* Minor comment change
---------
Co-authored-by: beck-thompson <beck314159@hotmail.com>
* Grilled Cheese Prototype
* Typos
* Removed butter reagent to test flavour changes.
* Flavour corrections.
* CC-BY-SA-3.0 attribution
* Fixing meta.json
* I lost an hour of my life to a missing comma in meta.json
* Merge Conflict Rebase and Test Fixing
* Cook time to 10 seconds.
* Sandwich nutritional balance
* Grilled cheese sprite fixed, found the actual original source for copyright.
* Give the chef access to fiber bags
* Update Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* A looooooooot of new cotton foods for the moffs
* address slam's comments on the food for moffs not having any moff food in the food (the food that's intended for moffs)
* alternative sprites for bagel-cottondough.png, baguette-cotton.png, and croissant-cotton.png
* update requested sprites
* change requested sprites
* address part of sloth's review, awaiting response
* address second half of review, fix magical food nutriment mitosis bug
* First round of anomaly core functionalities added
* Added sliceTime to anom meat mass and cooked version
* Adds SmokeOnUse component, system and shared system, adds new functions to inert electrical anom core
* Added more functions
* Final touches to branch
* Cleaning up some of the metadata for sprites and component definitions
* PR_Changes_v2_rev.0_Final_FINALFORREALTHISTIME.yml
* Lol jk these goddamn tests why me
* Quick updates based on feedback
* more changes to improve
* additional fixes and edits
* Changed tech core functionality
* added magboot functionality to grav core
* fixed issue with bluespace core sizing
* Reverting changes per request
* extra file to be deleted
* File cleanup
* Update chemicals.ftl
* Update cores.yml
* Update cores.yml
* Update meta.json
* Update chemicals.yml
* Update Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* Update meal_recipes.yml
* Update cores.yml
---------
Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* 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
* 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>
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>
* 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>
