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

2022-02-22 17:10:25 -05:00
parent 83a62ace04 de3ea65587
commit 3ea22f97a6
1045 changed files with 68632 additions and 58299 deletions
@@ -590,8 +590,8 @@
 	var/list/all_teams = list()
 	var/list/all_antagonists = list()

-	// for(var/datum/team/A in GLOB.antagonist_teams)
-	// 	all_teams |= A
+	for(var/datum/team/A in GLOB.antagonist_teams)
+		all_teams |= A

 	for(var/datum/antagonist/A in GLOB.antagonists)
 		if(!A.owner)