Fixes ZAS silliness with SoftDelete
Fixes derpiness with ZAS heat transfer.
Adds developer-level access to ZAS settings.
Fixes bug which would always let heat move through doors.

Conflicts:
	code/modules/admin/admin_verbs.dm
Fixes
Added filling_color var to food items for use in sandwiches.

Conflicts:
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/food/snacks/grown.dm
Icon fixes, shards hidden in food will now lacerate random body parts because damage code is weird. Stop eating chocolate cake sandwich with your left food.
Colour fix for bread slices.
Sandwich icon and dme fixes
Talisman icon fix

Makes talismans keep looking like talismans for more than a tick.
Added spider meat recipes

Conflicts:
	code/modules/food/recipes_microwave.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	icons/obj/food.dmi
Added spider butchery

Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
	icons/mob/animal.dmi
Merge pull request #18 from ZomgPonies/master

11/01/14