Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Changed machine frame to automatically generated required component description and to update the amounts as components are added.
Fixed the pinpointer ignoring z-level changes and directing the user to a nonsense location if the disk is on a different z-level
Fixed the robot sight modules, eg mesons not clearing on death.
Fixed cablecoil not updating user mob at all and added a give() proc to more standardly give coils more and cleaned up coil joining
Re-enabled bag item count thing
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	code/modules/power/cable.dm
Merge pull request #383 from Tastyfish/master

Machine frames, pinpointers, borgs, etc