From b869c7d96ee78a2c53b6d9aae318260cbc4326bf Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Wed, 13 Apr 2022 13:55:00 +0000 Subject: [PATCH] Bans some stackable quirk combos (#12722) * more incompatible trait combos * I do like commas * I sort of forgot Linguist is useful for hearing, not speaking * No guns is a stupid trait with an obnoxious amount of overlap --- code/controllers/subsystem/processing/quirks.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index 350cd475d75..9b0e160336a 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -28,7 +28,9 @@ PROCESSING_SUBSYSTEM_DEF(quirks) list("Extrovert", "Introvert"), //SKYRAT EDIT ADDITION BEGIN list("Nerve Stapled", "Pacifist", "Nearsighted"), - list("No Guns", "Chunky Fingers") + list("No Guns", "Chunky Fingers", "Stormtrooper Aim"), + list("Mute", "Social Anxiety"), + list("No Guns", "Pacifist") //SKYRAT EDIT ADDITION END )