Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Hydroponics Plant Size Scaling!

Plants now get resized, based on their potency!
(Except for logs and sunflowers because they're snowflakes)

screenshot:
http://puu.sh/5iJws.png
Adds an alt RD uniform to the code
adds the uniform to the RDs locker, and updates the sprites.
Updates to the mob sprites
Sprite Changes on request from Nienhaus
Jesus Christ it compiles
Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-deadlyboolets

Conflicts:
	code/modules/projectiles/guns/magic/wand.dm
Scattershot ho!
Syringe guns can suck it.
Morgue Changes

Crematorium lights up when cooking.
Morgue slabs change light color depending on what is inside.
Red = dead body, orange = no body but items, green = client connected
body.
Updates when open or closed, and when ghosts/re-enters body inside.
[MAP] Adds Syndicate Borgs

Nuclear Operatives can now order a Syndicate Borg for 20TC. After
spawned, a candidate from ghosts is chosen to control it.
It has a 25k cell and the following modules:
-Emag
-Esword
-Ebow
-Laser Rifle
-Jetpack

All weapons use 100 charge per shot.

2 borg rechargers have been added to the Syndicate Shuttle for the
Syndieborgs to use.
Changelog will be added in a separate commit.
Genocide of the Colons
Whoops
fixes the merging failure

hopefully that's it
move along people, nothing to see here
reverts another merging failure
Increases the cost of Syndicate Cyborgs

Now it's 25 TC.
Made the teleporter refundable

Also fixes a missing return