Nothing to see here.
Made Research much more modular
Woops, did not notice this little slip. Should work in the general form now.
Fix #1389
Merge pull request #4 from d3athrow/Bleeding-Edge

D:BE->S:C
Re-adds custom amount to chem dispenser
Additional fixes
Fixing meteor admin warning

Fixes didn't go through with the rest when saving : Electric Boogaloo 2
Changes to Wish Granter

- Most messages were changed to sinister, all messages now use span
- Compability fixes for custom naming
- Admins are now warned directly when someone fucks with a Wish Granter
- Third person warnings on interaction and the Wish Granter now forces
you to whisper much like when praying, possibly into a radio
- Added a few default lines, notably the good old "Muh valids"
- Whisper lines can now be customized directly
- Fixed most strings
Cooking cleanup
Add nutriment to config
Added the check to stop ghosts messing with the fabricator machines
Entities wearing sec/medical HUDs or corresponding now receive broadcast messages from relevant bots.
Tasty tasty bot features
forgot file
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafuckshitpiss
Merge branch 'master' of https://github.com/ComicIronic/vgstation13 into ComicIronic-master

Conflicts:
	code/game/mecha/mech_fabricator.dm
dm enviroment and map
added ingredientLimit
shitty fucking git