Males are cloned with a full beard.
-Replaces the holodeck boxing ring that no longer works with a dodgeball arena. Adds dodgeball sprites and defines.
-Fixes the crew monitoring console disappearing when damaged (meant to do this before but the change didn't go through somehow)
-Readds the space piano, removes the useless /device subtype from its path.

-Makes tables use a less hardcoded method to determine iconstate.
Merge branch 'master' of https://github.com/tgstation/-tg-station into Master
-Adds the dodgeball sound effect.
-Adds a two-headed coin to maintenance.
-Adds the RD's plant to his office.
-Adds lightswitch to hydroponics back room.
Merge branch 'master' of https://github.com/tgstation/-tg-station into Master

Conflicts:
	maps/tgstation.2.1.2.dmm
-Updating my map. Used the tool thing. It's pretty neat. I think I did it right??
Changed the health check for crit in life.dm for humans, monkeys, and aliens from < 0 to <= 0.

Fixes that weird issue where people can take 5 laser hits to the face and still run around at 0 health until someone sneezes on them or they stub their toe.
fixed the changelog... could've sworn I pressed reload
removed changelog.html

Well I thought it was game changing :(
Fixes the bug where clown stamps were usable by anyone, they just didn't affect the sprite.
Also made the stamp check for clumsiness instead of mind.assigned_role.
Changed all crit checks from static zeros to config.health_threshold_crit
Merge branch 'master' of https://github.com/tgstation/-tg-station into Master
Merge pull request #518 from Malkevin/rasputin

Changed the critical heath check to <=0
Merge pull request #484 from Ikarrus/clonebeard

Bearded Clones
Merge pull request #521 from Rolan7/ClownstampBugfix

Fixes the bug where clown stamps were usable by anyone
Merge branch 'master' of https://github.com/tgstation/-tg-station into Master
updating my dme
Fixed a bug that prevented Parrots from using the supply channel.
New datums for AI Lawsets: Paladin, Tryant, Corporate

New AIs have a 5% chance of having the Paladin, Tryant, Corporate, or Robocop lawset.
Merge branch 'master' of https://github.com/AndroidSFV/UMcS