From b8bc2e353f8a9f3c682d33dc3d2fb66fc632b679 Mon Sep 17 00:00:00 2001
From: Vigers Ray <vigersray@gmail.com>
Date: Sun, 20 Apr 2025 02:39:58 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=84=D1=80=D0=B0?=
 =?UTF-8?q?=D0=BA=D1=86=D0=B8=D0=B8=20=D0=B4=D1=80=D0=B0=D0=BA=D0=BE=D0=BD?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Prototypes/Entities/Mobs/NPCs/carp.yml    |  2 +-
 .../Entities/Mobs/Player/dragon.yml           |  2 +-
 Resources/Prototypes/_Sunrise/ai_factions.yml |  2 ++
 Resources/Prototypes/ai_factions.yml          | 19 ++++++++++++++++++-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
index a23904b4da..45f3bd9f06 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -15,7 +15,7 @@
           true
     - type: NpcFactionMember
       factions:
-      - Carps
+      - Carps # Sunrise-Edit
     - type: Sprite
       drawdepth: Mobs
       sprite: Mobs/Aliens/Carps/space.rsi
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index 35dd5fd8d0..21d06a48c5 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -32,7 +32,7 @@
         true
   - type: NpcFactionMember
     factions:
-    - Carps
+    - Dragon
   - type: Speech
     speechVerb: LargeMob
   - type: CombatMode
diff --git a/Resources/Prototypes/_Sunrise/ai_factions.yml b/Resources/Prototypes/_Sunrise/ai_factions.yml
index 34adb1bc3d..08f959d8d8 100644
--- a/Resources/Prototypes/_Sunrise/ai_factions.yml
+++ b/Resources/Prototypes/_Sunrise/ai_factions.yml
@@ -34,6 +34,8 @@
 
 - type: npcFaction
   id: Carps
+  friendly:
+  - Dragon
   hostile:
   - NanoTrasen
   - Syndicate
diff --git a/Resources/Prototypes/ai_factions.yml b/Resources/Prototypes/ai_factions.yml
index 27afc62b35..3ce3813a36 100644
--- a/Resources/Prototypes/ai_factions.yml
+++ b/Resources/Prototypes/ai_factions.yml
@@ -1,5 +1,7 @@
 - type: npcFaction
   id: Dragon
+  friendly:
+  - Carps # Sunrise Edit
   hostile:
   - NanoTrasen
   - Syndicate
@@ -9,6 +11,13 @@
   - Revolutionary
   - AllHostile
   - Wizard
+  # Sunrise Edit
+  - Thief
+  - Changeling
+  - Vampire
+  - FleshHuman
+  - Flesh
+  - BloodCult
 
 - type: npcFaction
   id: NanoTrasen
@@ -20,6 +29,7 @@
   - Revolutionary
   - AllHostile
   - Wizard
+  - Dragon
   # Sunrise Edit
   - Thief
   - Carps
@@ -47,6 +57,7 @@
   - Xeno
   - AllHostile
   - Wizard
+  - Dragon
   # Sunrise Edit
   - Carps
   - Flesh
@@ -60,7 +71,7 @@
   - PetsNT
   - Zombie
   - Revolutionary
-  #- Dragon
+  - Dragon
   - Xeno
   - AllHostile
   - Wizard
@@ -86,6 +97,7 @@
   - Zombie
   - AllHostile
   - Wizard
+  - Dragon
   # Sunrise Edit
   - Thief
   - Carps
@@ -106,6 +118,7 @@
   - Revolutionary
   - AllHostile
   - Wizard
+  - Dragon
   # Sunrise Edit
   - Thief
   - Carps
@@ -127,6 +140,7 @@
   - Revolutionary
   - AllHostile
   - Wizard
+  - Dragon
   # Sunrise Edit
   - Thief
   - Carps
@@ -144,6 +158,7 @@
   - SimpleHostile
   - AllHostile
   - Wizard
+  - Dragon
   # Sunrise Edit
   - Carps
   - Changeling
@@ -166,6 +181,7 @@
   - Zombie
   - Revolutionary
   - Wizard
+  - Dragon
   # Sunrise Edit
   - Thief
   - Carps
@@ -189,6 +205,7 @@
   - Zombie
   - Revolutionary
   - AllHostile
+  - Dragon
   # Sunrise Edit
   - Thief
   - Carps