Inflatable barrier boxes readded to engineering. Inflatable barriers can no longer be deflated by ghosts.

Conflicts:
	maps/tgstation2.dmm
Crash fix attempt:  Moving NanoUI resource file sending away from client/New()

it's going in mob/Login() instead.

Conflicts:
	code/modules/client/client procs.dm
	code/modules/mob/login.dm
turfs: fix some playsound ERRORs on areas

Turf (de)construction playsound()s were using src.loc, instead of src

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/turfs/simulated.dm
	code/game/turfs/simulated/floor.dm
Fixed IPC getting high from smokables
fix for IPCs taking rad damage.

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
fix for https://github.com/Baystation12/Baystation12/issues/4548
Fixes for Mloc, part 2.

Conflicts:
	code/game/objects/items/weapons/cigs_lighters.dm
Fixes cyborg laser + emp problem
Fixes sprites for ion rifle
final stuff

Conflicts:
	code/modules/projectiles/guns/energy/special.dm
	icons/mob/back.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
Male VOX.

Conflicts:
	tools/vox/announcements.txt
	tools/vox/create.py
	tools/vox/lexicon.txt
	tools/vox/voxwords.txt
Object pool the sparks.

Conflicts:
	code/game/objects/effects/effect_system.dm
human: move organ generation into a species proc

New proc: /datum/species/create_organs
Called in set_species when no organs exist or it's forced.
Also shuffled set_species around a bit, adding a var to human/new to
specify a species to start as.
Should fix the adminspawn vox organ runtime.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/organs/organ.dm
Update with some bay optimizations for mobs.

Conflicts:
	code/defines/obj.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/organs/blood.dm
	code/modules/organs/organ.dm
	code/modules/organs/organ_external.dm
	code/setup.dm
	compare_report.txt
Merge pull request #108 from ZomgPonies/master

29/04/14