From d838e850c69676df880ff794aa9e2fbcf4aa10f2 Mon Sep 17 00:00:00 2001
From: Aviu00 <93730715+Aviu00@users.noreply.github.com>
Date: Sat, 8 Jun 2024 13:03:20 +0000
Subject: [PATCH] Ling tweak & faction cleanup (#337)

* - tweak: Ling tweaks.

* - fix: Faction cleanup.
---
 .../Changeling/ChangelingRuleSystem.cs        |  2 +-
 .../Changeling/ChangelingComponent.cs         |  2 +-
 .../white/changeling/changeling-entities.ftl  |  2 +-
 .../Objects/Weapons/Melee/armblade.yml        |  1 +
 .../Entities/Clothing/Head/hive_head.yml      |  3 +-
 Resources/Prototypes/ai_factions.yml          | 31 ++++++++++++++++++-
 6 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/Content.Server/Changeling/ChangelingRuleSystem.cs b/Content.Server/Changeling/ChangelingRuleSystem.cs
index 4d34a04bd3..fe9954677f 100644
--- a/Content.Server/Changeling/ChangelingRuleSystem.cs
+++ b/Content.Server/Changeling/ChangelingRuleSystem.cs
@@ -215,7 +215,7 @@ public sealed class ChangelingRuleSystem : GameRuleSystem<ChangelingRuleComponen
 
         // Change the faction
         _npcFaction.RemoveFaction(changeling, "NanoTrasen", false);
-        _npcFaction.AddFaction(changeling, "Syndicate");
+        _npcFaction.AddFaction(changeling, "Changeling");
 
         EnsureComp<ChangelingComponent>(changeling, out var readyChangeling);
 
diff --git a/Content.Shared/Changeling/ChangelingComponent.cs b/Content.Shared/Changeling/ChangelingComponent.cs
index f12157f464..f4ddb6e875 100644
--- a/Content.Shared/Changeling/ChangelingComponent.cs
+++ b/Content.Shared/Changeling/ChangelingComponent.cs
@@ -24,7 +24,7 @@ public sealed partial class ChangelingComponent : Component
     public float Accumulator;
 
     [ViewVariables(VVAccess.ReadOnly)]
-    public float UpdateDelay = 4f;
+    public float UpdateDelay = 8f;
 
     [ViewVariables(VVAccess.ReadOnly)]
     public bool IsRegenerating;
diff --git a/Resources/Locale/ru-RU/white/changeling/changeling-entities.ftl b/Resources/Locale/ru-RU/white/changeling/changeling-entities.ftl
index 27f6c1e246..b9c2dfcf64 100644
--- a/Resources/Locale/ru-RU/white/changeling/changeling-entities.ftl
+++ b/Resources/Locale/ru-RU/white/changeling/changeling-entities.ftl
@@ -53,7 +53,7 @@ changeling-ability-changeling-lesser-form = Примитивная форма
 changeling-ability-changeling-lesser-form-desc = Превращает в самую примитивную форму. Полезно для побега из наручников. Стоит 5 химикатов.
 
 changeling-ability-bees = Выпустить пчёл
-changeling-ability-bees-desc = Выпускает 4 агрессивных пчелы из улья.
+changeling-ability-bees-desc = Выпускает 6 агрессивных пчёл из улья.
 
 ent-ActionChangelingShop = Эволюции
     .desc = Эволюционируйте и развивайтесь.
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
index 2814c4202c..4900a48f88 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
@@ -10,6 +10,7 @@
     state: icon
   - type: MeleeWeapon
     wideAnimationRotation: 90
+    attackRate: 0.75
     damage:
       types:
         Slash: 20
diff --git a/Resources/Prototypes/_White/Entities/Clothing/Head/hive_head.yml b/Resources/Prototypes/_White/Entities/Clothing/Head/hive_head.yml
index 444308352e..f4a6fb4d88 100644
--- a/Resources/Prototypes/_White/Entities/Clothing/Head/hive_head.yml
+++ b/Resources/Prototypes/_White/Entities/Clothing/Head/hive_head.yml
@@ -21,6 +21,7 @@
   - type: FlashImmunity
   - type: EyeProtection
   - type: HiveHead
+    beesAmount: 6
 
 - type: entity
   id: ActionReleaseBees
@@ -43,4 +44,4 @@
       lifetime: 25.0
     - type: NpcFactionMember
       factions:
-      - Syndicate
+      - Changeling
diff --git a/Resources/Prototypes/ai_factions.yml b/Resources/Prototypes/ai_factions.yml
index 6d5f5abf39..56816aaedf 100644
--- a/Resources/Prototypes/ai_factions.yml
+++ b/Resources/Prototypes/ai_factions.yml
@@ -7,6 +7,8 @@
     - PetsNT
     - Zombie
     - Revolutionary
+    - Cultist
+    - Changeling
 
 - type: npcFaction
   id: NanoTrasen
@@ -16,7 +18,9 @@
   - Xeno
   - Zombie
   - Revolutionary
+  - Cultist
   - Wizard
+  - Changeling
 
 - type: npcFaction
   id: Mouse
@@ -43,6 +47,8 @@
   - PetsNT
   - Zombie
   - Revolutionary
+  - Cultist
+  - Changeling
 
 - type: npcFaction
   id: SimpleNeutral
@@ -55,7 +61,9 @@
   - Xeno
   - PetsNT
   - Zombie
+  - Cultist
   - Wizard
+  - Changeling
 
 - type: npcFaction
   id: Xeno
@@ -66,6 +74,8 @@
   - PetsNT
   - Zombie
   - Revolutionary
+  - Cultist
+  - Changeling
 
 - type: npcFaction
   id: Zombie
@@ -77,7 +87,9 @@
   - Passive
   - PetsNT
   - Revolutionary
+  - Cultist
   - Wizard
+  - Changeling
 
 - type: npcFaction
   id: Revolutionary
@@ -86,7 +98,9 @@
   - Zombie
   - SimpleHostile
   - Dragon
+  - Cultist
   - Wizard
+  - Changeling
 
 # WD EDIT STARt
 - type: npcFaction
@@ -95,9 +109,10 @@
     - NanoTrasen
     - SimpleHostile
     - Xeno
-    - PetsNT
+    - Dragon
     - Syndicate
     - Wizard
+    - Changeling
 
 - type: npcFaction
   id: Wizard
@@ -107,4 +122,18 @@
   - Cultist
   - Revolutionary
   - Zombie
+  - Changeling
+
+- type: npcFaction
+  id: Changeling
+  hostile:
+  - NanoTrasen
+  - SimpleHostile
+  - Xeno
+  - Dragon
+  - Syndicate
+  - Cultist
+  - Revolutionary
+  - Zombie
+  - Wizard
 # WD EDIT END