Merge remote-tracking branch 'upstream/master' into lungsss

This commit is contained in:
Fox-McCloud
2017-08-16 19:20:19 -04:00
122 changed files with 1263 additions and 942 deletions
@@ -58,7 +58,7 @@ var/global/sent_syndicate_infiltration_team = 0
infiltrators += candidate
else
to_chat(src, "Polling candidates...")
infiltrators = pollCandidates("Do you want to play as a SYNDICATE INFILTRATOR?") // ROLE_TRAITOR, 7
infiltrators = pollCandidates("Do you want to play as a SYNDICATE INFILTRATOR?", ROLE_TRAITOR, 1)
if(!infiltrators.len)
to_chat(src, "Nobody volunteered.")