From 3dbf8138176289eba288b2cb8c9e66efe0a930a4 Mon Sep 17 00:00:00 2001 From: Putnam Date: Tue, 17 Dec 2019 22:34:28 -0800 Subject: [PATCH 1/2] probably fixes only neutral traits existing --- code/controllers/subsystem/processing/quirks.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index f96690126a..683429e9b7 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -63,28 +63,28 @@ PROCESSING_SUBSYSTEM_DEF(quirks) for(var/i in quirk_names) . += quirk_points_by_name(i) -/datum/controller/subsystem/processing/quirks/proc/filter_quirks(list/quirks, datum/job/job) +/datum/controller/subsystem/processing/quirks/proc/filter_quirks(list/our_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 + var/list/blacklisted = our_quirks & banned_names if(length(blacklisted)) for(var/i in blacklisted) - quirks -= i + our_quirks -= i cut += i /* //Code to automatically reduce positive quirks until balance is even. - var/points_used = total_points(quirks) + var/points_used = total_points(our_quirks) if(points_used > 0) //they owe us points, let's collect. - for(var/i in quirks) + for(var/i in our_quirks) var/points = quirk_points_by_name(i) if(points > 0) cut += i - quirks -= i + our_quirks -= i points_used -= points if(points_used <= 0) break @@ -92,9 +92,9 @@ PROCESSING_SUBSYSTEM_DEF(quirks) //Nah, let's null all non-neutrals out. if(cut.len) - for(var/i in quirks) + for(var/i in our_quirks) if(quirk_points_by_name(i) != 0) //cut += i -- Commented out: Only show the ones that triggered the quirk purge. - quirks -= i + our_quirks -= i return cut From 5ec5650c6ff49606840f9c76c56edb19af1e474c Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 18 Dec 2019 00:41:44 -0600 Subject: [PATCH 2/2] Automatic changelog generation for PR #10227 [ci skip] --- html/changelogs/AutoChangeLog-pr-10227.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10227.yml diff --git a/html/changelogs/AutoChangeLog-pr-10227.yml b/html/changelogs/AutoChangeLog-pr-10227.yml new file mode 100644 index 0000000000..5d9446d045 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10227.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - bugfix: "whoops broke quirks"