Merge branch 'master' of https://github.com/tgstation/-tg-station
This is an example of a commit.
edit example
yeah
Merge branch 'master' of https://github.com/errorage/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Added food bags. (Sprites don't work yet)
Condiment packs are mostly working. Still no sprites.
Integrated Aru's condipack sprites and made the dinnerware vendor dispense ketchup and hotsauce packs.
Bugfixes

Fixes the damage_converter.dm symptom trying to heal robotic limbs
Adds some NEEDED sanity checks to attempt_initiate_surgery (certain human only procs were being called on monkeys/other mobs)
Removes the DME, God damn silly error
Fixes the DME Please...
Merge branch '30/11/2013-Toxic-Converter-Cyberlimb-Fix' of https://github.com/RobRichards1997/-tg-station into 30/11/2013-Toxic-Converter-Cyberlimb-Fix
Groundwork for kittens.
VV now allows read-only stuff without edit perm

Also removes links you do not have permissions to use
Oops
Oh that's how it works
Final pass
Cleaning up
Reverted links getting disabled when client lacks permissions for them