Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum

# Conflicts:
#	icons/mob/clothing/mask.dmi

code/game/gamemodes/bloodsucker/bloodsucker.dm

@@ -24,6 +24,7 @@
 	traitor_name = "Bloodsucker"
 	antag_flag = ROLE_BLOODSUCKER
 	false_report_weight = 1
+	chaos = 4
 	restricted_jobs = list("AI","Cyborg")
 	protected_jobs = list("Chaplain", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
 	required_players = 20
@@ -87,7 +88,7 @@
 // Init Sunlight (called from datum_bloodsucker.on_gain(), in case game mode isn't even Bloodsucker
 /datum/game_mode/proc/check_start_sunlight()
 	// Already Sunlight (and not about to cancel)
-	if(istype(bloodsucker_sunlight) && !bloodsucker_sunlight.cancel_me)
+	if(istype(bloodsucker_sunlight))
 		return
 	bloodsucker_sunlight = new ()
 
@@ -97,7 +98,6 @@
 	if(!istype(bloodsucker_sunlight))
 		return
 	if(bloodsuckers.len <= 0)
-		bloodsucker_sunlight.cancel_me = TRUE
 		qdel(bloodsucker_sunlight)
 		bloodsucker_sunlight = null
 

code/game/gamemodes/brother/traitor_bro.dm

@@ -6,6 +6,7 @@
 	name = "traitor+brothers"
 	config_tag = "traitorbro"
 	required_players = 25
+	chaos = 5
 	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")
 

code/game/gamemodes/changeling/changeling.dm

@@ -10,6 +10,7 @@ GLOBAL_VAR(changeling_team_objective_type) //If this is not null, we hand our th
 	config_tag = "changeling"
 	antag_flag = ROLE_CHANGELING
 	false_report_weight = 10
+	chaos = 5
 	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")	//citadel change - adds HoP, CE, CMO, and RD to ling role blacklist
 	required_players = 15

code/game/gamemodes/changeling/traitor_chan.dm

@@ -2,6 +2,7 @@
 	name = "traitor+changeling"
 	config_tag = "traitorchan"
 	false_report_weight = 10
+	chaos = 6
 	traitors_possible = 3 //hard limit on traitors if scaling is turned off
 	restricted_jobs = list("AI", "Cyborg")
 	required_players = 25

code/game/gamemodes/clock_cult/clock_cult.dm

@@ -134,6 +134,7 @@ Credit where due:
 	config_tag = "clockwork_cult"
 	antag_flag = ROLE_SERVANT_OF_RATVAR
 	false_report_weight = 10
+	chaos = 8
 	required_players = 24 //Fixing this directly for now since apparently config machine for forcing modes broke.
 	required_enemies = 3
 	recommended_enemies = 5

code/game/gamemodes/clown_ops/clown_ops.dm

@@ -1,7 +1,7 @@
 /datum/game_mode/nuclear/clown_ops
 	name = "clown ops"
 	config_tag = "clownops"
-
+	chaos = 8
 	announce_span = "danger"
 	announce_text = "Clown empire forces are approaching the station in an attempt to HONK it!\n\
 	<span class='danger'>Operatives</span>: Secure the nuclear authentication disk and use your bananium fission explosive to HONK the station.\n\

code/game/gamemodes/cult/cult.dm

@@ -38,6 +38,7 @@
 	config_tag = "cult"
 	antag_flag = ROLE_CULTIST
 	false_report_weight = 10
+	chaos = 8
 	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 = 30

code/game/gamemodes/devil/devil agent/devil_agent.dm

@@ -1,6 +1,7 @@
 /datum/game_mode/devil/devil_agents
 	name = "Devil Agents"
 	config_tag = "devil_agents"
+	chaos = 5
 	required_players = 25
 	required_enemies = 3
 	recommended_enemies = 8

code/game/gamemodes/devil/devil_game_mode.dm

@@ -3,6 +3,7 @@
 	config_tag = "devil"
 	antag_flag = ROLE_DEVIL
 	false_report_weight = 1
+	chaos = 3
 	protected_jobs = list("Lawyer", "Curator", "Chaplain", "Head of Security", "Captain", "AI")
 	required_players = 0
 	required_enemies = 1

code/game/gamemodes/dynamic/dynamic_rulesets.dm

@@ -106,6 +106,7 @@
 			for(var/i in 1 to 3)
 				if(config_tag in saved_dynamic_rules[i])
 					weight_mult -= (repeated_mode_adjust[i]/100)
+	weight_mult = max(0,weight_mult)
 	if(config_tag in costs)
 		cost = costs[config_tag]
 	if(config_tag in requirementses)

code/game/gamemodes/eldritch_cult/eldritch_cult.dm

@@ -3,6 +3,7 @@
 	config_tag = "heresy"
 	antag_flag = ROLE_HERETIC
 	false_report_weight = 5
+	chaos = 5
 	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")	//citadel change - adds HoP, CE, CMO, and RD to heretic role blacklist
 	required_players = 15

code/game/gamemodes/extended/extended.dm

@@ -3,6 +3,7 @@
 	config_tag = "secret_extended"
 	false_report_weight = 5
 	required_players = 0
+	chaos = 0
 
 	announce_span = "notice"
 	announce_text = "Just have fun and enjoy the game!"

code/game/gamemodes/game_mode.dm

@@ -17,6 +17,7 @@
 	var/config_tag = null
 	var/votable = 1
 	var/probability = 0
+	var/chaos = 5 // 0-9, used for weighting round-to-round
 	var/false_report_weight = 0 //How often will this show up incorrectly in a centcom report?
 	var/station_was_nuked = 0 //see nuclearbomb.dm and malfunction.dm
 	var/nuke_off_station = 0 //Used for tracking where the nuke hit
@@ -81,30 +82,43 @@
 
 ///Everyone should now be on the station and have their normal gear.  This is the place to give the special roles extra things
 /datum/game_mode/proc/post_setup(report) //Gamemodes can override the intercept report. Passing TRUE as the argument will force a report.
-	//finalize_monster_hunters() Disabled for now
 	if(!report)
 		report = !CONFIG_GET(flag/no_intercept_report)
 	addtimer(CALLBACK(GLOBAL_PROC, .proc/display_roundstart_logout_report), ROUNDSTART_LOGOUT_REPORT_TIME)
 
-	if(prob(20)) //CIT CHANGE - adds a 20% chance for the security level to be the opposite of what it normally is
+	if(prob(20)) //cit-change
 		flipseclevel = TRUE
+
+	// if(CONFIG_GET(flag/reopen_roundstart_suicide_roles))
+	// 	var/delay = CONFIG_GET(number/reopen_roundstart_suicide_roles_delay)
+	// 	if(delay)
+	// 		delay = (delay SECONDS)
+	// 	else
+	// 		delay = (4 MINUTES) //default to 4 minutes if the delay isn't defined.
+	// 	addtimer(CALLBACK(GLOBAL_PROC, .proc/reopen_roundstart_suicide_roles), delay)
+
 	if(SSdbcore.Connect())
-		var/sql
+		var/list/to_set = list()
+		var/arguments = list()
 		if(SSticker.mode)
-			sql += "game_mode = '[SSticker.mode]'"
+			to_set += "game_mode = :game_mode"
+			arguments["game_mode"] = SSticker.mode
 		if(GLOB.revdata.originmastercommit)
-			if(sql)
-				sql += ", "
-			sql += "commit_hash = '[GLOB.revdata.originmastercommit]'"
-		if(sql)
-			var/datum/DBQuery/query_round_game_mode = SSdbcore.NewQuery("UPDATE [format_table_name("round")] SET [sql] WHERE id = [GLOB.round_id]")
+			to_set += "commit_hash = :commit_hash"
+			arguments["commit_hash"] = GLOB.revdata.originmastercommit
+		if(to_set.len)
+			arguments["round_id"] = GLOB.round_id
+			var/datum/db_query/query_round_game_mode = SSdbcore.NewQuery(
+				"UPDATE [format_table_name("round")] SET [to_set.Join(", ")] WHERE id = :round_id",
+				arguments
+			)
 			query_round_game_mode.Execute()
 			qdel(query_round_game_mode)
 	if(report)
 		addtimer(CALLBACK(src, .proc/send_intercept, 0), rand(waittime_l, waittime_h))
 	generate_station_goals()
 	gamemode_ready = TRUE
-	return 1
+	return TRUE
 
 
 ///Handles late-join antag assignments
@@ -610,3 +624,10 @@
 /// Mode specific info for ghost game_info
 /datum/game_mode/proc/ghost_info()
 	return
+
+/datum/game_mode/proc/get_chaos()
+	var/chaos_levels = CONFIG_GET(keyed_list/chaos_level)
+	if(config_tag in chaos_levels)
+		return chaos_levels[config_tag]
+	else
+		return chaos

code/game/gamemodes/gangs/gangs.dm

@@ -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

code/game/gamemodes/meteor/meteor.dm

@@ -2,6 +2,7 @@
 	name = "meteor"
 	config_tag = "meteor"
 	false_report_weight = 1
+	chaos = 9
 	var/meteordelay = 2000
 	var/nometeors = 0
 	var/rampupdelta = 5

code/game/gamemodes/meteor/meteors.dm

@@ -1,4 +1,6 @@
 #define DEFAULT_METEOR_LIFETIME 1800
+#define MAP_EDGE_PAD 5
+
 GLOBAL_VAR_INIT(meteor_wave_delay, 625) //minimum wait between waves in tenths of seconds
 //set to at least 100 unless you want evarr ruining every round
 
@@ -30,7 +32,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
 	var/turf/pickedgoal
 	var/max_i = 10//number of tries to spawn meteor.
 	while(!isspaceturf(pickedstart))
-		var/startSide = dir || pick(GLOB.cardinals)
+		var/startSide = (dir ? dir : pick(GLOB.cardinals))
 		var/startZ = pick(SSmapping.levels_by_trait(ZTRAIT_STATION))
 		pickedstart = spaceDebrisStartLoc(startSide, startZ)
 		pickedgoal = spaceDebrisFinishLoc(startSide, startZ)
@@ -46,17 +48,17 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
 	var/startx
 	switch(startSide)
 		if(NORTH)
-			starty = world.maxy-(TRANSITIONEDGE+2)
-			startx = rand((TRANSITIONEDGE+2), world.maxx-(TRANSITIONEDGE+2))
+			starty = world.maxy-(TRANSITIONEDGE + MAP_EDGE_PAD)
+			startx = rand((TRANSITIONEDGE + MAP_EDGE_PAD), world.maxx-(TRANSITIONEDGE + MAP_EDGE_PAD))
 		if(EAST)
-			starty = rand((TRANSITIONEDGE+2),world.maxy-(TRANSITIONEDGE+2))
-			startx = world.maxx-(TRANSITIONEDGE+2)
+			starty = rand((TRANSITIONEDGE + MAP_EDGE_PAD),world.maxy-(TRANSITIONEDGE + MAP_EDGE_PAD))
+			startx = world.maxx-(TRANSITIONEDGE + MAP_EDGE_PAD)
 		if(SOUTH)
-			starty = (TRANSITIONEDGE+2)
-			startx = rand((TRANSITIONEDGE+2), world.maxx-(TRANSITIONEDGE+2))
+			starty = (TRANSITIONEDGE + MAP_EDGE_PAD)
+			startx = rand((TRANSITIONEDGE + MAP_EDGE_PAD), world.maxx-(TRANSITIONEDGE + MAP_EDGE_PAD))
 		if(WEST)
-			starty = rand((TRANSITIONEDGE+2), world.maxy-(TRANSITIONEDGE+2))
-			startx = (TRANSITIONEDGE+2)
+			starty = rand((TRANSITIONEDGE + MAP_EDGE_PAD), world.maxy-(TRANSITIONEDGE + MAP_EDGE_PAD))
+			startx = (TRANSITIONEDGE + MAP_EDGE_PAD)
 	. = locate(startx, starty, Z)
 
 /proc/spaceDebrisFinishLoc(startSide, Z)
@@ -64,17 +66,17 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
 	var/endx
 	switch(startSide)
 		if(NORTH)
-			endy = (TRANSITIONEDGE+1)
-			endx = rand((TRANSITIONEDGE+1), world.maxx-(TRANSITIONEDGE+1))
+			endy = (TRANSITIONEDGE + MAP_EDGE_PAD)
+			endx = rand((TRANSITIONEDGE + MAP_EDGE_PAD), world.maxx-(TRANSITIONEDGE + MAP_EDGE_PAD))
 		if(EAST)
-			endy = rand((TRANSITIONEDGE+1), world.maxy-(TRANSITIONEDGE+1))
-			endx = (TRANSITIONEDGE+1)
+			endy = rand((TRANSITIONEDGE + MAP_EDGE_PAD), world.maxy-(TRANSITIONEDGE + MAP_EDGE_PAD))
+			endx = (TRANSITIONEDGE + MAP_EDGE_PAD)
 		if(SOUTH)
-			endy = world.maxy-(TRANSITIONEDGE+1)
-			endx = rand((TRANSITIONEDGE+1), world.maxx-(TRANSITIONEDGE+1))
+			endy = world.maxy-(TRANSITIONEDGE + MAP_EDGE_PAD)
+			endx = rand((TRANSITIONEDGE + MAP_EDGE_PAD), world.maxx-(TRANSITIONEDGE + MAP_EDGE_PAD))
 		if(WEST)
-			endy = rand((TRANSITIONEDGE+1),world.maxy-(TRANSITIONEDGE+1))
-			endx = world.maxx-(TRANSITIONEDGE+1)
+			endy = rand((TRANSITIONEDGE + MAP_EDGE_PAD),world.maxy-(TRANSITIONEDGE + MAP_EDGE_PAD))
+			endx = world.maxx-(TRANSITIONEDGE + MAP_EDGE_PAD)
 	. = locate(endx, endy, Z)
 
 ///////////////////////
@@ -82,7 +84,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
 //////////////////////
 
 /obj/effect/meteor
-	name = "the concept of meteor"
+	name = "\proper the concept of meteor"
 	desc = "You should probably run instead of gawking at this."
 	icon = 'icons/obj/meteor.dmi'
 	icon_state = "small"
@@ -92,7 +94,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
 	var/hitpwr = 2 //Level of ex_act to be called on hit.
 	var/dest
 	pass_flags = PASSTABLE
-	var/heavy = 0
+	var/heavy = FALSE
 	var/meteorsound = 'sound/effects/meteorimpact.ogg'
 	var/z_original
 	var/threat = 0 // used for determining which meteors are most interesting
@@ -108,12 +110,12 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
 
 	. = ..() //process movement...
 
+	var/turf/T = get_turf(loc)
 	if(.)//.. if did move, ram the turf we get in
-		var/turf/T = get_turf(loc)
 		ram_turf(T)
 
-		if(prob(10) && !isspaceturf(T) && !istype(T, /turf/closed/mineral) && !istype(T, /turf/open/floor/plating/asteroid))//randomly takes a 'hit' from ramming
-			get_hit()
+	if(prob(10) && !isspaceturf(T) && !istype(T, /turf/closed/mineral) && !istype(T, /turf/open/floor/plating/asteroid))//randomly takes a 'hit' from ramming, and ignore spare ruin aseroids
+		get_hit()
 
 /obj/effect/meteor/Destroy()
 	if (timerid)
@@ -135,24 +137,25 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
 /obj/effect/meteor/Bump(atom/A)
 	if(A)
 		ram_turf(get_turf(A))
-		playsound(src.loc, meteorsound, 40, 1)
-		if(!istype(A, /turf/closed/mineral) && !istype(A, /turf/open/floor/plating/asteroid))
+		playsound(src.loc, meteorsound, 40, TRUE)
+		if(!istype(A, /turf/closed/mineral) && !istype(A, /turf/open/floor/plating/asteroid)) // ignore localstation ruins
 			get_hit()
 
 /obj/effect/meteor/proc/ram_turf(turf/T)
 	//first bust whatever is in the turf
-	for(var/atom/A in T)
-		if(A != src)
-			if(isliving(A))
-				A.visible_message("<span class='warning'>[src] slams into [A].</span>", "<span class='userdanger'>[src] slams into you!.</span>")
-			A.ex_act(hitpwr)
+	for(var/thing in T)
+		if(thing == src)
+			continue
+		if(isliving(thing))
+			var/mob/living/living_thing = thing
+			living_thing.visible_message("<span class='warning'>[src] slams into [living_thing].</span>", "<span class='userdanger'>[src] slams into you!.</span>")
+			living_thing.ex_act(hitpwr)
 
 	//then, ram the turf if it still exists
 	if(T)
 		T.ex_act(hitpwr)
 
 
-
 //process getting 'hit' by colliding with a dense object
 //or randomly when ramming turfs
 /obj/effect/meteor/proc/get_hit()
@@ -162,13 +165,10 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
 		meteor_effect()
 		qdel(src)
 
-/obj/effect/meteor/ex_act()
-	return
-
 /obj/effect/meteor/examine(mob/user)
+	. = ..()
 	if(!(flags_1 & ADMIN_SPAWNED_1) && isliving(user))
-		SSmedals.UnlockMedal(MEDAL_METEOR, user.client)
-	return ..()
+		user.client.give_award(/datum/award/achievement/misc/meteor_examine, user)
 
 /obj/effect/meteor/attackby(obj/item/I, mob/user, params)
 	if(I.tool_behaviour == TOOL_MINING)
@@ -232,7 +232,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
 	name = "big meteor"
 	icon_state = "large"
 	hits = 6
-	heavy = 1
+	heavy = TRUE
 	dropamt = 4
 	threat = 10
 
@@ -245,7 +245,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
 	name = "flaming meteor"
 	icon_state = "flaming"
 	hits = 5
-	heavy = 1
+	heavy = TRUE
 	meteorsound = 'sound/effects/bamf.ogg'
 	meteordrop = list(/obj/item/stack/ore/plasma)
 	threat = 20
@@ -258,7 +258,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
 /obj/effect/meteor/irradiated
 	name = "glowing meteor"
 	icon_state = "glowing"
-	heavy = 1
+	heavy = TRUE
 	meteordrop = list(/obj/item/stack/ore/uranium)
 	threat = 15
 
@@ -275,7 +275,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
 	icon_state = "meateor"
 	desc = "Just... don't think too hard about where this thing came from."
 	hits = 2
-	heavy = 1
+	heavy = TRUE
 	meteorsound = 'sound/effects/blobattack.ogg'
 	meteordrop = list(/obj/item/reagent_containers/food/snacks/meat/slab/human, /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant, /obj/item/organ/heart, /obj/item/organ/lungs, /obj/item/organ/tongue, /obj/item/organ/appendix/)
 	var/meteorgibs = /obj/effect/gibspawner/generic
@@ -327,7 +327,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
 	desc = "Your life briefly passes before your eyes the moment you lay them on this monstrosity."
 	hits = 30
 	hitpwr = 1
-	heavy = 1
+	heavy = TRUE
 	meteorsound = 'sound/effects/bamf.ogg'
 	meteordrop = list(/obj/item/stack/ore/plasma)
 	threat = 50
@@ -358,7 +358,7 @@ GLOBAL_LIST_INIT(meteorsSPOOKY, list(/obj/effect/meteor/pumpkin))
 	icon = 'icons/obj/meteor_spooky.dmi'
 	icon_state = "pumpkin"
 	hits = 10
-	heavy = 1
+	heavy = TRUE
 	dropamt = 1
 	meteordrop = list(/obj/item/clothing/head/hardhat/pumpkinhead, /obj/item/reagent_containers/food/snacks/grown/pumpkin)
 	threat = 100
@@ -368,3 +368,4 @@ GLOBAL_LIST_INIT(meteorsSPOOKY, list(/obj/effect/meteor/pumpkin))
 	meteorsound = pick('sound/hallucinations/im_here1.ogg','sound/hallucinations/im_here2.ogg')
 //////////////////////////
 #undef DEFAULT_METEOR_LIFETIME
+#undef MAP_EDGE_PAD

code/game/gamemodes/monkey/monkey.dm

@@ -11,6 +11,7 @@
 	required_players = 20
 	required_enemies = 1
 	recommended_enemies = 1
+	chaos = 9
 
 	restricted_jobs = list("Cyborg", "AI")
 

code/game/gamemodes/nuclear/nuclear.dm

@@ -2,6 +2,7 @@
 	name = "nuclear emergency"
 	config_tag = "nuclear"
 	false_report_weight = 10
+	chaos = 9
 	required_players = 28 // 30 players - 3 players to be the nuke ops = 25 players remaining
 	required_enemies = 2
 	recommended_enemies = 5

code/game/gamemodes/overthrow/overthrow.dm

@@ -3,6 +3,7 @@
 	name = "overthrow"
 	config_tag = "overthrow"
 	antag_flag = ROLE_OVERTHROW
+	chaos = 5
 	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 = 20 // the core idea is of a swift, bloodless coup, so it shouldn't be as chaotic as revs.

code/game/gamemodes/revolution/revolution.dm

@@ -12,6 +12,7 @@
 	config_tag = "revolution"
 	antag_flag = ROLE_REV
 	false_report_weight = 10
+	chaos = 8
 	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 = 20

code/game/gamemodes/traitor/double_agents.dm

@@ -10,6 +10,7 @@
 	required_enemies = 5
 	recommended_enemies = 8
 	reroll_friendly = 0
+	chaos = 7
 	traitor_name = "Nanotrasen Internal Affairs Agent"
 	antag_flag = ROLE_INTERNAL_AFFAIRS
 

code/game/gamemodes/traitor/traitor.dm

@@ -17,6 +17,7 @@
 	recommended_enemies = 4
 	reroll_friendly = 1
 	enemy_minimum_age = 0
+	chaos = 2
 
 	announce_span = "danger"
 	announce_text = "There are Syndicate agents on the station!\n\

code/game/gamemodes/wizard/wizard.dm

@@ -12,6 +12,7 @@
 	recommended_enemies = 1
 	enemy_minimum_age = 7
 	round_ends_with_antag_death = 1
+	chaos = 9
 	announce_span = "danger"
 	announce_text = "There is a space wizard attacking the station!\n\
 	<span class='danger'>Wizard</span>: Accomplish your objectives and cause mayhem on the station.\n\