Commit Graph

112 Commits

Author SHA1 Message Date
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Razgriz
3b0f1d91b7 Update cereal.dm 2021-06-17 22:54:36 -07:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Nadyr
2c409ca754 powder that makes you say yes 2021-05-27 20:00:04 -04:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Razgriz
09899f191a Update oven.dm 2021-02-12 22:55:57 -07:00
Chompstation Bot
c11124cb58 [MIRROR] Absurd Amount of Food Fixes 2021-02-08 04:59:38 +00:00
Cadyn
a74f637820 Quick fix for oven shenanigans 2020-10-07 14:14:04 -07:00
Cadyn
1d0e69633f Fix silly stuff 2020-10-05 19:46:50 -07:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
Novacat
e72d810c31 Update _appliance.dm 2020-09-21 13:54:40 -04:00
Novacat
23d0b9a699 Update _appliance.dm 2020-09-21 13:54:02 -04:00
Mechoid
68a37c64fa Hydro upkeep 2020-09-16 19:40:41 -04:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
ShadowLarkens
c32f05e1f7 TGUI Civilian
UI's Converted:
 - Aurora Cooking
 - Chaplain Book Selection
 - ColorMate
 - Cryo Storage
 - Holodeck
 - Jukebox
 - Looking Glass
 - Microwave
 - Newscasters
 - Timeclock
 - Vending Machine Improvements
2020-09-02 13:32:42 -07:00
Novacat
f6e61ea8f1 Merge pull request #8658 from Rykka-Stormheart/shep-dev-ambience-additions
Massive Ambience and Sound Overhaul + Addition
2020-08-28 00:47:23 -04:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Atermonera
dcd6ae56ca Merge pull request #7550 from Khloross/cookingfix
Fix combinination_cook() creating items with no reagents
2020-08-27 19:46:28 -04:00
izac112
48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
Atermonera
0ebcca246e Merge pull request #7518 from Meghan-Rossi/borgcookfix
Fix cyborgs not being able to cook
2020-08-21 01:25:40 -04:00
izac112
81871a960e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-10 21:50:42 +02:00
Razgriz
71cad743d1 Merge pull request #461 from Rykka-Stormheart/shep-dev-reduce-oven-heat-loss
Halve Oven Heat Loss
2020-08-10 01:08:31 -07:00
Rykka
1fef17858c Halve Oven Heat Loss
Resolves https://github.com/CHOMPStation2/CHOMPStation2/issues/460
2020-08-10 00:40:56 -04:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull
August2020UpstreamPull
2020-08-09 02:58:18 -07:00
Atermonera
afb5819c32 Tweak to kitchen machinery: 2020-08-08 23:53:58 -04:00
Rykka
0214f52039 Aurora Cooking Pre-heating bugfix
Appliances previously had 60k resist and 30k resist, for fryer and oven respectively.

This meant that fryer would heat up in 62 minutes and oven would heat in 35-45. Obviously completely out of wack.

Now grill heats in at 6:50, fryer at 10:35, and oven at 12:10 to reach peak/cap temperatures!
2020-08-06 00:23:35 -04:00
Rykka
19a90b6bd3 Aurora Cooking Pre-heating bugfix
Appliances previously had 60k resist and 30k resist, for fryer and oven respectively.

This meant that fryer would heat up in 62 minutes and oven would heat in 35-45. Obviously completely out of wack.

Now grill heats in at 6:50, fryer at 10:35, and oven at 12:10 to reach peak/cap temperatures!
2020-08-06 00:19:12 -04:00
izac112
50834e4a7b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-02 23:52:01 +02:00
Rykka
df0c1b8c9f Icon Updates!
* Adds new sprites for all kitchen appliances, from Aurora
* Adds new pre-heating light for Fryer, lined up with the spot for it
* Adds new grill rack sprites
* Updates multiple food sprites to no longer be downscaled PNGs, and gives us gloriously pretty waffles and brownies.
2020-07-31 03:20:26 -04: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
izac112
601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02:00
Rykka
c27b2d2234 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 22:14:04 -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
e2dc3a5aad Makes the Oven start closed. Recipe updates will come in a second PR 2020-07-21 20:23:17 -04:00
Rykka
839b9bb4c8 Makes the Oven start closed. Recipe updates will come in a second PR 2020-07-21 19:21:51 -04:00
Rykka
6f5fac3955 Cleanup Commits, Bugfix Commit - More TBD if any issues arise 2020-07-20 23:43:26 -04:00
Rykka
93a4631005 Various fixes and bugfixes from live playtests 2020-07-20 23:33:30 -04:00
Rykka
de2c80c628 Commit 4
Bugfixing for ChompStation errors will now happen
2020-07-19 16:29:26 -04:00
Rykka
8103e0c02c Commit 3 2020-07-19 16:28:59 -04:00
Rykka
ed573739ae Commit 2 2020-07-19 16:27:36 -04:00
Rykka
454cfda0b6 Commit One 2020-07-19 16:24:56 -04:00
Rykka
df7bb084f1 Bugfixes, Feature Tweaks, and Final Touches
Microwave not cooking micros/mice: Fixed
Invalid Recipe datum thanks to /microwave prefix: Fixed
Fryer earsplittingly loud: Fixed
Fryer/Oven continuing to cook even after items removed: Fixed
Oven having 'on' icon state when door closed but off: Fixed
Appliances not scaling cooking time/damage based on size: Fixed
Feature added - Burning Food will set off fire alarms and set off a black cloud of smoke!
Overcook time reduced to allow for less margin of error (IE Actively requires you to pay attention)
Multiple Microwave bugfixes, including multicooking/etc not working, recipe errors, icon state errors, ejection errors.
2020-07-17 23:58:33 -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
Rykka
940aaec9c8 WIP Aurora Cooking Port
This ports Aurora Cooking, sometimes called Nanako Cooking, from CitRP, who got it from Aurora originally. 

https://github.com/Citadel-Station-13/Citadel-Station-13-RP/pull/608

Pulled from here with updates to to_chat()

Ovens and fryers now work like the microwave, but also have special trays/baskets that can be inserted and removed with things on them. There's also a crapton of new recipes. Note that you can still use the oven to just bake things, or produce variable food items, to my knowledge. This was specifically kept in when it was originally implemented, IIRC.

- Cooking now uses several machines to make recipes. Microwave, oven, deep fryer.
- Recipes have been redone to reflect this.
- Adds a reagent called Space Spice (used in Synnono's food recipes mostly, prevents recipe conflicts)
- New foods! Lots of them.
- You can cook using held mobs. Also, mouse/ratburgers.
I can dump the recipes if you'd like.

https://user-images.githubusercontent.com/40557659/52112070-10165a80-25cb-11e9-9a72-2c919f0033dd.png (From their PR, may not be accurate).

This is WIP, and will not compile just yet.
2020-07-14 17:04:52 -04:00
izac112
e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
izac112
e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
2020-05-06 21:53:03 +02:00