Commit Graph

117 Commits

Author SHA1 Message Date
CHOMPStation2
0a7a411f88 [MIRROR] Soup's On! (#7041)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
2023-09-26 16:51:44 +02:00
Casey
0552773770 Merge pull request #13935 from VOREStation/upstream-merge-8760
[MIRROR] Adds the requested club sandwich. [READY FOR MERGE]
2022-10-23 18:49:46 +00:00
Casey
a5ed33a2e1 Merge pull request #12944 from Somememeguy/MakeCookingGreatAgain
Make Cooking Great Again [Tedium Update, Rebalance some cooking aspects]
2022-05-12 19:26:08 +00:00
Casey
abea22deec Merge pull request #12765 from GhostActual/Lettuce-Eat
Lettuce Eat
2022-04-17 17:55:59 +00:00
Casey
61ea8e3f3d New Donk-pockets 2022-04-06 02:12:51 +00:00
Casey
c2441330b6 Adds general-purpose cooking oil, replaces usages of corn oil 2021-12-10 00:20:40 +00:00
Novacat
827f9ebbbf Merge pull request #11477 from VOREStation/upstream-merge-8223
[MIRROR] Updates wine reagent id to redwine.
2021-08-24 23:57:24 +00:00
Ghost Actual
50c2de86d2 7/22/2021 Food Revamp (#11210)
* Base Commit

* Forgot the New Chips

* Forgot Chicken Fillet

* Base Commit

* Forgot the New Chips

* Forgot Chicken Fillet

* Conflict Fix

* Oopsie

* Fixes known issues

* Uploads Files for Remote Work

* Small Fix

* Final Commit (hopefully)

* Small Fix
2021-07-26 16:51:23 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Chompstation Bot
c11124cb58 [MIRROR] Absurd Amount of Food Fixes 2021-02-08 04:59:38 +00:00
Novacat
d993f24661 Merge pull request #9607 from VOREStation/upstream-merge-7822
[MIRROR] Adds Chicken noodle soup
2021-01-25 00:51:19 +00:00
Novacat
225e22cf87 Merge pull request #9593 from H0lySquirr3l/master
Pre-emptive Pre port of CHicken noodle soup item from Polaris
2021-01-23 17:20:25 +00:00
Novacat
4809b0b379 Merge pull request #9301 from Jwguy/FoodAdds
Adding New Foods
2020-11-19 01:29:03 +00:00
Rykka
e8ebaee3dd Fix incoming mirror PR 2020-07-31 01:14:09 -04:00
Atermonera
31f04a4975 Aurora Cooking Port 2020-07-30 15:13:46 -04:00
Rykka
bd5d102a35 Fix for duplicate tortilla recipe and flatbread/tortilla recipe conflict 2020-07-28 12:07:16 -04:00
Rykka
04024ad472 Null R.Type fix and Fortune Cookie Fix
Fortune Cookies had special weird-as-shit code to handle leaving a piece of paper behind, and therefore just getting rid of the special-code seems the best option.

R.type is actually R.id on our codebase, so that was causing runtimes. This fixes those runtimes.

Also removes duplicate recipes from microwave.dm, and fixes the issue with recipes returning burnt mess.
2020-07-24 10:05:39 -04:00
Rykka
886ab72289 Huge Bundle of Fixes, Update Cooking to current Aurora
Cooking times are now no longer 10-15 minutes per item, the LARGEST items will take around ~4-5 minutes, 6 at the maximum in the case of the superbigbite (one of the most filling food items in the game).
Cooking oil tanks added
Appliances are now constructible instead of being eldritch black magic
Recipes are now reorganized to either fryer/oven/grill based on where they're made (Although recipes_microwave still needs a LOT more sorting)
Critical time bug with cooking fixed, AND you can now upgrade your appliances for even higher efficiencies!
2020-07-22 21:34:13 -04:00
Rykka
3974d7e87f Last Push - Everything is working, just needs testing! 2020-07-16 19:52:20 -04:00
Rykka
9f935ff59d Second Half of Aurora Cooking Initial Port - All files added
Now onto the bugfixing nightmares!
2020-07-16 00:37:22 -04:00
Atermonera
d39b10b144 Merge pull request #6803 from Schnayy/CookingUpdate1
Cooking adjustments
2020-03-10 18:41:02 -04:00
Schnayy
7bee18a2d7 Let them finally eat cake 2020-03-03 15:57:10 -05:00
Atermonera
d116feb648 Merge pull request #6747 from Neerti/pigs_in_blanket
Changes Pigs in a Blanket recipe
2020-02-26 21:02:34 -05:00
Atermonera
4e523c9b5e Merge pull request #6649 from Trexdude/patch-1
Fixes Bagel Poppy Recipe
2020-01-25 22:16:18 -05:00
Atermonera
f7da338790 Move Microwave recipes to their own subtype of the recipe datum. 2020-01-21 00:35:38 -05:00
Cerebulon
183b1d99b1 Coffee Shop Revamp 2019-12-22 22:54:01 -05:00
Atermonera
a78cdc85cc Merge pull request #6308 from Heroman3003/kitchenfixes
Fixes some kitchen screwery
2019-07-22 00:43:05 -04:00
Atermonera
d987e1e7fd Merge pull request #6301 from Cerebulon/saltoid
Salt is Salt
2019-07-16 00:49:52 -04:00
Atermonera
1472642b88 Merge pull request #6262 from Mechoid/CivilianExpansion1
Civilian Expansion 1: The Plantening
2019-07-07 17:29:32 -04:00
Atermonera
10d196de89 Merge pull request #6099 from Heroman3003/fcookie-runtime-fix
Fixes fortune cookie recipe runtime
2019-04-18 13:28:13 -04:00
SunnyDaise
1f80c3336d Onions, Food and Plant Tweaks (#4629)
* Onyonyon

* Fixes Potato's and adds Changelog.
2018-01-27 16:53:54 -08:00
Cerebulon
8ec8b89e10 Adds a bunch of food recipes from /tg/station. (#4565)
* Adds a bunch of food from /tg/station.
With recipes adjusted for our system.
Meat Bun, Sashimi, Eggs Benedict, Baked Beans, Sugar Cookie, Berry Muffin, Booberry Muffin, Egg Roll, Fruit Salad, Egg Bowl, Pork Bowl, Tortilla, Meat Burrito, Cheese Burrito, Fuego Burrito, Nachos, Cheesy Nachos, Cuban Nachos, Pig in Blanket.
2018-01-23 19:16:30 -08:00
SunnyDaise
10490fa5b4 Food and Drink: Additions and Bugfixes (#4598)
* Food and Drink
2018-01-21 22:18:33 -08:00
Belsima
92da4a84ee Adds crossaints. 2017-09-08 15:35:51 -04:00
Spades
350fa74c14 Changes Spider meat back to Xeno meat
But also changes a bad design choice and makes spider meat a viable
alternative to recipes requiring Xeno meat.

Now, for those of us who do still use xenos for things, xeno meat isn't
suddenly completely useless, while spiders still produce their own
unique meat that is usable in these recipes.
2017-07-17 04:45:40 -04:00
Anewbe
2c9c3e208e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/giant_spider.dm
#	code/modules/organs/blood.dm
#	code/modules/organs/internal/lungs.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_external.dm
2017-03-22 17:29:01 -05:00
Arokha Sieyes
166e888397 Find/replace job for bread slices
`/obj/item/weapon/reagent_containers/food/snacks/breadslice` is not a real thing. The only reason the code compiled with references to it is because there was a line at the top of sandwich.dm that defined the attackby proc for it, which willed it into existence with all the default 'snack' values so it was just called 'snack', had no icon, etc.

`/obj/item/weapon/reagent_containers/food/snacks/slice/bread` is the real path for bread slices, and this replaces all mentions of one with the other.
2017-03-13 14:16:10 -04:00
Anewbe
83db0cc38f Medical tweaks 2017-01-23 23:43:44 -06:00
Mloc
7377f57e5d adds bun-bun, a bread monkey made with two burger buns
Signed-off-by: Mloc <colmohici@gmail.com>
2016-07-05 18:19:05 +01:00
Zuhayr
f93ea6a78f Tweaks to previous commits.
More tweaks to IPC fixes.
Merge resolution/compile fixes.

Further work on properly integrating, updating and fixing prosthetic options.

Repathed internal organs to organ/internal.

More work on full synthetics, changelings, overheating.

Working on getting organs to qdel properly and spawn properly when robotized.

Finalized some overheating values, added remaining prosthetic icons.

Finalizing the testing version of the full prosthetic bodies branch.

Added suit cyclers to the autolathe and map.

Fixing runtime errors.

Fixing errors.

Changelog.

Replacing limb and organ strings with constants.

Prevented brainless species from becoming full cyborgs.

Fixed issues with brain/MMIs renaming themselves inappropriately.

Various fixes and oversights.
2015-12-24 21:13:40 +10:30
Zuhayr
3c71472644 Removing unused and now uncompilable distillery code. 2015-02-21 22:37:53 +10:30
Zuhayr
9ad9f19a0b Transitioning back to using flour as a reagent. Sorry RKF. 2015-02-21 22:04:32 +10:30
Zuhayr
cf0a358ad6 KITCHEN CODE IS WORKING. YES. I CAN DIE NOW. 2015-02-16 22:11:59 +10:30
Zuhayr
5e87b21d44 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-14 09:32:17 +10:30
PsiOmega
73bc5934d5 Replaces uplink Donk-pockets with Sin-Pockets.
Sin-Pockets can be self-heated using the future magic of producing heat by mixing chemicals.
Each heated pocket contains: Doctor's Delight - 5 units, Hyperzine - 5 units, Synaptizine - 1 unit.
Overconsumption is definitely possible by the careless.

Makes the concealed cane use non-del methods.
2015-02-11 09:55:50 +01:00
Zuhayr
fdf0360a69 Collapsing all fruit into one object type. Refactoring reagent grinder and removing juicer. WIP. 2015-02-04 10:55:33 +10:30
Zuhayr
5538ce5589 Refactored nettles and sunflowers into regular plants. 2015-02-04 10:38:56 +10:30
Zuhayr
bbfc6db0a3 Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right) 2014-12-23 17:38:05 +10:30
Zuhayr
c569d52700 Fixes pretzels being unmakable (use a poppy instead of the seeds) 2014-12-13 22:46:55 +10:30
Zuhayr
9fcde12b4f Organ rewrite mapclean attempt. 2014-09-29 06:18:58 +09:30