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.
code/game/objects/items/robot/* lowercase pass
NOTE: vision modes have to be proper.
FIXED: inconsistencies with stack item names.
CHANGE: stacks are gender = PLURAL by default because it fits.
code/game/object/items/weapons/* lowercase pass
code/game/object/structure/* lowercase pass (start)
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
Janiborgs can no longer place their mop, light replacer or trash bag in the janicart. Fixes #1954
Language fix "this the" -> "the" in storage.dm
Adds deconstruction for DNA scanner and cloning pod.
Adding wires to a machine frame uses one unit of wire.
Wires returned from deconstructing return 1 unit of wire.
Fixes issue #1001
Applied logic to portable generator deconstruction.
Merge branch 'master' into ItemNameFixingRound3