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
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
efdbdef49f
Fix mistake in bottle hitting message.
2015-03-23 14:27:52 +01:00
92684d7717
Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
2015-03-20 22:26:23 +01:00
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
de9641edae
seriously where did these lines come from
2015-03-19 19:35:02 -04:00
46a824c5cc
againwhy?
2015-03-19 19:34:36 -04:00
9ed41e0510
lineswhy
2015-03-19 19:34:16 -04:00
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
179c62a84a
conflicts harharhar
2015-03-19 16:02:50 -04:00
bf4476a041
Merge remote-tracking branch 'remotes/upstream/master' into bearfood
...
Conflicts:
icons/obj/food.dmi
2015-03-17 22:39:03 -04:00
b87300e712
Fixes donuts not having a uniquee filling color
2015-03-16 19:51:06 +01:00
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
fcd6718c56
Merge pull request #8309 from phil235/BurgerSpriteFix
...
Fixes burger and sandwich ingredient stacking and sprites.
2015-03-16 01:40:15 +03:00
4f1e20bd84
Merge pull request #8348 from phil235/DoughHotfix
...
Fix dough and cakebatter recipes.
2015-03-15 16:30:20 +03:00
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
94bb6f9fd6
lmao
2015-03-14 21:04:37 -04:00
8ee898d67a
ayy
2015-03-14 21:04:11 -04:00
0cdffeecfb
Merge pull request #8296 from phil235/TablecraftFix
...
Tablecraft Fix and recipe detection
2015-03-14 19:41:56 -05:00
913d64b9a7
Fix dough and cakebatter recipes.
2015-03-14 23:59:56 +01:00
456a64f8fd
slime from carbon to simple animal
2015-03-14 23:40:57 +01:00
565ac0b4de
quickfix
2015-03-14 14:38:01 -04:00
17a9556798
Adds 3 new bear-related foods. Now with 100% less 4k+ line changes.
2015-03-14 14:22:29 -04:00
a15adec48d
Fixes burger and sandwich ingredient stacking and sprites.
2015-03-12 13:32:30 +01:00
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
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
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
564238f335
Merge pull request #8215 from Ahammer18/Ahammer18
...
Slime Cake
2015-03-09 02:35:18 -05:00
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
0aa2246231
Fixed changelog and color
2015-03-08 13:52:26 -05:00
cd1472bc42
Updated
2015-03-07 22:34:56 -06:00
d295a401a1
A bit of a test I did, added slimecake.
2015-03-07 22:23:01 -06:00
d4de07d336
Fixes ghostburger and appendixburger icons.
2015-03-06 12:38:08 +01:00
9cf4a0bfc6
Merge pull request #8114 from phil235/CookTrash
...
Cooking fixes for meat and trash
2015-03-05 23:54:29 -06:00
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
c2290c6c5c
Merge pull request #7913 from phil235/NewPlants
...
Adds new plants to botany
2015-03-03 11:23:32 +01:00
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
daffcdf075
Merge pull request #7987 from phil235/SugarSatietyRemoval
...
Remove sugar satiety effect
2015-03-02 18:17:40 +01:00
2be30eb89e
Merge pull request #8083 from Delimusca/getochemboyz
...
added improvised heating
2015-03-02 08:58:12 -06:00
d856e240c2
Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants
...
Conflicts:
icons/mob/head.dmi
2015-03-02 13:45:15 +01:00
747ebbc78d
added improvised heating
2015-02-28 20:51:39 -07:00
f6e18e9e45
Re-adds the shot glass sprites.
2015-02-27 17:14:50 -06:00
fa0e5344ef
Removes sugar effects.
2015-02-27 19:01:32 +01:00
809a1be279
Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants
...
Conflicts:
icons/mob/head.dmi
2015-02-25 18:50:42 +01:00
7c93a9081e
Merge pull request #7941 from phil235/SmallFoodRenamingFix
...
Fixes custom food renaming for sandwiches.
2015-02-25 08:24:38 -06:00
588c79873f
Merge pull request #7562 from Iamgoofball/drugs
...
GOONCHEM: Part 4: Pyrotechnics, Drugs, and Misc. Chemicals
2015-02-25 08:26:21 +03:00
b1ff6b7220
Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams
...
Conflicts:
code/game/turfs/simulated/floor/light_floor.dm
2015-02-24 22:16:53 +00:00
2c7ffaaea2
Fixes custom food naming for sandwiches.
2015-02-23 22:24:49 +01:00
7b33271e85
Fix all foods getting the warning message about ingredient being too big.
2015-02-23 13:51:31 +01:00
bd870d649c
Adds new plants to botany (rice, oat, blue cherries, holy melon, parsnip, geranium, lily, snap corn, blumpkin, mimana, sweet potato, vanilla, red beet) and adding two new reagents (vanilla and rice).
2015-02-22 22:10:25 +01:00
phil235
MMMiracles
Razharas
Cheridan
phil235
Ahammer18
Swag McYolosteinen
Delimusca
TheVekter
Remie Richards