Minor Change, committing before the undertaking
Merge pull request #9 from ZomgPonies/master

Update
Fix smoke
Don't use get_area proc, introduce myArea variable.

Conflicts:
	code/modules/power/power.dm
Because it use less instructions.
experimental getArea() proc.
Declare myArea as an area.
Use the experimental getArea.

Conflicts:
	code/modules/power/power.dm
Revert from area to text.

Conflicts:
	code/modules/power/power.dm
atmos: remove a few force-deletes in merge code

Removes del(giver) from pipeline/merge(), turf/assume_air() and
atom/assume_air().
Thanks to valzargaming on reddit/github for pointing it out.
fixes #4717

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
Let depend on use_power var if we need to know the area.
Enabled action icon for magboots

Conflicts:
	code/modules/clothing/shoes/magboots.dm
Removed the now-redundant verb

Less clutter for the object panel.

Conflicts:
	code/modules/clothing/shoes/magboots.dm
Prevent vox boots from enabling in player's hand

Vox players can't "dig their claws into the flooring" when holding the
boots in their hand. When enabled, the boots can't be taken off until
disabled.
Clean up check for item being equipped

Moved some common code to item.dm. Someone should probably take a look
at get_equipped_items() in inventory.dm sometime in the future.
Events can now strike all areas instead of few select ones
Merge pull request #183 from alex-gh/event_area_rework

Events can now strike all areas instead of few select ones
Say code fixes.

Lobby players won't hear stuffs
Universal hearing with animals won't be a thing.
Players won't hear stuff if they are sleeping, though somethings might slip through...

Conflicts:
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/modules/mob/new_player/new_player.dm
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
Shuttle windows replaced with reskinned reinforced glass windows. Number of doors into cockpit reduced to 1.

Fitness room rearranged to make more sense, with glass around pool.

Conflicts:
	maps/tgstation2.dmm