From f4a62d1780669caad32ca1784b9502b71c66b830 Mon Sep 17 00:00:00 2001
From: Mickyan <38563876+Mickyan@users.noreply.github.com>
Date: Tue, 27 Nov 2018 02:32:44 +0100
Subject: [PATCH] Blacklists some incompatible quirks (#41669)

cl Mickyan
fix: Certain incompatible quirks can no longer be taken together
/cl

Fixes #37669
---
 code/controllers/subsystem/processing/quirks.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm
index 5f5972bed35..7f0ee25e7cc 100644
--- a/code/controllers/subsystem/processing/quirks.dm
+++ b/code/controllers/subsystem/processing/quirks.dm
@@ -16,7 +16,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 /datum/controller/subsystem/processing/quirks/Initialize(timeofday)
 	if(!quirks.len)
 		SetupQuirks()
-	quirk_blacklist = list(list("Blind","Nearsighted"))
+	quirk_blacklist = list(list("Blind","Nearsighted"),list("Jolly","Depression","Apathetic"),list("Ageusia","Deviant Tastes"),list("Ananas Affinity","Ananas Aversion"))
 	return ..()
 
 /datum/controller/subsystem/processing/quirks/proc/SetupQuirks()