Commit Graph

331 Commits

Author SHA1 Message Date
Rykka
1ca8336bad Change to_world debug messages to runtimes instead 2020-07-22 01:49:16 -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
SweetBlueSylveon
9640367e88 Fixes two drinks.
Correctly maps "Dumb Shroom Juice" and "Unsweetened Tea" to /ethanol.
2020-05-31 01:59:34 -07:00
Aronai Sieyes
a5de42d181 Merge pull request #8140 from SweetBlueSylveon/Drink-update
Drink update
2020-05-30 19:09:25 -04:00
SweetBlueSylveon
2c3c8e8450 Patch 2
Fixed indentations.
Removed "Icon_state" and "center_of_mass" where stated a second time.
2020-05-30 15:57:03 -07:00
SweetBlueSylveon
dcdf46212c Drink update
Adds 20 new drinks, 30 replaced sprites for old drinks, and adds 3 new sprites to drinks without one. Snow White recipe changed.
Requires"Allow reagents to have specific metaglass icon files" from Arokha.
2020-05-30 14:55:44 -07:00
Arokha Sieyes
982f523dd4 Allow reagents to have specific metaglass icon files 2020-05-30 16:58:05 -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
Arokha Sieyes
e91418fa6d Add protean shakes 2020-05-17 00:05:01 -04:00
Nepox
0ffb4c81a0 Fixes missing sprite from Honeybuns
It should work now.
2020-05-12 21:14:41 +02:00
Atermonera
9c32a0e2b3 Updates machines to use default_apply_parts() 2020-05-07 00:40:34 -04:00
Aronai Sieyes
4a12194414 VS: Cached version of icon_states() proc 2020-05-06 16:06:48 -04:00
Aronai Sieyes
ad9cdaade6 Merge pull request #7637 from VOREStation/aro-shake
Fix protein shaker name
2020-05-04 21:12:09 -04:00
Aronai Sieyes
fa13c1089f Fix protein shaker name 2020-05-04 21:01:06 -04:00
Aronai Sieyes
19450573fe Fix condiment container infinite range 2020-05-04 20:24:54 -04:00
Nepox
9fe34ecece Adds new food item: Honeybun
Honeybun 2: Electrig Bogaloo

This time inside the right files- I hope.
2020-05-01 11:45:33 +02:00
Aronai Sieyes
b3c1cfd29d Merge pull request #7516 from VOREStation/upstream-merge-7045
[MIRROR] Removes limits on eating, centralizes nutrition changing.
2020-04-29 19:23:55 -04:00
Aronai Sieyes
893130bdff Merge nutrition refactor for vorestation 2020-04-29 18:34:22 -04:00
Atermonera
f1cabd6742 Removes limits on eating, centralizes nutrition changing. 2020-04-29 17:15:15 -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
ArgobargSoup
5b21fa1ff5 Makes fish meat non-toxic, attempt number 2 2020-04-01 21:39:24 -07: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
8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -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
Atermonera
d39b10b144 Merge pull request #6803 from Schnayy/CookingUpdate1
Cooking adjustments
2020-03-10 18:41:02 -04:00
Novacat
f63fa398b9 Update thecake.dm 2020-03-03 16:15:54 -05:00
Schnayy
7bee18a2d7 Let them finally eat cake 2020-03-03 15:57:10 -05:00
Atermonera
7f5f8daf1b Merge pull request #6774 from Schnayy/spritefix-march
Sprite fixes
2020-03-03 01:47:45 -05:00
Novacat
65c9b4087f Merge pull request #6627 from VOREStation/aro-carafes
Adds carafes and pitchers
2020-03-01 10:52:28 -05:00
Novacat
b44f8e0911 Merge pull request #6592 from VOREStation/vchat-rebase
VChat: Redone chat output in Vue.js
2020-03-01 10:51:29 -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
c1fe64ba6a Merge pull request #6717 from LeighKnapenberger/master
Fixes Mint Apple Sparkle having a recipe, but no drink
2020-02-24 16:00:57 -05:00
Atermonera
11eed81b92 Ports precision placement of items 2020-02-22 02:35:41 -05:00
Aronai Sieyes
55790864bd Adds carafes and pitchers
Also adds them to the bartender vendor.
2020-02-20 22:17:32 -05: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
Novacat
4f4a29b5fc Merge pull request #6568 from VOREStation/stream
Remove use of <<
2020-02-14 09:34:12 -05:00
Heroman3003
718feb1ebe Adds pineapple pizzabox (#6682) 2020-02-13 17:11:43 -05:00
Atermonera
cae97cf4c0 Merge pull request #6659 from Darlantanis/MetamorphicPintGlas
Metamorphic Pint Glass
2020-02-13 00:31:59 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00