From 0a34d17d1cecd16df3fcacb7cda6b1c43731eb8c Mon Sep 17 00:00:00 2001
From: Tris0r <163807362+Tris0r@users.noreply.github.com>
Date: Wed, 1 Jan 2025 18:48:19 +0500
Subject: [PATCH 1/3] furry's maid

---
 Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml | 6 +++++-
 Resources/Prototypes/Entities/Mobs/NPCs/pets.yml          | 8 +++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
index 6e38d12a0bcf..8ab1c9537208 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
@@ -129,6 +129,10 @@
   - type: NpcFactionMember
     factions:
       - SimpleHostile
+    #ss220 fix start
+    addFriendlyFactions:
+      - PetsNT
+    #ss220 fix end
   - type: HTN
     rootTask:
       task: KillerTomatoCompound
@@ -238,4 +242,4 @@
       types:
         Blunt: 0.11
   - type: StaticPrice
-    price: 400
\ No newline at end of file
+    price: 400
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index 960c95f9e72f..a95ee9353299 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -148,9 +148,11 @@
   - type: NpcFactionMember
     factions:
       - PetsNT
-  - type: HTN
-    rootTask:
-      task: SimpleHostileCompound
+ #ss220 fix start
+#  - type: HTN
+#    rootTask:
+#      task: SimpleHostileCompound
+ #ss220 fix end
   - type: Grammar
     attributes:
       proper: true

From 747ff694e86144e4c93115d52591e41b718dbaa1 Mon Sep 17 00:00:00 2001
From: Stalen <33173619+stalengd@users.noreply.github.com>
Date: Sun, 5 Jan 2025 05:12:56 +0300
Subject: [PATCH 2/3] Update miscellaneous.yml


From 88581a8c03540484812444f94fc3ae8bba43b3e3 Mon Sep 17 00:00:00 2001
From: Tris0r <163807362+Tris0r@users.noreply.github.com>
Date: Tue, 7 Jan 2025 03:25:46 +0500
Subject: [PATCH 3/3] =?UTF-8?q?=D1=81=20=D0=A0=D0=BE=D0=B6=D0=B4=D0=B5?=
 =?UTF-8?q?=D1=81=D1=82=D0=B2=D0=BE=D0=BC!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Resources/Prototypes/Entities/Mobs/NPCs/pets.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index a95ee9353299..e3c124c2890f 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -148,11 +148,13 @@
   - type: NpcFactionMember
     factions:
       - PetsNT
- #ss220 fix start
-#  - type: HTN
-#    rootTask:
-#      task: SimpleHostileCompound
- #ss220 fix end
+  #ss220 fix start
+    addFriendlyFactions:
+      - SimpleHostile
+  #ss220 fix end
+  - type: HTN
+    rootTask:
+      task: SimpleHostileCompound
   - type: Grammar
     attributes:
       proper: true