Mercs now start with weapons in their inventory#110

Merged

Cervator merged 3 commits intoMovingBlocks:developfrom JGelfand:develop

Aug 27, 2016

+8-3

Commits on Aug 26, 2016

Mercs now spawn with items

Joseph G
authored and
Joseph G
committed
Merge branch 'develop' of https://github.com/JGelfand/DestinationSol.git into develop

Joseph G
authored and
Joseph G
committed
Inserted placeholder for mer equip stuff

Joseph G
authored and
Joseph G
committed