From 8cd11dca69c176ac6df3da7181dd57cb29acd30e Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Thu, 12 May 2022 08:41:18 +0100 Subject: [PATCH] SlowOnDamage for mobs. Removes pulling from some mobs. (#7824) * SlowOnDamage for all mobs now not just humans * removes puller from basesimplemob * adds pulling back to xeno, pets and some animals --- Resources/Prototypes/Entities/Mobs/NPCs/animals.yml | 7 ++++++- Resources/Prototypes/Entities/Mobs/NPCs/pets.yml | 1 + Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml | 7 ++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 60493ccc92..d71782d9df 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -487,6 +487,7 @@ path: /Audio/Animals/goose_honk.ogg - type: Bloodstream bloodMaxVolume: 100 + - type: Puller - type: entity name: gorilla @@ -523,6 +524,7 @@ amount: 4 - type: Bloodstream bloodMaxVolume: 300 + - type: Puller - type: entity name: kangaroo @@ -557,7 +559,8 @@ # SKIPPY NO! crit: kangaroo-dead dead: kangaroo-dead - + - type: Puller + - type: entity name: boxing kangaroo parent: MobKangaroo @@ -638,6 +641,7 @@ - id: FoodMeat amount: 3 - type: MonkeyAccent + - type: Puller - type: entity name: mouse @@ -1170,6 +1174,7 @@ successChance: 0.5 interactSuccessString: petting-success-tarantula interactFailureString: petting-failure-generic + - type: Puller - type: entity name: tarantula diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 1303dab6d3..a56362fbe9 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -46,6 +46,7 @@ gender: epicene - type: SentienceTarget flavorKind: corgi + - type: Puller - type: entity name: corrupted corgi diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml index 0a2a025e68..0ce3d0d100 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml @@ -124,7 +124,6 @@ - type: Climbing - type: Flashable - type: Pullable - - type: Puller - type: Buckle - type: Recyclable safe: false @@ -132,6 +131,12 @@ - type: Alerts - type: NameIdentifier group: GenericNumber + - type: SlowOnDamage + speedModifierThresholds: + 40: 0.8 + 60: 0.6 + 80: 0.4 + 90: 0.2 - type: entity save: false