From 07c42f980880612be8731d71eefddf358000ebe4 Mon Sep 17 00:00:00 2001
From: FaDeOkno <logkedr18@gmail.com>
Date: Thu, 8 Aug 2024 10:29:17 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B5=D0=BE=D0=B6=D0=B8=D0=B4=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=BD=D0=BE=20=D0=BD=D0=B0=D0=B3=D1=80=D1=8F=D0=BD=D1=83?=
 =?UTF-8?q?=D0=BB=20=D0=B0=D0=BF=D1=81=D1=82=D1=80=D0=B8=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/humanoid-profile-editor.ftl            |  2 +-
 .../Prototypes/ADT/Traits/categories.yml      |  4 ---
 Resources/Prototypes/ADT/Traits/quirks.yml    | 31 ++-----------------
 Resources/Prototypes/Traits/categories.yml    |  1 +
 Resources/Prototypes/Traits/quirks.yml        |  3 ++
 5 files changed, 7 insertions(+), 34 deletions(-)
 delete mode 100644 Resources/Prototypes/ADT/Traits/categories.yml

diff --git a/Resources/Locale/ru-RU/preferences/ui/humanoid-profile-editor.ftl b/Resources/Locale/ru-RU/preferences/ui/humanoid-profile-editor.ftl
index 77f2f665a1e..165f5ce95af 100644
--- a/Resources/Locale/ru-RU/preferences/ui/humanoid-profile-editor.ftl
+++ b/Resources/Locale/ru-RU/preferences/ui/humanoid-profile-editor.ftl
@@ -54,4 +54,4 @@ humanoid-profile-editor-no-traits = Нет доступных черт
 humanoid-profile-editor-trait-count-hint = Доступно очков: [{ $current }/{ $max }]
 trait-category-disabilities = Ограничения
 trait-category-speech = Черты речи
-trait-category-quirks = Причуды
+#trait-category-quirks = Причуды
diff --git a/Resources/Prototypes/ADT/Traits/categories.yml b/Resources/Prototypes/ADT/Traits/categories.yml
deleted file mode 100644
index af7b502fb4f..00000000000
--- a/Resources/Prototypes/ADT/Traits/categories.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: traitCategory
-  id: Quirks
-  name: trait-category-quirks
-  maxTraitPoints: 0
diff --git a/Resources/Prototypes/ADT/Traits/quirks.yml b/Resources/Prototypes/ADT/Traits/quirks.yml
index e35a3c342f5..7ea899d46cc 100644
--- a/Resources/Prototypes/ADT/Traits/quirks.yml
+++ b/Resources/Prototypes/ADT/Traits/quirks.yml
@@ -1,3 +1,4 @@
+# Main
 - type: trait
   id: Blindness
   name: trait-blindness-name
@@ -36,15 +37,6 @@
       durationOfIncident: 10, 30
   cost: -2
 
-- type: trait
-  id: Pacifist
-  name: trait-pacifist-name
-  description: trait-pacifist-desc
-  category: Quirks
-  components:
-    - type: Pacified
-  cost: -2
-
 - type: trait
   id: Unrevivable
   name: trait-unrevivable-name
@@ -66,16 +58,6 @@
     - type: Muted
   cost: -2
 
-- type: trait
-  id: LightweightDrunk
-  name: trait-lightweight-name
-  description: trait-lightweight-desc
-  category: Quirks
-  components:
-    - type: LightweightDrunk
-      boozeStrengthMultiplier: 2
-  cost: -1
-
 - type: trait
   id: Paracusia
   name: trait-paracusia-name
@@ -90,15 +72,6 @@
         collection: Paracusia
   cost: -1
 
-- type: trait
-  id: Snoring
-  name: trait-snoring-name
-  description: trait-snoring-desc
-  category: Quirks
-  components:
-    - type: Snoring
-  cost: -1
-
 # ADT
 
 - type: trait
@@ -158,7 +131,7 @@
       modifier: 1.3
   cost: 2
 
-# Simple Station
+# SimpleStation14
 
 - type: trait
   id: ColorBlindnessMonochrome
diff --git a/Resources/Prototypes/Traits/categories.yml b/Resources/Prototypes/Traits/categories.yml
index d024b3fcff3..0c86fab860a 100644
--- a/Resources/Prototypes/Traits/categories.yml
+++ b/Resources/Prototypes/Traits/categories.yml
@@ -10,3 +10,4 @@
 - type: traitCategory
   id: Quirks
   name: trait-category-quirks
+  maxTraitPoints: 0 # ADT quirks
diff --git a/Resources/Prototypes/Traits/quirks.yml b/Resources/Prototypes/Traits/quirks.yml
index d01bf6218ab..28979dcc23b 100644
--- a/Resources/Prototypes/Traits/quirks.yml
+++ b/Resources/Prototypes/Traits/quirks.yml
@@ -5,6 +5,7 @@
   category: Quirks
   components:
   - type: Pacified
+  cost: -2  # ADT quirks
 
 - type: trait
   id: LightweightDrunk
@@ -14,6 +15,7 @@
   components:
   - type: LightweightDrunk
     boozeStrengthMultiplier: 2
+  cost: -1  # ADT quirks
 
 - type: trait
   id: Snoring
@@ -22,3 +24,4 @@
   category: Quirks
   components:
   - type: Snoring
+  cost: -1  # ADT quirks