Commit Graph
69 Commits
Author SHA1 Message Date
MistakeNot4892andUnknown 3e804dc799 Sideports a couple of init unit tests from Neb. 2021-02-27 13:05:16 -05:00
NovacatandGitHub 2a7bb0dceb Update oven.dm 2021-02-06 20:52:35 -05:00
SchnayyandVirgoBot 94a1966f3a Absurd Amount of Food Fixes 2021-02-06 20:21:02 -05:00
MechoidandVirgoBot 019926cbc7 Fresh Meat, Leatherworking 2020-11-07 15:08:04 -05:00
NovacatandGitHub e72d810c31 Update _appliance.dm 2020-09-21 13:54:40 -04:00
NovacatandGitHub 23d0b9a699 Update _appliance.dm 2020-09-21 13:54:02 -04:00
MechoidandVirgoBot 68a37c64fa Hydro upkeep 2020-09-16 19:40:41 -04: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
NovacatandGitHub 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
AtermoneraandVirgoBot dcd6ae56ca Merge pull request #7550 from Khloross/cookingfix
Fix combinination_cook() creating items with no reagents
2020-08-27 19:46:28 -04:00
AtermoneraandVirgoBot 0ebcca246e Merge pull request #7518 from Meghan-Rossi/borgcookfix
Fix cyborgs not being able to cook
2020-08-21 01:25:40 -04:00
NovacatandGitHub e4b5b8ea2d Merge pull request #8661 from ShadowLarkens/med_pass_2
TGUI Medical: Second Pass
2020-08-12 20:01:12 -04:00
AtermoneraandVirgoBot 194056340e Merge pull request #7447 from Cyantime/patch-3
Gives NOREACT flag back to fixed microwaves
2020-08-12 14:23:19 -04:00
ShadowLarkens 24cdba0042 TGUI Smartfridge 2020-08-10 04:46:28 -07:00
AtermoneraandVirgoBot afb5819c32 Tweak to kitchen machinery: 2020-08-08 23:53:58 -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
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
AtermoneraandVirgoBot 31f04a4975 Aurora Cooking Port 2020-07-30 15:13:46 -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 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
AtermoneraandVirgoBot 9c32a0e2b3 Updates machines to use default_apply_parts() 2020-05-07 00:40:34 -04:00
Aronai SieyesandVirgoBot 6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
AtermoneraandVirgoBot d7a9416bb8 Clean up various things 2020-04-03 03:15:06 -04:00
UnknownandAronai Sieyes 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
AtermoneraandAronai Sieyes a23797182f Port Bay's vendor/smartfridge sprites 2020-03-31 13:56:38 -04:00
AtermoneraandVirgoBot cbb40196fc Machinery: Always use update_use_power() 2020-03-23 23:21:10 -04:00
AtermoneraandVirgoBot 223fb23423 Merge pull request #6811 from Schnayy/mwsprites
Deluxe microwave sprites work
2020-03-12 03:21:45 -04:00
CerebulonandVirgoBot 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 SieyesandLeshana 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 SieyesandLeshana 47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
NovacatandGitHub 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
NovacatandGitHub ae5fe87e38 Update microwave.dm 2020-01-21 01:36:15 -05:00
NovacatandGitHub 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
NovacatandGitHub c72899c7e6 Update microwave.dm 2020-01-21 01:13:37 -05:00
AtermoneraandVirgoBot f7da338790 Move Microwave recipes to their own subtype of the recipe datum. 2020-01-21 00:35:38 -05:00
AtermoneraandVirgoBot d10a72a77f Adds a mega cooking recipe 2020-01-20 23:15:01 -05:00
AtermoneraandVirgoBot 9b93339969 Moar descriptions for things 2020-01-20 22:50:39 -05:00
CerebulonandVirgoBot 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