Commit Graph

49 Commits

Author SHA1 Message Date
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
839b9bb4c8 Makes the Oven start closed. Recipe updates will come in a second PR 2020-07-21 19:21:51 -04:00
Rykka
93a4631005 Various fixes and bugfixes from live playtests 2020-07-20 23:33:30 -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
Aronai Sieyes
1bf4a11207 Fixes smartfridge throw stock issue 2020-05-21 11:24:45 -04:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
Atermonera
9c32a0e2b3 Updates machines to use default_apply_parts() 2020-05-07 00:40:34 -04:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Atermonera
d7a9416bb8 Clean up various things 2020-04-03 03:15:06 -04:00
Unknown
dca2e93209 VS: Conflict Resolution + VS Changes
Makes soft vendors work again
Conflict Resolution II
Fixes Shelter Capsule Vendor
Note to self remember quotations
Bad Lynx stop forgetting quotes!
2020-03-31 13:56:38 -04:00
Atermonera
a23797182f Port Bay's vendor/smartfridge sprites 2020-03-31 13:56:38 -04:00
Atermonera
cbb40196fc Machinery: Always use update_use_power() 2020-03-23 23:21:10 -04:00
Atermonera
223fb23423 Merge pull request #6811 from Schnayy/mwsprites
Deluxe microwave sprites work
2020-03-12 03:21:45 -04:00
Cerebulon
80f7f3afb2 Adds more machine button sounds (#6802)
* Adds more machine button sounds

* chang
2020-03-11 20:32:06 -04:00
Arokha Sieyes
1d9e5be122 Replace \image macro with bicon() 2020-02-19 19:55:01 -05:00
Arokha Sieyes
d5b820fc58 VChat: Redone chat output in Vue.js
Co-authored-by: Leshana <Leshana@users.noreply.github.com>
2020-02-19 19:55:01 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Novacat
0679ed4042 Merge pull request #6481 from VOREStation/upstream-merge-6632
[MIRROR] Move Microwave recipes to their own subtype of the recipe datum.
2020-01-21 01:44:50 -05:00
Novacat
ae5fe87e38 Update microwave.dm 2020-01-21 01:36:15 -05:00
Novacat
1688d86772 Merge pull request #6478 from VOREStation/upstream-merge-6621
[MIRROR] Moar descriptions for things
2020-01-21 01:33:06 -05:00
Unknown
c6a709b5e4 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-6632 2020-01-21 01:28:43 -05:00
Novacat
c72899c7e6 Update microwave.dm 2020-01-21 01:13:37 -05:00
Atermonera
f7da338790 Move Microwave recipes to their own subtype of the recipe datum. 2020-01-21 00:35:38 -05:00
Atermonera
d10a72a77f Adds a mega cooking recipe 2020-01-20 23:15:01 -05:00
Atermonera
9b93339969 Moar descriptions for things 2020-01-20 22:50:39 -05:00
Cerebulon
183b1d99b1 Coffee Shop Revamp 2019-12-22 22:54:01 -05:00
Unknown
45577f8c34 Microwave was too fast, fixed. 2019-07-04 21:48:36 -04:00
Unknown
a5961d8e0e Ease of Eating Changes
On request from Duke

- Microwave cooking times cut to 25% of normal times
- You now need 1/5 of the amount of clonexcadone for meat
- Cargo pizzas start out cooked
2019-07-04 21:32:52 -04:00
Novacat
466516b066 Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good" 2019-04-08 15:24:27 -04:00
Heroman
5a9e1f1566 Ports some fixes 2019-04-07 14:02:34 +10:00
Heroman
b11015107c REVERT of nanoui/chemistry becoming subsystems (temp) 2019-04-05 13:30:32 +10:00
kevinz000
6415e4193f [READY]Makes a bunch of processes subsystems instead 2019-03-27 16:03:51 -04:00
Unknown
a92eb4a414 Reverts to Polaris File 2019-03-27 12:50:51 -04:00
Neerti
373e1c766a Fixes infinite microwave sound when recipe fails 2019-03-27 12:45:09 -04:00
Unknown
4e67e1b9ab Conflict Resolution 2019-03-27 04:11:30 -04:00
Anewbe
09b01407e3 Adds Various Sounds, Looping Sound System 2019-03-27 03:55:21 -04:00
Atermonera
131636b1d2 Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding 2019-03-26 13:21:08 -04:00
Spades
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Spades
c6c7d98a2d Merge branch 'master' into upstream-merge-5735 2019-01-14 11:20:55 -05:00
Spades
1338225afa Resolves some merge conflicts 2019-01-05 16:29:19 -05:00
Unknown
b48efb138f More merge conflict fixes
I think I got them all.
2018-12-13 00:33:32 -05:00
kevinz000
fc178c1e04 Makes math helpers defines for performance 2018-12-06 16:15:00 -05:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Shophaune
fad2beb82e Fixes duplication of corpses by holding and then cooking (#5693)
* Add files via upload

* Revert "Merge pull request #1 from Shophaune/plant-bag-ui-bug-fix"

This reverts commit 62a60d4f87774508621506b347c679191e1a242f, reversing
changes made to 6f909ce590.

* Fix for cooking mob duplication

* Actually this is a better method, thanks Baystation

Yeah they kinda fixed it three days ago way better than I did it so
2018-10-22 20:54:02 -04:00
Arokha Sieyes
ce187f64ed Fixup other vorestation things
Stop using the web editor please
2018-10-16 12:05:32 -04:00
Anewbe
12e34de332 Move almost everything food related into the kitchen module. 2018-10-15 15:47:14 -04:00