Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements

2019-08-17 23:41:28 -05:00
parent b671384015 13f27c040e
commit 2922f08ef6
35 changed files with 210 additions and 90 deletions
@@ -57,6 +57,7 @@
 	var/antag_rep = 10

 	var/list/mind_traits // Traits added to the mind of the mob assigned this job
+	var/list/blacklisted_quirks		//list of quirk typepaths blacklisted.

 	var/display_order = JOB_DISPLAY_ORDER_DEFAULT

@@ -25,6 +25,8 @@

 	display_order = JOB_DISPLAY_ORDER_CAPTAIN

+	blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/nonviolent, /datum/quirk/insanity)
+
 /datum/job/captain/get_access()
 	return get_all_accesses()