From: Nim <128169402+Nimfar11@users.noreply.github.com>
Date: Wed, 3 May 2023 12:47:17 +0000 (+0300)
Subject: Factions for animals (#16013)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=1ff6b6adbbc375741a3ef818b25d84b52ead75ea;p=space-station-14.git

Factions for animals (#16013)

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
---

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index e873e508e7..fa5b72ebbd 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -197,6 +197,9 @@
     flavorKind: station-event-random-sentience-flavor-organic
   - type: Puller
     needsHands: true
+  - type: Faction
+    factions:
+    - Passive
 
 - type: entity
   name: mallard duck #Quack
@@ -248,6 +251,9 @@
     accent: duck
   - type: SentienceTarget
     flavorKind: station-event-random-sentience-flavor-organic
+  - type: Faction
+    factions:
+    - Passive
 
 - type: entity
   name: white duck #Quack
@@ -407,7 +413,9 @@
       path: /Audio/Animals/cow_moo.ogg
   - type: Perishable
     molsPerSecondPerUnitMass: 0.0015
-
+  - type: Faction
+    factions:
+    - Passive
 
 - type: entity
   name: crab
@@ -508,6 +516,9 @@
     interactFailureString: petting-failure-goat
     interactSuccessSound:
       path: /Audio/Animals/goat_bah.ogg
+  - type: Faction
+    factions:
+    - Passive
 
 # Note that we gotta make this bitch vomit someday when you feed it anthrax or sumthin. Needs to be a small item thief too and aggressive if attacked.
 - type: entity
@@ -554,6 +565,9 @@
   - type: Bloodstream
     bloodMaxVolume: 100
   - type: Puller
+  - type: Faction
+    factions:
+    - Passive
 
 - type: entity
   name: gorilla
@@ -742,6 +756,9 @@
   - type: MonkeyAccent
   - type: Puller
   - type: CanHostGuardian
+  - type: Faction
+    factions:
+    - Passive
   - type: GhostRole
     makeSentient: true
     name: monkey
@@ -1172,6 +1189,9 @@
     interactFailureString: petting-failure-generic
     interactSuccessSound:
       path: /Audio/Animals/penguin_squawk.ogg
+  - type: Faction
+    factions:
+    - Passive
 
 - type: entity
   name: grenade penguin
@@ -2128,3 +2148,6 @@
     accent: pig
   - type: SentienceTarget
     flavorKind: station-event-random-sentience-flavor-organic
+  - type: Faction
+    factions:
+    - Passive
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index b37a167abe..825067a688 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -125,6 +125,9 @@
   parent: MobCatCalico
   description: Ask nicely, and maybe they'll give you one of their spare lives.
   components:
+  - type: Faction
+    factions:
+      - PetsNT
   - type: Grammar
     attributes:
       gender: male
diff --git a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
index d4e7c5f47c..4325278c25 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
@@ -24,6 +24,9 @@
     - Chapel
   - type: Mind
     showExamineInfo: true
+  - type: Faction
+    factions:
+    - PetsNT
   - type: Alerts
   - type: Familiar
 
diff --git a/Resources/Prototypes/ai_factions.yml b/Resources/Prototypes/ai_factions.yml
index ffa527257d..e9b4709f2b 100644
--- a/Resources/Prototypes/ai_factions.yml
+++ b/Resources/Prototypes/ai_factions.yml
@@ -4,6 +4,7 @@
     - NanoTrasen
     - Syndicate
     - Xeno
+    - PetsNT
 
 - type: faction
   id: NanoTrasen
@@ -17,6 +18,9 @@
   hostile:
     - PetsNT
 
+- type: faction
+  id: Passive
+
 - type: faction
   id: PetsNT
   hostile:
@@ -29,6 +33,8 @@
   hostile:
   - NanoTrasen
   - Syndicate
+  - Passive
+  - PetsNT
 
 - type: faction
   id: SimpleNeutral
@@ -39,9 +45,12 @@
   - NanoTrasen
   - SimpleHostile
   - Xeno
+  - PetsNT
 
 - type: faction
   id: Xeno
   hostile:
   - NanoTrasen
   - Syndicate
+  - Passive
+  - PetsNT