Commit Graph

218 Commits

Author SHA1 Message Date
phil235 c39168b059 Fixes wingfangchu recipe. It is now a soup (consistent with its sprite) 2015-04-14 18:44:55 +02:00
phil235 afef61aa58 Fixes the meat type of many simple animals
Fixes the name of some steaks and cutlets when spawned.
2015-04-11 14:18:32 +02:00
Jordie 40d1c3e347 Merge pull request #8863 from Iamgoofball/patch-53
Fixes slime core dupe bug
2015-04-10 14:38:25 +10:00
Iamgoofball 16a25f3dd8 Fixes slime core dupe bug
why the fuck this didn't throw an error is beyond me.
2015-04-09 20:49:07 -07:00
phil235 e6e0143ec5 Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2
Conflicts:
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/MiniStation/z2.dmm
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
2015-04-08 19:36:49 +02:00
Iamgoofball c06ad7e6b8 moved process() to datum. made /datum/reagents/ process instead of the containers. 2015-04-07 17:13:59 -07:00
phil235 ad797d405e Better parsnip sprite 2015-04-06 19:25:27 +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 e32a0b5b3e map fixes and adjusting max reagent volume for some foods. 2015-04-04 19:44:46 +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
phil235 9396253eb8 Fixes alien and simple animal being unable to attack porta_turret (like the AI turrets). Making a take_damage() proc to update the turret's health.
Fixes porta_turret being broken by severity = 1 explosion and deleted by severity = 3 instead of the other way around.

Fixes soda can being named 'drink' in tablecraft window.
2015-03-31 00:09:55 +02:00
phil235 1b3eb49a1d Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/slime/say.dm
2015-03-26 02:31:06 +01:00
phil235 92b0f9f4cd Adding a changelog.
Some work on death() procs of many animals.
Replacing most istype(XYZ, mob/living/simple_animal/slime) by isslime(XYZ).
Some work on slime feeding procs.
Made simple animal aliens see in the dark like regular aliens (in case somone wants to control one).
2015-03-26 02:23:39 +01:00
phil235 efdbdef49f Fix mistake in bottle hitting message. 2015-03-23 14:27:52 +01:00
phil235 92684d7717 Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal 2015-03-20 22:26:23 +01:00
phil235 aecb365f84 Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
Conflicts:
	code/modules/mob/living/carbon/alien/life.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/simple_animal/slime/life.dm
2015-03-20 19:32:16 +01:00
MMMiracles de9641edae seriously where did these lines come from 2015-03-19 19:35:02 -04:00
MMMiracles 46a824c5cc againwhy? 2015-03-19 19:34:36 -04:00
MMMiracles 9ed41e0510 lineswhy 2015-03-19 19:34:16 -04:00
MMMiracles ae42b04999 Merge branch 'master' of https://github.com/tgstation/-tg-station into bearfood
Conflicts:
	code/modules/food&drinks/food/snacks_burgers.dm
	code/modules/food&drinks/food/snacks_meat.dm
	code/modules/food&drinks/food/snacks_pie.dm
2015-03-19 16:06:13 -04:00
MMMiracles 179c62a84a conflicts harharhar 2015-03-19 16:02:50 -04: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
phil235 b87300e712 Fixes donuts not having a uniquee filling color 2015-03-16 19:51:06 +01:00
phil235 41279b3c03 Fixes spawned food not having normal amounts of nutriment and other reagents.
Upgraded microwave now adds more nutriment, vitamin and other reagents to the food it cooks.
2015-03-16 18:47:01 +01:00
Razharas fcd6718c56 Merge pull request #8309 from phil235/BurgerSpriteFix
Fixes burger and sandwich ingredient stacking and sprites.
2015-03-16 01:40:15 +03:00
Razharas 4f1e20bd84 Merge pull request #8348 from phil235/DoughHotfix
Fix dough and cakebatter recipes.
2015-03-15 16:30:20 +03:00
phil235 791b229388 Merge branch 'master' of https://github.com/tgstation/-tg-station into BurgerSpriteFix
Conflicts:
	icons/obj/food.dmi
2015-03-15 12:21:45 +01:00
MMMiracles 94bb6f9fd6 lmao 2015-03-14 21:04:37 -04:00
MMMiracles 8ee898d67a ayy 2015-03-14 21:04:11 -04:00
Cheridan 0cdffeecfb Merge pull request #8296 from phil235/TablecraftFix
Tablecraft Fix and recipe detection
2015-03-14 19:41:56 -05:00
phil235 913d64b9a7 Fix dough and cakebatter recipes. 2015-03-14 23:59:56 +01:00
phil235 456a64f8fd slime from carbon to simple animal 2015-03-14 23:40:57 +01: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 a15adec48d Fixes burger and sandwich ingredient stacking and sprites. 2015-03-12 13:32:30 +01: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 bc091234ee Changes egg breaking to use reagent_containers/glass/attackby() (fix issue with custom egg salad)
You can only break eggs on glass containers (beaker,bucket,bowl,etc)
2015-03-09 19:43:39 +01:00
Cheridan 564238f335 Merge pull request #8215 from Ahammer18/Ahammer18
Slime Cake
2015-03-09 02:35:18 -05: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 0aa2246231 Fixed changelog and color 2015-03-08 13:52:26 -05: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 d4de07d336 Fixes ghostburger and appendixburger icons. 2015-03-06 12:38:08 +01:00
Cheridan 9cf4a0bfc6 Merge pull request #8114 from phil235/CookTrash
Cooking fixes for meat and trash
2015-03-05 23:54:29 -06:00
phil235 bb10824737 Improvised heating fix: Fixes dough recipe from egg + 15u flour beaker.
Adds a limit to how hot the beaker reagents can be heated. (no hotter than the heat source)
moving reagent_containers/attackby() to reagents/reagent_containers.dm for better visibility.
2015-03-03 22:35:11 +01:00
Swag McYolosteinen c2290c6c5c Merge pull request #7913 from phil235/NewPlants
Adds new plants to botany
2015-03-03 11:23:32 +01:00
phil235 467e102b49 Fixes trash disappearing when washed in a sink.
Fixes waffle trash being named "waffles".
Replacing some stat/weakened/stunned checks with incapacitated()
Fixes meat cutlets and steak not including meat type in their name (e.g. raw corgi meat cutlet)
Harvesting meat from simple animals now takes time, has a sound, and can be done with any sharp item.
2015-03-03 00:07:08 +01:00