From 352080c2613115b587091df5b7304a20aec22a38 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 7 Oct 2021 14:27:36 +0200 Subject: [PATCH] [MIRROR] Fix quirk blacklist not working [MDB IGNORE] (#8651) * Fix quirk blacklist not working (#61932) * Fix quirk blacklist not working Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> --- code/controllers/subsystem/processing/quirks.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index c5faac40f3c..d6d2f3a9cbc 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -13,11 +13,11 @@ PROCESSING_SUBSYSTEM_DEF(quirks) var/list/quirks = list() //Assoc. list of all roundstart quirk datum types; "name" = /path/ 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_blacklist = list() //A list of quirks that can not be used with each other. Format: list(quirk1,quirk2),list(quirk3,quirk4) ///An assoc list of quirks that can be obtained as a hardcore character, and their hardcore value. var/list/hardcore_quirks = list() - var/static/list/quirks_blacklist = list( + /// A list of quirks that can not be used with each other. Format: list(quirk1,quirk2),list(quirk3,quirk4) + var/static/list/quirk_blacklist = list( list("Blind","Nearsighted"), list("Jolly","Depression","Apathetic","Hypersensitive"), list("Ageusia","Vegetarian","Deviant Tastes"), @@ -149,7 +149,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks) var/list/new_quirks = list() var/list/positive_quirks = list() var/balance = 0 - + var/list/all_quirks = get_quirks() for (var/quirk_name in quirks)