Fix unknown component errors and duplicate damageable references (#1778)

2020-08-18 16:41:35 +02:00
parent 04bc20c365
commit 8ea9e4cd90
10 changed files with 2 additions and 18 deletions
--- a/Content.Client/IgnoredComponents.cs
+++ b/Content.Client/IgnoredComponents.cs
@@ -157,6 +157,7 @@
            "DamageOnHighSpeedImpact",
            "Barotrauma",
            "MobStateManager",
+            "Metabolism",
        };
    }
 }
--- a/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs
+++ b/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs
@@ -17,6 +17,7 @@ namespace Content.Shared.GameObjects.Components.Damage
    ///     Component that allows attached entities to take damage.
    ///     This basic version never dies (thus can take an indefinite amount of damage).
    /// </summary>
+    [RegisterComponent]
    [ComponentReference(typeof(IDamageableComponent))]
    public class DamageableComponent : Component, IDamageableComponent
    {
--- a/Resources/Prototypes/Entities/Constructible/Ground/pilot_chair.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/pilot_chair.yml
@@ -13,7 +13,6 @@
  - type: Collidable
  - type: Clickable
  - type: InteractionOutline
-  - type: Damageable
  - type: Destructible
    maxHP: 100
  - type: Physics
--- a/Resources/Prototypes/Entities/Constructible/Walls/signs.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/signs.yml
@@ -8,7 +8,6 @@
  - type: Collidable
    shapes:
    - !type:PhysShapeAabb
-  - type: Damageable
  - type: Destructible
    thresholdvalue: 5
  - type: Sprite
--- a/Resources/Prototypes/Entities/Constructible/disposal.yml
+++ b/Resources/Prototypes/Entities/Constructible/disposal.yml
@@ -13,7 +13,6 @@
  - type: SnapGrid
    offset: Center
  - type: Anchorable
-  - type: Damageable
  - type: Breakable
  - type: Rotatable

--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -39,14 +39,10 @@
      layer:
      - Opaque
      - MobImpassable
-  - type: Species
-    Template: Human
-    HeatResistance: 50
  - type: BodyManager
    BaseTemplate: bodyTemplate.Humanoid
    BasePreset: bodyPreset.BasicHuman
  - type: HeatResistance
-  - type: Damageable
  - type: CombatMode
  - type: Teleportable
  - type: Stunnable
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -34,14 +34,10 @@
      layer:
      - Opaque
      - MobImpassable
-  - type: Species
-    Template: Human
-    HeatResistance: 323
  - type: BodyManager
    BaseTemplate: bodyTemplate.Humanoid
    BasePreset: bodyPreset.BasicHuman
  - type: HeatResistance
-  - type: Damageable
  - type: CombatMode
  - type: Teleportable
  - type: Stunnable
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -31,14 +31,10 @@
      layer:
      - Opaque
      - MobImpassable
-  - type: Species
-    Template: Human
-    HeatResistance: 50
  - type: BodyManager
    BaseTemplate: bodyTemplate.Humanoid
    BasePreset: bodyPreset.BasicHuman
  - type: HeatResistance
-  - type: Damageable
  - type: CombatMode
  - type: Teleportable
  - type: Stunnable
@@ -64,7 +60,6 @@
  drawdepth: Mobs
  suffix: AI
  components:
-  - type: Damageable
  - type: Sprite
    drawdepth: Mobs
    sprite: Mobs/Pets/corgi.rsi
--- a/Resources/Prototypes/Entities/Mobs/Species/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -258,7 +258,6 @@
      baseTemplate: bodyTemplate.Humanoid
      basePreset: bodyPreset.BasicHuman
    - type: MobStateManager
-    - type: Damageable
    - type: Appearance
      visuals:
        - type: RotationVisualizer
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml
@@ -106,7 +106,6 @@
    devastationRange: 25
    heavyImpactRange: 25
    flashRange: 50
-  - type: Damageable
  - type: Destructible
    thresholdvalue: 50
  - type: Appearance