]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
add type "Puller" for few pets in .yaml file (#14022)
authorpofitlo <107665898+pofitlo@users.noreply.github.com>
Tue, 28 Feb 2023 12:57:08 +0000 (16:57 +0400)
committerGitHub <noreply@github.com>
Tue, 28 Feb 2023 12:57:08 +0000 (08:57 -0400)
Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml

index e90646741fa85223f41a3f8b98f6c609675943c5..6c0f63e6a3e20facd020b45a401f6aa5a20a7759 100644 (file)
@@ -63,6 +63,8 @@
       types:
         Piercing: 5
   - type: NoSlip
+  - type: Puller
+    needsHands: true
 
 - type: entity
   name: bee
   - type: NoSlip
   - type: MobPrice
     price: 50
+  - type: Puller
+    needsHands: true
 
 - type: entity
   name: bee
     accent: chicken
   - type: SentienceTarget
     flavorKind: station-event-random-sentience-flavor-organic
+  - type: Puller
+    needsHands: true
 
 - type: entity
   name: mallard duck #Quack
   - type: NoSlip
   - type: MobPrice
     price: 50
+  - type: Puller
+    needsHands: true
 
 - type: entity
   name: cow
   - type: CanEscapeInventory
   - type: MobPrice
     price: 50
+  - type: Puller
+    needsHands: true
 
 - type: entity
   parent: MobMouse
   - type: Damageable
     damageContainer: Biological
     damageModifierSet: Scale
+  - type: Puller
+    needsHands: true
+
 
 - type: entity
   name: slug
       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
   - 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.
     successChance: 0.5
     interactSuccessString: petting-success-tarantula
     interactFailureString: petting-failure-generic
-  - type: Puller
-    needsHands: false
   - type: NoSlip
   - type: Spider
   - type: IgnoreSpiderWeb
     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:
index e61f0e057667f14312fb17c096b28849cdb034aa..96902e589bc5732a2a2cea979023bbafabf66794 100644 (file)
@@ -57,6 +57,7 @@
       proper: true
       gender: male
 
+
 - type: entity
   name: Lisa
   parent: MobCorgi
     description: ghost-role-information-hamlet-description
   - type: InteractionPopup
     successChance: 1
-  - type: Puller
-    needsHands: false
   - type: Butcherable
     spawned:
     - id: FoodMeat
index d7d041a31bfba62488935115161ef167c8cc3e9b..541ec177830484f6563366e3b960139e4dc58417 100644 (file)
@@ -82,8 +82,6 @@
         Base: dead
       Dead:
         Base: dead
-  - type: Puller
-    needsHands: false
   - type: GhostTakeoverAvailable
     makeSentient: true
     name: Rat King
         Base: dead-3
       Dead:
         Base: splat-3
-  - type: Puller
-    needsHands: false
   - type: DiseaseCarrier
     carrierDiseases:
     - VentCough
index 34b3d18bd333b97b60d781acaa739d43cdfd5c26..ac38c18fe4e50b899248b8c6c0731016ef55c1a2 100644 (file)
     price: 150
   - type: Appearance
   - type: FloatingVisuals
+  - type: Puller
+    needsHands: false