Merge pull request #14716 from Putnam3145/fix-blacklisting-traits

Makes species/antag trait blacklist no longer remove ALL traits
This commit is contained in:
silicons
2021-05-22 03:41:57 -06:00
committed by GitHub
2 changed files with 4 additions and 8 deletions
@@ -569,12 +569,10 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
/datum/species/proc/remove_blacklisted_quirks(mob/living/carbon/C)
var/mob/living/L = C.mind?.current
if(istype(L))
var/list/my_quirks = L.client?.prefs.all_quirks.Copy()
SSquirks.filter_quirks(my_quirks, blacklisted_quirks)
for(var/q in L.roundstart_quirks)
var/datum/quirk/Q = q
if(!(SSquirks.quirk_name_by_path(Q.type) in my_quirks))
L.remove_quirk(Q.type)
if(Q.type in blacklisted_quirks)
qdel(Q)
removed_quirks += Q.type
// restore any quirks that we removed