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
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.
[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.
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
Makes the borg spawner and the contract a subtype of antag_spawner
reorganized the code a bit
now properly
Gives Razharas' icon to the syndieborg

Adds the crowbar and flash module to the syndieborg loadout
Changes the TC_cost variable of the teleporter to update with the
uplink_items TC_cost (thanks for the help Giacom).
It works for humans!
Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-deadlyboolets

Conflicts:
	code/modules/projectiles/guns/magic.dm
Mysterious compile errors gone.