t

code/controllers/subsystem/processing/quirks.dm

@@ -9,6 +9,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 	runlevels = RUNLEVEL_GAME
 
 	var/list/quirks = list()		//Assoc. list of all roundstart quirk datum types; "name" = /path/
+	var/list/quirk_names_by_path = list()
 	var/list/quirk_points = list()	//Assoc. list of quirk names and their "point cost"; positive numbers are good traits, and negative ones are bad
 	var/list/quirk_objects = list()	//A list of all quirk objects in the game, since some may process
 
@@ -22,11 +23,57 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 		var/datum/quirk/T = V
 		quirks[initial(T.name)] = T
 		quirk_points[initial(T.name)] = initial(T.value)
+		quirk_names_by_path[T] = initial(T.name)
 
-/datum/controller/subsystem/processing/quirks/proc/AssignQuirks(mob/living/user, client/cli, spawn_effects)
+/datum/controller/subsystem/processing/quirks/proc/AssignQuirks(mob/living/user, client/cli, spawn_effects, roundstart = FALSE, datum/job/job, silent = FALSE)
 	GenerateQuirks(cli)
-	for(var/V in cli.prefs.character_quirks)
+	var/list/quirks = cli.prefs.character_quirks.Copy()
+	var/list/cut
+	if(job && job.blacklisted_quirks)
+		cut = filter_quirks(quirks, job)
+	for(var/V in quirks)
 		user.add_quirk(V, spawn_effects)
+	if(!silent)
+		to_chat(user, "<span class='boldwarning'>The following quirks were cut during assignment either due to a job restriction or another reason: [english_list(cut)].</span>")
+
+/datum/controller/subsystem/processing/quirks/proc/quirk_path_by_name(name)
+	return quirks[name]
+
+/datum/controller/subsystem/processing/quirks/proc/quirk_points_by_name(name)
+	return quirk_points[name]
+
+/datum/controller/subsystem/processing/quirks/proc/quirk_name_by_path(path)
+	return quirk_names_by_path[path]
+
+/datum/controller/subsystem/processing/quirks/proc/total_points(list/quirk_names)
+	. = 0
+	for(var/i in quirk_names)
+		. += quirk_points_by_name(i)
+
+/datum/controller/subsystem/processing/quirks/proc/filter_quirks(list/quirks, datum/job/job)
+	var/list/cut = list()
+	var/list/banned_names = list()
+	for(var/i in job.blacklisted_quirks)
+		var/name = quirk_name_by_path(i)
+		if(name)
+			banned_names += name
+	var/list/blacklisted = quirks & banned_names
+	if(length(blacklisted))
+		for(var/i in blacklisted)
+			quirks -= i
+			cut += i
+	var/points_used = total_points(quirks)
+	if(points_used > 0)
+		//they owe us points, let's collect.
+		for(var/i in quirks)
+			var/points = quirk_points_by_name(i)
+			if(points > 0)
+				cut += i
+				quirks -= i
+				points_used -= points
+			if(points_used <= 0)
+				break
+	return cut
 
 /datum/controller/subsystem/processing/quirks/proc/GenerateQuirks(client/user)
 	if(user.prefs.character_quirks.len)

code/datums/traits/_quirk.dm

@@ -13,7 +13,6 @@
 	var/mob/living/quirk_holder
 
 /datum/quirk/New(mob/living/quirk_mob, spawn_effects)
-	..()
 	if(!quirk_mob || (human_only && !ishuman(quirk_mob)) || quirk_mob.has_quirk(type))
 		qdel(src)
 	quirk_holder = quirk_mob

code/modules/jobs/job_types/captain.dm

@@ -21,6 +21,8 @@ Captain
 	access = list() 			//See get_access()
 	minimal_access = list() 	//See get_access()
 
+	blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems)
+
 /datum/job/captain/get_access()
 	return get_all_accesses()
 
@@ -94,6 +96,7 @@ Head of Personnel
 			            ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_VAULT, ACCESS_MINING_STATION,
 			            ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM)
 
+	blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/insanity)
 
 /datum/outfit/job/hop
 	name = "Head of Personnel"

code/modules/jobs/job_types/cargo_service.dm

@@ -17,6 +17,8 @@ Quartermaster
 	access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_VAULT)
 	minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_VAULT)
 
+	blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems)
+
 /datum/outfit/job/quartermaster
 	name = "Quartermaster"
 	jobtype = /datum/job/qm

code/modules/jobs/job_types/engineering.dm

@@ -29,6 +29,8 @@ Chief Engineer
 			            ACCESS_HEADS, ACCESS_CONSTRUCTION, ACCESS_SEC_DOORS, ACCESS_MINISAT,
 			            ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_MINERAL_STOREROOM)
 
+	blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems)
+
 /datum/outfit/job/ce
 	name = "Chief Engineer"
 	jobtype = /datum/job/chief_engineer

code/modules/jobs/job_types/job.dm

@@ -56,6 +56,8 @@
 
 	var/list/mind_traits // Traits added to the mind of the mob assigned this job
 
+	var/list/blacklisted_quirks		//list of quirk typepaths blacklisted.
+
 //Only override this proc
 //H is usually a human unless an /equip override transformed it
 /datum/job/proc/after_spawn(mob/living/H, mob/M, latejoin = FALSE)

code/modules/jobs/job_types/medical.dm

@@ -27,6 +27,8 @@ Chief Medical Officer
 			ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_SURGERY, ACCESS_RC_ANNOUNCE,
 			ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS)
 
+	blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems)
+
 /datum/outfit/job/cmo
 	name = "Chief Medical Officer"
 	jobtype = /datum/job/cmo

code/modules/jobs/job_types/science.dm

@@ -31,6 +31,8 @@ Research Director
 			            ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM,
 			            ACCESS_TECH_STORAGE, ACCESS_MINISAT, ACCESS_MAINT_TUNNELS, ACCESS_NETWORK)
 
+	blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems)
+
 /datum/outfit/job/rd
 	name = "Research Director"
 	jobtype = /datum/job/rd

code/modules/jobs/job_types/security.dm

@@ -37,6 +37,8 @@ Head of Security
 
 	mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM)
 
+	blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/nonviolent)
+
 /datum/outfit/job/hos
 	name = "Head of Security"
 	jobtype = /datum/job/hos

code/modules/mob/dead/new_player/new_player.dm

@@ -416,7 +416,7 @@
 						SSticker.mode.make_antag_chance(humanc)
 
 	if(humanc && CONFIG_GET(flag/roundstart_traits))
-		SSquirks.AssignQuirks(humanc, humanc.client, TRUE)
+		SSquirks.AssignQuirks(humanc, humanc.client, TRUE, TRUE, job)
 
 	log_manifest(character.mind.key,character.mind,character,latejoin = TRUE)