Remie Richards b1ff6b7220 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams ...

Conflicts:
	code/game/turfs/simulated/floor/light_floor.dm

2015-02-24 22:16:53 +00:00

..

robot_items.dm

This fixes the message issues

2014-08-22 01:15:13 +02:00

robot_parts.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

robot_upgrades.dm

borg updates

2015-02-14 17:38:17 -08:00