Merge remote-tracking branch 'origin/master' into perlin-genny

2021-03-20 20:36:56 +08:00
parent 2fe6125955 cd20cb85dc
commit 292f67e098
267 changed files with 109865 additions and 107683 deletions
@@ -6,6 +6,7 @@ GLOBAL_LIST_EMPTY(gangs)
 	name = "gang war"
 	config_tag = "gang"
 	antag_flag = ROLE_GANG
+	chaos = 9
 	restricted_jobs = list("AI", "Cyborg")
 	protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
 	required_players = 15