assistant limit tweak
Should fix being retarded outing you as a ling
compile fix
fix conveyer switches
Fix conveyor switch building.
Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge

Conflicts:
	code/modules/assembly/signaler.dm
Use u_equip instead of the if-tree when building conveyor switches.
Rearrange engineering, add TEG, cold loop.
hurp
Allow guns again on sandbox, while still banning the most griffable shit.
Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge
Screw around with gene logic.
test
Fixes the ryetalin part of #322
Shut off the spawn messages to adminirc.
Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge
Fix telecomms.
Remove cPickle, doesn't work well with python3 and we don't need something that speedy for a goddamn chatbot.
Rearrange argument specification for ircbot.  Maybe it'll work betterer on Windows.
Mess around with the map a bit.