Commit Graph

41 Commits

Author SHA1 Message Date
c0
a690abcf92 Plant Refactor: Seeds 2016-03-04 02:35:51 +03:00
c0
0e1ae09e92 Plant Refactor: Revenge of the Grown 2016-03-02 07:30:06 +03:00
c0
23f1123b9a Name burgers are back! 2016-02-26 15:31:54 +03:00
bgobandit
a2241e0f6f Merge branch 'master' of https://github.com/tgstation/-tg-station into lizcannotwag
Conflicts:
	code/modules/client/preferences.dm
	icons/mob/head.dmi
	tgstation.dme
2015-12-17 20:12:32 -05:00
Incoming
a5aa452c2b I fudged it 2015-12-10 22:22:22 -05:00
bgobandit
49d54f48f7 Adds the severing of lizard tails. 2015-12-10 18:58:37 -05:00
Cheridan
f634890457 Merge pull request #13335 from Incoming5643/fudge_dice
Fudge dice
2015-12-02 16:40:25 -06:00
swankcookie
3e5e9086c0 fix 2015-12-01 21:52:35 -06:00
Incoming
0c1d7272d5 Adds fudge dice
They're six sided dice with two pluses, two minusii, and two blank sides.

They're also a jokey recipe you can create with any dice and a chocolate bar. Once you eat the literal fudge die you get a fudge die no matter what kind of die you used into its creation. This is INTENTIONAL AND PART OF THE JOKE.

Adds them to the "rare dice" spawn in dice bags.

Formally defines a d6 as a separate thing from the generic parent die. the generic parent die is still a d6 for all intents and purposes except for the fact that it's now just called a generic "die" instead of a d6. This was so the recipe didn't list a d6 as needed for the fudge dice recipe when really any die would do.

Doesn't replace existent generic die with d6eses on the maps because I don't want this to conflict for a million years. I'll swap out the generic dies at some future point after this is added.
2015-11-30 15:19:25 -05:00
bgobandit
fbdbe43118 adds grappa and grape tarts, fixes typos O NO 2015-10-15 13:25:59 -04:00
phil235
c4c447a8dc Fixes hotspot having two New() procs.
Fixes many machines and a few structure not having a cooldown when attacked with an item.
Fixes not being able to eat or be facehugged when wearing riot helmet with visor up.
Fixes not being able to use child of the tool type for craft recipes requiring tools.
Tablecrafting failure message now tells you what caused the failure (missing tool, missing component)
Fixes fuego plasma burrito recipe.
Fixes being able to grab cups from water cooler with telekinesis, putting the cup directly in your hand.
Fixes golem appearing with their old human name for a split second.
Some changes to make code more OOP (take_damage() proc for barricade, shieldgen, etc)
Some tweaks to light tube building code.
2015-10-08 19:50:01 +02:00
c0
691f6fb66d Surgery & Organs Rework: Phase 2 2015-08-06 09:56:54 +03:00
c0
04f7b3f2de Surgery, Implants and Organs rework: Phase 1 2015-07-31 22:18:31 +03:00
bgobandit
ee9e59a974 WHAT ARE YOU DOING TO THAT POOR DOG 2015-07-22 21:30:15 -04:00
Remie Richards
0611c9b3bb Adds a category for food items, adds some missing weapons and a Misc category 2015-06-25 11:58:42 +01:00
Firecage
3a826fe13c Changes alot of datum/ to /datum/ 2015-05-31 02:40:54 +02:00
phil235
c39168b059 Fixes wingfangchu recipe. It is now a soup (consistent with its sprite) 2015-04-14 18:44:55 +02:00
phil235
cbbd5897ee Fixes typos, rice pudding recipe changed, maxvolume and bitesize for superbiteburger and stew changed, cookbook updated. 2015-04-05 16:48:50 +02:00
phil235
f9f618d699 Adding the chemical reactions and recipes for the new recipes.
Changes the glasses of what? to use an overlay with reagents color.
Adding a ricepack to the kitchen cabinet and the food crate.
Adding more bowl to the dinnerware vending machine.
Adding pumpkinjuice, blumpkingjuice, cherryshake, bluecherryshake pumpkin latte, drunken blumpkin reagents.
2015-04-04 19:29:12 +02:00
phil235
22ff13eff8 Adding a whole bunch of food. 2015-04-04 02:35:48 +02:00
phil235
493c3e038a Splitting food.dmi into smaller files.
Repathing meat slab, meatsteaks and cutlets into meat/slab, meat/steak, meat/rawcutlet, meat/cutlet. Fixes issue with food naming when containing meat stuff, especially human meat.
Bowl filled with reagent now gets a nice half transparent overlay with the reagents colors (like beaker)
Mousedroping a snack that's on a table now opens the tablecrafting window.
Fixes not being to store items in plain bread, plain cake and cheesewheel.
2015-04-03 21:59:56 +02:00
MMMiracles
bf4476a041 Merge remote-tracking branch 'remotes/upstream/master' into bearfood
Conflicts:
	icons/obj/food.dmi
2015-03-17 22:39:03 -04:00
MMMiracles
94bb6f9fd6 lmao 2015-03-14 21:04:37 -04:00
Cheridan
0cdffeecfb Merge pull request #8296 from phil235/TablecraftFix
Tablecraft Fix and recipe detection
2015-03-14 19:41:56 -05:00
MMMiracles
565ac0b4de quickfix 2015-03-14 14:38:01 -04:00
MMMiracles
17a9556798 Adds 3 new bear-related foods. Now with 100% less 4k+ line changes. 2015-03-14 14:22:29 -04:00
phil235
82d9761f1f Fixes notasandwich and flamethrower tablecraft recipes
Add a recipe detection to tablecrafting, if you have some of the things required for the recipe (50% of the amount of different things needed, i.e if less than 3 different things in the recipe then you need 1, otherwise 2+), it will now appear in grey in the tablecrafting window. The tablecrafting window will also lists the requirements for each recipes it shows.
2015-03-11 19:36:51 +01:00
phil235
82b1b1adcd Merge branch 'master' of https://github.com/tgstation/-tg-station into DoughChange
Conflicts:
	icons/obj/food.dmi
2015-03-09 19:48:23 +01:00
phil235
1a092e0ede Changes how doughs are made. 10water+15flour chem reaction for dough. 15flour+15eggyolk+5sugar for cake batter (or alternatively for vegans 15 soymilk instead of the eggyolk).
Introduce egg yolk reagent
You can break eggs in open reagent containers or blend them to get egg yolk.
Fixes breadslices sprites and other merge conflict bugs in food.dmi.
Change customizable snack max volume to 60. Buff nutriment amount in doughs.
2015-03-08 22:15:55 +01:00
Ahammer18
cd1472bc42 Updated 2015-03-07 22:34:56 -06:00
Ahammer18
d295a401a1 A bit of a test I did, added slimecake. 2015-03-07 22:23:01 -06:00
phil235
024559f801 Buffs nutriment amounts in doughs and their cooked counterparts, as well as meats.
Fixed a recipe.
2015-02-18 14:02:18 +01:00
phil235
2e7479c998 Adding cake batter, pie dough and raw pastry base recipes to tablecrafting in case people struggle to add milk to the dough.
Adding opencontainer flag to dough, doughslice and flat dough so you can transfer reagent to them using a beaker.
Renaming sandwich without a top to "toast".
2015-02-14 15:27:08 +01:00
phil235
897618d42f Fixed some recipes in chef recipes book. Fixed jelly sandwich recipes. Remove unused milk/soymilk carton sprites from drinks.dmi 2015-02-12 21:39:20 +01:00
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
63456ef622 Many fixes. Adding custom pizza slices. Reducing amount of icons used. Adding a changelog. 2015-02-07 03:10:32 +01:00
phil235
a296e8f6a1 Updating the cook book. Finishing giving filling color to growns. More fixes 2015-02-05 22:34:11 +01:00
phil235
0a6013cfa9 - Some fixes
- Adding power var to microwave to reduce microwaving time (with risk of failure)
- Giving unique color to snacks for filling purposes
- cake batter and pie dough can also be made with soy milk
2015-02-05 19:53:34 +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