[MERGED PR] Merges mechanics with engineer

[Lord_earthfire]

I think we will see now that it is merged. Personally i hope this will turn more engineers into "yellow staffies", with the few that actually enjoy the engine being there to take care of the engine. but now the whole thing is left to even more to chance than it already was. Differentiation has its purpose.