From: pofitlo <107665898+pofitlo@users.noreply.github.com>
Date: Tue, 28 Feb 2023 12:57:08 +0000 (+0400)
Subject: add type "Puller" for few pets in .yaml file (#14022)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=625d6a136a6f1d32aad02423bd677311be3bdfdc;p=space-station-14.git

add type "Puller" for few pets in .yaml file (#14022)
---

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index e90646741f..6c0f63e6a3 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -63,6 +63,8 @@
       types:
         Piercing: 5
   - type: NoSlip
+  - type: Puller
+    needsHands: true
 
 - type: entity
   name: bee
@@ -121,6 +123,8 @@
   - type: NoSlip
   - type: MobPrice
     price: 50
+  - type: Puller
+    needsHands: true
 
 - type: entity
   name: bee
@@ -203,6 +207,8 @@
     accent: chicken
   - type: SentienceTarget
     flavorKind: station-event-random-sentience-flavor-organic
+  - type: Puller
+    needsHands: true
 
 - type: entity
   name: mallard duck #Quack
@@ -350,6 +356,8 @@
   - type: NoSlip
   - type: MobPrice
     price: 50
+  - type: Puller
+    needsHands: true
 
 - type: entity
   name: cow
@@ -862,6 +870,8 @@
   - type: CanEscapeInventory
   - type: MobPrice
     price: 50
+  - type: Puller
+    needsHands: true
 
 - type: entity
   parent: MobMouse
@@ -965,6 +975,9 @@
   - type: Damageable
     damageContainer: Biological
     damageModifierSet: Scale
+  - type: Puller
+    needsHands: true
+
 
 - type: entity
   name: slug
@@ -1059,6 +1072,8 @@
       path: /Audio/Animals/frog_ribbit.ogg
   - type: Bloodstream
     bloodMaxVolume: 50
+  - type: Puller
+    needsHands: true
 
 # Would be cool to have some functionality for the parrot to be able to sit on stuff
 - type: entity
@@ -1272,6 +1287,8 @@
   - type: Damageable
     damageContainer: Biological
     damageModifierSet: Scale
+  - type: Puller
+    needsHands: true
 
 # Code unique spider prototypes or combine them all into one spider and get a
 # random sprite state when you spawn it.
@@ -1337,8 +1354,6 @@
     successChance: 0.5
     interactSuccessString: petting-success-tarantula
     interactFailureString: petting-failure-generic
-  - type: Puller
-    needsHands: false
   - type: NoSlip
   - type: Spider
   - type: IgnoreSpiderWeb
@@ -1644,7 +1659,7 @@
     damageContainer: Biological
     damageModifierSet: Infernal
   - type: Temperature
-    heatDamageThreshold: 4000 #They come from hell, so...
+    heatDamageThreshold: 4000 #They come from hell, so..
     coldDamageThreshold: 260
     currentTemperature: 310.15
     coldDamage:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index e61f0e0576..96902e589b 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -57,6 +57,7 @@
       proper: true
       gender: male
 
+
 - type: entity
   name: Lisa
   parent: MobCorgi
@@ -404,8 +405,6 @@
     description: ghost-role-information-hamlet-description
   - type: InteractionPopup
     successChance: 1
-  - type: Puller
-    needsHands: false
   - type: Butcherable
     spawned:
     - id: FoodMeat
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
index d7d041a31b..541ec17783 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -82,8 +82,6 @@
         Base: dead
       Dead:
         Base: dead
-  - type: Puller
-    needsHands: false
   - type: GhostTakeoverAvailable
     makeSentient: true
     name: Rat King
@@ -264,8 +262,6 @@
         Base: dead-3
       Dead:
         Base: splat-3
-  - type: Puller
-    needsHands: false
   - type: DiseaseCarrier
     carrierDiseases:
     - VentCough
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
index 34b3d18bd3..ac38c18fe4 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -224,4 +224,6 @@
     price: 150
   - type: Appearance
   - type: FloatingVisuals
+  - type: Puller
+    needsHands: false