phil235 cf48bb8364 Fixes potato cell construction being broken ...

Fixes eggplant parmigiana recipe (it was inheriting reagent requirements from spaghetti). I changed recipes so that they never inherit items or reagents requirements from a parent recipe to make adding new recipes in each categories less prone to mistakes.

2015-01-02 18:18:26 +01:00

..

admin

Merge pull request #6634 from paprka/chefuniform

2014-12-30 03:45:13 -03:00

assembly

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

2014-12-28 11:20:15 +03:00

awaymissions

Fixes conflicts

2014-12-30 15:12:09 +03:00

client

Revert "Adds mouse pointers for different ui styles"

2014-12-31 02:17:50 -03:00

clothing

Fixes conflicts

2014-12-30 15:12:09 +03:00

crafting

fixed compile errors

2014-12-24 21:03:22 -08:00

detectivework

…

emoji

…

events

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

2014-12-28 11:20:15 +03:00

flufftext

Fixes hallucinated attackers not doing the attack animation.

2014-12-27 22:41:13 +01:00

food&drinks

Fixes potato cell construction being broken

2015-01-02 18:18:26 +01:00

holiday

…

hydroponics

Fixes potato cell construction being broken

2015-01-02 18:18:26 +01:00

library

…

mining

Merge pull request #6586 from phil235/ResonatorTableFix

2014-12-27 15:06:36 -03:00

mob

Merge pull request #6686 from paprka/lizstutterv2

2014-12-31 23:22:38 -03:00

nano

…

paperwork

Conflict fix

2014-12-21 06:12:33 +03:00

power

Merge pull request #6646 from RemieRichards/TerminalDecon

2014-12-31 21:47:47 -03:00

projectiles

Merge pull request #6324 from Razharas/GenShit

2014-12-31 17:24:15 -03:00

reagents

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

2014-12-29 17:05:20 +03:00

recycling

Merge pull request #6324 from Razharas/GenShit

2014-12-31 17:24:15 -03:00

research

Fixed retractor spawning an /obj/item/weapon/retractor when fabricated in an autolathe.

2014-12-29 20:46:01 +01:00

scripting

…

security levels

…

shuttle

…

surgery

…

telesci

…