Commit Graph

8 Commits

Author SHA1 Message Date
phil235
549b71a487 Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul
Conflicts:
	icons/obj/drinks.dmi

Fixing a couple typos. Making sure all eggs used in tablecraft recipes are boiled
2015-02-11 16:13:04 +01:00
phil235
732a54fe63 Making all meat subtypes of snacks/meat
Adding specific cutlets and raw cutlets for a lot of types of meat.
Enabling reagent transfer from ingredients to resulting dish for foodtablecrafting
Adjusting tablecraft food recipes reagents accordingly.
Adding raw pastry base and pastry base food and including it into certain recipes.
2015-02-08 21:36:54 +01:00
phil235
0aa8e4b5ad Adding a table proc checking whether the table is too crowded to craft things on it.
Two small fixes.
2015-02-08 00:50:19 +01:00
phil235
f6b0f57e89 last fixes I hope:
tiny change to latexballoon (b/c I reorganized is_sharp proc already, so why not)
some fixes suggested by razharas in table.dm
Renamed microwave to microwave oven. Adding efficiency effect (upgrading the machine)
Adding rolling pins to the kitchen vending machine (so the two cooks don't fight.
2015-02-07 20:10:11 +01:00
phil235
faba71fcca Cooking overhaul: adding tablecraft food recipes, customizable food, food ingredients (from bay)
- converted the microwave recipes to tablecraft recipes
- Added customizable food (thanks iamgoofball)
- added food ingredients (from baystation)
- changing food recipes a bit (replacing stuff with the new food ingredients)
- repurpose the microwave to actually cook certain food items.
- bowl is no longer trash but a reagent_containers/glass that is used in salad/soup recipes
- Changed the hunger system a bit, sugar becomes a normal reagent again. Adding a junkiness var to foods to drain mob satiety.
- milk carton is now a condiment bottle
- slight buff to vitamin
2015-02-05 16:48:25 +01:00
MrPerson
863f28f295 On second thought, leave the result as just a path
Fix up IED's so they work correctly when tablecrafted. Also remove their manual crafting.

Merge branch 'master' of https://github.com/tgstation/-tg-station into table_module

Conflicts:
	code/game/objects/structures/tables_racks.dm
2014-10-10 14:30:41 -07:00
MrPerson
694f9fda91 Tablecrafting improvements:
Allow more than one result. All components will be placed inside the first result in the list.
Completion of crafting will now reset the interface, if possible.
Opening the interface now causes you to face the table.
2014-10-06 01:24:26 -07:00
MrPerson
b04f547cd1 Move table crafting into the modules folder 2014-10-04 23:43:03 -07:00