Merge pull request #4 from ZomgPonies/master

Merge to Master
Merge pull request #5 from ZomgPonies/master

Merge from master
Updated projectiles
Implement toxic farts.

Conflicts:
	code/game/objects/effects/effect_system.dm
	code/modules/mob/living/carbon/human/human_defines.dm
Implement psy-resist block (and fix some naughty remoteview behavior).
Sober gene implementation

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
Added new Fluff sprite

Black schoolgirl uniform, made my Wisewill~
Fix
Merge pull request #122 from Regen1/master

Added new Fluff sprite from Wisewill
Fixed cat2 sprites
Implemented crude crafting

Debug messages are still inside, pushing only cozx pete asked me to

Conflicts:
	code/_globalvars/lists/objects.dm
	code/game/objects/structures/tables_racks.dm
Added tools and time handling

Well yeah
Switching cable coils to stacks
Admin requested addition of a global dsay toggle.

Conflicts:
	code/modules/admin/admin_verbs.dm
fix for muting deadme as well.
Merge pull request #2 from ZomgPonies/master

Update
Standardize mutation constants, remove ambiguity, remove non-implemented muts.

Conflicts:
	code/_onclick/click.dm
	code/game/dna/genes/powers.dm
	code/game/machinery/wishgranter.dm
	code/modules/mob/living/carbon/alien/alien.dm
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_movement.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/damage_procs.dm
	code/modules/mob/living/living.dm
	code/modules/power/lighting.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/setup.dm
	maps/RandomZLevels/wildwest.dm
Standardize XRAY.

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	maps/RandomZLevels/wildwest.dm
Compile fixes XRAY
Standardize HULK.

Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/items/weapons/swords_axes_etc.dm