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.
Fixed condipack issues
Compile testing is for skrubs. (Condipacks compile now)
Fixed sprites.
Adds new and better wand and spellbook sprtes by Neerti
Adds new functionality where wands will look different once they're out of charge for at a glace judgements
Adds a wand of nothing to the hacked item list for the autodrobe, by popular request
Bugfix: Wrote a work around for reviving dead simple animals, who were simply becoming pristine corpses before this. Not the prettiest thing in the world, but blame how simple animals die.
Removes the staff of animation from summon magic. I never intended for it to be there and it's OP as hell.
Feature: Adds summon guns and summon magic as fun secrets for badmins
Bugfix: Prevents people from becoming the survivor multiple times
Digital valves can now be made and unwrenched. Fixes pipe fitting names.
Weird pipe fitting names like "uvent fitting" have just been changed to "vent fitting".
Bugfix: Adds a var to simple animals "player_controlled" to surpress behaviors in simple_animals that have players assigned.
Bugfix: Dead player mice won't be converted to items so they can still be revived.
Bugfix: Players playing chicks won't die by developing into chickens anymore
Bugfix: Fixes an edge case where a poor soul struck by multiple polymorphing shots at once ends up in a state where they can't move.

Feature: Renames the wand of resurrection to the wand of healing to drive home the fact that it does the same things the staff of healing can do

Balancing: Gives the wand of healing more shots. 10, 5, 5, 4 up from 3, 2, 2, 1
feature: renames the monkeyizing var to "notransform" since that's how it was being used in the code, as a flag to tell code to ignore transformation (initially because they were already turning into a monkey).

bugfix: gives notransform to etheral jaunting based on an observed edge case where a wizard was staff of changed while starting a jaunt and got stuck in bluespace for the rest of the round

meta: modified revive() so I could remove all that horrible snowflake I introduced to let reviving simple mobs come back
I forgot how children work guys

Merge branch 'master' of https://github.com/tgstation/-tg-station into wands3
Fixes for Gia:
Fixes the mysteries of reviving simple animals in the least intrusive manner I could think of
Removes player_controlled because ckeys did much the same thing
Uses update_canmove() instead of hardseting it

One last Bugfix: Simple animals generated with no real_name will use their initial name as their real name so that transformed antags will not get a "(survived as )" because the thing they turned into didn't have a real_name set.
Bugfix: Slimes that reproduce will now properly inherit magic spells
Feature:  Changed how used books of mindswap punish people. Now if you use a used mindswap book it marks you to be used in a mindswap with the next unfortunate soul who reads its. Some Limitations: You can escape the impending mindswap by changing forms or being dead when the next time someone tries to read the book. You can of course also just keep the book safe or destroy it if you accidentally read one. Only works with things that have hands. Consider intentionally reading one as a monkey then giving it to the captain.

Feature: After some serious testing (and because it was already being done on live servers thanks to wabbajack() preserving spells) I've removed the compatible_mobs list for mind_transfer, meaning you can now mind transfer to any player controled living mob.

Flowery fluff that no one would ever care about: changes the mindswap message for trying to swap into a dead guy, since a spell holder isn't nessisarily a space wizard
Merge branch 'master' of https://github.com/tgstation/-tg-station into condimentpacks

Conflicts:
	code/modules/reagents/reagent_containers/food/condiment.dm
 * Increased the amount of iron that spawns in the labor camp.
 * Decreased the amount of points you get from diamond and bananium. Increased the amount of points you get from Iron and alloys.
 * You can now see which minerals give you which points from the claiming console.
Viral fix

Fixed strain_data, removed some unused code.