[Fixed] droids can now be called and store in public buildings

Change-Id: Idcd10bcc5a3af1e25a7637a0145b001fda9f3eae
Merge "[Fixed] droids can now be called and store in public buildings" into unstable