kosticia
87a3b4fa56
Rename kira special to the orange-lime soda ( #41167 )
...
* 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 >
2025-10-28 19:46:56 +00:00
Hitlinemoss
63c17b151d
Added the golden shaker (playtime reward for Bartenders) ( #40762 )
...
* Added a golden shaker (playtime reward for Bartenders)
* Removed redundant icon line
2025-10-07 23:26:56 +00:00
āda
ceedfb6d39
Standardize state names in drinks yml ( #40316 )
...
* drinks_base
* drinks_special
* drinks_fun
* drinks_cans - the holy minus diff
* bottles_glass and metamorphic
* mugs
* Solar's Best Hot Drinks
* misc drinks_cups
* slight addition to base
* lint fix
* metamorphic glass
---------
Co-authored-by: iaada <iaada@users.noreply.github.com >
2025-10-07 16:05:30 +00:00
SurrealShibe
84f994f296
Give mimes their french bread back ( #40601 )
...
* add the nutri-batard
* i missed this file smh
* add the proper accenting to "bâtard"
2025-10-07 10:08:00 +00:00
Tiniest Shark
4796c92609
Inhand Sprites for Clear Glass ( #40427 )
2025-09-20 11:25:01 -07:00
iaada
29dda7949f
Merge remote-tracking branch 'upstream/master' into up/drinks-yml
...
# Conflicts:
# Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
2025-09-05 17:07:09 -05:00
ScarKy0
b2c9106839
Vulpkanin Species ( #37539 )
...
* [April Fools] Elf species (#35353 )
elf
* [April Fools] Juice that makes me go insane (#35370 )
* kill me
* MAKE IT STOP
* is it finally over?
* web edit
* webedit
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
* webedit
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
* webedit
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
* webedit
* WEBEDIT PLEASE
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
---------
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
* vulpkanin species
the ultimate april fools joke
Co-Authored-By: Kr8art <188977876+kr8art@users.noreply.github.com >
* cant be bothered
* make build and test debug run on the april fools branch (#35396 )
welp
* Revert "[April Fools] Juice that makes me go insane (#35370 )"
This reverts commit fcbdcf8452 .
* Revert "[April Fools] Elf species (#35353 )"
This reverts commit 704293a051 .
* nuh uh
* localized names
* fix survival box
* abilities (Mostly don't work yet, pending PRs)
* wagging loc
* slight heat tweaks
* stuff
* Update Vulpkanin.xml
* vulp screams + quieter howl
* MessyDrinker by Orks
* MessyDrinker guidebook
* animal bones
* fix wagging
* missed
* no loc
* Lower damage, remove butchering
* Revert "animal bones"
This reverts commit 3457cde13e57336678f62a20bf57fb315844c240.
* leap
* collision
* leap desc update
* leap guidebook
* fix leap
* microbalance
* comment
* microbalancing pt 2
* microbalancing pt 3
* test fail fix (i hope)
* fix organs
* no leaping on the ground
* remove SolutionScanner + ling work
* fix clone
* add stuff back
* microbalancing pt yes
* male vulp names
mainly slavic names with some similiar sounding ones mixed in
* Revert "male vulp names"
This reverts commit 1666f81821bfea241262627160a594dd1b0ce050.
* male vulps names pr 2 (slavic, dog names, few puns)
Slavic names, with mixed in typical dog names and some puns
* female names (mainly slavic, other stuff mixed in)
* oops
* Update vulpkanin.yml
* Vulps WIP Work (#1 )
* Modified aesprite tools
* WIP
* wipperoni
* We are done here, wawa
* Revert "Merge branch 'aseprite-tools' into hannah/vulps-wip"
This reverts commit d258645df60a94d0217fecd85a38545f2b951cde, reversing
changes made to 0ae39e862152ef6548533eba0547709594c55e90.
* Resolve merge issue
* Fix Urist McVulp forgetting his fursuit
---------
Co-authored-by: Southbridge-fur <southbridgefur@gmail.com >
* re-add ears and husk overlay
* revert adding ears to vox
* Crest Markings
* Fade Markings
* Sharp Markings
* microbalance + comments
* censor character nudity option compliance
* Ear Markings
* 1984 wagging animations
* Tail Markings
* tail wag icon
* annoyance
* guidebook
* slight temperature tweak
* seperate out snouts, port over 2 markings for testing
* fix
* seperate snout file
* Snout/Head Markings
* cleanup + locale for ears
* Head and Snout loc
* gray eyes
* crest and husk cleanup
* Tail and Chest loc
* Legs and Arms loc
* most important commit
* mime vulps like rations too
* missing loc
* microbalance
* not needed
* goatee
* white eyes
* harmony feedback tail fixes
* personal changes and fixes after playing
* fix fluffy tail clipping
* Sprite fixes, displacement fixes (#2 )
* Tune head displacement
* Vulps Sprite Tuning
* helmets
* detail
* Urist
* wag
* comban't
* fix attributions
* remove vulp biosuits
* fix vulp beards
* fixed up ears
* comment note
* further ear tweaks
* engi helmets
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
Co-authored-by: Milon <milonpl.git@proton.me >
Co-authored-by: Kr8art <188977876+kr8art@users.noreply.github.com >
Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com >
Co-authored-by: Southbridge-fur <southbridgefur@gmail.com >
2025-09-05 12:43:17 +02:00
Tiniest Shark
7916819203
Burger Inhands ( #39894 )
...
burger is in your hands
2025-09-03 15:42:50 -04:00
Tiniest Shark
3aeecd0139
Add inhand sprites to Cartons and Cups, give new inhands to Cans. ( #39814 )
...
* Added inhand sprites to cans, cartons and cups.
* small tweak
2025-09-03 15:21:00 -04:00
iaada
765db2e065
Merge remote-tracking branch 'upstream/master' into up/drinks-yml
...
# Conflicts:
# Resources/Locale/en-US/nutrition/components/drink-component.ftl
# Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
# Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
# Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
# Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
# Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
# Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml
# Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
2025-08-06 11:17:41 -05:00
Hannah Giovanna Dawson
b86b0c7fe8
Berry Delight ( #38881 )
...
* Berry delight
* Uncook the YAML
* Move stuff in meal_recipes
* BERRY DELIGHT IS INEVITABLE
2025-08-02 14:35:09 -04:00
Disp-Dev
9b0a171743
New recipe: Cotton Cakes ( #39222 )
...
* add moth edible cotton cakes
* oh fuck i accidentally changed the sln file
* inhand sprite fix
---------
Co-authored-by: DispenserDev <mariousjoaquin@gmail.com >
2025-07-30 18:51:21 -04:00
iaada
0db3df2578
final pass
2025-07-26 03:45:36 -05:00
iaada
3774b05ca1
no commit discipline
2025-07-26 02:58:28 -05:00
iaada
eb8599d204
trash drinks gets trashed (fixed)
2025-07-25 15:01:34 -05:00
Tiniest Shark
88ebad06ea
Bottle Drink Inhands ( #38937 )
...
* there is now bottles of booze in your hands
* Messed up the vermouth inhand fills slightly.
* oh whoops that's redundant
2025-07-12 10:28:22 -04:00
Prole
f1d60b44e1
Flask Visual Overhaul & YML Organizing ( #38032 )
...
* Adding Back Baseline V1 Changes
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
* Readability Change
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
* icon_open implementation, tidy up & attributions (fix lith/shiny flask ugly af open sprites)
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
* good enough
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
* No mo closed spills
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
* Inhands & Attributions Part 1
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
* Inhands & Attributions Part 2
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
* Flask Sounds & Attributions
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
* Cap flask inhands change
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
* Lith flask Inhand Changes
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
* Spacing
* Fix?
* Man...
* Attributions Back in...
* Im loosing it..
* REAL!
* :/
* Again...
* again :/
* Plz???
---------
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
2025-06-21 10:52:36 -04:00
SlamBamActionman
9a5bd9de6a
Add propeller hat & swirl lollipop ( #38260 )
2025-06-11 18:22:51 -07:00
Disp-Dev
c3956eff6d
New Recipes: Breakfasts ( #37279 )
...
* Adds full english and american breakfasts and respective recipes
* sprite tweak and added random spawner
* reagent rebalance
* reagent re-rebalance
* spawner ID fix
* ACTUALLY actually fixed the spawner, also description changes
* reagent re-re-rebalance
* spawner fix so the linter stops screaming at me
* different check failed kekw
* trailing whitespace fix attempt #1
* identation fix? i think?
* indetation fix part 2, also vox cant eat this anymore
* more yaml fixes
---------
Co-authored-by: DispenserDev <mariousjoaquin@gmail.com >
2025-06-10 00:33:02 +02:00
Orsoniks
e21fb8ff39
In-hand sprites for some food items ( #38024 )
...
* so meow changes
* qwawa
* fixed sprites
* Update meta.json
* Update meta.json
* Update meta.json
* Update meta.json
* Update meta.json
* more inhand variations using coloring
not perfect but better than nothing
* more meats
* pizza inhands, ported from starlight and edited
* add link
* snack inhands
* worldpeas
* chips
* packets
* all snacks and trashes finished
* correction
2025-06-05 17:06:38 -04:00
Alpaccalypse
0df4a2e243
Absinthe makes you mildly hallucinate ( #34371 )
...
* Absinthe make you mildly hallucinate. Smaller glass volume, doesn't make you sick.
* Reordered glass fill sprites to look more equal
2025-05-30 18:03:49 +02:00
mubururu_
7c9a031f99
inhands for CAKE + sprite fixes ( #37819 )
...
caek
2025-05-27 19:47:58 -04:00
Tiniest Shark
214338caa6
Inhands for bartender tools and mugs. ( #37771 )
2025-05-24 13:32:27 -04:00
MisterImp
9868932cfe
New food recipe: Draco (dragon taco) ( #37212 )
...
* Added draco (dragon taco)
* Update Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml
* fix whitespace
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2025-05-14 21:33:37 +02:00
Prole
6cdc436f5f
Water bottle dispenser fix & Bottle Yaml Organizing ( #37108 )
...
* A New Parent/Category For The Soda & Tonic Water Bottle
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
* New Parent For water bottle & Cleanup
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
* More Cleanup
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
* Details
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
* Organizing For Additions
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
* Streamlining waterbottle to be compatible with DrinkBottleVisualsAll Parent
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
* Replacing/Renaming Parents
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
* New Tonic/Soda Water Bottle Sprites
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
* Misc Fixes
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
* New Parent for Small Glass Bottles & Organizing
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
* Organizing & uSize Parity.
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
* File Parity
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
* Merged Categories & Misc Fixes
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
* Removed Silly
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
* Parent Name Parity & Cleanup
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
* Large Glass Bottles Category & Cleanup
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
---------
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
2025-05-06 14:13:33 -04:00
Wolfkey-SomeoneElseTookMyUsername
0dd9ffe8bf
Add Cotton Burgers ( #36405 )
...
* 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 >
2025-04-25 18:54:14 -07:00
SG6732
b0edf7106f
Meat Patty ( #34896 )
...
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
2025-04-23 20:45:27 -07:00
Smith
8478125fe8
Cotton Grilled Cheese Sandwich ( #36135 )
...
* Working entity.
* New sprite by MadeOfHeartAndStone
* Removed deadspace, changed attribution in meta.json
* review
---------
Co-authored-by: Milon <milonpl.git@proton.me >
2025-04-24 05:24:37 +02:00
kosticia
2076e8b02d
Moth-pockets ( #34517 )
...
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
2025-04-22 22:36:54 -07:00
uhbg
94b46a9edc
The Bartender can now make Eggnog ( #34065 )
...
* 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 >
2025-04-20 17:27:35 -04:00
Prole
58fb282023
The Beverage Jug Can Now Look Open ( #36070 )
...
* GenJug-Changes
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
* Guh
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
* Support For the Rest
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
* New Sprites
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
* Newest Sprites
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
---------
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
2025-04-20 16:36:22 -04:00
GrownSamoyedDog
36999e5a06
Gave Bartender Pineapple Juice Cartons ( #34769 )
...
pineapple juice core pina colada maxxed
2025-04-19 10:25:09 -04:00
SharkSnake98
9599f582f3
New Drinks ( #36287 )
...
Co-authored-by: RedBookcase <crazykid1590@gmail.com >
Co-authored-by: SharkSnake98 <sharksnake87@gmail.com >
2025-04-18 22:12:10 -07:00
Centronias
98f9149883
Add inhand sprites for the drink shaker ( #36382 )
...
* 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 >
2025-04-18 10:12:37 -07:00
SlamBamActionman
7f6756135b
Add cooked dragon steak and cutlets ( #36273 )
...
* Add cooked dragon steak and cutlets
* If it's worse for you it's even more of a delicacy
* Attribution
2025-04-10 08:59:18 -07:00
MisterImp
899d318f01
New food recipe: World Peazza ( #35191 )
...
* added world peazza
* fixed a comma in the pizza sprite json
* changed attribution comment on ArtisticRoomba's suggestion
* restored accidentally deleted line, thanks Tayrtahn
2025-04-01 16:26:53 -07:00
MisterImp
7a539b3568
Fix recipe and animation for copypasta ( #35925 )
...
* Fixed animation and recipe for Copypasta
* Update Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2025-03-19 17:35:34 -07:00
Coolsurf6
5d296d2dbb
Added Bacchus' Blessing Drink ( #35306 )
...
* 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
2025-03-13 23:49:26 -07:00
RedBookcase
80e674a9ae
Added New Cocktails and new fill level sprites to existing drinks. ( #33570 )
...
* 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 >
2025-03-10 19:08:23 -04:00
Smith
3c8fb2e865
Grilled Cheese Sandwich Entity and Recipe ( #33807 )
...
* 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.
2025-02-13 00:00:38 -08:00
Ps3Moira
b2a6d5c1b0
Cabinetification ( #34293 )
...
* Resprite Boxes and Icons + Remove Boxes
* Update Meta
* Update Flatpacks
* Update Shotgun Ammo Boxes
* Remove Leftover Ammo Box Icons
* Update Donk Pocket Boxes
* Update Briefcase
* Update Happyhonk + Remove Open Sprites
* Update Medal Case
* Update Cigarette Packs
* Update Cigarette Cartons
* Update Medkits
* fix positioning for medkits
* Update Junk Medkit
* Update Present
* Tweak Rad and Burn Medkits
* Tweak Briefcase
* Update Toolboxes
* Update Decoy Boxes
* Fix Meta for Healing toolbox
* Update Cow tool box
* Update Donut Box
* Removal of left over rubber bullet sprites and duplicate ammo box sprites
* Removal of Duplicate Ammo Boxes
* Update .20 rifle ammo box
* Update .35 ammo box + fix meta
* Update .45 magnum ammo box Sprites
* Update .25 caseless ammo
* Remove leftover box
* Update cargo_service.yml
* Fix Icon Cigs
* fix big .20 ammo box
* Update Black Cigs Pack
* Update Cig Placement
* Update Blue Cigs
* Update Cig Packs
* Re-Add Big Ammo box for the USA guns vending machine lol
* Remove 10x24 mention in migration.yml
* Update Big Cig Cartons
* Remove Toolbox Changes
2025-02-04 00:52:10 -07:00
pathetic meowmeow
85da2351c8
Give the chef access to cloth boxes ( #34403 )
...
* 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 >
2025-01-23 00:54:03 +01:00
Alpaccalypse
f4e60ff96e
Renamed "Irish Car Bomb" drink to "Irish Slammer" ( #34107 )
...
* 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
2025-01-02 10:46:30 +01:00
ArtisticRoomba
e07609b3b3
New cotton baguette, crostini, chevre-chaud, bagel, and croissant foods for moffs ( #33508 )
...
* 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
2024-12-29 03:02:24 +01:00
Hannah Giovanna Dawson
c33d3350bd
[Christmas] Y'all want a Smite Cranberry? ( #33922 )
...
* 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
2024-12-19 01:11:59 +01:00
dragonryan06
1e80dd2891
Add the Zombie, a new cocktail ( #32802 )
2024-12-16 16:25:06 +01:00
August Sun
bd2d0ee5e5
Added the ability to microwave inert flesh anomaly cores to turn into an anomalous meat mass ( #33223 )
...
* 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 >
2024-11-12 20:59:47 -06:00
RumiTiger
6ce80d914d
Muffins ( #29318 )
...
* Update meta.json
* Add files via upload
* Update misc.yml
* Update meal_recipes.yml
* Update meta.json
* Add files via upload
* Update plate.yml
* Update food_baked_single.yml
* Update dinnerware.yml
* Update cooking.yml
* Update misc.yml
* Add files via upload
* Delete Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-cherry.png
* Add files via upload
* Update meta.json
* Update misc.yml
* Update meal_recipes.yml
* Update meta.json
* Fix meta.json
* Fix meta.json again
* Update misc.yml
* Update misc.yml
* Update misc.yml
* Update misc.yml
* Update meta.json
* Update meta.json
* Update misc.yml
* Update meal_recipes.yml
* Update Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
* Update dinnerware.yml
* Delete cherry
* Add files via upload
* Delete banana
* Add banana
* Delete chocolate
* Add chocolate
* lathe recipe fix
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2024-10-31 22:06:46 -04:00
beck-thompson
384ff7e8f6
Add pumpkin pie! ( #32623 )
...
* first commit
* Licence fix
* rosysyntax licence change (permission granted!)
* simplify
* Better wording
2024-10-09 10:29:41 +11:00
slarticodefast
0d40b0b3e0
Add extradimensional orange, holymelon, meatwheat, worldpeas mutations ( #27624 )
...
* new mutations
* translation string fix
* add haloperidol to plant
* fix
* add FoodSequence
* food sequence fixes
2024-09-14 00:02:54 +10:00