Merge branch 'master' of https://github.com/tgstation/-tg-station
This is an example of a commit.
edit example
yeah
Basic usage of blend_mode

Areas - fire and party alarms look better
Druggy 420 blazeit screen looks better
The whiteness of a flash looks nicer. Mob code makes me hesitant to really change this.
The nearsighted/welding mask dither looks better

If you want screenshots just ask.
Merge branch 'master' of https://github.com/errorage/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge pull request #1729 from MrPerson/zone_of_the_blenders

Basic usage of blend_mode
Added food bags. (Sprites don't work yet)
Condiment packs are mostly working. Still no sprites.
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Hydroponics Plant Size Scaling!

Plants now get resized, based on their potency!
(Except for logs and sunflowers because they're snowflakes)

screenshot:
http://puu.sh/5iJws.png
Integrated Aru's condipack sprites and made the dinnerware vendor dispense ketchup and hotsauce packs.
gia ;_;
Removed the need of the input and output object for the machinery of mining.
They will now use the input_dir and output_dir vars.
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